Submarine: add metacity themes with huge borders

can be used in non-compositor case

31 files changed, 1210 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index abdae6e9..83a46dde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,8 @@ desktop-themes/Blue-Submarine/gtk-2.0/assets/Makefile
 desktop-themes/Blue-Submarine/gtk-3.0/Makefile
 desktop-themes/Blue-Submarine/gtk-3.0/assets/Makefile
 desktop-themes/Blue-Submarine/metacity-1/Makefile
+desktop-themes/Blue-Submarine-border/Makefile
+desktop-themes/Blue-Submarine-border/metacity-1/Makefile
 desktop-themes/ContrastHigh/Makefile
 desktop-themes/GreenLaguna/Makefile
 desktop-themes/GreenLaguna/gtk-2.0/Makefile
@@ -99,6 +101,8 @@ desktop-themes/Green-Submarine/gtk-2.0/assets/Makefile
 desktop-themes/Green-Submarine/gtk-3.0/Makefile
 desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile
 desktop-themes/Green-Submarine/metacity-1/Makefile
+desktop-themes/Green-Submarine-border/Makefile
+desktop-themes/Green-Submarine-border/metacity-1/Makefile
 desktop-themes/HighContrastInverse/Makefile
 desktop-themes/HighContrastInverse/gtk-2.0/Makefile
 desktop-themes/HighContrastInverse/gtk-2.0/gtkrc
diff --git a/desktop-themes/Blue-Submarine-border/Makefile.am b/desktop-themes/Blue-Submarine-border/Makefile.am
new file mode 100644
index 00000000..b0e9f3c2
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/Makefile.am
@@ -0,0 +1,14 @@
+THEME_NAME=Blue-Submarine-border
+THEME_IN_FILES=index.theme.in
+
+@INTLTOOL_THEME_RULE@
+ 
+themedir = $(datadir)/themes/$(THEME_NAME)
+
+theme_DATA = index.theme
+
+SUBDIRS = \
+	metacity-1
+
+DISTCLEANFILES = index.theme
+EXTRA_DIST = index.theme.in
diff --git a/desktop-themes/Blue-Submarine-border/index.theme.in b/desktop-themes/Blue-Submarine-border/index.theme.in
new file mode 100644
index 00000000..9fe6dc1c
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/index.theme.in
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=X-GNOME-Metatheme
+Name=Blue-Submarine-border
+Comment=A medium blue theme with dark menus and panel with huge borders for using without compositor
+Encoding=UTF-8
+
+Name[de_DE]=index.theme.in
+
+[X-GNOME-Metatheme]
+GtkTheme=Blue-Submarine
+MetacityTheme=Blue-Submarine-border
+IconTheme=mate
+CursorTheme=mate
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/Makefile.am b/desktop-themes/Blue-Submarine-border/metacity-1/Makefile.am
new file mode 100644
index 00000000..78ed94ef
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/Makefile.am
@@ -0,0 +1,16 @@
+
+themedir = $(datadir)/themes/Blue-Submarine-border/metacity-1
+
+theme_DATA = \
+	icon_close.png \
+	icon_close_u.png \
+	icon_maximize.png \
+	icon_maximize_u.png \
+	icon_minimize.png \
+	icon_minimize_u.png \
+	icon_restore.png \
+	icon_restore_u.png \
+	metacity-theme-1.xml \
+	stripes.png
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/icon_close.png b/desktop-themes/Blue-Submarine-border/metacity-1/icon_close.png
new file mode 100644
index 00000000..f2f8408a
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/icon_close.png
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/icon_close_u.png b/desktop-themes/Blue-Submarine-border/metacity-1/icon_close_u.png
new file mode 100644
index 00000000..dff25f9f
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/icon_close_u.png
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/icon_maximize.png b/desktop-themes/Blue-Submarine-border/metacity-1/icon_maximize.png
new file mode 100644
index 00000000..e9eb1a56
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/icon_maximize.png
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/icon_maximize_u.png b/desktop-themes/Blue-Submarine-border/metacity-1/icon_maximize_u.png
new file mode 100644
index 00000000..930b481f
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/icon_maximize_u.png
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/icon_minimize.png b/desktop-themes/Blue-Submarine-border/metacity-1/icon_minimize.png
new file mode 100644
index 00000000..2b6459c2
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/icon_minimize.png
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/icon_minimize_u.png b/desktop-themes/Blue-Submarine-border/metacity-1/icon_minimize_u.png
new file mode 100644
index 00000000..8dabe871
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/icon_minimize_u.png
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/icon_restore.png b/desktop-themes/Blue-Submarine-border/metacity-1/icon_restore.png
new file mode 100644
index 00000000..fed61c3c
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/icon_restore.png
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/icon_restore_u.png b/desktop-themes/Blue-Submarine-border/metacity-1/icon_restore_u.png
new file mode 100644
index 00000000..f9dc696f
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/icon_restore_u.png
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/metacity-theme-1.xml b/desktop-themes/Blue-Submarine-border/metacity-1/metacity-theme-1.xml
new file mode 100644
index 00000000..7ef72d79
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/metacity-theme-1.xml
@@ -0,0 +1,549 @@
+<?xml version="1.0"?>
+<!-- 	$Id: metacity-theme-1.xml,v 1.4 2003/12/10 13:57:58 jimmac Exp $	 -->
+<metacity_theme>
+<info>
+  <name>Blue-Submarine-border</name>
+  <author>Wolfgang Ulbrich</author>
+  <copyright>&#194; 2013</copyright>
+  <date>Apil, 2013</date>
+  <description>Dark theme based on Gilouche legacy.</description>
+  <!-- based on the Gilouche theme -->
+</info>
+ 
+<frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" 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="4"/>
+  <distance name="right_titlebar_edge" value="4"/>
+  <aspect_ratio name="button" value="1"/>
+  <distance name="title_vertical_pad" value="1"/>
+  <border name="title_border" left="1" right="1" top="2" bottom="3"/>
+  <border name="button_border" left="1" right="1" top="4" bottom="2"/>
+</frame_geometry>
+
+<frame_geometry name="normal_maximized" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
+  <!-- strip frame spacing off the normal geometry when maximised -->
+  <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="1"/>
+  <distance name="title_vertical_pad" value="1"/>
+  <border name="title_border" left="2" right="2" top="1" bottom="2"/>
+  <border name="button_border" left="1" right="1" top="2" bottom="2"/>
+</frame_geometry>
+
+<frame_geometry name="border" has_title="false" rounded_top_left="true" rounded_top_right="true"  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="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="6" bottom="0"/>
+  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
+</frame_geometry>
+
+<!-- button inside padding -->
+<constant name="ButtonIPad" value="3"/>
+
+<draw_ops name="inner_window_border">
+  <gradient type="vertical" x="0" y="top_height-1" width="4" height="height-bottom_height-top_height+2">
+    <color value="#303030"/>
+    <color value="#303030"/>
+    <color value="#303030"/>
+  </gradient>
+  <gradient type="vertical" x="width-right_width" y="top_height-1" width="4" height="height-bottom_height-top_height+2">
+    <color value="#303030"/>
+    <color value="#303030"/>
+    <color value="#303030"/>
+  </gradient>
+
+  <gradient type="horizontal" x="0" y="height-bottom_height" width="width" height="4">
+    <color value="#303030"/>
+    <color value="#303030"/>
+    <color value="#303030"/>
+  </gradient>
+</draw_ops>
+
+<!-- ** stripes ** -->
+<draw_ops name="title_tile">
+<!-- too slow
+	<image filename="stripes.png" x="0" y="0" width="width" height="height" alpha=".05"/>
+  <tint color="black" x="0" y="0" width="width" height="0" alpha="0.1"/>
+  <tint color="white" x="0" y="1" width="width" height="1" alpha="0.05"/>
+	-->
+</draw_ops>
+
+<draw_ops name="titlebar-backdrop">
+<!-- horizontal gradient -->
+  <gradient type="horizontal" x="1" y="1" width="width - 2" height="title_height + 10">
+    <color value="#1C1B19"/>
+    <color value="blend/#255880/#343330/.2"/>
+    <color value="blend/#255880/#343330/.2"/>
+    <color value="#1C1B19"/>
+  </gradient>
+</draw_ops>
+
+<draw_ops name="bevel_maximized">
+
+  <!-- horizontal gradient -->
+  <gradient type="horizontal" x="0" y="0" width="width" height="title_height + 10">
+    <color value="#1C1B19"/>
+    <color value="blend/#255880/#343330/.2"/>
+    <color value="blend/#255880/#343330/.2"/>
+    <color value="#1C1B19"/>
+  </gradient>
+
+  <!-- top highlight -->  
+    <gradient type="horizontal" x="10" y="0" width="width - 20" height="1">
+      <color value="#1C1B19"/>
+      <color value="blend/#255880/#ffffff/.6"/>
+      <color value="#1C1B19"/>
+    </gradient>
+
+  <!-- shade to menubar -->
+  <tint color="#303030" alpha=".2" width="width - 2" height="2" x="1" y="title_height - 11" />  
+  <tint color="#303030" alpha=".3" width="width - 2" height="2" x="1" y="title_height - 9" />
+  <tint color="#303030" alpha=".4" width="width - 2" height="2" x="1" y="title_height - 7" />
+  <tint color="#303030" alpha=".5" width="width - 2" height="2" x="1" y="title_height - 5" />
+  <tint color="#303030" alpha=".6" width="width - 2" height="2" x="1" y="title_height - 3" />
+  <tint color="#303030" alpha=".7" width="width - 2" height="2" x="1" y="title_height - 1" />
+  <tint color="#303030" alpha=".8" width="width - 2" height="2" x="1" y="title_height + 1" />
+  <tint color="#303030" alpha="1" width="width - 2" height="2" x="1" y="title_height + 3" />
+
+<!-- stripes are 1990
+<tile name="title_tile" tile_width="width" tile_height="2" x="1" y="title_height / 2 + 3" width="width - 2" height="10"/>
+-->
+
+</draw_ops>
+
+<draw_ops name="bevel_unfocused">
+
+  <rectangle color="#1F2427" filled="true"
+             x="0" y="0"
+             width="width"
+             height="height"/>
+<!-- rounded corner -->
+<!-- outside left -->
+<line color="#303030" x1="3" y1="1" x2="4" y2="1" />
+<line color="#303030" x1="2" y1="2" x2="2" y2="2" />
+<line color="#303030" x1="1" y1="3" x2="1" y2="4" />
+<!-- inside left -->
+<line color="#303030" x1="3" y1="2" x2="4" y2="2" />
+<line color="#303030" x1="2" y1="3" x2="2" y2="4" />
+<!-- outside right -->
+<line color="#303030" x1="width - 5" y1="1" x2="width - 3" y2="1" />
+<line color="#303030" x1="width - 3" y1="2" x2="width - 2" y2="2" />
+<line color="#303030" x1="width - 2" y1="3" x2="width - 2" y2="4" />
+<!-- inside right -->
+<line color="#303030" x1="width - 5" y1="2" x2="width - 4" y2="2" />
+<line color="#303030" x1="width - 3" y1="3" x2="width - 3" y2="4" />
+</draw_ops>
+
+<draw_ops name="bevel">
+
+  <include name="titlebar-backdrop" />
+
+  <!-- shade to title -->
+  <tint color="#303030" alpha=".1" width="width - 2" height="2" x="1" y="title_height - 16" />  
+  <tint color="#303030" alpha=".2" width="width - 2" height="2" x="1" y="title_height - 14" />
+  <tint color="#303030" alpha=".3" width="width - 2" height="2" x="1" y="title_height - 12" />  
+  <tint color="#303030" alpha=".4" width="width - 2" height="2" x="1" y="title_height - 10" />
+  <tint color="#303030" alpha=".5" width="width - 2" height="2" x="1" y="title_height - 8" />
+  <tint color="#303030" alpha=".55" width="width - 2" height="2" x="1" y="title_height - 6" />
+  <tint color="#303030" alpha=".6" width="width - 2" height="2" x="1" y="title_height - 4" />
+  <tint color="#303030" alpha=".7" width="width - 2" height="2" x="1" y="title_height - 2" />
+  <tint color="#303030" alpha=".8" width="width - 2" height="2" x="1" y="title_height" />
+  <tint color="#303030" alpha=".9" width="width - 2" height="2" x="1" y="title_height + 2" />
+  <tint color="#303030" alpha="1" width="width - 2" height="2" x="1" y="title_height + 4" />
+  
+	<!-- outer border -->
+  <rectangle color="blend/#2C2B29/#000000/.5" filled="false"
+       x="0" y="0"
+       width="width - 1"
+       height="height - 1"/>
+
+  <!-- top highlight -->  
+    <gradient type="horizontal" x="10" y="1" width="width - 20" height="1">
+      <color value="#1C1B19"/>
+      <color value="blend/#255880/#ffffff/.6"/>
+      <color value="#1C1B19"/>
+    </gradient>
+
+</draw_ops>
+
+
+<draw_ops name="bevel_border">
+  <include name="bevel"/>
+  <include name="inner_window_border"/>
+</draw_ops>
+
+<!-- ::: TITLES ::: -->
+
+<draw_ops name="title">
+  <title color="#252525"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+  <title color="#ffffff"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+</draw_ops>
+
+<draw_ops name="title_unfocused">
+  <title color="blend/#101010/#CBD5D9/0.5"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+</draw_ops>
+
+<draw_ops name="title_max">
+  <title color="#252525"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 3"/>
+  <title color="#ffffff"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+</draw_ops>
+
+<draw_ops name="title_max_unfocused">
+  <title color="blend/#101010/#CBD5D9/0.5"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+</draw_ops>
+
+<!-- ::: BUTTONS ::: -->
+
+
+<!-- borders -->
+<draw_ops name="menu_button_icon"> 
+  <icon  x="(width-mini_icon_width)/2"
+         y="(height-mini_icon_height)/2"
+         width="mini_icon_width" height="mini_icon_height"/>
+</draw_ops>
+
+<draw_ops name="button_bg">
+<!-- kinda looks better without
+	<line color="#255880" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="#255880" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="#255880" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="#255880" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+-->
+</draw_ops>
+
+<draw_ops name="button_bg_prelight">
+	<line color="blend/#255880/#ffffff/.2" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="blend/#255880/#ffffff/.2" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="blend/#255880/#ffffff/.2" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="blend/#255880/#ffffff/.2" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+
+  <gradient type="vertical" x="1" y="1" width="width - 3" height="height - 3">
+		<color value="blend/#255880/#ffffff/.1"/>
+		<color value="blend/#255880/#000000/.1"/>
+  </gradient>
+</draw_ops>
+
+<draw_ops name="button_bg_pressed">
+	<line color="blend/#255880/#ffffff/.1" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="blend/#255880/#ffffff/.1" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="blend/#255880/#ffffff/.1" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="blend/#255880/#ffffff/.1" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+	
+  <gradient type="vertical" x="1" y="1" width="width - 3" height="height - 3">
+		<color value="blend/#255880/#000000/.2"/>
+		<color value="blend/#255880/#ffffff/.2"/>
+  </gradient>
+</draw_ops>
+
+
+<draw_ops name="button_bg_unfocused">
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused_prelight">
+	<line color="blend/#CBD5D9/#000000/0.1" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="blend/#CBD5D9/#000000/0.1" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="blend/#CBD5D9/#000000/0.1" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="blend/#CBD5D9/#000000/0.1" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+
+  <gradient type="vertical" x="1" y="1" width="width - 3" height="height - 3">
+		<color value="blend/#CBD5D9/#ffffff/.5"/>
+		<color value="blend/#CBD5D9/#000000/0.1"/>
+  </gradient>
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused_pressed">
+	<line color="blend/#CBD5D9/#000000/0.1" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="blend/#CBD5D9/#000000/0.1" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="blend/#CBD5D9/#000000/0.1" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="blend/#CBD5D9/#000000/0.1" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+
+  <gradient type="vertical" x="1" y="1" width="width - 3" height="height - 3">
+		<color value="blend/#CBD5D9/#000000/0.1"/>
+		<color value="blend/#CBD5D9/#ffffff/.5"/>
+  </gradient>
+</draw_ops>
+
+<draw_ops name="menu_button_normal">
+  <include name="menu_button_icon"/>
+</draw_ops>
+<draw_ops name="menu_button_pressed">
+  <include name="menu_button_icon"/>
+</draw_ops>
+<draw_ops name="menu_button_unfocused">
+  <include name="menu_button_icon"/>
+</draw_ops>
+
+<!-- ::: ICONS ::: -->
+<draw_ops name="close_button_icon">
+	<image filename="icon_close.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="0.7"/>
+</draw_ops>
+
+<draw_ops name="close_button_icon_unfocused">
+	<image filename="icon_close_u.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" colorize="blend/#101010/#CBD5D9/0.5"/>
+</draw_ops>
+
+<draw_ops name="close_button_normal">
+  <include name="button_bg"/>
+  <include name="close_button_icon"/>
+</draw_ops>
+<draw_ops name="close_button_prelight">
+  <!--<include name="button_bg_prelight"/>-->
+	<image filename="icon_close.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="1" />
+</draw_ops>
+<draw_ops name="close_button_pressed">
+  <include name="button_bg_pressed"/>
+  <include name="close_button_icon"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused">
+  <include name="button_bg_unfocused"/>
+  <include name="close_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused_prelight">
+  <!--<include name="button_bg_unfocused_prelight"/>-->
+  <include name="close_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused_pressed">
+  <include name="button_bg_unfocused_pressed"/>
+  <include name="close_button_icon_unfocused"/>
+</draw_ops>
+
+<draw_ops name="maximize_button_icon">
+	<image filename="icon_maximize.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="0.7"/>
+</draw_ops>
+
+<draw_ops name="maximize_button_icon_unfocused">	
+	<image filename="icon_maximize_u.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" colorize="blend/#101010/#CBD5D9/0.5"/>
+</draw_ops>
+
+<draw_ops name="maximize_button_normal">
+  <include name="button_bg"/>
+  <include name="maximize_button_icon"/>
+</draw_ops>
+<draw_ops name="maximize_button_prelight">
+  <!--<include name="button_bg_prelight"/>-->
+	<image filename="icon_maximize.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10"/>
+</draw_ops>
+<draw_ops name="maximize_button_pressed">
+  <include name="button_bg_pressed"/>
+  <include name="maximize_button_icon"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused">
+  <include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused_prelight">
+  <!--<include name="button_bg_unfocused_prelight"/>-->
+  <include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused_pressed">
+  <include name="button_bg_unfocused_pressed"/>
+  <include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+
+<draw_ops name="restore_button_icon">
+	<image filename="icon_restore.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="0.7"/>
+</draw_ops>
+
+<draw_ops name="restore_button_icon_unfocused">
+	<image filename="icon_restore_u.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" colorize="blend/#101010/#CBD5D9/0.5"/>
+</draw_ops>
+
+<draw_ops name="restore_button_normal">
+  <include name="button_bg"/>
+  <include name="restore_button_icon"/>
+</draw_ops>
+<draw_ops name="restore_button_prelight">
+  <!--<include name="button_bg_prelight"/>-->
+	<image filename="icon_restore.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10"/>
+</draw_ops>
+<draw_ops name="restore_button_pressed">
+  <include name="button_bg_pressed"/>
+  <include name="restore_button_icon"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused">
+  <include name="restore_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused_prelight">
+  <!--<include name="button_bg_unfocused_prelight"/>-->
+  <include name="restore_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused_pressed">
+  <include name="button_bg_unfocused_pressed"/>
+  <include name="restore_button_icon_unfocused"/>
+</draw_ops>
+
+<draw_ops name="minimize_button_icon">
+	<image filename="icon_minimize.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="0.7"/>
+</draw_ops>
+
+<draw_ops name="minimize_button_icon_unfocused">
+	<image filename="icon_minimize_u.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" colorize="blend/#101010/#CBD5D9/0.5"/></draw_ops>
+
+<draw_ops name="minimize_button_normal">
+  <include name="button_bg"/>
+  <include name="minimize_button_icon"/>
+</draw_ops>
+<draw_ops name="minimize_button_prelight">
+  <!--<include name="button_bg_prelight"/>-->
+	<image filename="icon_minimize.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10"/>
+</draw_ops>
+<draw_ops name="minimize_button_pressed">
+  <include name="button_bg_pressed"/>
+  <include name="minimize_button_icon"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused">
+  <include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused_prelight">
+  <!--<include name="button_bg_unfocused_prelight"/>-->
+  <include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused_pressed">
+  <include name="button_bg_unfocused_pressed"/>
+  <include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+
+
+
+<draw_ops name="blank">
+<!-- nothing -->
+</draw_ops>
+
+<frame_style name="normal" geometry="normal">
+  <piece position="entire_background" draw_ops="bevel_unfocused"/>
+  <piece position="title" draw_ops="title_unfocused"/>
+  <button function="close" state="normal" draw_ops="close_button_unfocused"/>
+  <button function="close" state="pressed" draw_ops="close_button_unfocused_pressed"/>
+  <button function="close" state="prelight" draw_ops="close_button_unfocused_prelight"/>
+  <button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/>
+  <button function="maximize" state="pressed" draw_ops="maximize_button_unfocused_pressed"/>
+  <button function="maximize" state="prelight" draw_ops="maximize_button_unfocused_prelight"/>
+  <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
+  <button function="minimize" state="pressed" draw_ops="minimize_button_unfocused_pressed"/>
+  <button function="minimize" state="prelight" draw_ops="minimize_button_unfocused_prelight"/>
+  <button function="menu" state="normal" draw_ops="menu_button_unfocused"/>
+  <button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+</frame_style>
+
+<frame_style name="focused" geometry="normal" parent="normal">
+  <piece position="entire_background" draw_ops="bevel_border"/>
+  <piece position="title" draw_ops="title"/>
+  <button function="close" state="normal" draw_ops="close_button_normal"/>
+  <button function="close" state="pressed" draw_ops="close_button_pressed"/>
+  <button function="close" state="prelight" draw_ops="close_button_prelight"/>
+  <button function="maximize" state="normal" draw_ops="maximize_button_normal"/>
+  <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/>
+  <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/>
+  <button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
+  <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
+  <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
+  <button function="menu" state="normal" draw_ops="menu_button_normal"/>
+</frame_style>
+
+<frame_style name="normal_maximized" geometry="normal_maximized">
+  <piece position="entire_background" draw_ops="bevel_unfocused"/>
+  <piece position="title" draw_ops="title_max_unfocused"/>
+  <button function="close" state="normal" draw_ops="close_button_unfocused"/>
+  <button function="close" state="pressed" draw_ops="close_button_unfocused_pressed"/>
+  <button function="close" state="prelight" draw_ops="close_button_unfocused_prelight"/>
+  <button function="maximize" state="normal" draw_ops="restore_button_unfocused"/>
+  <button function="maximize" state="pressed" draw_ops="restore_button_unfocused_pressed"/>
+  <button function="maximize" state="prelight" draw_ops="restore_button_unfocused_prelight"/>
+  <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
+  <button function="minimize" state="pressed" draw_ops="minimize_button_unfocused_pressed"/>
+  <button function="minimize" state="prelight" draw_ops="minimize_button_unfocused_prelight"/>
+  <button function="menu" state="normal" draw_ops="menu_button_unfocused"/>
+  <button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+</frame_style>
+
+<frame_style name="focused_maximized" geometry="normal_maximized" parent="normal">
+  <piece position="title" draw_ops="title_max"/>
+  <button function="close" state="normal" draw_ops="close_button_normal"/>
+  <button function="close" state="pressed" draw_ops="close_button_pressed"/>
+  <button function="close" state="prelight" draw_ops="close_button_prelight"/>
+  <button function="maximize" state="normal" draw_ops="restore_button_normal"/>
+  <button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
+  <button function="maximize" state="prelight" draw_ops="restore_button_prelight"/>
+  <button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
+  <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
+  <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
+  <piece position="entire_background" draw_ops="bevel_maximized"/>
+
+
+
+  <button function="menu" state="normal" draw_ops="menu_button_normal"/>
+</frame_style>
+
+<frame_style name="border" geometry="border" parent="normal">
+  <piece position="entire_background" draw_ops="bevel_unfocused"/>
+  <piece position="title" draw_ops="blank"/>
+</frame_style>
+
+<frame_style_set name="normal">
+   <frame focus="yes" state="normal" resize="both" style="focused"/>
+   <frame focus="no" state="normal" resize="both" style="normal"/>
+   <frame focus="yes" state="maximized" style="focused_maximized"/>
+   <frame focus="no" state="maximized" style="normal_maximized"/>
+   <frame focus="yes" state="shaded" style="focused"/>
+   <frame focus="no" state="shaded" style="normal"/>
+   <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
+   <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
+</frame_style_set>
+
+<frame_style_set name="utility" parent="normal">
+<frame focus="yes" state="normal" resize="both" style="focused"/>
+<frame focus="no" state="normal" resize="both" style="normal"/>
+<!-- this is a bunch of crack since utility windows shouldn't be maximized -->
+<frame focus="yes" state="maximized" style="focused"/>
+<frame focus="no" state="maximized" style="normal"/>
+<frame focus="yes" state="shaded" style="focused"/>
+<frame focus="no" state="shaded" style="normal"/>
+<frame focus="yes" state="maximized_and_shaded" style="focused"/>
+<frame focus="no" state="maximized_and_shaded" style="normal"/>
+</frame_style_set>
+
+<frame_style_set name="border">
+<frame focus="yes" state="normal" resize="both" style="border"/>
+<frame focus="no" state="normal" resize="both" style="border"/>
+<frame focus="yes" state="maximized" style="border"/>
+<frame focus="no" state="maximized" style="border"/>
+<frame focus="yes" state="shaded" style="border"/>
+<frame focus="no" state="shaded" style="border"/>
+<frame focus="yes" state="maximized_and_shaded" style="border"/>
+<frame focus="no" state="maximized_and_shaded" style="border"/>
+</frame_style_set>
+
+<window type="normal" style_set="normal"/>
+<window type="dialog" style_set="normal"/>
+<window type="modal_dialog" style_set="normal"/>
+<window type="menu" style_set="normal"/>
+<window type="utility" style_set="normal"/>
+<window type="border" style_set="border"/>
+
+<menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/>
+<menu_icon function="maximize" state="normal" draw_ops="maximize_button_icon_unfocused"/>
+<menu_icon function="unmaximize" state="normal" draw_ops="restore_button_icon_unfocused"/>
+<menu_icon function="minimize" state="normal" draw_ops="minimize_button_icon_unfocused"/>
+
+</metacity_theme>
diff --git a/desktop-themes/Blue-Submarine-border/metacity-1/stripes.png b/desktop-themes/Blue-Submarine-border/metacity-1/stripes.png
new file mode 100644
index 00000000..447fd7f5
--- /dev/null
+++ b/desktop-themes/Blue-Submarine-border/metacity-1/stripes.png
diff --git a/desktop-themes/Blue-Submarine/metacity-1/metacity-theme-1.xml b/desktop-themes/Blue-Submarine/metacity-1/metacity-theme-1.xml
index dc5b0780..ebe79ad1 100644
--- a/desktop-themes/Blue-Submarine/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/Blue-Submarine/metacity-1/metacity-theme-1.xml
@@ -11,9 +11,9 @@
 </info>
  
 <frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" 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_width" value="1"/>
+  <distance name="right_width" value="1"/>
+  <distance name="bottom_height" value="1"/>
   <distance name="left_titlebar_edge" value="4"/>
   <distance name="right_titlebar_edge" value="4"/>
   <aspect_ratio name="button" value="1"/>
@@ -26,7 +26,7 @@
   <!-- strip frame spacing off the normal geometry when maximised -->
   <distance name="left_width" value="0"/>
   <distance name="right_width" value="0"/>
-  <distance name="bottom_height" value="1"/>
+  <distance name="bottom_height" value="0"/>
   <distance name="left_titlebar_edge" value="1"/>
   <distance name="right_titlebar_edge" value="1"/>
   <distance name="title_vertical_pad" value="1"/>
@@ -35,9 +35,9 @@
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false" rounded_top_left="true" rounded_top_right="true"  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_width" value="1"/>
+  <distance name="right_width" value="1"/>
+  <distance name="bottom_height" value="1"/>
   <distance name="left_titlebar_edge" value="0"/>
   <distance name="right_titlebar_edge" value="0"/>
   <distance name="button_width" value="0"/>
@@ -51,18 +51,18 @@
 <constant name="ButtonIPad" value="3"/>
 
 <draw_ops name="inner_window_border">
-  <gradient type="vertical" x="0" y="top_height-1" width="3" height="height-bottom_height-top_height+2">
+  <gradient type="vertical" x="0" y="top_height-1" width="1" height="height-bottom_height-top_height+2">
     <color value="#303030"/>
     <color value="#303030"/>
     <color value="#303030"/>
   </gradient>
-  <gradient type="vertical" x="width-right_width" y="top_height-1" width="3" height="height-bottom_height-top_height+2">
+  <gradient type="vertical" x="width-right_width" y="top_height-1" width="1" height="height-bottom_height-top_height+2">
     <color value="#303030"/>
     <color value="#303030"/>
     <color value="#303030"/>
   </gradient>
 
-  <gradient type="horizontal" x="0" y="height-bottom_height" width="width" height="3">
+  <gradient type="horizontal" x="0" y="height-bottom_height" width="width" height="1">
     <color value="#303030"/>
     <color value="#303030"/>
     <color value="#303030"/>
diff --git a/desktop-themes/Green-Submarine-border/Makefile.am b/desktop-themes/Green-Submarine-border/Makefile.am
new file mode 100644
index 00000000..5cdef7f1
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/Makefile.am
@@ -0,0 +1,14 @@
+THEME_NAME=Green-Submarine-border
+THEME_IN_FILES=index.theme.in
+
+@INTLTOOL_THEME_RULE@
+ 
+themedir = $(datadir)/themes/$(THEME_NAME)
+
+theme_DATA = index.theme
+
+SUBDIRS = \
+	metacity-1
+
+DISTCLEANFILES = index.theme
+EXTRA_DIST = index.theme.in
diff --git a/desktop-themes/Green-Submarine-border/index.theme.in b/desktop-themes/Green-Submarine-border/index.theme.in
new file mode 100644
index 00000000..637aadcb
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/index.theme.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=X-GNOME-Metatheme
+Name=Green-Submarine-border
+_Comment=A medium green theme with dark menus and panel with huge borders for using without compositor
+Encoding=UTF-8
+
+[X-GNOME-Metatheme]
+GtkTheme=Green-Submarine
+MetacityTheme=Green-Submarine-border
+IconTheme=menta
+CursorTheme=mate
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/Makefile.am b/desktop-themes/Green-Submarine-border/metacity-1/Makefile.am
new file mode 100644
index 00000000..90f9b763
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/Makefile.am
@@ -0,0 +1,16 @@
+
+themedir = $(datadir)/themes/Green-Submarine-border/metacity-1
+
+theme_DATA = \
+	icon_close.png \
+	icon_close_u.png \
+	icon_maximize.png \
+	icon_maximize_u.png \
+	icon_minimize.png \
+	icon_minimize_u.png \
+	icon_restore.png \
+	icon_restore_u.png \
+	metacity-theme-1.xml \
+	stripes.png
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/icon_close.png b/desktop-themes/Green-Submarine-border/metacity-1/icon_close.png
new file mode 100644
index 00000000..f2f8408a
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/icon_close.png
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/icon_close_u.png b/desktop-themes/Green-Submarine-border/metacity-1/icon_close_u.png
new file mode 100644
index 00000000..dff25f9f
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/icon_close_u.png
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/icon_maximize.png b/desktop-themes/Green-Submarine-border/metacity-1/icon_maximize.png
new file mode 100644
index 00000000..e9eb1a56
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/icon_maximize.png
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/icon_maximize_u.png b/desktop-themes/Green-Submarine-border/metacity-1/icon_maximize_u.png
new file mode 100644
index 00000000..930b481f
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/icon_maximize_u.png
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/icon_minimize.png b/desktop-themes/Green-Submarine-border/metacity-1/icon_minimize.png
new file mode 100644
index 00000000..2b6459c2
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/icon_minimize.png
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/icon_minimize_u.png b/desktop-themes/Green-Submarine-border/metacity-1/icon_minimize_u.png
new file mode 100644
index 00000000..8dabe871
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/icon_minimize_u.png
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/icon_restore.png b/desktop-themes/Green-Submarine-border/metacity-1/icon_restore.png
new file mode 100644
index 00000000..fed61c3c
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/icon_restore.png
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/icon_restore_u.png b/desktop-themes/Green-Submarine-border/metacity-1/icon_restore_u.png
new file mode 100644
index 00000000..f9dc696f
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/icon_restore_u.png
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/metacity-theme-1.xml b/desktop-themes/Green-Submarine-border/metacity-1/metacity-theme-1.xml
new file mode 100644
index 00000000..daaad612
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/metacity-theme-1.xml
@@ -0,0 +1,549 @@
+<?xml version="1.0"?>
+<!-- 	$Id: metacity-theme-1.xml,v 1.4 2003/12/10 13:57:58 jimmac Exp $	 -->
+<metacity_theme>
+<info>
+  <name>Green-Submarine</name>
+  <author>Wolfgang Ulbrich</author>
+  <copyright>&#194; 2013</copyright>
+  <date>Apil, 2013</date>
+  <description>Dark theme based on Gilouche legacy.</description>
+  <!-- based on the Gilouche theme -->
+</info>
+ 
+<frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" 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="4"/>
+  <distance name="right_titlebar_edge" value="4"/>
+  <aspect_ratio name="button" value="1"/>
+  <distance name="title_vertical_pad" value="1"/>
+  <border name="title_border" left="1" right="1" top="2" bottom="3"/>
+  <border name="button_border" left="1" right="1" top="4" bottom="2"/>
+</frame_geometry>
+
+<frame_geometry name="normal_maximized" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
+  <!-- strip frame spacing off the normal geometry when maximised -->
+  <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="1"/>
+  <distance name="title_vertical_pad" value="1"/>
+  <border name="title_border" left="2" right="2" top="1" bottom="2"/>
+  <border name="button_border" left="1" right="1" top="2" bottom="2"/>
+</frame_geometry>
+
+<frame_geometry name="border" has_title="false" rounded_top_left="true" rounded_top_right="true"  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="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="6" bottom="0"/>
+  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
+</frame_geometry>
+
+<!-- button inside padding -->
+<constant name="ButtonIPad" value="3"/>
+
+<draw_ops name="inner_window_border">
+  <gradient type="vertical" x="0" y="top_height-1" width="4" height="height-bottom_height-top_height+2">
+    <color value="#303030"/>
+    <color value="#303030"/>
+    <color value="#303030"/>
+  </gradient>
+  <gradient type="vertical" x="width-right_width" y="top_height-1" width="4" height="height-bottom_height-top_height+2">
+    <color value="#303030"/>
+    <color value="#303030"/>
+    <color value="#303030"/>
+  </gradient>
+
+  <gradient type="horizontal" x="0" y="height-bottom_height" width="width" height="4">
+    <color value="#303030"/>
+    <color value="#303030"/>
+    <color value="#303030"/>
+  </gradient>
+</draw_ops>
+
+<!-- ** stripes ** -->
+<draw_ops name="title_tile">
+<!-- too slow
+	<image filename="stripes.png" x="0" y="0" width="width" height="height" alpha=".05"/>
+  <tint color="black" x="0" y="0" width="width" height="0" alpha="0.1"/>
+  <tint color="white" x="0" y="1" width="width" height="1" alpha="0.05"/>
+	-->
+</draw_ops>
+
+<draw_ops name="titlebar-backdrop">
+<!-- horizontal gradient -->
+  <gradient type="horizontal" x="1" y="1" width="width - 2" height="title_height + 10">
+    <color value="#1C1B19"/>
+    <color value="blend/#72B49D/#343330/.2"/>
+    <color value="blend/#72B49D/#343330/.2"/>
+    <color value="#1C1B19"/>
+  </gradient>
+</draw_ops>
+
+<draw_ops name="bevel_maximized">
+
+  <!-- horizontal gradient -->
+  <gradient type="horizontal" x="0" y="0" width="width" height="title_height + 10">
+    <color value="#1C1B19"/>
+    <color value="blend/#72B49D/#343330/.2"/>
+    <color value="blend/#72B49D/#343330/.2"/>
+    <color value="#1C1B19"/>
+  </gradient>
+
+  <!-- top highlight -->  
+    <gradient type="horizontal" x="10" y="0" width="width - 20" height="1">
+      <color value="#1C1B19"/>
+      <color value="blend/#72B49D/#ffffff/.6"/>
+      <color value="#1C1B19"/>
+    </gradient>
+
+  <!-- shade to menubar -->
+  <tint color="#303030" alpha=".2" width="width - 2" height="2" x="1" y="title_height - 11" />  
+  <tint color="#303030" alpha=".3" width="width - 2" height="2" x="1" y="title_height - 9" />
+  <tint color="#303030" alpha=".4" width="width - 2" height="2" x="1" y="title_height - 7" />
+  <tint color="#303030" alpha=".5" width="width - 2" height="2" x="1" y="title_height - 5" />
+  <tint color="#303030" alpha=".6" width="width - 2" height="2" x="1" y="title_height - 3" />
+  <tint color="#303030" alpha=".7" width="width - 2" height="2" x="1" y="title_height - 1" />
+  <tint color="#303030" alpha=".8" width="width - 2" height="2" x="1" y="title_height + 1" />
+  <tint color="#303030" alpha="1" width="width - 2" height="2" x="1" y="title_height + 3" />
+
+<!-- stripes are 1990
+<tile name="title_tile" tile_width="width" tile_height="2" x="1" y="title_height / 2 + 3" width="width - 2" height="10"/>
+-->
+
+</draw_ops>
+
+<draw_ops name="bevel_unfocused">
+
+  <rectangle color="#1F2427" filled="true"
+             x="0" y="0"
+             width="width"
+             height="height"/>
+<!-- rounded corner -->
+<!-- outside left -->
+<line color="#303030" x1="3" y1="1" x2="4" y2="1" />
+<line color="#303030" x1="2" y1="2" x2="2" y2="2" />
+<line color="#303030" x1="1" y1="3" x2="1" y2="4" />
+<!-- inside left -->
+<line color="#303030" x1="3" y1="2" x2="4" y2="2" />
+<line color="#303030" x1="2" y1="3" x2="2" y2="4" />
+<!-- outside right -->
+<line color="#303030" x1="width - 5" y1="1" x2="width - 3" y2="1" />
+<line color="#303030" x1="width - 3" y1="2" x2="width - 2" y2="2" />
+<line color="#303030" x1="width - 2" y1="3" x2="width - 2" y2="4" />
+<!-- inside right -->
+<line color="#303030" x1="width - 5" y1="2" x2="width - 4" y2="2" />
+<line color="#303030" x1="width - 3" y1="3" x2="width - 3" y2="4" />
+</draw_ops>
+
+<draw_ops name="bevel">
+
+  <include name="titlebar-backdrop" />
+
+  <!-- shade to title -->
+  <tint color="#303030" alpha=".1" width="width - 2" height="2" x="1" y="title_height - 16" />  
+  <tint color="#303030" alpha=".2" width="width - 2" height="2" x="1" y="title_height - 14" />
+  <tint color="#303030" alpha=".3" width="width - 2" height="2" x="1" y="title_height - 12" />  
+  <tint color="#303030" alpha=".4" width="width - 2" height="2" x="1" y="title_height - 10" />
+  <tint color="#303030" alpha=".5" width="width - 2" height="2" x="1" y="title_height - 8" />
+  <tint color="#303030" alpha=".55" width="width - 2" height="2" x="1" y="title_height - 6" />
+  <tint color="#303030" alpha=".6" width="width - 2" height="2" x="1" y="title_height - 4" />
+  <tint color="#303030" alpha=".7" width="width - 2" height="2" x="1" y="title_height - 2" />
+  <tint color="#303030" alpha=".8" width="width - 2" height="2" x="1" y="title_height" />
+  <tint color="#303030" alpha=".9" width="width - 2" height="2" x="1" y="title_height + 2" />
+  <tint color="#303030" alpha="1" width="width - 2" height="2" x="1" y="title_height + 4" />
+  
+	<!-- outer border -->
+  <rectangle color="blend/#2C2B29/#000000/.5" filled="false"
+       x="0" y="0"
+       width="width - 1"
+       height="height - 1"/>
+
+  <!-- top highlight -->  
+    <gradient type="horizontal" x="10" y="1" width="width - 20" height="1">
+      <color value="#1C1B19"/>
+      <color value="blend/#72B49D/#ffffff/.6"/>
+      <color value="#1C1B19"/>
+    </gradient>
+
+</draw_ops>
+
+
+<draw_ops name="bevel_border">
+  <include name="bevel"/>
+  <include name="inner_window_border"/>
+</draw_ops>
+
+<!-- ::: TITLES ::: -->
+
+<draw_ops name="title">
+  <title color="#252525"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+  <title color="#ffffff"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+</draw_ops>
+
+<draw_ops name="title_unfocused">
+  <title color="blend/#101010/#CBD9D4/0.5"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+</draw_ops>
+
+<draw_ops name="title_max">
+  <title color="#252525"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 3"/>
+  <title color="#ffffff"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+</draw_ops>
+
+<draw_ops name="title_max_unfocused">
+  <title color="blend/#101010/#CBD9D4/0.5"
+         x="(3 `max` (width-title_width)) / 2"
+         y="(height - title_height) / 2 + 1"/>
+</draw_ops>
+
+<!-- ::: BUTTONS ::: -->
+
+
+<!-- borders -->
+<draw_ops name="menu_button_icon"> 
+  <icon  x="(width-mini_icon_width)/2"
+         y="(height-mini_icon_height)/2"
+         width="mini_icon_width" height="mini_icon_height"/>
+</draw_ops>
+
+<draw_ops name="button_bg">
+<!-- kinda looks better without
+	<line color="#72B49D" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="#72B49D" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="#72B49D" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="#72B49D" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+-->
+</draw_ops>
+
+<draw_ops name="button_bg_prelight">
+	<line color="blend/#72B49D/#ffffff/.2" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="blend/#72B49D/#ffffff/.2" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="blend/#72B49D/#ffffff/.2" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="blend/#72B49D/#ffffff/.2" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+
+  <gradient type="vertical" x="1" y="1" width="width - 3" height="height - 3">
+		<color value="blend/#72B49D/#ffffff/.1"/>
+		<color value="blend/#72B49D/#000000/.1"/>
+  </gradient>
+</draw_ops>
+
+<draw_ops name="button_bg_pressed">
+	<line color="blend/#72B49D/#ffffff/.1" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="blend/#72B49D/#ffffff/.1" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="blend/#72B49D/#ffffff/.1" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="blend/#72B49D/#ffffff/.1" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+	
+  <gradient type="vertical" x="1" y="1" width="width - 3" height="height - 3">
+		<color value="blend/#72B49D/#000000/.2"/>
+		<color value="blend/#72B49D/#ffffff/.2"/>
+  </gradient>
+</draw_ops>
+
+
+<draw_ops name="button_bg_unfocused">
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused_prelight">
+	<line color="blend/#CBD9D4/#000000/0.1" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="blend/#CBD9D4/#000000/0.1" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="blend/#CBD9D4/#000000/0.1" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="blend/#CBD9D4/#000000/0.1" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+
+  <gradient type="vertical" x="1" y="1" width="width - 3" height="height - 3">
+		<color value="blend/#CBD9D4/#ffffff/.5"/>
+		<color value="blend/#CBD9D4/#000000/0.1"/>
+  </gradient>
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused_pressed">
+	<line color="blend/#CBD9D4/#000000/0.1" x1="1" y1="0" x2="width-3" y2="0" />
+	<line color="blend/#CBD9D4/#000000/0.1" x1="0" y1="1" x2="0" y2="height-3" />
+	<line color="blend/#CBD9D4/#000000/0.1" x1="1" y1="height-2" x2="width-3" y2="height-2" />
+	<line color="blend/#CBD9D4/#000000/0.1" x1="width-2" y1="1" x2="width-2" y2="height-3" />
+
+  <gradient type="vertical" x="1" y="1" width="width - 3" height="height - 3">
+		<color value="blend/#CBD9D4/#000000/0.1"/>
+		<color value="blend/#CBD9D4/#ffffff/.5"/>
+  </gradient>
+</draw_ops>
+
+<draw_ops name="menu_button_normal">
+  <include name="menu_button_icon"/>
+</draw_ops>
+<draw_ops name="menu_button_pressed">
+  <include name="menu_button_icon"/>
+</draw_ops>
+<draw_ops name="menu_button_unfocused">
+  <include name="menu_button_icon"/>
+</draw_ops>
+
+<!-- ::: ICONS ::: -->
+<draw_ops name="close_button_icon">
+	<image filename="icon_close.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="0.7"/>
+</draw_ops>
+
+<draw_ops name="close_button_icon_unfocused">
+	<image filename="icon_close_u.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" colorize="blend/#101010/#CBD9D4/0.5"/>
+</draw_ops>
+
+<draw_ops name="close_button_normal">
+  <include name="button_bg"/>
+  <include name="close_button_icon"/>
+</draw_ops>
+<draw_ops name="close_button_prelight">
+  <!--<include name="button_bg_prelight"/>-->
+	<image filename="icon_close.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="1" />
+</draw_ops>
+<draw_ops name="close_button_pressed">
+  <include name="button_bg_pressed"/>
+  <include name="close_button_icon"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused">
+  <include name="button_bg_unfocused"/>
+  <include name="close_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused_prelight">
+  <!--<include name="button_bg_unfocused_prelight"/>-->
+  <include name="close_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused_pressed">
+  <include name="button_bg_unfocused_pressed"/>
+  <include name="close_button_icon_unfocused"/>
+</draw_ops>
+
+<draw_ops name="maximize_button_icon">
+	<image filename="icon_maximize.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="0.7"/>
+</draw_ops>
+
+<draw_ops name="maximize_button_icon_unfocused">	
+	<image filename="icon_maximize_u.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" colorize="blend/#101010/#CBD9D4/0.5"/>
+</draw_ops>
+
+<draw_ops name="maximize_button_normal">
+  <include name="button_bg"/>
+  <include name="maximize_button_icon"/>
+</draw_ops>
+<draw_ops name="maximize_button_prelight">
+  <!--<include name="button_bg_prelight"/>-->
+	<image filename="icon_maximize.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10"/>
+</draw_ops>
+<draw_ops name="maximize_button_pressed">
+  <include name="button_bg_pressed"/>
+  <include name="maximize_button_icon"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused">
+  <include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused_prelight">
+  <!--<include name="button_bg_unfocused_prelight"/>-->
+  <include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused_pressed">
+  <include name="button_bg_unfocused_pressed"/>
+  <include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+
+<draw_ops name="restore_button_icon">
+	<image filename="icon_restore.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="0.7"/>
+</draw_ops>
+
+<draw_ops name="restore_button_icon_unfocused">
+	<image filename="icon_restore_u.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" colorize="blend/#101010/#CBD9D4/0.5"/>
+</draw_ops>
+
+<draw_ops name="restore_button_normal">
+  <include name="button_bg"/>
+  <include name="restore_button_icon"/>
+</draw_ops>
+<draw_ops name="restore_button_prelight">
+  <!--<include name="button_bg_prelight"/>-->
+	<image filename="icon_restore.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10"/>
+</draw_ops>
+<draw_ops name="restore_button_pressed">
+  <include name="button_bg_pressed"/>
+  <include name="restore_button_icon"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused">
+  <include name="restore_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused_prelight">
+  <!--<include name="button_bg_unfocused_prelight"/>-->
+  <include name="restore_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused_pressed">
+  <include name="button_bg_unfocused_pressed"/>
+  <include name="restore_button_icon_unfocused"/>
+</draw_ops>
+
+<draw_ops name="minimize_button_icon">
+	<image filename="icon_minimize.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" alpha="0.7"/>
+</draw_ops>
+
+<draw_ops name="minimize_button_icon_unfocused">
+	<image filename="icon_minimize_u.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10" colorize="blend/#101010/#CBD9D4/0.5"/></draw_ops>
+
+<draw_ops name="minimize_button_normal">
+  <include name="button_bg"/>
+  <include name="minimize_button_icon"/>
+</draw_ops>
+<draw_ops name="minimize_button_prelight">
+  <!--<include name="button_bg_prelight"/>-->
+	<image filename="icon_minimize.png" x="(width-10)/2" y="(height-10)/2" width="10" height="10"/>
+</draw_ops>
+<draw_ops name="minimize_button_pressed">
+  <include name="button_bg_pressed"/>
+  <include name="minimize_button_icon"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused">
+  <include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused_prelight">
+  <!--<include name="button_bg_unfocused_prelight"/>-->
+  <include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused_pressed">
+  <include name="button_bg_unfocused_pressed"/>
+  <include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+
+
+
+<draw_ops name="blank">
+<!-- nothing -->
+</draw_ops>
+
+<frame_style name="normal" geometry="normal">
+  <piece position="entire_background" draw_ops="bevel_unfocused"/>
+  <piece position="title" draw_ops="title_unfocused"/>
+  <button function="close" state="normal" draw_ops="close_button_unfocused"/>
+  <button function="close" state="pressed" draw_ops="close_button_unfocused_pressed"/>
+  <button function="close" state="prelight" draw_ops="close_button_unfocused_prelight"/>
+  <button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/>
+  <button function="maximize" state="pressed" draw_ops="maximize_button_unfocused_pressed"/>
+  <button function="maximize" state="prelight" draw_ops="maximize_button_unfocused_prelight"/>
+  <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
+  <button function="minimize" state="pressed" draw_ops="minimize_button_unfocused_pressed"/>
+  <button function="minimize" state="prelight" draw_ops="minimize_button_unfocused_prelight"/>
+  <button function="menu" state="normal" draw_ops="menu_button_unfocused"/>
+  <button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+</frame_style>
+
+<frame_style name="focused" geometry="normal" parent="normal">
+  <piece position="entire_background" draw_ops="bevel_border"/>
+  <piece position="title" draw_ops="title"/>
+  <button function="close" state="normal" draw_ops="close_button_normal"/>
+  <button function="close" state="pressed" draw_ops="close_button_pressed"/>
+  <button function="close" state="prelight" draw_ops="close_button_prelight"/>
+  <button function="maximize" state="normal" draw_ops="maximize_button_normal"/>
+  <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/>
+  <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/>
+  <button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
+  <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
+  <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
+  <button function="menu" state="normal" draw_ops="menu_button_normal"/>
+</frame_style>
+
+<frame_style name="normal_maximized" geometry="normal_maximized">
+  <piece position="entire_background" draw_ops="bevel_unfocused"/>
+  <piece position="title" draw_ops="title_max_unfocused"/>
+  <button function="close" state="normal" draw_ops="close_button_unfocused"/>
+  <button function="close" state="pressed" draw_ops="close_button_unfocused_pressed"/>
+  <button function="close" state="prelight" draw_ops="close_button_unfocused_prelight"/>
+  <button function="maximize" state="normal" draw_ops="restore_button_unfocused"/>
+  <button function="maximize" state="pressed" draw_ops="restore_button_unfocused_pressed"/>
+  <button function="maximize" state="prelight" draw_ops="restore_button_unfocused_prelight"/>
+  <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
+  <button function="minimize" state="pressed" draw_ops="minimize_button_unfocused_pressed"/>
+  <button function="minimize" state="prelight" draw_ops="minimize_button_unfocused_prelight"/>
+  <button function="menu" state="normal" draw_ops="menu_button_unfocused"/>
+  <button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+</frame_style>
+
+<frame_style name="focused_maximized" geometry="normal_maximized" parent="normal">
+  <piece position="title" draw_ops="title_max"/>
+  <button function="close" state="normal" draw_ops="close_button_normal"/>
+  <button function="close" state="pressed" draw_ops="close_button_pressed"/>
+  <button function="close" state="prelight" draw_ops="close_button_prelight"/>
+  <button function="maximize" state="normal" draw_ops="restore_button_normal"/>
+  <button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
+  <button function="maximize" state="prelight" draw_ops="restore_button_prelight"/>
+  <button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
+  <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
+  <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
+  <piece position="entire_background" draw_ops="bevel_maximized"/>
+
+
+
+  <button function="menu" state="normal" draw_ops="menu_button_normal"/>
+</frame_style>
+
+<frame_style name="border" geometry="border" parent="normal">
+  <piece position="entire_background" draw_ops="bevel_unfocused"/>
+  <piece position="title" draw_ops="blank"/>
+</frame_style>
+
+<frame_style_set name="normal">
+   <frame focus="yes" state="normal" resize="both" style="focused"/>
+   <frame focus="no" state="normal" resize="both" style="normal"/>
+   <frame focus="yes" state="maximized" style="focused_maximized"/>
+   <frame focus="no" state="maximized" style="normal_maximized"/>
+   <frame focus="yes" state="shaded" style="focused"/>
+   <frame focus="no" state="shaded" style="normal"/>
+   <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
+   <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
+</frame_style_set>
+
+<frame_style_set name="utility" parent="normal">
+<frame focus="yes" state="normal" resize="both" style="focused"/>
+<frame focus="no" state="normal" resize="both" style="normal"/>
+<!-- this is a bunch of crack since utility windows shouldn't be maximized -->
+<frame focus="yes" state="maximized" style="focused"/>
+<frame focus="no" state="maximized" style="normal"/>
+<frame focus="yes" state="shaded" style="focused"/>
+<frame focus="no" state="shaded" style="normal"/>
+<frame focus="yes" state="maximized_and_shaded" style="focused"/>
+<frame focus="no" state="maximized_and_shaded" style="normal"/>
+</frame_style_set>
+
+<frame_style_set name="border">
+<frame focus="yes" state="normal" resize="both" style="border"/>
+<frame focus="no" state="normal" resize="both" style="border"/>
+<frame focus="yes" state="maximized" style="border"/>
+<frame focus="no" state="maximized" style="border"/>
+<frame focus="yes" state="shaded" style="border"/>
+<frame focus="no" state="shaded" style="border"/>
+<frame focus="yes" state="maximized_and_shaded" style="border"/>
+<frame focus="no" state="maximized_and_shaded" style="border"/>
+</frame_style_set>
+
+<window type="normal" style_set="normal"/>
+<window type="dialog" style_set="normal"/>
+<window type="modal_dialog" style_set="normal"/>
+<window type="menu" style_set="normal"/>
+<window type="utility" style_set="normal"/>
+<window type="border" style_set="border"/>
+
+<menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/>
+<menu_icon function="maximize" state="normal" draw_ops="maximize_button_icon_unfocused"/>
+<menu_icon function="unmaximize" state="normal" draw_ops="restore_button_icon_unfocused"/>
+<menu_icon function="minimize" state="normal" draw_ops="minimize_button_icon_unfocused"/>
+
+</metacity_theme>
diff --git a/desktop-themes/Green-Submarine-border/metacity-1/stripes.png b/desktop-themes/Green-Submarine-border/metacity-1/stripes.png
new file mode 100644
index 00000000..447fd7f5
--- /dev/null
+++ b/desktop-themes/Green-Submarine-border/metacity-1/stripes.png
diff --git a/desktop-themes/Green-Submarine/metacity-1/metacity-theme-1.xml b/desktop-themes/Green-Submarine/metacity-1/metacity-theme-1.xml
index 5e44ca48..34f91cfd 100644
--- a/desktop-themes/Green-Submarine/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/Green-Submarine/metacity-1/metacity-theme-1.xml
@@ -11,9 +11,9 @@
 </info>
  
 <frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" 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_width" value="1"/>
+  <distance name="right_width" value="1"/>
+  <distance name="bottom_height" value="1"/>
   <distance name="left_titlebar_edge" value="4"/>
   <distance name="right_titlebar_edge" value="4"/>
   <aspect_ratio name="button" value="1"/>
@@ -26,7 +26,7 @@
   <!-- strip frame spacing off the normal geometry when maximised -->
   <distance name="left_width" value="0"/>
   <distance name="right_width" value="0"/>
-  <distance name="bottom_height" value="1"/>
+  <distance name="bottom_height" value="0"/>
   <distance name="left_titlebar_edge" value="1"/>
   <distance name="right_titlebar_edge" value="1"/>
   <distance name="title_vertical_pad" value="1"/>
@@ -35,9 +35,9 @@
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false" rounded_top_left="true" rounded_top_right="true"  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_width" value="1"/>
+  <distance name="right_width" value="1"/>
+  <distance name="bottom_height" value="1"/>
   <distance name="left_titlebar_edge" value="0"/>
   <distance name="right_titlebar_edge" value="0"/>
   <distance name="button_width" value="0"/>
@@ -51,18 +51,18 @@
 <constant name="ButtonIPad" value="3"/>
 
 <draw_ops name="inner_window_border">
-  <gradient type="vertical" x="0" y="top_height-1" width="3" height="height-bottom_height-top_height+2">
+  <gradient type="vertical" x="0" y="top_height-1" width="1" height="height-bottom_height-top_height+2">
     <color value="#303030"/>
     <color value="#303030"/>
     <color value="#303030"/>
   </gradient>
-  <gradient type="vertical" x="width-right_width" y="top_height-1" width="3" height="height-bottom_height-top_height+2">
+  <gradient type="vertical" x="width-right_width" y="top_height-1" width="1" height="height-bottom_height-top_height+2">
     <color value="#303030"/>
     <color value="#303030"/>
     <color value="#303030"/>
   </gradient>
 
-  <gradient type="horizontal" x="0" y="height-bottom_height" width="width" height="3">
+  <gradient type="horizontal" x="0" y="height-bottom_height" width="width" height="1">
     <color value="#303030"/>
     <color value="#303030"/>
     <color value="#303030"/>
diff --git a/desktop-themes/Makefile.am b/desktop-themes/Makefile.am
index 34fce3b2..c52d90a7 100644
--- a/desktop-themes/Makefile.am
+++ b/desktop-themes/Makefile.am
@@ -3,9 +3,11 @@ SUBDIRS = \
 	BlueMenta \
 	BlueMenta-border \
 	Blue-Submarine \
+	Blue-Submarine-border \
 	ContrastHigh \
 	GreenLaguna \
 	Green-Submarine \
+	Green-Submarine-border \
 	HighContrastInverse \
 	Menta \
 	Menta-border \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2019f763..89e67602 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,10 +5,12 @@ desktop-themes/BlackMATE/index.theme.in
 desktop-themes/BlueMenta/index.theme.in
 desktop-themes/BlueMenta-border/index.theme.in
 desktop-themes/Blue-Submarine/index.theme.in
+desktop-themes/Blue-Submarine-border/index.theme.in
 desktop-themes/ContrastHigh/index.theme.in
 desktop-themes/HighContrastInverse/index.theme.in
 desktop-themes/GreenLaguna/index.theme.in
 desktop-themes/Green-Submarine/index.theme.in
+desktop-themes/Green-Submarine-border/index.theme.in
 desktop-themes/Menta/index.theme.in
 desktop-themes/Menta-border/index.theme.in
 desktop-themes/TraditionalGreen/index.theme.in