diff --git a/AtariGem5/metacity-1/close.png b/AtariGem5/focused/close.png
similarity index 100%
rename from AtariGem5/metacity-1/close.png
rename to AtariGem5/focused/close.png
diff --git a/AtariGem5/metacity-1/maximize-pressed.png b/AtariGem5/focused/max-alt.png
similarity index 100%
rename from AtariGem5/metacity-1/maximize-pressed.png
rename to AtariGem5/focused/max-alt.png
diff --git a/AtariGem5/metacity-1/maximize.png b/AtariGem5/focused/max.png
similarity index 100%
rename from AtariGem5/metacity-1/maximize.png
rename to AtariGem5/focused/max.png
diff --git a/AtariGem5/metacity-1/icon.png b/AtariGem5/focused/menu.png
similarity index 100%
rename from AtariGem5/metacity-1/icon.png
rename to AtariGem5/focused/menu.png
diff --git a/AtariGem5/metacity-1/minimize.png b/AtariGem5/focused/min.png
similarity index 100%
rename from AtariGem5/metacity-1/minimize.png
rename to AtariGem5/focused/min.png
diff --git a/AtariGem5/metacity-1/metacity-theme-1.xml b/AtariGem5/metacity-theme-1.xml
similarity index 100%
rename from AtariGem5/metacity-1/metacity-theme-1.xml
rename to AtariGem5/metacity-theme-1.xml
diff --git a/AtariGem5/metacity-1/close-pressed.png b/AtariGem5/pressed/closepr.png
similarity index 100%
rename from AtariGem5/metacity-1/close-pressed.png
rename to AtariGem5/pressed/closepr.png
diff --git a/AtariGem5/metacity-1/maximized.png b/AtariGem5/pressed/maxpr.png
similarity index 100%
rename from AtariGem5/metacity-1/maximized.png
rename to AtariGem5/pressed/maxpr.png
diff --git a/AtariGem5/metacity-1/icon-pressed.png b/AtariGem5/pressed/menupr.png
similarity index 100%
rename from AtariGem5/metacity-1/icon-pressed.png
rename to AtariGem5/pressed/menupr.png
diff --git a/AtariGem5/metacity-1/minimize-pressed.png b/AtariGem5/pressed/minpr.png
similarity index 100%
rename from AtariGem5/metacity-1/minimize-pressed.png
rename to AtariGem5/pressed/minpr.png
diff --git a/AtariGem5/theme.conf b/AtariGem5/theme.conf
new file mode 100644
index 0000000..d66012f
--- /dev/null
+++ b/AtariGem5/theme.conf
@@ -0,0 +1,33 @@
+DestroyDecor AtariGem5
+AddToDecor   AtariGem5
+
+    + Style * FluxBoxHandles
+    + Style * HandleWidth 10
+
+    + 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
+
+    + Style * HilightBorderColorset 3, BorderColorset 4, HilightColorset 2
+
+    + ButtonStyle 1 \
+        ActiveUp   (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/focused/min.png -- Flat) \
+        ActiveDown (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/pressed/minpr.png -- Flat) \
+        Inactive   (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/focused/min.png -- Flat)
+
+    + ButtonStyle 2 \
+        ActiveUp   (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/focused/close.png -- Flat) \
+        ActiveDown (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/pressed/closepr.png -- Flat) \
+        Inactive   (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/focused/close.png -- Flat)
+
+    + ButtonStyle 4 \
+        ActiveUp   (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/focused/max.png -- Flat) \
+        ActiveDown (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/pressed/maxpr.png -- Flat) \
+        Inactive   (Pixmap $[FVWM_USERDIR]/assets/themes/AtariGem5/focused/max.png -- Flat)
+
+
+    + Mouse 1 1 A Iconify
+    + Mouse 1 2 A Close
+    + Mouse 1 4 A Maximize
+
+Style * UseDecor AtariGem5
diff --git a/AtariGem5/unfocused b/AtariGem5/unfocused
new file mode 120000
index 0000000..52ced7f
--- /dev/null
+++ b/AtariGem5/unfocused
@@ -0,0 +1 @@
+focused/
\ No newline at end of file
diff --git a/RiscOS/gtk-symlink b/RiscOS/gtk-symlink
deleted file mode 120000
index 92edf85..0000000
--- a/RiscOS/gtk-symlink
+++ /dev/null
@@ -1 +0,0 @@
-/home/midfavila/.config/fxde-themes/gtk-symlink
\ No newline at end of file