diff --git a/Zukitre/gtk-2.0/assets.svg b/Zukitre/gtk-2.0/assets.svg
index 91b788d..2ae3b00 100644
--- a/Zukitre/gtk-2.0/assets.svg
+++ b/Zukitre/gtk-2.0/assets.svg
@@ -14,7 +14,7 @@
    viewBox="0 0 200 200"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
    sodipodi:docname="assets.svg">
   <defs
      id="defs4" />
@@ -25,16 +25,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="43.910386"
-     inkscape:cy="160.43035"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="42.196609"
+     inkscape:cy="149.32525"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
-     inkscape:window-width="1869"
+     inkscape:window-width="1857"
      inkscape:window-height="926"
-     inkscape:window-x="51"
+     inkscape:window-x="63"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
      showguides="false">
@@ -121,14 +121,6 @@
          d="m 54,858.36216 0,8 8,0 0,-8 -8,0 z m 1,1 6,0 0,6 -6,0 0,-6 z"
          id="path4211" />
     </g>
-    <rect
-       y="872.36218"
-       x="5"
-       height="6"
-       width="1"
-       id="panel-btn-hover"
-       style="opacity:1;fill:#ffffff;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
-       inkscape:label="#rect4225" />
     <g
        id="btn"
        inkscape:label="#g6379">
@@ -285,22 +277,6 @@
          id="rect4256"
          style="opacity:1;fill:#e3e3e3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038" />
     </g>
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:0.1882353;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
-       id="panel-btn-active"
-       width="1"
-       height="6"
-       x="9"
-       y="872.36218"
-       inkscape:label="#rect4262" />
-    <rect
-       y="872.36218"
-       x="13"
-       height="6"
-       width="1"
-       id="panel-btn-active-hover"
-       style="opacity:1;fill:#ffffff;fill-opacity:0.25098041;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
-       inkscape:label="#rect4282" />
     <rect
        inkscape:label="#rect4323"
        y="855.36218"
diff --git a/Zukitre/gtk-2.0/assets.txt b/Zukitre/gtk-2.0/assets.txt
index b58adc2..a6855c8 100644
--- a/Zukitre/gtk-2.0/assets.txt
+++ b/Zukitre/gtk-2.0/assets.txt
@@ -18,9 +18,6 @@ radio-checked-insensitive
 column-header
 column-header-hover
 handle
-panel-btn-active
-panel-btn-active-hover
-panel-btn-hover
 resize-grip
 menubar-menuitem
 null
diff --git a/Zukitre/gtk-2.0/assets/panel-btn-active-hover.png b/Zukitre/gtk-2.0/assets/panel-btn-active-hover.png
deleted file mode 100644
index fd9cc06..0000000
Binary files a/Zukitre/gtk-2.0/assets/panel-btn-active-hover.png and /dev/null differ
diff --git a/Zukitre/gtk-2.0/assets/panel-btn-active.png b/Zukitre/gtk-2.0/assets/panel-btn-active.png
deleted file mode 100644
index 07a9e1d..0000000
Binary files a/Zukitre/gtk-2.0/assets/panel-btn-active.png and /dev/null differ
diff --git a/Zukitre/gtk-2.0/assets/panel-btn-hover.png b/Zukitre/gtk-2.0/assets/panel-btn-hover.png
deleted file mode 100644
index 67f1d0f..0000000
Binary files a/Zukitre/gtk-2.0/assets/panel-btn-hover.png and /dev/null differ
diff --git a/Zukitre/gtk-2.0/panel.rc b/Zukitre/gtk-2.0/panel.rc
index b4b8cf4..1495287 100755
--- a/Zukitre/gtk-2.0/panel.rc
+++ b/Zukitre/gtk-2.0/panel.rc
@@ -1,362 +1,161 @@
-style "theme-panel" = "dark"
-{
-    xthickness     = 1
+style "theme-panel" {
+  xthickness = 1
+  ythickness = 0
 
-    bg[NORMAL]     = @panel_bg_color
-    bg[ACTIVE]     = shade (0.6, @panel_bg_color)
-    bg[PRELIGHT]   = shade (1.2, @panel_bg_color)
-    bg[SELECTED]   = shade (0.6, @panel_bg_color)
+  bg[NORMAL]   = @panel_bg_color
+  bg[ACTIVE]   = shade (0.4, @panel_bg_color)
+  bg[PRELIGHT] = shade (1.22, @panel_bg_color)
+  bg[SELECTED] = shade (0.4, @panel_bg_color)
 
-    fg[NORMAL]     = @panel_fg_color
-    fg[PRELIGHT]   = @panel_fg_color
-    fg[ACTIVE]     = @panel_fg_color
-    fg[SELECTED]   = @panel_fg_color
+  fg[NORMAL]   = @panel_fg_color
+  fg[PRELIGHT] = @selected_fg_color
+  fg[ACTIVE]   = @selected_fg_color
+  fg[SELECTED] = @selected_fg_color
 
-    text[NORMAL]   = @panel_fg_color
-    text[PRELIGHT] = @panel_fg_color
-    text[ACTIVE]   = @panel_fg_color
-    text[SELECTED] = @panel_fg_color
+  text[NORMAL]   = @panel_fg_color
+  text[PRELIGHT] = @panel_fg_color
+  text[ACTIVE]   = @panel_fg_color
+  text[SELECTED] = @panel_fg_color
 
-    engine "murrine" {
-        reliefstyle     = 0
-        glazestyle      = 0
-        glow_shade      = 1.0
-        highlight_shade = 1.0
-        roundness       = 0
-        gradient_shades = {1.0,1.0,1.0,1.0}
-        textstyle       = 0
-        contrast        = 0.0
-        textstyle       = 0
-    }
+  engine "murrine" {
+    reliefstyle     = 0
+    glazestyle      = 0
+    glow_shade      = 1.0
+    highlight_shade = 1.0
+    roundness       = 0
+    gradient_shades = {1.0,1.0,1.0,1.0}
+    textstyle       = 0
+    contrast        = 0.0
+  }
 }
 
-style "panelbar" {
-
-    fg[NORMAL]   = @panel_fg_color
-    fg[ACTIVE]   = @panel_fg_color
-    fg[PRELIGHT] = @panel_fg_color
-    fg[SELECTED] = @selected_fg_color
-
-    bg[SELECTED] = @selected_bg_color
-
-    engine "murrine" {}
+style "theme-panel-progressbar" {
+  bg[ACTIVE] = @selected_bg_color
 }
 
-style "theme-panel-buttons" {
-
-    xthickness = 4
-    ythickness = 0
+style "panelbar" {
+  fg[NORMAL] = @panel_fg_color
+  fg[ACTIVE] = @panel_fg_color
+  fg[PRELIGHT] = @panel_fg_color
+  fg[SELECTED] = @selected_fg_color
 
-    engine "murrine" {
-        textstyle = 0
-    }
-}
+  bg[SELECTED] = @selected_bg_color
 
-style "theme-panel-buttons"
-{
-    GtkButton::child-displacement-x = 0
-    GtkButton::child-displacement-y = 0
-    engine "pixmap" {
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = NORMAL
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = PRELIGHT
-            shadow      = OUT
-            file        = "assets/panel-btn-hover.png"
-            border      = { 0, 0, 0, 2 }
-            stretch     = TRUE
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = PRELIGHT
-            shadow      = IN
-            file        = "assets/panel-btn-active-hover.png"
-            border      = { 0, 0, 0, 2 }
-            stretch     = TRUE
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = ACTIVE
-            file        = "assets/panel-btn-active.png"
-            border      = { 0, 0, 0, 2 }
-            stretch     = TRUE
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = SELECTED
-            file        = "assets/panel-btn-active.png"
-            border      = { 0, 0, 0, 2 }
-            stretch     = TRUE
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = INSENSITIVE
-        }
-        image {
-            function        = ARROW
-            recolorable     = TRUE
-            arrow_direction = DOWN
-        }
-    }
+  engine "murrine" {}
 }
 
-style "theme-panel-text"
-{
-    fg[NORMAL]     = @panel_fg_color
-    fg[PRELIGHT]   = @panel_fg_color
-    fg[ACTIVE]     = @panel_fg_color
+style "panelbuttons" {
+  xthickness = 4
+  ythickness = 0
 
-    text[NORMAL]   = @panel_fg_color
-    text[PRELIGHT] = @panel_fg_color
-    text[ACTIVE]   = @panel_fg_color
-
-    engine "murrine" {
-    }
+  engine "murrine" {
+    textstyle = 0
+  }
 }
 
-style "panel-entry" = "dark"
-{
-    fg[NORMAL]        = @text_color
-    fg[PRELIGHT]      = @text_color
-    fg[ACTIVE]        = @text_color
-    fg[SELECTED]      = @text_color
-    fg[INSENSITIVE]   = @text_color
+style "theme-panel-text" {
+  fg[NORMAL]   = @panel_fg_color
+  fg[PRELIGHT] = @selected_fg_color
+  fg[ACTIVE]   = @panel_fg_color
 
-    text[NORMAL]      = @text_color
-    text[PRELIGHT]    = @text_color
-    text[ACTIVE]      = @text_color
-    text[SELECTED]    = @text_color
-    text[INSENSITIVE] = @text_color
+  text[NORMAL]   = @panel_fg_color
+  text[PRELIGHT] = @selected_fg_color
+  text[ACTIVE]   = @panel_fg_color
 
+  engine "murrine" {
+    textstyle  = 0
+    text_shade = 0.2
+  }
 }
 
-style "theme-main-menu-text" = "theme-panel-text"
-{
-    fg[PRELIGHT]   = "#ffffff"
-    text[PRELIGHT] = "#ffffff"
-}
+style "panel-entry" = "dark" {
+  fg[NORMAL]        = @text_color
+  fg[PRELIGHT]      = @text_color
+  fg[ACTIVE]        = @text_color
+  fg[SELECTED]      = @text_color
+  fg[INSENSITIVE]   = @text_color
 
-style "workspace-switcher" = "theme-panel"
-{
-    bg[SELECTED] = shade (0.8, @selected_bg_color)
+  text[NORMAL]      = @text_color
+  text[PRELIGHT]    = @text_color
+  text[ACTIVE]      = @text_color
+  text[SELECTED]    = @text_color
+  text[INSENSITIVE] = @text_color
 }
 
-style "window-buttons" = "theme-panel"
-{
-    xthickness    = 3
-
-    bg[ACTIVE]   = shade (0.6, @panel_bg_color)
-    bg[PRELIGHT] = shade (1.2, @panel_bg_color)
-    bg[SELECTED] = shade (0.6, @panel_bg_color)
-
-    fg[NORMAL]   = shade (0.7, @base_color)
-    fg[ACTIVE]   = @base_color
-    fg[PRELIGHT] = @base_color
+style "theme-main-menu-text" = "theme-panel-text" {
+  fg[PRELIGHT] = @selected_fg_color
+  text[PRELIGHT] = @selected_fg_color
+}
 
-    engine "murrine" {
-        contrast        = 0.0
-        gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-        roundness       = 0
-        reliefstyle     = 0
-    }
+style "workspace-switcher" = "theme-panel" {
+  bg[SELECTED] = @selected_bg_color
 }
 
-style "indicator" = "theme-panel"
-{
-    xthickness = 0
-    ythickness = 0
+style "indicator" = "theme-panel" {
+  xthickness = 0
+  ythickness = 0
 }
 
-# Panel buttons
-widget       "*tasklist*"                         style "theme-panel-buttons"
-widget_class "*Xfce*Panel*.GtkToggleButton"       style "theme-panel-buttons"
-widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "theme-panel-buttons"
-widget_class "*PanelToplevel*Button"              style "theme-panel-buttons"
-widget_class "*Panel*GtkToggleButton"             style "theme-panel-buttons"
-widget_class "*Xfce*Panel*Button*"                style "theme-panel-buttons"
-widget_class "*<XfceArrowButton>"                 style "theme-panel-buttons"
-widget_class "*<XfceActionsPlugin>*"              style "theme-panel-buttons"
-widget_class "*XfcePanelPlugin.GtkButton"         style "theme-panel-buttons"
-widget       "*dict*Applet*"                      style "theme-panel-buttons"
-widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "theme-panel-buttons"
-widget_class "*Tasklist*"                         style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"                   style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"                    style:highest "theme-panel-buttons"
+widget       "*tasklist*"                             style "panelbuttons"
+widget_class "*Xfce*Panel*.GtkToggleButton"           style "panelbuttons"
+widget_class "*Xfce*NetkTasklist*GtkToggleButton"     style "panelbuttons"
+widget_class "*PanelToplevel*Button"                  style "panelbuttons"
+widget_class "*Panel*GtkToggleButton"                 style "panelbuttons"
+widget_class "*Xfce*Panel*Button*"                    style "panelbuttons"
+widget_class "*<XfceArrowButton>"                     style "panelbuttons"
+widget_class "*<XfceActionsPlugin>*"                  style "panelbuttons"
+widget_class "*XfcePanelPlugin.GtkButton"             style "panelbuttons"
+widget       "*dict*Applet*"                          style "panelbuttons"
+widget_class "*Xfce*NetkTasklist*GtkToggleButton"     style "panelbuttons"
+widget_class "*Tasklist*"                             style:highest "panelbuttons"
+widget_class "*LauncherPlugin*"                       style:highest "panelbuttons"
+widget_class "*ActionsPlugin*"                        style:highest "panelbuttons"
 
 # lxpanel and fbpanel
-widget "*.tclock.*"       style "theme-panel-buttons"
-widget "*.taskbar.*"      style "theme-panel-buttons"
-widget_class "*GtkBgbox*" style "theme-panel-buttons"
-
-class "*Panel*MenuBar*"             style "panelbar"
-widget_class "*Panel*MenuBar*"      style "panelbar"
-widget_class "*Panel*MenuBar*Item*" style:highest "panelbar"
-
-widget "*PanelWidget*"            style "theme-panel"
-widget "*PanelApplet*"            style "theme-panel"
-widget "*fast-user-switch*"       style "theme-panel"
-widget "*CPUFreq*Applet*"         style "theme-panel"
-class "PanelApp*"                 style "theme-panel"
-class "PanelToplevel*"            style "theme-panel"
-widget_class "*PanelToplevel*"    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"
+widget "*.tclock.*"                                   style "panelbuttons"
+widget "*.taskbar.*"                                  style "panelbuttons"
+widget_class "*GtkBgbox*"                             style "panelbuttons"
+
+class "*Panel*MenuBar*"                               style "panelbar"
+widget_class "*Panel*MenuBar*"                        style "panelbar"
+widget_class "*Panel*MenuBar*Item*"                   style:highest "panelbar"
+
+widget "*PanelWidget*"                                style "theme-panel"
+widget "*PanelApplet*"                                style "theme-panel"
+widget "*fast-user-switch*"                           style "theme-panel"
+widget "*CPUFreq*Applet*"                             style "theme-panel"
+class "PanelApp*"                                     style "theme-panel"
+class "PanelToplevel*"                                style "theme-panel"
+widget_class "*PanelToplevel*"                        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"
-widget_class "*Notif*Brasero*" style "theme-panel"
+widget_class "*Notif*Beagle*"                         style "theme-panel"
+widget_class "*Notif*Brasero*"                        style "theme-panel"
 
 # XFCE panel theming.
-widget "*Xfce*Panel*" style "theme-panel"
-class "*Xfce*Panel*"  style "theme-panel"
-widget "*WnckPager*"  style "workspace-switcher"
-widget "*TopMenu*"    style "theme-panel"
+widget "*Xfce*Panel*"                                 style "theme-panel"
+class  "*Xfce*Panel*"                                 style "theme-panel"
+widget "*Xfce*Panel*GtkProgressBar"                   style "theme-panel-progressbar"
+widget "*WnckPager*"                                  style "workspace-switcher"
+widget "*TopMenu*"                                    style "theme-panel"
+widget "*XfceTasklist*"                               style "panelbuttons"
 
 # Fix gtk-entries in the panel
-class "GtkEntry"                      style "combo"
-class "*SexyIconEntry*"               style:highest "combo" # fixes dict-plugin
-widget "*xfce4-verve-plugin*GtkEntry" style:highest "combo" # fixes verve-plugin
-widget "*bookmark*GtkEntry"           style "panel-entry"   # fixes smartbookmark-plugin
+widget "*bookmark*GtkEntry"                           style "panel-entry" # fixes smartbookmark-plugin
 
 # Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"      style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*" style "theme-main-menu-text"
-widget "*.clock-applet-button.*"    style "theme-panel-text"
-widget "*PanelApplet*"              style "theme-panel-text"
+widget_class "*Panel*MenuBar*"                        style "theme-main-menu-text"
+widget_class "*Panel*<GtkMenuBar>*"                   style "theme-main-menu-text"
+widget "*.clock-applet-button.*"                      style "theme-panel-text"
+widget "*PanelApplet*"                                style "theme-panel-text"
 
 # Override general panel-style with specific plugin-styles
-widget "*indicator-applet*" style "indicator"
-widget "*indicator-button*" style "indicator"
-#widget "*XfceTasklist*"     style "window-buttons"
-widget "*XfceTasklist*"     style "theme-panel-buttons"
-
-# XFCE Notify Window
-
-style "notify-window"
-{
-    XfceNotifyWindow::summary-bold       = 1
-    XfceNotifyWindow::border-color       = @bg_color_dark
-    XfceNotifyWindow::border-color-hover = @bg_color_dark
-    XfceNotifyWindow::border-radius      = 0.0
-    XfceNotifyWindow::border-width       = 0.0
-    XfceNotifyWindow::border-width-hover = 0.0
-    
-    bg[NORMAL] = @bg_color_dark
-}
-
-style "notify-button"
-{
-    bg[NORMAL]   = shade (1.25, @bg_color_dark)
-    bg[PRELIGHT] = shade (1.35, @bg_color_dark)
-    bg[ACTIVE]   = @selected_bg_color
-    fg[NORMAL]   = @text_color_dark
-    fg[PRELIGHT] = @text_color_dark
-
-    engine "murrine" {
-        border_shades = { 0.7, 0.7 }
-        shadow_shades = {0.1,0.1}
-        roundness     = 0
-    }
-}
-
-style "notify-text"
-{
-    fg[NORMAL]   = @text_color_dark
-    fg[PRELIGHT] = @text_color_dark
-
-    GtkWidget::link-color = @link_color
-}
-
-style "notify-summary"
-{
-    font_name = "Bold"
-}
-
-style "notify-progressbar"
-{
-    GtkProgressBar::min-horizontal-bar-height = 4
-    xthickness   = 0
-    ythickness   = 0
-
-    fg[PRELIGHT] = @text_color_dark
-    bg[NORMAL]   = @bg_color_dark
-    bg[SELECTED] = @selected_bg_color
-    bg[ACTIVE]   = @selected_bg_color
-
-    engine "murrine" {
-        gradient_shades      = {1.0,1.0,1.0,1.0}
-        trough_shades        = {0.2, 0.2}
-        trough_border_shades = {0.2, 0.2}
-        roundness            = 0
-        contrast             = 1.0
-    }
-}
-
-class        "XfceNotifyWindow"                    style "notify-window"
-widget       "XfceNotifyWindow.*.summary"          style "notify-summary"
-widget_class "XfceNotifyWindow.*<GtkButton>"       style:highest "notify-button"
-widget_class "XfceNotifyWindow.*.<GtkLabel>"       style "notify-text"
-widget_class "XfceNotifyWindow.*.<GtkProgress>"    style:highest "notify-progressbar"
-widget_class "XfceNotifyWindow.*.<GtkProgressBar>" style:highest "notify-progressbar"
-
-style "xfce-panel-image-style"
-{
-  # Fix the panel images to a default gtk icon size, is only works for
-  # images below 32 pixels. You can for example use this when you have
-  # fuzzy launcher icons.
-  XfcePanelImage::force-gtk-icon-sizes = true
-}
-class "XfcePanelImage" style "xfce-panel-image-style"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-    image {
-            function        = ARROW
-            recolorable     = TRUE
-            overlay_file    = "assets/null.png"
-            overlay_border  = {1,1,1,1}
-            overlay_stretch = FALSE
-            arrow_direction = UP
-        }
-    image {
-            function        = ARROW
-            recolorable     = TRUE
-            overlay_file    = "assets/null.png"
-            overlay_border  = {1,1,1,1}
-            overlay_stretch = FALSE
-            arrow_direction = DOWN
-        }
-    image
-        {
-            function        = HANDLE
-            overlay_file    = "assets/null.png"
-            overlay_stretch = FALSE
-            orientation     = VERTICAL
-        }
-    image
-        {
-            function        = HANDLE
-            overlay_file    = "assets/null.png"
-            overlay_stretch = FALSE
-            orientation     = HORIZONTAL
-        }
-    }
-}
-
-widget_class "*PanelToplevel*" style:highest "panel-arrow-remove"
+widget "*indicator-applet*"                           style "indicator"
+widget "*indicator-button*"                           style "indicator"
diff --git a/Zukitwo/gtk-2.0/assets.svg b/Zukitwo/gtk-2.0/assets.svg
index a0e60f1..5118885 100644
--- a/Zukitwo/gtk-2.0/assets.svg
+++ b/Zukitwo/gtk-2.0/assets.svg
@@ -15,7 +15,7 @@
    viewBox="0 0 200 200"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
    sodipodi:docname="assets.svg">
   <defs
      id="defs4">
@@ -160,60 +160,6 @@
        x2="65"
        y2="920.36218"
        gradientTransform="translate(4,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4462"
-       id="linearGradient4460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.75,0)"
-       x1="4.75"
-       y1="872.36218"
-       x2="4.75"
-       y2="878.36218" />
-    <linearGradient
-       id="linearGradient4462"
-       inkscape:collect="always">
-      <stop
-         id="stop4464"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.25098041" />
-      <stop
-         id="stop4466"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4444"
-       id="linearGradient4442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(16.25,-2.2617187e-5)"
-       x1="4.75"
-       y1="872.36218"
-       x2="4.75"
-       y2="878.36218" />
-    <linearGradient
-       id="linearGradient4444"
-       inkscape:collect="always">
-      <stop
-         id="stop4446"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.58823532" />
-      <stop
-         id="stop4448"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4444"
-       id="linearGradient4420"
-       x1="4.75"
-       y1="872.36218"
-       x2="4.75"
-       y2="878.36218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(8.25,-2.2617187e-5)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4514"
@@ -232,15 +178,15 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="2.8284271"
-     inkscape:cx="76.915911"
+     inkscape:cx="8.8568827"
      inkscape:cy="158.75154"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      units="px"
-     inkscape:window-width="1869"
+     inkscape:window-width="1857"
      inkscape:window-height="926"
-     inkscape:window-x="51"
+     inkscape:window-x="63"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
      showguides="true">
@@ -1044,127 +990,6 @@
          id="rect4397"
          style="opacity:1;fill:#d4d4d4;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451" />
     </g>
-    <g
-       id="panel-btn-active"
-       inkscape:label="#g4598">
-      <rect
-         inkscape:label="#rect4225"
-         style="opacity:1;fill:url(#linearGradient4420);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
-         id="g"
-         width="4"
-         height="6"
-         x="11"
-         y="872.36218" />
-      <rect
-         y="872.36218"
-         x="11"
-         height="6"
-         width="1"
-         id="rect4422"
-         style="opacity:1;fill:#000000;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451" />
-      <rect
-         style="opacity:1;fill:#000000;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451"
-         id="rect4425"
-         width="1"
-         height="6"
-         x="14"
-         y="872.36218" />
-      <rect
-         y="872.36218"
-         x="10"
-         height="6"
-         width="1"
-         id="rect4427"
-         style="opacity:1;fill:#ffffff;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451" />
-      <rect
-         style="opacity:1;fill:#ffffff;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451"
-         id="rect4429"
-         width="1"
-         height="6"
-         x="15"
-         y="872.36218" />
-    </g>
-    <g
-       id="panel-btn-active-hover"
-       inkscape:label="#g4605">
-      <rect
-         y="872.36218"
-         x="19"
-         height="6"
-         width="4"
-         id="rect4431"
-         style="opacity:1;fill:url(#linearGradient4442);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
-         inkscape:label="#rect4225" />
-      <rect
-         style="opacity:1;fill:#000000;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451"
-         id="rect4433"
-         width="1"
-         height="6"
-         x="19"
-         y="872.36218" />
-      <rect
-         y="872.36218"
-         x="22"
-         height="6"
-         width="1"
-         id="rect4436"
-         style="opacity:1;fill:#000000;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451" />
-      <rect
-         style="opacity:1;fill:#ffffff;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451"
-         id="rect4438"
-         width="1"
-         height="6"
-         x="18"
-         y="872.36218" />
-      <rect
-         y="872.36218"
-         x="23"
-         height="6"
-         width="1"
-         id="rect4440"
-         style="opacity:1;fill:#ffffff;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451" />
-    </g>
-    <g
-       transform="translate(1,-2.2617187e-5)"
-       id="panel-btn-hover"
-       inkscape:label="#g4468">
-      <rect
-         y="872.36218"
-         x="2"
-         height="6"
-         width="4"
-         id="rect4450"
-         style="opacity:1;fill:url(#linearGradient4460);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
-         inkscape:label="#rect4225" />
-      <rect
-         style="opacity:1;fill:#ffffff;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451"
-         id="rect4452"
-         width="1"
-         height="6"
-         x="2"
-         y="872.36218" />
-      <rect
-         y="872.36218"
-         x="5"
-         height="6"
-         width="1"
-         id="rect4454"
-         style="opacity:1;fill:#ffffff;fill-opacity:0.1254902;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451" />
-      <rect
-         style="opacity:1;fill:#000000;fill-opacity:0.0627451;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451"
-         id="rect4456"
-         width="1"
-         height="6"
-         x="1"
-         y="872.36218" />
-      <rect
-         y="872.36218"
-         x="6"
-         height="6"
-         width="1"
-         id="rect4458"
-         style="opacity:1;fill:#000000;fill-opacity:0.0627451;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.0627451" />
-    </g>
     <g
        id="menubar-menuitem"
        inkscape:label="#g4524">
diff --git a/Zukitwo/gtk-2.0/assets.txt b/Zukitwo/gtk-2.0/assets.txt
index 721fc5e..c544160 100644
--- a/Zukitwo/gtk-2.0/assets.txt
+++ b/Zukitwo/gtk-2.0/assets.txt
@@ -18,9 +18,6 @@ radio-checked-insensitive
 column-header
 column-header-hover
 handle
-panel-btn-active
-panel-btn-active-hover
-panel-btn-hover
 resize-grip
 menubar-menuitem
 null
diff --git a/Zukitwo/gtk-2.0/assets/panel-btn-active-hover.png b/Zukitwo/gtk-2.0/assets/panel-btn-active-hover.png
deleted file mode 100644
index d058829..0000000
Binary files a/Zukitwo/gtk-2.0/assets/panel-btn-active-hover.png and /dev/null differ
diff --git a/Zukitwo/gtk-2.0/assets/panel-btn-active.png b/Zukitwo/gtk-2.0/assets/panel-btn-active.png
deleted file mode 100644
index d058829..0000000
Binary files a/Zukitwo/gtk-2.0/assets/panel-btn-active.png and /dev/null differ
diff --git a/Zukitwo/gtk-2.0/assets/panel-btn-hover.png b/Zukitwo/gtk-2.0/assets/panel-btn-hover.png
deleted file mode 100644
index 28889d2..0000000
Binary files a/Zukitwo/gtk-2.0/assets/panel-btn-hover.png and /dev/null differ
diff --git a/Zukitwo/gtk-2.0/panel.rc b/Zukitwo/gtk-2.0/panel.rc
index 29e1f34..1495287 100755
--- a/Zukitwo/gtk-2.0/panel.rc
+++ b/Zukitwo/gtk-2.0/panel.rc
@@ -1,351 +1,161 @@
-style "theme-panel" = "dark"
-{
-    xthickness     = 1
+style "theme-panel" {
+  xthickness = 1
+  ythickness = 0
 
-    bg[NORMAL]     = @panel_bg_color
-    bg[ACTIVE]     = shade (0.6, @panel_bg_color)
-    bg[PRELIGHT]   = shade (1.2, @panel_bg_color)
-    bg[SELECTED]   = shade (0.6, @panel_bg_color)
+  bg[NORMAL]   = @panel_bg_color
+  bg[ACTIVE]   = shade (0.4, @panel_bg_color)
+  bg[PRELIGHT] = shade (1.22, @panel_bg_color)
+  bg[SELECTED] = shade (0.4, @panel_bg_color)
 
-    fg[NORMAL]     = @panel_fg_color
-    fg[PRELIGHT]   = @panel_fg_color
-    fg[ACTIVE]     = @panel_fg_color
-    fg[SELECTED]   = @panel_fg_color
+  fg[NORMAL]   = @panel_fg_color
+  fg[PRELIGHT] = @selected_fg_color
+  fg[ACTIVE]   = @selected_fg_color
+  fg[SELECTED] = @selected_fg_color
 
-    text[NORMAL]   = @panel_fg_color
-    text[PRELIGHT] = @panel_fg_color
-    text[ACTIVE]   = @panel_fg_color
-    text[SELECTED] = @panel_fg_color
+  text[NORMAL]   = @panel_fg_color
+  text[PRELIGHT] = @panel_fg_color
+  text[ACTIVE]   = @panel_fg_color
+  text[SELECTED] = @panel_fg_color
 
-    engine "murrine" {
-        contrast = 0.0
-    }
+  engine "murrine" {
+    reliefstyle     = 0
+    glazestyle      = 0
+    glow_shade      = 1.0
+    highlight_shade = 1.0
+    roundness       = 0
+    gradient_shades = {1.0,1.0,1.0,1.0}
+    textstyle       = 0
+    contrast        = 0.0
+  }
 }
 
-style "panelbar" {
-
-    fg[NORMAL]   = @panel_fg_color
-    fg[ACTIVE]   = @panel_fg_color
-    fg[PRELIGHT] = @panel_fg_color
-    fg[SELECTED] = @selected_fg_color
-
-    bg[SELECTED] = @selected_bg_color
-
-    engine "murrine" {}
+style "theme-panel-progressbar" {
+  bg[ACTIVE] = @selected_bg_color
 }
 
-style "theme-panel-buttons" {
-
-    xthickness = 4
-    ythickness = 0
+style "panelbar" {
+  fg[NORMAL] = @panel_fg_color
+  fg[ACTIVE] = @panel_fg_color
+  fg[PRELIGHT] = @panel_fg_color
+  fg[SELECTED] = @selected_fg_color
 
-    engine "murrine" {
-        textstyle = 0
-    }
-}
+  bg[SELECTED] = @selected_bg_color
 
-style "theme-panel-buttons"
-{
-    GtkButton::child-displacement-x = 0
-    GtkButton::child-displacement-y = 0
-    engine "pixmap" {
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = NORMAL
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = PRELIGHT
-            shadow      = OUT
-            file        = "assets/panel-btn-hover.png"
-            border      = { 2, 2, 0, 0 }
-            stretch     = TRUE
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = PRELIGHT
-            shadow      = IN
-            file        = "assets/panel-btn-active-hover.png"
-            border      = { 2, 2, 0, 0 }
-            stretch     = TRUE
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = ACTIVE
-            file        = "assets/panel-btn-active.png"
-            border      = { 2, 2, 0, 0 }
-            stretch     = TRUE
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = SELECTED
-            file        = "assets/panel-btn-active.png"
-            border      = { 2, 2, 0, 0 }
-            stretch     = TRUE
-        }
-        image {
-            function    = BOX
-            recolorable = TRUE
-            state       = INSENSITIVE
-        }
-        image {
-            function        = ARROW
-            recolorable     = TRUE
-            arrow_direction = DOWN
-        }
-    }
+  engine "murrine" {}
 }
 
-style "theme-panel-text"
-{
-    fg[NORMAL]     = @panel_fg_color
-    fg[PRELIGHT]   = @panel_fg_color
-    fg[ACTIVE]     = @panel_fg_color
+style "panelbuttons" {
+  xthickness = 4
+  ythickness = 0
 
-    text[NORMAL]   = @panel_fg_color
-    text[PRELIGHT] = @panel_fg_color
-    text[ACTIVE]   = @panel_fg_color
-
-    engine "murrine" {
-    }
+  engine "murrine" {
+    textstyle = 0
+  }
 }
 
-style "panel-entry" = "dark"
-{
-    fg[NORMAL]        = @text_color
-    fg[PRELIGHT]      = @text_color
-    fg[ACTIVE]        = @text_color
-    fg[SELECTED]      = @text_color
-    fg[INSENSITIVE]   = @text_color
+style "theme-panel-text" {
+  fg[NORMAL]   = @panel_fg_color
+  fg[PRELIGHT] = @selected_fg_color
+  fg[ACTIVE]   = @panel_fg_color
 
-    text[NORMAL]      = @text_color
-    text[PRELIGHT]    = @text_color
-    text[ACTIVE]      = @text_color
-    text[SELECTED]    = @text_color
-    text[INSENSITIVE] = @text_color
+  text[NORMAL]   = @panel_fg_color
+  text[PRELIGHT] = @selected_fg_color
+  text[ACTIVE]   = @panel_fg_color
 
+  engine "murrine" {
+    textstyle  = 0
+    text_shade = 0.2
+  }
 }
 
-style "theme-main-menu-text" = "theme-panel-text"
-{
-    fg[PRELIGHT]   = "#ffffff"
-    text[PRELIGHT] = "#ffffff"
-}
+style "panel-entry" = "dark" {
+  fg[NORMAL]        = @text_color
+  fg[PRELIGHT]      = @text_color
+  fg[ACTIVE]        = @text_color
+  fg[SELECTED]      = @text_color
+  fg[INSENSITIVE]   = @text_color
 
-style "workspace-switcher" = "theme-panel"
-{
-    bg[SELECTED] = shade (0.8, @selected_bg_color)
+  text[NORMAL]      = @text_color
+  text[PRELIGHT]    = @text_color
+  text[ACTIVE]      = @text_color
+  text[SELECTED]    = @text_color
+  text[INSENSITIVE] = @text_color
 }
 
-style "window-buttons" = "theme-panel"
-{
-    xthickness    = 3
-
-    bg[ACTIVE]   = shade (0.6, @panel_bg_color)
-    bg[PRELIGHT] = shade (1.2, @panel_bg_color)
-    bg[SELECTED] = shade (0.6, @panel_bg_color)
-
-    fg[NORMAL]   = shade (0.7, @base_color)
-    fg[ACTIVE]   = @base_color
-    fg[PRELIGHT] = @base_color
+style "theme-main-menu-text" = "theme-panel-text" {
+  fg[PRELIGHT] = @selected_fg_color
+  text[PRELIGHT] = @selected_fg_color
+}
 
-    engine "murrine" {
-        contrast = 0.0
-    }
+style "workspace-switcher" = "theme-panel" {
+  bg[SELECTED] = @selected_bg_color
 }
 
-style "indicator" = "theme-panel"
-{
-    xthickness = 0
-    ythickness = 0
+style "indicator" = "theme-panel" {
+  xthickness = 0
+  ythickness = 0
 }
 
-# Panel buttons
-widget       "*tasklist*"                         style "theme-panel-buttons"
-widget_class "*Xfce*Panel*.GtkToggleButton"       style "theme-panel-buttons"
-widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "theme-panel-buttons"
-widget_class "*PanelToplevel*Button"              style "theme-panel-buttons"
-widget_class "*Panel*GtkToggleButton"             style "theme-panel-buttons"
-widget_class "*Xfce*Panel*Button*"                style "theme-panel-buttons"
-widget_class "*<XfceArrowButton>"                 style "theme-panel-buttons"
-widget_class "*<XfceActionsPlugin>*"              style "theme-panel-buttons"
-widget_class "*XfcePanelPlugin.GtkButton"         style "theme-panel-buttons"
-widget       "*dict*Applet*"                      style "theme-panel-buttons"
-widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "theme-panel-buttons"
-widget_class "*Tasklist*"                         style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"                   style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"                    style:highest "theme-panel-buttons"
+widget       "*tasklist*"                             style "panelbuttons"
+widget_class "*Xfce*Panel*.GtkToggleButton"           style "panelbuttons"
+widget_class "*Xfce*NetkTasklist*GtkToggleButton"     style "panelbuttons"
+widget_class "*PanelToplevel*Button"                  style "panelbuttons"
+widget_class "*Panel*GtkToggleButton"                 style "panelbuttons"
+widget_class "*Xfce*Panel*Button*"                    style "panelbuttons"
+widget_class "*<XfceArrowButton>"                     style "panelbuttons"
+widget_class "*<XfceActionsPlugin>*"                  style "panelbuttons"
+widget_class "*XfcePanelPlugin.GtkButton"             style "panelbuttons"
+widget       "*dict*Applet*"                          style "panelbuttons"
+widget_class "*Xfce*NetkTasklist*GtkToggleButton"     style "panelbuttons"
+widget_class "*Tasklist*"                             style:highest "panelbuttons"
+widget_class "*LauncherPlugin*"                       style:highest "panelbuttons"
+widget_class "*ActionsPlugin*"                        style:highest "panelbuttons"
 
 # lxpanel and fbpanel
-widget "*.tclock.*"       style "theme-panel-buttons"
-widget "*.taskbar.*"      style "theme-panel-buttons"
-widget_class "*GtkBgbox*" style "theme-panel-buttons"
-
-class "*Panel*MenuBar*"             style "panelbar"
-widget_class "*Panel*MenuBar*"      style "panelbar"
-widget_class "*Panel*MenuBar*Item*" style:highest "panelbar"
-
-widget "*PanelWidget*"            style "theme-panel"
-widget "*PanelApplet*"            style "theme-panel"
-widget "*fast-user-switch*"       style "theme-panel"
-widget "*CPUFreq*Applet*"         style "theme-panel"
-class "PanelApp*"                 style "theme-panel"
-class "PanelToplevel*"            style "theme-panel"
-widget_class "*PanelToplevel*"    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"
+widget "*.tclock.*"                                   style "panelbuttons"
+widget "*.taskbar.*"                                  style "panelbuttons"
+widget_class "*GtkBgbox*"                             style "panelbuttons"
+
+class "*Panel*MenuBar*"                               style "panelbar"
+widget_class "*Panel*MenuBar*"                        style "panelbar"
+widget_class "*Panel*MenuBar*Item*"                   style:highest "panelbar"
+
+widget "*PanelWidget*"                                style "theme-panel"
+widget "*PanelApplet*"                                style "theme-panel"
+widget "*fast-user-switch*"                           style "theme-panel"
+widget "*CPUFreq*Applet*"                             style "theme-panel"
+class "PanelApp*"                                     style "theme-panel"
+class "PanelToplevel*"                                style "theme-panel"
+widget_class "*PanelToplevel*"                        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"
-widget_class "*Notif*Brasero*" style "theme-panel"
+widget_class "*Notif*Beagle*"                         style "theme-panel"
+widget_class "*Notif*Brasero*"                        style "theme-panel"
 
 # XFCE panel theming.
-widget "*Xfce*Panel*" style "theme-panel"
-class "*Xfce*Panel*"  style "theme-panel"
-widget "*WnckPager*"  style "workspace-switcher"
-widget "*TopMenu*"    style "theme-panel"
+widget "*Xfce*Panel*"                                 style "theme-panel"
+class  "*Xfce*Panel*"                                 style "theme-panel"
+widget "*Xfce*Panel*GtkProgressBar"                   style "theme-panel-progressbar"
+widget "*WnckPager*"                                  style "workspace-switcher"
+widget "*TopMenu*"                                    style "theme-panel"
+widget "*XfceTasklist*"                               style "panelbuttons"
 
 # Fix gtk-entries in the panel
-class "GtkEntry"                      style "combo"
-class "*SexyIconEntry*"               style:highest "combo" # fixes dict-plugin
-widget "*xfce4-verve-plugin*GtkEntry" style:highest "combo" # fixes verve-plugin
-widget "*bookmark*GtkEntry"           style "panel-entry"   # fixes smartbookmark-plugin
+widget "*bookmark*GtkEntry"                           style "panel-entry" # fixes smartbookmark-plugin
 
 # Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"      style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*" style "theme-main-menu-text"
-widget "*.clock-applet-button.*"    style "theme-panel-text"
-widget "*PanelApplet*"              style "theme-panel-text"
+widget_class "*Panel*MenuBar*"                        style "theme-main-menu-text"
+widget_class "*Panel*<GtkMenuBar>*"                   style "theme-main-menu-text"
+widget "*.clock-applet-button.*"                      style "theme-panel-text"
+widget "*PanelApplet*"                                style "theme-panel-text"
 
 # Override general panel-style with specific plugin-styles
-widget "*indicator-applet*" style "indicator"
-widget "*indicator-button*" style "indicator"
-#widget "*XfceTasklist*"     style "window-buttons"
-widget "*XfceTasklist*"     style "theme-panel-buttons"
-
-# XFCE Notify Window
-
-style "notify-window"
-{
-    XfceNotifyWindow::summary-bold       = 1
-    XfceNotifyWindow::border-color       = @bg_color_dark
-    XfceNotifyWindow::border-color-hover = @bg_color_dark
-    XfceNotifyWindow::border-radius      = 7.0
-    XfceNotifyWindow::border-width       = 0.0
-    XfceNotifyWindow::border-width-hover = 0.0
-    
-    bg[NORMAL] = @bg_color_dark
-}
-
-style "notify-button"
-{
-    bg[NORMAL]   = shade (1.25, @bg_color_dark)
-    bg[PRELIGHT] = shade (1.35, @bg_color_dark)
-    bg[ACTIVE]   = @selected_bg_color
-    fg[NORMAL]   = @text_color_dark
-    fg[PRELIGHT] = @text_color_dark
-
-    engine "murrine" {
-        border_shades = { 0.7, 0.7 }
-        shadow_shades = {0.1,0.1}
-        roundness     = 2
-    }
-}
-
-style "notify-text"
-{
-    fg[NORMAL]   = @text_color_dark
-    fg[PRELIGHT] = @text_color_dark
-
-    GtkWidget::link-color = @link_color
-}
-
-style "notify-summary"
-{
-    font_name = "Bold"
-}
-
-style "notify-progressbar"
-{
-    GtkProgressBar::min-horizontal-bar-height = 4
-    xthickness   = 0
-    ythickness   = 0
-
-    fg[PRELIGHT] = @text_color_dark
-    bg[NORMAL]   = @bg_color_dark
-    bg[SELECTED] = @selected_bg_color
-    bg[ACTIVE]   = @selected_bg_color
-
-    engine "murrine" {
-        gradient_shades      = {1.0,1.0,1.0,1.0}
-        trough_shades        = {0.2, 0.2}
-        trough_border_shades = {0.2, 0.2}
-        roundness            = 0
-        contrast             = 1.0
-    }
-}
-
-class        "XfceNotifyWindow"                    style "notify-window"
-widget       "XfceNotifyWindow.*.summary"          style "notify-summary"
-widget_class "XfceNotifyWindow.*<GtkButton>"       style:highest "notify-button"
-widget_class "XfceNotifyWindow.*.<GtkLabel>"       style "notify-text"
-widget_class "XfceNotifyWindow.*.<GtkProgress>"    style:highest "notify-progressbar"
-widget_class "XfceNotifyWindow.*.<GtkProgressBar>" style:highest "notify-progressbar"
-
-style "xfce-panel-image-style"
-{
-  # Fix the panel images to a default gtk icon size, is only works for
-  # images below 32 pixels. You can for example use this when you have
-  # fuzzy launcher icons.
-  XfcePanelImage::force-gtk-icon-sizes = true
-}
-class "XfcePanelImage" style "xfce-panel-image-style"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-    image {
-            function        = ARROW
-            recolorable     = TRUE
-            overlay_file    = "assets/null.png"
-            overlay_border  = {1,1,1,1}
-            overlay_stretch = FALSE
-            arrow_direction = UP
-        }
-    image {
-            function        = ARROW
-            recolorable     = TRUE
-            overlay_file    = "assets/null.png"
-            overlay_border  = {1,1,1,1}
-            overlay_stretch = FALSE
-            arrow_direction = DOWN
-        }
-    image
-        {
-            function        = HANDLE
-            overlay_file    = "assets/null.png"
-            overlay_stretch = FALSE
-            orientation     = VERTICAL
-        }
-    image
-        {
-            function        = HANDLE
-            overlay_file    = "assets/null.png"
-            overlay_stretch = FALSE
-            orientation     = HORIZONTAL
-        }
-    }
-}
-
-widget_class "*PanelToplevel*" style:highest "panel-arrow-remove"
+widget "*indicator-applet*"                           style "indicator"
+widget "*indicator-button*"                           style "indicator"