diff --git a/fvwm_mfl_:0.pid b/fvwm_mfl_:0.pid
new file mode 100644
index 0000000..69dcc71
--- /dev/null
+++ b/fvwm_mfl_:0.pid
@@ -0,0 +1 @@
+41840
\ No newline at end of file
diff --git a/infra/cosmrc b/infra/cosmrc
index 1284d47..84c31db 100644
--- a/infra/cosmrc
+++ b/infra/cosmrc
@@ -1,10 +1,15 @@
 # Set the standard font for elements.
-Style * Font "$[infostore.std_font]"
+DefaultFont "$[infostore.ui_font]"
+
+TitleStyle Font "$[infostore.std_font]"
+
+MenuStyle * TitleFont "$[infostore.ui_font]"
+MenuStyle * Font      "$[infostore.ui_font]"
 
 # Set FvwmScript theme settings.
-*FvwmScript: DefaultFont     "$[infostore.small_font]"
+*FvwmScript: DefaultFont     "$[infostore.ui_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
+Read         $[FVWM_USERDIR]/../fxde-assets/themes/$[infostore.theme]/theme.conf
+Read         $[FVWM_USERDIR]/../fxde-assets/cursors/$[infostore.cursor]/theme.conf
diff --git a/infra/funcrc b/infra/funcrc
index 75d4936..118c3a2 100644
--- a/infra/funcrc
+++ b/infra/funcrc
@@ -66,5 +66,5 @@ AddToFunc   LargeifyFunc
 # A simple function to set the wallpaper.
 DestroyFunc PaperBoy
 AddToFunc   PaperBoy
-    + I          InfoStoreAdd pape $[FVWM_USERDIR]/.data/prefs/cosmetics/pape
+    + I          InfoStoreAdd pape $[FVWM_USERDIR]/../fxde-data/prefs/cosmetics/pape
     + I Exec     $[infostore.posix]/paperboy $[infostore.papedir]/`cat $[infostore.pape]`
diff --git a/infra/menurc b/infra/menurc
index c45cc2d..1ab3019 100644
--- a/infra/menurc
+++ b/infra/menurc
@@ -2,8 +2,7 @@
 
 MenuStyle * MenuColorset 5, PopupDelayed, PopupDelay 300, PopupAsSubmenu, \
     HoldSubmenus, PopupOffset 1 100, PopdownImmediately, HilightTitleBack, \
-    TitleColorset 6, InactiveColorset 5, ActiveColorset 6, HilightBack, \
-    Font "$[infostore.small_font]"
+    TitleColorset 7, HilightBack, ActiveColorset 6
 
 
 
diff --git a/infra/varrc b/infra/varrc
index 29c6e58..b0ea353 100644
--- a/infra/varrc
+++ b/infra/varrc
@@ -2,5 +2,9 @@
 
 InfoStoreAdd posix   $[FVWM_USERDIR]/scripts/posix
 InfoStoreAdd fscript $[FVWM_USERDIR]/scripts/fvwmscript
-InfoStoreAdd sdir    $[FVWM_USERDIR]/assets/audio
-InfoStoreAdd papedir $[FVWM_USERDIR]/assets/wallpaper
+InfoStoreAdd sdir    $[FVWM_USERDIR]/../fxde-assets/audio
+InfoStoreAdd papedir $[FVWM_USERDIR]/../fxde-assets/wallpaper
+
+# Define some internal variables.
+
+ImagePath "$[FVWM_USERDIR]/../fxde-assets/themes/RiscOS/gtk-2.0/;.png"
diff --git a/modules/pager b/modules/pager
index aaf9345..70a0ce2 100644
--- a/modules/pager
+++ b/modules/pager
@@ -4,7 +4,7 @@ Style "ShelfPager"  NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \
 
 DestroyModuleConfig ShelfPager
 *ShelfPager:        Geometry        100+100
-*ShelfPager:        Font            "$[infostore.ui_font_bold]"
+*ShelfPager:        Font            "$[infostore.ui_font]"
 *ShelfPager:        Rows            1
 *ShelfPager:        Columns         1
 *ShelfPager:        Colorset        * 13
diff --git a/modules/shelf b/modules/shelf
index cdc6081..6659118 100644
--- a/modules/shelf
+++ b/modules/shelf
@@ -13,7 +13,7 @@ DestroyModuleConfig Shelf
 *Shelf:  Padding       2 2
 *Shelf:  Colorset      10
 *Shelf:  BoxSize       fixed
-*Shelf:  Font          "$[infostore.ui_font_bold]"
+*Shelf:  Font          "$[infostore.ui_font]"
 *Shelf:  Colorset      9
 *Shelf:  PressColorset 10