diff --git a/usr/share/icons/Lubuntu/apps/16/kuaipan4uk.png b/usr/share/icons/Lubuntu/apps/16/kuaipan4uk.png
new file mode 100644
index 0000000..6dc929a
Binary files /dev/null and b/usr/share/icons/Lubuntu/apps/16/kuaipan4uk.png differ
diff --git a/usr/share/icons/Lubuntu/apps/16/kuaipan.svg b/usr/share/icons/Lubuntu/apps/16/kuaipan4uk.svg
similarity index 99%
rename from usr/share/icons/Lubuntu/apps/16/kuaipan.svg
rename to usr/share/icons/Lubuntu/apps/16/kuaipan4uk.svg
index 83eddfa..389e6bb 100644
--- a/usr/share/icons/Lubuntu/apps/16/kuaipan.svg
+++ b/usr/share/icons/Lubuntu/apps/16/kuaipan4uk.svg
@@ -14,7 +14,10 @@
inkscape:version="0.48.4 r9939"
width="100%"
height="100%"
- sodipodi:docname="kuaipan16.svg">
+ sodipodi:docname="kuaipan4uk.svg"
+ inkscape:export-filename="/home/rafa/.icons/Box/apps/16/kuaipan4uk.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
@@ -23,7 +26,7 @@
image/svg+xml
-
+
@@ -37,14 +40,14 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
- inkscape:window-height="951"
+ inkscape:window-height="975"
id="namedview30"
showgrid="true"
inkscape:zoom="20.85965"
inkscape:cx="14.237288"
inkscape:cy="9.4997504"
inkscape:window-x="0"
- inkscape:window-y="0"
+ inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
inkscape:snap-bbox="true">
diff --git a/usr/share/icons/Lubuntu/apps/16/shotwell.svg b/usr/share/icons/Lubuntu/apps/16/shotwell.svg
new file mode 100644
index 0000000..a2c3b2a
--- /dev/null
+++ b/usr/share/icons/Lubuntu/apps/16/shotwell.svg
@@ -0,0 +1,932 @@
+
+
+
+
diff --git a/usr/share/icons/Lubuntu/apps/22/kuaipan4uk.png b/usr/share/icons/Lubuntu/apps/22/kuaipan4uk.png
new file mode 100644
index 0000000..db5bd9f
Binary files /dev/null and b/usr/share/icons/Lubuntu/apps/22/kuaipan4uk.png differ
diff --git a/usr/share/icons/Lubuntu/apps/22/kuaipan.svg b/usr/share/icons/Lubuntu/apps/22/kuaipan4uk.svg
similarity index 99%
rename from usr/share/icons/Lubuntu/apps/22/kuaipan.svg
rename to usr/share/icons/Lubuntu/apps/22/kuaipan4uk.svg
index a1ead37..e13b290 100644
--- a/usr/share/icons/Lubuntu/apps/22/kuaipan.svg
+++ b/usr/share/icons/Lubuntu/apps/22/kuaipan4uk.svg
@@ -15,7 +15,10 @@
id="svg4700"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="kuaipan22.svg">
+ sodipodi:docname="kuaipan4uk.svg"
+ inkscape:export-filename="/home/rafa/.icons/Box/apps/22/kuaipan4uk.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ sodipodi:docname="kuaipan4uk.svg"
+ inkscape:export-filename="/home/rafa/.icons/Box/apps/24/kuaipan4uk.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
image/svg+xml
-
+
diff --git a/usr/share/icons/Lubuntu/apps/24/shotwell.svg b/usr/share/icons/Lubuntu/apps/24/shotwell.svg
new file mode 100644
index 0000000..9d07ed0
--- /dev/null
+++ b/usr/share/icons/Lubuntu/apps/24/shotwell.svg
@@ -0,0 +1,742 @@
+
+
+
+
diff --git a/usr/share/icons/Lubuntu/apps/48/kuaipan4uk.png b/usr/share/icons/Lubuntu/apps/48/kuaipan4uk.png
new file mode 100644
index 0000000..6a52ea8
Binary files /dev/null and b/usr/share/icons/Lubuntu/apps/48/kuaipan4uk.png differ
diff --git a/usr/share/icons/Lubuntu/apps/48/kuaipan.svg b/usr/share/icons/Lubuntu/apps/48/kuaipan4uk.svg
similarity index 98%
rename from usr/share/icons/Lubuntu/apps/48/kuaipan.svg
rename to usr/share/icons/Lubuntu/apps/48/kuaipan4uk.svg
index 8bb098c..8603f77 100644
--- a/usr/share/icons/Lubuntu/apps/48/kuaipan.svg
+++ b/usr/share/icons/Lubuntu/apps/48/kuaipan4uk.svg
@@ -15,7 +15,10 @@
id="svg4700"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="kuaipan48.svg">
+ sodipodi:docname="kuaipan4uk.svg"
+ inkscape:export-filename="/home/rafa/.icons/Box/apps/48/kuaipan4uk.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
image/svg+xml
-
+
diff --git a/usr/share/icons/Lubuntu/apps/48/shotwell.svg b/usr/share/icons/Lubuntu/apps/48/shotwell.svg
new file mode 100644
index 0000000..46802a8
--- /dev/null
+++ b/usr/share/icons/Lubuntu/apps/48/shotwell.svg
@@ -0,0 +1,876 @@
+
+
diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-caja.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-caja.rc
new file mode 100644
index 0000000..818251a
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-caja.rc
@@ -0,0 +1,95 @@
+style "caja-window-base" { bg[NORMAL] = @base_color }
+
+style "caja-sidebar" = "murrine-sidebar" {
+ GtkTreeView::horizontal_separator = 15
+ GtkTreeView::vertical_separator = 2
+
+ text[NORMAL] = @fg_color
+ base[NORMAL] = @sidepane_color
+
+ GtkTreeView::odd_row_color = "#E3E3E3"
+ GtkTreeView::even_row_color = "#E3E3E3"
+}
+
+style "caja-view" {
+ xthickness = 0
+ ythickness = 0
+}
+
+style "caja-handle" {
+ GtkPaned::handle-size = 1
+
+ engine "pixmap" {
+ # for the thin gray line separating the sidepane and viewpane
+ image {
+ function = HANDLE
+ recolorable = TRUE
+ file = "images/handle-vert.png"
+ stretch = TRUE
+ border = { 0, 0, 0, 0 }
+ }
+ }
+}
+
+style "caja-statusbar"
+{
+ bg[NORMAL] = @base_color
+ base[NORMAL] = @base_color
+ fg[NORMAL] = shade (1.2, @fg_color)
+
+ engine "murrine" {}
+}
+
+style "caja-location"
+{
+
+ xthickness = 0
+ ythickness = 0
+
+ bg[NORMAL] = @base_color
+
+ engine "pixmap" {
+ image
+ {
+ function = FLAT_BOX
+ recolorable = TRUE
+ file = "Caja/extra-widget.png"
+ state = NORMAL
+ stretch = TRUE
+ border = { 0, 0, 1, 0 }
+ }
+ }
+}
+
+style "caja-pathbar"
+{
+ #bg[NORMAL] = @bg_color
+}
+
+############################################
+# CAJA
+# Order of assignment is important
+#############################################
+
+widget_class "*CajaSidePane.*" style "caja-sidebar"
+widget_class "*Caja*Places*Sidebar*" style "caja-sidebar"
+widget_class "*Caja*Side*.GtkWidget" style "caja-sidebar"
+widget_class "*Caja*Side*Title*" style "caja-sidebar"
+
+#widget "*CajaNavigationWindow" style "caja-window-base"
+
+widget_class "*Caja*Scrollbar" style "murrine-scrollbar"
+widget_class "*CajaSidePane.*Scrollbar" style:highest "murrine-scrollbar"
+widget_class "*Caja*Statusbar*" style "caja-statusbar"
+
+widget "*Caja*Splitter" style "caja-handle"
+widget_class "*Caja*View*" style "caja-view"
+widget_class "*Caja*Notebook" style "murrine-notebook"
+
+widget_class "*Caja*." style "murrine-treeview-header"
+widget_class "*Caja*." style "murrine-treeview-header"
+widget_class "*Caja*." style "murrine-treeview-header"
+widget_class "*Caja*." style "murrine-treeview-header"
+
+widget_class "*CajaPathBar*" style "caja-pathbar"
+widget "*.caja-extra-view-widget" style "caja-location"
diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-panel.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-panel.rc
new file mode 100644
index 0000000..3b23b38
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/mate-panel.rc
@@ -0,0 +1,204 @@
+style "theme-panel"
+{
+ xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
+ ythickness = 0
+
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+ #bg_pixmap[NORMAL] = "../images/panel-bg.png"
+
+ base[NORMAL] = @bg_color
+ base[PRELIGHT] = shade (1.06, @bg_color)
+ base[INSENSITIVE] = @bg_color
+ bg[NORMAL] = @bg_color
+ bg[PRELIGHT] = shade (1.20, @bg_color)
+ bg[SELECTED] = shade (0.90, @selected_bg_color)
+ bg[INSENSITIVE] = @bg_color_dark
+ bg[ACTIVE] = shade (0.8, @bg_color)
+ fg[NORMAL] = "#000000"
+ fg[PRELIGHT] = "#000000"
+ fg[SELECTED] = @selected_fg_color
+ fg[ACTIVE] = "#ffffff"
+ fg[INSENSITIVE] = "#f0f0f0"
+ text[NORMAL] = "#000000"
+ text[PRELIGHT] = "#000000"
+ text[ACTIVE] = "#ffffff"
+ text[SELECTED] = @selected_fg_color
+ text[INSENSITIVE] = "#f0f0f0"
+
+ engine "murrine" {
+ }
+}
+
+style "theme-panel-buttons"
+{
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+ #bg_pixmap[NORMAL] = "../images/panel-bg.png"
+
+ engine "pixmap" {
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = NORMAL
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = PRELIGHT
+ file = "../images/panel-button-hover.png"
+ border = { 4, 4, 1, 1 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = ACTIVE
+ file = "../images/panel-button-active.png"
+ border = { 4, 4, 1, 1 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = SELECTED
+ file = "../images/panel-button-active.png"
+ border = { 4, 4, 1, 1 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = INSENSITIVE
+ }
+ image {
+ function = ARROW
+ recolorable = TRUE
+ arrow_direction = DOWN
+ }
+ }
+}
+
+style "theme-panel-light"
+{
+ xthickness = 1
+ ythickness = 0
+
+ fg[NORMAL] = @fg_color
+
+ engine "murrine" {
+ textstyle = 0
+ roundness = 0
+ }
+}
+
+style "theme-panel-text"
+{
+ fg[NORMAL] = "#000000"
+ fg[PRELIGHT] = "#000000"
+ fg[ACTIVE] = "#ffffff"
+ text[NORMAL] = "#000000"
+ text[PRELIGHT] = "#000000"
+ text[ACTIVE] = "#ffffff"
+}
+
+style "theme-main-menu-text" = "theme-panel-text"
+{
+ fg[PRELIGHT] = "#ffffff"
+ text[PRELIGHT] = "#ffffff"
+}
+
+style "theme-panel-handle"
+{
+ engine "pixmap" {
+ image {
+ function = HANDLE
+ }
+ image {
+ function = HANDLE
+ }
+ }
+}
+
+widget "*PanelWidget*" style "theme-panel"
+widget "*PanelApplet*" style "theme-panel"
+widget "*fast-user-switch*" style "theme-panel"
+widget "*CPUFreq*Applet*" style "theme-panel"
+widget "*indicator-applet*" style "theme-panel"
+class "PanelApp*" style "theme-panel"
+class "PanelToplevel*" style "theme-panel"
+widget_class "*PanelToplevel*" style "theme-panel"
+widget_class "*PanelFrame*" style "theme-panel"
+widget_class "*PanelAppletFrame*" style "theme-panel"
+widget_class "*PanelWidget*.*" style "theme-panel"
+#widget_class "*notif*" style "theme-panel"
+#widget_class "*Notif*" style "theme-panel"
+widget_class "*Tray*" style "theme-panel"
+widget_class "*tray*" style "theme-panel"
+widget_class "*computertemp*" style "theme-panel"
+widget_class "*Applet*Tomboy*" style "theme-panel"
+widget_class "*Applet*Netstatus*" style "theme-panel"
+
+# Fixes for tooltip text in some apps.
+widget_class "*Notif*Beagle*" style "theme-panel-light"
+widget_class "*Notif*Brasero*" style "theme-panel-light"
+
+# XFCE panel theming.
+widget "*Xfce*Panel*" style "theme-panel"
+class "*Xfce*Panel*" style "theme-panel"
+
+# Panel buttons
+widget_class "*Panel*GtkToggleButton" style:highest "theme-panel-buttons"
+#widget_class "*Panel*GtkButton" style:highest "theme-panel-buttons"
+
+# XFCE panel buttons
+widget "*Xfce*Panel*Button*" style:highest "theme-panel-buttons"
+class "*Xfce*Panel*Button*" style:highest "theme-panel-buttons"
+widget_class "*LauncherPlugin*" style:highest "theme-panel-buttons"
+widget_class "*ActionsPlugin*" style:highest "theme-panel-buttons"
+
+# lxpanel and fbpanel
++widget "*.tclock.*" style "theme-panel-buttons"
++widget "*.taskbar.*" style "theme-panel-buttons"
++widget_class "*GtkBgbox*" style "theme-panel-buttons"
+
+# Make sure panel text color doesn't change
+widget_class "*Panel*MenuBar*" style "theme-main-menu-text"
+widget_class "*Panel**" style "theme-main-menu-text"
+widget "*.clock-applet-button.*" style "theme-panel-text"
+widget "*PanelApplet*" style "theme-panel-text"
+
+# Hide ugly handle
+class "PanelAppletFrame" style:highest "theme-panel-handle"
+
+# The following removes the arrows from the panel
+
+style "panel-arrow-remove" {
+engine "pixmap" {
+ image {
+ function = ARROW
+ recolorable = TRUE
+ overlay_file = "Panel/arrow-blank.png"
+ overlay_border = {2,2,2,2}
+ overlay_stretch = FALSE
+ arrow_direction = UP
+ }
+ image {
+ function = ARROW
+ recolorable = TRUE
+ overlay_file = "Panel/arrow-blank.png"
+ overlay_border = {2,2,2,2}
+ overlay_stretch = FALSE
+ arrow_direction = DOWN
+ }
+ }
+}
+
+widget_class "*PanelToplevel*" style "panel-arrow-remove"
+
+# Fix xfce-notifyd button
+style "xfce-notifyd-button" {
+ fg[NORMAL] = @text_color
+ fg[PRELIGHT] = @text_color
+ fg[ACTIVE] = @text_color
+}
+
+widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc
index c1fcfd6..45d0046 100644
--- a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc
+++ b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc
@@ -682,3 +682,6 @@ include "apps/pcmanfm.rc"
include "apps/xfce4-notifyd.rc"
include "apps/thunar.rc"
+# MATE specific
+include "apps/mate-caja.rc"
+include "apps/mate-panel.rc"
diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down.png
new file mode 100644
index 0000000..6b9c03d
Binary files /dev/null and b/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down.png differ