diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index 214e5aea8f..b22f2300e7 100755
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -25,6 +25,17 @@ UM.PreferencesPage
         }
     }
 
+    function setDefaultTheme(defaultThemeCode)
+    {
+        for(var i = 0; i < themeList.count; i++)
+        {
+            if (themeComboBox.model.get(i).code == defaultThemeCode)
+            {
+                themeComboBox.currentIndex = i
+            }
+        }
+    }
+
     function setDefaultDiscardOrKeepProfile(code)
     {
         for (var i = 0; i < choiceOnProfileOverrideDropDownButton.model.count; i++)
@@ -55,6 +66,10 @@ UM.PreferencesPage
         var defaultLanguage = UM.Preferences.getValue("general/language")
         setDefaultLanguage(defaultLanguage)
 
+        UM.Preferences.resetPreference("general/theme")
+        var defaultTheme = UM.Preferences.getValue("general/theme")
+        setDefaultTheme(defaultTheme)
+
         UM.Preferences.resetPreference("physics/automatic_push_free")
         pushFreeCheckbox.checked = boolCheck(UM.Preferences.getValue("physics/automatic_push_free"))
         UM.Preferences.resetPreference("physics/automatic_drop_down")
@@ -194,6 +209,87 @@ UM.PreferencesPage
                 font.italic: true
             }
 
+            Item
+	        {
+	            //: Spacer
+	            height: UM.Theme.getSize("default_margin").height
+	            width: UM.Theme.getSize("default_margin").width
+	        }
+
+            Row
+	        {
+	            spacing: UM.Theme.getSize("default_margin").width
+	            Label
+	            {
+	                id: themeLabel
+	                text: catalog.i18nc("@label","Theme:")
+	                anchors.verticalCenter: themeComboBox.verticalCenter
+	            }
+
+	            ComboBox
+	            {
+	                id: themeComboBox
+	                model: ListModel
+	                {
+	                    id: themeList
+
+	                    Component.onCompleted: {
+	                        append({ text: catalog.i18nc("@item:inlistbox", "Ultimaker"), code: "cura" })
+	                    }
+	                }
+
+	                currentIndex:
+	                {
+	                    var code = UM.Preferences.getValue("general/theme");
+	                    for(var i = 0; i < themeList.count; ++i)
+	                    {
+	                        if(model.get(i).code == code)
+	                        {
+	                            return i
+	                        }
+	                    }
+	                }
+	                onActivated: UM.Preferences.setValue("general/theme", model.get(index).code)
+
+	                Component.onCompleted:
+	                {
+	                    // Because ListModel is stupid and does not allow using qsTr() for values.
+	                    for(var i = 0; i < themeList.count; ++i)
+	                    {
+	                        themeList.setProperty(i, "text", catalog.i18n(themeList.get(i).text));
+	                    }
+
+	                    // Glorious hack time. ComboBox does not update the text properly after changing the
+	                    // model. So change the indices around to force it to update.
+	                    currentIndex += 1;
+	                    currentIndex -= 1;
+	                }
+	            }
+	        }
+
+	        Label
+	        {
+	            id: themeCaption
+
+	            //: Theme change warning
+	            text: catalog.i18nc("@label", "You will need to restart the application for theme changes to have effect.")
+	            wrapMode: Text.WordWrap
+	            font.italic: true
+	        }
+
+	        Item
+	        {
+	            //: Spacer
+	            height: UM.Theme.getSize("default_margin").height
+	            width: UM.Theme.getSize("default_margin").width
+	        }
+
+	        Label
+	        {
+	            font.bold: true
+	            text: catalog.i18nc("@label","Viewport behavior")
+	        }
+
             Item
             {
                 //: Spacer
@@ -211,7 +307,6 @@ UM.PreferencesPage
                 CheckBox
                 {
                     id: autoSliceCheckbox
-
                     checked: boolCheck(UM.Preferences.getValue("general/auto_slice"))
                     onClicked: UM.Preferences.setValue("general/auto_slice", checked)