diff --git a/.data/prefs/cosmetics/pape b/.data/prefs/cosmetics/pape
index 1058396..52d68b2 100644
--- a/.data/prefs/cosmetics/pape
+++ b/.data/prefs/cosmetics/pape
@@ -1 +1 @@
-space-station.png
+bubble-slope.png
diff --git a/assets b/assets
new file mode 120000
index 0000000..c55060f
--- /dev/null
+++ b/assets
@@ -0,0 +1 @@
+../fxde-assets/
\ No newline at end of file
diff --git a/infra/cosmrc b/infra/cosmrc
index 11b328f..59e38a1 100644
--- a/infra/cosmrc
+++ b/infra/cosmrc
@@ -1,6 +1,10 @@
 # Set the standard font for elements.
 Style * Font "$[infostore.std_font]"
 
+# Set FvwmScript theme settings.
+*FvwmScript: DefaultFont "$[infostore.small_font]"
+*FvwmScript: DefaultColorset 9
+
 # Load theme settings.
 Read $[FVWM_USERDIR]/assets/themes/$[infostore.theme]/theme.conf
  Read $[FVWM_USERDIR]/assets/cursors/$[infostore.cursor]/theme.conf
diff --git a/infra/menurc b/infra/menurc
index 65935e2..2140d2b 100644
--- a/infra/menurc
+++ b/infra/menurc
@@ -1,9 +1,10 @@
 # The first section of the document defines the look and feel of menus.
 
-    MenuStyle * PopupDelayed, PopupDelay 300, PopupAsSubmenu, HoldSubmenus \
-    PopupOffset 1 100, PopdownImmediately, Font "$[infostore.small_font]", \
-    HilightTitleBack, TitleColorset 6, InactiveColorset 5, ActiveColorset 6, \
-    HilightBack
+    MenuStyle * MenuColorset 5, PopupDelayed, PopupDelay 300, PopupAsSubmenu, \
+    HoldSubmenus, PopupOffset 1 100, PopdownImmediately, HilightTitleBack, \
+    TitleColorset 6, InactiveColorset 5, ActiveColorset 6, HilightBack, \
+    Font "$[infostore.small_font]"
+
 
 
 
diff --git a/infra/windrc b/infra/windrc
index 113d0ff..03d923e 100644
--- a/infra/windrc
+++ b/infra/windrc
@@ -16,5 +16,8 @@ Style XCalendar   !Title,!Borders,!Handles,Sticky,StaysOnTop,WindowListSkip
 Style svkbd       !Title,!Borders,!Handles,Sticky,StaysOnTop,WindowListSkip,NeverFocus
 Style XVkbd       !Title,!Borders,!Handles,Sticky,StaysOnTop,WindowListSkip,NeverFocus
 
+# We don't want to worry about rubber-banding freezing the screen...
+OpaqueMoveSize unlimited
+
 # This is an icon-free zone, ma'am.
 Style * NoIcon
diff --git a/modules/pager b/modules/pager
index 081b1e3..8ad15ab 100644
--- a/modules/pager
+++ b/modules/pager
@@ -6,7 +6,9 @@ DestroyModuleConfig ShelfPager
 *ShelfPager:        Font "$[infostore.ui_font_bold]"
 *ShelfPager:        Rows 1
 *ShelfPager:        Columns 1
-*ShelfPager:        HilightColorset * 3
+*ShelfPager:        Colorset * 13
+*ShelfPager:        HilightColorset * 14
 *ShelfPager:        Back rgb:BE/BE/BE
 *ShelfPager:        WindowColors rgb:A5/A5/A5 rgb:A5/A5/A5 rgb:9B/A9/C9 rgb:9B/A9/C9
 *ShelfPager:        SolidSeparators
+*ShelfPager:        Label * FXDE
diff --git a/scripts/fvwmscript/FvwmScript-ConfirmQuit b/scripts/fvwmscript/FvwmScript-ConfirmQuit
index 164866a..569878c 100644
--- a/scripts/fvwmscript/FvwmScript-ConfirmQuit
+++ b/scripts/fvwmscript/FvwmScript-ConfirmQuit
@@ -1,6 +1,5 @@
 WindowTitle {Session}
 WindowSize  375 185
-Colorset 10
 
 Init
  Begin
@@ -50,7 +49,7 @@ Property
   Size 0 0
   Position 115 75
   Flags NoReliefString
-  Colorset 15
+  Colorset 10
   Type RadioButton
   Value 0
   Main
@@ -70,7 +69,7 @@ Property
   Size 0 0
   Position 115 95
   Flags NoReliefString
-  Colorset 15
+  Colorset 10
   Type RadioButton
   Value 0
   Main
@@ -91,7 +90,7 @@ Property
   Size 0 0
   Position 115 115
   Flags NoReliefString
-  Colorset 15
+  Colorset 10
   Type RadioButton
   Value 0
   Main
@@ -111,7 +110,7 @@ Property
   Size 71 28
   Position 285 140
   Flags NoReliefString
-  Colorset 12
+  Colorset 13
   Type PushButton
   Main
     Case message of
@@ -127,7 +126,7 @@ Property
   Size 100 15
   Position 130 54
   Flags NoReliefString
-  Colorset 0
+  Colorset 9
   Type ItemDraw
   End
 
@@ -137,7 +136,7 @@ Property
   Size 100 15
   Position 130 74
   Flags NoReliefString
-  Colorset 0
+  Colorset 9
   Type ItemDraw
   End
 
@@ -147,7 +146,7 @@ Property
   Size 100 15
   Position 130 94
   Flags NoReliefString
-  Colorset 0
+  Colorset 9
   Type ItemDraw
   End
 
@@ -157,7 +156,7 @@ Property
   Size 80 15
   Position 130 114
   Flags NoReliefString
-  Colorset 0
+  Colorset 9
   Type ItemDraw
   End
 
@@ -167,7 +166,7 @@ Widget 7
 Property
   Title {Ok}
   Size 71 28
-  Colorset 12
+  Colorset 13
   Position 215 140
   Flags NoReliefString
   Type PushButton