diff --git a/interface/resources/QtWebEngine/UIDelegates/Menu.qml b/interface/resources/QtWebEngine/UIDelegates/Menu.qml
index 46c00e758e..adfd29df9e 100644
--- a/interface/resources/QtWebEngine/UIDelegates/Menu.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/Menu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: menu
diff --git a/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml b/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
index 6014b6834b..b4d3ca4bb2 100644
--- a/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: root
diff --git a/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml b/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
index e4ab3037ef..089c745571 100644
--- a/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../../qml/dialogs"
 
 QtObject {
diff --git a/interface/resources/qml/AudioScopeUI.qml b/interface/resources/qml/AudioScopeUI.qml
index aa181dbf8d..91908807e2 100644
--- a/interface/resources/qml/AudioScopeUI.qml
+++ b/interface/resources/qml/AudioScopeUI.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "styles-uit"
-import "controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 Item {
     id: root
diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml
index 4474cfb2cd..01de7a36f9 100644
--- a/interface/resources/qml/Browser.qml
+++ b/interface/resources/qml/Browser.qml
@@ -2,9 +2,9 @@ import QtQuick 2.5
 import QtWebChannel 1.0
 import QtWebEngine 1.5
 
-import "controls-uit"
+import controlsUit 1.0
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 ScrollingWindow {
diff --git a/interface/resources/qml/CurrentAPI.qml b/interface/resources/qml/CurrentAPI.qml
index 96bfb5c36b..4ea45041c3 100644
--- a/interface/resources/qml/CurrentAPI.qml
+++ b/interface/resources/qml/CurrentAPI.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "styles-uit"
-import "controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Item {
     id: root
diff --git a/interface/resources/qml/InfoView.qml b/interface/resources/qml/InfoView.qml
index f18969fb2f..8c5900b4c3 100644
--- a/interface/resources/qml/InfoView.qml
+++ b/interface/resources/qml/InfoView.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import Hifi 1.0 as Hifi
 
-import "controls-uit"
+import controlsUit 1.0
 import "windows" as Windows
 
 Windows.ScrollingWindow {
diff --git a/interface/resources/qml/InteractiveWindow.qml b/interface/resources/qml/InteractiveWindow.qml
index aa12b7f790..da1e9ec2bf 100644
--- a/interface/resources/qml/InteractiveWindow.qml
+++ b/interface/resources/qml/InteractiveWindow.qml
@@ -12,9 +12,9 @@ import QtQuick 2.3
 
 import "windows" as Windows
 import "controls"
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
 import "styles"
-import "styles-uit"
+import stylesUit 1.0
 
 Windows.Window {
     id: root;
diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index 92cb408a7c..ab65e36955 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.4
 
-import "qrc:////qml//controls-uit" as HifiControlsUit
-import "qrc:////qml//styles-uit" as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
 
 import "LoginDialog"
 
diff --git a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
index 96b638c911..a40110b1e9 100644
--- a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
@@ -13,8 +13,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: linkAccountBody
diff --git a/interface/resources/qml/LoginDialog/+android/SignUpBody.qml b/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
index 3a44a8d741..10909e4c85 100644
--- a/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
@@ -13,8 +13,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: signupBody
diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
index 43ac0c7cec..0b738effc4 100644
--- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
+++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "qrc:////qml//controls-uit" as HifiControlsUit
-import "qrc:////qml//styles-uit" as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
 
 Item {
     id: completeProfileBody
diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 44f4ba7439..c421459149 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -13,10 +13,15 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
+<<<<<<< HEAD
 import "qrc:////qml//controls-uit" as HifiControlsUit
 import "qrc:////qml//styles-uit" as HifiStylesUit
 
 import TabletScriptingInterface 1.0
+=======
+import controlsUit 1.0
+import stylesUit 1.0
+>>>>>>> 63bf0777766bc2421184a1cd9a06ed775b09fc1c
 
 Item {
     id: linkAccountBody
diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml
index e94a450f96..6913269c7c 100644
--- a/interface/resources/qml/LoginDialog/LoggingInBody.qml
+++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml
@@ -13,8 +13,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "qrc:////qml//controls-uit" as HifiControlsUit
-import "qrc:////qml//styles-uit" as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
 
 Item {
 
diff --git a/interface/resources/qml/LoginDialog/SignInBody.qml b/interface/resources/qml/LoginDialog/SignInBody.qml
index b9083ec23b..2940866ef0 100644
--- a/interface/resources/qml/LoginDialog/SignInBody.qml
+++ b/interface/resources/qml/LoginDialog/SignInBody.qml
@@ -13,9 +13,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "qrc:////qml//controls-uit" as HifiControlsUit
-import "qrc:////qml//styles-uit" as HifiStylesUit
-
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
 import TabletScriptingInterface 1.0
 
 Item {
diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml
new file mode 100644
index 0000000000..d3c898d76f
--- /dev/null
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@@ -0,0 +1,280 @@
+//
+//  SignUpBody.qml
+//
+//  Created by Stephen Birarda on 7 Dec 2016
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import Hifi 1.0
+import QtQuick 2.7
+import QtQuick.Controls 1.4
+
+import controlsUit 1.0
+import stylesUit 1.0
+
+Item {
+    id: signupBody
+    clip: true
+    height: root.pane.height
+    width: root.pane.width
+
+    function signup() {
+        mainTextContainer.visible = false
+        toggleLoading(true)
+        loginDialog.signup(emailField.text, usernameField.text, passwordField.text)
+    }
+
+    property bool keyboardEnabled: false
+    property bool keyboardRaised: false
+    property bool punctuationMode: false
+
+    onKeyboardRaisedChanged: d.resize();
+
+    QtObject {
+        id: d
+        readonly property int minWidth: 480
+        readonly property int maxWidth: 1280
+        readonly property int minHeight: 120
+        readonly property int maxHeight: 720
+
+        function resize() {
+            var targetWidth = Math.max(titleWidth, form.contentWidth);
+            var targetHeight =  hifi.dimensions.contentSpacing.y + mainTextContainer.height +
+                                4 * hifi.dimensions.contentSpacing.y + form.height;
+
+            parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
+            parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+                + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : 0);
+        }
+    }
+
+    function toggleLoading(isLoading) {
+        linkAccountSpinner.visible = isLoading
+        form.visible = !isLoading
+
+        leftButton.visible = !isLoading
+        buttons.visible = !isLoading
+    }
+
+    BusyIndicator {
+        id: linkAccountSpinner
+
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+            topMargin: hifi.dimensions.contentSpacing.y
+        }
+
+        visible: false
+        running: true
+
+        width: 48
+        height: 48
+    }
+
+    ShortcutText {
+        id: mainTextContainer
+        anchors {
+            top: parent.top
+            left: parent.left
+            margins: 0
+            topMargin: hifi.dimensions.contentSpacing.y
+        }
+
+        visible: false
+
+        text: qsTr("There was an unknown error while creating your account.")
+        wrapMode: Text.WordWrap
+        color: hifi.colors.redAccent
+        horizontalAlignment: Text.AlignLeft
+    }
+
+    Column {
+        id: form
+        width: parent.width
+        onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
+        anchors {
+            top: mainTextContainer.bottom
+            topMargin: 2 * hifi.dimensions.contentSpacing.y
+        }
+        spacing: 2 * hifi.dimensions.contentSpacing.y
+
+        TextField {
+            id: emailField
+            width: parent.width
+            label: "Email"
+            activeFocusOnPress: true
+            onFocusChanged: {
+                root.text = "";
+            }
+        }
+
+        TextField {
+            id: usernameField
+            width: parent.width
+            label: "Username"
+            activeFocusOnPress: true
+
+            ShortcutText {
+                anchors {
+                    verticalCenter: parent.textFieldLabel.verticalCenter
+                    left: parent.textFieldLabel.right
+                    leftMargin: 10
+                }
+
+                text: qsTr("No spaces / special chars.")
+
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+
+                color: hifi.colors.blueAccent
+                onFocusChanged: {
+                    root.text = "";
+                }
+            }
+        }
+
+        TextField {
+            id: passwordField
+            width: parent.width
+            label: "Password"
+            echoMode: TextInput.Password
+            activeFocusOnPress: true
+
+            ShortcutText {
+                anchors {
+                    verticalCenter: parent.textFieldLabel.verticalCenter
+                    left: parent.textFieldLabel.right
+                    leftMargin: 10
+                }
+
+                text: qsTr("At least 6 characters")
+
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+
+                color: hifi.colors.blueAccent
+            }
+
+            onFocusChanged: {
+                root.text = "";
+                root.isPassword = focus
+            }
+
+            Keys.onReturnPressed: signupBody.signup()
+        }
+
+        Row {
+            id: leftButton
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            spacing: hifi.dimensions.contentSpacing.x
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: qsTr("Existing User")
+
+                onClicked: {
+                    bodyLoader.setSource("LinkAccountBody.qml")
+                    if (!root.isTablet) {
+                        bodyLoader.item.width = root.pane.width
+                        bodyLoader.item.height = root.pane.height
+                    }
+                }
+            }
+        }
+
+        Row {
+            id: buttons
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: hifi.dimensions.contentSpacing.x
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
+            Button {
+                id: linkAccountButton
+                anchors.verticalCenter: parent.verticalCenter
+                width: 200
+
+                text: qsTr("Sign Up")
+                color: hifi.buttons.blue
+
+                onClicked: signupBody.signup()
+            }
+
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: qsTr("Cancel")
+
+                onClicked: root.tryDestroy()
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        root.title = qsTr("Create an Account")
+        root.iconText = "<"
+        //dont rise local keyboard
+        keyboardEnabled = !root.isTablet && HMD.active;
+        //but rise Tablet's one instead for Tablet interface
+        if (root.isTablet) {
+            root.keyboardEnabled = HMD.active;
+            root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
+        }
+        d.resize();
+
+        emailField.forceActiveFocus();
+    }
+
+    Connections {
+        target: loginDialog
+        onHandleSignupCompleted: {
+            console.log("Sign Up Succeeded");
+
+            // now that we have an account, login with that username and password
+            loginDialog.login(usernameField.text, passwordField.text)
+        }
+        onHandleSignupFailed: {
+            console.log("Sign Up Failed")
+            toggleLoading(false)
+
+            mainTextContainer.text = errorString
+            mainTextContainer.visible = true
+
+            d.resize();
+        }
+        onHandleLoginCompleted: {
+            bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack": false })
+            bodyLoader.item.width = root.pane.width
+            bodyLoader.item.height = root.pane.height
+        }
+        onHandleLoginFailed: {
+            // we failed to login, show the LoginDialog so the user will try again
+            bodyLoader.setSource("LinkAccountBody.qml", { "failAfterSignUp": true })
+            if (!root.isTablet) {
+                bodyLoader.item.width = root.pane.width
+                bodyLoader.item.height = root.pane.height
+            }
+        }
+    }
+
+    Keys.onPressed: {
+        if (!visible) {
+            return
+        }
+
+        switch (event.key) {
+        case Qt.Key_Enter:
+        case Qt.Key_Return:
+            event.accepted = true
+            signupBody.signup()
+            break
+        }
+    }
+}
diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
index aad3fdff20..2e7429ab99 100644
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.4
 import QtQuick.Controls 1.4
 
-import "qrc:////qml//controls-uit" as HifiControlsUit
-import "qrc:////qml//styles-uit" as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
 
 Item {
     id: usernameCollisionBody
diff --git a/interface/resources/qml/LoginDialog/WelcomeBody.qml b/interface/resources/qml/LoginDialog/WelcomeBody.qml
new file mode 100644
index 0000000000..020e6db002
--- /dev/null
+++ b/interface/resources/qml/LoginDialog/WelcomeBody.qml
@@ -0,0 +1,90 @@
+//
+//  WelcomeBody.qml
+//
+//  Created by Clement on 7/18/16
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import Hifi 1.0
+import QtQuick 2.4
+
+import controlsUit 1.0
+import stylesUit 1.0
+
+Item {
+    id: welcomeBody
+    clip: true
+    width: root.pane.width
+    height: root.pane.height
+
+    property bool welcomeBack: false
+
+    function setTitle() {
+        root.title = (welcomeBack ? qsTr("Welcome back <b>") : qsTr("Welcome <b>")) + Account.username + qsTr("</b>!")
+        root.iconText = ""
+        d.resize();
+    }
+
+    QtObject {
+        id: d
+        readonly property int minWidth: 480
+        readonly property int maxWidth: 1280
+        readonly property int minHeight: 120
+        readonly property int maxHeight: 720
+
+        function resize() {
+            var targetWidth = Math.max(titleWidth, mainTextContainer.contentWidth)
+            var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y + buttons.height
+
+            parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth))
+            parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+        }
+    }
+
+    InfoItem {
+        id: mainTextContainer
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+            margins: 0
+            topMargin: hifi.dimensions.contentSpacing.y
+        }
+
+        text: qsTr("You are now signed into High Fidelity")
+        wrapMode: Text.WordWrap
+        color: hifi.colors.baseGrayHighlight
+        lineHeight: 2
+        lineHeightMode: Text.ProportionalHeight
+        horizontalAlignment: Text.AlignHCenter
+    }
+
+    Row {
+        id: buttons
+        anchors {
+            top: mainTextContainer.bottom
+            horizontalCenter: parent.horizontalCenter
+            margins: 0
+            topMargin: 2 * hifi.dimensions.contentSpacing.y
+        }
+        spacing: hifi.dimensions.contentSpacing.x
+        onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
+        Button {
+            anchors.verticalCenter: parent.verticalCenter
+
+            text: qsTr("Close");
+
+            onClicked: root.tryDestroy()
+        }
+    }
+
+    Component.onCompleted: welcomeBody.setTitle()
+
+    Connections {
+        target: Account
+        onUsernameChanged: welcomeBody.setTitle()
+    }
+}
diff --git a/interface/resources/qml/OverlayLoginDialog.qml b/interface/resources/qml/OverlayLoginDialog.qml
index 0088282e8e..bd8fe00c86 100644
--- a/interface/resources/qml/OverlayLoginDialog.qml
+++ b/interface/resources/qml/OverlayLoginDialog.qml
@@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.4
 
-import "qrc:////qml//controls-uit" as HifiControlsUit
-import "qrc:////qml//styles-uit" as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
 
 import "LoginDialog"
 
diff --git a/interface/resources/qml/QmlWebWindow.qml b/interface/resources/qml/QmlWebWindow.qml
index 8c4d6145ec..322535641d 100644
--- a/interface/resources/qml/QmlWebWindow.qml
+++ b/interface/resources/qml/QmlWebWindow.qml
@@ -13,8 +13,8 @@ import QtWebEngine 1.1
 import QtWebChannel 1.0
 
 import "windows" as Windows
-import "controls-uit" as Controls
-import "styles-uit"
+import controlsUit 1.0 as Controls
+import stylesUit 1.0
 
 Windows.ScrollingWindow {
     id: root
diff --git a/interface/resources/qml/QmlWindow.qml b/interface/resources/qml/QmlWindow.qml
index bef6423e25..53e6bcc37d 100644
--- a/interface/resources/qml/QmlWindow.qml
+++ b/interface/resources/qml/QmlWindow.qml
@@ -2,9 +2,9 @@ import QtQuick 2.3
 
 import "windows" as Windows
 import "controls"
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
 import "styles"
-import "styles-uit"
+import stylesUit 1.0
 
 Windows.Window {
     id: root
diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml
index 141c1f25a7..720a904231 100644
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@@ -3,9 +3,9 @@ import QtWebChannel 1.0
 import QtWebEngine 1.5
 
 import "controls"
-import "controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 Item {
diff --git a/interface/resources/qml/UpdateDialog.qml b/interface/resources/qml/UpdateDialog.qml
index 5e05601ce4..9c22d0b65b 100644
--- a/interface/resources/qml/UpdateDialog.qml
+++ b/interface/resources/qml/UpdateDialog.qml
@@ -4,9 +4,9 @@ import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.3
 import QtGraphicalEffects 1.0
 
-import "controls-uit"
+import controlsUit 1.0
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 ScrollingWindow {
diff --git a/interface/resources/qml/controls/Button.qml b/interface/resources/qml/controls/Button.qml
index 6cbdec5644..b677822c0e 100644
--- a/interface/resources/qml/controls/Button.qml
+++ b/interface/resources/qml/controls/Button.qml
@@ -3,7 +3,6 @@ import QtQuick.Controls 2.2 as Original
 
 import "."
 import "../styles"
-import "../controls-uit"
 
 Original.Button {
     id: control
diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 943f15e1de..cce32c137a 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -4,7 +4,7 @@ import QtWebChannel 1.0
 
 import QtQuick.Controls 2.2
 
-import "../styles-uit" as StylesUIt
+import stylesUit 1.0 as StylesUIt
 
 Item {
     id: flick
diff --git a/interface/resources/qml/controls/TabletWebButton.qml b/interface/resources/qml/controls/TabletWebButton.qml
index d016f71f2d..140461d817 100644
--- a/interface/resources/qml/controls/TabletWebButton.qml
+++ b/interface/resources/qml/controls/TabletWebButton.qml
@@ -10,7 +10,7 @@
 
 import Hifi 1.0
 import QtQuick 2.4
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     property alias text: label.text
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index bb037ad478..be11f16498 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 
 Item {
     id: root
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index db695dbfb2..0c5ca37e00 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.7
 import QtWebEngine 1.5
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 import "../styles" as HifiStyles
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: root
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 71bf69fdc8..375bcd50e0 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 
 Item {
     width: parent !== null ? parent.width : undefined
diff --git a/interface/resources/qml/controls-uit/+android/ImageButton.qml b/interface/resources/qml/controlsUit/+android/ImageButton.qml
similarity index 96%
rename from interface/resources/qml/controls-uit/+android/ImageButton.qml
rename to interface/resources/qml/controlsUit/+android/ImageButton.qml
index 5ebf7cd3e9..88eaf95d76 100644
--- a/interface/resources/qml/controls-uit/+android/ImageButton.qml
+++ b/interface/resources/qml/controlsUit/+android/ImageButton.qml
@@ -1,6 +1,6 @@
 //
 //  ImageButton.qml
-//  interface/resources/qml/controls-uit
+//  interface/resources/qml/controlsUit
 //
 //  Created by Gabriel Calero & Cristian Duarte on 12 Oct 2017
 //  Copyright 2017 High Fidelity, Inc.
@@ -11,7 +11,7 @@
 
 import QtQuick 2.5
 import QtQuick.Layouts 1.3
-import "../styles-uit" as HifiStyles
+import "../stylesUit" as HifiStyles
 
 Item {
     id: button
@@ -79,4 +79,4 @@ Item {
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/interface/resources/qml/controls-uit/AttachmentsTable.qml b/interface/resources/qml/controlsUit/AttachmentsTable.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/AttachmentsTable.qml
rename to interface/resources/qml/controlsUit/AttachmentsTable.qml
index 8ee9909ab8..a2677962da 100644
--- a/interface/resources/qml/controls-uit/AttachmentsTable.qml
+++ b/interface/resources/qml/controlsUit/AttachmentsTable.qml
@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.XmlListModel 2.0
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 import "../windows"
 import "../hifi/models"
 
diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controlsUit/BaseWebView.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/BaseWebView.qml
rename to interface/resources/qml/controlsUit/BaseWebView.qml
diff --git a/interface/resources/qml/controls-uit/Button.qml b/interface/resources/qml/controlsUit/Button.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/Button.qml
rename to interface/resources/qml/controlsUit/Button.qml
index 5aa440518d..726cc7b806 100644
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controlsUit/Button.qml
@@ -12,7 +12,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3 as Original
 import TabletScriptingInterface 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control;
diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controlsUit/CheckBox.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/CheckBox.qml
rename to interface/resources/qml/controlsUit/CheckBox.qml
index 6e4a3df010..abf08908fb 100644
--- a/interface/resources/qml/controls-uit/CheckBox.qml
+++ b/interface/resources/qml/controlsUit/CheckBox.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 import TabletScriptingInterface 1.0
 
diff --git a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml b/interface/resources/qml/controlsUit/CheckBoxQQC2.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/CheckBoxQQC2.qml
rename to interface/resources/qml/controlsUit/CheckBoxQQC2.qml
index 8a9686ff5e..91d35ecd58 100644
--- a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
+++ b/interface/resources/qml/controlsUit/CheckBoxQQC2.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
-import "../controls-uit" as HiFiControls
+import "../stylesUit"
+import "." as HiFiControls
 import TabletScriptingInterface 1.0
 
 CheckBox {
diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controlsUit/ComboBox.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/ComboBox.qml
rename to interface/resources/qml/controlsUit/ComboBox.qml
index 245b565a62..8d1d7a5262 100644
--- a/interface/resources/qml/controls-uit/ComboBox.qml
+++ b/interface/resources/qml/controlsUit/ComboBox.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 FocusScope {
     id: root
diff --git a/interface/resources/qml/controls-uit/ContentSection.qml b/interface/resources/qml/controlsUit/ContentSection.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/ContentSection.qml
rename to interface/resources/qml/controlsUit/ContentSection.qml
index 47a13e9262..262c29220f 100644
--- a/interface/resources/qml/controls-uit/ContentSection.qml
+++ b/interface/resources/qml/controlsUit/ContentSection.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Column {
     property string name: "Content Section"
diff --git a/interface/resources/qml/controls-uit/FilterBar.qml b/interface/resources/qml/controlsUit/FilterBar.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/FilterBar.qml
rename to interface/resources/qml/controlsUit/FilterBar.qml
index 3d4e18ed48..0892018913 100644
--- a/interface/resources/qml/controls-uit/FilterBar.qml
+++ b/interface/resources/qml/controlsUit/FilterBar.qml
@@ -12,8 +12,8 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 Item {
     id: root;
diff --git a/interface/resources/qml/controls-uit/GlyphButton.qml b/interface/resources/qml/controlsUit/GlyphButton.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/GlyphButton.qml
rename to interface/resources/qml/controlsUit/GlyphButton.qml
index 9129486720..17f7fba2d6 100644
--- a/interface/resources/qml/controls-uit/GlyphButton.qml
+++ b/interface/resources/qml/controlsUit/GlyphButton.qml
@@ -12,7 +12,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2 as Original
 import TabletScriptingInterface 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control
diff --git a/interface/resources/qml/controls-uit/HorizontalRule.qml b/interface/resources/qml/controlsUit/HorizontalRule.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/HorizontalRule.qml
rename to interface/resources/qml/controlsUit/HorizontalRule.qml
diff --git a/interface/resources/qml/controls-uit/HorizontalSpacer.qml b/interface/resources/qml/controlsUit/HorizontalSpacer.qml
similarity index 94%
rename from interface/resources/qml/controls-uit/HorizontalSpacer.qml
rename to interface/resources/qml/controlsUit/HorizontalSpacer.qml
index 545154ab44..efcabf2699 100644
--- a/interface/resources/qml/controls-uit/HorizontalSpacer.qml
+++ b/interface/resources/qml/controlsUit/HorizontalSpacer.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: root
diff --git a/interface/resources/qml/controls-uit/ImageMessageBox.qml b/interface/resources/qml/controlsUit/ImageMessageBox.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/ImageMessageBox.qml
rename to interface/resources/qml/controlsUit/ImageMessageBox.qml
index 74313f7ffe..46d93383a4 100644
--- a/interface/resources/qml/controls-uit/ImageMessageBox.qml
+++ b/interface/resources/qml/controlsUit/ImageMessageBox.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: imageBox
diff --git a/interface/resources/qml/controls-uit/Key.qml b/interface/resources/qml/controlsUit/Key.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/Key.qml
rename to interface/resources/qml/controlsUit/Key.qml
diff --git a/interface/resources/qml/controls-uit/Keyboard.qml b/interface/resources/qml/controlsUit/Keyboard.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/Keyboard.qml
rename to interface/resources/qml/controlsUit/Keyboard.qml
diff --git a/interface/resources/qml/controls-uit/Label.qml b/interface/resources/qml/controlsUit/Label.qml
similarity index 97%
rename from interface/resources/qml/controls-uit/Label.qml
rename to interface/resources/qml/controlsUit/Label.qml
index 4c7051b495..7f208cde88 100644
--- a/interface/resources/qml/controls-uit/Label.qml
+++ b/interface/resources/qml/controlsUit/Label.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.7
 
-import "../styles-uit"
+import "../stylesUit"
 
 RalewaySemiBold {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/controls-uit/QueuedButton.qml b/interface/resources/qml/controlsUit/QueuedButton.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/QueuedButton.qml
rename to interface/resources/qml/controlsUit/QueuedButton.qml
index 6612d582df..70ad9eb112 100644
--- a/interface/resources/qml/controls-uit/QueuedButton.qml
+++ b/interface/resources/qml/controlsUit/QueuedButton.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 import "." as HifiControls
 
 HifiControls.Button {
diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controlsUit/RadioButton.qml
similarity index 97%
rename from interface/resources/qml/controls-uit/RadioButton.qml
rename to interface/resources/qml/controlsUit/RadioButton.qml
index 56324c55d7..ad62a77aa7 100644
--- a/interface/resources/qml/controls-uit/RadioButton.qml
+++ b/interface/resources/qml/controlsUit/RadioButton.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 import TabletScriptingInterface 1.0
 
diff --git a/interface/resources/qml/controls-uit/ScrollBar.qml b/interface/resources/qml/controlsUit/ScrollBar.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/ScrollBar.qml
rename to interface/resources/qml/controlsUit/ScrollBar.qml
index 125e84e585..bcb1f62429 100644
--- a/interface/resources/qml/controls-uit/ScrollBar.qml
+++ b/interface/resources/qml/controlsUit/ScrollBar.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
+import "../stylesUit"
 
 ScrollBar {
     visible: size < 1.0
diff --git a/interface/resources/qml/controls-uit/Separator.qml b/interface/resources/qml/controlsUit/Separator.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/Separator.qml
rename to interface/resources/qml/controlsUit/Separator.qml
index 3350764ae9..da6b9adf57 100644
--- a/interface/resources/qml/controls-uit/Separator.qml
+++ b/interface/resources/qml/controlsUit/Separator.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     property int colorScheme: 0;
diff --git a/interface/resources/qml/controls-uit/Slider.qml b/interface/resources/qml/controlsUit/Slider.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/Slider.qml
rename to interface/resources/qml/controlsUit/Slider.qml
index 2a5d4c137d..8cb08b69e2 100644
--- a/interface/resources/qml/controls-uit/Slider.qml
+++ b/interface/resources/qml/controlsUit/Slider.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 Slider {
     id: slider
diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controlsUit/SpinBox.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/SpinBox.qml
rename to interface/resources/qml/controlsUit/SpinBox.qml
index 3d3ea7a75e..d24c7c5e8c 100644
--- a/interface/resources/qml/controls-uit/SpinBox.qml
+++ b/interface/resources/qml/controlsUit/SpinBox.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 SpinBox {
     id: spinBox
diff --git a/interface/resources/qml/controls-uit/Switch.qml b/interface/resources/qml/controlsUit/Switch.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/Switch.qml
rename to interface/resources/qml/controlsUit/Switch.qml
index bfe86b1420..0961ef2500 100644
--- a/interface/resources/qml/controls-uit/Switch.qml
+++ b/interface/resources/qml/controlsUit/Switch.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: rootSwitch;
diff --git a/interface/resources/qml/controls-uit/Table.qml b/interface/resources/qml/controlsUit/Table.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/Table.qml
rename to interface/resources/qml/controlsUit/Table.qml
index ce4e1c376a..ab74361046 100644
--- a/interface/resources/qml/controls-uit/Table.qml
+++ b/interface/resources/qml/controlsUit/Table.qml
@@ -13,7 +13,7 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls 2.3 as QQC2
 
-import "../styles-uit"
+import "../stylesUit"
 
 TableView {
     id: tableView
diff --git a/interface/resources/qml/controls-uit/TabletContentSection.qml b/interface/resources/qml/controlsUit/TabletContentSection.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/TabletContentSection.qml
rename to interface/resources/qml/controlsUit/TabletContentSection.qml
index c34f4afdd6..dccaf31bbe 100644
--- a/interface/resources/qml/controls-uit/TabletContentSection.qml
+++ b/interface/resources/qml/controlsUit/TabletContentSection.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Column {
     property string name: "Content Section"
diff --git a/interface/resources/qml/controls-uit/TabletHeader.qml b/interface/resources/qml/controlsUit/TabletHeader.qml
similarity index 96%
rename from interface/resources/qml/controls-uit/TabletHeader.qml
rename to interface/resources/qml/controlsUit/TabletHeader.qml
index 56203de286..f626700742 100644
--- a/interface/resources/qml/controls-uit/TabletHeader.qml
+++ b/interface/resources/qml/controlsUit/TabletHeader.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Rectangle {
 
diff --git a/interface/resources/qml/controls-uit/TextAction.qml b/interface/resources/qml/controlsUit/TextAction.qml
similarity index 96%
rename from interface/resources/qml/controls-uit/TextAction.qml
rename to interface/resources/qml/controlsUit/TextAction.qml
index 1745a6c273..a0a1bb7d07 100644
--- a/interface/resources/qml/controls-uit/TextAction.qml
+++ b/interface/resources/qml/controlsUit/TextAction.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 Item {
     property string icon: ""
diff --git a/interface/resources/qml/controls-uit/TextEdit.qml b/interface/resources/qml/controlsUit/TextEdit.qml
similarity index 95%
rename from interface/resources/qml/controls-uit/TextEdit.qml
rename to interface/resources/qml/controlsUit/TextEdit.qml
index a72a3b13d8..7446c5040f 100644
--- a/interface/resources/qml/controls-uit/TextEdit.qml
+++ b/interface/resources/qml/controlsUit/TextEdit.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 TextEdit {
 
diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controlsUit/TextField.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/TextField.qml
rename to interface/resources/qml/controlsUit/TextField.qml
index 917068ac01..d78f3a1340 100644
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controlsUit/TextField.qml
@@ -12,8 +12,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 TextField {
     id: textField
diff --git a/interface/resources/qml/controls-uit/ToolTip.qml b/interface/resources/qml/controlsUit/ToolTip.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/ToolTip.qml
rename to interface/resources/qml/controlsUit/ToolTip.qml
diff --git a/interface/resources/qml/controls-uit/Tree.qml b/interface/resources/qml/controlsUit/Tree.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/Tree.qml
rename to interface/resources/qml/controlsUit/Tree.qml
index 5199a10a27..f2c49095b1 100644
--- a/interface/resources/qml/controls-uit/Tree.qml
+++ b/interface/resources/qml/controlsUit/Tree.qml
@@ -15,7 +15,7 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls 2.2 as QQC2
 
 
-import "../styles-uit"
+import "../stylesUit"
 
 TreeView {
     id: treeView
diff --git a/interface/resources/qml/controls-uit/VerticalSpacer.qml b/interface/resources/qml/controlsUit/VerticalSpacer.qml
similarity index 94%
rename from interface/resources/qml/controls-uit/VerticalSpacer.qml
rename to interface/resources/qml/controlsUit/VerticalSpacer.qml
index 2df65f1002..4c93aa1801 100644
--- a/interface/resources/qml/controls-uit/VerticalSpacer.qml
+++ b/interface/resources/qml/controlsUit/VerticalSpacer.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: root
diff --git a/interface/resources/qml/controls-uit/WebGlyphButton.qml b/interface/resources/qml/controlsUit/WebGlyphButton.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/WebGlyphButton.qml
rename to interface/resources/qml/controlsUit/WebGlyphButton.qml
index fd7cd001b2..7739ecd5e7 100644
--- a/interface/resources/qml/controls-uit/WebGlyphButton.qml
+++ b/interface/resources/qml/controlsUit/WebGlyphButton.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control
diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controlsUit/WebSpinner.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/WebSpinner.qml
rename to interface/resources/qml/controlsUit/WebSpinner.qml
diff --git a/interface/resources/qml/controls-uit/WebView.qml b/interface/resources/qml/controlsUit/WebView.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/WebView.qml
rename to interface/resources/qml/controlsUit/WebView.qml
diff --git a/interface/resources/qml/controls-uit/qmldir b/interface/resources/qml/controlsUit/qmldir
similarity index 94%
rename from interface/resources/qml/controls-uit/qmldir
rename to interface/resources/qml/controlsUit/qmldir
index 989115b8d2..d0577f5575 100644
--- a/interface/resources/qml/controls-uit/qmldir
+++ b/interface/resources/qml/controlsUit/qmldir
@@ -6,6 +6,7 @@ CheckBox 1.0 CheckBox.qml
 CheckBoxQQC2 1.0 CheckBoxQQC2.qml
 ComboBox 1.0 ComboBox.qml
 ContentSection 1.0 ContentSection.qml
+FilterBar 1.0 FilterBar.qml
 GlyphButton 1.0 GlyphButton.qml
 HorizontalRule 1.0 HorizontalRule.qml
 HorizontalSpacer 1.0 HorizontalSpacer.qml
@@ -15,6 +16,7 @@ Keyboard 1.0 Keyboard.qml
 Label 1.0 Label.qml
 QueuedButton 1.0 QueuedButton.qml
 RadioButton 1.0 RadioButton.qml
+ScrollBar 1.0 ScrollBar.qml
 Separator 1.0 Separator.qml
 Slider 1.0 Slider.qml
 SpinBox 1.0 SpinBox.qml
diff --git a/interface/resources/qml/dialogs/AssetDialog.qml b/interface/resources/qml/dialogs/AssetDialog.qml
index e8d28e9b37..b8eaab0b8d 100644
--- a/interface/resources/qml/dialogs/AssetDialog.qml
+++ b/interface/resources/qml/dialogs/AssetDialog.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import Qt.labs.settings 1.0
 
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "assetDialog"
diff --git a/interface/resources/qml/dialogs/CustomQueryDialog.qml b/interface/resources/qml/dialogs/CustomQueryDialog.qml
index 0c86b93c4b..026068eee1 100644
--- a/interface/resources/qml/dialogs/CustomQueryDialog.qml
+++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7;
 import QtQuick.Dialogs 1.2 as OriginalDialogs;
 import QtQuick.Controls 2.3
 
-import "../controls-uit";
-import "../styles-uit";
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows";
 
 ModalWindow {
diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index 6651af0db3..b7340575dd 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3
 
 import ".."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "fileDialog"
diff --git a/interface/resources/qml/dialogs/MessageDialog.qml b/interface/resources/qml/dialogs/MessageDialog.qml
index b5ac6cab72..9428e3ab6e 100644
--- a/interface/resources/qml/dialogs/MessageDialog.qml
+++ b/interface/resources/qml/dialogs/MessageDialog.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "messageDialog"
diff --git a/interface/resources/qml/dialogs/PreferencesDialog.qml b/interface/resources/qml/dialogs/PreferencesDialog.qml
index fffd0e2ed9..9df1d0b963 100644
--- a/interface/resources/qml/dialogs/PreferencesDialog.qml
+++ b/interface/resources/qml/dialogs/PreferencesDialog.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../controls-uit" as HifiControls
-import "../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 import "../windows"
 import "preferences"
 
diff --git a/interface/resources/qml/dialogs/QueryDialog.qml b/interface/resources/qml/dialogs/QueryDialog.qml
index 41ee30e6d5..9cfb3011bd 100644
--- a/interface/resources/qml/dialogs/QueryDialog.qml
+++ b/interface/resources/qml/dialogs/QueryDialog.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 ModalWindow {
diff --git a/interface/resources/qml/dialogs/TabletAssetDialog.qml b/interface/resources/qml/dialogs/TabletAssetDialog.qml
index 897378e40c..b3bd45f972 100644
--- a/interface/resources/qml/dialogs/TabletAssetDialog.qml
+++ b/interface/resources/qml/dialogs/TabletAssetDialog.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "assetDialog"
diff --git a/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml b/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
index 81a2c5c1e0..c7772984ab 100644
--- a/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
+++ b/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 TabletModalWindow {
diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml
index 6848c230e3..3be6e30dd0 100644
--- a/interface/resources/qml/dialogs/TabletFileDialog.qml
+++ b/interface/resources/qml/dialogs/TabletFileDialog.qml
@@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3
 
 import ".."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "fileDialog"
diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index ad34e07f1b..bda9daaa18 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -11,9 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.5
 
-import "qrc:////qml//controls-uit" as HifiControlsUit
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "../windows" as Windows
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
 
 import "../LoginDialog"
 
diff --git a/interface/resources/qml/dialogs/TabletMessageBox.qml b/interface/resources/qml/dialogs/TabletMessageBox.qml
index fabe0dd247..1e6f0734ad 100644
--- a/interface/resources/qml/dialogs/TabletMessageBox.qml
+++ b/interface/resources/qml/dialogs/TabletMessageBox.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "messageDialog"
diff --git a/interface/resources/qml/dialogs/TabletQueryDialog.qml b/interface/resources/qml/dialogs/TabletQueryDialog.qml
index 5746a3d67c..8f63730b8e 100644
--- a/interface/resources/qml/dialogs/TabletQueryDialog.qml
+++ b/interface/resources/qml/dialogs/TabletQueryDialog.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 TabletModalWindow {
diff --git a/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml b/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
index c3e842bc2f..da976ef3e1 100644
--- a/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
+++ b/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3
 import QtQuick.Controls 1.5 as QQC1
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 import "../fileDialog"
 
diff --git a/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml b/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
index 50a10974b5..6c042b5598 100644
--- a/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
+++ b/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 ComboBox {
     id: root
diff --git a/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml b/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
index 8411980db7..f5715fa2c2 100644
--- a/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
+++ b/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Button {
     property var dialog;
diff --git a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
index 0efc3776b3..9505e70530 100644
--- a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 import "../../hifi/tablet/tabletWindows/preferences"
 
 Preference {
diff --git a/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml b/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
index 2cf50891c9..6059f8ff1c 100644
--- a/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
+++ b/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/ButtonPreference.qml b/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
index 454a9124ae..09c5b4329d 100644
--- a/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
index e2172d8eda..f6f840bbe8 100644
--- a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml b/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
index 3b3efaf520..98cb397976 100644
--- a/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit" as HiFiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HiFiControls
+import stylesUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/EditablePreference.qml b/interface/resources/qml/dialogs/preferences/EditablePreference.qml
index 8acf8e1f76..e0c79ebba0 100644
--- a/interface/resources/qml/dialogs/preferences/EditablePreference.qml
+++ b/interface/resources/qml/dialogs/preferences/EditablePreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
index cfc2e94ed9..f963003c59 100644
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml b/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
index 103904a666..0a09d8d609 100644
--- a/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/Section.qml b/interface/resources/qml/dialogs/preferences/Section.qml
index c2c6583b7e..a9b755ad83 100644
--- a/interface/resources/qml/dialogs/preferences/Section.qml
+++ b/interface/resources/qml/dialogs/preferences/Section.qml
@@ -12,8 +12,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import Hifi 1.0
 
-import "../../controls-uit" as HiFiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HiFiControls
+import stylesUit 1.0
 import "."
 
 Preference {
diff --git a/interface/resources/qml/dialogs/preferences/SliderPreference.qml b/interface/resources/qml/dialogs/preferences/SliderPreference.qml
index 2bdda09fc3..c8a2aae158 100644
--- a/interface/resources/qml/dialogs/preferences/SliderPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SliderPreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml b/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
index b2c334b674..1b080c2759 100644
--- a/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml b/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
index 126e62fc30..cbc804d9d7 100644
--- a/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/hifi/+android/ActionBar.qml b/interface/resources/qml/hifi/+android/ActionBar.qml
index d487901d6f..3c58156f30 100644
--- a/interface/resources/qml/hifi/+android/ActionBar.qml
+++ b/interface/resources/qml/hifi/+android/ActionBar.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/+android/AudioBar.qml b/interface/resources/qml/hifi/+android/AudioBar.qml
index 6cc17fccf7..912572fdf8 100644
--- a/interface/resources/qml/hifi/+android/AudioBar.qml
+++ b/interface/resources/qml/hifi/+android/AudioBar.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/+android/AvatarOption.qml b/interface/resources/qml/hifi/+android/AvatarOption.qml
index 85d7e52eb2..7eba3c2a67 100644
--- a/interface/resources/qml/hifi/+android/AvatarOption.qml
+++ b/interface/resources/qml/hifi/+android/AvatarOption.qml
@@ -11,7 +11,7 @@
 
 import QtQuick.Layouts 1.3
 import QtQuick 2.5
-import "../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 
 ColumnLayout {
     id: itemRoot
diff --git a/interface/resources/qml/hifi/+android/StatsBar.qml b/interface/resources/qml/hifi/+android/StatsBar.qml
index aee438b44f..64e93b4a08 100644
--- a/interface/resources/qml/hifi/+android/StatsBar.qml
+++ b/interface/resources/qml/hifi/+android/StatsBar.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/+android/WindowHeader.qml b/interface/resources/qml/hifi/+android/WindowHeader.qml
index 4ec0a0c6e6..5316fc4786 100644
--- a/interface/resources/qml/hifi/+android/WindowHeader.qml
+++ b/interface/resources/qml/hifi/+android/WindowHeader.qml
@@ -16,8 +16,8 @@ import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import "."
 import "../styles" as HifiStyles
-import "../styles-uit"
-import "../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/+android/bottomHudOptions.qml b/interface/resources/qml/hifi/+android/bottomHudOptions.qml
index 22beccf531..6b830d94c2 100644
--- a/interface/resources/qml/hifi/+android/bottomHudOptions.qml
+++ b/interface/resources/qml/hifi/+android/bottomHudOptions.qml
@@ -16,8 +16,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import "../../styles" as HifiStyles
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 import "."
diff --git a/interface/resources/qml/hifi/+android/modesbar.qml b/interface/resources/qml/hifi/+android/modesbar.qml
index 994bf1efe4..1bf04fb8d9 100644
--- a/interface/resources/qml/hifi/+android/modesbar.qml
+++ b/interface/resources/qml/hifi/+android/modesbar.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 1a7f5bac40..ad337a6361 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -14,8 +14,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../windows" as Windows
 import "../dialogs"
 
diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml
index aea5931627..39590748cf 100644
--- a/interface/resources/qml/hifi/AvatarApp.qml
+++ b/interface/resources/qml/hifi/AvatarApp.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQml.Models 2.1
 import QtGraphicalEffects 1.0
-import "../controls-uit" as HifiControls
-import "../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 import "avatarapp"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/Card.qml b/interface/resources/qml/hifi/Card.qml
index 83bf1e2c54..7f29324416 100644
--- a/interface/resources/qml/hifi/Card.qml
+++ b/interface/resources/qml/hifi/Card.qml
@@ -17,7 +17,7 @@ import QtGraphicalEffects 1.0
 import TabletScriptingInterface 1.0
 
 import "toolbars"
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: root;
diff --git a/interface/resources/qml/hifi/ComboDialog.qml b/interface/resources/qml/hifi/ComboDialog.qml
index e5dc8a9c1a..74d9c1019b 100644
--- a/interface/resources/qml/hifi/ComboDialog.qml
+++ b/interface/resources/qml/hifi/ComboDialog.qml
@@ -10,8 +10,8 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
-import "../controls-uit"
+import stylesUit 1.0
+import controlsUit 1.0
 
 Item {
     property var dialogTitleText : "";
diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml
index 6d8c5321eb..b787ed935d 100644
--- a/interface/resources/qml/hifi/Desktop.qml
+++ b/interface/resources/qml/hifi/Desktop.qml
@@ -8,7 +8,7 @@ import "../desktop" as OriginalDesktop
 import ".."
 import "."
 import "./toolbars"
-import "../controls-uit"
+import controlsUit 1.0
 
 OriginalDesktop.Desktop {
     id: desktop
diff --git a/interface/resources/qml/hifi/DesktopLetterboxMessage.qml b/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
index 9e9dcc75b2..048add24e5 100644
--- a/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
+++ b/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
@@ -10,7 +10,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     property alias text: popupText.text
diff --git a/interface/resources/qml/hifi/Feed.qml b/interface/resources/qml/hifi/Feed.qml
index 346481fe1f..4cfd4804b3 100644
--- a/interface/resources/qml/hifi/Feed.qml
+++ b/interface/resources/qml/hifi/Feed.qml
@@ -15,7 +15,7 @@ import Hifi 1.0
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 import "toolbars"
-import "../styles-uit"
+import stylesUit 1.0
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 
 Column {
diff --git a/interface/resources/qml/hifi/LetterboxMessage.qml b/interface/resources/qml/hifi/LetterboxMessage.qml
index 8a18d88842..68bebdd041 100644
--- a/interface/resources/qml/hifi/LetterboxMessage.qml
+++ b/interface/resources/qml/hifi/LetterboxMessage.qml
@@ -10,7 +10,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     property alias text: popupText.text
diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index dfa6555150..242ca5ab57 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -13,8 +13,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtGraphicalEffects 1.0
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "toolbars"
 
 // references Users, UserActivityLogger, MyAvatar, Vec3, Quat, AddressManager, Account from root context
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 1384cb8711..368beaab47 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -15,8 +15,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtGraphicalEffects 1.0
 import Qt.labs.settings 1.0
-import "../styles-uit"
-import "../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../controls" as HifiControls
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 
diff --git a/interface/resources/qml/hifi/SkyboxChanger.qml b/interface/resources/qml/hifi/SkyboxChanger.qml
index f0c97a11a3..a66fc38415 100644
--- a/interface/resources/qml/hifi/SkyboxChanger.qml
+++ b/interface/resources/qml/hifi/SkyboxChanger.qml
@@ -10,8 +10,8 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import QtQuick.Controls 2.2
 
 Item {
diff --git a/interface/resources/qml/hifi/SpectatorCamera.qml b/interface/resources/qml/hifi/SpectatorCamera.qml
index 4bf80e410b..09b722b906 100644
--- a/interface/resources/qml/hifi/SpectatorCamera.qml
+++ b/interface/resources/qml/hifi/SpectatorCamera.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.7
-import "../styles-uit"
-import "../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../controls" as HifiControls
 
 // references HMD, XXX from root context
diff --git a/interface/resources/qml/hifi/TabletTextButton.qml b/interface/resources/qml/hifi/TabletTextButton.qml
index e5ff1d381d..6c9e0331df 100644
--- a/interface/resources/qml/hifi/TabletTextButton.qml
+++ b/interface/resources/qml/hifi/TabletTextButton.qml
@@ -10,7 +10,7 @@
 
 import Hifi 1.0
 import QtQuick 2.4
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     property alias text: label.text
diff --git a/interface/resources/qml/hifi/TextButton.qml b/interface/resources/qml/hifi/TextButton.qml
index 02e49d86e4..61588a9603 100644
--- a/interface/resources/qml/hifi/TextButton.qml
+++ b/interface/resources/qml/hifi/TextButton.qml
@@ -9,7 +9,7 @@
 //
 import Hifi 1.0
 import QtQuick 2.4
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     property alias text: label.text;
diff --git a/interface/resources/qml/hifi/WebBrowser.qml b/interface/resources/qml/hifi/WebBrowser.qml
index ab93752d92..c05de26471 100644
--- a/interface/resources/qml/hifi/WebBrowser.qml
+++ b/interface/resources/qml/hifi/WebBrowser.qml
@@ -18,8 +18,8 @@ import QtGraphicalEffects 1.0
 import QtWebEngine 1.5
 import QtWebChannel 1.0
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../windows"
 import "../controls"
 
diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index f4a708567a..c8dd83cd62 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -15,8 +15,8 @@ import QtQuick 2.5
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import "./" as AudioControls
 
diff --git a/interface/resources/qml/hifi/audio/AudioTabButton.qml b/interface/resources/qml/hifi/audio/AudioTabButton.qml
index 3a3ed90f5e..32331ccb6e 100644
--- a/interface/resources/qml/hifi/audio/AudioTabButton.qml
+++ b/interface/resources/qml/hifi/audio/AudioTabButton.qml
@@ -11,8 +11,8 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 TabButton {
     id: control
diff --git a/interface/resources/qml/hifi/audio/CheckBox.qml b/interface/resources/qml/hifi/audio/CheckBox.qml
index 3a954d4004..5ab62a5091 100644
--- a/interface/resources/qml/hifi/audio/CheckBox.qml
+++ b/interface/resources/qml/hifi/audio/CheckBox.qml
@@ -11,7 +11,7 @@
 
 import QtQuick 2.7
 
-import "../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 HifiControls.CheckBoxQQC2 {
     color: "white"
diff --git a/interface/resources/qml/hifi/audio/PlaySampleSound.qml b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
index 2b9599a3cc..cfe55af9c4 100644
--- a/interface/resources/qml/hifi/audio/PlaySampleSound.qml
+++ b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
@@ -13,8 +13,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 RowLayout {
     property var sound: null;
diff --git a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
index 5fff14e4a1..0740914440 100644
--- a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
+++ b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
@@ -1,9 +1,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtQuick.Layouts 1.3
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
-import "../../controls" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 Rectangle {
     id: root;
diff --git a/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml b/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
index 9d9db010fb..d3c9cd1d5f 100644
--- a/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
+++ b/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
@@ -1,6 +1,6 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../styles-uit"
+import stylesUit 1.0
 
 ShadowRectangle {
     id: header
diff --git a/interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml b/interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml
index f66c7121cb..36cb4b1080 100644
--- a/interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml
+++ b/interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 import QtQuick.Window 2.2
-import "../../styles-uit"
+import stylesUit 1.0
 
 QtObject {
 	readonly property QtObject colors: QtObject {
diff --git a/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml b/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml
index cb73e9fe71..8b28d4c66b 100644
--- a/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml
+++ b/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.9
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 ShadowRectangle {
     property int wearablesCount: 0
diff --git a/interface/resources/qml/hifi/avatarapp/BlueButton.qml b/interface/resources/qml/hifi/avatarapp/BlueButton.qml
index e668951517..0cc84d5ba0 100644
--- a/interface/resources/qml/hifi/avatarapp/BlueButton.qml
+++ b/interface/resources/qml/hifi/avatarapp/BlueButton.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 HifiControlsUit.Button {
     HifiConstants {
diff --git a/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml b/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
index 1387c0791a..780981a5a3 100644
--- a/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
+++ b/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
@@ -1,7 +1,7 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/avatarapp/InputField.qml b/interface/resources/qml/hifi/avatarapp/InputField.qml
index 905518ef0f..2020d56c96 100644
--- a/interface/resources/qml/hifi/avatarapp/InputField.qml
+++ b/interface/resources/qml/hifi/avatarapp/InputField.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 TextField {
     id: textField
diff --git a/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml b/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml
index 4b868b47ce..6c2101498c 100644
--- a/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml
+++ b/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml
@@ -1,5 +1,5 @@
-import "../../controls-uit" as HifiControlsUit
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0
 
 import QtQuick 2.0
 import QtQuick.Controls 2.2
diff --git a/interface/resources/qml/hifi/avatarapp/MessageBox.qml b/interface/resources/qml/hifi/avatarapp/MessageBox.qml
index f111303214..eb28745b1a 100644
--- a/interface/resources/qml/hifi/avatarapp/MessageBox.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBox.qml
@@ -1,7 +1,7 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/avatarapp/Settings.qml b/interface/resources/qml/hifi/avatarapp/Settings.qml
index 3446191163..bad1394133 100644
--- a/interface/resources/qml/hifi/avatarapp/Settings.qml
+++ b/interface/resources/qml/hifi/avatarapp/Settings.qml
@@ -2,8 +2,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml b/interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml
index c2d84bb371..a2c84fad47 100644
--- a/interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml
+++ b/interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml
@@ -1,4 +1,4 @@
-import "../../styles-uit"
+import stylesUit 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
diff --git a/interface/resources/qml/hifi/avatarapp/ShadowImage.qml b/interface/resources/qml/hifi/avatarapp/ShadowImage.qml
index 3995446e49..51e1043702 100644
--- a/interface/resources/qml/hifi/avatarapp/ShadowImage.qml
+++ b/interface/resources/qml/hifi/avatarapp/ShadowImage.qml
@@ -1,4 +1,4 @@
-import "../../styles-uit"
+import stylesUit 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
diff --git a/interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml b/interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml
index 741fce3d8d..3968fcb1ff 100644
--- a/interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml
+++ b/interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml
@@ -1,4 +1,4 @@
-import "../../styles-uit"
+import stylesUit 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
diff --git a/interface/resources/qml/hifi/avatarapp/SquareLabel.qml b/interface/resources/qml/hifi/avatarapp/SquareLabel.qml
index e2c456ec04..69aff47373 100644
--- a/interface/resources/qml/hifi/avatarapp/SquareLabel.qml
+++ b/interface/resources/qml/hifi/avatarapp/SquareLabel.qml
@@ -1,5 +1,5 @@
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
diff --git a/interface/resources/qml/hifi/avatarapp/Vector3.qml b/interface/resources/qml/hifi/avatarapp/Vector3.qml
index d77665f992..698123104f 100644
--- a/interface/resources/qml/hifi/avatarapp/Vector3.qml
+++ b/interface/resources/qml/hifi/avatarapp/Vector3.qml
@@ -1,7 +1,7 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 
 Row {
diff --git a/interface/resources/qml/hifi/avatarapp/WhiteButton.qml b/interface/resources/qml/hifi/avatarapp/WhiteButton.qml
index dc729ae097..d0a4a152db 100644
--- a/interface/resources/qml/hifi/avatarapp/WhiteButton.qml
+++ b/interface/resources/qml/hifi/avatarapp/WhiteButton.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 HifiControlsUit.Button {
     HifiConstants {
diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 271aab87d1..2cf176c1e5 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
 import "../common" as HifiCommerceCommon
diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
index 5901adc484..b7215500d2 100644
--- a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "qrc:////qml//styles-uit"
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index 99c2d89da8..0d0af875d1 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.7
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
index 0b982893f1..c2d85b68b4 100644
--- a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
+++ b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/common/sendAsset/ConnectionItem.qml b/interface/resources/qml/hifi/commerce/common/sendAsset/ConnectionItem.qml
index 41eacd68d5..1eb8af31e6 100644
--- a/interface/resources/qml/hifi/commerce/common/sendAsset/ConnectionItem.qml
+++ b/interface/resources/qml/hifi/commerce/common/sendAsset/ConnectionItem.qml
@@ -16,8 +16,8 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import "../../../../styles-uit"
-import "../../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../../controls" as HifiControls
 import "../../wallet" as HifiWallet
 
diff --git a/interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml b/interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml
index 9293dc83ab..9e1a967d50 100644
--- a/interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml
+++ b/interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml
@@ -15,8 +15,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.6
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
-import "../../../../styles-uit"
-import "../../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../../controls" as HifiControls
 import "../" as HifiCommerceCommon
 
diff --git a/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml b/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
index bb4bb624bc..ec7146f33e 100644
--- a/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
+++ b/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
@@ -15,8 +15,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.6
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
-import "../../../../styles-uit"
-import "../../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../../controls" as HifiControls
 import "../" as HifiCommerceCommon
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index 885838a26e..8d0b93d11a 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
 
diff --git a/interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml b/interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml
index 27277a28f4..966f359e92 100644
--- a/interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml
+++ b/interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml
@@ -14,8 +14,8 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import Hifi 1.0 as Hifi
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
 
 Rectangle {
     id: root;
diff --git a/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml b/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
index 2a4f2d0e22..a37a0ac756 100644
--- a/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
+++ b/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
@@ -15,8 +15,9 @@ import QtQuick 2.10
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.3
 import Hifi 1.0 as Hifi
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
+
 
 
 
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 0828d86eff..c8ec7238d6 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -15,8 +15,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
 import TabletScriptingInterface 1.0
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index e7b541b350..932a3ab6c4 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 import "../wallet" as HifiWallet
diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 575edfc34d..1598aec41c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml b/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
index 03af964830..ab05f55deb 100644
--- a/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
index 8451c90836..6ddfe0da1c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
index c4abd40d2a..86d50e87ec 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../common" as HifiCommerceCommon
 
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
index e052b78876..179ffcf707 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index f44e715703..ed4ba66b2b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../common" as HifiCommerceCommon
 import "../common/sendAsset"
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 19065ee542..e7163a3641 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import "../common" as HifiCommerceCommon
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 
 Item {
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index d32017189e..f18d4c7b44 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -15,8 +15,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
index ecd7234400..1cecebc41b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../common" as HifiCommerceCommon
 
diff --git a/interface/resources/qml/hifi/dialogs/AboutDialog.qml b/interface/resources/qml/hifi/dialogs/AboutDialog.qml
index b8e6e89aec..3d5d1a94a3 100644
--- a/interface/resources/qml/hifi/dialogs/AboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/AboutDialog.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.8
 
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../windows"
 
 ScrollingWindow {
diff --git a/interface/resources/qml/hifi/dialogs/RunningScripts.qml b/interface/resources/qml/hifi/dialogs/RunningScripts.qml
index b0817c4bbc..9e2b175043 100644
--- a/interface/resources/qml/hifi/dialogs/RunningScripts.qml
+++ b/interface/resources/qml/hifi/dialogs/RunningScripts.qml
@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows" as Windows
 import "../"
 
@@ -30,7 +30,7 @@ Windows.ScrollingWindow {
     minSize: Qt.vector2d(424, 300)
 
     HifiConstants { id: hifi }
-    
+
     property var scripts: ScriptDiscoveryService;
     property var scriptsModel: scripts.scriptsModelFilter
     property var runningScriptsModel: ListModel { }
@@ -63,8 +63,8 @@ Windows.ScrollingWindow {
             }
         }
     }
-    
-    
+
+
     Timer {
         id: refreshTimer
         interval: 100
@@ -81,7 +81,7 @@ Windows.ScrollingWindow {
         running: false
         onTriggered: developerMenuEnabled = MenuInterface.isOptionChecked("Developer Menu");
     }
-    
+
     Component {
         id: listModelBuilder
         ListModel { }
@@ -92,7 +92,7 @@ Windows.ScrollingWindow {
         onScriptCountChanged: {
             runningScriptsModel = listModelBuilder.createObject(root);
             refreshTimer.restart();
-        }            
+        }
     }
 
     Component.onCompleted: {
@@ -120,7 +120,7 @@ Windows.ScrollingWindow {
         // Calling  `runningScriptsModel.clear()` here instead of creating a new object
         // triggers some kind of weird heap corruption deep inside Qt.  So instead of
         // modifying the model in place, possibly triggering behaviors in the table
-        // instead we create a new `ListModel`, populate it and update the 
+        // instead we create a new `ListModel`, populate it and update the
         // existing model atomically.
         var newRunningScriptsModel = listModelBuilder.createObject(root);
         for (var i = 0; i < runningScripts.length; ++i) {
@@ -180,7 +180,7 @@ Windows.ScrollingWindow {
         if ((script === "controllerScripts.js") || (script === "defaultScripts.js")) {
             return developerMenuEnabled;
         }
-        
+
         return true;
     }
 
@@ -372,7 +372,7 @@ Windows.ScrollingWindow {
                 colorScheme: hifi.colorSchemes.dark
                 anchors.left: parent.left
                 anchors.right: parent.right
-                
+
                 TableViewColumn {
                     role: "display";
                 }
@@ -450,4 +450,3 @@ Windows.ScrollingWindow {
         }
     }
 }
-
diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
index 579aa1cb1e..d26bf81e57 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     width: 480
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 0eeb252049..f665032b01 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -14,8 +14,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import ".."
 
diff --git a/interface/resources/qml/hifi/dialogs/TabletDCDialog.qml b/interface/resources/qml/hifi/dialogs/TabletDCDialog.qml
index afe06897df..763f56b92b 100644
--- a/interface/resources/qml/hifi/dialogs/TabletDCDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletDCDialog.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml b/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
index 50df4dedbc..213dca8b48 100644
--- a/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2
 import Hifi 1.0 as Hifi
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Rectangle {
     id: root
diff --git a/interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml b/interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml
index 24798af21a..4cfc99e0eb 100644
--- a/interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml b/interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml
index d5c5a5ee02..e86dfd7554 100644
--- a/interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Column {
     id: root
diff --git a/interface/resources/qml/hifi/dialogs/TabletLODTools.qml b/interface/resources/qml/hifi/dialogs/TabletLODTools.qml
index ab53f03477..bb3d668850 100644
--- a/interface/resources/qml/hifi/dialogs/TabletLODTools.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletLODTools.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml b/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
index 018c8f5737..6cd220307d 100644
--- a/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import "../"
 
diff --git a/interface/resources/qml/hifi/dialogs/content/ModelBrowserContent.qml b/interface/resources/qml/hifi/dialogs/content/ModelBrowserContent.qml
index ce1abc6154..b1aa8e5c45 100644
--- a/interface/resources/qml/hifi/dialogs/content/ModelBrowserContent.qml
+++ b/interface/resources/qml/hifi/dialogs/content/ModelBrowserContent.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.3
 
-import "../../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 Column {
     width: pane.contentWidth
diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
index 96a554838f..08605033a5 100644
--- a/interface/resources/qml/hifi/dialogs/security/Security.qml
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 import "qrc:////qml//hifi//commerce//common" as HifiCommerceCommon
 
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
index 96d75e340b..82d094144d 100644
--- a/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
index f058aad40a..366372622c 100644
--- a/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/tablet/CalibratingScreen.qml b/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
index e3115a5738..6b2aa331e8 100644
--- a/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
+++ b/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
@@ -10,9 +10,9 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../controls"
-import "../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/tablet/ControllerSettings.qml b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
index 6706830537..b8bbd71f33 100644
--- a/interface/resources/qml/hifi/tablet/ControllerSettings.qml
+++ b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
@@ -11,9 +11,9 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 import Qt.labs.settings 1.0
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../controls"
-import "../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "../../dialogs"
 import "../../dialogs/preferences"
 import "tabletWindows"
diff --git a/interface/resources/qml/hifi/tablet/EditEntityList.qml b/interface/resources/qml/hifi/tablet/EditEntityList.qml
index d484885103..d2fb99ea0a 100644
--- a/interface/resources/qml/hifi/tablet/EditEntityList.qml
+++ b/interface/resources/qml/hifi/tablet/EditEntityList.qml
@@ -4,8 +4,8 @@ import QtWebChannel 1.0
 import "../../controls"
 import "../toolbars"
 import QtGraphicalEffects 1.0
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 
 WebView {
diff --git a/interface/resources/qml/hifi/tablet/EditTabButton.qml b/interface/resources/qml/hifi/tablet/EditTabButton.qml
index 13894f4d15..5fc4341eb8 100644
--- a/interface/resources/qml/hifi/tablet/EditTabButton.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabButton.qml
@@ -11,8 +11,8 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 TabButton {
     id: control
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index bf7dd3e66b..d9549feeb0 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -4,8 +4,8 @@ import QtWebChannel 1.0
 import "../../controls"
 import "../toolbars"
 import QtGraphicalEffects 1.0
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 TabBar {
     id: editTabView
diff --git a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
index 13b1caf8fb..dc7ad683e3 100644
--- a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
@@ -4,8 +4,8 @@ import QtWebChannel 1.0
 import "../../controls"
 import "../toolbars"
 import QtGraphicalEffects 1.0
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 TabBar {
     id: editTabView
diff --git a/interface/resources/qml/hifi/tablet/InputRecorder.qml b/interface/resources/qml/hifi/tablet/InputRecorder.qml
index 527a6cacb4..9b63a612a8 100644
--- a/interface/resources/qml/hifi/tablet/InputRecorder.qml
+++ b/interface/resources/qml/hifi/tablet/InputRecorder.qml
@@ -9,8 +9,8 @@
 import QtQuick 2.5
 import Hifi 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import "../../dialogs"
 
diff --git a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
index 526a42f8e2..dde372648b 100644
--- a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
@@ -13,8 +13,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../../styles-uit"
-import "../../controls-uit"
+import stylesUit 1.0
+import controlsUit 1.0
 import "../dialogs"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/tablet/NewModelDialog.qml b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
index 553a4fd59f..9540979479 100644
--- a/interface/resources/qml/hifi/tablet/NewModelDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
@@ -12,8 +12,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../../styles-uit"
-import "../../controls-uit"
+import stylesUit 1.0
+import controlsUit 1.0
 import "../dialogs"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index f91642105f..2fc5cc4196 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -9,9 +9,9 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../controls"
-import "../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "."
 
 
diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
index 3d518289fb..0f26ba20aa 100644
--- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
@@ -18,8 +18,8 @@ import "../../styles"
 import "../../windows"
 import "../"
 import "../toolbars"
-import "../../styles-uit" as HifiStyles
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0 as HifiStyles
+import controlsUit 1.0 as HifiControls
 import QtQuick.Controls 2.2 as QQC2
 import QtQuick.Templates 2.2 as T
 
diff --git a/interface/resources/qml/hifi/tablet/TabletHome.qml b/interface/resources/qml/hifi/tablet/TabletHome.qml
index 1922b02f93..934ed91995 100644
--- a/interface/resources/qml/hifi/tablet/TabletHome.qml
+++ b/interface/resources/qml/hifi/tablet/TabletHome.qml
@@ -6,7 +6,7 @@ import QtQuick.Layouts 1.3
 import TabletScriptingInterface 1.0
 
 import "."
-import "../../styles-uit"
+import stylesUit 1.0
 import "../audio" as HifiAudio
 
 Item {
diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml
index 6540d53fca..267fb9f0cf 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenu.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml
@@ -7,7 +7,7 @@ import QtWebEngine  1.1
 
 
 import "."
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../controls"
 
 FocusScope {
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuItem.qml b/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
index 74f175e049..25db90c771 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: root
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuView.qml b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
index b632a17e57..73b0405984 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuView.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0
 
-import "../../styles-uit"
+import stylesUit 1.0
 import "."
 
 FocusScope {
diff --git a/interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml b/interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml
index d69d760b95..ce4e641476 100644
--- a/interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 import "../dialogs/content"
 
 Item {
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
index 871d1c92a9..8e91655dda 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
@@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3
 
 import ".."
-import "../../../controls-uit"
-import "../../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../../../windows"
 
 import "../../../dialogs/fileDialog"
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
index 3708f75114..57ca705352 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
@@ -12,8 +12,8 @@ import QtQuick 2.5
 
 import "."
 import "./preferences"
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Item {
     id: dialog
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
index 6ac3f706e4..57fdeb482b 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
@@ -12,8 +12,8 @@ import QtQuick 2.5
 import Hifi 1.0
 
 import "../../../../dialogs/preferences"
-import "../../../../controls-uit" as HiFiControls
-import "../../../../styles-uit"
+import controlsUit 1.0 as HiFiControls
+import stylesUit 1.0
 import "."
 
 Preference {
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletBrowsablePreference.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletBrowsablePreference.qml
index 8c0e934971..36b927f5f9 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletBrowsablePreference.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletBrowsablePreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../../../dialogs"
-import "../../../../controls-uit"
+import controlsUit 1.0
 import "../"
 
 Preference {
diff --git a/interface/resources/qml/styles-uit/+android/HifiConstants.qml b/interface/resources/qml/stylesUit/+android/HifiConstants.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/+android/HifiConstants.qml
rename to interface/resources/qml/stylesUit/+android/HifiConstants.qml
diff --git a/interface/resources/qml/styles-uit/AnonymousProRegular.qml b/interface/resources/qml/stylesUit/AnonymousProRegular.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/AnonymousProRegular.qml
rename to interface/resources/qml/stylesUit/AnonymousProRegular.qml
diff --git a/interface/resources/qml/styles-uit/ButtonLabel.qml b/interface/resources/qml/stylesUit/ButtonLabel.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/ButtonLabel.qml
rename to interface/resources/qml/stylesUit/ButtonLabel.qml
diff --git a/interface/resources/qml/styles-uit/FiraSansRegular.qml b/interface/resources/qml/stylesUit/FiraSansRegular.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/FiraSansRegular.qml
rename to interface/resources/qml/stylesUit/FiraSansRegular.qml
diff --git a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml b/interface/resources/qml/stylesUit/FiraSansSemiBold.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/FiraSansSemiBold.qml
rename to interface/resources/qml/stylesUit/FiraSansSemiBold.qml
diff --git a/interface/resources/qml/styles-uit/HiFiGlyphs.qml b/interface/resources/qml/stylesUit/HiFiGlyphs.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/HiFiGlyphs.qml
rename to interface/resources/qml/stylesUit/HiFiGlyphs.qml
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/stylesUit/HifiConstants.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/HifiConstants.qml
rename to interface/resources/qml/stylesUit/HifiConstants.qml
diff --git a/interface/resources/qml/styles-uit/IconButton.qml b/interface/resources/qml/stylesUit/IconButton.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/IconButton.qml
rename to interface/resources/qml/stylesUit/IconButton.qml
diff --git a/interface/resources/qml/styles-uit/InfoItem.qml b/interface/resources/qml/stylesUit/InfoItem.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/InfoItem.qml
rename to interface/resources/qml/stylesUit/InfoItem.qml
diff --git a/interface/resources/qml/styles-uit/InputLabel.qml b/interface/resources/qml/stylesUit/InputLabel.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/InputLabel.qml
rename to interface/resources/qml/stylesUit/InputLabel.qml
diff --git a/interface/resources/qml/styles-uit/ListItem.qml b/interface/resources/qml/stylesUit/ListItem.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/ListItem.qml
rename to interface/resources/qml/stylesUit/ListItem.qml
diff --git a/interface/resources/qml/styles-uit/Logs.qml b/interface/resources/qml/stylesUit/Logs.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/Logs.qml
rename to interface/resources/qml/stylesUit/Logs.qml
diff --git a/interface/resources/qml/styles-uit/OverlayTitle.qml b/interface/resources/qml/stylesUit/OverlayTitle.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/OverlayTitle.qml
rename to interface/resources/qml/stylesUit/OverlayTitle.qml
diff --git a/interface/resources/qml/styles-uit/RalewayBold.qml b/interface/resources/qml/stylesUit/RalewayBold.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/RalewayBold.qml
rename to interface/resources/qml/stylesUit/RalewayBold.qml
diff --git a/interface/resources/qml/styles-uit/RalewayLight.qml b/interface/resources/qml/stylesUit/RalewayLight.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/RalewayLight.qml
rename to interface/resources/qml/stylesUit/RalewayLight.qml
diff --git a/interface/resources/qml/styles-uit/RalewayRegular.qml b/interface/resources/qml/stylesUit/RalewayRegular.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/RalewayRegular.qml
rename to interface/resources/qml/stylesUit/RalewayRegular.qml
diff --git a/interface/resources/qml/styles-uit/RalewaySemiBold.qml b/interface/resources/qml/stylesUit/RalewaySemiBold.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/RalewaySemiBold.qml
rename to interface/resources/qml/stylesUit/RalewaySemiBold.qml
diff --git a/interface/resources/qml/styles-uit/SectionName.qml b/interface/resources/qml/stylesUit/SectionName.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/SectionName.qml
rename to interface/resources/qml/stylesUit/SectionName.qml
diff --git a/interface/resources/qml/styles-uit/Separator.qml b/interface/resources/qml/stylesUit/Separator.qml
similarity index 97%
rename from interface/resources/qml/styles-uit/Separator.qml
rename to interface/resources/qml/stylesUit/Separator.qml
index 4134b928a7..d9f11e192c 100644
--- a/interface/resources/qml/styles-uit/Separator.qml
+++ b/interface/resources/qml/stylesUit/Separator.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "."
 
 Item {
     // Size
diff --git a/interface/resources/qml/styles-uit/ShortcutText.qml b/interface/resources/qml/stylesUit/ShortcutText.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/ShortcutText.qml
rename to interface/resources/qml/stylesUit/ShortcutText.qml
diff --git a/interface/resources/qml/styles-uit/TabName.qml b/interface/resources/qml/stylesUit/TabName.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/TabName.qml
rename to interface/resources/qml/stylesUit/TabName.qml
diff --git a/interface/resources/qml/styles-uit/TextFieldInput.qml b/interface/resources/qml/stylesUit/TextFieldInput.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/TextFieldInput.qml
rename to interface/resources/qml/stylesUit/TextFieldInput.qml
diff --git a/interface/resources/qml/styles-uit/qmldir b/interface/resources/qml/stylesUit/qmldir
similarity index 100%
rename from interface/resources/qml/styles-uit/qmldir
rename to interface/resources/qml/stylesUit/qmldir
diff --git a/interface/resources/qml/windows/Decoration.qml b/interface/resources/qml/windows/Decoration.qml
index f8fd9f4e6c..efaea6be8a 100644
--- a/interface/resources/qml/windows/Decoration.qml
+++ b/interface/resources/qml/windows/Decoration.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/DefaultFrame.qml b/interface/resources/qml/windows/DefaultFrame.qml
index 60e744bec3..5a366e367b 100644
--- a/interface/resources/qml/windows/DefaultFrame.qml
+++ b/interface/resources/qml/windows/DefaultFrame.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Frame {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/DefaultFrameDecoration.qml b/interface/resources/qml/windows/DefaultFrameDecoration.qml
index 1ddd83976e..fb0dd55985 100644
--- a/interface/resources/qml/windows/DefaultFrameDecoration.qml
+++ b/interface/resources/qml/windows/DefaultFrameDecoration.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Decoration {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/Fadable.qml b/interface/resources/qml/windows/Fadable.qml
index 406c6be556..6d88fb067a 100644
--- a/interface/resources/qml/windows/Fadable.qml
+++ b/interface/resources/qml/windows/Fadable.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import stylesUit 1.0
 
 // Enable window visibility transitions
 FocusScope {
diff --git a/interface/resources/qml/windows/Frame.qml b/interface/resources/qml/windows/Frame.qml
index 271d4f2e07..7b0fbf8d8c 100644
--- a/interface/resources/qml/windows/Frame.qml
+++ b/interface/resources/qml/windows/Frame.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import stylesUit 1.0
 import "../js/Utils.js" as Utils
 
 Item {
diff --git a/interface/resources/qml/windows/ModalFrame.qml b/interface/resources/qml/windows/ModalFrame.qml
index f076ea9580..f1733ec32c 100644
--- a/interface/resources/qml/windows/ModalFrame.qml
+++ b/interface/resources/qml/windows/ModalFrame.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 
 import "."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Frame {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/ScrollingWindow.qml b/interface/resources/qml/windows/ScrollingWindow.qml
index 3c374ac8cf..4320399801 100644
--- a/interface/resources/qml/windows/ScrollingWindow.qml
+++ b/interface/resources/qml/windows/ScrollingWindow.qml
@@ -14,8 +14,8 @@ import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
 import "." as Windows
-import "../styles-uit"
-import "../controls-uit" as HiFiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HiFiControlsUit
 
 // FIXME how do I set the initial position of a window without
 // overriding places where the a individual client of the window
@@ -178,7 +178,7 @@ Windows.Window {
                 children: [ footer ]
             }
 
-            HiFiControls.Keyboard {
+            HiFiControlsUit.Keyboard {
                 id: keyboard
                 enabled: !keyboardOverride
                 raised: keyboardEnabled && keyboardRaised
diff --git a/interface/resources/qml/windows/TabletModalFrame.qml b/interface/resources/qml/windows/TabletModalFrame.qml
index 550eec8357..1e9310eb5a 100644
--- a/interface/resources/qml/windows/TabletModalFrame.qml
+++ b/interface/resources/qml/windows/TabletModalFrame.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 
 import "."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 
 Rectangle {
diff --git a/interface/resources/qml/windows/ToolFrame.qml b/interface/resources/qml/windows/ToolFrame.qml
index 20c86afb5e..bb2bada498 100644
--- a/interface/resources/qml/windows/ToolFrame.qml
+++ b/interface/resources/qml/windows/ToolFrame.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Frame {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/ToolFrameDecoration.qml b/interface/resources/qml/windows/ToolFrameDecoration.qml
index ba36a2a38c..4f149037b3 100644
--- a/interface/resources/qml/windows/ToolFrameDecoration.qml
+++ b/interface/resources/qml/windows/ToolFrameDecoration.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Decoration {
     id: root
diff --git a/interface/resources/qml/windows/Window.qml b/interface/resources/qml/windows/Window.qml
index 835967c628..9f180af55d 100644
--- a/interface/resources/qml/windows/Window.qml
+++ b/interface/resources/qml/windows/Window.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 // FIXME how do I set the initial position of a window without
 // overriding places where the a individual client of the window
diff --git a/libraries/gpu/src/gpu/MipGeneration.slh b/libraries/gpu/src/gpu/MipGeneration.slh
index bc8dd39042..b5d4ab3303 100644
--- a/libraries/gpu/src/gpu/MipGeneration.slh
+++ b/libraries/gpu/src/gpu/MipGeneration.slh
@@ -13,7 +13,7 @@
 
 <@include gpu/ShaderConstants.h@>
 
-layout(binding=GPU_TEXTURE_MIP_CREATION_INPUT) uniform sampler2D texMap;
+LAYOUT(binding=GPU_TEXTURE_MIP_CREATION_INPUT) uniform sampler2D texMap;
 
 in vec2 varTexCoord0;
 
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index ddd23339df..c0c5a4d059 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -231,7 +231,11 @@ private:
     QString _pendingPath;
     QTimer _settingsTimer;
     mutable ReadWriteLockable _interstitialModeSettingLock;
-    Setting::Handle<bool> _enableInterstitialMode{ "enableInterstitialMode", true };
+#ifdef Q_OS_ANDROID
+    Setting::Handle<bool> _enableInterstitialMode{ "enableInterstitialMode", false };
+#else
+    Setting::Handle<bool> _enableInterstitialMode { "enableInterstitialMode", true };
+#endif
 
     QSet<QString> _domainConnectionRefusals;
     bool _hasCheckedForAccessToken { false };
diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index 7aad8d468a..392bc5b7af 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -740,6 +740,8 @@ void Resource::handleReplyFinished() {
 
     setSize(_bytesTotal);
 
+    // Make sure we keep the Resource alive here
+    auto self = _self.lock();
     ResourceCache::requestCompleted(_self);
 
     auto result = _request->getResult();
diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h
index 33490301d7..c632399ad4 100644
--- a/libraries/networking/src/ResourceCache.h
+++ b/libraries/networking/src/ResourceCache.h
@@ -62,7 +62,7 @@ static const qint64 MAX_UNUSED_MAX_SIZE = MAXIMUM_CACHE_SIZE;
 class ResourceCacheSharedItems : public Dependency  {
     SINGLETON_DEPENDENCY
 
-    using Mutex = std::mutex;
+    using Mutex = std::recursive_mutex;
     using Lock = std::unique_lock<Mutex>;
 
 public:
diff --git a/libraries/render-utils/src/debug_deferred_buffer.slf b/libraries/render-utils/src/debug_deferred_buffer.slf
index c6e3c49e54..ccbe5c491f 100644
--- a/libraries/render-utils/src/debug_deferred_buffer.slf
+++ b/libraries/render-utils/src/debug_deferred_buffer.slf
@@ -25,7 +25,7 @@ LAYOUT(binding=RENDER_UTILS_TEXTURE_SHADOW) uniform sampler2DArrayShadow shadowM
 
 <@include debug_deferred_buffer_shared.slh@>
 
-layout(std140, binding=RENDER_UTILS_BUFFER_DEBUG_DEFERRED_PARAMS) uniform parametersBuffer {
+LAYOUT_STD140(binding=RENDER_UTILS_BUFFER_DEBUG_DEFERRED_PARAMS) uniform parametersBuffer {
     DebugParameters parameters;
 };
 
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 74098f69c7..f67a356078 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -250,6 +250,7 @@ void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
 
     engine->setNetworkAccessManagerFactory(new QmlNetworkAccessManagerFactory);
     auto importList = engine->importPathList();
+    importList.insert(importList.begin(), PathUtils::resourcesPath() + "qml/");
     importList.insert(importList.begin(), PathUtils::resourcesPath());
     engine->setImportPathList(importList);
     for (const auto& path : importList) {
diff --git a/libraries/workload/src/workload/ViewTask.cpp b/libraries/workload/src/workload/ViewTask.cpp
index 9d0c693149..0a268df9fc 100644
--- a/libraries/workload/src/workload/ViewTask.cpp
+++ b/libraries/workload/src/workload/ViewTask.cpp
@@ -31,13 +31,25 @@ void SetupViews::run(const WorkloadContextPointer& renderContext, const Input& i
     auto& outViews = outputs;
     outViews.clear();
 
-    // Filter the first view centerer on the avatar head if needed
     if (_views.size() >= 2) {
+        // when inputs contains two or more views:
+        //   index 0 = view from avatar's head
+        //   index 1 = view from camera
+        //   index 2 and higher = secondary camera and whatever
         if (data.useAvatarView) {
+            // for debug purposes we keep the head view and skip that of the camera
             outViews.push_back(_views[0]);
             outViews.insert(outViews.end(), _views.begin() + 2, _views.end());
         } else {
-            outViews.insert(outViews.end(), _views.begin() + 1, _views.end());
+            // otherwise we use all of the views...
+            const float MIN_HEAD_CAMERA_SEPARATION_SQUARED = MIN_VIEW_BACK_FRONTS[0][1] * MIN_VIEW_BACK_FRONTS[0][1];
+            if (glm::distance2(_views[0].origin, _views[1].origin) < MIN_HEAD_CAMERA_SEPARATION_SQUARED) {
+                // ... unless the first two are close enough to be considered the same
+                // in which case we only keep one of them
+                outViews.insert(outViews.end(), _views.begin() + 1, _views.end());
+            } else {
+                outViews = _views;
+            }
         }
     } else {
         outViews = _views;
@@ -177,7 +189,6 @@ void ControlViews::regulateViews(workload::Views& outViews, const workload::Timi
         outView.regionBackFronts[workload::Region::R1] = regionBackFronts[workload::Region::R1];
         outView.regionBackFronts[workload::Region::R2] = regionBackFronts[workload::Region::R2];
         outView.regionBackFronts[workload::Region::R3] = regionBackFronts[workload::Region::R3];
-
         workload::View::updateRegionsFromBackFronts(outView);
     }
 }
diff --git a/scripts/developer/tests/ControlsGallery.qml b/scripts/developer/tests/ControlsGallery.qml
index ceb8a26dc9..9685fa6fe8 100644
--- a/scripts/developer/tests/ControlsGallery.qml
+++ b/scripts/developer/tests/ControlsGallery.qml
@@ -2,16 +2,9 @@ import QtQuick 2.10
 import QtQuick.Window 2.10
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
 
-//uncomment to use from qmlscratch tool
-//import '../../../interface/resources/qml/controls-uit' as HifiControlsUit
-//import '../../../interface/resources/qml/styles-uit'
-
-//uncomment to use with HIFI_USE_SOURCE_TREE_RESOURCES=1
-//import '../../../resources/qml/controls-uit' as HifiControlsUit
-//import '../../../resources/qml/styles-uit'
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
 
 Item {
     visible: true
diff --git a/scripts/developer/utilities/audio/Stats.qml b/scripts/developer/utilities/audio/Stats.qml
index f359e9b04c..e2291e485d 100644
--- a/scripts/developer/utilities/audio/Stats.qml
+++ b/scripts/developer/utilities/audio/Stats.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:////qml//controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 Column {
     id: stats
diff --git a/scripts/developer/utilities/audio/TabletStats.qml b/scripts/developer/utilities/audio/TabletStats.qml
index 2f8d212a2a..b50acabec4 100644
--- a/scripts/developer/utilities/audio/TabletStats.qml
+++ b/scripts/developer/utilities/audio/TabletStats.qml
@@ -11,8 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
-
-import "qrc:////qml//styles-uit"
+import stylesUit 1.0
 
 Item {
     id: dialog
diff --git a/scripts/developer/utilities/lib/jet/qml/TaskList.qml b/scripts/developer/utilities/lib/jet/qml/TaskList.qml
index 5b1aa0afb5..166f604666 100644
--- a/scripts/developer/utilities/lib/jet/qml/TaskList.qml
+++ b/scripts/developer/utilities/lib/jet/qml/TaskList.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 import "../jet.js" as Jet
 
diff --git a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
index 2c75865698..0f083aa72c 100644
--- a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
+++ b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 import "../jet.js" as Jet
 
diff --git a/scripts/developer/utilities/lib/plotperf/Color.qml b/scripts/developer/utilities/lib/plotperf/Color.qml
index 15d7f9fcc9..1ad72fe2e6 100644
--- a/scripts/developer/utilities/lib/plotperf/Color.qml
+++ b/scripts/developer/utilities/lib/plotperf/Color.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 
 Item {
diff --git a/scripts/developer/utilities/render/antialiasing.qml b/scripts/developer/utilities/render/antialiasing.qml
index 1a8f9dac2d..5abfd30935 100644
--- a/scripts/developer/utilities/render/antialiasing.qml
+++ b/scripts/developer/utilities/render/antialiasing.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
     
 import "configSlider"
 import "../lib/plotperf"
diff --git a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
index 41de77fb09..bf9089d82c 100644
--- a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
+++ b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 
 Item {
diff --git a/scripts/developer/utilities/render/configSlider/RichSlider.qml b/scripts/developer/utilities/render/configSlider/RichSlider.qml
index 01b14f3d48..ff16cb32ad 100644
--- a/scripts/developer/utilities/render/configSlider/RichSlider.qml
+++ b/scripts/developer/utilities/render/configSlider/RichSlider.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 
 Item {
diff --git a/scripts/developer/utilities/render/deferredLighting.qml b/scripts/developer/utilities/render/deferredLighting.qml
index a9479b2935..64e00acdac 100644
--- a/scripts/developer/utilities/render/deferredLighting.qml
+++ b/scripts/developer/utilities/render/deferredLighting.qml
@@ -11,8 +11,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import  "configSlider"
 import "../lib/jet/qml" as Jet
 
diff --git a/scripts/developer/utilities/render/engineInspector.qml b/scripts/developer/utilities/render/engineInspector.qml
index 1b9941e64e..16dd8eb985 100644
--- a/scripts/developer/utilities/render/engineInspector.qml
+++ b/scripts/developer/utilities/render/engineInspector.qml
@@ -11,8 +11,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 import "../lib/jet/qml" as Jet
 
diff --git a/scripts/developer/utilities/render/highlight.qml b/scripts/developer/utilities/render/highlight.qml
index 88d6a807ae..d8af2a828e 100644
--- a/scripts/developer/utilities/render/highlight.qml
+++ b/scripts/developer/utilities/render/highlight.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import  "configSlider"
 import  "../lib/plotperf"
 import  "highlight"
diff --git a/scripts/developer/utilities/render/highlight/HighlightStyle.qml b/scripts/developer/utilities/render/highlight/HighlightStyle.qml
index 371b7e81f7..475aadfdce 100644
--- a/scripts/developer/utilities/render/highlight/HighlightStyle.qml
+++ b/scripts/developer/utilities/render/highlight/HighlightStyle.qml
@@ -12,8 +12,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 import "../configSlider"
 import "../../lib/plotperf"
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Item {
     id: root
diff --git a/scripts/developer/utilities/render/lod.qml b/scripts/developer/utilities/render/lod.qml
index 889d8db836..892b43d8be 100644
--- a/scripts/developer/utilities/render/lod.qml
+++ b/scripts/developer/utilities/render/lod.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 import "../lib/plotperf"
 import "configSlider"
diff --git a/scripts/developer/utilities/render/shadow.qml b/scripts/developer/utilities/render/shadow.qml
index 464fe00eb9..a1d6777a68 100644
--- a/scripts/developer/utilities/render/shadow.qml
+++ b/scripts/developer/utilities/render/shadow.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
     
 import "configSlider"
 
diff --git a/scripts/developer/utilities/render/transition.qml b/scripts/developer/utilities/render/transition.qml
index f74468a273..c150c523f9 100644
--- a/scripts/developer/utilities/render/transition.qml
+++ b/scripts/developer/utilities/render/transition.qml
@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 import QtQuick.Dialogs 1.0
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import  "configSlider"
 import "../lib/plotperf"
 
diff --git a/scripts/developer/utilities/workload/workloadInspector.qml b/scripts/developer/utilities/workload/workloadInspector.qml
index 2eaa9d8133..746a572f29 100644
--- a/scripts/developer/utilities/workload/workloadInspector.qml
+++ b/scripts/developer/utilities/workload/workloadInspector.qml
@@ -11,8 +11,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../render/configSlider"
 import "../lib/jet/qml" as Jet
 import "../lib/plotperf"
diff --git a/tests-manual/ui/qml/ControlsGalleryWindow.qml b/tests-manual/ui/qml/ControlsGalleryWindow.qml
new file mode 100644
index 0000000000..32fd62da36
--- /dev/null
+++ b/tests-manual/ui/qml/ControlsGalleryWindow.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QtQuick.Window 2.3
+import QtQuick.Controls 1.4
+import '../../../scripts/developer/tests' as Tests
+
+ApplicationWindow {
+    width: 640
+    height: 480
+    visible: true
+
+    Tests.ControlsGallery {
+        anchors.fill: parent
+    }
+}
diff --git a/tests-manual/ui/qml/Palettes.qml b/tests-manual/ui/qml/Palettes.qml
deleted file mode 100644
index 2bdf6eba8b..0000000000
--- a/tests-manual/ui/qml/Palettes.qml
+++ /dev/null
@@ -1,150 +0,0 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-
-Rectangle {
-    color: "teal"
-    height: 512
-    width: 192
-    SystemPalette { id: sp; colorGroup: SystemPalette.Active }
-    SystemPalette { id: spi; colorGroup: SystemPalette.Inactive }
-    SystemPalette { id: spd; colorGroup: SystemPalette.Disabled }
-
-    Column {
-        anchors.margins: 8
-        anchors.fill: parent
-        spacing: 8
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "base" }
-            Rectangle { height: parent.height; width: 16; color: sp.base }
-            Rectangle { height: parent.height; width: 16; color: spi.base }
-            Rectangle { height: parent.height; width: 16; color: spd.base }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "alternateBase" }
-            Rectangle { height: parent.height; width: 16; color: sp.alternateBase }
-            Rectangle { height: parent.height; width: 16; color: spi.alternateBase }
-            Rectangle { height: parent.height; width: 16; color: spd.alternateBase }
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "dark" }
-            Rectangle { height: parent.height; width: 16; color: sp.dark }
-            Rectangle { height: parent.height; width: 16; color: spi.dark }
-            Rectangle { height: parent.height; width: 16; color: spd.dark }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "mid" }
-            Rectangle { height: parent.height; width: 16; color: sp.mid }
-            Rectangle { height: parent.height; width: 16; color: spi.mid }
-            Rectangle { height: parent.height; width: 16; color: spd.mid }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "mid light" }
-            Rectangle { height: parent.height; width: 16; color: sp.midlight }
-            Rectangle { height: parent.height; width: 16; color: spi.midlight }
-            Rectangle { height: parent.height; width: 16; color: spd.midlight }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "light" }
-            Rectangle { height: parent.height; width: 16; color: sp.light}
-            Rectangle { height: parent.height; width: 16; color: spi.light}
-            Rectangle { height: parent.height; width: 16; color: spd.light}
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "shadow" }
-            Rectangle { height: parent.height; width: 16; color: sp.shadow}
-            Rectangle { height: parent.height; width: 16; color: spi.shadow}
-            Rectangle { height: parent.height; width: 16; color: spd.shadow}
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "text" }
-            Rectangle { height: parent.height; width: 16; color: sp.text }
-            Rectangle { height: parent.height; width: 16; color: spi.text }
-            Rectangle { height: parent.height; width: 16; color: spd.text }
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "window" }
-            Rectangle { height: parent.height; width: 16; color: sp.window }
-            Rectangle { height: parent.height; width: 16; color: spi.window }
-            Rectangle { height: parent.height; width: 16; color: spd.window }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "window text" }
-            Rectangle { height: parent.height; width: 16; color: sp.windowText }
-            Rectangle { height: parent.height; width: 16; color: spi.windowText }
-            Rectangle { height: parent.height; width: 16; color: spd.windowText }
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "button" }
-            Rectangle { height: parent.height; width: 16; color: sp.button }
-            Rectangle { height: parent.height; width: 16; color: spi.button }
-            Rectangle { height: parent.height; width: 16; color: spd.button }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "buttonText" }
-            Rectangle { height: parent.height; width: 16; color: sp.buttonText }
-            Rectangle { height: parent.height; width: 16; color: spi.buttonText }
-            Rectangle { height: parent.height; width: 16; color: spd.buttonText }
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "highlight" }
-            Rectangle { height: parent.height; width: 16; color: sp.highlight }
-            Rectangle { height: parent.height; width: 16; color: spi.highlight }
-            Rectangle { height: parent.height; width: 16; color: spd.highlight }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "highlighted text" }
-            Rectangle { height: parent.height; width: 16; color: sp.highlightedText}
-            Rectangle { height: parent.height; width: 16; color: spi.highlightedText}
-            Rectangle { height: parent.height; width: 16; color: spd.highlightedText}
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/ScrollingGraph.qml b/tests-manual/ui/qml/ScrollingGraph.qml
deleted file mode 100644
index 55523a23f4..0000000000
--- a/tests-manual/ui/qml/ScrollingGraph.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Layouts 1.0
-import QtQuick.Dialogs 1.0
-
-Rectangle {
-    id: root
-    property int size: 64
-    width: size
-    height: size
-    color: 'black'
-    property int controlId: 0
-    property real value: 0.5
-    property int scrollWidth: 1
-    property real min: 0.0
-    property real max: 1.0
-    property bool log: false
-    property real range: max - min
-    property color lineColor: 'yellow'
-    property bool bar: false
-    property real lastHeight: -1
-    property string label: ""
-
-    function update() {
-        value = Controller.getValue(controlId);
-        if (log) {
-            var log = Math.log(10) / Math.log(Math.abs(value));
-            var sign = Math.sign(value);
-            value = log * sign;
-        }
-        canvas.requestPaint();
-    }
-
-    function drawHeight() {
-        if (value < min) {
-            return 0;
-        }
-        if (value > max) {
-            return height;
-        }
-        return ((value - min) / range) * height;
-    }
-
-    Timer {
-        interval: 50; running: true; repeat: true
-        onTriggered: root.update()
-    }
-
-    Canvas {
-       id: canvas
-       anchors.fill: parent
-       antialiasing: false
-
-       Text {
-           anchors.top: parent.top
-           text: root.label
-           color: 'white'
-       }
-
-       Text {
-           anchors.right: parent.right
-           anchors.top: parent.top
-           text: root.max
-           color: 'white'
-       }
-
-       Text {
-           anchors.right: parent.right
-           anchors.bottom: parent.bottom
-           text: root.min
-           color: 'white'
-       }
-
-       function scroll() {
-           var ctx = canvas.getContext('2d');
-           var image = ctx.getImageData(0, 0, canvas.width, canvas.height);
-           ctx.beginPath();
-           ctx.clearRect(0, 0, canvas.width, canvas.height);
-           ctx.drawImage(image, -root.scrollWidth, 0, canvas.width, canvas.height)
-           ctx.restore()
-       }
-
-       onPaint: {
-           scroll();
-           var ctx = canvas.getContext('2d');
-           ctx.save();
-           var currentHeight = root.drawHeight();
-           if (root.lastHeight == -1) {
-               root.lastHeight = currentHeight
-           }
-
-//           var x = canvas.width - root.drawWidth;
-//           var y = canvas.height - drawHeight;
-//           ctx.fillStyle = root.color
-//           ctx.fillRect(x, y, root.drawWidth, root.bar ? drawHeight : 1)
-//           ctx.fill();
-//           ctx.restore()
-
-
-           ctx.beginPath();
-           ctx.lineWidth = 1
-           ctx.strokeStyle = root.lineColor
-           ctx.moveTo(canvas.width - root.scrollWidth, root.lastHeight).lineTo(canvas.width, currentHeight)
-           ctx.stroke()
-           ctx.restore()
-           root.lastHeight = currentHeight
-       }
-    }
-}
-
-
diff --git a/tests-manual/ui/qml/StubMenu.qml b/tests-manual/ui/qml/StubMenu.qml
deleted file mode 100644
index fd0298988a..0000000000
--- a/tests-manual/ui/qml/StubMenu.qml
+++ /dev/null
@@ -1,730 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-import "../../../interface/resources/qml/hifi"
-
-Menu {
-    property var menuOption: MenuOption {}
-    Item {
-        Action {
-            id: login;
-            text: menuOption.login
-        }
-        Action {
-            id: update;
-            text: "Update";
-            enabled: false
-        }
-        Action {
-            id: crashReporter;
-            text: "Crash Reporter...";
-            enabled: false
-        }
-        Action {
-            id: help;
-            text: menuOption.help
-            onTriggered: Application.showHelp()
-        }
-        Action {
-            id: aboutApp;
-            text: menuOption.aboutApp
-        }
-        Action {
-            id: quit;
-            text: menuOption.quit
-        }
-
-        ExclusiveGroup { id: renderResolutionGroup }
-        Action {
-            id: renderResolutionOne;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionOne;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderResolutionTwoThird;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionTwoThird;
-            checkable: true
-        }
-        Action {
-            id: renderResolutionHalf;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionHalf;
-            checkable: true
-        }
-        Action {
-            id: renderResolutionThird;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionThird;
-            checkable: true
-        }
-        Action {
-            id: renderResolutionQuarter;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionQuarter;
-            checkable: true
-        }
-
-        ExclusiveGroup { id: ambientLightGroup }
-        Action {
-            id: renderAmbientLightGlobal;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLightGlobal;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight0;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight0;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight1;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight1;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight2;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight2;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight3;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight3;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight4;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight4;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight5;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight5;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight6;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight6;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight7;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight7;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight8;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight8;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight9;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight9;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: preferences
-            shortcut: StandardKey.Preferences
-            text: menuOption.preferences
-            onTriggered: dialogsManager.editPreferences()
-        }
-
-    }
-
-    Menu {
-        title: "File"
-        MenuItem {
-            action: login
-        }
-        MenuItem {
-            action: update
-        }
-        MenuItem {
-            action: help
-        }
-        MenuItem {
-            action: crashReporter
-        }
-        MenuItem {
-            action: aboutApp
-        }
-        MenuItem {
-            action: quit
-        }
-    }
-
-    Menu {
-        title: "Edit"
-        MenuItem {
-            text: "Undo" }
-        MenuItem {
-            text: "Redo" }
-        MenuItem {
-            text: menuOption.runningScripts
-        }
-        MenuItem {
-            text: menuOption.loadScript
-        }
-        MenuItem {
-            text: menuOption.loadScriptURL
-        }
-        MenuItem {
-            text: menuOption.stopAllScripts
-        }
-        MenuItem {
-            text: menuOption.reloadAllScripts
-        }
-        MenuItem {
-            text: menuOption.scriptEditor
-        }
-        MenuItem {
-            text: menuOption.console_
-        }
-        MenuItem {
-            text: menuOption.reloadContent
-        }
-        MenuItem {
-            text: menuOption.packageModel
-        }
-    }
-
-    Menu {
-        title: "Audio"
-        MenuItem {
-            text: menuOption.muteAudio;
-            checkable: true
-        }
-        MenuItem {
-            text: menuOption.audioTools;
-            checkable: true
-        }
-    }
-    Menu {
-        title: "Avatar"
-        // Avatar > Attachments...
-        MenuItem {
-            text: menuOption.attachments
-        }
-        Menu {
-            title: "Size"
-            // Avatar > Size > Increase
-            MenuItem {
-                text: menuOption.increaseAvatarSize
-            }
-            // Avatar > Size > Decrease
-            MenuItem {
-                text: menuOption.decreaseAvatarSize
-            }
-            // Avatar > Size > Reset
-            MenuItem {
-                text: menuOption.resetAvatarSize
-            }
-        }
-        // Avatar > Reset Sensors
-        MenuItem {
-            text: menuOption.resetSensors
-        }
-    }
-    Menu {
-        title: "Display"
-    }
-    Menu {
-        title: "View"
-        ExclusiveGroup {
-            id: cameraModeGroup
-        }
-
-        MenuItem {
-            text: menuOption.firstPerson;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuItem {
-            text: menuOption.thirdPerson;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuItem {
-            text: menuOption.fullscreenMirror;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuItem {
-            text: menuOption.independentMode;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuItem {
-            text: menuOption.cameraEntityMode;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuSeparator{}
-        MenuItem {
-            text: menuOption.miniMirror;
-            checkable: true
-        }
-    }
-    Menu {
-        title: "Navigate"
-        MenuItem {
-            text: "Home" }
-        MenuItem {
-            text: menuOption.addressBar
-        }
-        MenuItem {
-            text: "Directory" }
-        MenuItem {
-            text: menuOption.copyAddress
-        }
-        MenuItem {
-            text: menuOption.copyPath
-        }
-    }
-    Menu {
-        title: "Settings"
-        MenuItem {
-            text: "Advanced Menus" }
-        MenuItem {
-            text: "Developer Menus" }
-        MenuItem {
-            text: menuOption.preferences
-        }
-        MenuItem {
-            text: "Avatar..." }
-        MenuItem {
-            text: "Audio..." }
-        MenuItem {
-            text: "LOD..." }
-        MenuItem {
-            text: menuOption.inputMenu
-        }
-    }
-    Menu {
-        title: "Developer"
-        Menu {
-            title: "Render"
-            MenuItem {
-                text: menuOption.atmosphere;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.worldAxes;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.debugAmbientOcclusion;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.antialiasing;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.stars;
-                checkable: true
-            }
-            Menu {
-                title: menuOption.renderAmbientLight
-                MenuItem {
-                    action: renderAmbientLightGlobal; }
-                MenuItem {
-                    action: renderAmbientLight0; }
-                MenuItem {
-                    action: renderAmbientLight1; }
-                MenuItem {
-                    action: renderAmbientLight2; }
-                MenuItem {
-                    action: renderAmbientLight3; }
-                MenuItem {
-                    action: renderAmbientLight4; }
-                MenuItem {
-                    action: renderAmbientLight5; }
-                MenuItem {
-                    action: renderAmbientLight6; }
-                MenuItem {
-                    action: renderAmbientLight7; }
-                MenuItem {
-                    action: renderAmbientLight8; }
-                MenuItem {
-                    action: renderAmbientLight9; }
-            }
-            MenuItem {
-                text: menuOption.throttleFPSIfNotFocus;
-                checkable: true
-            }
-            Menu {
-                title: menuOption.renderResolution
-                MenuItem {
-                    action: renderResolutionOne
-                }
-                MenuItem {
-                    action: renderResolutionTwoThird
-                }
-                MenuItem {
-                    action: renderResolutionHalf
-                }
-                MenuItem {
-                    action: renderResolutionThird
-                }
-                MenuItem {
-                    action: renderResolutionQuarter
-                }
-            }
-            MenuItem {
-                text: menuOption.lodTools
-            }
-        }
-        Menu {
-            title: "Assets"
-            MenuItem {
-                text: menuOption.uploadAsset
-            }
-            MenuItem {
-                text: menuOption.assetMigration
-            }
-        }
-        Menu {
-            title: "Avatar"
-            Menu {
-                title: "Face Tracking"
-                MenuItem {
-                    text: menuOption.noFaceTracking;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.faceshift;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.useCamera;
-                    checkable: true
-                }
-                MenuSeparator{}
-                MenuItem {
-                    text: menuOption.binaryEyelidControl;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.coupleEyelids;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.useAudioForMouth;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.velocityFilter;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.calibrateCamera
-                }
-                MenuSeparator{}
-                MenuItem {
-                    text: menuOption.muteFaceTracking;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.autoMuteAudio;
-                    checkable: true
-                }
-            }
-            Menu {
-                title: "Eye Tracking"
-                MenuItem {
-                    text: menuOption.sMIEyeTracking;
-                    checkable: true
-                }
-                Menu {
-                    title: "Calibrate"
-                    MenuItem {
-                        text: menuOption.onePointCalibration
-                    }
-                    MenuItem {
-                        text: menuOption.threePointCalibration
-                    }
-                    MenuItem {
-                        text: menuOption.fivePointCalibration
-                    }
-                }
-                MenuItem {
-                    text: menuOption.simulateEyeTracking;
-                    checkable: true
-                }
-            }
-            MenuItem {
-                text: menuOption.avatarReceiveStats;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.renderBoundingCollisionShapes;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.renderLookAtVectors;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.renderLookAtTargets;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.renderFocusIndicator;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.showWhosLookingAtMe;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.fixGaze;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.animDebugDrawDefaultPose;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.animDebugDrawAnimPose;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.animDebugDrawPosition;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.meshVisible;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.disableEyelidAdjustment;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.turnWithHead;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.keyboardMotorControl;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.scriptedMotorControl;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.enableCharacterController;
-                checkable: true
-            }
-        }
-        Menu {
-            title: "Hands"
-            MenuItem {
-                text: menuOption.displayHandTargets;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.lowVelocityFilter;
-                checkable: true
-            }
-            Menu {
-                title: "Leap Motion"
-                MenuItem {
-                    text: menuOption.leapMotionOnHMD;
-                    checkable: true
-                }
-            }
-        }
-        Menu {
-            title: "Entities"
-            MenuItem {
-                text: menuOption.octreeStats
-            }
-            MenuItem {
-                text: menuOption.showRealtimeEntityStats;
-                checkable: true
-            }
-        }
-        Menu {
-            title: "Network"
-            MenuItem {
-                text: menuOption.reloadContent
-            }
-            MenuItem {
-                text: menuOption.disableNackPackets;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.disableActivityLogger;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.cachesSize
-            }
-            MenuItem {
-                text: menuOption.diskCacheEditor
-            }
-            MenuItem {
-                text: menuOption.showDSConnectTable
-            }
-            MenuItem {
-                text: menuOption.bandwidthDetails
-            }
-        }
-        Menu {
-            title: "Timing"
-            Menu {
-                title: "Performance Timer"
-                MenuItem {
-                    text: menuOption.displayDebugTimingDetails;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.onlyDisplayTopTen;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandUpdateTiming;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandMyAvatarTiming;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandMyAvatarSimulateTiming;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandOtherAvatarTiming;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandPaintGLTiming;
-                    checkable: true
-                }
-            }
-            MenuItem {
-                text: menuOption.frameTimer;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.runTimingTests
-            }
-            MenuItem {
-                text: menuOption.pipelineWarnings;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.logExtraTimings;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.suppressShortTimings;
-                checkable: true
-            }
-        }
-        Menu {
-            title: "Audio"
-            MenuItem {
-                text: menuOption.audioNoiseReduction;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.echoServerAudio;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.echoLocalAudio;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.muteEnvironment
-            }
-            Menu {
-                title: "Audio"
-                MenuItem {
-                    text: menuOption.audioScope;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.audioScopePause;
-                    checkable: true
-                }
-                Menu {
-                    title: "Display Frames"
-                    ExclusiveGroup {
-                        id: audioScopeFramesGroup
-                    }
-                    MenuItem {
-                        exclusiveGroup: audioScopeFramesGroup;
-                        text: menuOption.audioScopeFiveFrames;
-                        checkable: true
-                    }
-                    MenuItem {
-                        exclusiveGroup: audioScopeFramesGroup;
-                        text: menuOption.audioScopeTwentyFrames;
-                        checkable: true
-                    }
-                    MenuItem {
-                        exclusiveGroup: audioScopeFramesGroup;
-                        text: menuOption.audioScopeFiftyFrames;
-                        checkable: true
-                    }
-                }
-                MenuItem {
-                    text: menuOption.audioNetworkStats
-                }
-            }
-        }
-        Menu {
-            title: "Physics"
-            MenuItem {
-                text: menuOption.physicsShowOwned;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.physicsShowHulls;
-                checkable: true
-            }
-        }
-        MenuItem {
-            text: menuOption.displayCrashOptions;
-            checkable: true
-        }
-        MenuItem {
-            text: menuOption.crashInterface
-        }
-        MenuItem {
-            text: menuOption.log
-        }
-        MenuItem {
-            text: menuOption.stats;
-            checkable: true
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/Stubs.qml b/tests-manual/ui/qml/Stubs.qml
deleted file mode 100644
index 8c1465d54c..0000000000
--- a/tests-manual/ui/qml/Stubs.qml
+++ /dev/null
@@ -1,346 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-// Stubs for the global service objects set by Interface.cpp when creating the UI
-// This is useful for testing inside Qt creator where these services don't actually exist.
-Item {
-
-    Item {
-        objectName: "offscreenFlags"
-        property bool navigationFocused: false
-    }
-
-    Item {
-        objectName: "urlHandler"
-        function fixupUrl(url) { return url; }
-        function canHandleUrl(url) { return false; }
-        function handleUrl(url) { return true; }
-    }
-
-    Item {
-        objectName: "Account"
-        function isLoggedIn() { return true; }
-        function getUsername() { return "Jherico"; }
-    }
-
-    Item {
-        objectName: "GL"
-        property string vendor: ""
-    }
-
-    Item {
-        objectName: "ApplicationCompositor"
-        property bool reticleOverDesktop: true
-    }
-
-    Item {
-        objectName: "Controller"
-        function getRecommendedOverlayRect() {
-            return Qt.rect(0, 0, 1920, 1080);
-        }
-    }
-
-    Item {
-        objectName: "Preferences"
-        // List of categories obtained by logging categories as they are added in Interface in Preferences::addPreference().
-        property var categories: [
-            "Avatar Basics", "Snapshots", "Scripts", "Privacy", "Level of Detail Tuning", "Avatar Tuning", "Avatar Camera",
-            "Audio", "Octree", "HMD", "Sixense Controllers", "Graphics"
-        ]
-    }
-
-    Item {
-        objectName: "ScriptDiscoveryService"
-        //property var scriptsModelFilter: scriptsModel
-        signal scriptCountChanged()
-        property var _runningScripts:[
-            { name: "wireFrameTest.js", url: "foo/wireframetest.js", path: "foo/wireframetest.js", local: true },
-            { name: "edit.js", url: "foo/edit.js", path: "foo/edit.js", local: false },
-            { name: "listAllScripts.js", url: "foo/listAllScripts.js", path: "foo/listAllScripts.js", local: false },
-            { name: "users.js", url: "foo/users.js", path: "foo/users.js", local: false },
-        ]
-
-        function getRunning() {
-            return _runningScripts;
-        }
-    }
-
-    Item {
-        objectName: "HMD"
-        property bool active: false
-    }
-
-    Item {
-        id: menuHelper
-        objectName: "MenuHelper"
-
-        Component {
-            id: modelMaker
-            ListModel { }
-        }
-
-        function toModel(menu, parent) {
-            if (!parent) { parent = menuHelper }
-            var result = modelMaker.createObject(parent);
-            if (menu.type !== MenuItemType.Menu) {
-                console.warn("Not a menu: " + menu);
-                return result;
-            }
-
-            var items = menu.items;
-            for (var i = 0; i < items.length; ++i) {
-                var item = items[i];
-                switch (item.type) {
-                case 2:
-                    result.append({"name": item.title, "item": item})
-                    break;
-                case 1:
-                    result.append({"name": item.text, "item": item})
-                    break;
-                case 0:
-                    result.append({"name": "", "item": item})
-                    break;
-                }
-            }
-            return result;
-        }
-
-    }
-
-    Item {
-        objectName: "Desktop"
-
-        property string _OFFSCREEN_ROOT_OBJECT_NAME: "desktopRoot";
-        property string _OFFSCREEN_DIALOG_OBJECT_NAME: "topLevelWindow";
-
-
-        function findChild(item, name) {
-            for (var i = 0; i < item.children.length; ++i) {
-                if (item.children[i].objectName === name) {
-                    return item.children[i];
-                }
-            }
-            return null;
-        }
-
-        function findParent(item, name) {
-            while (item) {
-                if (item.objectName === name) {
-                    return item;
-                }
-                item = item.parent;
-            }
-            return null;
-        }
-
-        function findDialog(item) {
-            item = findParent(item, _OFFSCREEN_DIALOG_OBJECT_NAME);
-            return item;
-        }
-
-        function closeDialog(item) {
-            item = findDialog(item);
-            if (item) {
-                item.visible = false
-            } else {
-                console.warn("Could not find top level dialog")
-            }
-        }
-
-        function getDesktop(item) {
-            while (item) {
-                if (item.desktopRoot) {
-                    break;
-                }
-                item = item.parent;
-            }
-            return item
-        }
-
-        function raise(item) {
-            var desktop = getDesktop(item);
-            if (desktop) {
-                desktop.raise(item);
-            }
-        }
-    }
-
-    Menu {
-        id: root
-        objectName: "rootMenu"
-
-        Menu {
-            title: "Audio"
-        }
-
-        Menu {
-            title: "Avatar"
-        }
-
-        Menu {
-            title: "Display"
-            ExclusiveGroup { id: displayMode }
-            Menu {
-                title: "More Stuff"
-
-                Menu { title: "Empty" }
-
-                MenuItem {
-                    text: "Do Nothing"
-                    onTriggered: console.log("Nothing")
-                }
-            }
-            MenuItem {
-                text: "Oculus"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-            MenuItem {
-                text: "OpenVR"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-            MenuItem {
-                text: "OSVR"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-            MenuItem {
-                text: "2D Screen"
-                exclusiveGroup: displayMode
-                checkable: true
-                checked: true
-            }
-            MenuItem {
-                text: "3D Screen (Active)"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-            MenuItem {
-                text: "3D Screen (Passive)"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-        }
-
-        Menu {
-            title: "View"
-            Menu {
-                title: "Camera Mode"
-                ExclusiveGroup { id: cameraMode }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "First Person";
-                    onTriggered: console.log(text + " checked " + checked)
-                    checkable: true
-                    checked: true
-                }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "Third Person";
-                    onTriggered: console.log(text)
-                    checkable: true
-                }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "Independent Mode";
-                    onTriggered: console.log(text)
-                    checkable: true
-                }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "Entity Mode";
-                    onTriggered: console.log(text)
-                    enabled: false
-                    checkable: true
-                }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "Fullscreen Mirror";
-                    onTriggered: console.log(text)
-                    checkable: true
-                }
-            }
-        }
-
-        Menu {
-            title: "Edit"
-
-            MenuItem {
-                text: "Undo"
-                shortcut: "Ctrl+Z"
-                enabled: false
-                onTriggered: console.log(text)
-            }
-
-            MenuItem {
-                text: "Redo"
-                shortcut: "Ctrl+Shift+Z"
-                enabled: false
-                onTriggered: console.log(text)
-            }
-
-            MenuSeparator { }
-
-            MenuItem {
-                text: "Cut"
-                shortcut: "Ctrl+X"
-                onTriggered: console.log(text)
-            }
-
-            MenuItem {
-                text: "Copy"
-                shortcut: "Ctrl+C"
-                onTriggered: console.log(text)
-            }
-
-            MenuItem {
-                text: "Paste"
-                shortcut: "Ctrl+V"
-                visible: false
-                onTriggered: console.log("Paste")
-            }
-        }
-
-        Menu {
-            title: "Navigate"
-        }
-
-        Menu {
-            title: "Market"
-        }
-
-        Menu {
-            title: "Settings"
-        }
-
-        Menu {
-            title: "Developer"
-        }
-
-        Menu {
-            title: "Quit"
-        }
-
-        Menu {
-            title: "File"
-
-            Action  {
-                id: login
-                text: "Login"
-            }
-
-            Action  {
-                id: quit
-                text: "Quit"
-                shortcut: "Ctrl+Q"
-                onTriggered: Qt.quit();
-            }
-
-            MenuItem { action: quit }
-            MenuItem { action: login }
-        }
-    }
-
-}
-
diff --git a/tests-manual/ui/qml/TestControllers.qml b/tests-manual/ui/qml/TestControllers.qml
deleted file mode 100644
index e9a7fb49e5..0000000000
--- a/tests-manual/ui/qml/TestControllers.qml
+++ /dev/null
@@ -1,160 +0,0 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-import QtQuick.Layouts 1.0
-import QtQuick.Dialogs 1.0
-
-import "controller"
-import "controls" as HifiControls
-import "styles"
-
-HifiControls.VrDialog {
-    id: root
-    HifiConstants { id: hifi }
-    title: "Controller Test"
-    resizable: true
-    contentImplicitWidth: clientArea.implicitWidth
-    contentImplicitHeight: clientArea.implicitHeight
-    backgroundColor: "beige"
-
-    property var actions: Controller.Actions
-    property var standard: Controller.Standard
-    property var hydra: null
-    property var testMapping: null
-    property bool testMappingEnabled: false
-    property var xbox: null
-
-    function buildMapping() {
-        testMapping = Controller.newMapping();
-        testMapping.fromQml(standard.RY).invert().toQml(actions.Pitch);
-        testMapping.fromQml(function(){
-            return Math.sin(Date.now() / 250); 
-        }).toQml(actions.Yaw);
-        //testMapping.makeAxis(standard.LB, standard.RB).to(actions.Yaw);
-        // Step yaw takes a number of degrees
-        testMapping.fromQml(standard.LB).pulse(0.10).invert().scale(40.0).toQml(actions.StepYaw);
-        testMapping.fromQml(standard.RB).pulse(0.10).scale(15.0).toQml(actions.StepYaw);
-        testMapping.fromQml(standard.RX).scale(15.0).toQml(actions.StepYaw);
-    }
-
-    function toggleMapping() {
-        testMapping.enable(!testMappingEnabled);
-        testMappingEnabled = !testMappingEnabled;
-    }
-
-    Component.onCompleted: {
-        var xboxRegex = /^GamePad/;
-        var hydraRegex = /^Hydra/;
-        for (var prop in Controller.Hardware) {
-            if(xboxRegex.test(prop)) {
-                root.xbox = Controller.Hardware[prop]
-                print("found xbox")
-                continue
-            }
-            if (hydraRegex.test(prop)) {
-                root.hydra = Controller.Hardware[prop]
-                print("found hydra")
-                continue
-            }
-        }
-    }
-
-    Column {
-        id: clientArea
-        spacing: 12
-        x: root.clientX
-        y: root.clientY
-
-        Row {
-            spacing: 8
-            
-            Button {
-                text: !root.testMapping ? "Build Mapping" : (root.testMappingEnabled ? "Disable Mapping" : "Enable Mapping")
-                onClicked: {
-
-                    if (!root.testMapping) {
-                        root.buildMapping()
-                    } else {
-                        root.toggleMapping();
-                    }
-                }
-            }
-        }
-
-        Row {
-            Standard { device: root.standard; label: "Standard"; width: 180 }
-        }
-        
-        Row {
-            spacing: 8
-            Xbox { device: root.xbox; label: "XBox"; width: 180 }
-            Hydra { device: root.hydra; width: 180 }
-        }
-        
-        Row {
-            spacing: 4
-            ScrollingGraph {
-                controlId: Controller.Actions.Yaw
-                label: "Yaw"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.YawLeft
-                label: "Yaw Left"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.YawRight
-                label: "Yaw Right"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.StepYaw
-                label: "StepYaw"
-                min: -20.0
-                max: 20.0
-                size: 64
-            }
-        }
-
-        Row {
-            ScrollingGraph {
-                controlId: Controller.Actions.TranslateZ
-                label: "TranslateZ"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.Forward
-                label: "Forward"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.Backward
-                label: "Backward"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-        }
-    }
-} // dialog
-
-
-
-
-
diff --git a/tests-manual/ui/qml/TestDialog.qml b/tests-manual/ui/qml/TestDialog.qml
deleted file mode 100644
index e6675b7282..0000000000
--- a/tests-manual/ui/qml/TestDialog.qml
+++ /dev/null
@@ -1,94 +0,0 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-import QtQuick.Controls.Styles 1.3
-import "controls"
-
-VrDialog {
-    title: "Test Dialog"
-    id: testDialog
-    objectName: "TestDialog"
-    width: 512
-    height: 512
-    animationDuration: 200
-
-    onEnabledChanged: {
-        if (enabled) {
-            edit.forceActiveFocus();
-        }
-    }
-    
-    Item {
-        id: clientArea
-        // The client area
-        anchors.fill: parent
-        anchors.margins: parent.margins
-        anchors.topMargin: parent.topMargin
-    
-        Rectangle {
-            property int d: 100
-            id: square
-            objectName: "testRect"
-            width: d
-            height: d
-            anchors.centerIn: parent
-            color: "red"
-            NumberAnimation on rotation { from: 0; to: 360; duration: 2000; loops: Animation.Infinite; }
-        }
-    
-    
-        TextEdit {
-            id: edit
-            anchors.left: parent.left
-            anchors.leftMargin: 12
-            anchors.right: parent.right
-            anchors.rightMargin: 12
-            clip: true
-            text: "test edit"
-            anchors.top: parent.top
-            anchors.topMargin: 12
-        }
-
-        Button {
-            x: 128
-            y: 192
-            text: "Test"
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 12
-            anchors.right: parent.right
-            anchors.rightMargin: 12
-            onClicked: {
-                console.log("Click");
-                
-                if (square.visible) {
-                    square.visible = false
-                } else {
-                    square.visible = true
-                }
-            }
-        }
-    
-        Button {
-            id: customButton2
-            y: 192
-            text: "Move"
-            anchors.left: parent.left
-            anchors.leftMargin: 12
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 12
-            onClicked: {
-                onClicked: testDialog.x == 0 ? testDialog.x = 200 : testDialog.x = 0
-            }
-        }
-        
-        Keys.onPressed: {
-            console.log("Key " + event.key);
-            switch (event.key) {
-            case Qt.Key_Q:
-                if (Qt.ControlModifier == event.modifiers) {
-                    event.accepted = true;
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/TestMenu.qml b/tests-manual/ui/qml/TestMenu.qml
deleted file mode 100644
index fe8a26e234..0000000000
--- a/tests-manual/ui/qml/TestMenu.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Controls 1.3
-import Hifi 1.0
-
-// Currently for testing a pure QML replacement menu
-Item {
-    Menu {
-        objectName: "rootMenu";
-    } 
-}
diff --git a/tests-manual/ui/qml/TestRoot.qml b/tests-manual/ui/qml/TestRoot.qml
deleted file mode 100644
index bd38c696bf..0000000000
--- a/tests-manual/ui/qml/TestRoot.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-import Hifi 1.0
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-// Import local folder last so that our own control customizations override 
-// the built in ones
-import "controls"
-
-Root {
-    id: root
-    anchors.fill: parent
-    onParentChanged: {
-        forceActiveFocus();
-    }
-    Button {
-        id: messageBox
-        anchors.right: createDialog.left
-        anchors.rightMargin: 24
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 24
-        text: "Message"
-        onClicked: {
-            console.log("Foo")
-            root.information("a")
-            console.log("Bar")
-        }
-    }
-    Button {
-        id: createDialog
-        anchors.right: parent.right
-        anchors.rightMargin: 24
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 24
-        text: "Create"
-        onClicked: {
-            root.loadChild("MenuTest.qml");
-        }
-    }
-
-    Keys.onPressed: {
-        console.log("Key press root")
-    }
-}
-
diff --git a/tests-manual/ui/qml/controlDemo/ButtonPage.qml b/tests-manual/ui/qml/controlDemo/ButtonPage.qml
deleted file mode 100644
index 0ed7e2d6ad..0000000000
--- a/tests-manual/ui/qml/controlDemo/ButtonPage.qml
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2
-
-ScrollView {
-    id: page
-
-    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-
-    Item {
-        id: content
-
-        width: Math.max(page.viewport.width, grid.implicitWidth + 2 * grid.rowSpacing)
-        height: Math.max(page.viewport.height, grid.implicitHeight + 2 * grid.columnSpacing)
-
-        GridLayout {
-            id: grid
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.leftMargin: grid.rowSpacing
-            anchors.rightMargin: grid.rowSpacing
-            anchors.topMargin: grid.columnSpacing
-
-            columns: page.width < page.height ? 1 : 2
-
-            GroupBox {
-                title: "Button"
-                Layout.fillWidth: true
-                Layout.columnSpan: grid.columns
-                RowLayout {
-                    anchors.fill: parent
-                    Button { text: "OK"; isDefault: true }
-                    Button { text: "Cancel" }
-                    Item { Layout.fillWidth: true }
-                    Button {
-                        text: "Attach"
-                        menu: Menu {
-                            MenuItem { text: "Image" }
-                            MenuItem { text: "Document" }
-                        }
-                    }
-                }
-            }
-
-            GroupBox {
-                title: "CheckBox"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    CheckBox { text: "E-mail"; checked: true }
-                    CheckBox { text: "Calendar"; checked: true }
-                    CheckBox { text: "Contacts" }
-                }
-            }
-
-            GroupBox {
-                title: "RadioButton"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    ExclusiveGroup { id: radioGroup }
-                    RadioButton { text: "Portrait"; exclusiveGroup: radioGroup }
-                    RadioButton { text: "Landscape"; exclusiveGroup: radioGroup }
-                    RadioButton { text: "Automatic"; exclusiveGroup: radioGroup; checked: true }
-                }
-            }
-
-            GroupBox {
-                title: "Switch"
-                Layout.fillWidth: true
-                Layout.columnSpan: grid.columns
-                ColumnLayout {
-                    anchors.fill: parent
-                    RowLayout {
-                        Label { text: "Wi-Fi"; Layout.fillWidth: true }
-                        Switch { checked: true }
-                    }
-                    RowLayout {
-                        Label { text: "Bluetooth"; Layout.fillWidth: true }
-                        Switch { checked: false }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/controlDemo/InputPage.qml b/tests-manual/ui/qml/controlDemo/InputPage.qml
deleted file mode 100644
index cb1878d023..0000000000
--- a/tests-manual/ui/qml/controlDemo/InputPage.qml
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2
-
-ScrollView {
-    id: page
-
-    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-
-    Item {
-        id: content
-
-        width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
-        height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
-
-        ColumnLayout {
-            id: column
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.margins: column.spacing
-
-            GroupBox {
-                title: "TextField"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    TextField { placeholderText: "..."; Layout.fillWidth: true; z: 1 }
-                    TextField { placeholderText: "Password"; echoMode: TextInput.Password; Layout.fillWidth: true }
-                }
-            }
-
-            GroupBox {
-                title: "ComboBox"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    ComboBox {
-                        model: Qt.fontFamilies()
-                        Layout.fillWidth: true
-                    }
-                    ComboBox {
-                        editable: true
-                        model: ListModel {
-                            id: listModel
-                            ListElement { text: "Apple" }
-                            ListElement { text: "Banana" }
-                            ListElement { text: "Coconut" }
-                            ListElement { text: "Orange" }
-                        }
-                        onAccepted: {
-                            if (find(currentText) === -1) {
-                                listModel.append({text: editText})
-                                currentIndex = find(editText)
-                            }
-                        }
-                        Layout.fillWidth: true
-                    }
-                }
-            }
-
-            GroupBox {
-                title: "SpinBox"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    SpinBox { value: 99; Layout.fillWidth: true; z: 1 }
-                    SpinBox { decimals: 2; Layout.fillWidth: true }
-                }
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/controlDemo/ProgressPage.qml b/tests-manual/ui/qml/controlDemo/ProgressPage.qml
deleted file mode 100644
index a1fa596f79..0000000000
--- a/tests-manual/ui/qml/controlDemo/ProgressPage.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2
-
-ScrollView {
-    id: page
-
-    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-
-    Item {
-        id: content
-
-        width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
-        height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
-
-        ColumnLayout {
-            id: column
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.margins: column.spacing
-
-            GroupBox {
-                title: "ProgressBar"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    ProgressBar { indeterminate: true; Layout.fillWidth: true }
-                    ProgressBar { value: slider.value; Layout.fillWidth: true }
-                }
-            }
-
-            GroupBox {
-                title: "Slider"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    Slider { id: slider; value: 0.5; Layout.fillWidth: true }
-                }
-            }
-
-            GroupBox {
-                title: "BusyIndicator"
-                Layout.fillWidth: true
-                BusyIndicator { running: true }
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/controlDemo/main.qml b/tests-manual/ui/qml/controlDemo/main.qml
deleted file mode 100644
index 168b9fb291..0000000000
--- a/tests-manual/ui/qml/controlDemo/main.qml
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.1
-import QtQuick.Controls 1.2
-import "qml/UI.js" as UI
-import "qml"
-//import "/Users/bdavis/Git/hifi/interface/resources/qml"
-
-Item {
-    anchors.fill: parent
-    visible: true
-    //title: "Qt Quick Controls Gallery"
-
-    MessageDialog {
-        id: aboutDialog
-        icon: StandardIcon.Information
-        title: "About"
-        text: "Qt Quick Controls Gallery"
-        informativeText: "This example demonstrates most of the available Qt Quick Controls."
-    }
-
-    Action {
-        id: copyAction
-        text: "&Copy"
-        shortcut: StandardKey.Copy
-        iconName: "edit-copy"
-        enabled: (!!activeFocusItem && !!activeFocusItem["copy"])
-        onTriggered: activeFocusItem.copy()
-    }
-
-    Action {
-        id: cutAction
-        text: "Cu&t"
-        shortcut: StandardKey.Cut
-        iconName: "edit-cut"
-        enabled: (!!activeFocusItem && !!activeFocusItem["cut"])
-        onTriggered: activeFocusItem.cut()
-    }
-
-    Action {
-        id: pasteAction
-        text: "&Paste"
-        shortcut: StandardKey.Paste
-        iconName: "edit-paste"
-        enabled: (!!activeFocusItem && !!activeFocusItem["paste"])
-        onTriggered: activeFocusItem.paste()
-    }
-
-//    toolBar: ToolBar {
-//        RowLayout {
-//            anchors.fill: parent
-//            anchors.margins: spacing
-//            Label {
-//                text: UI.label
-//            }
-//            Item { Layout.fillWidth: true }
-//            CheckBox {
-//                id: enabler
-//                text: "Enabled"
-//                checked: true
-//            }
-//        }
-//    }
-
-//    menuBar: MenuBar {
-//        Menu {
-//            title: "&File"
-//            MenuItem {
-//                text: "E&xit"
-//                shortcut: StandardKey.Quit
-//                onTriggered: Qt.quit()
-//            }
-//        }
-//        Menu {
-//            title: "&Edit"
-//            visible: tabView.currentIndex == 2
-//            MenuItem { action: cutAction }
-//            MenuItem { action: copyAction }
-//            MenuItem { action: pasteAction }
-//        }
-//        Menu {
-//            title: "&Help"
-//            MenuItem {
-//                text: "About..."
-//                onTriggered: aboutDialog.open()
-//            }
-//        }
-//    }
-
-    TabView {
-        id: tabView
-
-        anchors.fill: parent
-        anchors.margins: UI.margin
-        tabPosition: UI.tabPosition
-
-        Layout.minimumWidth: 360
-        Layout.minimumHeight: 360
-        Layout.preferredWidth: 480
-        Layout.preferredHeight: 640
-
-        Tab {
-            title: "Buttons"
-            ButtonPage {
-                enabled: enabler.checked
-            }
-        }
-        Tab {
-            title: "Progress"
-            ProgressPage {
-                enabled: enabler.checked
-            }
-        }
-        Tab {
-            title: "Input"
-            InputPage {
-                enabled: enabler.checked
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/main.qml b/tests-manual/ui/qml/main.qml
deleted file mode 100644
index 607bd624a1..0000000000
--- a/tests-manual/ui/qml/main.qml
+++ /dev/null
@@ -1,461 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Dialogs 1.2 as OriginalDialogs
-import Qt.labs.settings 1.0
-
-import "../../../interface/resources/qml"
-//import "../../../interface/resources/qml/windows"
-import "../../../interface/resources/qml/windows"
-import "../../../interface/resources/qml/dialogs"
-import "../../../interface/resources/qml/hifi"
-import "../../../interface/resources/qml/hifi/dialogs"
-import "../../../interface/resources/qml/styles-uit"
-
-ApplicationWindow {
-    id: appWindow
-    objectName: "MainWindow"
-    visible: true
-    width: 1280
-    height: 800
-    title: qsTr("Scratch App")
-    toolBar: Row {
-        id: testButtons
-        anchors { margins: 8; left: parent.left; top: parent.top }
-        spacing: 8
-        property int count: 0
-
-        property var tabs: [];
-        property var urls: [];
-        property var toolbar;
-        property var lastButton;
-
-        Button {
-            text: HMD.active ? "Disable HMD" : "Enable HMD"
-            onClicked: HMD.active = !HMD.active
-        }
-
-        Button {
-            text: desktop.hmdHandMouseActive ? "Disable HMD HandMouse" : "Enable HMD HandMouse"
-            onClicked: desktop.hmdHandMouseActive = !desktop.hmdHandMouseActive
-        }
-
-        // Window visibility
-        Button {
-            text: "toggle desktop"
-            onClicked: desktop.togglePinned()
-        }
-
-        Button {
-            text: "Create Toolbar"
-            onClicked: testButtons.toolbar = desktop.getToolbar("com.highfidelity.interface.toolbar.system");
-        }
-
-        Button {
-            text: "Toggle Toolbar Direction"
-            onClicked: testButtons.toolbar.horizontal = !testButtons.toolbar.horizontal
-        }
-
-        Button {
-            readonly property var icons: [
-                "edit-01.svg",
-                "model-01.svg",
-                "cube-01.svg",
-                "sphere-01.svg",
-                "light-01.svg",
-                "text-01.svg",
-                "web-01.svg",
-                "zone-01.svg",
-                "particle-01.svg",
-            ]
-            property int iconIndex: 0
-            readonly property string toolIconUrl: "../../../../../scripts/system/assets/images/tools/"
-            text: "Create Button"
-            onClicked: {
-                var name = icons[iconIndex];
-                var url = toolIconUrl + name;
-                iconIndex = (iconIndex + 1) % icons.length;
-                var button = testButtons.lastButton = testButtons.toolbar.addButton({
-                    imageURL: url,
-                    objectName: name,
-                    subImage: {
-                        y: 50,
-                    },
-                    alpha: 0.9
-                });
-
-                button.clicked.connect(function(){
-                    console.log("Clicked on button " + button.imageURL + " alpha " + button.alpha)
-                });
-            }
-        }
-
-        Button {
-            text: "Toggle Button Visible"
-            onClicked: testButtons.lastButton.visible = !testButtons.lastButton.visible
-        }
-
-        // Error alerts
-        /*
-        Button {
-            // Message without title.
-            text: "Show Error"
-            onClicked: {
-                var messageBox = desktop.messageBox({
-                                                        text: "Diagnostic cycle will be complete in 30 seconds",
-                                                        icon: hifi.icons.critical,
-                                                    });
-                messageBox.selected.connect(function(button) {
-                    console.log("You clicked " + button)
-                })
-            }
-        }
-        Button {
-            // detailedText is not currently used anywhere in Interface but it is easier to leave in and style good enough.
-            text: "Show Long Error"
-            onClicked: {
-                desktop.messageBox({
-                                       informativeText: "Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds  Diagnostic cycle will be complete in 30 seconds  Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds  Diagnostic cycle will be complete in 30 seconds  Diagnostic cycle will be complete in 30 seconds ",
-                                       text: "Baloney",
-                                       icon: hifi.icons.warning,
-                                       detailedText: "sakjd;laskj dksa;dl jka;lsd j;lkjas ;dlkaj s;dlakjd ;alkjda; slkjda; lkjda;lksjd ;alksjd; alksjd ;alksjd; alksjd; alksdjas;ldkjas;lkdja ;kj ;lkasjd; lkj as;dlka jsd;lka jsd;laksjd a"
-                                   });
-            }
-        }
-        */
-
-        // query
-        /*
-        // There is no such desktop.queryBox() function; may need to update test to cover QueryDialog.qml?
-        Button {
-            text: "Show Query"
-            onClicked: {
-                var queryBox = desktop.queryBox({
-                                                      text: "Have you stopped beating your wife?",
-                                                      placeholderText: "Are you sure?",
-                                                     // icon: hifi.icons.critical,
-                                                  });
-                queryBox.selected.connect(function(result) {
-                    console.log("User responded with " + result);
-                });
-
-                queryBox.canceled.connect(function() {
-                    console.log("User cancelled query box ");
-                })
-            }
-        }
-        */
-
-        // Browser
-        /*
-        Button {
-            text: "Open Browser"
-            onClicked: builder.createObject(desktop);
-            property var builder: Component {
-                Browser {}
-            }
-        }
-        */
-
-
-        // file dialog
-        /*
-
-        Button {
-            text: "Open Directory"
-            property var builder: Component {
-                FileDialog { selectDirectory: true }
-            }
-
-            onClicked: {
-                var fileDialog = builder.createObject(desktop);
-                fileDialog.canceled.connect(function(){
-                    console.log("Cancelled")
-                })
-                fileDialog.selectedFile.connect(function(file){
-                    console.log("Selected " + file)
-                })
-            }
-        }
-        Button {
-            text: "Open File"
-            property var builder: Component {
-                FileDialog {
-                    title: "Open File"
-                    filter: "All Files (*.*)"
-                    //filter: "HTML files (*.html);;Other(*.png)"
-                }
-            }
-
-            onClicked: {
-                var fileDialog = builder.createObject(desktop);
-                fileDialog.canceled.connect(function(){
-                    console.log("Cancelled")
-                })
-                fileDialog.selectedFile.connect(function(file){
-                    console.log("Selected " + file)
-                })
-            }
-        }
-        */
-
-        // tabs
-        /*
-        Button {
-            text: "Add Tab"
-            onClicked: {
-                console.log(desktop.toolWindow);
-                desktop.toolWindow.addWebTab({ source: "Foo" });
-                desktop.toolWindow.showTabForUrl("Foo", true);
-            }
-        }
-
-        Button {
-            text: "Add Tab 2"
-            onClicked: {
-                console.log(desktop.toolWindow);
-                desktop.toolWindow.addWebTab({ source: "Foo 2" });
-                desktop.toolWindow.showTabForUrl("Foo 2", true);
-            }
-        }
-
-        Button {
-            text: "Add Tab 3"
-            onClicked: {
-                console.log(desktop.toolWindow);
-                desktop.toolWindow.addWebTab({ source: "Foo 3" });
-                desktop.toolWindow.showTabForUrl("Foo 3", true);
-            }
-        }
-
-        Button {
-            text: "Destroy Tab"
-            onClicked: {
-                console.log(desktop.toolWindow);
-                desktop.toolWindow.removeTabForUrl("Foo");
-            }
-        }
-        */
-
-        // Hifi specific stuff
-        /*
-        Button {
-            // Shows the dialog with preferences sections but not each section's preference items
-            // because Preferences.preferencesByCategory() method is not stubbed out.
-            text: "Settings > General..."
-            property var builder: Component {
-                GeneralPreferencesDialog { }
-            }
-            onClicked: {
-                var runningScripts = builder.createObject(desktop);
-            }
-        }
-
-        Button {
-            text: "Running Scripts"
-            property var builder: Component {
-                RunningScripts { }
-            }
-            onClicked: {
-                var runningScripts = builder.createObject(desktop);
-            }
-        }
-
-        Button {
-            text: "Attachments"
-            property var builder: Component {
-                AttachmentsDialog { }
-            }
-            onClicked: {
-                var attachmentsDialog = builder.createObject(desktop);
-            }
-        }
-        Button {
-            // Replicates message box that pops up after selecting new avatar. Includes title.
-            text: "Confirm Avatar"
-            onClicked: {
-                var messageBox = desktop.messageBox({
-                                       title: "Set Avatar",
-                                       text: "Would you like to use 'Albert' for your avatar?",
-                                       icon: hifi.icons.question,         // Test question icon
-                                       //icon: hifi.icons.information,    // Test informaton icon
-                                       //icon: hifi.icons.warning,        // Test warning icon
-                                       //icon: hifi.icons.critical,       // Test critical icon
-                                       //icon: hifi.icons.none,         // Test no icon
-                                       buttons: OriginalDialogs.StandardButton.Ok + OriginalDialogs.StandardButton.Cancel,
-                                       defaultButton: OriginalDialogs.StandardButton.Ok
-                                   });
-                messageBox.selected.connect(function(button) {
-                    console.log("You clicked " + button)
-                })
-            }
-        }
-        */
-        // bookmarks
-        /*
-        Button {
-            text: "Bookmark Location"
-            onClicked: {
-                desktop.inputDialog({
-                                       title: "Bookmark Location",
-                                       icon: hifi.icons.placemark,
-                                       label: "Name"
-                                   });
-            }
-        }
-        Button {
-            text: "Delete Bookmark"
-            onClicked: {
-                desktop.inputDialog({
-                                       title: "Delete Bookmark",
-                                       icon: hifi.icons.placemark,
-                                       label: "Select the bookmark to delete",
-                                       items: ["Bookmark A", "Bookmark B", "Bookmark C"]
-                                   });
-            }
-        }
-        Button {
-            text: "Duplicate Bookmark"
-            onClicked: {
-                desktop.messageBox({
-                                       title: "Duplicate Bookmark",
-                                       icon: hifi.icons.warning,
-                                       text: "The bookmark name you entered alread exists in yoru list.",
-                                       informativeText: "Would you like to overwrite it?",
-                                       buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
-                                       defaultButton: OriginalDialogs.StandardButton.Yes
-                                   });
-            }
-        }
-        */
-
-    }
-
-
-    HifiConstants { id: hifi }
-
-    Desktop {
-        id: desktop
-        anchors.fill: parent
-
-        //rootMenu: StubMenu { id: rootMenu }
-        //Component.onCompleted: offscreenWindow = appWindow
-
-        /*
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.RightButton
-            onClicked: desktop.popupMenu(Qt.vector2d(mouseX, mouseY));
-        }
-        */
-
-        Browser {
-            url: "http://s3.amazonaws.com/DreamingContent/testUiDelegates.html"
-        }
-
-
-        Window {
-            id: blue
-            closable: true
-            visible: true
-            resizable: true
-            destroyOnHidden: false
-            title: "Blue"
-
-            width: 100; height: 100
-            x: 1280 / 2; y: 720 / 2
-            Settings {
-                category: "TestWindow.Blue"
-                property alias x: blue.x
-                property alias y: blue.y
-                property alias width: blue.width
-                property alias height: blue.height
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                visible: true
-                color: "blue"
-                Component.onDestruction: console.log("Blue destroyed")
-            }
-        }
-
-        Window {
-            id: green
-            closable: true
-            visible: true
-            resizable: true
-            title: "Green"
-            destroyOnHidden: false
-
-            width: 100; height: 100
-            x: 1280 / 2; y: 720 / 2
-            Settings {
-                category: "TestWindow.Green"
-                property alias x: green.x
-                property alias y: green.y
-                property alias width: green.width
-                property alias height: green.height
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                visible: true
-                color: "green"
-                Component.onDestruction: console.log("Green destroyed")
-            }
-        }
-
-/*
-        Rectangle { width: 100; height: 100; x: 100; y: 100; color: "#00f" }
-
-        Window {
-            id: green
-            alwaysOnTop: true
-            frame: HiddenFrame{}
-            hideBackground: true
-            closable: true
-            visible: true
-            resizable: false
-            x: 1280 / 2; y: 720 / 2
-            width: 100; height: 100
-            Rectangle {
-                color: "#0f0"
-                width: green.width;
-                height: green.height;
-            }
-        }
-        */
-
-/*
-        Window {
-            id: yellow
-            closable: true
-            visible: true
-            resizable: true
-            x: 100; y: 100
-            width: 100; height: 100
-            Rectangle {
-                anchors.fill: parent
-                visible: true
-                color: "yellow"
-            }
-        }
-*/
-    }
-
-    Action {
-        id: openBrowserAction
-        text: "Open Browser"
-        shortcut: "Ctrl+Shift+X"
-        onTriggered: {
-            builder.createObject(desktop);
-        }
-        property var builder: Component {
-            ModelBrowserDialog{}
-        }
-    }
-}
-
-
-
-
diff --git a/tests-manual/ui/qmlscratch.pro b/tests-manual/ui/qmlscratch.pro
index 5c9b91ee52..3287180d26 100644
--- a/tests-manual/ui/qmlscratch.pro
+++ b/tests-manual/ui/qmlscratch.pro
@@ -4,34 +4,10 @@ QT += gui qml quick xml webengine widgets
 
 CONFIG += c++11
 
-SOURCES += src/main.cpp \
-    ../../libraries/ui/src/FileDialogHelper.cpp
-
-HEADERS += \
-    ../../libraries/ui/src/FileDialogHelper.h
+SOURCES += src/main.cpp
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH = ../../interface/resources/qml
 
-
 DISTFILES += \
-    qml/*.qml \
-    ../../interface/resources/QtWebEngine/UIDelegates/original/*.qml \
-    ../../interface/resources/QtWebEngine/UIDelegates/*.qml \
-    ../../interface/resources/qml/*.qml \
-    ../../interface/resources/qml/controls/*.qml \
-    ../../interface/resources/qml/controls-uit/*.qml \
-    ../../interface/resources/qml/dialogs/*.qml \
-    ../../interface/resources/qml/dialogs/fileDialog/*.qml \
-    ../../interface/resources/qml/dialogs/preferences/*.qml \
-    ../../interface/resources/qml/dialogs/messageDialog/*.qml \
-    ../../interface/resources/qml/desktop/*.qml \
-    ../../interface/resources/qml/menus/*.qml \
-    ../../interface/resources/qml/styles/*.qml \
-    ../../interface/resources/qml/styles-uit/*.qml \
-    ../../interface/resources/qml/windows/*.qml \
-    ../../interface/resources/qml/hifi/*.qml \
-    ../../interface/resources/qml/hifi/toolbars/*.qml \
-    ../../interface/resources/qml/hifi/dialogs/*.qml \
-    ../../interface/resources/qml/hifi/dialogs/preferences/*.qml \
-    ../../interface/resources/qml/hifi/overlays/*.qml
+    qml/*.qml
diff --git a/tests-manual/ui/src/main.cpp b/tests-manual/ui/src/main.cpp
index 312b5f3823..a5061f4d01 100644
--- a/tests-manual/ui/src/main.cpp
+++ b/tests-manual/ui/src/main.cpp
@@ -3,88 +3,31 @@
 #include <QtWebEngine>
 #include <QFileSystemModel>
 
-#include "../../../libraries/ui/src/FileDialogHelper.h"
-
-
-class Preference : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QString category READ getCategory() CONSTANT)
-    Q_PROPERTY(QString name READ getName() CONSTANT)
-    Q_PROPERTY(Type type READ getType() CONSTANT)
-    Q_ENUMS(Type)
-public:
-    enum Type {
-        Editable,
-        Browsable,
-        Spinner,
-        Checkbox,
-    };
-
-    Preference(QObject* parent = nullptr) : QObject(parent) {}
-
-    Preference(const QString& category, const QString& name, QObject* parent = nullptr)
-        : QObject(parent), _category(category), _name(name) { }
-    const QString& getCategory() const { return _category; }
-    const QString& getName() const { return _name; }
-    virtual Type getType() { return Editable; }
-
-protected:
-    const QString _category;
-    const QString _name;
-};
-
-class Reticle : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QPoint position READ getPosition CONSTANT)
-public:
-
-    Reticle(QObject* parent) : QObject(parent) {
-    }
-
-    QPoint getPosition() {
-        if (!_window) {
-            return QPoint(0, 0);
-        }
-        return _window->mapFromGlobal(QCursor::pos());
-    }
-
-    void setWindow(QWindow* window) {
-        _window = window;
-    }
-
-private:
-    QWindow* _window{nullptr};
-};
-
 QString getRelativeDir(const QString& relativePath = ".") {
-    QDir path(__FILE__); path.cdUp();
+    QDir path(__FILE__);
+    path.cdUp();
+    path.cdUp();
     auto result = path.absoluteFilePath(relativePath);
     result = path.cleanPath(result) + "/";
     return result;
 }
 
-QString getTestQmlDir() {
-    return getRelativeDir("../qml");
+QString getResourcesDir() {
+    return getRelativeDir("../../interface/resources");
 }
 
-QString getInterfaceQmlDir() {
-    return getRelativeDir("/");
+QString getQmlDir() {
+    return getRelativeDir("../../interface/resources/qml");
 }
 
-
-void setChild(QQmlApplicationEngine& engine, const char* name) {
-  for (auto obj : engine.rootObjects()) {
-    auto child = obj->findChild<QObject*>(QString(name));
-    if (child) {
-      engine.rootContext()->setContextProperty(name, child);
-      return;
-    }
-  }
-  qWarning() << "Could not find object named " << name;
+QString getScriptsDir() {
+    return getRelativeDir("../../scripts");
 }
 
 void addImportPath(QQmlApplicationEngine& engine, const QString& relativePath, bool insert = false) {
     QString resolvedPath = getRelativeDir(relativePath);
+
+    qDebug() << "adding import path: " << QDir::toNativeSeparators(resolvedPath);
     engine.addImportPath(resolvedPath);
 }
 
@@ -93,44 +36,24 @@ int main(int argc, char *argv[]) {
     app.setOrganizationName("Some Company");
     app.setOrganizationDomain("somecompany.com");
     app.setApplicationName("Amazing Application");
-    QDir::setCurrent(getRelativeDir(".."));
 
-    QtWebEngine::initialize();
-    qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
+    auto scriptsDir = getScriptsDir();
+    auto resourcesDir = getResourcesDir();
 
     QQmlApplicationEngine engine;
+    addImportPath(engine, ".");
     addImportPath(engine, "qml");
-    addImportPath(engine, "../../interface/resources/qml");
-    addImportPath(engine, "../../interface/resources");
-    engine.load(QUrl(QStringLiteral("qml/Stubs.qml")));
+    addImportPath(engine, resourcesDir);
+    addImportPath(engine, resourcesDir + "/qml");
+    addImportPath(engine, scriptsDir);
+    addImportPath(engine, scriptsDir + "/developer/tests");
 
-    setChild(engine, "offscreenFlags");
-    setChild(engine, "Account");
-    setChild(engine, "ApplicationCompositor");
-    setChild(engine, "Controller");
-    setChild(engine, "Desktop");
-    setChild(engine, "ScriptDiscoveryService");
-    setChild(engine, "HMD");
-    setChild(engine, "GL");
-    setChild(engine, "MenuHelper");
-    setChild(engine, "Preferences");
-    setChild(engine, "urlHandler");
-    engine.rootContext()->setContextProperty("DebugQML", true);
-    engine.rootContext()->setContextProperty("fileDialogHelper", new FileDialogHelper());
+    QFontDatabase::addApplicationFont(resourcesDir + "/fonts/FiraSans-Regular.ttf");
+    QFontDatabase::addApplicationFont(resourcesDir + "/fonts/FiraSans-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(resourcesDir + "/fonts/hifi-glyphs.ttf");
 
-    //engine.load(QUrl(QStringLiteral("qrc:/qml/gallery/main.qml")));
-    engine.load(QUrl(QStringLiteral("qml/main.qml")));
-    for (QObject* rootObject : engine.rootObjects()) {
-        if (rootObject->objectName() == "MainWindow") {
-            Reticle* reticle = new Reticle(rootObject);
-            reticle->setWindow((QWindow*)rootObject);
-            engine.rootContext()->setContextProperty("Reticle", reticle);
-            engine.rootContext()->setContextProperty("Window", rootObject);
-            break;
-        }
-    }
+    auto url = getRelativeDir(".") + "qml/ControlsGalleryWindow.qml";
+
+    engine.load(url);
     return app.exec();
 }
-
-#include "main.moc"
-
diff --git a/tools/auto-tester/CMakeLists.txt b/tools/auto-tester/CMakeLists.txt
index 06930ab0fe..c8c0a336d2 100644
--- a/tools/auto-tester/CMakeLists.txt
+++ b/tools/auto-tester/CMakeLists.txt
@@ -60,7 +60,7 @@ if (WIN32)
     add_custom_command(
         TARGET ${TARGET_NAME}
         POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E copy_directory D:/GitHub/vcpkg/installed/x64-windows/bin "$<TARGET_FILE_DIR:${TARGET_NAME}>"
+        COMMAND "${CMAKE_COMMAND}" -E copy_directory "$ENV{VCPKG_ROOT}/installed/x64-windows/bin" "$<TARGET_FILE_DIR:${TARGET_NAME}>"
     )
 
 endif ()
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml b/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
index 033039b87d..753771987a 100644
--- a/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
+++ b/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
@@ -16,8 +16,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 import "qrc:////qml//hifi" as Hifi