Theme UPDATES

Includes multiple fixes for GTK3 and GTK2.
README file rewrites with an INSTALL guide.
An alternative Plymouth boot featuring a retro linux theme.
Screenshots are moved to their own file instead of the README.

CREDITS

@@ -1,3 +1,4 @@
 [Chicago 95 Theme]
 Grassmunk 4/2016
 AdrianoML 12/2016
+EMH-Mark-I 4/2017

Extras/gtk-3.0 Override/pulseaudio_fix.css

@@ -1,2 +0,0 @@
-#pulseaudio-button { padding: 6px 6px; }
-#xfce4-power-manager-plugin { padding: 6px 6px; }

Extras/override/gtk.css

@@ -0,0 +1,64 @@
+/* Panel plugins */
+#pulseaudio-button { 
+    padding: 6px 6px; 
+}
+
+#xfce4-power-manager-plugin { 
+    padding: 6px 6px; 
+}
+
+/* File Chooser */
+filechooser box paned placessidebar viewport list {
+    background-color: white;
+}
+
+filechooser box paned placessidebar viewport list box {
+    padding: 3px;
+}
+
+filechooser box paned placessidebar viewport {
+    border: none;
+}
+
+
+filechooser box paned box box stack placesview stack frame scrolledwindow viewport list {
+    border: 1px solid;
+}
+
+filechooser box paned box revealer box stack box widget button {
+padding-top: 1px;
+padding-bottom: 1px;
+padding-left: 5px;
+padding-right: 5px;
+}
+
+filechooser box paned box revealer box stack box treeview {
+border-left: 2px solid black;
+}
+
+filechooser box paned placessidebar viewport list separator {
+    border-top: 1px solid #808080;
+    border-bottom: 1px solid white;
+}
+
+filechooser placessidebar viewport list {
+    background-color: white;
+}
+
+filechooser box paned placessidebar viewport list *:selected,
+filechooser box paned placessidebar viewport list *:active,
+filechooser box paned placessidebar viewport list *:focus {
+    outline: none;
+}
+
+filechooser placessidebar viewport separator {
+    border-top: 1
+}
+
+/* GNOME Disk utility */
+
+.gnome-disk-utility-grid {
+background-color: #000080;
+padding: 20px;
+}
+

INSTALL.md

@@ -0,0 +1,147 @@
+## How To Install
+
+Note: You may have to enable `view hidden folders` in your file manager to see hidden files.
+
+Create a `.themes` folder in your user directory `/home/$USER/` if it doesn't already exist.
+
+    mkdir -p ~/.themes
+
+Copy the `Theme/Chicago95` folder into `.themes`.
+
+    cp -r Theme/Chicago95 ~/.themes
+
+Copy `Extras/override/gtk.css` file into `/home/$USER/.config/gtk-3.0/`.
+
+    cp Extras/override/gtk.css ~/.config/gtk-3.0/
+
+(Note 1: You may have to create the "gtk-3.0" directory if it's not there.)
+
+    mkdir -p ~/.config/gtk-3.0
+
+(Note 2: If you ever want to change your system theme to anything else, don't forget to remove the `gtk.css` override file! It makes adjustments based on this theme which might break other themes.)
+
+Log out then log back after installing.
+
+## Configuration
+
+#### Enabling the GTK theme
+Open the XFCE settings manager > Appearance.
+
+- Choose Chicago95 as the theme style.
+
+#### Enabling the Window Manager theme
+Open the XFCE settings manager > Window Manager.
+
+- Choose Chicago95.
+- Set Title font to Sans Bold, 8 points.
+
+#### Enabling the theme for QT5 applications
+Open your terminal and install the qt5 style plugins package.
+
+- sudo apt install qt5-style-plugins
+
+Relogin for changes to take place.
+
+#### Enabling the notification theme
+Open the XFCE settings manager > Notifications.
+
+- Choose Chicago95 for the theme.
+- Adjust Opacity to 100%.
+
+#### Setting up the XFCE panel
+
+Create a new panel. A Horizontal panel with a Row Size of 32px is highly preffered for this theme. Vertical panel support for the theme is lacking, but possible with some additional work required. (Some help for a nice looking vertical panel would be appreciated!)
+
+- Lock panel
+- Set the panel length to 100%
+- Under the Appearance tab set the background style to "None (use system style.)"
+
+Here's a list for the panel Items plugin layout as seen from the screenshots. This is optional, the item configuration is up to you after all.
+
+1. Application Menu or Whisker Menu;
+2. Separator (Handle Style);
+3. Custom Launcher, Custom Launcher, Custom Launcher, etc. (16x16px icons are preferred.);
+4. “Show Desktop” plugin;
+5. Separator (Handle Style);
+6. Window Buttons (Uncheck "Show flat buttons" and "Show Handle.;" Sorting Order: None; Window grouping: Never);
+7. Separator (Transparent with Expanding);
+8. Separator (Handle Style);
+9. Indicator Plugin OR Notification Area (19px max icon size);
+10. Separator (Transparent);
+11. Orage Panel Clock. (Enable check box “Show frame” and replace the text in “Line 1” with %I:%M %p.)
+
+#### Whisker Menu and XFCE Aplication Menu Start Buttons
+Your panel has to be 32px high. If it’s any other size, the button won’t look correct. This is a work around for allowing a static button and icon with similar functionality to Windows95.
+
+Note: Whisker Menu is now GTK3 and Application Menu is GTK2.
+
+- Open the `Applications Menu` for Whisker Menu or Application Menu by right clicking on the panel icon and selecting `properties.`
+
+- In the Applications Menu window beside the icon section, click the icon badge to access the `Select An Icon` window.
+
+#### • Whisker Menu Steps
+Click on the "Select icon from" drop down menu, select the "Image Files" option in the bottom of the menu, and
+navigate to the following location ($USER is your account) `/home/$USER/.themes/Chicago95/misc/GTK3 start buttons/`
+
+Press Ctrl+H if you can't see the `.theme` folder.
+
+Select from one of the three images to become the Start Button.
+
+#### • Application Menu Steps
+navigate to the following location ($USER is your account) `/home/$USER/.themes/Chicago95/misc/GTK2 start buttons/`
+
+Press Ctrl+H if you can't see the `.theme` folder.
+
+Select from one of the four images to become the Start Button.
+
+If the icon appears crunched or blurry, then log out and log back in. The icon should appear a regular size.
+
+## Optional configurations
+
+#### Shadows
+Disable shadows in compositing for an authentic appearance, or at the very least disable “show shadows under dock windows” to prevent dark shading from the panel bar overlapping onto maximized applications.
+
+- Open the XFCE settings manager > Window Manager Tweaks > Compositor tab
+- Uncheck "Show shadows under pupup windows."
+- Uncheck "Show shadows under dock windows."
+- Uncheck "Show shadows under regular windows."
+
+####  Icons
+To install the icons copy the folders `Icons/Chicago95` and `Icons/Chicago95-tux`to `~/.icons`.
+
+In XFCE select Settings -> Appearance. Click on 'Icons' and select `Chicago95`.
+
+#### Desktop icons
+Open the XFCE Settings manager > Desktop > Icons tab. Adjust the Icon size for 32px.
+
+If you want to change the icon label backdrop colour, text colours, or highlight colours you'll have to edit the gtkrc theme file located in `/home/$USER/.themes/Chicago95/gtk-2.0/` on line numbers 536 to 541. After any changes are made log out then log back in. You can use CSS colour properties as seen on line 536 for "#008081".
+
+#### Cursors
+To install the cursors copy the folders in `Cursors` to `/usr/share/icons` or `~/.icons`.
+
+In XFCE select Settings -> Mouse and Touchpad. Click on 'Icons' and select `Chicago95`.
+
+Note: If you copied the icons to `/usr/share/icons` you may have to log out or reboot your system before the cursor theme is available.
+
+#### Bash terminal Fonts
+Copy the folder `Fonts/vga_font` to `~/.fonts/truetype/` if the `.fonts/truetype` folder doesn't exist just create it before you copy the files.
+
+Update your font cache: sudo fc-cache -f -v
+
+In xfce-term selet the font `Less Perfect DOS VGA` or `More Pefect DOS VGA`.
+
+[Click here](https://int10h.org/oldschool-pc-fonts/fontlist/) for more classic fonts.
+
+#### Bash terminal MS-DOS theme
+Copy the file `Extras/Chicago95.theme` to `~/.local/share/xfce4/terminal/colorschemes` (create the colorschemes folder if it doesn't exist: `mkdir .local/share/xfce4/terminal`).
+Under preferences in xfce-term select 'Colors.' Under `Presets` you should see `Chicago 95`.
+
+To get the MS-DOS `C:\>` prompt and startup message add the contents of `Extras/DOSrc` to your `.bashrc` file: `cat Extras/DOSrc >> ~/.bashrc`.
+To get MS-DOS Prompt title, go to the Preferences prompt and change title to MS-DOS Prompt and select isn't displayed on The Dynamically-Set Title
+
+#### oh-my-zsh MS-DOS theme
+Copy the file `Extras/Chicago95.zsh-theme` to `~/.oh-my-zsh/themes` (if you have changed your `.oh-my-zsh` config location, put the theme in that folder). In your `.zshrc` change your theme to Chicago95.
+
+This will add the MS-DOS prompt. You will get a C prompt by default. If the previous command had an exit code other than 0 you will get an F prompt. If you are in a git repository you will git a G prompt, followed by the branch (in yellow) and the status (clean in green, dirty in red).
+
+To get the startup message, add the contents of `Extras/ZSHDOSrc` to your `.zshrc` file: `cat Extras/ZSHDOSrc >> ~/.zshrc`.

Lightdm/Chicago95/README.md

@@ -4,12 +4,6 @@ Chicago95 Greeter
 Chicago95 is a greeter(read: a login screen) for use with lightdm and lightdm-webkit-greeter.
 
 It has very limited functionality, but reminds you of that 90s aesthetic.
-A screenshot of paddy-greeter in action can be found [here](https://raw.githubusercontent.com/grassmunk/Chicago95/master/Screenshots/lightdm.png).
-
-![Where do you want to go today?](https://raw.githubusercontent.com/grassmunk/Chicago95/master/Screenshots/lightdm.png)
-
-
-
 
 Documentation
 -------------

Plymouth/Readme.md

@@ -1,12 +1,26 @@
-## Plymouth Chicago95 Theme
+## Plymouth boot splash theme
 
-This theme is based on the template provided by http://brej.org/blog/?p=174
+The Windows95 boot theme is based on the template provided by http://brej.org/blog/?p=174
 
 It is meant to simulate the Windows 95 boot screen and shutdown screen.
 
-to install (Ubuntu):
+The RetroTux boot theme is based on the xubuntu-logo Plymouth theme.
 
-sudo cp -r Chicago95 /usr/share/plymouth/themes/
-sudo update-alternatives --install /usr/share//plymouth/themes/default.plymouth default.plymouth /usr/share//plymouth/themes/Chicago95/Chicago95.plymouth 100
-sudo update-alternatives --config default.plymouth  #here, choose the number of the theme you want to use then hit enter
-sudo update-initramfs -u
+#### Install instructions for XUbuntu
+Copy the theme folder into the Plymouth theme directory.
+
+- `sudo cp -r Chicago95/Plymouth/Chicago95 /usr/share/plymouth/themes/`
+- `sudo cp -r Chicago95/Plymouth/RetroTux /usr/share/plymouth/themes/`
+
+Add to default.plymouth
+
+- `sudo update-alternatives --install /usr/share//plymouth/themes/default.plymouth default.plymouth /usr/share/plymouth/themes/Chicago95/Chicago95.plymouth 100`
+- `sudo update-alternatives --install /usr/share//plymouth/themes/default.plymouth default.plymouth /usr/share/plymouth/themes/RetroTux/RetroTux.plymouth 100`
+
+Choose the theme to load. (As you run the following command there will be a number assigned to each theme and located in the first column of a list. Use that number to specify the theme and press enter to continue.)
+
+- `sudo update-alternatives --config default.plymouth`
+
+Update initramfs
+
+- `sudo update-initramfs -u`

README.md

@@ -1,7 +1,5 @@
 # Chicago95
-
-## XFCE / Xubuntu Windows 95 Total Conversion
-
+#### XFCE / Xubuntu Windows 95 Total Conversion
 I was unhappy with the various XFCE/GTK2/GTK3 Windows 95 based themes and decided to make one that was more consistent accross the board for theming.
 
 Included in this theme:
@@ -13,163 +11,27 @@ Included in this theme:
 - Plymouth theme created from scratch
 - An MS-DOS inspired theme for oh-my-zsh
 
+#### Requirements
+GTK+ 3.22
+
+Xfce 4.12
+
+(A Window compositor is preferred.) [See here if you don't use a compositor.](https://github.com/EMH-Mark-I/Chicago95-Custom-XFCE4)
+
+(Preferred Linux distribution is Xubuntu 17.10) [See here for the 16.04 LTS version of the theme.](https://github.com/EMH-Mark-I/Chicago95-Custom-XUbuntu-16.04-)
+
+## Install the system theme
+[Click here](INSTALL.md) for install steps.
+
+## Install the Plymouth boot splash theme
+[Click here](Plymouth/Readme.md) for install steps.
+
+## Install the LightDM login manager theme
+[Click here](Lightdm/Chicago95/README.md) for install steps.
+
 ## Screenshots
-![alt text](https://raw.githubusercontent.com/AdrianoML/Chicago95/master/Screenshots/plymouth.gif "Plymouth")
+[Click here to view screenshots](Screenshots/SCREENSHOTS.md)
 
-![alt text](https://raw.githubusercontent.com/AdrianoML/Chicago95/master/Screenshots/lightdm.png "LightDM")
-
-![alt text](https://raw.githubusercontent.com/AdrianoML/Chicago95/master/Screenshots/Screenshot.png "Big Screenshot")
-
-![alt text](https://raw.githubusercontent.com/AdrianoML/Chicago95/master/Screenshots/gtk2.png "GTK2")
-
-![alt text](https://raw.githubusercontent.com/AdrianoML/Chicago95/master/Screenshots/widget-factory-gtk3-chicago95.png "GTK3")
-
-![alt text](https://raw.githubusercontent.com/AdrianoML/Chicago95/master/Screenshots/nautilus-grk3-chicago95.png "GTK3")
-
-
-I decided that the pop-overs were almost exactly as annoying/ugly as Clippy was in MS Office 97 so the buttons/coloring are matched to look exactly like that.
-
-![alt text](https://raw.githubusercontent.com/AdrianoML/Chicago95/master/Screenshots/DOS.png "Terminal")
-
-There is also an oh-my-zsh terminal theme.
-
-![alt text](https://raw.githubusercontent.com/Geweldig/Chicago95/master/Screenshots/oh-my-zshDOS.png "oh-my-zsh terminal")
-
-## Installation
-
-### Themes
-For system wide install, copy the folder `Theme/Chicago95` to the themes directory i.e. `/usr/share/themes/` or `~/.themes`.
-
-In XFCE select Settings -> Appearance. Click on 'Style' and select `Chicago95`.
-
-For window borders select Settings -> Window Manager. Under 'Style' select `Chicago 95`.
-
-Background: Just set to whatever you like, for a more authentic look try setting Style to none and color to `#008080`.
-
-###  Icons
-To install the icons copy the folder `Icons/Chicago95` to `/usr/share/icons` or `~/.icons`.
-
-In XFCE select Settings -> Appearance. Click on 'Icons' and select `Chicago95`.
-
-For icons with tux check the Extras section below.
-
-### Cursors
-To install the cursors copy the folders in `Cursors` to `/usr/share/icons` or `~/.icons`.
-
-In XFCE select Settings -> Mouse and Touchpad. Click on 'Icons' and select `Chicago95`.
-
-### Fonts
-Copy the folder `Fonts/vga_font` to `~/.fonts/truetype/` if the `.fonts/truetype` folder doesn't exist just create it before you copy the files. 
-
-Update your font cache: sudo fc-cache -f -v
-
-In xfce-term selet the font `Less Perfect DOS VGA` or `More Pefect DOS VGA`.
-
-### Terminal
-#### Bash
-Copy the file `Extras/Chicago95.theme` to `~/.local/share/xfce4/terminal/colorschemes` (create the colorschemes folder if it doesn't exist: `mkdir .local/share/xfce4/terminal`).
-Under preferences in xfce-term select 'Colors.' Under `Presets` you should see `Chicago 95`.
-
-To get the MS-DOS `C:\>` prompt and startup message add the contents of `Extras/DOSrc` to your `.bashrc` file: `cat Extras/DOSrc >> ~/.bashrc`.
-To get MS-DOS Prompt title, go to the Preferences prompt and change title to MS-DOS Prompt and select isn't displayed on The Dynamically-Set Title
-
-#### oh-my-zsh
-Copy the file `Extras/Chicago95.zsh-theme` to `~/.oh-my-zsh/themes` (if you have changed your `.oh-my-zsh` config location, put the theme in that folder). In your `.zshrc` change your theme to Chicago95.
-
-This will add the MS-DOS prompt. You will get a C prompt by default. If the previous command had an exit code other than 0 you will get an F prompt. If you are in a git repository you will git a G prompt, followed by the branch (in yellow) and the status (clean in green, dirty in red).
-
-To get the startup message, add the contents of `Extras/ZSHDOSrc` to your `.zshrc` file: `cat Extras/ZSHDOSrc >> ~/.zshrc`.
-
-### Plymouth
-
-Recreates the classic Windows 95 boot screen.
-
-To install:
-
-```
-sudo cp -r Plymouth/Chicago95 /lib/plymouth/themes/
-sudo update-alternatives --install /lib/plymouth/themes/default.plymouth default.plymouth /lib/plymouth/themes/Chicago95/Chicago95.plymouth 100
-sudo update-alternatives --config default.plymouth  #here, choose the number of the theme you want to use then hit enter
-sudo update-initramfs -u
-```
-
-### LightDM:
-
-Attemps to recreate the asthetic of logging on to a computer in the mid 90's.
-
-Install instructions are in the `README.md` in `Lightdm/Chicago95/`.
-
-
-## Extras
-
-Big thanks to u/EMH_Mark_I at Reddit.com for the most recent changes and these items:
-
-### Fonts
-In the xfce appearance window, open the font tab.
-
-* Default Font: Sans 10
-* Enable Antialiasing: Yes
-* Hinting: Full
-* Sub-pixel order: None
-
-Next, open Window Manager.
-
-* Title Font: Sans Bold 8
-
-### Where’s the classic Start Button?
-
-If you want a classic style start button for the Whisker Menu or Application-Menu plugins instead of it defaulting to only an icon without the button borders, there are a few steps required to set this up.
-
-Note: Your panel has to be 32px high if you wish to have the classic style Start button. If it’s any other size, the button won’t look correct. You’re more than welcomed to make your own Start button.
-This is a work around because I’ve been unable to find a more sane means of making something that should be so simple to work...
-
-1. Go to the install directory of the theme, i.e.`~/.themes/Chicago95/gtk-2.0/` or `/usr/share/themes/Chicago95/gtk-2.0/.`
-2. You will see a file named `panel.rc` and another one named `panel.rc.alt`. Rename `panel.rc` to `panel.rc.bak`. Then rename `panel.rc.alt` to `panel.rc`.
-3. Open the properties menu of either Whisker Menu or Application Menu and change the icon. The Start Button is located in the following directory: `~/.themes/Chicago95/gtk-2.0/panel` or `/usr/share/themes/Chicago95/gtk-2.0/panel.` Select the file name `start-button_windows` or `start-button_tux.`
-4. The icon will appear crunched. Log out and log back in or run `xfce4-panel -r` to reset the panel interface. The icon should appear a regular size.
-
-### Pulse Audio Icon Fix
-Copy the `pulseaudio_fix.css` file from the `Extras\gtk-3.0 Override` directory into `/home/$USER/.config/gtk-3.0/` (This will fix the oversized pulse audio button and battery icon in the panel.)
-
-Next, execute the following command as a regular user to import the pulseaudio fix:
-
-`echo "@import url(\"pulseaudio_fix.css\");" >> /home/$USER/.config/gtk-3.0/gtk.css`
-
-### Setting up the panel
-
-1. Panel 1. Horizontal, 32px high ONLY, and 100% Length. Currently no proper vertical panel support so below or above only. (Make sure you set the background style to "None" so that it inherits the theme style.)
-2. Application Menu; 
-3. Separator (Handle Style); 
-4. Custom Launcher, Custom Launcher, Custom Launcher, etc. (Try using 16px icons for the launchers.)
-5. “Show Desktop” plugin; 
-6. Separator (Handle Style); 
-7. Window Buttons (Sorting Order: Timestamp and Window Grouping is Always. Uncheck “Show Handle” if it’s enabled.); 
-8. Separator (Transparent with Expanding); 
-9. Separator (Handle Style); 
-10. Notification Area (19px max icon size); 
-11. PulseAudio Plugin (Uncheck mark "Show Notifications when volume changes." it will conflict with XFCE notifiyd by making duplicate volume notifications); 
-12. Separator (Transparent); 
-13. Orage Panel Clock. ( In settings, enable check box “Show frame” and replace the text in “Line 1” with %I:%M %p.)
-
-### Shadows
-Disable shadows in compositing for an authentic appearance, or at the very least disable “show shadows under dock windows” to prevent dark shading from the panel bar overlapping onto maximized applications.
-
-### Install tweaked icons
-
-For the icon theme, I made a small adjustment that replaces the MS Windows logos with tux penguins. You can install this if you want. To install it, copy the `Chicago95-tux` directory into “/home/$USER/.icons.”
-
-### Notification baloon theme
-To set the notification theme, open the system notification settings manager (xfce4-notifyd-config) and in the "Theme" option select Chicago95 in the pull down menu.
-
-
-## Requirements
-
-GTK+ 3.22 or above
-
-Xfce 4.12 of above
-
-(preferred distro is Xubuntu)
 
 ### Code and license
-
 License: GPL-3.0+/MIT

Screenshots/SCREENSHOTS.md

@@ -0,0 +1,27 @@
+## Screenshots
+
+#### Windows 95 Plymouth boot screen
+![alt text](plymouth.gif "Windows95 Plymouth Boot Splash")
+
+#### RetroTux Plymouth boot screen
+![alt text](retrotux.png "RetroTux Plymouth Boot Splash")
+
+#### LightDM login manager theme
+![alt text](lightdm_theme.png "LightDM")
+
+#### Desktop screenshots
+![alt text](Desktop0.png "Desktop")
+
+![alt text](Desktop1.png "Desktop1")
+
+![alt text](Desktop2.png "Desktop2")
+
+![alt text](Desktop3.png "Desktop3")
+
+![alt text](Desktop4.png "Desktop4")
+
+#### Widget Factory screenshots
+
+![alt text](awf-gtk2.png "awf-gtk2")
+
+![alt text](awf-gtk3.png "awf-gtk3")

Theme/Chicago95/gtk-2.0/button.rc

@@ -1,77 +1,11 @@
 style "button" = "default"
 {
 
-xthickness = 10
-ythickness = 10
-
-engine "pixmap"
-{
-
-	image
-	{
-		function	= BOX
-		recolorable	= TRUE
-		detail		= "buttondefault"
-		file		= "/button/button-default.png"
-		border		= { 4 ,4 , 4 ,4}
-		stretch		= TRUE
-	}
-
-	image
-	{
-		function	= BOX
-		state		= NORMAL
-		file		= "/button/button-default.png"
-		border		= { 4 ,4 , 4 ,4}
-		stretch		= TRUE
-	}
-
-	image
-	{
-		function	= BOX
-		recolorable	= TRUE
-		state		= PRELIGHT
-		shadow		= OUT
-		file		= "/button/button-default.png"
-		border		= { 4 ,4 , 4 ,4}
-		stretch		= TRUE
-	}
-
-	image
-	{
-		function	= BOX
-		recolorable	= TRUE
-		state		= PRELIGHT
-		shadow		= IN
-		file		= "/button/button-active.png"
-		border		= { 4 ,4 , 4 ,4}
-		stretch		= TRUE
-	}
-
-	image
-	{
-		function	= BOX
-		state		= INSENSITIVE
-		file		= "/button/button-default.png"
-		border		= { 4 ,4 , 4 ,4}
-		stretch		= TRUE
-	}
-
-
-	image
-	{
-		function	= BOX
-		state		= ACTIVE
-		file		= "/button/button-active.png"
-		border		= { 4 ,4 , 4 ,4}
-		stretch		= TRUE
-	}
+xthickness = 4
+ythickness = 4
 
 
 }
 
-}
-
-class "GtkToolBar"				style "button"
-
-#class "GtkButton"      				style "button"
+#class "GtkToolBar"				style "button"
+widget_class "*GtkButton"      				style "button"

Theme/Chicago95/gtk-2.0/gtkrc

@@ -17,7 +17,7 @@ gtk-icon-sizes = "mini-commander-icon=32,32:print-manager=32,32:panel-button=32,
 style "standard-default"
 {
   GtkWidget::interior_focus = 2
-  GtkButton::default_border = { 1, 1, 1, 1 }
+  GtkButton::default_border = { 0, 0, 0, 0 }
   GtkButton::default_outside_border = { 0, 0, 0, 0 }
   GtkOptionMenu::indicator_size = { 9, 5 }
   GtkOptionMenu::indicator_spacing = { 7, 5, 2, 2 }
@@ -518,7 +518,7 @@ widget "gtk-tooltip*" style "gnome-color-chooser-tooltips"
 # Desktop shortcut icon style & text shadow
 style "xfdesktop-icon-view" {
   XfdesktopIconView::label-radius = 0.99
-  XfdesktopIconView::label-alpha = 0
+  XfdesktopIconView::label-alpha = 255
   XfdesktopIconView::selected-label-alpha = 255
 #  XfdesktopIconView::shadow-x-offset = 1				#Enable these if you want a shadow behind text
 #  XfdesktopIconView::shadow-y-offset = 1				#Enable these if you want a shadow behind text
@@ -529,10 +529,16 @@ style "xfdesktop-icon-view" {
 #  XfdesktopIconView::shadow-blur-radius = 2				#Enable this if you want a a blurry shadow behind text
   XfdesktopIconView::cell-spacing = 5
   XfdesktopIconView::cell-padding = 0
-  XfdesktopIconView::cell-text-width-proportion = 2
+  XfdesktopIconView::cell-color = "#c0c0c0"
+  XfdesktopIconView::cell-text-width-proportion = 2.4
+  XfdesktopIconView::ellipsize-icon-labels = 0
 
-  fg[NORMAL] = @selected_fg_color
-  fg[ACTIVE] = @selected_fg_color
+  base[NORMAL] = "#008081"		#This is the desktop icon label background colour.
+  base[SELECTED] = @selected_bg_color	#This is the desktop icon label background colour selected state.
+  base[ACTIVE] = @selected_bg_color	#This is the desktop icon label background colour active state.
+  fg[NORMAL] = @selected_fg_color	#This is the desktop icon label TEXT colour state.
+  fg[SELECTED] = @selected_fg_color	#This is the desktop icon label TEXT colour selected state.
+  fg[ACTIVE] = @selected_fg_color	#This is the desktop icon label TEXT colour active state.
 
 }
 
@@ -559,6 +565,13 @@ style "frame"
 
 class "GtkFrame"	                style "frame"
 
+style "my-launchers"
+{
+    xthickness = 7
+    ythickness = 7
+}
+widget "*launcher*" style "my-launchers"
+
 include "tabwin.rc"
 include "panel.rc"
 include "scrollbar.rc"
@@ -569,3 +582,4 @@ include "slider.rc"
 include "toolbutton.rc"
 include "tabs.rc"
 include "menubar.rc"
+include "button.rc"

Theme/Chicago95/gtk-2.0/panel.rc

@@ -69,7 +69,7 @@ style "panel"
 		state				= ACTIVE
 		file            		= "panel/panel-button-active.png"
 		border          		= { 5, 5, 5, 5 }
-		stretch         		= TRUE
+		stretch         		= FALSE
 	}  
 
 	image
@@ -89,7 +89,7 @@ style "panel"
 		state				= SELECTED
 		file            		= "panel/panel-button-active.png"
 		border          		= { 5, 5, 5, 5 }
-		stretch         		= TRUE
+		stretch         		= FALSE
 	}  
 
 
@@ -124,7 +124,7 @@ class "*BonoboDockItem" 		style "panel"
 widget "*TrayIcon*" 			style "panel"
 class "*Panel*Applet*" 			style "panel"
 widget_class "*Panel*GtkToggleButton" 	style "panel"
-widget_class "*Panel*GtkButton" 	style "panel"
+#widget_class "*Panel*GtkButton" 	style "panel"
 widget_class "*.Panel*Button*GtkLabel" 	style "panel"
 widget_class "*.Panel*GtkLabel" 	style "panel"
 widget "*PanelWidget*" 			style "panel"
@@ -141,14 +141,54 @@ widget_class "*Netstatus*" 		style "panel"
 widget_class "*Tomboy*Tray*" 		style "panel"
 widget "*fast-user-switch*" 		style "panel"
 widget_class "*PanelToplevel*" 		style "panel"
-class "Xfce*Panel*" 			style "panel"
-widget_class "*Xfce*Panel*" 		style "panel"
+
+
 widget_class "*PanelApplet*" 		style "panel"
 widget_class "*PanelWidget*" 		style "panel"
 widget_class "*computertemp*"     style "panel"
 widget_class "*Applet*Tomboy*"    style "panel"
 widget_class "*Applet*Netstatus*" style "panel"
 
+#############################################################
+
+style "launcher"
+{
+xthickness            			= 5
+ythickness            			= 5
+
+#GtkWidget::focus_padding 		= 2
+
+engine "pixmap" {
+
+	image
+	{
+		function        		= BOX
+		recolorable     		= TRUE
+		state				= ACTIVE
+		file            		= "panel/launcher-button-active.png"
+		border          		= { 5, 5, 5, 5 }
+		stretch         		= TRUE
+	}  
+
+	image
+	{
+		function        		= BOX
+		shadow				= OUT
+		recolorable     		= TRUE
+		state				= PRELIGHT
+		file            		= "panel/panel-bg.png"
+		border          		= { 5, 5, 5, 5 }
+		stretch         		= TRUE
+	}
+}
+}
+#############################################################
+#Affects XFCE Launcher icons on the panel.
+#############################################################
+widget_class "*Xfce*Panel*" 		style "launcher"
+class "Xfce*Panel*" 			style "panel"
+#############################################################
+
 #############################################################
 #THIS MAKES THE APPLICATIONS PLACES SYSTEM MENU ON THE PANEL
 #USE PANEL STYLE
@@ -212,7 +252,7 @@ engine "pixmap"
 
 style "panelbuttons"
 {
-        xthickness            			= 5
+        xthickness            			= 4
         ythickness            			= 2
 
 	GtkWidget::focus_padding 		= 2
@@ -305,10 +345,10 @@ widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "panelbuttons"
 
 style "paneltogglebuttons"
 {
- xthickness            			= 5
- ythickness            			= 2
+xthickness            			= 4
+ythickness            			= 2
 
-	GtkWidget::focus_padding = 2
+	#GtkWidget::focus_padding = 2
 
 	engine "pixmap" {
       
@@ -318,7 +358,7 @@ style "paneltogglebuttons"
 		recolorable     		= TRUE
 		state				= NORMAL
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}
 		
@@ -329,7 +369,7 @@ style "paneltogglebuttons"
 		recolorable     		= TRUE
 		state				= PRELIGHT
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}		
 
@@ -340,7 +380,7 @@ style "paneltogglebuttons"
 		shadow				= IN
 		state				= PRELIGHT
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}
 		
@@ -350,8 +390,8 @@ style "paneltogglebuttons"
 		function        		= BOX
 		recolorable     		= TRUE
 		state				= ACTIVE
-		file            		= "panel/panel-button-active.png"
-		border          		= { 3, 3, 3, 3 }
+		file            		= "panel/launcher-button-active.png"
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}  
 
@@ -361,7 +401,7 @@ style "paneltogglebuttons"
 		recolorable     		= TRUE
 		state				= INSENSITIVE
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	} 
 
@@ -371,7 +411,7 @@ style "paneltogglebuttons"
 		recolorable     		= TRUE
 		state				= SELECTED
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}  
 
@@ -384,17 +424,16 @@ widget_class "*Panel*GtkToggleButton" 		style "paneltogglebuttons"
 
 style "whiskerbutton"
 {
- xthickness            			= 5
- ythickness            			= 2
-
-	GtkWidget::focus_padding = 2
-
-	engine "pixmap" {
+ xthickness            			= 0
+ ythickness            			= 0
+ GtkWidget::focus_padding = 1
+ engine "pixmap" 
+	{
         image
 	{
 		function			= BOX
 		detail				= "buttondefault"
-		file				= "panel/panel-bg.png"
+		file				= "Others/null.png"
 		stretch				= TRUE
 	}
 
@@ -403,8 +442,8 @@ style "whiskerbutton"
 		function        		= BOX
 		recolorable     		= TRUE
 		state				= NORMAL
-		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		file            		= "Others/null.png"
+		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}
 		
@@ -414,8 +453,8 @@ style "whiskerbutton"
 		shadow				= OUT
 		recolorable     		= TRUE
 		state				= PRELIGHT
-		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		file            		= "Others/null.png"
+		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}		
 
@@ -425,8 +464,8 @@ style "whiskerbutton"
 		recolorable     		= TRUE
 		shadow				= IN
 		state				= PRELIGHT
-		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		file            		= "panel/start-button-shade.png" #Sets a backdrop colour. 
+		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}
 		
@@ -436,8 +475,8 @@ style "whiskerbutton"
 		function        		= BOX
 		recolorable     		= TRUE
 		state				= ACTIVE
-		file            		= "panel/start.png"
-		border          		= { 3, 3, 3, 3 }
+		file            		= "panel/start-button-shade.png" #Sets a backdrop colour. 
+		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}  
 
@@ -446,8 +485,8 @@ style "whiskerbutton"
 		function        		= BOX
 		recolorable     		= TRUE
 		state				= INSENSITIVE
-		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		file            		= "Others/null.png"
+		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	} 
 
@@ -456,16 +495,14 @@ style "whiskerbutton"
 		function        		= BOX
 		recolorable     		= TRUE
 		state				= SELECTED
-		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		file            		= "Others/null.png"
+		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}  
-
+	}
 }
-
-}
-
-widget "whiskermenu-button*" style "whiskerbutton"
+widget "*applicationmenu-button" style "whiskerbutton" #for the application menu button.
+widget "*whiskermenu-button" style "whiskerbutton" #for Whisker menu button.
 #widget "*Xfce*Panel*isker" style "whiskerbutton"
 
 

Theme/Chicago95/gtk-2.0/panel.rc(ALT)

@@ -69,7 +69,7 @@ style "panel"
 		state				= ACTIVE
 		file            		= "panel/panel-button-active.png"
 		border          		= { 5, 5, 5, 5 }
-		stretch         		= TRUE
+		stretch         		= FALSE
 	}  
 
 	image
@@ -89,7 +89,7 @@ style "panel"
 		state				= SELECTED
 		file            		= "panel/panel-button-active.png"
 		border          		= { 5, 5, 5, 5 }
-		stretch         		= TRUE
+		stretch         		= FALSE
 	}  
 
 
@@ -124,7 +124,7 @@ class "*BonoboDockItem" 		style "panel"
 widget "*TrayIcon*" 			style "panel"
 class "*Panel*Applet*" 			style "panel"
 widget_class "*Panel*GtkToggleButton" 	style "panel"
-widget_class "*Panel*GtkButton" 	style "panel"
+#widget_class "*Panel*GtkButton" 	style "panel"
 widget_class "*.Panel*Button*GtkLabel" 	style "panel"
 widget_class "*.Panel*GtkLabel" 	style "panel"
 widget "*PanelWidget*" 			style "panel"
@@ -141,14 +141,54 @@ widget_class "*Netstatus*" 		style "panel"
 widget_class "*Tomboy*Tray*" 		style "panel"
 widget "*fast-user-switch*" 		style "panel"
 widget_class "*PanelToplevel*" 		style "panel"
-class "Xfce*Panel*" 			style "panel"
-widget_class "*Xfce*Panel*" 		style "panel"
+
+
 widget_class "*PanelApplet*" 		style "panel"
 widget_class "*PanelWidget*" 		style "panel"
 widget_class "*computertemp*"     style "panel"
 widget_class "*Applet*Tomboy*"    style "panel"
 widget_class "*Applet*Netstatus*" style "panel"
 
+#############################################################
+
+style "launcher"
+{
+xthickness            			= 5
+ythickness            			= 5
+
+#GtkWidget::focus_padding 		= 2
+
+engine "pixmap" {
+
+	image
+	{
+		function        		= BOX
+		recolorable     		= TRUE
+		state				= ACTIVE
+		file            		= "panel/launcher-button-active.png"
+		border          		= { 5, 5, 5, 5 }
+		stretch         		= TRUE
+	}  
+
+	image
+	{
+		function        		= BOX
+		shadow				= OUT
+		recolorable     		= TRUE
+		state				= PRELIGHT
+		file            		= "panel/panel-bg.png"
+		border          		= { 5, 5, 5, 5 }
+		stretch         		= TRUE
+	}
+}
+}
+#############################################################
+#Affects XFCE Launcher icons on the panel.
+#############################################################
+widget_class "*Xfce*Panel*" 		style "launcher"
+class "Xfce*Panel*" 			style "panel"
+#############################################################
+
 #############################################################
 #THIS MAKES THE APPLICATIONS PLACES SYSTEM MENU ON THE PANEL
 #USE PANEL STYLE
@@ -212,7 +252,7 @@ engine "pixmap"
 
 style "panelbuttons"
 {
-        xthickness            			= 5
+        xthickness            			= 4
         ythickness            			= 2
 
 	GtkWidget::focus_padding 		= 2
@@ -305,10 +345,10 @@ widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "panelbuttons"
 
 style "paneltogglebuttons"
 {
- xthickness            			= 5
- ythickness            			= 2
+xthickness            			= 4
+ythickness            			= 2
 
-	GtkWidget::focus_padding = 2
+	#GtkWidget::focus_padding = 2
 
 	engine "pixmap" {
       
@@ -318,7 +358,7 @@ style "paneltogglebuttons"
 		recolorable     		= TRUE
 		state				= NORMAL
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}
 		
@@ -329,7 +369,7 @@ style "paneltogglebuttons"
 		recolorable     		= TRUE
 		state				= PRELIGHT
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}		
 
@@ -340,7 +380,7 @@ style "paneltogglebuttons"
 		shadow				= IN
 		state				= PRELIGHT
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}
 		
@@ -350,8 +390,8 @@ style "paneltogglebuttons"
 		function        		= BOX
 		recolorable     		= TRUE
 		state				= ACTIVE
-		file            		= "panel/panel-button-active.png"
-		border          		= { 3, 3, 3, 3 }
+		file            		= "panel/launcher-button-active.png"
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}  
 
@@ -361,7 +401,7 @@ style "paneltogglebuttons"
 		recolorable     		= TRUE
 		state				= INSENSITIVE
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	} 
 
@@ -371,7 +411,7 @@ style "paneltogglebuttons"
 		recolorable     		= TRUE
 		state				= SELECTED
 		file            		= "panel/panel-bg.png"
-		border          		= { 3, 3, 3, 3 }
+		border          		= { 5, 5, 5, 5 }
 		stretch         		= TRUE
 	}  
 
@@ -424,7 +464,7 @@ style "whiskerbutton"
 		recolorable     		= TRUE
 		shadow				= IN
 		state				= PRELIGHT
-		file            		= "panel/start-button-shade.png" #Sets a backdrop colour.
+		file            		= "panel/null.png" 
 		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}
@@ -435,7 +475,7 @@ style "whiskerbutton"
 		function        		= BOX
 		recolorable     		= TRUE
 		state				= ACTIVE
-		file            		= "panel/start-button-shade.png" #Sets a backdrop colour.
+		file            		= "panel/null.png
 		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}  

Theme/Chicago95/gtk-2.0/slider.rc

@@ -9,7 +9,7 @@ style "range"
       function			= BOX
       detail			= "trough"
       file			= "Range/trough-horizontal.png"
-      border			= { 0, 0, 0, 0 }
+      border			= { 0, 0, 21, 0 }
       stretch			= TRUE
       orientation		= HORIZONTAL
     }	
@@ -18,7 +18,7 @@ style "range"
       function			= BOX
       detail			= "trough"
       file			= "Range/trough-vertical.png"
-      border			= { 0, 0, 0, 0 }
+      border			= { 21, 0, 0, 0 }
       stretch			= TRUE
       orientation		= VERTICAL
     }

Theme/Chicago95/gtk-2.0/tabs.rc

@@ -17,7 +17,7 @@ engine "pixmap"
 		gap_side	= BOTTOM
 		file		= "/tabs/tab-top-active.png"
 		stretch		= TRUE
-		border		= { 2 ,2 ,2 ,2}
+		border		= { 4 ,4 ,4 ,4}
 	}
 
 	image
@@ -27,7 +27,7 @@ engine "pixmap"
 		gap_side	= BOTTOM
 		file		= "/tabs/tab-top.png"
 		stretch		= TRUE
-		border		= { 4 ,4 ,4 ,4}
+		border		= { 8 ,8 ,8 ,8}
 	}
 
 
@@ -48,7 +48,7 @@ engine "pixmap"
 		gap_side	= TOP
 		file		= "/tabs/tab-bottom.png"
 		stretch		= TRUE
-		border		= { 2 ,2 ,2 ,2}
+		border		= { 8 ,8 ,8 ,8}
 	}
 
 	image
@@ -56,26 +56,6 @@ engine "pixmap"
 		function	= EXTENSION
 		state		= NORMAL
 		gap_side	= LEFT
-		file		= "/tabs/tab-left-active.png"
-		stretch		= TRUE
-		border		= { 4 ,4 ,4 ,4}
-	}
-
-	image
-	{
-		function	= EXTENSION
-		state		= ACTIVE
-		gap_side	= LEFT
-		file		= "/tabs/tab-left.png"
-		stretch		= TRUE
-		border		= { 2 ,2 ,2 ,2}
-	}
-
-	image
-	{
-		function	= EXTENSION
-		state		= NORMAL
-		gap_side	= RIGHT
 		file		= "/tabs/tab-right-active.png"
 		stretch		= TRUE
 		border		= { 4 ,4 ,4 ,4}
@@ -85,10 +65,30 @@ engine "pixmap"
 	{
 		function	= EXTENSION
 		state		= ACTIVE
-		gap_side	= RIGHT
+		gap_side	= LEFT
 		file		= "/tabs/tab-right.png"
 		stretch		= TRUE
-		border		= { 2 ,2 ,2 ,2}
+		border		= { 4 ,4 ,4 ,4}
+	}
+
+	image
+	{
+		function	= EXTENSION
+		state		= NORMAL
+		gap_side	= RIGHT
+		file		= "/tabs/tab-left-active.png"
+		stretch		= TRUE
+		border		= { 4 ,4 ,4 ,4}
+	}
+
+	image
+	{
+		function	= EXTENSION
+		state		= ACTIVE
+		gap_side	= RIGHT
+		file		= "/tabs/tab-left.png"
+		stretch		= TRUE
+		border		= { 4 ,4 ,4 ,4}
 	}
 
 

Theme/Chicago95/gtk-3.0/apps/filechooser.css

@@ -0,0 +1,50 @@
+/* File Chooser */
+
+
+filechooser box paned placessidebar viewport list {
+    background-color: white;
+}
+
+
+filechooser box paned box box stack placesview stack frame scrolledwindow viewport list {
+    border: 1px solid;
+}
+
+filechooser box paned box revealer box stack box widget button {
+padding-top: 1px;
+padding-bottom: 1px;
+padding-left: 5px;
+padding-right: 5px;
+}
+
+filechooser box paned box revealer box stack box treeview {
+border-left: 2px solid black;
+}
+
+filechooser box paned placessidebar viewport list separator {
+    border-top: 1px solid #808080;
+    border-bottom: 1px solid white;
+}
+
+filechooser placessidebar viewport list {
+    background-color: white;
+}
+
+filechooser placessidebar viewport separator {
+    border-top: 1
+}
+
+dialog box box filechooser box  paned box box stack box scrolledwindow{
+border-left: 1px solid @bg_shade;
+border-top: 1px solid @bg_shade;
+border-right: 1px solid white;
+border-bottom: 1px solid white;
+box-shadow: inset -1px -1px @bg_shade,
+                     inset 1px 1px white;
+margin: 0px;
+}
+
+dialog box box filechooser box paned placessidebar viewport {
+border: none;
+box-shadow: none;
+}

Theme/Chicago95/gtk-3.0/apps/whiskermenu.css

@@ -0,0 +1,29 @@
+/* Whisker Menu Button style */
+
+#whiskermenu-button {
+    padding: 2px;
+    margin: 2px;
+    border-top: 1px solid #FFFFFF;
+    border-bottom: 1px solid #000000;
+    border-left: 1px solid #FFFFFF;
+    border-right: 1px solid #000000;
+    box-shadow: inset -1px -1px #808080;
+    background-color: #c0c0c0;
+}
+
+#whiskermenu-button:active,
+#whiskermenu-button:checked {
+    padding-left: 3px;
+    padding-right: 1px;
+    margin: 2px;
+    border-bottom: 1px solid #FFF;
+    border-right: 1px solid #FFF;
+    border-top: 1px solid #000000;
+    border-left: 1px solid #000000;
+    box-shadow: inset -1px -1px #c0c0c0,
+                inset 1px 1px #808080;
+    background-color: pink;
+    background: url("../assets/backdrop.png");
+    background-repeat: no-repeat;
+    border-radius: 0px;
+}

Theme/Chicago95/gtk-3.0/apps/xfce.css

@@ -1,3 +1,5 @@
+/* Panel buttons */
+
 XfceHeading {
     margin: 0;
     padding: 0;
@@ -8,25 +10,45 @@ XfceHeading {
 }
 
 .xfce4-panel {
-    background-color: @panel_bg_color;
+    background-color: #c0c0c0;
     color: @panel_fg_color;
-    font: normal;
     border: 0px;
     box-shadow: 0 0 0;
 }
 
-.xfce4-panel .button:hover,
-.xfce4-panel .button:active:hover,
-.xfce4-panel .button:active, 
-.xfce4-panel .button {
-    padding: 0 8px;
+.xfce4-panel button {
+    padding: 2px;
+    margin: 2px;
     border-radius: 0;
-    border: 0px;
-    border-style: none;
+    border: 1px solid transparent;
     color: @panel_fg_color;
     box-shadow: 0 0 0;
 }
 
-.xfce4-panel .menu {
-    -gtk-image-effect: none;
+.xfce4-panel button:hover {
+    padding: 2px;
+    margin: 2px;
+    border-top: 1px solid #c0c0c0;
+    border-bottom: 1px solid #000000;
+    border-left: 1px solid #c0c0c0;
+    border-right: 1px solid #000000;
+    box-shadow: inset 1px 1px #FFFFFF,
+                inset -1px -1px #808080;
+    background-color: #c0c0c0;
+}
+
+.xfce4-panel button:active,
+.xfce4-panel button:checked {
+    padding: 2px;
+    margin: 2px;
+    border-top: 1px solid #000000;
+    border-bottom: 1px solid #FFF;
+    border-left: 1px solid #000000;
+    border-right: 1px solid #FFF;
+    box-shadow: inset 1px 1px #808080;
+    background-color: #c0c0c0;
+}
+
+.xfce4-panel menu {
+    -gtk-icon-effect: none;
 }