diff --git a/Theme/Chicago95/gtk-2.0/menu_item.rc b/Theme/Chicago95/gtk-2.0/menu_item.rc
index c3de04d..a5e44b2 100644
--- a/Theme/Chicago95/gtk-2.0/menu_item.rc
+++ b/Theme/Chicago95/gtk-2.0/menu_item.rc
@@ -1,7 +1,7 @@
 style "menu_item"
 {
-	xthickness	= 2
-	ythickness	= 3
+	xthickness	= 0
+	ythickness	= 0
 
         # HACK: Gtk doesn't actually read this value
         # while rendering the menu items, but Libreoffice
@@ -195,4 +195,4 @@ style "menu_item"
 
 
 widget_class "*<GtkMenuItem>*"			style "menu_item"
-#class "GtkMenu" style "menu_item"
\ No newline at end of file
+#class "GtkMenu" style "menu_item"
diff --git a/Theme/Chicago95/gtk-3.0/apps/lightdm-gtk-greeter.css b/Theme/Chicago95/gtk-3.0/apps/lightdm-gtk-greeter.css
index 874cdb3..0990e1a 100644
--- a/Theme/Chicago95/gtk-3.0/apps/lightdm-gtk-greeter.css
+++ b/Theme/Chicago95/gtk-3.0/apps/lightdm-gtk-greeter.css
@@ -2,12 +2,10 @@
  * panel *
  *********/
 #panel_window {
-    background-color: transparent;
+    background-color: #008080;
     background-image: none;
     color: white;
     font: bold;
-    text-shadow: 0 1px alpha(black, 0.5);
-    icon-shadow: 0 1px alpha(black, 0.5);
 }
 
 #panel_window .menubar,
diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
index 7c52233..f867fab 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
@@ -667,11 +667,14 @@ GtkTreeView.view.expander:dir(rtl) {
     padding: 1px;
     border: 1px solid black;
     /* background-color: #808080; */
+    box-shadow: 0 0 0;
     color: @theme_fg_color;
 }
 
 .list-row {
-   padding: 0;
+   padding: 2px;
+   box-shadow: 0 0 0;
+   border: 1px solid #c0c0c0;
 }
 
 .list-row:selected {
@@ -2597,7 +2600,7 @@ GtkColorButton.button {
 
 
 .tooltip * {
-    background-color: transparent;
+    background-color: @theme_tooltip_bg_color;
 }
 
 /************
@@ -3200,6 +3203,11 @@ GtkBubbleWindow .toolbar {
     margin: 2px;
 }
 
+.window-frame {
+    border-radius: 0 0 0 0;
+    box-shadow: none;
+}
+
 /* Server-side decoration (SSD) */
 .window-frame.ssd {
     border-radius: 0 0 0 0;
@@ -3228,8 +3236,10 @@ GtkBubbleWindow .toolbar {
      box-shadow: none; 
 }
 
-GtkWindow.csd {
+GtkWindow.csd,
+GtkWindows.ssd {
     padding: 4px;
+    border-radius: 0;
     border-width: 0px 1px 1px 1px;
     border-style: solid;
     border-color: #c0c0c0 #000 #000 #c0c0c0;
diff --git a/Theme/Chicago95/index.theme b/Theme/Chicago95/index.theme
new file mode 100644
index 0000000..ee9c0d9
--- /dev/null
+++ b/Theme/Chicago95/index.theme
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Chicago95
+Type=X-GNOME-Metatheme
+Comment=A theme with Windows from 1995.
+
+[X-GNOME-Metatheme]
+GtkTheme=Chicago95
+MetacityTheme=Chicago95
+IconTheme=Chicago95
+CursorTheme=Chicago95_Cursor_White
+CursorSize=32
diff --git a/Theme/Chicago95/metacity-1/close_normal.png b/Theme/Chicago95/metacity-1/close_normal.png
new file mode 100644
index 0000000..51df427
Binary files /dev/null and b/Theme/Chicago95/metacity-1/close_normal.png differ
diff --git a/Theme/Chicago95/metacity-1/close_normal_small.png b/Theme/Chicago95/metacity-1/close_normal_small.png
new file mode 100644
index 0000000..7c87b0a
Binary files /dev/null and b/Theme/Chicago95/metacity-1/close_normal_small.png differ
diff --git a/Theme/Chicago95/metacity-1/close_pressed.png b/Theme/Chicago95/metacity-1/close_pressed.png
new file mode 100644
index 0000000..83a6d5f
Binary files /dev/null and b/Theme/Chicago95/metacity-1/close_pressed.png differ
diff --git a/Theme/Chicago95/metacity-1/close_pressed_small.png b/Theme/Chicago95/metacity-1/close_pressed_small.png
new file mode 100644
index 0000000..8523ba6
Binary files /dev/null and b/Theme/Chicago95/metacity-1/close_pressed_small.png differ
diff --git a/Theme/Chicago95/metacity-1/maximize_normal.png b/Theme/Chicago95/metacity-1/maximize_normal.png
new file mode 100644
index 0000000..f99a776
Binary files /dev/null and b/Theme/Chicago95/metacity-1/maximize_normal.png differ
diff --git a/Theme/Chicago95/metacity-1/maximize_pressed.png b/Theme/Chicago95/metacity-1/maximize_pressed.png
new file mode 100644
index 0000000..fb97a35
Binary files /dev/null and b/Theme/Chicago95/metacity-1/maximize_pressed.png differ
diff --git a/Theme/Chicago95/metacity-1/metacity-theme-1.xml b/Theme/Chicago95/metacity-1/metacity-theme-1.xml
new file mode 100644
index 0000000..a7596d1
--- /dev/null
+++ b/Theme/Chicago95/metacity-1/metacity-theme-1.xml
@@ -0,0 +1,343 @@
+<?xml version="1.0"?>
+<!--
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+// MA 02110-1301, USA.
+
+Notes
+	#d4d0c8 was replaced with gtk:bg[NORMAL]
+
+Notes: Modified from WinME theme by Perberos.
+
+-->
+<metacity_theme>
+	<info>
+		<name>Chicago 95</name>
+		<author>Grassmunk</author>
+		<copyright>&#194; 2007 Srivatsa Kanchi &lt;srivatsa_nk@dataone.in&gt;, 2010 Perberos</copyright>
+		<date>April 22, 2016</date>
+		<description>Windows 95 style theme</description>
+	</info>
+
+	<frame_geometry name="normal_geometry" has_title="true" rounded_top_left="false" rounded_top_right="false" title_scale="medium" rounded_bottom_left="false" rounded_bottom_right="false">
+		<distance name="left_width" value="4"/>
+		<distance name="right_width" value="4"/>
+		<distance name="bottom_height" value="4"/>
+		<distance name="left_titlebar_edge" value="5"/>
+		<distance name="right_titlebar_edge" value="6"/>
+		<distance name="title_vertical_pad" value="5"/>
+		<distance name="button_width" value="17"/>
+		<distance name="button_height" value="16"/>
+		<border name="title_border" left="0" right="0" top="4" bottom="0"/>
+		<border name="button_border" left="0" right="0" top="3" bottom="0"/>
+	</frame_geometry>
+
+	<frame_geometry name="borderless_geometry" has_title="true" rounded_top_left="false" rounded_top_right="false" title_scale="medium" rounded_bottom_left="false" rounded_bottom_right="false">
+		<distance name="left_width" value="0"/>
+		<distance name="right_width" value="0"/>
+		<distance name="bottom_height" value="0"/>
+		<distance name="left_titlebar_edge" value="1"/>
+		<distance name="right_titlebar_edge" value="2"/>
+		<distance name="title_vertical_pad" value="2"/>
+		<distance name="button_width" value="17"/>
+		<distance name="button_height" value="16"/>
+		<border name="title_border" left="0" right="0" top="0" bottom="0"/>
+		<border name="button_border" left="0" right="0" top="1" bottom="1"/>
+	</frame_geometry>
+
+	<frame_geometry name="utility_geometry" has_title="true" rounded_top_left="false" rounded_top_right="false" title_scale="small" rounded_bottom_left="false" rounded_bottom_right="false">
+		<distance name="left_width" value="3"/>
+		<distance name="right_width" value="3"/>
+		<distance name="bottom_height" value="3"/>
+		<distance name="left_titlebar_edge" value="4"/>
+		<distance name="right_titlebar_edge" value="4"/>
+		<distance name="title_vertical_pad" value="4"/>
+		<distance name="button_width" value="10"/>
+		<distance name="button_height" value="11"/>
+		<border name="title_border" left="0" right="0" top="4" bottom="2"/>
+		<border name="button_border" left="0" right="0" top="2" bottom="0"/>
+	</frame_geometry>
+
+	<frame_geometry name="border_geometry" has_title="false">
+		<distance name="left_width" value="0" />
+		<distance name="right_width" value="0" />
+		<distance name="bottom_height" value="0" />
+		<distance name="left_titlebar_edge" value="0" />
+		<distance name="right_titlebar_edge" value="0" />
+		<distance name="button_width" value="0"/>
+		<distance name="button_height" value="0"/>
+		<distance name="title_vertical_pad" value="0" />
+		<border name="title_border" left="0" right="0" top="0" bottom="0" />
+		<border name="button_border" left="0" right="0" top="0" bottom="0" />
+	</frame_geometry>
+
+	<frame_style name="normal_focused_style" geometry="normal_geometry">
+		<piece position="left_edge">
+			<draw_ops>
+				<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
+				<line color="#ffffff" x1="1" y1="0" x2="1" y2="height" width="1"/>
+			</draw_ops>
+		</piece>
+		<piece position="right_edge">
+			<draw_ops>
+				<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
+				<line color="#808080" x1="width-2" y1="0" x2="width-2" y2="height" width="1"/>
+				<line color="#000000" x1="width-1" y1="0" x2="width-1" y2="height" width="1"/>
+			</draw_ops>
+		</piece>
+		<piece position="bottom_edge">
+			<draw_ops>
+				<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
+				<line color="#808080" x1="1" y1="height-2" x2="width" y2="height-2" width="1"/>
+				<line color="#000000" x1="0" y1="height-1" x2="width" y2="height-1" width="1"/>
+				<line color="#ffffff" x1="1" y1="0" x2="1" y2="height-2" width="1"/>
+				<line color="#000000" x1="width-1" y1="0" x2="width-1" y2="height" width="1"/>
+				<line color="#808080" x1="width-2" y1="0" x2="width-2" y2="height-2" width="1"/>
+			</draw_ops>
+		</piece>
+		<piece position="titlebar">
+			<draw_ops>
+				<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
+				<line color="#ffffff" x1="1" y1="1" x2="1" y2="height" width="1"/>
+				<line color="#ffffff" x1="1" y1="1" x2="width-2" y2="1" width="1"/>
+				<line color="#000000" x1="width-1" y1="0" x2="width-1" y2="height" width="1"/>
+				<line color="#808080" x1="width-2" y1="1" x2="width-2" y2="height" width="1"/>
+                <rectangle color="gtk:bg[SELECTED]" x="4" y="4" width="width-8" height="height-5" filled="true"/>
+			</draw_ops>
+		</piece>
+
+		<button function="close" state="normal">
+			<draw_ops>
+				<image filename="close_normal.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="close" state="pressed">
+			<draw_ops>
+				<image filename="close_pressed.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="maximize" state="normal">
+			<draw_ops>
+				<image filename="maximize_normal.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="maximize" state="pressed">
+			<draw_ops>
+				<image filename="maximize_pressed.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="minimize" state="normal">
+			<draw_ops>
+				<image filename="minimize_normal.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="minimize" state="pressed">
+			<draw_ops>
+				<image filename="minimize_pressed.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="menu" state="normal">
+			<draw_ops>
+			  <icon x="1" y="0" width="16" height="16"/>
+			</draw_ops>
+		</button>
+		<button function="menu" state="pressed">
+			<draw_ops>
+			  <icon x="1" y="0" width="16" height="16"/>
+			</draw_ops>
+		</button>
+		<piece position="title">
+			<draw_ops>
+				<title x="3" y="2" color="#ffffff"/>
+			</draw_ops>
+		</piece>
+	</frame_style>
+
+	<frame_style name="normal(maximized)_focused_style" geometry="borderless_geometry" parent="normal_focused_style">
+		<piece position="titlebar">
+			<draw_ops>
+                <rectangle color="gtk:bg[SELECTED]" x="0" y="0" width="width-0" height="height-0" filled="true"/>
+			</draw_ops>
+		</piece>
+		<button function="maximize" state="normal">
+
+			<draw_ops>
+				<image filename="restore_normal.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="maximize" state="pressed">
+			<draw_ops>
+				<image filename="restore_pressed.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+	</frame_style>
+
+	<frame_style name="normal_unfocused_style" geometry="normal_geometry" parent="normal_focused_style">
+		<piece position="titlebar">
+			<draw_ops>
+				<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
+				<line color="#ffffff" x1="1" y1="1" x2="1" y2="height" width="1"/>
+				<line color="#ffffff" x1="1" y1="1" x2="width-2" y2="1" width="1"/>
+				<line color="#000000" x1="width-1" y1="0" x2="width-1" y2="height" width="1"/>
+				<line color="#808080" x1="width-2" y1="1" x2="width-2" y2="height" width="1"/>
+                <rectangle color="#808080" x="4" y="4" width="width-8" height="height-5" filled="true"/>
+			</draw_ops>
+		</piece>
+		<piece position="title">
+			<draw_ops>
+				<title x="3" y="2" color="gtk:bg[NORMAL]"/>
+			</draw_ops>
+		</piece>
+	</frame_style>
+
+	<frame_style name="normal(maximized)_unfocused_style" geometry="borderless_geometry" parent="normal_unfocused_style">
+		<piece position="titlebar">
+			<draw_ops>
+                <rectangle color="#808080" x="0" y="0" width="width-0" height="height-0" filled="true"/>
+			</draw_ops>
+		</piece>
+		<button function="maximize" state="normal">
+			<draw_ops>
+				<image filename="restore_normal.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+	</frame_style>
+
+	<frame_style name="utility_focused_style" geometry="utility_geometry">
+		<piece position="entire_background">
+			<draw_ops>
+				<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
+				<rectangle color="#ffffff" x="1" y="1" width="width-3" height="height-3" filled="false"/>
+				<line color="#808080" x1="width-2" y1="1" x2="width-2" y2="height-3"/>
+				<line color="#808080" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
+				<line color="#000000" x1="width-1" y1="0" x2="width-1" y2="height-1"/>
+				<line color="#808080" x1="0" y1="height-1" x2="width-1" y2="height-1"/>
+			</draw_ops>
+		</piece>
+
+		<piece position="titlebar">
+			<draw_ops>
+                <rectangle color="gtk:bg[SELECTED]" x="4" y="4" width="width-8" height="height-5" filled="true"/>
+			</draw_ops>
+		</piece>
+		<button function="menu" state="normal"><draw_ops/></button>
+		<button function="menu" state="pressed"><draw_ops/></button>
+
+		<piece position="title">
+			<draw_ops>
+				<title x="3" y="2" color="#ffffff"/>
+			</draw_ops>
+		</piece>
+
+		<button function="close" state="normal">
+			<draw_ops>
+				<image filename="close_normal_small.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="close" state="pressed">
+			<draw_ops>
+				<image filename="close_pressed_small.png" x="0" y="0" width="width" height="height"/>
+			</draw_ops>
+		</button>
+		<button function="maximize" state="normal"><draw_ops/></button>
+		<button function="maximize" state="pressed"><draw_ops/></button>
+		<button function="minimize" state="normal"><draw_ops/></button>
+		<button function="minimize" state="pressed"><draw_ops/></button>
+	</frame_style>
+
+	<frame_style name="utility_unfocused_style" geometry="utility_geometry" parent="utility_focused_style">
+		<piece position="titlebar">
+			<draw_ops>
+                <rectangle color="#808080" x="0" y="0" width="width-0" height="height-0" filled="true"/>
+			</draw_ops>
+		</piece>
+		<piece position="title">
+			<draw_ops>
+				<title x="3" y="2" color="gtk:bg[NORMAL]"/>
+			</draw_ops>
+		</piece>
+	</frame_style>
+
+
+	<frame_style name="border_style" geometry="border_geometry">
+		<button function="close" state="normal"><draw_ops/></button>
+		<button function="close" state="pressed"><draw_ops/></button>
+		<button function="maximize" state="normal"><draw_ops/></button>
+		<button function="maximize" state="pressed"><draw_ops/></button>
+		<button function="minimize" state="normal"><draw_ops/></button>
+		<button function="minimize" state="pressed"><draw_ops/></button>
+		<button function="menu" state="normal"><draw_ops/></button>
+		<button function="menu" state="pressed"><draw_ops/></button>
+	</frame_style>
+
+	<!-- system menu icon : default drawn by metacity -->
+	<menu_icon function="close" state="normal">
+		<draw_ops/>
+	</menu_icon>
+
+	<menu_icon function="maximize" state="normal">
+		<draw_ops/>
+	</menu_icon>
+
+	<menu_icon function="minimize" state="normal">
+		<draw_ops/>
+	</menu_icon>
+
+	<menu_icon function="unmaximize" state="normal">
+		<draw_ops/>
+	</menu_icon>
+
+	<frame_style_set name="normal_set">
+		<frame focus="yes" state="normal" resize="both" style="normal_focused_style"/>
+		<frame focus="no" state="normal" resize="both" style="normal_unfocused_style"/>
+		<frame focus="yes" state="normal" resize="none" style="normal_focused_style"/>
+		<frame focus="no" state="normal" resize="none" style="normal_unfocused_style"/>
+		<frame focus="yes" state="maximized" style="normal(maximized)_focused_style"/>
+		<frame focus="no" state="maximized" style="normal(maximized)_unfocused_style"/>
+		<frame focus="yes" state="shaded" style="normal_focused_style"/>
+		<frame focus="no" state="shaded" style="normal_unfocused_style"/>
+		<frame focus="yes" state="maximized_and_shaded" style="normal(maximized)_focused_style"/>
+		<frame focus="no" state="maximized_and_shaded" style="normal_unfocused_style"/>
+	</frame_style_set>
+
+
+	<frame_style_set name="border_set">
+		<frame focus="yes" state="normal" resize="both" style="border_style" />
+		<frame focus="no"  state="normal" resize="both" style="border_style" />
+		<frame focus="yes" state="normal" resize="none" style="border_style" />
+		<frame focus="no"  state="normal" resize="none" style="border_style" />
+		<frame focus="yes" state="maximized" style="border_style" />
+		<frame focus="no"  state="maximized" style="border_style" />
+		<frame focus="yes" state="shaded" style="border_style" />
+		<frame focus="no"  state="shaded" style="border_style" />
+		<frame focus="yes" state="maximized_and_shaded" style="border_style" />
+		<frame focus="no"  state="maximized_and_shaded" style="border_style" />
+	</frame_style_set>
+
+	<frame_style_set name="utility_set" parent="border_set">
+		<frame focus="yes" state="normal" resize="both" style="utility_focused_style" />
+		<frame focus="no"  state="normal" resize="both" style="utility_unfocused_style" />
+		<frame focus="yes" state="normal" resize="none" style="utility_focused_style" />
+		<frame focus="no"  state="normal" resize="none" style="utility_unfocused_style" />
+	</frame_style_set>
+
+
+	<window type="normal" style_set="normal_set"/>
+	<window type="dialog" style_set="normal_set"/>
+	<window type="modal_dialog" style_set="normal_set"/>
+	<window type="menu" style_set="utility_set"/>
+	<window type="utility" style_set="utility_set"/>
+	<window type="border" style_set="border_set"/>
+
+</metacity_theme>
diff --git a/Theme/Chicago95/metacity-1/minimize_normal.png b/Theme/Chicago95/metacity-1/minimize_normal.png
new file mode 100644
index 0000000..873a82d
Binary files /dev/null and b/Theme/Chicago95/metacity-1/minimize_normal.png differ
diff --git a/Theme/Chicago95/metacity-1/minimize_pressed.png b/Theme/Chicago95/metacity-1/minimize_pressed.png
new file mode 100644
index 0000000..fabcfbd
Binary files /dev/null and b/Theme/Chicago95/metacity-1/minimize_pressed.png differ
diff --git a/Theme/Chicago95/metacity-1/restore_normal.png b/Theme/Chicago95/metacity-1/restore_normal.png
new file mode 100644
index 0000000..029643c
Binary files /dev/null and b/Theme/Chicago95/metacity-1/restore_normal.png differ
diff --git a/Theme/Chicago95/metacity-1/restore_pressed.png b/Theme/Chicago95/metacity-1/restore_pressed.png
new file mode 100644
index 0000000..872eb05
Binary files /dev/null and b/Theme/Chicago95/metacity-1/restore_pressed.png differ