diff --git a/3rdparty/mmu_man/themes/TODO.txt b/3rdparty/mmu_man/themes/TODO.txt
index 2e0b9c7de2..c4072191b7 100644
--- a/3rdparty/mmu_man/themes/TODO.txt
+++ b/3rdparty/mmu_man/themes/TODO.txt
@@ -1,4 +1,5 @@
 TODOs for Theme manager:
+* check R5 build
 * style cleanup (-> Haiku style)
 * enable theme comments again (tooltip on listitem ?).
 * make ParseMessage more robust
@@ -6,14 +7,16 @@ TODOs for Theme manager:
 * implement BackupFiles() methods to add required files to a zip.
 * fix TerminalAddon: get theme from haiku
 * Save as resource/BMessage ? (for editing)
+* broadcast _UIC for Haiku
 * ideas for addons:
 	- ~/config/settings/Tracker/DefaultFolderTemplate/ (default background ??)
 	- Desktop icon size ?
 	- Desktop shelf ? (dangerous)
+	- Deskbar logo (Be, leaf...)
 	- dircolors (cf. http://linux.die.net/man/5/dir_colors )
 	- icons (/etc/icons ? svg/hvif, setmime...)
 	- mouse cursors (needs app_server fixes ??)
 	- Pulse colors (-> sample code)
 	- BeIDE/Pe/Eddie full colors (map to singe namespace)
-
+	- Firefox theme ?
 
diff --git a/3rdparty/mmu_man/themes/ThemesAddon.cpp b/3rdparty/mmu_man/themes/ThemesAddon.cpp
index f67eb884e3..9042e36fa0 100644
--- a/3rdparty/mmu_man/themes/ThemesAddon.cpp
+++ b/3rdparty/mmu_man/themes/ThemesAddon.cpp
@@ -190,6 +190,10 @@ status_t ThemesAddon::CompareToCurrent(BMessage &theme)
 	BMessage current, a, b;
 	BackupCurrent(current);
 	status_t err;
+	
+	if (!MessageName())
+		return B_OK;
+	
 	err = theme.FindMessage(MessageName(), &a);
 	if (err)
 		return err;
diff --git a/3rdparty/mmu_man/themes/UITheme.h b/3rdparty/mmu_man/themes/UITheme.h
index fd6b741014..b4d5cf053b 100644
--- a/3rdparty/mmu_man/themes/UITheme.h
+++ b/3rdparty/mmu_man/themes/UITheme.h
@@ -78,6 +78,8 @@
 #define B_UI_MENU_SELECTED_BORDER_COLOR "be:c:MenSBr"
 #define B_UI_SUCCESS_COLOR "be:c:Success"
 #define B_UI_FAILURE_COLOR "be:c:Failure"
+// broadcasted on update
+#define B_UI_SETTINGS_CHANGED '_UIC'
 #endif
 
 #endif /* _Z_UI_THEME_H */
diff --git a/3rdparty/mmu_man/themes/addons/DeskbarAddon.cpp b/3rdparty/mmu_man/themes/addons/DeskbarAddon.cpp
index b553ba217e..25f3b06fb8 100644
--- a/3rdparty/mmu_man/themes/addons/DeskbarAddon.cpp
+++ b/3rdparty/mmu_man/themes/addons/DeskbarAddon.cpp
@@ -126,6 +126,9 @@ status_t DeskbarThemesAddon::MakeTheme(BMessage &theme, uint32 flags)
 	bool expanded;
 	BDeskbar db;
 
+	deskbar.RemoveName("db:location");
+	deskbar.RemoveName("db:expanded");
+
 	loc = db.Location(&expanded);
 	deskbar.AddInt32("db:location", (int32)loc);
 	deskbar.AddBool("db:expanded", expanded);