diff --git a/src/Gui/PreferencePacks/CMakeLists.txt b/src/Gui/PreferencePacks/CMakeLists.txt
index b4732994ea..7b9a17260d 100644
--- a/src/Gui/PreferencePacks/CMakeLists.txt
+++ b/src/Gui/PreferencePacks/CMakeLists.txt
@@ -4,9 +4,9 @@ SET(PreferencePacks_Files
 )
 
 SET(PreferencePacks_Directories
-"Classic"
-"Dark"
-"Light"
+"Classic theme"
+"Dark theme"
+"Light theme"
 )
 
 ADD_CUSTOM_TARGET(PreferencePacks_data ALL
diff --git a/src/Gui/PreferencePacks/Classic/Classic.cfg b/src/Gui/PreferencePacks/Classic theme/Classic.cfg
similarity index 100%
rename from src/Gui/PreferencePacks/Classic/Classic.cfg
rename to src/Gui/PreferencePacks/Classic theme/Classic.cfg
diff --git a/src/Gui/PreferencePacks/Dark/Dark.cfg b/src/Gui/PreferencePacks/Dark theme/Dark.cfg
similarity index 100%
rename from src/Gui/PreferencePacks/Dark/Dark.cfg
rename to src/Gui/PreferencePacks/Dark theme/Dark.cfg
diff --git a/src/Gui/PreferencePacks/Light/Light.cfg b/src/Gui/PreferencePacks/Light theme/Light.cfg
similarity index 100%
rename from src/Gui/PreferencePacks/Light/Light.cfg
rename to src/Gui/PreferencePacks/Light theme/Light.cfg
diff --git a/src/Gui/PreferencePacks/package.xml b/src/Gui/PreferencePacks/package.xml
index 006f084884..d4b84d9161 100644
--- a/src/Gui/PreferencePacks/package.xml
+++ b/src/Gui/PreferencePacks/package.xml
@@ -9,25 +9,33 @@
 
   <content>
     <preferencepack>
-      <name>Classic</name>
-      <description>FreeCAD default colors for core app and included Mods.</description>
+      <name>Classic theme</name>
+      <description>Removes stylesheets, and applies the classic purple/gray background. Resets all colors to default</description>
       <version>1.0.0</version>
       <tag>built-in</tag>
-      <tag>colors</tag>
+      <tag>background</tag>
+      <tag>no stylesheet</tag>
+      <tag>classic theme</tag>
     </preferencepack>
     <preferencepack>
-      <name>Dark</name>
-      <description>Dark color scheme</description>
-      <version>1.0.0</version>
+      <name>Dark theme</name>
+      <description>Applies a dark background and a darker stylesheets, you can choose other dark stylesheets as you wish.</description>
+      <version>0.5.0</version>
       <tag>built-in</tag>
       <tag>dark</tag>
+      <tag>background</tag>
+      <tag>stylesheet</tag>
+      <tag>theme</tag>
     </preferencepack>
     <preferencepack>
-      <name>Light</name>
-      <description>Light color scheme.</description>
-      <version>1.0.0</version>
+      <name>Light theme</name>
+      <description>Applies a light background and a darker stylesheets, you can choose other light stylesheets as you wish.</description>
+      <version>0.5.0</version>
       <tag>built-in</tag>
       <tag>light</tag>
+      <tag>background</tag>
+      <tag>stylesheet</tag>
+      <tag>theme</tag>
     </preferencepack>
   </content>