diff --git a/Screenshots/android_notification.png b/Screenshots/android_notification.png
index 8be4acff..d9496621 100644
Binary files a/Screenshots/android_notification.png and b/Screenshots/android_notification.png differ
diff --git a/Screenshots/c64.png b/Screenshots/c64.png
index 3cd05559..ed140ef0 100644
Binary files a/Screenshots/c64.png and b/Screenshots/c64.png differ
diff --git a/Screenshots/glue_pro_blue.png b/Screenshots/glue_pro_blue.png
index e8048b94..7ec9b92d 100644
Binary files a/Screenshots/glue_pro_blue.png and b/Screenshots/glue_pro_blue.png differ
diff --git a/Screenshots/purple.png b/Screenshots/purple.png
index 7d56272f..cdb512e4 100644
Binary files a/Screenshots/purple.png and b/Screenshots/purple.png differ
diff --git a/Screenshots/solarized.png b/Screenshots/solarized.png
index 617b8621..8855612e 100644
Binary files a/Screenshots/solarized.png and b/Screenshots/solarized.png differ
diff --git a/Screenshots/solarized_alternate.png b/Screenshots/solarized_alternate.png
index fdc1249a..178b37d1 100644
Binary files a/Screenshots/solarized_alternate.png and b/Screenshots/solarized_alternate.png differ
diff --git a/generator.html b/generator.html
index f454f59b..cb0cbfda 100644
--- a/generator.html
+++ b/generator.html
@@ -547,6 +547,7 @@ rofi.color-enabled: true</span></pre><p id="command">rofi</p></div>
     var title = document.createElement('h2');
     title.appendChild(new Text('Overall background'));
     window_settings.appendChild(title);
+    window_settings.appendChild(new Text("(This is not part of the theme, but to test the effect of transparency)"));
 
     var label = document.createElement('label');
 
diff --git a/p05-Themes.md b/p05-Themes.md
index 7a6f609e..39b216a6 100644
--- a/p05-Themes.md
+++ b/p05-Themes.md
@@ -7,7 +7,27 @@ title: Themes
 # Rofi Themes: 
 Below a list of user contributed **rofi** themes.
 
-# Arc
+# android_notification.theme
+by Rasi
+
+## Screenshot
+
+![Screenshot](./Screenshots/android_notification.png)
+
+## XResources
+
+~~~
+! ------------------------------------------------------------------------------
+! ROFI Color theme
+! ------------------------------------------------------------------------------
+rofi.color-enabled: true
+rofi.color-window: #273238, #273238, #1e2529
+rofi.color-normal: #273238, #c1c1c1, #273238, #394249, #ffffff
+rofi.color-active: #273238, #80cbc4, #273238, #394249, #80cbc4
+rofi.color-urgent: #273238, #ff1844, #273238, #394249, #ff1844
+~~~
+
+# Arc.theme
 
 ## Screenshot
 
@@ -33,26 +53,7 @@ rofi.color-window:                   #ffffff,#f5f5f5
 rofi.separator-style:                solid
 ~~~
 
-# android_notification
-
-## Screenshot
-
-![Screenshot](./Screenshots/android_notification.png)
-
-## XResources
-
-~~~
-! ------------------------------------------------------------------------------
-! ROFI Color theme
-! ------------------------------------------------------------------------------
-rofi.color-enabled: true
-rofi.color-window: #273238, #273238, #1e2529
-rofi.color-normal: #273238, #c1c1c1, #273238, #394249, #ffffff
-rofi.color-active: #273238, #80cbc4, #273238, #394249, #80cbc4
-rofi.color-urgent: #273238, #ff1844, #273238, #394249, #ff1844
-~~~
-
-# blor
+# blor.theme
 
 ## Screenshot
 
@@ -78,7 +79,7 @@ rofi.color-window:                   argb:ee222222,  #FAC863 ,  #FAC863
 rofi.separator-style:                solid
 ~~~
 
-# blue
+# blue.theme
 
 ## Screenshot
 
@@ -102,7 +103,8 @@ rofi.color-active:                   argb:00000000, #a0ffa0, argb:00000000, #a0f
 rofi.color-window:                   argb:ee0060a0, #00b0ef,#00b0ef
 ~~~
 
-# c64
+# c64.theme
+by Rasi
 
 ## Screenshot
 
@@ -121,7 +123,8 @@ rofi.color-active: #0039ff, #68ba50, #0039ff, #4f80ff, #68ba50
 rofi.color-urgent: #0039ff, #ff7047, #0039ff, #4f80ff, #ff7047
 ~~~
 
-# glue_pro_blue
+# glue_pro_blue.theme
+by Rasi
 
 ## Screenshot
 
@@ -140,7 +143,7 @@ rofi.color-active: #393939, #268bd2, #393939, #268bd2, #205171
 rofi.color-urgent: #393939, #f3843d, #393939, #268bd2, #ffc39c
 ~~~
 
-# lb
+# lb.theme
 
 ## Screenshot
 
@@ -167,7 +170,8 @@ rofi.color-window:                   argb:ee333333, #1aa,#1aa
 rofi.separator-style:                dash
 ~~~
 
-# purple
+# purple.theme
+by Rasi
 
 ## Screenshot
 
@@ -193,7 +197,28 @@ rofi.color-window:                   #2f1e2e, argb:36ef6155, argb:2fef6155
 rofi.separator-style:                dash
 ~~~
 
-# solarized
+# solarized_alternate.theme
+by Rasi
+
+## Screenshot
+
+![Screenshot](./Screenshots/solarized_alternate.png)
+
+## XResources
+
+~~~
+! ------------------------------------------------------------------------------
+! ROFI Color theme
+! ------------------------------------------------------------------------------
+rofi.color-enabled: true
+rofi.color-window: #002b37, #002b37, #003642
+rofi.color-normal: #002b37, #819396, #003643, #008ed4, #ffffff
+rofi.color-active: #002b37, #008ed4, #003643, #008ed4, #66c6ff
+rofi.color-urgent: #002b37, #da4281, #003643, #008ed4, #890661
+~~~
+
+# solarized.theme
+by Rasi
 
 ## Screenshot
 
@@ -212,19 +237,3 @@ rofi.color-active: #002b37, #008ed4, #002b37, #003642, #008ed4
 rofi.color-urgent: #002b37, #da4281, #002b37, #003642, #da4281
 ~~~
 
-# solarized_alternate
-
-## Screenshot
-
-![Screenshot](./Screenshots/solarized_alternate.png)
-
-## XResources
-
-~~~
-rofi.color-enabled: true
-rofi.color-window: #002b37, #002b37, #003642
-rofi.color-normal: #002b37, #819396, #003643, #008ed4, #ffffff
-rofi.color-active: #002b37, #008ed4, #003643, #008ed4, #66c6ff
-rofi.color-urgent: #002b37, #da4281, #003643, #008ed4, #890661
-~~~
-