diff --git a/AtariGem5/theme.conf b/AtariGem5/theme.conf
index d66012f..38c4374 100644
--- a/AtariGem5/theme.conf
+++ b/AtariGem5/theme.conf
@@ -1,14 +1,15 @@
 DestroyDecor AtariGem5
 AddToDecor   AtariGem5
 
-    + Style * FluxBoxHandles
-    + Style * HandleWidth 10
+    + Style * BorderWidth 3
+    + Style * !Handles
 
-    + Colorset 2 fg #CCCCCC
-    + Colorset 3 fg #CCCCCC, bg #000000, hi #585858, sh #000000, Plain, NoShape
-    + Colorset 4 fg #FFFFFF, bg #000000, hi #868686, sh #000000, Plain, NoShape
+    + Colorset 2 fg #000000
+    + Colorset 3 fg #000000, bg #A0BFA0, hi #BDBDBD, sh #000000, Plain, NoShape
+    + Colorset 4 fg #000000, bg #A0BFA0, hi #868686, sh #000000, Plain, NoShape
 
-    + Style * HilightBorderColorset 3, BorderColorset 4, HilightColorset 2
+    + Style * HilightBorderColorset 3, BorderColorset 4, HilightColorset 2, Colorset 2
+    + TitleStyle Colorset 3
 
     + ButtonStyle 1 \
         ActiveUp   (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/focused/min.png -- Flat) \
@@ -25,6 +26,13 @@ AddToDecor   AtariGem5
         ActiveDown (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/pressed/maxpr.png -- Flat) \
         Inactive   (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/focused/max.png -- Flat)
 
+    + TitleStyle AllActive MultiPixmap Main Colorset 4 \
+            Buttons TiledPixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/underbuttons.png -- Flat
+    + TitleStyle AllInactive MultiPixmap Main Colorset 3 \
+            Buttons TiledPixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/underbuttons.png -- Flat
+
+    + ButtonStyle All -- UseTitleStyle
+
 
     + Mouse 1 1 A Iconify
     + Mouse 1 2 A Close
diff --git a/AtariGem5/underbuttons.png b/AtariGem5/underbuttons.png
new file mode 100644
index 0000000..16eccc4
Binary files /dev/null and b/AtariGem5/underbuttons.png differ