diff --git a/3rdparty/themes/CompareMessages.cpp b/3rdparty/mmu_man/themes/CompareMessages.cpp
similarity index 100%
rename from 3rdparty/themes/CompareMessages.cpp
rename to 3rdparty/mmu_man/themes/CompareMessages.cpp
diff --git a/3rdparty/themes/DumpMessage.cpp b/3rdparty/mmu_man/themes/DumpMessage.cpp
similarity index 100%
rename from 3rdparty/themes/DumpMessage.cpp
rename to 3rdparty/mmu_man/themes/DumpMessage.cpp
diff --git a/3rdparty/themes/DumpMessage.h b/3rdparty/mmu_man/themes/DumpMessage.h
similarity index 100%
rename from 3rdparty/themes/DumpMessage.h
rename to 3rdparty/mmu_man/themes/DumpMessage.h
diff --git a/3rdparty/themes/FileUtils.cpp b/3rdparty/mmu_man/themes/FileUtils.cpp
similarity index 100%
rename from 3rdparty/themes/FileUtils.cpp
rename to 3rdparty/mmu_man/themes/FileUtils.cpp
diff --git a/3rdparty/themes/FileUtils.h b/3rdparty/mmu_man/themes/FileUtils.h
similarity index 100%
rename from 3rdparty/themes/FileUtils.h
rename to 3rdparty/mmu_man/themes/FileUtils.h
diff --git a/3rdparty/themes/Jamfile b/3rdparty/mmu_man/themes/Jamfile
similarity index 100%
rename from 3rdparty/themes/Jamfile
rename to 3rdparty/mmu_man/themes/Jamfile
diff --git a/3rdparty/themes/MakeScreenshot.cpp b/3rdparty/mmu_man/themes/MakeScreenshot.cpp
similarity index 100%
rename from 3rdparty/themes/MakeScreenshot.cpp
rename to 3rdparty/mmu_man/themes/MakeScreenshot.cpp
diff --git a/3rdparty/themes/ParseMessage.cpp b/3rdparty/mmu_man/themes/ParseMessage.cpp
similarity index 100%
rename from 3rdparty/themes/ParseMessage.cpp
rename to 3rdparty/mmu_man/themes/ParseMessage.cpp
diff --git a/3rdparty/themes/ParseMessage.h b/3rdparty/mmu_man/themes/ParseMessage.h
similarity index 100%
rename from 3rdparty/themes/ParseMessage.h
rename to 3rdparty/mmu_man/themes/ParseMessage.h
diff --git a/3rdparty/themes/TextInputAlert.cpp b/3rdparty/mmu_man/themes/TextInputAlert.cpp
similarity index 100%
rename from 3rdparty/themes/TextInputAlert.cpp
rename to 3rdparty/mmu_man/themes/TextInputAlert.cpp
diff --git a/3rdparty/themes/TextInputAlert.h b/3rdparty/mmu_man/themes/TextInputAlert.h
similarity index 100%
rename from 3rdparty/themes/TextInputAlert.h
rename to 3rdparty/mmu_man/themes/TextInputAlert.h
diff --git a/3rdparty/themes/ThemeAddonItem.cpp b/3rdparty/mmu_man/themes/ThemeAddonItem.cpp
similarity index 100%
rename from 3rdparty/themes/ThemeAddonItem.cpp
rename to 3rdparty/mmu_man/themes/ThemeAddonItem.cpp
diff --git a/3rdparty/themes/ThemeAddonItem.h b/3rdparty/mmu_man/themes/ThemeAddonItem.h
similarity index 100%
rename from 3rdparty/themes/ThemeAddonItem.h
rename to 3rdparty/mmu_man/themes/ThemeAddonItem.h
diff --git a/3rdparty/themes/ThemeInterfaceView.cpp b/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp
similarity index 100%
rename from 3rdparty/themes/ThemeInterfaceView.cpp
rename to 3rdparty/mmu_man/themes/ThemeInterfaceView.cpp
diff --git a/3rdparty/themes/ThemeInterfaceView.h b/3rdparty/mmu_man/themes/ThemeInterfaceView.h
similarity index 100%
rename from 3rdparty/themes/ThemeInterfaceView.h
rename to 3rdparty/mmu_man/themes/ThemeInterfaceView.h
diff --git a/3rdparty/themes/ThemeItem.cpp b/3rdparty/mmu_man/themes/ThemeItem.cpp
similarity index 100%
rename from 3rdparty/themes/ThemeItem.cpp
rename to 3rdparty/mmu_man/themes/ThemeItem.cpp
diff --git a/3rdparty/themes/ThemeItem.h b/3rdparty/mmu_man/themes/ThemeItem.h
similarity index 100%
rename from 3rdparty/themes/ThemeItem.h
rename to 3rdparty/mmu_man/themes/ThemeItem.h
diff --git a/3rdparty/themes/ThemeManager.cpp b/3rdparty/mmu_man/themes/ThemeManager.cpp
similarity index 100%
rename from 3rdparty/themes/ThemeManager.cpp
rename to 3rdparty/mmu_man/themes/ThemeManager.cpp
diff --git a/3rdparty/themes/ThemeManager.h b/3rdparty/mmu_man/themes/ThemeManager.h
similarity index 100%
rename from 3rdparty/themes/ThemeManager.h
rename to 3rdparty/mmu_man/themes/ThemeManager.h
diff --git a/3rdparty/themes/Themes.rdef b/3rdparty/mmu_man/themes/Themes.rdef
similarity index 100%
rename from 3rdparty/themes/Themes.rdef
rename to 3rdparty/mmu_man/themes/Themes.rdef
diff --git a/3rdparty/themes/ThemesAddon.cpp b/3rdparty/mmu_man/themes/ThemesAddon.cpp
similarity index 100%
rename from 3rdparty/themes/ThemesAddon.cpp
rename to 3rdparty/mmu_man/themes/ThemesAddon.cpp
diff --git a/3rdparty/themes/ThemesAddon.h b/3rdparty/mmu_man/themes/ThemesAddon.h
similarity index 100%
rename from 3rdparty/themes/ThemesAddon.h
rename to 3rdparty/mmu_man/themes/ThemesAddon.h
diff --git a/3rdparty/themes/UITheme.h b/3rdparty/mmu_man/themes/UITheme.h
similarity index 100%
rename from 3rdparty/themes/UITheme.h
rename to 3rdparty/mmu_man/themes/UITheme.h
diff --git a/3rdparty/themes/ViewItem.cpp b/3rdparty/mmu_man/themes/ViewItem.cpp
similarity index 100%
rename from 3rdparty/themes/ViewItem.cpp
rename to 3rdparty/mmu_man/themes/ViewItem.cpp
diff --git a/3rdparty/themes/ViewItem.h b/3rdparty/mmu_man/themes/ViewItem.h
similarity index 100%
rename from 3rdparty/themes/ViewItem.h
rename to 3rdparty/mmu_man/themes/ViewItem.h
diff --git a/3rdparty/themes/addons/BackgroundsAddon.cpp b/3rdparty/mmu_man/themes/addons/BackgroundsAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/BackgroundsAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/BackgroundsAddon.cpp
diff --git a/3rdparty/themes/addons/BeIDEAddon.cpp b/3rdparty/mmu_man/themes/addons/BeIDEAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/BeIDEAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/BeIDEAddon.cpp
diff --git a/3rdparty/themes/addons/DanoWindowDecorAddon.cpp b/3rdparty/mmu_man/themes/addons/DanoWindowDecorAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/DanoWindowDecorAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/DanoWindowDecorAddon.cpp
diff --git a/3rdparty/themes/addons/DeskbarAddon.cpp b/3rdparty/mmu_man/themes/addons/DeskbarAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/DeskbarAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/DeskbarAddon.cpp
diff --git a/3rdparty/themes/addons/EddieAddon.cpp b/3rdparty/mmu_man/themes/addons/EddieAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/EddieAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/EddieAddon.cpp
diff --git a/3rdparty/themes/addons/PeAddon.cpp b/3rdparty/mmu_man/themes/addons/PeAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/PeAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/PeAddon.cpp
diff --git a/3rdparty/themes/addons/ScreensaverAddon.cpp b/3rdparty/mmu_man/themes/addons/ScreensaverAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/ScreensaverAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/ScreensaverAddon.cpp
diff --git a/3rdparty/themes/addons/SoundplayColorAddon.cpp b/3rdparty/mmu_man/themes/addons/SoundplayColorAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/SoundplayColorAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/SoundplayColorAddon.cpp
diff --git a/3rdparty/themes/addons/SoundsAddon.cpp b/3rdparty/mmu_man/themes/addons/SoundsAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/SoundsAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/SoundsAddon.cpp
diff --git a/3rdparty/themes/addons/TerminalAddon.cpp b/3rdparty/mmu_man/themes/addons/TerminalAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/TerminalAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/TerminalAddon.cpp
diff --git a/3rdparty/themes/addons/UISettingsAddon.cpp b/3rdparty/mmu_man/themes/addons/UISettingsAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/UISettingsAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/UISettingsAddon.cpp
diff --git a/3rdparty/themes/addons/WinampSkinAddon.cpp b/3rdparty/mmu_man/themes/addons/WinampSkinAddon.cpp
similarity index 100%
rename from 3rdparty/themes/addons/WinampSkinAddon.cpp
rename to 3rdparty/mmu_man/themes/addons/WinampSkinAddon.cpp