diff --git a/apps/removable_app.lua b/apps/removable_app.lua
index 766fdc8..f7eee3c 100644
--- a/apps/removable_app.lua
+++ b/apps/removable_app.lua
@@ -57,6 +57,8 @@ laptop.register_app("removable", {
 					idata.label = "Backup of "..mtos.hwdef.description.." from "..os.date('%x')
 				elseif fields.format == "CS-BOS" then
 					idata.meta:set_string("os_format", "boot")
+					local disksys = mtos.bdev:get_app_storage("removable", 'os')
+					disksys.theme = "Shell"
 					idata.label = "CS-BOS Boot Disk"
 				end
 			elseif fields.restore then
diff --git a/nodes.lua b/nodes.lua
index a8eae02..065d77f 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -75,6 +75,7 @@ laptop.register_hardware("laptop:printer", {
 	infotext = 'Flash Printex',
 	sequence = { "off", "powersave", "on" },
 	custom_launcher = "printer_launcher",
+	custom_theme = "Shell",
 	hw_capabilities = {"hdd"},
 	node_defs = {
 
@@ -153,7 +154,7 @@ laptop.register_hardware("laptop:cube", {
 	description = "CUBE PC",
 	infotext = "CUBE PC",
 	sequence = { "off", "on"},
-	custom_theme = "Red",
+	custom_theme = "Shell",
 	hw_capabilities = { "hdd", "floppy", "net", "liveboot" },
 	node_defs = {
 		["on"] = {
diff --git a/os.lua b/os.lua
index 4101b52..0f5095d 100644
--- a/os.lua
+++ b/os.lua
@@ -59,8 +59,10 @@ end
 
 -- Set current theme
 function os_class:set_theme(theme)
-	if laptop.themes[theme] and self.sysdata then
-		self.sysdata.theme = theme
+	if laptop.themes[theme] then
+		if self.sysdata then
+			self.sysdata.theme = theme
+		end
 		self.theme = self:get_theme()
 		self:swap_node()
 		self:save()