diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
index dff1c08835f..e49f9c6753d 100644
--- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm
+++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
@@ -423,3 +423,10 @@
 	greyscale_config = null
 	greyscale_colors = null
 	long_ranged = TRUE
+
+/obj/item/modular_computer/pda/clear/Initialize(mapload)
+	. = ..()
+	var/datum/computer_file/program/themeify/theme_app = locate() in stored_files
+	if(theme_app)
+		for(var/theme_key in GLOB.pda_name_to_theme - GLOB.default_pda_themes)
+			theme_app.imported_themes += theme_key
diff --git a/code/modules/modular_computers/file_system/programs/theme_selector.dm b/code/modules/modular_computers/file_system/programs/theme_selector.dm
index 7700f508924..9bc15a1a00b 100644
--- a/code/modules/modular_computers/file_system/programs/theme_selector.dm
+++ b/code/modules/modular_computers/file_system/programs/theme_selector.dm
@@ -28,7 +28,11 @@
 	switch(action)
 		if("PRG_change_theme")
 			var/selected_theme = params["selected_theme"]
-			if(!GLOB.default_pda_themes.Find(selected_theme) && !imported_themes.Find(selected_theme) && !(computer.obj_flags & EMAGGED))
+			if( \
+				!GLOB.default_pda_themes.Find(selected_theme) && \
+				!imported_themes.Find(selected_theme) && \
+				!(computer.obj_flags & EMAGGED) \
+			)
 				return FALSE
 			computer.device_theme = GLOB.pda_name_to_theme[selected_theme]
 			return TRUE