diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index 9248752f70..d616681ddb 100755
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -219,7 +219,11 @@ UM.PreferencesPage
                         id: themeList
 
                         Component.onCompleted: {
-                            append({ text: catalog.i18nc("@item:inlistbox", "Ultimaker"), code: "cura" })
+                            var themes = UM.Theme.getThemes()
+                            for (var i = 0; i < themes.length; i++)
+                            {
+                                append({ text: themes[i].name.toString(), code: themes[i].id.toString() });
+                            }
                         }
                     }
 
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index e7d49cb5e8..a36f271fe8 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -1,4 +1,7 @@
 {
+    "metadata": {
+        "name": "Ultimaker"
+    },
     "fonts": {
         "large": {
             "size": 1.25,