104 files changed, 0 insertions, 10930 deletions

diff --git a/prototype_2016/third_party/qml-material/src/components/ActionButton.qml b/prototype_2016/third_party/qml-material/src/components/ActionButton.qml
deleted file mode 100644
index c286663..0000000
--- a/prototype_2016/third_party/qml-material/src/components/ActionButton.qml
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles 1.3 as ControlStyles
-import Material 0.3
-import QtGraphicalEffects 1.0
-
-/*!
-   \qmltype ActionButton
-   \inqmlmodule Material
-
-   \brief A floating action button.
-
-   An ActionButton is a floating action button that provides a primary action
-   on the current page.
- */
-Controls.Button {
-    id: button
-
-    visible: action ? action.visible : true
-
-    /*!
-       The color of the action button. By default, this is the accent color of your
-       app as defined by \l Theme::accentColor.
-     */
-    property color backgroundColor: Theme.accentColor
-
-    /*!
-       \internal
-       The elevation of the icon. This will be higher for a white background color.
-     */
-    property int elevation: backgroundColor == "white" ? 0 : 1
-
-    /*!
-       The color of the icon displayed on the action button. By default, this is
-       automatically selected based on the \l backgroundColor.
-     */
-    property color iconColor: Theme.lightDark(button.backgroundColor,
-                                              Theme.light.iconColor,
-                                              Theme.dark.iconColor)
-
-    /*!
-       The name of the icon to display in the action button, selected from the Material
-       Design icon collection by Google.
-     */
-    property string iconName: action ? action.iconName : ""
-
-    /*!
-       Floating action buttons come in two sizes:
-
-       \list
-       \li \b {Default size} - for most use cases
-       \li \b {Mini size} - only used to create visual continuity with other screen elements
-       \endlist
-     */
-    property bool isMiniSize: false
-
-    style: ControlStyles.ButtonStyle {
-        padding {
-            left: 0
-            right: 0
-            top: 0
-            bottom: 0
-        }
-
-        background: Item {
-            RectangularGlow {
-
-                anchors.centerIn: parent
-                anchors.verticalCenterOffset: elevation == 1 ? 1.5 * Units.dp
-                                                             : 1 * Units.dp
-
-                width: parent.width
-                height: parent.height
-
-                glowRadius: elevation == 1 ? 0.75 * Units.dp : 0.3 * Units.dp
-                opacity: elevation == 1 ? 0.6 : 0.3
-                spread: elevation == 1 ? 0.7 : 0.85
-                color: "black"
-                cornerRadius: height/2
-            }
-
-            View {
-                anchors.fill: parent
-                radius: width/2
-
-                backgroundColor: button.backgroundColor
-
-                tintColor: control.pressed ||
-                           (control.focus && !button.elevation) ||
-                           (control.hovered && !button.elevation) ?
-                           Qt.rgba(0,0,0, control.pressed ? 0.1 : 0.05) : "transparent"
-
-                Ink {
-                    id: mouseArea
-                    anchors.fill: parent
-                    Connections {
-                        target: control.__behavior
-                        onPressed: mouseArea.onPressed(mouse)
-                        onCanceled: mouseArea.onCanceled()
-                        onReleased: mouseArea.onReleased(mouse)
-                    }
-
-                    circular: true
-                }
-            }
-        }
-        label: Item {
-            implicitHeight: isMiniSize ? 40 * Units.dp : 56 * Units.dp
-            implicitWidth: implicitHeight
-            Icon {
-                id: icon
-
-                anchors.centerIn: parent
-                name: control.iconName
-                color: button.iconColor
-                size: 24 * Units.dp
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/Card.qml b/prototype_2016/third_party/qml-material/src/components/Card.qml
deleted file mode 100644
index e778027..0000000
--- a/prototype_2016/third_party/qml-material/src/components/Card.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype Card
-   \inqmlmodule Material
-
-   \brief A card is a piece of paper with unique related data that serves as an entry point
-   to more detailed information.
- */
-View {
-    width: 300 * Units.dp
-    height: 250 * Units.dp
-    elevation: flat ? 0 : 1
-
-    property bool flat: false
-
-    border.color: flat ? Qt.rgba(0,0,0,0.2) : "transparent"
-    radius: fullWidth || fullHeight ? 0 : 2 * Units.dp
-
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/DatePicker.qml b/prototype_2016/third_party/qml-material/src/components/DatePicker.qml
deleted file mode 100644
index 02b87ab..0000000
--- a/prototype_2016/third_party/qml-material/src/components/DatePicker.qml
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015 Jordan Neidlinger <JNeidlinger@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
-import QtQuick.Controls.Styles 1.3
-import QtQuick.Controls.Private 1.0
-import Material 0.3
-
-/*!
-   \qmltype DatePicker
-   \inqmlmodule Material
-
-   \brief Date Picker provides a simple way to select a valid, formatted date
- */
-Controls.Calendar {
-
-    /*!
-       Set to \c true if the picker should lay itself in landscape mode
-     */
-    property bool isLandscape: false
-    property int dayAreaBottomMargin : 0
-
-    style: CalendarStyle {
-        gridVisible: false
-
-        property int calendarWidth: isLandscape ? 500 * Units.dp : 340 * Units.dp
-        property int calendarHeight: isLandscape ? 280 * Units.dp : 440 * Units.dp
-
-        background: Rectangle {
-            color: "white"
-            implicitWidth: calendarWidth
-            implicitHeight: calendarHeight
-        }
-
-        navigationBar: Rectangle {
-            height: isLandscape ? calendarHeight + 64 * Units.dp : 96 * Units.dp
-                        width: isLandscape ? calendarWidth / 3 : undefined
-                        color: Theme.accentColor
-
-                        ColumnLayout {
-                                anchors.verticalCenter: isLandscape ? undefined : parent.verticalCenter
-                                anchors.left: parent.left
-                                anchors.leftMargin: isLandscape ? 16 * Units.dp : 24 * Units.dp
-                                anchors.top: isLandscape ? parent.top : undefined
-                                anchors.topMargin: isLandscape ? 16 * Units.dp : undefined
-                                anchors.right: parent.right
-                                anchors.rightMargin: 36 * Units.dp
-                                spacing: 0
-
-                                Label {
-                                        font.weight: Font.DemiBold
-                                        style: "body2"
-                                        color: Qt.rgba(1, 1, 1, 0.7)
-                                        text: control.selectedDate.toLocaleString(control.__locale, "yyyy")
-                                }
-
-                                Label {
-                                        id: dayTitle
-                                        font.weight: Font.DemiBold
-                                        font.pixelSize: 36 * Units.dp
-                                        Layout.fillWidth: true
-                                        lineHeight: 0.9
-                                        wrapMode: Text.Wrap
-                                        color: Theme.dark.textColor
-                                        text: control.selectedDate.toLocaleString(control.__locale, "ddd, MMM dd")
-                                }
-                        }
-        }
-
-        dayOfWeekDelegate: Rectangle {
-            color: "transparent"
-            implicitHeight: 30 * Units.dp
-            Label {
-                text: control.__locale.dayName(styleData.dayOfWeek, Locale.NarrowFormat).substring(0, 1)
-                color: Theme.light.subTextColor
-                anchors.centerIn: parent
-            }
-        }
-
-        dayDelegate: Item {
-            visible: styleData.visibleMonth
-
-            Rectangle {
-                anchors.centerIn: parent
-                width: 1 * Math.min(parent.width, parent.height)
-                height: width
-
-                color: styleData.selected ? Theme.accentColor : "transparent"
-                radius: height/2
-            }
-
-            Label {
-                text: styleData.date.getDate()
-                anchors.centerIn: parent
-                color: styleData.selected
-                       ? "white" : styleData.today
-                                                 ? Theme.accentColor : "black"
-            }
-        }
-
-        panel: Item {
-            id: panelItem
-
-            implicitWidth: backgroundLoader.implicitWidth
-            implicitHeight: backgroundLoader.implicitHeight
-
-            property alias navigationBarItem: navigationBarLoader.item
-
-            property alias dayOfWeekHeaderRow: dayOfWeekHeaderRow
-
-            readonly property int weeksToShow: 6
-            readonly property int rows: weeksToShow
-            readonly property int columns: CalendarUtils.daysInAWeek
-
-            // The combined available width and height to be shared amongst each cell.
-            readonly property real availableWidth: viewContainer.width
-            readonly property real availableHeight: viewContainer.height
-
-            property int hoveredCellIndex: -1
-            property int pressedCellIndex: -1
-            property int pressCellIndex: -1
-
-            Rectangle {
-                anchors.fill: parent
-                color: "transparent"
-                border.color: gridColor
-                visible: control.frameVisible
-            }
-
-            Item {
-                id: container
-                anchors.fill: parent
-                anchors.margins: control.frameVisible ? 1 : 0
-
-                Loader {
-                    id: backgroundLoader
-                    anchors.fill: parent
-                    sourceComponent: background
-                }
-
-                Loader {
-                    id: navigationBarLoader
-                    anchors.left: parent.left
-                    anchors.right: isLandscape ? undefined: parent.right
-                    anchors.top: parent.top
-                    anchors.bottom: isLandscape ? parent.bottom : undefined
-                    sourceComponent: navigationBar
-                    active: control.navigationBarVisible
-
-                    property QtObject styleData: QtObject {
-                        readonly property string title: control.__locale.standaloneMonthName(control.visibleMonth)
-                                                        + new Date(control.visibleYear, control.visibleMonth, 1).toLocaleDateString(control.__locale, " yyyy")
-                    }
-                }
-
-                Rectangle {
-                    id: dayOfWeekHeaderRow
-                    anchors.top: control.isLandscape ? parent.top : navigationBarLoader.bottom
-                    anchors.left: control.isLandscape ? navigationBarLoader.right : parent.left
-                    anchors.right: parent.right
-                    width: control.isLandscape ? parent.width / 2 : undefined
-                                        height: control.isLandscape ? 72 * Units.dp : 80 * Units.dp
-                    color: "transparent"
-
-                    IconButton {
-                        iconName: "navigation/chevron_left"
-                        id: previousMonth
-                        anchors.top: parent.top
-                                                anchors.topMargin: control.isLandscape ? 12 * Units.dp : 16 * Units.dp
-                        anchors.left: parent.left
-                                                anchors.leftMargin: 16 * Units.dp
-                        onClicked: control.showPreviousMonth()
-                    }
-
-                    IconButton {
-                        iconName: "navigation/chevron_right"
-                        id: nextMonth
-                        anchors.top: parent.top
-                                                anchors.topMargin: control.isLandscape ? 12 * Units.dp : 16 * Units.dp
-                        anchors.right: parent.right
-                                                anchors.rightMargin: 16 * Units.dp
-                        onClicked: control.showNextMonth()
-                    }
-
-                    Label {
-                        id: monthHeader
-                        anchors.verticalCenter: previousMonth.verticalCenter
-                        anchors.verticalCenterOffset: -1 * Units.dp
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        font.weight: Font.Black
-                        style: "subheading"
-                        text: control.__locale.standaloneMonthName(control.visibleMonth) + " " + control.visibleYear
-                    }
-
-                    Row {
-                        id: calenderHeader
-                        anchors.bottom: parent.bottom
-                        anchors.left: parent.left
-                                                anchors.leftMargin: (control.weekNumbersVisible ? weekNumbersItem.width : 0) + 8 * Units.dp
-                        anchors.right: parent.right
-                                                anchors.rightMargin: 8 * Units.dp
-
-                        spacing: gridVisible ? __gridLineWidth : 0
-
-                        Repeater {
-                            id: repeater
-                            model: CalendarHeaderModel {
-                                locale: control.__locale
-                            }
-                            Loader {
-                                id: dayOfWeekDelegateLoader
-                                sourceComponent: dayOfWeekDelegate
-                                width: __cellRectAt(index).width
-
-                                readonly property int __index: index
-                                readonly property var __dayOfWeek: dayOfWeek
-
-                                property QtObject styleData: QtObject {
-                                    readonly property alias index: dayOfWeekDelegateLoader.__index
-                                    readonly property alias dayOfWeek: dayOfWeekDelegateLoader.__dayOfWeek
-                                }
-                            }
-                        }
-                    }
-                }
-                Rectangle {
-                    id: topGridLine
-                    color: __horizontalSeparatorColor
-                                        width: control.isLandscape ? parent.width * (2/3) : parent.width
-                    height: __gridLineWidth
-                    visible: gridVisible
-                    anchors.top: dayOfWeekHeaderRow.bottom
-                    anchors.right: control.isLandscape ? parent.right : undefined
-                }
-
-                Row {
-                    id: gridRow
-                                        width: weekNumbersItem.width + (control.isLandscape ? (viewContainer.width * (2/3)) : viewContainer.width) - 16 * Units.dp
-                    height: viewContainer.height - dayAreaBottomMargin
-                    anchors.top: topGridLine.bottom
-                    anchors.left: control.isLandscape ? topGridLine.left : parent.left
-                                        anchors.leftMargin: 8 * Units.dp
-
-                    Column {
-                        id: weekNumbersItem
-                        visible: control.weekNumbersVisible
-                        height: viewContainer.height - dayAreaBottomMargin
-                        spacing: gridVisible ? __gridLineWidth : 0
-                        Repeater {
-                            id: weekNumberRepeater
-                            model: panelItem.weeksToShow
-
-                            Loader {
-                                id: weekNumberDelegateLoader
-                                height: __cellRectAt(index * panelItem.columns).height
-                                sourceComponent: weekNumberDelegate
-
-                                readonly property int __index: index
-                                property int __weekNumber: control.__model.weekNumberAt(index)
-
-                                Connections {
-                                    target: control
-                                    onVisibleMonthChanged: __weekNumber = control.__model.weekNumberAt(index)
-                                    onVisibleYearChanged: __weekNumber = control.__model.weekNumberAt(index)
-                                }
-
-                                Connections {
-                                    target: control.__model
-                                    onCountChanged: __weekNumber = control.__model.weekNumberAt(index)
-                                }
-
-                                property QtObject styleData: QtObject {
-                                    readonly property alias index: weekNumberDelegateLoader.__index
-                                    readonly property int weekNumber: weekNumberDelegateLoader.__weekNumber
-                                }
-                            }
-                        }
-                    }
-
-                    Rectangle {
-                        id: separator
-                        anchors.topMargin: - dayOfWeekHeaderRow.height - 1
-                        anchors.top: weekNumbersItem.top
-                        anchors.bottom: weekNumbersItem.bottom
-
-                        width: __gridLineWidth
-                        color: __verticalSeparatorColor
-                        visible: control.weekNumbersVisible
-                    }
-
-                    // Contains the grid lines and the grid itself.
-                    Item {
-                        id: viewContainer
-                                                width: (control.isLandscape ? container.width * (2/3) : container.width) - (control.weekNumbersVisible ? weekNumbersItem.width + separator.width : 0) - 16 * Units.dp
-                        height: container.height - (control.isLandscape ? 0 : navigationBarLoader.height) - dayOfWeekHeaderRow.height - topGridLine.height - dayAreaBottomMargin
-
-                        Repeater {
-                            id: verticalGridLineRepeater
-                            model: panelItem.columns - 1
-                            delegate: Rectangle {
-                                x: __cellRectAt(index + 1).x - __gridLineWidth
-                                y: 0
-                                width: __gridLineWidth
-                                height: viewContainer.height
-                                color: gridColor
-                                visible: gridVisible
-                            }
-                        }
-
-                        Repeater {
-                            id: horizontalGridLineRepeater
-                            model: panelItem.rows - 1
-                            delegate: Rectangle {
-                                x: 0
-                                y: __cellRectAt((index + 1) * panelItem.columns).y - __gridLineWidth
-                                width: viewContainer.width
-                                height: __gridLineWidth
-                                color: gridColor
-                                visible: gridVisible
-                            }
-                        }
-
-                        MouseArea {
-                            id: mouseArea
-                            anchors.fill: parent
-
-                            hoverEnabled: true
-
-                            function cellIndexAt(mouseX, mouseY) {
-                                var viewContainerPos = viewContainer.mapFromItem(mouseArea, mouseX, mouseY);
-                                var child = viewContainer.childAt(viewContainerPos.x, viewContainerPos.y);
-                                // In the tests, the mouseArea sometimes gets picked instead of the cells,
-                                // probably because stuff is still loading. To be safe, we check for that here.
-                                return child && child !== mouseArea ? child.__index : -1;
-                            }
-
-                            onEntered: {
-                                hoveredCellIndex = cellIndexAt(mouseX, mouseY);
-                                if (hoveredCellIndex === undefined) {
-                                    hoveredCellIndex = cellIndexAt(mouseX, mouseY);
-                                }
-
-                                var date = view.model.dateAt(hoveredCellIndex);
-                                if (__isValidDate(date)) {
-                                    control.hovered(date);
-                                }
-                            }
-
-                            onExited: {
-                                hoveredCellIndex = -1;
-                            }
-
-                            onPositionChanged: {
-                                var indexOfCell = cellIndexAt(mouse.x, mouse.y);
-                                var previousHoveredCellIndex = hoveredCellIndex;
-                                hoveredCellIndex = indexOfCell;
-                                if (indexOfCell !== -1) {
-                                    var date = view.model.dateAt(indexOfCell);
-                                    if (__isValidDate(date)) {
-                                        if (hoveredCellIndex !== previousHoveredCellIndex)
-                                            control.hovered(date);
-
-                                        // The date must be different for the pressed signal to be emitted.
-                                        if (pressed && date.getTime() !== control.selectedDate.getTime()) {
-                                            control.pressed(date);
-
-                                            // You can't select dates in a different month while dragging.
-                                            if (date.getMonth() === control.selectedDate.getMonth()) {
-                                                control.selectedDate = date;
-                                                pressedCellIndex = indexOfCell;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            onPressed: {
-                                pressCellIndex = cellIndexAt(mouse.x, mouse.y);
-                                if (pressCellIndex !== -1) {
-                                    var date = view.model.dateAt(pressCellIndex);
-                                    pressedCellIndex = pressCellIndex;
-                                    if (__isValidDate(date) && (date.getMonth() === control.visibleMonth && date.getFullYear() === control.visibleYear)) {
-                                        control.selectedDate = date;
-                                        control.pressed(date);
-                                    }
-                                }
-                            }
-
-                            onReleased: {
-                                var indexOfCell = cellIndexAt(mouse.x, mouse.y);
-                                if (indexOfCell !== -1) {
-                                    // The cell index might be valid, but the date has to be too. We could let the
-                                    // selected date validation take care of this, but then the selected date would
-                                    // change to the earliest day if a day before the minimum date is clicked, for example.
-                                    var date = view.model.dateAt(indexOfCell);
-                                    if (__isValidDate(date)) {
-                                        control.released(date);
-                                    }
-                                }
-                                pressedCellIndex = -1;
-                            }
-
-                            onClicked: {
-                                var indexOfCell = cellIndexAt(mouse.x, mouse.y);
-                                if (indexOfCell !== -1 && indexOfCell === pressCellIndex) {
-                                    var date = view.model.dateAt(indexOfCell);
-                                    if (__isValidDate(date))
-                                        control.clicked(date);
-                                }
-                            }
-
-                            onDoubleClicked: {
-                                var indexOfCell = cellIndexAt(mouse.x, mouse.y);
-                                if (indexOfCell !== -1) {
-                                    var date = view.model.dateAt(indexOfCell);
-                                    if (__isValidDate(date))
-                                        control.doubleClicked(date);
-                                }
-                            }
-
-                            onPressAndHold: {
-                                var indexOfCell = cellIndexAt(mouse.x, mouse.y);
-                                if (indexOfCell !== -1 && indexOfCell === pressCellIndex) {
-                                    var date = view.model.dateAt(indexOfCell);
-                                    if (__isValidDate(date))
-                                        control.pressAndHold(date);
-                                }
-                            }
-                        }
-
-                        Connections {
-                            target: control
-                            onSelectedDateChanged: view.selectedDateChanged()
-                        }
-
-                        Repeater {
-                            id: view
-
-                            property int currentIndex: -1
-
-                            model: control.__model
-
-                            Component.onCompleted: selectedDateChanged()
-
-                            function selectedDateChanged() {
-                                if (model !== undefined && model.locale !== undefined) {
-                                    currentIndex = model.indexAt(control.selectedDate);
-                                }
-                            }
-
-                            delegate: Loader {
-                                id: delegateLoader
-
-                                x: __cellRectAt(index).x
-                                y: __cellRectAt(index).y
-                                width: __cellRectAt(index).width
-                                height: __cellRectAt(index).height
-                                sourceComponent: dayDelegate
-
-                                readonly property int __index: index
-                                readonly property date __date: date
-                                // We rely on the fact that an invalid QDate will be converted to a Date
-                                // whose year is -4713, which is always an invalid date since our
-                                // earliest minimum date is the year 1.
-                                readonly property bool valid: __isValidDate(date)
-
-                                property QtObject styleData: QtObject {
-                                    readonly property alias index: delegateLoader.__index
-                                    readonly property bool selected: control.selectedDate.getTime() === date.getTime()
-                                    readonly property alias date: delegateLoader.__date
-                                    readonly property bool valid: delegateLoader.valid
-                                    // TODO: this will not be correct if the app is running when a new day begins.
-                                    readonly property bool today: date.getTime() === new Date().setHours(0, 0, 0, 0)
-                                    readonly property bool visibleMonth: date.getMonth() === control.visibleMonth
-                                    readonly property bool hovered: panelItem.hoveredCellIndex == index
-                                    readonly property bool pressed: panelItem.pressedCellIndex == index
-                                    // todo: pressed property here, clicked and doubleClicked in the control itself
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/IconButton.qml b/prototype_2016/third_party/qml-material/src/components/IconButton.qml
deleted file mode 100644
index 2c6d27d..0000000
--- a/prototype_2016/third_party/qml-material/src/components/IconButton.qml
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype IconButton
-   \inqmlmodule Material
-
-   \brief Icon buttons are appropriate for app bars, toolbars, action buttons or toggles.
- */
-Item {
-    id: iconButton
-
-    property Action action
-    property string iconName
-    property string iconSource: action ? action.iconSource : "icon://" + iconName
-    property bool hoverAnimation: action ? action.hoverAnimation : false
-    property alias color: icon.color
-    property alias size: icon.size
-
-    signal clicked
-
-    width: icon.width
-    height: icon.height
-    enabled: action ? action.enabled : true
-    opacity: enabled ? 1 : 0.6
-
-    onClicked: {
-        if (action) action.triggered(icon)
-    }
-
-    Ink {
-        id: ink
-
-        anchors.centerIn: parent
-        enabled: iconButton.enabled
-        centered: true
-        circular: true
-
-        width: parent.width + 20 * Units.dp
-        height: parent.height + 20 * Units.dp
-
-        z: 0
-
-        onClicked: {
-            iconButton.clicked()
-        }
-    }
-
-    Icon {
-        id: icon
-
-        anchors.centerIn: parent
-
-        source: iconButton.iconSource
-        rotation: iconButton.hoverAnimation ? ink.containsMouse ? 90 : 0
-                                            : 0
-
-        Behavior on rotation {
-            NumberAnimation { duration: 200 }
-        }
-    }
-
-    Tooltip {
-        text: action ? action.name : ""
-        mouseArea: ink
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/OverlayLayer.qml b/prototype_2016/third_party/qml-material/src/components/OverlayLayer.qml
deleted file mode 100644
index 47c032b..0000000
--- a/prototype_2016/third_party/qml-material/src/components/OverlayLayer.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-/*!
-   \qmltype OverlayLayer
-   \inqmlmodule Material
-
-   \brief Provides a layer to display popups and other overlay components.
- */
-Rectangle {
-    id: overlayLayer
-    objectName: "overlayLayer"
-
-    anchors.fill: parent
-
-    property Item currentOverlay
-    color: "transparent"
-
-    onEnabledChanged: {
-        if (!enabled && overlayLayer.currentOverlay != null)
-            overlayLayer.currentOverlay.close()
-    }
-
-    onWidthChanged: closeIfNecessary()
-    onHeightChanged: closeIfNecessary()
-
-    states: State {
-        name: "ShowState"
-        when: overlayLayer.currentOverlay != null
-
-        PropertyChanges {
-            target: overlayLayer
-            color: currentOverlay.overlayColor
-        }
-    }
-
-    transitions: Transition {
-        ColorAnimation {
-            duration: 300
-            easing.type: Easing.InOutQuad
-        }
-    }
-
-    function closeIfNecessary() {
-        if (overlayLayer.currentOverlay != null && overlayLayer.currentOverlay.closeOnResize)
-            overlayLayer.currentOverlay.close()
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        enabled: overlayLayer.currentOverlay != null &&
-                overlayLayer.currentOverlay.globalMouseAreaEnabled
-        hoverEnabled: enabled
-
-        onWheel: wheel.accepted = true
-
-        onClicked: {
-            if (overlayLayer.currentOverlay.dismissOnTap)
-                overlayLayer.currentOverlay.close()
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/OverlayView.qml b/prototype_2016/third_party/qml-material/src/components/OverlayView.qml
deleted file mode 100644
index f2f5fbe..0000000
--- a/prototype_2016/third_party/qml-material/src/components/OverlayView.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype OverlayView
-   \inqmlmodule Material
-
-   \brief A view that pops out of the content to display as an overlay.
- */
-PopupBase {
-    id: overlay
-
-    overlayLayer: "dialogOverlayLayer"
-    overlayColor: Qt.rgba(0, 0, 0, 0.3)
-
-    visible: transitionOpacity > 0
-    state: showing ? "visible" : "hidden"
-
-    x: (parent.width - width)/2
-    y: (parent.height - height)/2
-
-    property alias transitionOpacity: shadow.opacity
-
-    states: [
-        State {
-            name: "hidden"
-
-            PropertyChanges {
-                target: overlay
-                x: sourceView ? sourceView.mapToItem(overlay.parent, 0, 0).x : 0
-                y: sourceView ? sourceView.mapToItem(overlay.parent, 0, 0).y : 0
-                width: sourceView ? sourceView.width : 0
-                height: sourceView ? sourceView.height : 0
-            }
-        }
-    ]
-
-    transitions: Transition {
-        from: "*"; to: "*"
-
-        NumberAnimation {
-            target: overlay
-            properties: "x,y,width,height"
-            duration: 300; easing.type: Easing.InOutQuad
-        }
-    }
-
-    property Item sourceView
-
-    function open(sourceView) {
-        overlay.sourceView = sourceView;
-
-        parent = Utils.findRootChild(overlay, overlayLayer)
-        showing = true
-        forceActiveFocus()
-        parent.currentOverlay = overlay
-
-        opened()
-    }
-
-    function close() {
-        showing = false
-        parent.currentOverlay = null
-        sourceView = null
-    }
-
-    View {
-        id: shadow
-
-        anchors.fill: parent
-        opacity: showing ? 1 : 0
-        elevation: 5
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 300; easing.type: Easing.InOutQuad
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/ProgressCircle.qml b/prototype_2016/third_party/qml-material/src/components/ProgressCircle.qml
deleted file mode 100644
index 71cd7b5..0000000
--- a/prototype_2016/third_party/qml-material/src/components/ProgressCircle.qml
+++ /dev/null
@@ -1,226 +0,0 @@
-/***** THIS FILE CANNOT BE RELICENSED UNDER THE MPL YET *****/
-
-/*
- * QML Material - An application framework implementing Material Design.
- * Copyright (C) 2015 Jordan Neidlinger <JNeidlinger@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.4
-import QtQuick.Window 2.2
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles 1.3 as Styles
-import Material 0.3
-
-/*!
-   \qmltype ProgressCircle
-   \inqmlmodule Material
-
-   \brief Visual circular indicator of progress in some operation.
-*/
-Controls.ProgressBar {
-    id: progressBar
-
-    /*!
-       The color for the progress circle. By default this is
-       the primary color defined in \l Theme::primaryColor
-     */
-    property color color: Theme.primaryColor
-
-    /*!
-       The thickness of the progress circle's stroke,
-       3 dp by default
-     */
-    property real dashThickness: 3 * Units.dp
-
-    width: 32 * Units.dp
-    height: 32 * Units.dp
-
-    indeterminate: true
-
-    style: Styles.ProgressBarStyle {
-        id: progressBarStyle
-
-        progress: Item {
-            anchors.fill: parent
-
-            Canvas {
-                id: canvas
-
-                property int ratio: Screen.devicePixelRatio
-
-                width: parent.width * ratio
-                height: parent.height * ratio
-                anchors.centerIn: parent
-
-                scale: 1/ratio
-
-                onWidthChanged: requestPaint()
-                onHeightChanged: requestPaint()
-
-                renderStrategy: Canvas.Threaded
-                antialiasing: true
-                onPaint: drawSpinner();
-
-                opacity:  visible ? 1.0 : 0
-
-                Behavior on opacity {
-                    PropertyAnimation {
-                        duration: 800
-                    }
-                }
-
-                Connections {
-                    target: control
-                    onColorChanged: canvas.requestPaint()
-                    onValueChanged: canvas.requestPaint()
-                    onDashThicknessChanged: canvas.requestPaint()
-                    onIndeterminateChanged:
-                    {
-                        if(control.indeterminate)
-                        {
-                            internal.arcEndPoint = 0
-                            internal.arcStartPoint = 0
-                            internal.rotate = 0
-                        }
-
-                        canvas.requestPaint();
-                    }
-                }
-
-                QtObject {
-                    id: internal
-
-                    property real arcEndPoint: 0
-                    onArcEndPointChanged: canvas.requestPaint();
-
-                    property real arcStartPoint: 0
-                    onArcStartPointChanged: canvas.requestPaint();
-
-                    property real rotate: 0
-                    onRotateChanged: canvas.requestPaint();
-
-                    property real longDash: 3 * Math.PI / 2
-                    property real shortDash: 19 * Math.PI / 10
-                }
-
-                NumberAnimation {
-                    target: internal
-                    properties: "rotate"
-                    from: 0
-                    to: 2 * Math.PI
-                    loops: Animation.Infinite
-                    running: control.indeterminate && canvas.visible
-                    easing.type: Easing.Linear
-                    duration: 3000
-                }
-
-                SequentialAnimation {
-                    running: control.indeterminate && canvas.visible
-                    loops: Animation.Infinite
-
-                    ParallelAnimation {
-                        NumberAnimation {
-                            target: internal
-                            properties: "arcEndPoint"
-                            from: 0
-                            to: internal.longDash
-                            easing.type: Easing.InOutCubic
-                            duration: 800
-                        }
-
-                        NumberAnimation {
-                            target: internal
-                            properties: "arcStartPoint"
-                            from: internal.shortDash
-                            to: 2 * Math.PI - 0.001
-                            easing.type: Easing.InOutCubic
-                            duration: 800
-                        }
-                    }
-
-                    ParallelAnimation {
-                        NumberAnimation {
-                            target: internal
-                            properties: "arcEndPoint"
-                            from: internal.longDash
-                            to: 2 * Math.PI - 0.001
-                            easing.type: Easing.InOutCubic
-                            duration: 800
-                        }
-
-                        NumberAnimation {
-                            target: internal
-                            properties: "arcStartPoint"
-                            from: 0
-                            to: internal.shortDash
-                            easing.type: Easing.InOutCubic
-                            duration: 800
-                        }
-                    }
-                }
-
-                function drawSpinner() {
-                    var ctx = canvas.getContext("2d");
-                    ctx.reset();
-                    ctx.clearRect(0, 0, canvas.width, canvas.height);
-                    ctx.strokeStyle = control.color
-                    ctx.lineWidth = control.dashThickness * canvas.ratio
-                    ctx.lineCap = "butt";
-
-                    ctx.translate(canvas.width / 2, canvas.height / 2);
-                    ctx.rotate(control.indeterminate ? internal.rotate : currentProgress * (3 * Math.PI / 2));
-
-                    ctx.arc(0, 0, Math.max(0, Math.min(canvas.width, canvas.height) / 2 - ctx.lineWidth),
-                        control.indeterminate ? internal.arcStartPoint : 0,
-                        control.indeterminate ? internal.arcEndPoint : currentProgress * (2 * Math.PI),
-                        false);
-
-                    ctx.stroke();
-                }
-            }
-        }
-
-        property Component panel: Item{
-            implicitWidth: backgroundLoader.implicitWidth
-            implicitHeight: backgroundLoader.implicitHeight
-
-            Item {
-                width: parent.width
-                height: parent.height
-                transformOrigin: Item.TopLeft
-
-                Rectangle {
-                    id: backgroundLoader
-                    implicitWidth: control.width
-                    implicitHeight: control.height
-                    color: "transparent"
-                }
-
-                Loader {
-                    sourceComponent: progressBarStyle.progress
-                    anchors.topMargin: padding.top
-                    anchors.leftMargin: padding.left
-                    anchors.rightMargin: padding.right
-                    anchors.bottomMargin: padding.bottom
-
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.bottom: parent.bottom
-                    width: parent.width - padding.left - padding.right
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/Scrollbar.qml b/prototype_2016/third_party/qml-material/src/components/Scrollbar.qml
deleted file mode 100644
index 4c3de83..0000000
--- a/prototype_2016/third_party/qml-material/src/components/Scrollbar.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-/*!
-   \qmltype Scrollbar
-   \inqmlmodule Material
-
-   \brief Scrollbars show scrolling progress for listviews and flickables.
-*/
-Item {
-    id: root
-
-    property Flickable flickableItem
-    property int orientation: Qt.Vertical
-    property int thickness: 5
-    property bool moving: flickableItem.moving
-
-    width: thickness
-    height: thickness
-    clip: true
-    smooth: true
-    visible: orientation === Qt.Vertical ? flickableItem.contentHeight > flickableItem.height
-                                         : flickableItem.contentWidth > flickableItem.width
-
-    anchors {
-        top: orientation === Qt.Vertical ? flickableItem.top : undefined
-        bottom: flickableItem.bottom
-        left: orientation === Qt.Horizontal ? flickableItem.left : undefined
-        right: flickableItem.right
-        margins: 2
-    }
-
-    Component.onCompleted: hideAnimation.start()
-
-    onMovingChanged: {
-        if (moving) {
-            hideAnimation.stop()
-            showAnimation.start()
-        } else {
-            hideAnimation.start()
-            showAnimation.stop()
-        }
-    }
-
-    NumberAnimation {
-        id: showAnimation
-        target: scrollBar;
-        property: "opacity";
-        to: 0.3;
-        duration: 200;
-        easing.type: Easing.InOutQuad
-    }
-
-    SequentialAnimation {
-        id: hideAnimation
-
-        NumberAnimation { duration: 500 }
-        NumberAnimation {
-            target: scrollBar;
-            property: "opacity";
-            to: 0;
-            duration: 500;
-            easing.type: Easing.InOutQuad
-        }
-    }
-
-    onOrientationChanged: {
-        if (orientation == Qt.Vertical) {
-            width = thickness
-        } else {
-            height = thickness
-        }
-    }
-
-    Rectangle {
-        id: scrollBar
-        property int length: orientation == Qt.Vertical ? root.height
-                                                        : root.width;
-        property int targetLength: orientation == Qt.Vertical ? flickableItem.height
-                                                              : flickableItem.width;
-        property int contentStart: orientation == Qt.Vertical ? flickableItem.contentY
-                                                              : flickableItem.contentX;
-        property int contentLength: orientation == Qt.Vertical ? flickableItem.contentHeight
-                                                               : flickableItem.contentWidth;
-        property int start: Math.max(0, length * contentStart/contentLength);
-        property int end: Math.min(length,
-                                   length * (contentStart + targetLength)/contentLength)
-
-        color: "black"//theme.foreground
-        opacity: 0.3
-        radius: thickness/2
-        width: Math.max(orientation == Qt.Horizontal ? end - start : 0, thickness)
-        height: Math.max(orientation == Qt.Vertical ? end - start : 0, thickness)
-        x: orientation == Qt.Horizontal ? start : 0
-        y: orientation == Qt.Vertical ? start : 0
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/Snackbar.qml b/prototype_2016/third_party/qml-material/src/components/Snackbar.qml
deleted file mode 100644
index 834a8b7..0000000
--- a/prototype_2016/third_party/qml-material/src/components/Snackbar.qml
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2014 Bogdan Cuza <bogdan.cuza@hotmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.3
-
-/*!
-   \qmltype Snackbar
-   \inqmlmodule Material
-
-   \brief Snackbars provide lightweight feedback about an operation
- */
-View {
-    id: snackbar
-
-    property string buttonText
-    property color buttonColor: Theme.accentColor
-    property string text
-    property bool opened
-    property int duration: 2000
-    property bool fullWidth: Device.type === Device.phone || Device.type === Device.phablet
-
-    signal clicked
-
-    function open(text) {
-        snackbar.text = text
-        opened = true;
-        timer.restart();
-    }
-
-    anchors {
-        left: fullWidth ? parent.left : undefined
-        right: fullWidth ? parent.right : undefined
-        bottom: parent.bottom
-        bottomMargin: opened ? 0 :  -snackbar.height
-        horizontalCenter: fullWidth ? undefined : parent.horizontalCenter
-
-        Behavior on bottomMargin {
-            NumberAnimation { duration: 300 }
-        }
-    }
-    radius: fullWidth ? 0 : 2 * Units.dp
-    backgroundColor: "#323232"
-    height: snackLayout.height
-    width: fullWidth ? undefined : snackLayout.width
-    opacity: opened ? 1 : 0
-
-    Timer {
-        id: timer
-
-        interval: snackbar.duration
-
-        onTriggered: {
-            if (!running) {
-                snackbar.opened = false;
-            }
-        }
-    }
-
-    RowLayout {
-        id: snackLayout
-
-        anchors {
-            verticalCenter: parent.verticalCenter
-            left: snackbar.fullWidth ? parent.left : undefined
-            right: snackbar.fullWidth ? parent.right : undefined
-        }
-
-        spacing: 0
-
-        Item {
-            width: 24 * Units.dp
-        }
-
-        Label {
-            id: snackText
-            Layout.fillWidth: true
-            Layout.minimumWidth: snackbar.fullWidth ? -1 : 216 * Units.dp - snackButton.width
-            Layout.maximumWidth: snackbar.fullWidth ? -1 :
-                Math.min(496 * Units.dp - snackButton.width - middleSpacer.width - 48 * Units.dp,
-                         snackbar.parent.width - snackButton.width - middleSpacer.width - 48 * Units.dp)
-
-            Layout.preferredHeight: lineCount == 2 ? 80 * Units.dp : 48 * Units.dp
-            verticalAlignment: Text.AlignVCenter
-            maximumLineCount: 2
-            wrapMode: Text.Wrap
-            elide: Text.ElideRight
-            text: snackbar.text
-            color: "white"
-        }
-
-        Item {
-            id: middleSpacer
-            width: snackbar.buttonText == "" ? 0 : snackbar.fullWidth ? 24 * Units.dp : 48 * Units.dp
-        }
-
-        Button {
-            id: snackButton
-            textColor: snackbar.buttonColor
-            visible: snackbar.buttonText != ""
-            text: snackbar.buttonText
-            context: "snackbar"
-            width: visible ? implicitWidth : 0
-            onClicked: snackbar.clicked()
-        }
-
-        Item {
-            width: 24 * Units.dp
-        }
-    }
-
-    Behavior on opacity {
-        NumberAnimation { duration: 300 }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/ThinDivider.qml b/prototype_2016/third_party/qml-material/src/components/ThinDivider.qml
deleted file mode 100644
index 8770960..0000000
--- a/prototype_2016/third_party/qml-material/src/components/ThinDivider.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype ThinDivider
-   \inqmlmodule Material
-
-   \brief A 1dp high divider for use in lists and other columns of content.
- */
-Rectangle {
-    anchors {
-        left: parent.left
-        right: parent.right
-    }
-
-    property bool darkBackground
-
-    color: darkBackground ? Theme.dark.hintColor : Theme.light.hintColor
-    height: 1
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/TimePicker.qml b/prototype_2016/third_party/qml-material/src/components/TimePicker.qml
deleted file mode 100644
index 6f84275..0000000
--- a/prototype_2016/third_party/qml-material/src/components/TimePicker.qml
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015 Steve Coffey <scoffey@barracuda.com>
- *               2015 Jordan Neidlinger <JNeidlinger@gmail.com>
- *               2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import Material.Extras 0.1
-import QtQuick.Controls 1.3 as QuickControls
-import QtQuick.Controls.Styles 1.3
-
-FocusScope {
-    id: timePicker
-
-    width: 300 * Units.dp
-    height: content.height
-
-    /*!
-       Set to \c true if selection is 24 hour based. Defaults to false
-     */
-    property bool prefer24Hour: false
-
-    /*!
-       The visual padding around the clock element
-     */
-    property real clockPadding: 24 * Units.dp
-
-    /*!
-       Set to \c true if the time picker should first show the hours. Defaults to true
-     */
-    property bool isHours: true
-
-    /*!
-       Sets the bottom margin for the time picker
-     */
-    property int bottomMargin: 0
-
-    Keys.onUpPressed: {
-        var date = internal.timePicked
-
-        if(isHours)
-            date.setHours(internal.timePicked.getHours() + 1)
-        else
-            date.setMinutes(internal.timePicked.getMinutes() + 1)
-
-        internal.timePicked = date
-    }
-
-    Keys.onDownPressed: {
-        var date = internal.timePicked
-
-        if(isHours)
-            date.setHours(internal.timePicked.getHours() - 1)
-        else
-            date.setMinutes(internal.timePicked.getMinutes() - 1)
-
-        internal.timePicked = date
-    }
-
-    Keys.onLeftPressed: {
-        if(!isHours)
-            setIsHours(true)
-    }
-
-    Keys.onRightPressed: {
-        if(isHours)
-            setIsHours(false)
-    }
-
-    property string __digitsPressed
-
-    Keys.onDigit0Pressed: setDigitsPressed(0)
-    Keys.onDigit1Pressed: setDigitsPressed(1)
-    Keys.onDigit2Pressed: setDigitsPressed(2)
-    Keys.onDigit3Pressed: setDigitsPressed(3)
-    Keys.onDigit4Pressed: setDigitsPressed(4)
-    Keys.onDigit5Pressed: setDigitsPressed(5)
-    Keys.onDigit6Pressed: setDigitsPressed(6)
-    Keys.onDigit7Pressed: setDigitsPressed(7)
-    Keys.onDigit8Pressed: setDigitsPressed(8)
-    Keys.onDigit9Pressed: setDigitsPressed(9)
-
-    QtObject {
-        id: internal
-        property bool resetFlag: false
-        property date timePicked
-        property bool completed: false
-
-        onTimePickedChanged: {
-            if(completed) {
-                var hours = timePicked.getHours()
-                if(hours > 11 && !prefer24Hour){
-                    hours -= 12
-                    amPmPicker.isAm = false
-                } else {
-                    amPmPicker.isAm = true
-                }
-
-                hoursPathView.currentIndex = hours
-
-                var minutes = internal.timePicked.getMinutes()
-                minutesPathView.currentIndex = minutes
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        internal.completed = true
-        internal.timePicked = new Date(Date.now())
-                forceActiveFocus()
-    }
-
-    Column {
-        id:content
-        height: childrenRect.height + bottomMargin
-        width: parent.width
-
-        Rectangle {
-            id: headerView
-            width: parent.width
-            height: 88 * Units.dp
-            color: Theme.accentColor
-
-            Row {
-                id: timeContainer
-                anchors.centerIn: parent
-                height: 48 * Units.dp
-
-                Label {
-                    id:hoursLabel
-                    style: "display3"
-                    color: isHours ? "white" : "#99ffffff"
-                    text: internal.timePicked.getHours()
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: {
-                            if(!isHours){
-                                setIsHours(true)
-                            }
-                        }
-                    }
-                }
-
-                Label {
-                    style: "display3"
-                    color: "white"
-                    text:":"
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                Label {
-                    id: minutesLabel
-                    style: "display3"
-                    color: !isHours ? "white" : "#99ffffff"
-                    text: internal.timePicked.getMinutes() < 10 ? "0" +  internal.timePicked.getMinutes() : internal.timePicked.getMinutes()
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: {
-                            if(isHours){
-                                setIsHours(false)
-                            }
-                        }
-                    }
-                }
-            }
-
-            Column {
-                id: amPmPicker
-                visible: !prefer24Hour
-
-                property bool isAm: true
-
-                anchors {
-                    bottom: timeContainer.bottom
-                    left: timeContainer.right
-                    leftMargin: 12 * Units.dp
-                }
-
-                spacing: 4 * Units.dp
-
-                Label {
-                    style: "subheading"
-                    font.weight: Font.DemiBold
-                    color: amPmPicker.isAm ? "white" : "#99ffffff"
-                    text: "AM"
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: amPmPicker.isAm = true
-                    }
-                }
-
-                Label {
-                    style: "subheading"
-                    font.weight: Font.DemiBold
-                    color: !amPmPicker.isAm ? "white" : "#99ffffff"
-                    text: "PM"
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: amPmPicker.isAm = false
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            id: picker
-            width: parent.width
-            height: width
-            color: "white"
-
-            Rectangle {
-                id: circle
-                color: "#eee"
-                anchors.centerIn: parent
-                width: parent.width * 0.9
-                height: width
-                radius: width / 2
-
-                Rectangle {
-                    id: centerPoint
-                    anchors.centerIn: parent
-                    color: Theme.accentColor
-                    width: 8 * Units.dp
-                    height: 8 * Units.dp
-                    radius: width / 2
-                }
-
-                Rectangle {
-                    id: pointer
-                    color: Theme.accentColor
-                    width: 2 * Units.dp
-                    height: circle.height / 2 - clockPadding
-                    y: clockPadding
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    antialiasing: true
-                    transformOrigin: Item.Bottom
-
-                    Connections {
-                        target: hoursPathView
-                        onCurrentIndexChanged: {
-                            if(isHours)
-                                pointer.setAngle()
-                        }
-                    }
-
-                    Connections {
-                        target: minutesPathView
-                        onCurrentIndexChanged: {
-                            if(!isHours)
-                                pointer.setAngle()
-                        }
-                    }
-
-                    Connections {
-                        target: timePicker
-                        onIsHoursChanged: pointer.setAngle()
-                    }
-
-                    function setAngle()
-                    {
-                        var idx = isHours ? hoursPathView.currentIndex : minutesPathView.currentIndex
-                        var angle
-                        if(isHours)
-                            angle = (360 / ((prefer24Hour) ? 24 : 12)) * idx
-                        else
-                            angle = 360 / 60 * idx
-
-                        if(Math.abs(pointer.rotation - angle) == 180)
-                            pointerRotation.direction = RotationAnimation.Clockwise
-                        else
-                            pointerRotation.direction = RotationAnimation.Shortest
-
-                        pointer.rotation = angle
-                    }
-
-                    Behavior on rotation {
-                        RotationAnimation {
-                            id: pointerRotation
-                            duration: 200
-                            direction: RotationAnimation.Shortest
-                        }
-                    }
-                }
-
-                Component {
-                    id: pathViewHighlight
-                    Rectangle {
-                        id: highlight
-                        width: 40 * Units.dp
-                        height: 40 * Units.dp
-                        color: Theme.accentColor
-                        radius: width / 2
-                    }
-                }
-
-                Component {
-                    id: pathViewItem
-                    Rectangle {
-                        id: rectangle
-                        width: !isHours && modelData % 5 == 0 ? 12 * Units.dp : isHours ? 30 * Units.dp : 8 * Units.dp
-                        height: !isHours && modelData % 5 == 0 ? 12 * Units.dp : isHours ? 30 * Units.dp : 8 * Units.dp
-                        color: "transparent"
-
-                        property bool isSelected: false
-
-                        Label {
-                            anchors.centerIn: parent
-                            text:{
-                                var model = isHours ? hoursPathView.model : minutesPathView.model
-                                return model.data < 10 && !isHours ? "0" + modelData : modelData
-                            }
-                            visible: modelData >= 0 && (isHours ? true : modelData % 5 == 0)
-                            style: "subheading"
-                        }
-
-                        Connections {
-                            target: parentMouseArea
-
-                            onClicked: {
-                                checkClick(false)
-                            }
-
-                            onPositionChanged: {
-                                checkClick(true)
-                            }
-
-                            function checkClick(isPress)
-                            {
-                                if((isPress ? parentMouseArea.leftButtonPressed : true) && rectangle.visible) {
-                                    var thisPosition = rectangle.mapToItem(null, 0, 0, width, height)
-
-                                    if(parentMouseArea.globalX > thisPosition.x &&
-                                        parentMouseArea.globalY > thisPosition.y &&
-                                        parentMouseArea.globalX < (thisPosition.x + width) &&
-                                        parentMouseArea.globalY < (thisPosition.y + height)) {
-
-                                        if(!rectangle.isSelected) {
-                                            rectangle.isSelected = true
-
-                                            var newDate = new Date(internal.timePicked) // Grab a new date from existing
-
-                                            var time = parseInt(modelData)
-                                            if(isHours) {
-                                                if(!prefer24Hour && !amPmPicker.isAm && time < 12) {
-                                                    time += 12
-                                                }
-                                                else if(!prefer24Hour && amPmPicker.isAm && time === 12) {
-                                                    time = 0
-                                                }
-
-                                                newDate.setHours(time)
-                                            } else {
-                                                newDate.setMinutes(time)
-                                            }
-
-                                            internal.timePicked = newDate
-                                        }
-                                    }
-                                    else {
-                                        rectangle.isSelected = false
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                MouseArea {
-                    property bool leftButtonPressed
-                    property int globalX
-                    property int globalY
-                    id: parentMouseArea
-                    anchors.fill: circle
-                    hoverEnabled: true
-
-                    onClicked: {
-                        globalX = parentMouseArea.mapToItem(null, mouse.x, mouse.y).x
-                        globalY = parentMouseArea.mapToItem(null, mouse.x, mouse.y).y
-                    }
-
-                    onPositionChanged: {
-                        if(containsPress)
-                        {
-                            leftButtonPressed = true
-                            globalX = parentMouseArea.mapToItem(null, mouse.x, mouse.y).x
-                            globalY = parentMouseArea.mapToItem(null, mouse.x, mouse.y).y
-                        }
-                        else
-                        {
-                            leftButtonPressed = false
-                        }
-                    }
-                }
-
-
-                PathView {
-                    id: hoursPathView
-                    anchors.fill: parent
-                    visible: isHours
-                    model: {
-                        var limit = prefer24Hour ? 24 : 12
-                        var zeroBased = prefer24Hour
-                        return getTimeList(limit, zeroBased)
-                    }
-                    highlightRangeMode: PathView.NoHighlightRange
-                    highlightMoveDuration: 200
-
-                    onCurrentIndexChanged: {
-                        var newText = currentIndex
-                        if(currentIndex == 0 && !prefer24Hour)
-                            newText = 12
-                        hoursLabel.text = newText
-                    }
-
-                    delegate: pathViewItem
-
-                    interactive: false
-                    highlight: pathViewHighlight
-
-                    path: Path {
-                        startX: circle.width / 2
-                        startY: clockPadding
-
-                        PathArc {
-                            x: circle.width / 2
-                            y: circle.height - clockPadding
-                            radiusX: circle.width / 2 - clockPadding
-                            radiusY: circle.width / 2 - clockPadding
-                            useLargeArc: false
-                        }
-
-                        PathArc {
-                            x: circle.width / 2
-                            y: clockPadding
-                            radiusX: circle.width / 2 - clockPadding
-                            radiusY: circle.width / 2 - clockPadding
-                            useLargeArc: false
-                        }
-                    }
-                }
-
-                PathView {
-                    id: minutesPathView
-                    anchors.fill: parent
-                    visible: !isHours
-                    model: {
-                        return getTimeList(60, true)
-                    }
-                    highlightRangeMode: PathView.NoHighlightRange
-                    highlightMoveDuration: 200
-                    delegate: pathViewItem
-                    highlight: pathViewHighlight
-                    interactive: false
-
-                    path: Path {
-                        startX: circle.width / 2
-                        startY: clockPadding
-
-                        PathArc {
-                            x: circle.width / 2
-                            y: circle.height - clockPadding
-                            radiusX: circle.width / 2 - clockPadding
-                            radiusY: circle.width / 2 - clockPadding
-                            useLargeArc: false
-                        }
-
-                        PathArc {
-                            x: circle.width / 2
-                            y: clockPadding
-                            radiusX: circle.width / 2 - clockPadding
-                            radiusY: circle.width / 2 - clockPadding
-                            useLargeArc: false
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-      Switches contexts
-
-      If previously we hadn't set hours, and we're now switching contexts, disable the auto switch to minutes
-      */
-    function setIsHours(_isHours) {
-        if(_isHours == isHours)
-            return
-
-        if(!internal.resetFlag)
-            internal.resetFlag = true
-
-        var prevRotation = pointerRotation.duration
-        pointerRotation.duration = 0
-        isHours = _isHours
-        pointerRotation.duration = prevRotation
-    }
-
-    function getCurrentTime() {
-        var date = new Date(internal.timePicked)
-        if(amPmPicker.isAm && date.getHours() > 11)
-            date.setHours(date.getHours() - 12)
-        else if(!amPmPicker.isAm && date.getHours() < 11)
-            date.setHours(date.getHours() + 12)
-
-        return date
-    }
-
-    /*!
-       \internal
-       Resets the view after closing
-     */
-    function reset() {
-        isHours = true
-        internal.resetFlag = false
-        amPmPicker.isAm = true
-        internal.timePicked = new Date(Date.now())
-    }
-
-    /*!
-       \internal
-       Provides list of ints for pathview based on the context and user prefs
-     */
-    function getTimeList(limit, isZeroBased) {
-        var items = []
-        if(!isZeroBased) {
-            items[0] = limit
-        }
-
-        var start = isZeroBased ? 0 : 1
-
-        var jump = limit > 24 ? 1 : 1
-        for(var i = start; i < limit; i += jump) {
-            items[i / jump] = i
-        }
-        return items
-    }
-
-    /*!
-       \internal
-     */
-    function setDigitsPressed(minute)
-    {
-        if(__digitsPressed.length > 1) {
-            __digitsPressed = ""
-            __digitsPressed = minute
-        }
-        else {
-            __digitsPressed += minute
-        }
-
-        var date = internal.timePicked
-        var value = parseInt(__digitsPressed)
-
-        if((isHours && value > 23) || (!isHours && value > 59)) {
-            __digitsPressed = ""
-            return
-        }
-
-        if(isHours)
-            date.setHours(value)
-        else
-            date.setMinutes(value)
-
-        internal.timePicked = date
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/Tooltip.qml b/prototype_2016/third_party/qml-material/src/components/Tooltip.qml
deleted file mode 100644
index 8ea259f..0000000
--- a/prototype_2016/third_party/qml-material/src/components/Tooltip.qml
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015 Jordan Neidlinger <jneidlinger@gmail.com>
- *               2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype Tooltip
-   \inqmlmodule Material
-
-   \brief A tooltip is a label that appears on hover and explains a non-text UI element.
-
-   To display a tooltip for your view, simply create an instance of Tooltip,
-   set the text property to your tooltip text, and then set the mouseArea property
-   to your MouseArea or Ink that will trigger the tooltip. If you use a MouseArea,
-   make sure hoverEnabled is set to true.
-
-   See the Material Design guidelines for more details:
-   http://www.google.com/design/spec/components/tooltips.html
- */
-Popover {
-    id: dropdown
-
-    property alias text: tooltipLabel.text
-
-    property MouseArea mouseArea
-
-    overlayLayer: "tooltipOverlayLayer"
-    globalMouseAreaEnabled: false
-
-    width: tooltipLabel.paintedWidth + 32 * Units.dp
-    implicitHeight: Device.isMobile ? 44 * Units.dp : 40 * Units.dp
-
-    backgroundColor: Qt.rgba(0.2, 0.2, 0.2, 0.9)
-
-    Timer {
-        id: timer
-
-        interval: 1000
-        onTriggered: open(mouseArea, 0, 4 * Units.dp)
-    }
-
-    Connections {
-        target: mouseArea
-
-        onReleased: {
-            if(showing)
-                close()
-        }
-
-        onPressAndHold: {
-            if(text !== "" && !showing)
-                open(mouseArea, 0, 4 * Units.dp)
-        }
-
-        onEntered: {
-            if(text !== "" && !showing)
-                timer.start()
-        }
-
-        onExited: {
-            timer.stop()
-
-            if(showing)
-                close()
-        }
-    }
-
-    Label {
-        id: tooltipLabel
-        style: "tooltip"
-        color: Theme.dark.textColor
-        anchors.centerIn: parent
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/Wave.qml b/prototype_2016/third_party/qml-material/src/components/Wave.qml
deleted file mode 100644
index 3a0afb4..0000000
--- a/prototype_2016/third_party/qml-material/src/components/Wave.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-/***** THIS FILE CANNOT BE RELICENSED UNDER THE MPL YET *****/
-
-/*
- * QML Material - An application framework implementing Material Design.
- * Copyright (C) 2014 Bogdan Cuza <bogdan.cuza@hotmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-
-/*!
-   \qmltype Wave
-   \inqmlmodule Material
-
-   \brief Provides a wave animation for transitioning between views of content.
- */
-Rectangle {
-    id: wave
-
-    property bool opened
-    property real size
-    property real initialX
-    property real initialY
-    property real abstractWidth: parent.width
-    property real abstractHeight: parent.height
-    property real diameter: 2*Math.sqrt(Math.pow(Math.max(initialX, abstractWidth - initialX), 2) + Math.pow(Math.max(initialY, abstractHeight - initialY), 2))
-
-    signal finished(bool opened)
-
-    function open(x, y) {
-        wave.initialX = x;
-        wave.initialY = y;
-        wave.opened = true;
-    }
-
-    function close(x, y) {
-        wave.initialX = x;
-        wave.initialY = y;
-        wave.opened = false;
-    }
-
-    width: size
-    height: size
-    radius: size/2
-    x: initialX - size/2
-    y: initialY - size/2
-
-    states: State {
-        name: "opened"
-        when: wave.opened
-
-        PropertyChanges {
-            target: wave
-            size: wave.diameter
-        }
-    }
-
-    transitions: Transition {
-        from: ""
-        to: "opened"
-        reversible: true
-
-        SequentialAnimation {
-            NumberAnimation {
-                property: "size"
-                easing.type: Easing.OutCubic
-            }
-            ScriptAction {
-                script: wave.finished(wave.opened)
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/components/components.qrc b/prototype_2016/third_party/qml-material/src/components/components.qrc
deleted file mode 100644
index 8d22f1e..0000000
--- a/prototype_2016/third_party/qml-material/src/components/components.qrc
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material">
-        <file>ActionButton.qml</file>
-        <file>Card.qml</file>
-        <file>DatePicker.qml</file>
-        <file>IconButton.qml</file>
-        <file>OverlayLayer.qml</file>
-        <file>OverlayView.qml</file>
-        <file>ProgressCircle.qml</file>
-        <file>Scrollbar.qml</file>
-        <file>Snackbar.qml</file>
-        <file>ThinDivider.qml</file>
-        <file>TimePicker.qml</file>
-        <file>Tooltip.qml</file>
-        <file>Wave.qml</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/controls/Action.qml b/prototype_2016/third_party/qml-material/src/controls/Action.qml
deleted file mode 100644
index a8ad35b..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/Action.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-/*!
-   \qmltype Action
-   \inqmlmodule Material
-
-   \brief Represents an action shown in an action bar, context menu, or list.
-
-   One of the most common uses of actions is displaying actions in the action bar of a page
-   using the \l Page::actions property. See the example for \l Page for more details.
- */
-Controls.Action {
-    id: action
-
-    /*!
-       Set to \c true to display a divider between this action and the next action. Used in lists
-       or context menus.
-     */
-    property bool hasDividerAfter
-
-    /*!
-       A URL pointing to an image to display as the icon. By default, this is
-       a special URL representing the icon named by \l iconName from the Material Design
-       icon collection or FontAwesome. The icon will be colorized using the specificed \l color,
-       unless you put ".color." in the filename, for example, "app-icon.color.svg".
-
-       \sa iconName
-       \sa Icon
-     */
-    property string iconSource: "icon://" + iconName
-
-    /*!
-       The text displayed for the action.
-     */
-    property string name
-
-    /*!
-      A short summary of the action, which may be displayed depending on the UI showing the
-      action. For example, a list of actions could display the summary as the secondary line of
-      text.
-     */
-    property string summary
-
-    /*!
-       Set to \c false to hide the action in the UI.
-     */
-    property bool visible: true
-
-    /*!
-       Set to \c true to rotate the icon 90 degrees on mouseover.
-     */
-    property bool hoverAnimation: false
-
-    property alias text: action.name
-    property alias tooltip: action.summary
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/Button.qml b/prototype_2016/third_party/qml-material/src/controls/Button.qml
deleted file mode 100644
index 1df4cac..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/Button.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
-import Material 0.3
-
-/*!
-   \qmltype Button
-   \inqmlmodule Material
-
-   \brief A push button with a text label.
-
-   A button clearly communicates what action will occur when the user touches it.
-   It consists of text, an image, or both, designed in accordance with your app’s color theme.
-
-   There are three standard types of buttons:
-
-   \list
-   \li Floating action button: A circular material button that lifts and displays
-       an ink reaction on press.
-   \li Raised button: A typically rectangular material button that lifts and
-       displays ink reactions on press.
-   \li Flat button: A button made of ink that displays ink reactions on press but
-       does not lift.
-   \endlist
-
-   This componenent provides raised and flat buttons. For floating action buttons,
-   see \l ActionButton.
-
-   Here are some example buttons:
-
-   \image buttons.png Button examples
-
-   See the \l {http://www.google.com/design/spec/components/buttons.html}
-   {Material Design spec} for details on how to use buttons.
-
-   \sa ActionButton
- */
-Controls.Button {
-    id: button
-
-    /*!
-       The background color of the button. By default, this is white for a raised
-       button and transparent for a flat button.
-     */
-    property color backgroundColor: elevation > 0 ? "white" : "transparent"
-
-    /*!
-       \internal
-
-       The context of the button, which is used to control special styling of
-       buttons in dialogs or snackbars.
-     */
-    property string context: "default" // or "dialog" or "snackbar"
-
-    /*!
-       Set to \c true if the button has a dark background color
-     */
-    property bool darkButton: Theme.isDarkColor(backgroundColor)
-
-    /*!
-       Set to \c true if the button is on a dark background
-     */
-    property bool darkBackground
-
-    /*!
-       The elevation of the button. Normally either \c 0 or \c 1.
-     */
-    property int elevation
-
-    /*!
-       The text color of the button. By default, this is calculated based on the background color,
-       but it can be customized to the theme's primary color or another color.
-     */
-    property color textColor: button.darkButton ? Theme.dark.textColor : Theme.light.textColor
-
-    style: MaterialStyle.ButtonStyle {}
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/CheckBox.qml b/prototype_2016/third_party/qml-material/src/controls/CheckBox.qml
deleted file mode 100644
index 87a54e9..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/CheckBox.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014 Jordan Neidlinger <JNeidlinger@gmail.com>
- *               2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
-import Material 0.3
-
-/*!
-   \qmltype CheckBox
-   \inqmlmodule Material
-
-   \brief Checkboxes allow the user to select multiple options from a set.
- */
-Controls.CheckBox {
-    id: checkBox
-
-    /*!
-       The checkbox color. By default this is the app's accent color
-     */
-    property color color: darkBackground ? Theme.dark.accentColor : Theme.light.accentColor
-
-    /*!
-       Set to \c true if the checkbox is on a dark background
-     */
-    property bool darkBackground
-
-    style: MaterialStyle.CheckBoxStyle {}
-
-    Ink {
-        anchors {
-            verticalCenter: parent.verticalCenter
-            left: parent.left
-            leftMargin: 4 * Units.dp
-        }
-
-        width: 40 * Units.dp
-        height: 40 * Units.dp
-        color: checkBox.checked ? Theme.alpha(checkBox.color, 0.20)
-                                : checkBox.darkBackground ? Qt.rgba(1,1,1,0.1)
-                                                          : Qt.rgba(0,0,0,0.1)
-        enabled: checkBox.enabled
-
-        circular: true
-        centered: true
-
-        onClicked: {
-          checkBox.checked = !checkBox.checked
-          checkBox.clicked()
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/Label.qml b/prototype_2016/third_party/qml-material/src/controls/Label.qml
deleted file mode 100644
index ad2cc8d..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/Label.qml
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype Label
-   \inqmlmodule Material
-
-   \brief A text label with many different font styles from Material Design.
- */
-Text {
-    id: label
-    property string style: "body1"
-
-    property var fontStyles: {
-        "display4": {
-            "size": 112,
-            "font": "light"
-        },
-
-        "display3": {
-            "size": 56,
-            "font": "regular"
-        },
-
-        "display2": {
-            "size": 45,
-            "font": "regular"
-        },
-
-        "display1": {
-            "size": 34,
-            "font": "regular"
-        },
-
-        "headline": {
-            "size": 24,
-            "font": "regular"
-        },
-
-        "title": {
-            "size": 20,
-            "font": "medium"
-        },
-
-        "dialog": {
-            "size": 18,
-            "size_desktop": 17,
-            "font": "regular"
-        },
-
-        "subheading": {
-            "size": 16,
-            "size_desktop": 15,
-            "font": "regular"
-        },
-
-        "body2": {
-            "size": 14,
-            "size_desktop": 13,
-            "font": "medium"
-        },
-
-        "body1": {
-            "size": 14,
-            "size_desktop": 13,
-            "font": "regular"
-        },
-
-        "caption": {
-            "size": 12,
-            "font": "regular"
-        },
-
-        "menu": {
-            "size": 14,
-            "size_desktop": 13,
-            "font": "medium"
-        },
-
-        "button": {
-            "size": 14,
-            "font": "medium"
-        },
-
-        "tooltip": {
-            "size_desktop": 13,
-            "size": 14,
-            "font": "medium"
-        }
-    }
-
-    property var fontInfo: fontStyles[style]
-
-    font.pixelSize: (!Device.isMobile && fontInfo.size_desktop
-            ? fontInfo.size_desktop : fontInfo.size) * Units.dp
-    font.family: "Roboto"
-    font.weight: {
-        var weight = fontInfo.font
-
-        if (weight === "medium") {
-            return Font.DemiBold
-        } else if (weight === "regular") {
-            return Font.Normal
-        } else if (weight === "light") {
-            return Font.Light
-        }
-    }
-
-    font.capitalization: style == "button" ? Font.AllUppercase : Font.MixedCase
-
-    color: Theme.light.textColor
-
-
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/ProgressBar.qml b/prototype_2016/third_party/qml-material/src/controls/ProgressBar.qml
deleted file mode 100644
index 027fed1..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/ProgressBar.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
-import Material 0.3
-
-/*!
-   \qmltype ProgressBar
-   \inqmlmodule Material
-
-   \brief Visual indicator of progress in some operation.
-*/
-
-Controls.ProgressBar {
-    /*!
-       The color for the progress bar. By default this is
-       the primary color defined in \l Theme::primaryColor
-     */
-    property color color: Theme.primaryColor
-
-    width: 200 * Units.dp
-    height: 4 * Units.dp
-
-    style: MaterialStyle.ProgressBarStyle {}
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/RadioButton.qml b/prototype_2016/third_party/qml-material/src/controls/RadioButton.qml
deleted file mode 100644
index 733f680..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/RadioButton.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2015 Jordan Neidlinger <JNeidlinger@gmail.com>
- *               2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
-import Material 0.3
-
-/*!
-   \qmltype RadioButton
-   \inqmlmodule Material
-
-   \brief Radio buttons allow the user to select one option from a set.
-*/
-Controls.RadioButton {
-    id: radioButton
-
-    /*!
-       The switch color. By default this is the app's accent color
-     */
-    property color color: darkBackground ? Theme.dark.accentColor
-                                         : Theme.light.accentColor
-
-    /*!
-       Set to \c true if the switch is on a dark background
-     */
-    property bool darkBackground
-
-    /*!
-       Set to \c true if the radio button can be toggled from checked to unchecked
-     */
-    property bool canToggle
-
-    style: MaterialStyle.RadioButtonStyle {}
-
-    Ink {
-        id: inkArea
-        anchors {
-            verticalCenter: parent.verticalCenter
-            left: parent.left
-            leftMargin: 4 * Units.dp
-        }
-
-        width: 40 * Units.dp
-        height: 40 * Units.dp
-        color: radioButton.checked ? Theme.alpha(radioButton.color, 0.20) : Qt.rgba(0,0,0,0.1)
-
-        onClicked: {
-            if(radioButton.canToggle || !radioButton.checked)
-                radioButton.checked = !radioButton.checked
-            radioButton.clicked()
-        }
-
-        circular: true
-        centered: true
-    }
-
-    MouseArea {
-        anchors {
-            left: inkArea.right
-            top: parent.top
-            right: parent.right
-            bottom: parent.bottom
-        }
-        onClicked: {
-            if(radioButton.canToggle || !radioButton.checked)
-                radioButton.checked = !radioButton.checked
-            radioButton.clicked()
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/Slider.qml b/prototype_2016/third_party/qml-material/src/controls/Slider.qml
deleted file mode 100644
index 8dfca9c..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/Slider.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014 Jordan Neidlinger <JNeidlinger@gmail.com>
- *               2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
-
-/*!
-   \qmltype Slider
-   \inqmlmodule Material
-
-   \brief Sliders let users select a value from a continuous or discrete range of
-   values by moving the slider thumb.
- */
-Controls.Slider {
-    id: slider
-
-    /*!
-       Set to \c true to enable a floating numeric value label above the slider knob
-     */
-    property bool numericValueLabel: false
-
-    /*!
-       Set to \c true to always show the numeric value label, even when not pressed
-     */
-    property bool alwaysShowValueLabel: false
-
-    /*!
-       Set to \c true if the switch is on a dark background
-     */
-    property bool darkBackground
-
-    /*!
-       The label to display within the value label knob, by default the sliders current value
-     */
-    property string knobLabel: slider.value.toFixed(0)
-
-    /*!
-       The diameter of the value label knob
-     */
-    property int knobDiameter: 32 * Units.dp
-
-    property color color: darkBackground ? Theme.dark.accentColor
-                                         : Theme.light.accentColor
-
-    tickmarksEnabled: false
-
-    implicitHeight: numericValueLabel ? 54 * Units.dp : 32 * Units.dp
-    implicitWidth: 200 * Units.dp
-
-    style: MaterialStyle.SliderStyle {}
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/Switch.qml b/prototype_2016/third_party/qml-material/src/controls/Switch.qml
deleted file mode 100644
index 8fd01b2..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/Switch.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles 1.3 as ControlStyles
-
-import Material 0.3
-
-/*!
-   \qmltype Switch
-   \inqmlmodule Material
-
-   \brief On/off switches toggle the state of a single settings option
- */
-Controls.Switch {
-    id: control
-
-    /*!
-       The switch color. By default this is the app's accent color
-     */
-    property color color: darkBackground ? Theme.dark.accentColor
-                                         : Theme.light.accentColor
-
-    /*!
-       Set to \c true if the switch is on a dark background
-     */
-    property bool darkBackground
-
-    style: ControlStyles.SwitchStyle {
-        handle: View {
-            width: 22 * Units.dp
-            height: 22 * Units.dp
-            radius: height / 2
-            elevation: 2
-            backgroundColor: control.enabled ? control.checked ? control.color
-                                                               : darkBackground ? "#BDBDBD"
-                                                                                : "#FAFAFA"
-                                             : darkBackground ? "#424242"
-                                                              : "#BDBDBD"
-        }
-
-        groove: Item {
-            width: 40 * Units.dp
-            height: 22 * Units.dp
-
-            Rectangle {
-                anchors.centerIn: parent
-                width: parent.width - 2 * Units.dp
-                height: 16 * Units.dp
-                radius: height / 2
-                color: control.enabled ? control.checked ? Theme.alpha(control.color, 0.5)
-                                                         : darkBackground ? Qt.rgba(1, 1, 1, 0.26)
-                                                                          : Qt.rgba(0, 0, 0, 0.26)
-                                       : darkBackground ? Qt.rgba(1, 1, 1, 0.12)
-                                                        : Qt.rgba(0, 0, 0, 0.12)
-
-                Behavior on color {
-                    ColorAnimation {
-                        duration: 200
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/Tab.qml b/prototype_2016/third_party/qml-material/src/controls/Tab.qml
deleted file mode 100644
index f01c802..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/Tab.qml
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-
-/*!
-   \qmltype Tab
-   \inqmlmodule Material
-
-   \brief Tab represents the content of a tab in a TabView.
-
-   This extends the QtQuick.Controls Tab component to add iconName and iconSource properties.
- */
-Controls.Tab {
-    id: tab
-
-        /*!
-       The icon displayed for the action. This can be a Material Design icon or an icon from
-       FontAwesome. See \l Icon from more details.
-     */
-        property string iconName
-
-        /*!
-       A URL pointing to an image to display as the icon. By default, this is
-       a special URL representing the icon named by \l iconName from the Material Design
-       icon collection or FontAwesome. The icon will be colorized using the specificed \l color,
-       unless you put ".color." in the filename, for example, "app-icon.color.svg".
-
-       \sa iconName
-       \sa Icon
-     */
-    property string iconSource: "icon://" + iconName
-
-    /*!
-     * Controls whether a close button will be shown for this tab.
-     *
-     * \since 0.3
-     */
-    property bool canRemove: false
-
-    /*!
-     * The index of the tab in a TabbedPage.
-     *
-     * \since 0.3
-     */
-    property int index
-
-    /*!
-     * \internal
-     * This holds the tab view this tab is in.
-     *
-     * \since 0.3
-     */
-    property Item __tabView
-
-    /*!
-     * This signal is emitted when the user tries to close the tab.
-     *
-     * This signal includes a close parameter. The close.accepted property is
-     * true by default so that the tab is allowed to close; but you can
-     * implement an onClosing handler and set \c{close.accepted = false} if you
-     * need to do something else before the tab can be closed.
-     *
-     * \since 0.3
-     */
-    signal closing(var close)
-
-    /*!
-     * Close the tab.
-     *
-     * When this method is called, or when the user tries to close the tab
-     * by its tab close button, the closing signal will be emitted. If there
-     * is no handler, or the handler does not revoke permission to close, the
-     * tab will subsequently close.
-     *
-     * \since 0.3
-     */
-    function close() {
-        var event = {accepted: true}
-        closing(event)
-
-        if (event.accepted) {
-            __tabView.removeTab(index)
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/TextField.qml b/prototype_2016/third_party/qml-material/src/controls/TextField.qml
deleted file mode 100644
index 2d0e689..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/TextField.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2014 Bogdan Cuza <bogdan.cuza@hotmail.com>
- *               2015 Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles.Material 0.1 as MaterialStyle
-import Material 0.3
-
-/*!
-   \qmltype TextField
-   \inqmlmodule Material
-
-   \brief A single-line text input control.
- */
-Controls.TextField {
-
-    property color color: Theme.accentColor
-    property color errorColor: Palette.colors["red"]["500"]
-    property string helperText
-    property bool floatingLabel: false
-    property bool hasError: characterLimit && length > characterLimit
-    property int characterLimit
-    property bool showBorder: true
-
-    style: MaterialStyle.TextFieldStyle {}
-}
diff --git a/prototype_2016/third_party/qml-material/src/controls/controls.qrc b/prototype_2016/third_party/qml-material/src/controls/controls.qrc
deleted file mode 100644
index 140f23b..0000000
--- a/prototype_2016/third_party/qml-material/src/controls/controls.qrc
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material">
-        <file>Action.qml</file>
-        <file>Button.qml</file>
-        <file>CheckBox.qml</file>
-        <file>Label.qml</file>
-        <file>ProgressBar.qml</file>
-        <file>RadioButton.qml</file>
-        <file>Slider.qml</file>
-        <file>Switch.qml</file>
-        <file>Tab.qml</file>
-        <file>TextField.qml</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/core/AwesomeIcon.qml b/prototype_2016/third_party/qml-material/src/core/AwesomeIcon.qml
deleted file mode 100644
index 26de884..0000000
--- a/prototype_2016/third_party/qml-material/src/core/AwesomeIcon.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import "awesome.js" as Awesome
-
-/*!
-   \qmltype AwesomeIcon
-   \inqmlmodule Material
-
-   \brief Displays an icon from the FontAwesome icon collection.
-
-   Most of the time, this is used indirectly by the \l Icon component, which
-   is used by action bars, list items, and many other common Material components.
- */
-Item {
-    id: widget
-
-    property string name
-    property bool rotate: widget.name.match(/.*-rotate/) !== null
-    property bool valid: text.implicitWidth > 0
-
-    property alias color: text.color
-    property int size: 24 * Units.dp
-
-    width: text.width
-    height: text.height
-
-    property bool shadow: false
-
-    property var icons: Awesome.map
-
-    property alias weight: text.font.weight
-
-    FontLoader { id: fontAwesome; source: Qt.resolvedUrl("FontAwesome.otf") }
-
-    Text {
-        id: text
-        anchors.centerIn: parent
-
-        property string name: widget.name.match(/.*-rotate/) !== null ? widget.name.substring(0, widget.name.length - 7) : widget.name
-
-        font.family: fontAwesome.name
-        font.weight: Font.Light
-        text: widget.icons.hasOwnProperty(name) ? widget.icons[name] : ""
-        color: Theme.light.iconColor
-        style: shadow ? Text.Raised : Text.Normal
-        styleColor: Qt.rgba(0,0,0,0.5)
-        font.pixelSize: widget.size
-
-        Behavior on color {
-            ColorAnimation { duration: 200 }
-        }
-
-        NumberAnimation on rotation {
-            running: widget.rotate
-            from: 0
-            to: 360
-            loops: Animation.Infinite
-            duration: 1100
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/FontAwesome.otf b/prototype_2016/third_party/qml-material/src/core/FontAwesome.otf
deleted file mode 100644
index d4de13e..0000000
--- a/prototype_2016/third_party/qml-material/src/core/FontAwesome.otf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/src/core/Icon.qml b/prototype_2016/third_party/qml-material/src/core/Icon.qml
deleted file mode 100644
index 1a54d1f..0000000
--- a/prototype_2016/third_party/qml-material/src/core/Icon.qml
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Bogdan Cuza <bogdan.cuza@hotmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Window 2.2
-import Material 0.3
-import QtGraphicalEffects 1.0
-
-/*!
-   \qmltype Icon
-   \inqmlmodule Material
-
-   \brief Displays an icon from the Material Design and FontAwesome icon collections.
-*/
-Item {
-    id: icon
-
-    property color color: Theme.light.iconColor
-    property real size: 24 * Units.dp
-
-    /*!
-       The name of the icon to display.
-
-       \sa source
-    */
-    property string name
-
-    /*!
-       A URL pointing to an image to display as the icon. By default, this is
-       a special URL representing the icon named by \l name from the Material Design
-       icon collection or FontAwesome. The icon will be colorized using the specified \l color,
-       unless you put ".color." in the filename, for example, "app-icon.color.svg".
-
-       \sa name
-      */
-    property string source: name ? "icon://" + name : ""
-
-    property bool valid: source.indexOf("icon://awesome/") == 0
-            ? awesomeIcon.valid : image.status == Image.Ready
-
-    width: size
-    height: size
-
-    property bool colorize: icon.source.indexOf(".color.") === -1
-
-    Image {
-        id: image
-
-        anchors.fill: parent
-        visible: source != "" && !colorize
-
-        source: {
-            if (icon.source.indexOf("icon://awesome/") == 0) {
-                return ''
-            } else if (icon.source.indexOf('icon://') === 0) {
-                var name = icon.source.substring(7)
-
-                if (name) {
-                    if (Theme.iconsRoot.indexOf('qrc') != -1)
-                        return Theme.iconsRoot + '/' + name + '.svg'
-                    else
-                        return Theme.iconsRoot + '/' + name.replace('/', '_') + '.svg'
-                } else {
-                    return ""
-                }
-            } else {
-                return icon.source
-            }
-        }
-
-        sourceSize {
-            width: size * Screen.devicePixelRatio
-            height: size * Screen.devicePixelRatio
-        }
-    }
-
-    ColorOverlay {
-        id: overlay
-
-        anchors.fill: parent
-        source: image
-        color: Theme.alpha(icon.color, 1)
-        cached: true
-        visible: image.source != "" && colorize
-        opacity: icon.color.a
-    }
-
-    AwesomeIcon {
-        id: awesomeIcon
-
-        anchors.centerIn: parent
-        size: icon.size * 0.9
-        visible: name != ""
-        color: icon.color
-
-        name: {
-            if (icon.source.indexOf("icon://awesome/") == 0) {
-                return icon.source.substring(15)
-            } else {
-                return ''
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/Ink.qml b/prototype_2016/third_party/qml-material/src/core/Ink.qml
deleted file mode 100644
index af73332..0000000
--- a/prototype_2016/third_party/qml-material/src/core/Ink.qml
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2014 Marcin Baszczewski
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype Ink
-   \inqmlmodule Material
-
-   \brief Represents a ripple ink animation used in buttons and many other components.
- */
-MouseArea {
-    id: view
-
-    clip: true
-    hoverEnabled: Device.hoverEnabled
-    z: 2
-
-    property int startRadius: circular ? width/10 : width/6
-    property int endRadius
-
-    property Item lastCircle
-    property color color: Qt.rgba(0,0,0,0.1)
-
-    property bool circular: false
-    property bool centered: false
-
-    property int focusWidth: width - 32 * Units.dp
-    property bool focused
-    property color focusColor: "transparent"
-
-    property bool showFocus: true
-
-    onPressed: {
-        createTapCircle(mouse.x, mouse.y)
-    }
-
-    onCanceled: {
-        lastCircle.removeCircle();
-    }
-
-    onReleased: {
-        lastCircle.removeCircle();
-    }
-
-    function createTapCircle(x, y) {
-        endRadius = centered ? width/2 : radius(x, y)
-        showFocus = false
-
-        lastCircle = tapCircle.createObject(view, {
-                                                       "circleX": centered ? width/2 : x,
-                                                       "circleY": centered ? height/2 : y
-                                                   });
-    }
-
-    function radius(x, y) {
-        var dist1 = Math.max(dist(x, y, 0, 0), dist(x, y, width, height))
-        var dist2 = Math.max(dist(x, y, width, 0), dist(x, y, 0, height))
-
-        return Math.max(dist1, dist2)
-    }
-
-    function dist(x1, y1, x2, y2) {
-        var xs = 0;
-        var ys = 0;
-
-        xs = x2 - x1;
-        xs = xs * xs;
-
-        ys = y2 - y1;
-        ys = ys * ys;
-
-        return Math.sqrt( xs + ys );
-    }
-
-    Rectangle {
-        id: focusBackground
-
-        anchors.fill: parent
-
-        color: Theme.isDarkColor(focusColor) && focusColor.a > 0
-                ? Qt.rgba(0,0,0,0.2) : Qt.rgba(0,0,0,0.1)
-
-        opacity: showFocus && focused ? 1 : 0
-
-        Behavior on opacity {
-            NumberAnimation { duration: 500; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    Rectangle {
-        id: focusCircle
-
-        anchors.centerIn: parent
-
-        width: focused
-                ? focusedState ? focusWidth
-                               : Math.min(parent.width - 8 * Units.dp, focusWidth + 12 * Units.dp)
-                : parent.width/5
-        height: width
-
-        radius: width/2
-
-        opacity: showFocus && focused ? 1 : 0
-
-        Behavior on opacity {
-            NumberAnimation { duration: 500; easing.type: Easing.InOutQuad }
-        }
-
-        Behavior on width {
-            NumberAnimation { duration: focusTimer.interval; }
-        }
-
-        color: focusColor.a === 0 ? Qt.rgba(1,1,1,0.4) : focusColor
-
-        property bool focusedState
-
-        Timer {
-            id: focusTimer
-            running: focused
-            repeat: true
-            interval: 800
-
-            onTriggered: focusCircle.focusedState = !focusCircle.focusedState
-        }
-    }
-
-    Component {
-        id: tapCircle
-
-        Item {
-            id: circleItem
-
-            anchors.fill: parent
-
-            property bool done
-
-            function removeCircle() {
-                done = true
-
-                if (fillSizeAnimation.running) {
-                    fillOpacityAnimation.stop()
-                    closeAnimation.start()
-
-                    circleItem.destroy(500);
-                } else {
-                    showFocus = true
-                    fadeAnimation.start();
-
-                    circleItem.destroy(300);
-                }
-            }
-
-            property real circleX
-            property real circleY
-
-            property bool closed
-
-            Item {
-                id: circleParent
-                anchors.fill: parent
-                visible: !circular
-
-                Rectangle {
-                    id: circleRectangle
-
-                    x: circleItem.circleX - radius
-                    y: circleItem.circleY - radius
-
-                    width: radius * 2
-                    height: radius * 2
-
-                    opacity: 0
-                    color: view.color
-
-                    NumberAnimation {
-                        id: fillSizeAnimation
-                        running: true
-
-                        target: circleRectangle; property: "radius"; duration: 500;
-                        from: startRadius; to: endRadius; easing.type: Easing.InOutQuad
-
-                        onStopped: {
-                            if (done)
-                                showFocus = true
-                        }
-                    }
-
-                    NumberAnimation {
-                        id: fillOpacityAnimation
-                        running: true
-
-                        target: circleRectangle; property: "opacity"; duration: 300;
-                        from: 0; to: 1; easing.type: Easing.InOutQuad
-                    }
-
-                    NumberAnimation {
-                        id: fadeAnimation
-
-                        target: circleRectangle; property: "opacity"; duration: 300;
-                        from: 1; to: 0; easing.type: Easing.InOutQuad
-                    }
-
-                    SequentialAnimation {
-                        id: closeAnimation
-
-                        NumberAnimation {
-                            target: circleRectangle; property: "opacity"; duration: 250;
-                            to: 1; easing.type: Easing.InOutQuad
-                        }
-
-                        NumberAnimation {
-                            target: circleRectangle; property: "opacity"; duration: 250;
-                            from: 1; to: 0; easing.type: Easing.InOutQuad
-                        }
-                    }
-                }
-            }
-
-            CircleMask {
-                anchors.fill: parent
-                source: circleParent
-                visible: circular
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/MaterialAnimation.qml b/prototype_2016/third_party/qml-material/src/core/MaterialAnimation.qml
deleted file mode 100644
index fda13ff..0000000
--- a/prototype_2016/third_party/qml-material/src/core/MaterialAnimation.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-pragma Singleton
-
-/*!
-   \qmltype MaterialAnimation
-   \inqmlmodule Material
-
-   \brief A singleton with common animation durations.
- */
-QtObject {
-    id: materialAnimation
-
-    property int pageTransitionDuration: 250
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/Object.qml b/prototype_2016/third_party/qml-material/src/core/Object.qml
deleted file mode 100644
index 995ee5f..0000000
--- a/prototype_2016/third_party/qml-material/src/core/Object.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-/*!
-   \qmltype Object
-   \inqmlmodule Material
-
-   \brief A base class for non-visual objects.
- */
-QtObject {
-    id: object
-    default property alias children: object.__childrenFix
-    property list<QtObject> __childrenFix: [QtObject {}]
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/Palette.qml b/prototype_2016/third_party/qml-material/src/core/Palette.qml
deleted file mode 100644
index 225bdfd..0000000
--- a/prototype_2016/third_party/qml-material/src/core/Palette.qml
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-pragma Singleton
-
-/*!
-   \qmltype Palette
-   \inqmlmodule Material
-
-   \brief Provides access to the Material Design color palette.
- */
-Object {
-    property var colors: {
-        'red': {
-            '500': '#F44336',
-            '50': '#FFEBEE',
-            '100': '#FFCDD2',
-            '200': '#EF9A9A',
-            '300': '#E57373',
-            '400': '#EF5350',
-            '600': '#E53935',
-            '700': '#D32F2F',
-            '800': '#C62828',
-            '900': '#B71C1C',
-            'A100': '#FF8A80',
-            'A200': '#FF5252',
-            'A400': '#FF1744',
-            'A700': '#D50000'
-        },
-        'pink': {
-            '500': '#E91E63',
-            '50': '#FCE4EC',
-            '100': '#F8BBD0',
-            '200': '#F48FB1',
-            '300': '#F06292',
-            '400': '#EC407A',
-            '600': '#D81B60',
-            '700': '#C2185B',
-            '800': '#AD1457',
-            '900': '#880E4F',
-            'A100': '#FF80AB',
-            'A200': '#FF4081',
-            'A400': '#F50057',
-            'A700': '#C51162'
-        },
-        'purple': {
-            '500': '#9C27B0',
-            '50': '#F3E5F5',
-            '100': '#E1BEE7',
-            '200': '#CE93D8',
-            '300': '#BA68C8',
-            '400': '#AB47BC',
-            '600': '#8E24AA',
-            '700': '#7B1FA2',
-            '800': '#6A1B9A',
-            '900': '#4A148C',
-            'A100': '#EA80FC',
-            'A200': '#E040FB',
-            'A400': '#D500F9',
-            'A700': '#AA00FF'
-        },
-        'deepPurple': {
-            '500': '#673AB7',
-            '50': '#EDE7F6',
-            '100': '#D1C4E9',
-            '200': '#B39DDB',
-            '300': '#9575CD',
-            '400': '#7E57C2',
-            '600': '#5E35B1',
-            '700': '#512DA8',
-            '800': '#4527A0',
-            '900': '#311B92',
-            'A100': '#B388FF',
-            'A200': '#7C4DFF',
-            'A400': '#651FFF',
-            'A700': '#6200EA'
-        },
-        'indigo': {
-            '500': '#3F51B5',
-            '50': '#E8EAF6',
-            '100': '#C5CAE9',
-            '200': '#9FA8DA',
-            '300': '#7986CB',
-            '400': '#5C6BC0',
-            '600': '#3949AB',
-            '700': '#303F9F',
-            '800': '#283593',
-            '900': '#1A237E',
-            'A100': '#8C9EFF',
-            'A200': '#536DFE',
-            'A400': '#3D5AFE',
-            'A700': '#304FFE'
-        },
-        'blue': {
-            '500': '#2196F3',
-            '50': '#E3F2FD',
-            '100': '#BBDEFB',
-            '200': '#90CAF9',
-            '300': '#64B5F6',
-            '400': '#42A5F5',
-            '600': '#1E88E5',
-            '700': '#1976D2',
-            '800': '#1565C0',
-            '900': '#0D47A1',
-            'A100': '#82B1FF',
-            'A200': '#448AFF',
-            'A400': '#2979FF',
-            'A700': '#2962FF'
-        },
-        'lightBlue': {
-            '500': '#03A9F4',
-            '50': '#E1F5FE',
-            '100': '#B3E5FC',
-            '200': '#81D4FA',
-            '300': '#4FC3F7',
-            '400': '#29B6F6',
-            '600': '#039BE5',
-            '700': '#0288D1',
-            '800': '#0277BD',
-            '900': '#01579B',
-            'A100': '#80D8FF',
-            'A200': '#40C4FF',
-            'A400': '#00B0FF',
-            'A700': '#0091EA'
-        },
-        'cyan': {
-            '500': '#00BCD4',
-            '50': '#E0F7FA',
-            '100': '#B2EBF2',
-            '200': '#80DEEA',
-            '300': '#4DD0E1',
-            '400': '#26C6DA',
-            '600': '#00ACC1',
-            '700': '#0097A7',
-            '800': '#00838F',
-            '900': '#006064',
-            'A100': '#84FFFF',
-            'A200': '#18FFFF',
-            'A400': '#00E5FF',
-            'A700': '#00B8D4'
-        },
-        'teal': {
-            '500': '#009688',
-            '50': '#E0F2F1',
-            '100': '#B2DFDB',
-            '200': '#80CBC4',
-            '300': '#4DB6AC',
-            '400': '#26A69A',
-            '600': '#00897B',
-            '700': '#00796B',
-            '800': '#00695C',
-            '900': '#004D40',
-            'A100': '#A7FFEB',
-            'A200': '#64FFDA',
-            'A400': '#1DE9B6',
-            'A700': '#00BFA5'
-        },
-        'green': {
-            '500': '#4CAF50',
-            '50': '#E8F5E9',
-            '100': '#C8E6C9',
-            '200': '#A5D6A7',
-            '300': '#81C784',
-            '400': '#66BB6A',
-            '600': '#43A047',
-            '700': '#388E3C',
-            '800': '#2E7D32',
-            '900': '#1B5E20',
-            'A100': '#B9F6CA',
-            'A200': '#69F0AE',
-            'A400': '#00E676',
-            'A700': '#00C853'
-        },
-        'lightGreen': {
-            '500': '#8BC34A',
-            '50': '#F1F8E9',
-            '100': '#DCEDC8',
-            '200': '#C5E1A5',
-            '300': '#AED581',
-            '400': '#9CCC65',
-            '600': '#7CB342',
-            '700': '#689F38',
-            '800': '#558B2F',
-            '900': '#33691E',
-            'A100': '#CCFF90',
-            'A200': '#B2FF59',
-            'A400': '#76FF03',
-            'A700': '#64DD17'
-        },
-        'lime': {
-            '500': '#CDDC39',
-            '50': '#F9FBE7',
-            '100': '#F0F4C3',
-            '200': '#E6EE9C',
-            '300': '#DCE775',
-            '400': '#D4E157',
-            '600': '#C0CA33',
-            '700': '#AFB42B',
-            '800': '#9E9D24',
-            '900': '#827717',
-            'A100': '#F4FF81',
-            'A200': '#EEFF41',
-            'A400': '#C6FF00',
-            'A700': '#AEEA00'
-        },
-        'yellow': {
-            '500': '#FFEB3B',
-            '50': '#FFFDE7',
-            '100': '#FFF9C4',
-            '200': '#FFF59D',
-            '300': '#FFF176',
-            '400': '#FFEE58',
-            '600': '#FDD835',
-            '700': '#FBC02D',
-            '800': '#F9A825',
-            '900': '#F57F17',
-            'A100': '#FFFF8D',
-            'A200': '#FFFF00',
-            'A400': '#FFEA00',
-            'A700': '#FFD600'
-        },
-        'amber': {
-            '500': '#FFC107',
-            '50': '#FFF8E1',
-            '100': '#FFECB3',
-            '200': '#FFE082',
-            '300': '#FFD54F',
-            '400': '#FFCA28',
-            '600': '#FFB300',
-            '700': '#FFA000',
-            '800': '#FF8F00',
-            '900': '#FF6F00',
-            'A100': '#FFE57F',
-            'A200': '#FFD740',
-            'A400': '#FFC400',
-            'A700': '#FFAB00'
-        },
-        'orange': {
-            '500': '#FF9800',
-            '50': '#FFF3E0',
-            '100': '#FFE0B2',
-            '200': '#FFCC80',
-            '300': '#FFB74D',
-            '400': '#FFA726',
-            '600': '#FB8C00',
-            '700': '#F57C00',
-            '800': '#EF6C00',
-            '900': '#E65100',
-            'A100': '#FFD180',
-            'A200': '#FFAB40',
-            'A400': '#FF9100',
-            'A700': '#FF6D00'
-        },
-        'deepOrange': {
-            '500': '#FF5722',
-            '50': '#FBE9E7',
-            '100': '#FFCCBC',
-            '200': '#FFAB91',
-            '300': '#FF8A65',
-            '400': '#FF7043',
-            '600': '#F4511E',
-            '700': '#E64A19',
-            '800': '#D84315',
-            '900': '#BF360C',
-            'A100': '#FF9E80',
-            'A200': '#FF6E40',
-            'A400': '#FF3D00',
-            'A700': '#DD2C00'
-        },
-        'grey': {
-            '500': '#9E9E9E',
-            '50': '#FAFAFA',
-            '100': '#F5F5F5',
-            '200': '#EEEEEE',
-            '300': '#E0E0E0',
-            '400': '#BDBDBD',
-            '600': '#757575',
-            '700': '#616161',
-            '800': '#424242',
-            '900': '#212121'
-        },
-        'blueGrey': {
-            '500': '#607D8B',
-            '50': '#ECEFF1',
-            '100': '#CFD8DC',
-            '200': '#B0BEC5',
-            '300': '#90A4AE',
-            '400': '#78909C',
-            '600': '#546E7A',
-            '700': '#455A64',
-            '800': '#37474F',
-            '900': '#263238'
-        },
-        'brown': {
-            '500': '#795548',
-            '50': '#EFEBE9',
-            '100': '#D7CCC8',
-            '200': '#BCAAA4',
-            '300': '#A1887F',
-            '400': '#8D6E63',
-            '600': '#6D4C41',
-            '700': '#5D4037',
-            '800': '#4E342E',
-            '900': '#3E2723'
-        },
-        'black': {
-            '500': '#000000'
-        },
-        'white': {
-            '500': '#FFFFFF'
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/PlatformExtensions.qml b/prototype_2016/third_party/qml-material/src/core/PlatformExtensions.qml
deleted file mode 100644
index 8e8f4c1..0000000
--- a/prototype_2016/third_party/qml-material/src/core/PlatformExtensions.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.0
-import Material 0.3
-
-Object {
-    id: platform
-
-    property var platformExtensions
-
-    property color decorationColor: Theme.primaryDarkColor
-    property var window: null
-    readonly property real multiplier: platformExtensions ? platformExtensions.multiplier : 1
-
-    onDecorationColorChanged: {
-        if (platformExtensions && color != "#000000") {
-            platformExtensions.decorationColor = decorationColor
-        }
-    }
-
-    onWindowChanged: {
-        if (platformExtensions) {
-            platformExtensions.window = window
-        }
-    }
-
-    Component.onCompleted: {
-        try {
-            var code = 'import Papyros.Material 0.1; PlatformExtensions {}'
-            platformExtensions = Qt.createQmlObject(code, platform, "PapyrosExtensions");
-
-            platformExtensions.window = window
-            if (decorationColor != "#000000")
-                platformExtensions.decorationColor = decorationColor
-        } catch (error) {
-            // Ignore the error; it only means that the Papyros
-            // platform extensions are not available
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/Theme.qml b/prototype_2016/third_party/qml-material/src/core/Theme.qml
deleted file mode 100644
index c8b2e95..0000000
--- a/prototype_2016/third_party/qml-material/src/core/Theme.qml
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-pragma Singleton
-
-/*!
-   \qmltype Theme
-   \inqmlmodule Material
-
-   \brief Provides access to standard colors that follow the Material Design specification.
-
-   See \l {http://www.google.com/design/spec/style/color.html#color-ui-color-application} for
-   details about choosing a color scheme for your application.
- */
-Object {
-    id: theme
-
-    /*!
-       The primary color used for the toolbar background unless a page specifies its own color.
-       This can be customized via the \l ApplicationWindow::theme group property. According to the
-       Material Design guidelines, this should normally be a 500 color from one of the color
-       palettes at \l {http://www.google.com/design/spec/style/color.html#color-color-palette}.
-     */
-    property color primaryColor: "#FAFAFA"
-
-    /*!
-       A darker version of the primary color used for the window titlebar (if client-side
-       decorations are not used), unless a \l Page specifies its own primary and primary dark
-       colors. This can be customized via the \l ApplicationWindow::theme group property. According
-       to the Material Design guidelines, this should normally be the 700 color version of your
-       aplication's primary color, taken from one of the color palettes at
-       \l {http://www.google.com/design/spec/style/color.html#color-color-palette}.
-    */
-    property color primaryDarkColor: Qt.rgba(0,0,0, 0.54)
-
-    /*!
-       The accent color complements the primary color, and is used for any primary action buttons
-       along with switches, sliders, and other components that do not specifically set a color.
-       This can be customized via the  \l ApplicationWindow::theme group property. According
-       to the Material Design guidelines, this should taken from a second color palette that
-       complements the primary color palette at
-       \l {http://www.google.com/design/spec/style/color.html#color-color-palette}.
-    */
-    property color accentColor: "#2196F3"
-
-    /*!
-       The default background color for the application.
-     */
-    property color backgroundColor: "#f3f3f3"
-
-    /*!
-       The color of the higlight indicator for selected tabs. By default this is the accent color,
-       but it can also be white (for a dark primary color/toolbar background).
-     */
-    property color tabHighlightColor: accentColor
-
-    /*!
-       Standard colors specifically meant for light surfaces. This includes text colors along with
-       a light version of the accent color.
-     */
-    property ThemePalette light: ThemePalette {
-        light: true
-    }
-
-    /*!
-       Standard colors specifically meant for dark surfaces. This includes text colors along with
-       a dark version of the accent color.
-    */
-    property ThemePalette dark: ThemePalette {
-        light: false
-    }
-
-    property string iconsRoot: "qrc:/icons"
-
-    /*!
-       A utility method for changing the alpha on colors. Returns a new object, and does not modify
-       the original color at all.
-     */
-    function alpha(color, alpha) {
-        // Make sure we have a real color object to work with (versus a string like "#ccc")
-        var realColor = Qt.darker(color, 1)
-
-        realColor.a = alpha
-
-        return realColor
-    }
-
-    /*!
-       Select a color depending on whether the background is light or dark.
-
-       \c lightColor is the color used on a light background.
-
-       \c darkColor is the color used on a dark background.
-     */
-    function lightDark(background, lightColor, darkColor) {
-        return isDarkColor(background) ? darkColor : lightColor
-    }
-
-    /*!
-       Returns true if the color is dark and should have light content on top
-     */
-    function isDarkColor(background) {
-        var temp = Qt.darker(background, 1)
-
-        var a = 1 - ( 0.299 * temp.r + 0.587 * temp.g + 0.114 * temp.b);
-
-        return temp.a > 0 && a >= 0.3
-    }
-
-    Component.onCompleted: {
-        try {
-            var code = 'import Material.Fonts 0.1; MaterialFontLoader {}'
-            Qt.createQmlObject(code, theme, "MaterialFontLoader")
-        } catch (error) {
-            // Ignore the error; it only means that the fonts were not enabled
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/ThemePalette.qml b/prototype_2016/third_party/qml-material/src/core/ThemePalette.qml
deleted file mode 100644
index 1b90e23..0000000
--- a/prototype_2016/third_party/qml-material/src/core/ThemePalette.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-/*!
-   \qmltype Theme
-   \inqmlmodule Material
-
-   \brief Provides access to standard colors that follow the Material Design specification, but
-   specifically designed for light or dark surfaces.
-
-   See \l {http://www.google.com/design/spec/style/color.html#color-ui-color-application} for
-   details about choosing a color scheme for your application.
- */
-QtObject {
-    id: palette
-
-    property bool light
-
-    readonly property color textColor: light ? shade(0.87) : shade(1)
-    readonly property color subTextColor: light ? shade(0.54) : shade(0.70)
-    readonly property color iconColor: light ? subTextColor : textColor
-    readonly property color disabledColor: light ? shade(0.38) : shade(0.50)
-    readonly property color hintColor: disabledColor
-    readonly property color dividerColor: shade(0.12)
-
-    /*!
-       A version of the accent color specifically for lighter or darker backgrounds. This is
-       normally the same as the global \l Theme::accentColor, but for some application's color
-       schemes, the accent color is too dark or too light  and a lighter/darker version is needed
-       for some surfaces. This can be customized via the \l ApplicationWindow::theme group property.
-       According to the Material Design guidelines, this should taken from a second color palette
-       that complements the primary color palette at
-       \l {http://www.google.com/design/spec/style/color.html#color-color-palette}.
-    */
-    property color accentColor: theme.accentColor
-
-    function shade(alpha) {
-        if (light) {
-            return Qt.rgba(0,0,0,alpha)
-        } else {
-            return Qt.rgba(1,1,1,alpha)
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/UnitsHelper.qml b/prototype_2016/third_party/qml-material/src/core/UnitsHelper.qml
deleted file mode 100644
index 3f0b17d..0000000
--- a/prototype_2016/third_party/qml-material/src/core/UnitsHelper.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-/*!
-   \qmltype Units
-   \inqmlmodule Material
-
-   \brief Provides access to screen-independent Units known as DPs (device-independent pixels).
-
-   This singleton provides methods for building a user interface that automatically scales based on
-   the screen density. Use the \l Units::dp function wherever you need to specify a screen size,
-   and your app will automatically scale to any screen density.
-
-   Here is a short example:
-
-   \qml
-   import QtQuick 2.4
-   import Material 0.3
-
-   Rectangle {
-       width: dp(100)
-       height: dp(80)
-
-       Label {
-           text:"A"
-           font.pixelSize: dp(50)
-       }
-   }
-   \endqml
-*/
-Object {
-    id: units
-
-    /*!
-       This is the standard function to use for accessing device-independent pixels. You should use
-       this anywhere you need to refer to distances on the screen.
-     */
-    function dp(number) {
-        return Math.round(number * dp);
-    }
-
-    function gu(number) {
-        return dp(number * Device.gridUnit)
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/View.qml b/prototype_2016/third_party/qml-material/src/core/View.qml
deleted file mode 100644
index 6de175b..0000000
--- a/prototype_2016/third_party/qml-material/src/core/View.qml
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtGraphicalEffects 1.0
-import Material 0.3
-
-/*!
-   \qmltype View
-   \inqmlmodule Material
-
-   \brief Provides a base view component, with support for Material Design elevation,
-   background colors, and tinting.
- */
-Item {
-    id: item
-    width: 100
-    height: 62
-
-    property int elevation: 0
-    property real radius: 0
-
-    property string style: "default"
-
-    property color backgroundColor: elevation > 0 ? "white" : "transparent"
-    property color tintColor: "transparent"
-
-    property alias border: rect.border
-
-    property bool fullWidth
-    property bool fullHeight
-
-    property alias clipContent: rect.clip
-
-    default property alias data: rect.data
-
-    property bool elevationInverted: false
-
-    property var topShadow: [
-        {
-            "opacity": 0,
-            "offset": 0,
-            "blur": 0
-        },
-
-        {
-            "opacity": 0.12,
-            "offset": 1 * Units.dp,
-            "blur": 1.5 * Units.dp
-        },
-
-        {
-            "opacity": 0.16,
-            "offset": 3 * Units.dp,
-            "blur": 3 * Units.dp
-        },
-
-        {
-            "opacity": 0.19,
-            "offset": 10 * Units.dp,
-            "blur": 10 * Units.dp
-        },
-
-        {
-            "opacity": 0.25,
-            "offset": 14 * Units.dp,
-            "blur": 14 * Units.dp
-        },
-
-        {
-            "opacity": 0.30,
-            "offset": 19 * Units.dp,
-            "blur": 19 * Units.dp
-        }
-    ]
-
-    property var bottomShadow: [
-        {
-            "opacity": 0,
-            "offset": 0 * Units.dp,
-            "blur": 0 * Units.dp
-        },
-
-        {
-            "opacity": 0.24,
-            "offset": 1 * Units.dp,
-            "blur": 1 * Units.dp
-        },
-
-        {
-            "opacity": 0.23,
-            "offset": 3 * Units.dp,
-            "blur": 3 * Units.dp
-        },
-
-        {
-            "opacity": 0.23,
-            "offset": 6 * Units.dp,
-            "blur": 3 * Units.dp
-        },
-
-        {
-            "opacity": 0.22,
-            "offset": 10 * Units.dp,
-            "blur": 5 * Units.dp
-        },
-
-        {
-            "opacity": 0.22,
-            "offset": 15 * Units.dp,
-            "blur": 6 * Units.dp
-        }
-    ]
-
-    RectangularGlow {
-        property var elevationInfo: bottomShadow[Math.min(elevation, 5)]
-        property real horizontalShadowOffset: elevationInfo.offset * Math.sin((2 * Math.PI) * (parent.rotation / 360.0))
-        property real verticalShadowOffset: elevationInfo.offset * Math.cos((2 * Math.PI) * (parent.rotation / 360.0))
-
-        anchors.centerIn: parent
-        width: parent.width + (fullWidth ? 10 * Units.dp : 0)
-        height: parent.height + (fullHeight ? 20 * Units.dp : 0)
-        anchors.horizontalCenterOffset: horizontalShadowOffset * (elevationInverted ? -1 : 1)
-        anchors.verticalCenterOffset: verticalShadowOffset * (elevationInverted ? -1 : 1)
-        glowRadius: elevationInfo.blur
-        opacity: elevationInfo.opacity
-        spread: 0.05
-        color: "black"
-        cornerRadius: item.radius + glowRadius * 2.5
-        //visible: parent.opacity == 1
-    }
-
-    RectangularGlow {
-        property var elevationInfo: topShadow[Math.min(elevation, 5)]
-        property real horizontalShadowOffset: elevationInfo.offset * Math.sin((2 * Math.PI) * (parent.rotation / 360.0))
-        property real verticalShadowOffset: elevationInfo.offset * Math.cos((2 * Math.PI) * (parent.rotation / 360.0))
-
-        anchors.centerIn: parent
-        width: parent.width + (fullWidth ? 10 * Units.dp : 0)
-        height: parent.height + (fullHeight ? 20 * Units.dp : 0)
-        anchors.horizontalCenterOffset: horizontalShadowOffset * (elevationInverted ? -1 : 1)
-        anchors.verticalCenterOffset: verticalShadowOffset * (elevationInverted ? -1 : 1)
-        glowRadius: elevationInfo.blur
-        opacity: elevationInfo.opacity
-        spread: 0.05
-        color: "black"
-        cornerRadius: item.radius + glowRadius * 2.5
-        //visible: parent.opacity == 1
-    }
-
-    Rectangle {
-        id: rect
-        anchors.fill: parent
-        color: Qt.tint(backgroundColor, tintColor)
-        radius: item.radius
-        antialiasing: parent.rotation || radius > 0 ? true : false
-        clip: true
-
-        Behavior on color {
-            ColorAnimation { duration: 200 }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/awesome.js b/prototype_2016/third_party/qml-material/src/core/awesome.js
deleted file mode 100644
index f53cbe5..0000000
--- a/prototype_2016/third_party/qml-material/src/core/awesome.js
+++ /dev/null
@@ -1,722 +0,0 @@
-
-.pragma library
-
-var map = {
-    '500px': '\uf26e',
-    'adjust': '\uf042',
-    'adn': '\uf170',
-    'align_center': '\uf037',
-    'align_justify': '\uf039',
-    'align_left': '\uf036',
-    'align_right': '\uf038',
-    'amazon': '\uf270',
-    'ambulance': '\uf0f9',
-    'american_sign_language_interpreting': '\uf2a3',
-    'anchor': '\uf13d',
-    'android': '\uf17b',
-    'angellist': '\uf209',
-    'angle_double_down': '\uf103',
-    'angle_double_left': '\uf100',
-    'angle_double_right': '\uf101',
-    'angle_double_up': '\uf102',
-    'angle_down': '\uf107',
-    'angle_left': '\uf104',
-    'angle_right': '\uf105',
-    'angle_up': '\uf106',
-    'apple': '\uf179',
-    'archive': '\uf187',
-    'area_chart': '\uf1fe',
-    'arrow_circle_down': '\uf0ab',
-    'arrow_circle_left': '\uf0a8',
-    'arrow_circle_o_down': '\uf01a',
-    'arrow_circle_o_left': '\uf190',
-    'arrow_circle_o_right': '\uf18e',
-    'arrow_circle_o_up': '\uf01b',
-    'arrow_circle_right': '\uf0a9',
-    'arrow_circle_up': '\uf0aa',
-    'arrow_down': '\uf063',
-    'arrow_left': '\uf060',
-    'arrow_right': '\uf061',
-    'arrow_up': '\uf062',
-    'arrows': '\uf047',
-    'arrows_alt': '\uf0b2',
-    'arrows_h': '\uf07e',
-    'arrows_v': '\uf07d',
-    'asl_interpreting': '\uf2a3',
-    'assistive_listening_systems': '\uf2a2',
-    'asterisk': '\uf069',
-    'at': '\uf1fa',
-    'audio_description': '\uf29e',
-    'automobile': '\uf1b9',
-    'backward': '\uf04a',
-    'balance_scale': '\uf24e',
-    'ban': '\uf05e',
-    'bank': '\uf19c',
-    'bar_chart': '\uf080',
-    'bar_chart_o': '\uf080',
-    'barcode': '\uf02a',
-    'bars': '\uf0c9',
-    'battery_0': '\uf244',
-    'battery_1': '\uf243',
-    'battery_2': '\uf242',
-    'battery_3': '\uf241',
-    'battery_4': '\uf240',
-    'battery_empty': '\uf244',
-    'battery_full': '\uf240',
-    'battery_half': '\uf242',
-    'battery_quarter': '\uf243',
-    'battery_three_quarters': '\uf241',
-    'bed': '\uf236',
-    'beer': '\uf0fc',
-    'behance': '\uf1b4',
-    'behance_square': '\uf1b5',
-    'bell': '\uf0f3',
-    'bell_o': '\uf0a2',
-    'bell_slash': '\uf1f6',
-    'bell_slash_o': '\uf1f7',
-    'bicycle': '\uf206',
-    'binoculars': '\uf1e5',
-    'birthday_cake': '\uf1fd',
-    'bitbucket': '\uf171',
-    'bitbucket_square': '\uf172',
-    'bitcoin': '\uf15a',
-    'black_tie': '\uf27e',
-    'blind': '\uf29d',
-    'bluetooth': '\uf293',
-    'bluetooth_b': '\uf294',
-    'bold': '\uf032',
-    'bolt': '\uf0e7',
-    'bomb': '\uf1e2',
-    'book': '\uf02d',
-    'bookmark': '\uf02e',
-    'bookmark_o': '\uf097',
-    'braille': '\uf2a1',
-    'briefcase': '\uf0b1',
-    'btc': '\uf15a',
-    'bug': '\uf188',
-    'building': '\uf1ad',
-    'building_o': '\uf0f7',
-    'bullhorn': '\uf0a1',
-    'bullseye': '\uf140',
-    'bus': '\uf207',
-    'buysellads': '\uf20d',
-    'cab': '\uf1ba',
-    'calculator': '\uf1ec',
-    'calendar': '\uf073',
-    'calendar_check_o': '\uf274',
-    'calendar_minus_o': '\uf272',
-    'calendar_o': '\uf133',
-    'calendar_plus_o': '\uf271',
-    'calendar_times_o': '\uf273',
-    'camera': '\uf030',
-    'camera_retro': '\uf083',
-    'car': '\uf1b9',
-    'caret_down': '\uf0d7',
-    'caret_left': '\uf0d9',
-    'caret_right': '\uf0da',
-    'caret_square_o_down': '\uf150',
-    'caret_square_o_left': '\uf191',
-    'caret_square_o_right': '\uf152',
-    'caret_square_o_up': '\uf151',
-    'caret_up': '\uf0d8',
-    'cart_arrow_down': '\uf218',
-    'cart_plus': '\uf217',
-    'cc': '\uf20a',
-    'cc_amex': '\uf1f3',
-    'cc_diners_club': '\uf24c',
-    'cc_discover': '\uf1f2',
-    'cc_jcb': '\uf24b',
-    'cc_mastercard': '\uf1f1',
-    'cc_paypal': '\uf1f4',
-    'cc_stripe': '\uf1f5',
-    'cc_visa': '\uf1f0',
-    'certificate': '\uf0a3',
-    'chain': '\uf0c1',
-    'chain_broken': '\uf127',
-    'check': '\uf00c',
-    'check_circle': '\uf058',
-    'check_circle_o': '\uf05d',
-    'check_square': '\uf14a',
-    'check_square_o': '\uf046',
-    'chevron_circle_down': '\uf13a',
-    'chevron_circle_left': '\uf137',
-    'chevron_circle_right': '\uf138',
-    'chevron_circle_up': '\uf139',
-    'chevron_down': '\uf078',
-    'chevron_left': '\uf053',
-    'chevron_right': '\uf054',
-    'chevron_up': '\uf077',
-    'child': '\uf1ae',
-    'chrome': '\uf268',
-    'circle': '\uf111',
-    'circle_o': '\uf10c',
-    'circle_o_notch': '\uf1ce',
-    'circle_thin': '\uf1db',
-    'clipboard': '\uf0ea',
-    'clock_o': '\uf017',
-    'clone': '\uf24d',
-    'close': '\uf00d',
-    'cloud': '\uf0c2',
-    'cloud_download': '\uf0ed',
-    'cloud_upload': '\uf0ee',
-    'cny': '\uf157',
-    'code': '\uf121',
-    'code_fork': '\uf126',
-    'codepen': '\uf1cb',
-    'codiepie': '\uf284',
-    'coffee': '\uf0f4',
-    'cog': '\uf013',
-    'cogs': '\uf085',
-    'columns': '\uf0db',
-    'comment': '\uf075',
-    'comment_o': '\uf0e5',
-    'commenting': '\uf27a',
-    'commenting_o': '\uf27b',
-    'comments': '\uf086',
-    'comments_o': '\uf0e6',
-    'compass': '\uf14e',
-    'compress': '\uf066',
-    'connectdevelop': '\uf20e',
-    'contao': '\uf26d',
-    'copy': '\uf0c5',
-    'copyright': '\uf1f9',
-    'creative_commons': '\uf25e',
-    'credit_card': '\uf09d',
-    'credit_card_alt': '\uf283',
-    'crop': '\uf125',
-    'crosshairs': '\uf05b',
-    'css3': '\uf13c',
-    'cube': '\uf1b2',
-    'cubes': '\uf1b3',
-    'cut': '\uf0c4',
-    'cutlery': '\uf0f5',
-    'dashboard': '\uf0e4',
-    'dashcube': '\uf210',
-    'database': '\uf1c0',
-    'deaf': '\uf2a4',
-    'deafness': '\uf2a4',
-    'dedent': '\uf03b',
-    'delicious': '\uf1a5',
-    'desktop': '\uf108',
-    'deviantart': '\uf1bd',
-    'diamond': '\uf219',
-    'digg': '\uf1a6',
-    'dollar': '\uf155',
-    'dot_circle_o': '\uf192',
-    'download': '\uf019',
-    'dribbble': '\uf17d',
-    'dropbox': '\uf16b',
-    'drupal': '\uf1a9',
-    'edge': '\uf282',
-    'edit': '\uf044',
-    'eject': '\uf052',
-    'ellipsis_h': '\uf141',
-    'ellipsis_v': '\uf142',
-    'empire': '\uf1d1',
-    'envelope': '\uf0e0',
-    'envelope_o': '\uf003',
-    'envelope_square': '\uf199',
-    'envira': '\uf299',
-    'eraser': '\uf12d',
-    'eur': '\uf153',
-    'euro': '\uf153',
-    'exchange': '\uf0ec',
-    'exclamation': '\uf12a',
-    'exclamation_circle': '\uf06a',
-    'exclamation_triangle': '\uf071',
-    'expand': '\uf065',
-    'expeditedssl': '\uf23e',
-    'external_link': '\uf08e',
-    'external_link_square': '\uf14c',
-    'eye': '\uf06e',
-    'eye_slash': '\uf070',
-    'eyedropper': '\uf1fb',
-    'fa': '\uf2b4',
-    'facebook': '\uf09a',
-    'facebook_f': '\uf09a',
-    'facebook_official': '\uf230',
-    'facebook_square': '\uf082',
-    'fast_backward': '\uf049',
-    'fast_forward': '\uf050',
-    'fax': '\uf1ac',
-    'feed': '\uf09e',
-    'female': '\uf182',
-    'fighter_jet': '\uf0fb',
-    'file': '\uf15b',
-    'file_archive_o': '\uf1c6',
-    'file_audio_o': '\uf1c7',
-    'file_code_o': '\uf1c9',
-    'file_excel_o': '\uf1c3',
-    'file_image_o': '\uf1c5',
-    'file_movie_o': '\uf1c8',
-    'file_o': '\uf016',
-    'file_pdf_o': '\uf1c1',
-    'file_photo_o': '\uf1c5',
-    'file_picture_o': '\uf1c5',
-    'file_powerpoint_o': '\uf1c4',
-    'file_sound_o': '\uf1c7',
-    'file_text': '\uf15c',
-    'file_text_o': '\uf0f6',
-    'file_video_o': '\uf1c8',
-    'file_word_o': '\uf1c2',
-    'file_zip_o': '\uf1c6',
-    'files_o': '\uf0c5',
-    'film': '\uf008',
-    'filter': '\uf0b0',
-    'fire': '\uf06d',
-    'fire_extinguisher': '\uf134',
-    'firefox': '\uf269',
-    'first_order': '\uf2b0',
-    'flag': '\uf024',
-    'flag_checkered': '\uf11e',
-    'flag_o': '\uf11d',
-    'flash': '\uf0e7',
-    'flask': '\uf0c3',
-    'flickr': '\uf16e',
-    'floppy_o': '\uf0c7',
-    'folder': '\uf07b',
-    'folder_o': '\uf114',
-    'folder_open': '\uf07c',
-    'folder_open_o': '\uf115',
-    'font': '\uf031',
-    'font_awesome': '\uf2b4',
-    'fonticons': '\uf280',
-    'fort_awesome': '\uf286',
-    'forumbee': '\uf211',
-    'forward': '\uf04e',
-    'foursquare': '\uf180',
-    'frown_o': '\uf119',
-    'futbol_o': '\uf1e3',
-    'gamepad': '\uf11b',
-    'gavel': '\uf0e3',
-    'gbp': '\uf154',
-    'ge': '\uf1d1',
-    'gear': '\uf013',
-    'gears': '\uf085',
-    'get_pocket': '\uf265',
-    'gg': '\uf260',
-    'gg_circle': '\uf261',
-    'gift': '\uf06b',
-    'git': '\uf1d3',
-    'git_square': '\uf1d2',
-    'github': '\uf09b',
-    'github_alt': '\uf113',
-    'github_square': '\uf092',
-    'gitlab': '\uf296',
-    'gittip': '\uf184',
-    'glass': '\uf000',
-    'glide': '\uf2a5',
-    'glide_g': '\uf2a6',
-    'globe': '\uf0ac',
-    'google': '\uf1a0',
-    'google_plus': '\uf0d5',
-    'google_plus_circle': '\uf2b3',
-    'google_plus_official': '\uf2b3',
-    'google_plus_square': '\uf0d4',
-    'google_wallet': '\uf1ee',
-    'graduation_cap': '\uf19d',
-    'gratipay': '\uf184',
-    'group': '\uf0c0',
-    'h_square': '\uf0fd',
-    'hacker_news': '\uf1d4',
-    'hand_grab_o': '\uf255',
-    'hand_lizard_o': '\uf258',
-    'hand_o_down': '\uf0a7',
-    'hand_o_left': '\uf0a5',
-    'hand_o_right': '\uf0a4',
-    'hand_o_up': '\uf0a6',
-    'hand_paper_o': '\uf256',
-    'hand_peace_o': '\uf25b',
-    'hand_pointer_o': '\uf25a',
-    'hand_rock_o': '\uf255',
-    'hand_scissors_o': '\uf257',
-    'hand_spock_o': '\uf259',
-    'hand_stop_o': '\uf256',
-    'hard_of_hearing': '\uf2a4',
-    'hashtag': '\uf292',
-    'hdd_o': '\uf0a0',
-    'header': '\uf1dc',
-    'headphones': '\uf025',
-    'heart': '\uf004',
-    'heart_o': '\uf08a',
-    'heartbeat': '\uf21e',
-    'history': '\uf1da',
-    'home': '\uf015',
-    'hospital_o': '\uf0f8',
-    'hotel': '\uf236',
-    'hourglass': '\uf254',
-    'hourglass_1': '\uf251',
-    'hourglass_2': '\uf252',
-    'hourglass_3': '\uf253',
-    'hourglass_end': '\uf253',
-    'hourglass_half': '\uf252',
-    'hourglass_o': '\uf250',
-    'hourglass_start': '\uf251',
-    'houzz': '\uf27c',
-    'html5': '\uf13b',
-    'i_cursor': '\uf246',
-    'ils': '\uf20b',
-    'image': '\uf03e',
-    'inbox': '\uf01c',
-    'indent': '\uf03c',
-    'industry': '\uf275',
-    'info': '\uf129',
-    'info_circle': '\uf05a',
-    'inr': '\uf156',
-    'instagram': '\uf16d',
-    'institution': '\uf19c',
-    'internet_explorer': '\uf26b',
-    'ioxhost': '\uf208',
-    'italic': '\uf033',
-    'joomla': '\uf1aa',
-    'jpy': '\uf157',
-    'jsfiddle': '\uf1cc',
-    'key': '\uf084',
-    'keyboard_o': '\uf11c',
-    'krw': '\uf159',
-    'language': '\uf1ab',
-    'laptop': '\uf109',
-    'lastfm': '\uf202',
-    'lastfm_square': '\uf203',
-    'leaf': '\uf06c',
-    'leanpub': '\uf212',
-    'legal': '\uf0e3',
-    'lemon_o': '\uf094',
-    'level_down': '\uf149',
-    'level_up': '\uf148',
-    'life_bouy': '\uf1cd',
-    'life_buoy': '\uf1cd',
-    'life_ring': '\uf1cd',
-    'life_saver': '\uf1cd',
-    'lightbulb_o': '\uf0eb',
-    'line_chart': '\uf201',
-    'link': '\uf0c1',
-    'linkedin': '\uf0e1',
-    'linkedin_square': '\uf08c',
-    'linux': '\uf17c',
-    'list': '\uf03a',
-    'list_alt': '\uf022',
-    'list_ol': '\uf0cb',
-    'list_ul': '\uf0ca',
-    'location_arrow': '\uf124',
-    'lock': '\uf023',
-    'long_arrow_down': '\uf175',
-    'long_arrow_left': '\uf177',
-    'long_arrow_right': '\uf178',
-    'long_arrow_up': '\uf176',
-    'low_vision': '\uf2a8',
-    'magic': '\uf0d0',
-    'magnet': '\uf076',
-    'mail_forward': '\uf064',
-    'mail_reply': '\uf112',
-    'mail_reply_all': '\uf122',
-    'male': '\uf183',
-    'map': '\uf279',
-    'map_marker': '\uf041',
-    'map_o': '\uf278',
-    'map_pin': '\uf276',
-    'map_signs': '\uf277',
-    'maxcdn': '\uf136',
-    'meanpath': '\uf20c',
-    'medium': '\uf23a',
-    'medkit': '\uf0fa',
-    'meh_o': '\uf11a',
-    'microphone': '\uf130',
-    'microphone_slash': '\uf131',
-    'minus': '\uf068',
-    'minus_circle': '\uf056',
-    'minus_square': '\uf146',
-    'minus_square_o': '\uf147',
-    'mixcloud': '\uf289',
-    'mobile': '\uf10b',
-    'mobile_phone': '\uf10b',
-    'modx': '\uf285',
-    'money': '\uf0d6',
-    'moon_o': '\uf186',
-    'mortar_board': '\uf19d',
-    'motorcycle': '\uf21c',
-    'mouse_pointer': '\uf245',
-    'music': '\uf001',
-    'navicon': '\uf0c9',
-    'newspaper_o': '\uf1ea',
-    'object_group': '\uf247',
-    'object_ungroup': '\uf248',
-    'odnoklassniki': '\uf263',
-    'odnoklassniki_square': '\uf264',
-    'opencart': '\uf23d',
-    'openid': '\uf19b',
-    'opera': '\uf26a',
-    'optin_monster': '\uf23c',
-    'outdent': '\uf03b',
-    'pagelines': '\uf18c',
-    'paint_brush': '\uf1fc',
-    'paper_plane': '\uf1d8',
-    'paper_plane_o': '\uf1d9',
-    'paperclip': '\uf0c6',
-    'paragraph': '\uf1dd',
-    'paste': '\uf0ea',
-    'pause': '\uf04c',
-    'pause_circle': '\uf28b',
-    'pause_circle_o': '\uf28c',
-    'paw': '\uf1b0',
-    'paypal': '\uf1ed',
-    'pencil': '\uf040',
-    'pencil_square': '\uf14b',
-    'pencil_square_o': '\uf044',
-    'percent': '\uf295',
-    'phone': '\uf095',
-    'phone_square': '\uf098',
-    'photo': '\uf03e',
-    'picture_o': '\uf03e',
-    'pie_chart': '\uf200',
-    'pied_piper': '\uf2ae',
-    'pied_piper_alt': '\uf1a8',
-    'pied_piper_pp': '\uf1a7',
-    'pinterest': '\uf0d2',
-    'pinterest_p': '\uf231',
-    'pinterest_square': '\uf0d3',
-    'plane': '\uf072',
-    'play': '\uf04b',
-    'play_circle': '\uf144',
-    'play_circle_o': '\uf01d',
-    'plug': '\uf1e6',
-    'plus': '\uf067',
-    'plus_circle': '\uf055',
-    'plus_square': '\uf0fe',
-    'plus_square_o': '\uf196',
-    'power_off': '\uf011',
-    'print': '\uf02f',
-    'product_hunt': '\uf288',
-    'puzzle_piece': '\uf12e',
-    'qq': '\uf1d6',
-    'qrcode': '\uf029',
-    'question': '\uf128',
-    'question_circle': '\uf059',
-    'question_circle_o': '\uf29c',
-    'quote_left': '\uf10d',
-    'quote_right': '\uf10e',
-    'ra': '\uf1d0',
-    'random': '\uf074',
-    'rebel': '\uf1d0',
-    'recycle': '\uf1b8',
-    'reddit': '\uf1a1',
-    'reddit_alien': '\uf281',
-    'reddit_square': '\uf1a2',
-    'refresh': '\uf021',
-    'registered': '\uf25d',
-    'remove': '\uf00d',
-    'renren': '\uf18b',
-    'reorder': '\uf0c9',
-    'repeat': '\uf01e',
-    'reply': '\uf112',
-    'reply_all': '\uf122',
-    'resistance': '\uf1d0',
-    'retweet': '\uf079',
-    'rmb': '\uf157',
-    'road': '\uf018',
-    'rocket': '\uf135',
-    'rotate_left': '\uf0e2',
-    'rotate_right': '\uf01e',
-    'rouble': '\uf158',
-    'rss': '\uf09e',
-    'rss_square': '\uf143',
-    'rub': '\uf158',
-    'ruble': '\uf158',
-    'rupee': '\uf156',
-    'safari': '\uf267',
-    'save': '\uf0c7',
-    'scissors': '\uf0c4',
-    'scribd': '\uf28a',
-    'search': '\uf002',
-    'search_minus': '\uf010',
-    'search_plus': '\uf00e',
-    'sellsy': '\uf213',
-    'send': '\uf1d8',
-    'send_o': '\uf1d9',
-    'server': '\uf233',
-    'share': '\uf064',
-    'share_alt': '\uf1e0',
-    'share_alt_square': '\uf1e1',
-    'share_square': '\uf14d',
-    'share_square_o': '\uf045',
-    'shekel': '\uf20b',
-    'sheqel': '\uf20b',
-    'shield': '\uf132',
-    'ship': '\uf21a',
-    'shirtsinbulk': '\uf214',
-    'shopping_bag': '\uf290',
-    'shopping_basket': '\uf291',
-    'shopping_cart': '\uf07a',
-    'sign_in': '\uf090',
-    'sign_language': '\uf2a7',
-    'sign_out': '\uf08b',
-    'signal': '\uf012',
-    'signing': '\uf2a7',
-    'simplybuilt': '\uf215',
-    'sitemap': '\uf0e8',
-    'skyatlas': '\uf216',
-    'skype': '\uf17e',
-    'slack': '\uf198',
-    'sliders': '\uf1de',
-    'slideshare': '\uf1e7',
-    'smile_o': '\uf118',
-    'snapchat': '\uf2ab',
-    'snapchat_ghost': '\uf2ac',
-    'snapchat_square': '\uf2ad',
-    'soccer_ball_o': '\uf1e3',
-    'sort': '\uf0dc',
-    'sort_alpha_asc': '\uf15d',
-    'sort_alpha_desc': '\uf15e',
-    'sort_amount_asc': '\uf160',
-    'sort_amount_desc': '\uf161',
-    'sort_asc': '\uf0de',
-    'sort_desc': '\uf0dd',
-    'sort_down': '\uf0dd',
-    'sort_numeric_asc': '\uf162',
-    'sort_numeric_desc': '\uf163',
-    'sort_up': '\uf0de',
-    'soundcloud': '\uf1be',
-    'space_shuttle': '\uf197',
-    'spinner': '\uf110',
-    'spoon': '\uf1b1',
-    'spotify': '\uf1bc',
-    'square': '\uf0c8',
-    'square_o': '\uf096',
-    'stack_exchange': '\uf18d',
-    'stack_overflow': '\uf16c',
-    'star': '\uf005',
-    'star_half': '\uf089',
-    'star_half_empty': '\uf123',
-    'star_half_full': '\uf123',
-    'star_half_o': '\uf123',
-    'star_o': '\uf006',
-    'steam': '\uf1b6',
-    'steam_square': '\uf1b7',
-    'step_backward': '\uf048',
-    'step_forward': '\uf051',
-    'stethoscope': '\uf0f1',
-    'sticky_note': '\uf249',
-    'sticky_note_o': '\uf24a',
-    'stop': '\uf04d',
-    'stop_circle': '\uf28d',
-    'stop_circle_o': '\uf28e',
-    'street_view': '\uf21d',
-    'strikethrough': '\uf0cc',
-    'stumbleupon': '\uf1a4',
-    'stumbleupon_circle': '\uf1a3',
-    'subscript': '\uf12c',
-    'subway': '\uf239',
-    'suitcase': '\uf0f2',
-    'sun_o': '\uf185',
-    'superscript': '\uf12b',
-    'support': '\uf1cd',
-    'table': '\uf0ce',
-    'tablet': '\uf10a',
-    'tachometer': '\uf0e4',
-    'tag': '\uf02b',
-    'tags': '\uf02c',
-    'tasks': '\uf0ae',
-    'taxi': '\uf1ba',
-    'television': '\uf26c',
-    'tencent_weibo': '\uf1d5',
-    'terminal': '\uf120',
-    'text_height': '\uf034',
-    'text_width': '\uf035',
-    'th': '\uf00a',
-    'th_large': '\uf009',
-    'th_list': '\uf00b',
-    'themeisle': '\uf2b2',
-    'thumb_tack': '\uf08d',
-    'thumbs_down': '\uf165',
-    'thumbs_o_down': '\uf088',
-    'thumbs_o_up': '\uf087',
-    'thumbs_up': '\uf164',
-    'ticket': '\uf145',
-    'times': '\uf00d',
-    'times_circle': '\uf057',
-    'times_circle_o': '\uf05c',
-    'tint': '\uf043',
-    'toggle_down': '\uf150',
-    'toggle_left': '\uf191',
-    'toggle_off': '\uf204',
-    'toggle_on': '\uf205',
-    'toggle_right': '\uf152',
-    'toggle_up': '\uf151',
-    'trademark': '\uf25c',
-    'train': '\uf238',
-    'trash': '\uf1f8',
-    'trash_o': '\uf014',
-    'tree': '\uf1bb',
-    'trello': '\uf181',
-    'tripadvisor': '\uf262',
-    'trophy': '\uf091',
-    'truck': '\uf0d1',
-    'try': '\uf195',
-    'tty': '\uf1e4',
-    'tumblr': '\uf173',
-    'tumblr_square': '\uf174',
-    'turkish_lira': '\uf195',
-    'tv': '\uf26c',
-    'twitch': '\uf1e8',
-    'twitter': '\uf099',
-    'twitter_square': '\uf081',
-    'umbrella': '\uf0e9',
-    'underline': '\uf0cd',
-    'undo': '\uf0e2',
-    'universal_access': '\uf29a',
-    'university': '\uf19c',
-    'unlink': '\uf127',
-    'unlock': '\uf09c',
-    'unlock_alt': '\uf13e',
-    'unsorted': '\uf0dc',
-    'upload': '\uf093',
-    'usb': '\uf287',
-    'usd': '\uf155',
-    'user': '\uf007',
-    'user_md': '\uf0f0',
-    'user_plus': '\uf234',
-    'user_secret': '\uf21b',
-    'user_times': '\uf235',
-    'users': '\uf0c0',
-    'viacoin': '\uf237',
-    'viadeo': '\uf2a9',
-    'viadeo_square': '\uf2aa',
-    'video_camera': '\uf03d',
-    'vimeo': '\uf27d',
-    'vimeo_square': '\uf194',
-    'vine': '\uf1ca',
-    'vk': '\uf189',
-    'volume_control_phone': '\uf2a0',
-    'volume_down': '\uf027',
-    'volume_off': '\uf026',
-    'volume_up': '\uf028',
-    'warning': '\uf071',
-    'wechat': '\uf1d7',
-    'weibo': '\uf18a',
-    'weixin': '\uf1d7',
-    'whatsapp': '\uf232',
-    'wheelchair': '\uf193',
-    'wheelchair_alt': '\uf29b',
-    'wifi': '\uf1eb',
-    'wikipedia_w': '\uf266',
-    'windows': '\uf17a',
-    'won': '\uf159',
-    'wordpress': '\uf19a',
-    'wpbeginner': '\uf297',
-    'wpforms': '\uf298',
-    'wrench': '\uf0ad',
-    'xing': '\uf168',
-    'xing_square': '\uf169',
-    'y_combinator': '\uf23b',
-    'y_combinator_square': '\uf1d4',
-    'yahoo': '\uf19e',
-    'yc': '\uf23b',
-    'yc_square': '\uf1d4',
-    'yelp': '\uf1e9',
-    'yen': '\uf157',
-    'yoast': '\uf2b1',
-    'youtube': '\uf167',
-    'youtube_play': '\uf16a',
-    'youtube_square': '\uf166',
-
-};
diff --git a/prototype_2016/third_party/qml-material/src/core/core.qrc b/prototype_2016/third_party/qml-material/src/core/core.qrc
deleted file mode 100644
index 56a5854..0000000
--- a/prototype_2016/third_party/qml-material/src/core/core.qrc
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material">
-        <file>AwesomeIcon.qml</file>
-        <file>FontAwesome.otf</file>
-        <file>Icon.qml</file>
-        <file>Ink.qml</file>
-        <file>MaterialAnimation.qml</file>
-        <file>Object.qml</file>
-        <file>Palette.qml</file>
-        <file>PlatformExtensions.qml</file>
-        <file>Theme.qml</file>
-        <file>ThemePalette.qml</file>
-        <file>UnitsHelper.qml</file>
-        <file>View.qml</file>
-        <file>awesome.js</file>
-        <file>utils.js</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/core/device.cpp b/prototype_2016/third_party/qml-material/src/core/device.cpp
deleted file mode 100644
index 7ca842c..0000000
--- a/prototype_2016/third_party/qml-material/src/core/device.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "device.h"
-
-Device::Device(QObject *parent)
-        : QObject(parent)
-{
-    QGuiApplication *app = (QGuiApplication *) QGuiApplication::instance();
-    m_screen = app->primaryScreen();
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-    connect(app, &QGuiApplication::primaryScreenChanged,
-            this, &Device::screenChanged);
-#endif
-}
-
-QObject *Device::qmlSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-
-    return new Device();
-}
-
-Device::FormFactor Device::formFactor() const
-{
-    float diagonal = calculateDiagonal();
-
-    if (diagonal >= 3.5 && diagonal < 5) { //iPhone 1st generation to phablet
-        return Device::Phone;
-    } else if (diagonal >= 5 && diagonal < 6.5) {
-        return Device::Phablet;
-    } else if (diagonal >= 6.5 && diagonal < 10.1) {
-        return Device::Tablet;
-    } else if (diagonal >= 10.1 && diagonal < 29) {
-        return Device::Computer;
-    } else if (diagonal >= 29 && diagonal < 92) {
-        return Device::TV;
-    } else {
-        return Device::Unknown;
-    }
-}
-
-QString Device::name() const
-{
-    switch (formFactor()) {
-        case Phone:
-            return tr("phone");
-        case Phablet:
-            return tr("phablet");
-        case Tablet:
-            return tr("tablet");
-        case Computer:
-            return tr("computer");
-        case TV:
-            return tr("TV");
-        case Unknown:
-            return tr("device");
-        default:
-            return tr("unknown");
-    }
-}
-
-QString Device::iconName() const
-{
-    switch (formFactor()) {
-        case Phone:
-            return "hardware/smartphone";
-        case Phablet:
-            return "hardware/tablet";
-        case Tablet:
-            return "hardware/tablet";
-        case Computer:
-            return "hardware/desktop_windows";
-        case TV:
-            return "hardware/tv";
-        case Unknown:
-        default:
-            return "hardware/computer";
-    }
-}
-
-bool Device::isPortrait() const
-{
-    return m_screen->physicalSize().height() > m_screen->physicalSize().width();
-}
-
-bool Device::hasTouchScreen() const
-{
-// QTBUG-36007
-#if defined(Q_OS_ANDROID)
-    return true;
-#else
-    const auto devices = QTouchDevice::devices();
-    foreach(const QTouchDevice *dev, devices) {
-        if (dev->type() == QTouchDevice::TouchScreen)
-            return true;
-    }
-    return false;
-#endif
-}
-
-bool Device::isMobile() const
-{
-#if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) || defined(Q_OS_WINRT)
-    return true;
-#else
-    if (qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_MOBILE")) {
-        return true;
-    }
-    return false;
-#endif
-}
-
-bool Device::hoverEnabled() const
-{
-    return !isMobile() || !hasTouchScreen();
-}
-
-int Device::gridUnit() const
-{
-    Device::FormFactor formFactor = this->formFactor();
-
-    if (formFactor == Device::Phone || formFactor == Device::Phablet) {
-        return isPortrait() ? 56 : 48;
-    } else if (formFactor == Device::Tablet) {
-        return 64;
-    } else {
-        return hasTouchScreen() ? 64 : 48;
-    }
-}
-
-void Device::screenChanged()
-{
-    if (m_screen)
-        m_screen->disconnect(this);
-
-    QGuiApplication *app = (QGuiApplication *) QGuiApplication::instance();
-    m_screen = app->primaryScreen();
-
-    connect(m_screen, &QScreen::geometryChanged, this, &Device::geometryChanged);
-
-    emit geometryChanged();
-}
-
-float Device::calculateDiagonal() const
-{
-    return sqrt(pow((m_screen->physicalSize().width()), 2) +
-                pow((m_screen->physicalSize().height()), 2)) * 0.039370;
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/device.h b/prototype_2016/third_party/qml-material/src/core/device.h
deleted file mode 100644
index 682de79..0000000
--- a/prototype_2016/third_party/qml-material/src/core/device.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
- #ifndef DEVICE_H
- #define DEVICE_H
-
-#include <QObject>
-
-#include <cmath>
-#include <QQmlEngine>
-#include <QGuiApplication>
-#include <QScreen>
-#include <QTouchDevice>
-
-class Device : public QObject {
-    Q_OBJECT
-
-    Q_PROPERTY(FormFactor formFactor READ formFactor NOTIFY geometryChanged)
-    Q_PROPERTY(QString name READ name NOTIFY geometryChanged)
-    Q_PROPERTY(QString iconName READ iconName NOTIFY geometryChanged)
-
-    Q_PROPERTY(bool isPortrait READ isPortrait NOTIFY geometryChanged)
-    Q_PROPERTY(bool isMobile READ isMobile CONSTANT)
-    Q_PROPERTY(bool hasTouchScreen READ hasTouchScreen CONSTANT)
-    Q_PROPERTY(bool hoverEnabled READ hoverEnabled CONSTANT)
-
-    Q_PROPERTY(int gridUnit READ gridUnit NOTIFY geometryChanged)
-
-public:
-    enum FormFactor {
-        Phone,
-        Phablet,
-        Tablet,
-        Computer,
-        TV,
-        Unknown
-    };
-    Q_ENUM(FormFactor)
-
-    Device(QObject *parent = nullptr);
-
-    static QObject *qmlSingleton(QQmlEngine *engine, QJSEngine *scriptEngine);
-
-    FormFactor formFactor() const;
-    QString name() const;
-    QString iconName() const;
-
-    bool isPortrait() const;
-    bool hasTouchScreen() const;
-    bool isMobile() const;
-    bool hoverEnabled() const;
-
-    int gridUnit() const;
-    int dpMultiplier() const;
-
-signals:
-    void geometryChanged();
-
-private slots:
-    void screenChanged();
-
-private:
-    float calculateDiagonal() const;
-
-    QScreen *m_screen;
-};
-
-#endif // DEVICE_H
diff --git a/prototype_2016/third_party/qml-material/src/core/units.cpp b/prototype_2016/third_party/qml-material/src/core/units.cpp
deleted file mode 100644
index 60d135c..0000000
--- a/prototype_2016/third_party/qml-material/src/core/units.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "units.h"
-
-#include <QGuiApplication>
-#include <QQuickItem>
-
-#if defined(Q_OS_ANDROID)
-#include <QtAndroidExtras>
-#endif
-
-#define DEFAULT_DPI 72
-
-UnitsAttached::UnitsAttached(QObject *attachee)
-        : QObject(attachee), m_screen(nullptr), m_window(nullptr), m_dpi(0), m_multiplier(1)
-{
-    m_attachee = qobject_cast<QQuickItem *>(attachee);
-
-    if (m_attachee) {
-        if (m_attachee->window()) // It might not be assigned to a window yet
-            windowChanged(m_attachee->window());
-    } else {
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(attachee);
-        if (window)
-            windowChanged(window);
-    }
-
-    if (!m_screen)
-        screenChanged(QGuiApplication::primaryScreen());
-}
-
-void UnitsAttached::windowChanged(QQuickWindow *window)
-{
-    if (m_window)
-        disconnect(m_window, &QQuickWindow::screenChanged, this, &UnitsAttached::screenChanged);
-
-    m_window = window;
-    screenChanged(window ? window->screen() : nullptr);
-
-    if (window)
-        connect(window, &QQuickWindow::screenChanged, this, &UnitsAttached::screenChanged);
-}
-
-void UnitsAttached::screenChanged(QScreen *screen)
-{
-    if (screen != m_screen) {
-        QScreen *oldScreen = m_screen;
-        m_screen = screen;
-
-        if (oldScreen)
-            oldScreen->disconnect(this);
-
-        if (oldScreen == nullptr || screen == nullptr ||
-            screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch() ||
-            screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch() ||
-            screen->devicePixelRatio() != oldScreen->devicePixelRatio()) {
-            updateDPI();
-            emit dpChanged();
-        }
-    }
-}
-
-int UnitsAttached::dp() const
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-    return m_multiplier;
-#else
-    auto dp = dpi() / 160;
-
-    return dp > 0 ? dp * m_multiplier : m_multiplier;
-#endif
-}
-
-int UnitsAttached::dpi() const { return m_dpi; }
-
-qreal UnitsAttached::multiplier() const { return m_multiplier; }
-
-void UnitsAttached::setMultiplier(qreal multiplier)
-{
-    if (m_multiplier != multiplier) {
-        m_multiplier = multiplier;
-        emit multiplierChanged();
-    }
-}
-
-void UnitsAttached::updateDPI()
-{
-    if (m_screen == nullptr) {
-        m_dpi = DEFAULT_DPI;
-        return;
-    }
-
-#if defined(Q_OS_IOS)
-    // iOS integration of scaling (retina, non-retina, 4K) does itself.
-    m_dpi = m_screen->physicalDotsPerInch();
-#elif defined(Q_OS_ANDROID)
-    // https://bugreports.qt-project.org/browse/QTBUG-35701
-    // recalculate dpi for Android
-
-    QAndroidJniEnvironment env;
-    QAndroidJniObject activity = QtAndroid::androidActivity();
-    QAndroidJniObject resources =
-            activity.callObjectMethod("getResources", "()Landroid/content/res/Resources;");
-    if (env->ExceptionCheck()) {
-        env->ExceptionDescribe();
-        env->ExceptionClear();
-
-        m_dpi = DEFAULT_DPI;
-        return;
-    }
-
-    QAndroidJniObject displayMetrics =
-            resources.callObjectMethod("getDisplayMetrics", "()Landroid/util/DisplayMetrics;");
-    if (env->ExceptionCheck()) {
-        env->ExceptionDescribe();
-        env->ExceptionClear();
-
-        m_dpi = DEFAULT_DPI;
-        return;
-    }
-    m_dpi = displayMetrics.getField<int>("densityDpi");
-    m_multiplier = displayMetrics.getField<float>("density");
-#else
-    // standard dpi
-    m_dpi = m_screen->logicalDotsPerInch() * m_screen->devicePixelRatio();
-#endif
-}
diff --git a/prototype_2016/third_party/qml-material/src/core/units.h b/prototype_2016/third_party/qml-material/src/core/units.h
deleted file mode 100644
index 374626a..0000000
--- a/prototype_2016/third_party/qml-material/src/core/units.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef UNITS_H
-#define UNITS_H
-
-#include <QObject>
-
-#include <QScreen>
-#include <QQuickWindow>
-#include <QPointer>
-
-class UnitsAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int dp READ dp NOTIFY dpChanged)
-    Q_PROPERTY(qreal multiplier READ multiplier WRITE setMultiplier NOTIFY multiplierChanged)
-
-public:
-    UnitsAttached(QObject *attachee);
-
-    int dp() const;
-    int dpi() const;
-    qreal multiplier() const;
-
-public slots:
-    void setMultiplier(qreal multiplier);
-
-signals:
-    void dpChanged();
-    void multiplierChanged();
-
-protected slots:
-    void screenChanged(QScreen *);
-
-private:
-    void updateDPI();
-    void windowChanged(QQuickWindow *);
-
-    QPointer<QScreen> m_screen;
-    QQuickWindow *m_window;
-    QQuickItem *m_attachee;
-
-    int m_dpi;
-    qreal m_multiplier;
-};
-
-class Units : public QObject
-{
-    Q_OBJECT
-
-public:
-    static UnitsAttached *qmlAttachedProperties(QObject *object)
-    {
-        return new UnitsAttached(object);
-    }
-};
-
-QML_DECLARE_TYPEINFO(Units, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif // UNITS_H
diff --git a/prototype_2016/third_party/qml-material/src/core/utils.js b/prototype_2016/third_party/qml-material/src/core/utils.js
deleted file mode 100644
index b6ea137..0000000
--- a/prototype_2016/third_party/qml-material/src/core/utils.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-function findRoot(obj) {
-    while (obj.parent) {
-        obj = obj.parent;
-    }
-
-    return obj;
-}
-
-function findRootChild(obj, objectName) {
-    obj = findRoot(obj);
-
-    var childs = new Array(0);
-    childs.push(obj);
-    while (childs.length > 0) {
-        if (childs[0].objectName == objectName) {
-            return childs[0];
-        }
-        for (var i in childs[0].data) {
-            childs.push(childs[0].data[i]);
-        }
-        childs.splice(0, 1);
-    }
-    return null;
-}
-
-function findChild(obj,objectName) {
-    var childs = new Array(0);
-    childs.push(obj);
-    while (childs.length > 0) {
-        if (childs[0].objectName == objectName) {
-            return childs[0];
-        }
-        for (var i in childs[0].data) {
-            childs.push(childs[0].data[i]);
-        }
-        childs.splice(0, 1);
-    }
-    return null;
-}
-
-function newObject(path, args, parent) {
-    if (!args)
-        args = {};
-
-    args.parent = parent;
-
-    var component = Qt.createComponent(path);
-    if (component.status === QtQuick.Component.Error) {
-        // Error Handling
-        print("Unable to load object: " + path + "\n" + component.errorString());
-        return null;
-    }
-
-    return component.createObject(parent, args);
-}
-
-function filter(list, filter) {
-    var filtered = [];
-
-    forEach(list, function(item) {
-        if (filter(item))
-            filtered.push(item)
-    })
-
-    return filtered;
-}
-
-function forEach(list, callback) {
-    for (var i = 0; i < length(list); i++) {
-        var item = getItem(list, i)
-        callback(item)
-    }
-}
-
-function getItem(model, index) {
-    var item = model.get ? model.get(index) : model[index]
-
-    if (model.get && item.modelData)
-        item = item.modelData
-
-    return item
-}
-
-function length(model) {
-    if (model === undefined || model === null)
-        return 0
-    else
-        return model.count ? model.count : model.length
-}
diff --git a/prototype_2016/third_party/qml-material/src/extras/AutomaticGrid.qml b/prototype_2016/third_party/qml-material/src/extras/AutomaticGrid.qml
deleted file mode 100644
index 8bfc939..0000000
--- a/prototype_2016/third_party/qml-material/src/extras/AutomaticGrid.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015 Bogdan Cuza <bogdan.cuza@hotmail.com>
- *               2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-Grid {
-    id: grid
-
-    default property alias delegate: repeater.delegate
-    property real cellWidth
-    property real cellHeight
-    property alias model: repeater.model
-    property real widthOverride: parent.width
-    property real heightOverride: parent.height
-    property real minColumnSpacing
-
-
-    columns: {
-        var flooredResult = Math.floor(widthOverride/cellWidth);
-        if (flooredResult >= 1 && flooredResult <= repeater.count)
-            if ((widthOverride-(flooredResult*cellWidth))/(flooredResult+1) < minColumnSpacing)
-                return flooredResult-1;
-            else
-                return flooredResult;
-        else if (flooredResult > repeater.count)
-            return repeater.count;
-        else
-            return 1;
-    }
-
-    columnSpacing: (widthOverride-(columns*cellWidth))/(columns+1) < (minColumnSpacing/2) ? (minColumnSpacing/2) : (widthOverride-(columns*cellWidth))/(columns+1)
-    width: widthOverride - 2*columnSpacing
-    anchors{
-        horizontalCenter: parent.horizontalCenter
-        top: parent.top
-        topMargin: rowSpacing
-    }
-
-    Repeater {
-        id: repeater
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/extras/CircleImage.qml b/prototype_2016/third_party/qml-material/src/extras/CircleImage.qml
deleted file mode 100644
index 777f412..0000000
--- a/prototype_2016/third_party/qml-material/src/extras/CircleImage.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material.Extras 0.1 as Extras
-import QtGraphicalEffects 1.0
-
-Item {
-    id: item
-
-    property alias source: image.source
-    property alias status: image.status
-    property alias averageColor: image.averageColor
-    property alias sourceSize: image.sourceSize
-    property alias asynchronous: image.asynchronous
-    property alias cache: image.cache
-    property alias fillMode: image.fillMode
-
-    width: image.implicitWidth
-    height: image.implicitHeight
-
-    Extras.Image {
-        id: image
-        anchors.fill: parent
-        smooth: true
-        visible: false
-        mipmap: true
-    }
-
-    CircleMask {
-        anchors.fill: image
-        source: image
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/extras/CircleMask.qml b/prototype_2016/third_party/qml-material/src/extras/CircleMask.qml
deleted file mode 100644
index cd92028..0000000
--- a/prototype_2016/third_party/qml-material/src/extras/CircleMask.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtGraphicalEffects 1.0
-
-Item {
-    id: item
-
-    property alias source: mask.source
-
-    Rectangle {
-        id: circleMask
-        anchors.fill: parent
-
-        smooth: true
-        visible: false
-
-        radius: Math.max(width/2, height/2)
-    }
-
-    OpacityMask {
-        id: mask
-
-        anchors.fill: parent
-        maskSource: circleMask
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/extras/ColumnFlow.qml b/prototype_2016/third_party/qml-material/src/extras/ColumnFlow.qml
deleted file mode 100644
index d9b4a54..0000000
--- a/prototype_2016/third_party/qml-material/src/extras/ColumnFlow.qml
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-/*
-example usage:
-
-Rectangle {
-    width: 600
-    height: 600
-
-    ColumnFlow {
-        id: grid
-        anchors.fill: parent
-        columns: 5
-        model: 20
-
-        delegate: Rectangle {
-            id: item
-            height: 100.0 * Math.random()
-            color: Qt.rgba(Math.random(), Math.random(), Math.random(), Math.random())
-            Text {text: index}
-        }
-    }
-}
-*/
-Item {
-    id: columnFlow
-
-    property int columnWidth
-
-    property int columns: Math.max(0, Math.floor(width/columnWidth))
-    property bool repeaterCompleted: false
-    property alias model: repeater.model
-    property alias delegate: repeater.delegate
-    property int contentHeight: 0
-
-    height: contentHeight
-
-    onColumnsChanged: reEvalColumns()
-    onModelChanged: reEvalColumns()
-
-    onWidthChanged: updateWidths()
-
-    function updateWidths() {
-        if (repeaterCompleted) {
-            var count = 0
-
-            //dump(columnFlow)
-
-            //add the first <column> elements
-            for (var i = 0; count < columns && i < columnFlow.children.length; i++) {
-                if (!columnFlow.children[i] || String(columnFlow.children[i]).indexOf("QQuickRepeater") == 0) continue
-
-                columnFlow.children[i].width = width / columns
-                count++
-            }
-        }
-    }
-
-    function dump(obj, indent) {
-        if (indent === undefined)
-            indent = 0
-        var spacing = ""
-        for (var a = 0; a < indent; a++) {
-            spacing += " "
-        }
-        print(spacing + String(obj))
-        if (obj.hasOwnProperty("children")) {
-            for (var i = 0; i < obj.children.length; i++) {
-                dump(obj.children[i], indent+1)
-            }
-        }
-    }
-
-    function reEvalColumns() {
-        if (!repeaterCompleted)
-            return
-        var i, j
-        var columnHeights = new Array(columns);
-        var lastItem = new Array(columns)
-        var lastI = -1
-        var count = 0
-
-        //dump(columnFlow)
-
-        //add the first <column> elements
-        for (i = 0; count < columns && i < columnFlow.children.length; i++) {
-            if (!columnFlow.children[i] || String(columnFlow.children[i]).indexOf("QQuickRepeater") == 0
-                     || !columnFlow.children[i].visible) continue
-
-            lastItem[count] = i
-            columnHeights[count] = columnFlow.children[i].height
-
-            columnFlow.children[i].anchors.top = columnFlow.top
-            columnFlow.children[i].anchors.left = (lastI === -1 ? columnFlow.left : columnFlow.children[lastI].right)
-            columnFlow.children[i].anchors.right = undefined
-            columnFlow.children[i].width = columnFlow.width / columns
-
-            lastI = i
-            count++
-        }
-
-        //add the other elements
-        for (i = i; i < columnFlow.children.length; i++) {
-            var highestHeight = Number.MAX_VALUE
-            var newColumn = 0
-
-            if (!columnFlow.children[i] || !columnFlow.children[i].visible) continue
-
-            // find the shortest column
-            for (j = 0; j < columns; j++) {
-                if (columnHeights[j] < highestHeight) {
-                    newColumn = j
-                    highestHeight = columnHeights[j]
-                }
-            }
-
-            // add the element to the shortest column
-            columnFlow.children[i].anchors.top = columnFlow.children[lastItem[newColumn]].bottom
-            columnFlow.children[i].anchors.left = columnFlow.children[lastItem[newColumn]].left
-            columnFlow.children[i].anchors.right = columnFlow.children[lastItem[newColumn]].right
-
-            lastItem[newColumn] = i
-            columnHeights[newColumn] += columnFlow.children[i].height
-        }
-
-        var cHeight = 0
-        for (i = 0; i < columns; i++) {
-            if (!columnHeights[i])
-                continue
-            cHeight = Math.max(cHeight, columnHeights[i])
-        }
-        contentHeight = cHeight
-
-        updateWidths()
-    }
-
-
-//    function appendToModel (item) {
-//        // only if model is an array
-//        if ((model instanceof Array) !== (item instanceof Array))
-//            return
-
-//        if (item instanceof Array)
-//            for (var i = 0; i < item.length; i++)
-//                repeater.model.push(item)
-//    }
-
-
-    Repeater {
-        id: repeater
-        model: columnFlow.model
-
-        Component.onCompleted: {
-            columnFlow.repeaterCompleted = true
-            columnFlow.reEvalColumns()
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/extras/Image.qml b/prototype_2016/third_party/qml-material/src/extras/Image.qml
deleted file mode 100644
index cdb3dd3..0000000
--- a/prototype_2016/third_party/qml-material/src/extras/Image.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014 Bogdan Cuza <bogdan.cuza@hotmail.com>
- *               2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-
-Image {
-  id: image
-
-  property color averageColor
-
-  Canvas {
-    id: canvas
-
-    opacity: 0
-
-    onAvailableChanged: {
-      var imgSource = image.source;
-      canvas.loadImage(String(imgSource));
-      var context = canvas.getContext("2d"),
-      pixelInterval = 5,
-      count = 0,
-      i = -4,
-      rgba = {"r": 0, "g": 0, "b": 0, "a": 0},
-      data = context.createImageData(String(imgSource)).data,
-      length = data.length;
-      while ((i += pixelInterval * 4) < length) {
-        count++;
-        rgba.r += data[i];
-        rgba.g += data[i+1];
-        rgba.b += data[i+2];
-        rgba.a += data[i+3];
-      };
-      rgba.r = Math.floor(rgba.r/count);
-      rgba.g = Math.floor(rgba.g/count);
-      rgba.b = Math.floor(rgba.b/count);
-      rgba.a = Math.floor(rgba.a/count);
-      image.averageColor = Qt.rgba(rgba.r/255, rgba.g/255, rgba.b/255, rgba.a/255);
-    }
-  }
-}
diff --git a/prototype_2016/third_party/qml-material/src/extras/extras.qrc b/prototype_2016/third_party/qml-material/src/extras/extras.qrc
deleted file mode 100644
index cb2452c..0000000
--- a/prototype_2016/third_party/qml-material/src/extras/extras.qrc
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material/Extras">
-        <file>AutomaticGrid.qml</file>
-        <file>CircleImage.qml</file>
-        <file>CircleMask.qml</file>
-        <file>ColumnFlow.qml</file>
-        <file>Image.qml</file>
-        <file>qmldir</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/extras/qmldir b/prototype_2016/third_party/qml-material/src/extras/qmldir
deleted file mode 100644
index 9cb93ae..0000000
--- a/prototype_2016/third_party/qml-material/src/extras/qmldir
+++ /dev/null
@@ -1,7 +0,0 @@
-module Material.Extras
-
-AutomaticGrid 0.1 AutomaticGrid.qml
-CircleImage 0.1 CircleImage.qml
-CircleMask 0.1 CircleMask.qml
-ColumnFlow 0.1 ColumnFlow.qml
-Image 0.1 Image.qml
diff --git a/prototype_2016/third_party/qml-material/src/listitems/BaseListItem.qml b/prototype_2016/third_party/qml-material/src/listitems/BaseListItem.qml
deleted file mode 100644
index 2aeeb59..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/BaseListItem.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype BaseListItem
-   \inqmlmodule Material.ListItems
-
-   \brief The base class for list items.
-
-   Provides ink effects, mouse/touch handling and tinting on mouse hover.
- */
-View {
-    id: listItem
-    anchors {
-        left: parent ? parent.left : undefined
-        right: parent ? parent.right : undefined
-    }
-
-    property bool darkBackground
-    property int margins: 16 * Units.dp
-
-    property bool selected
-    property bool interactive: true
-
-    property int dividerInset: 0
-    property bool showDivider: false
-
-    signal clicked()
-    signal pressAndHold()
-
-    opacity: enabled ? 1 : 0.6
-
-    ThinDivider {
-        anchors.bottom: parent.bottom
-        anchors.leftMargin: dividerInset
-
-        visible: showDivider
-        darkBackground: listItem.darkBackground
-    }
-
-    Ink {
-        id: ink
-
-        onClicked: listItem.clicked()
-        onPressAndHold: listItem.pressAndHold()
-
-        anchors.fill: parent
-
-        enabled: listItem.interactive && listItem.enabled
-        z: -1
-    }
-
-    tintColor: selected
-               ? Qt.rgba(0,0,0,0.05)
-               : ink.containsMouse ? Qt.rgba(0,0,0,0.03) : Qt.rgba(0,0,0,0)
-}
diff --git a/prototype_2016/third_party/qml-material/src/listitems/CMakeLists.txt b/prototype_2016/third_party/qml-material/src/listitems/CMakeLists.txt
deleted file mode 100644
index 0f042b1..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-file(GLOB QML_FILES *.qml)
-
-install(FILES ${QML_FILES} qmldir
-        DESTINATION ${QML_INSTALL_DIR}/Material/ListItems)
diff --git a/prototype_2016/third_party/qml-material/src/listitems/Divider.qml b/prototype_2016/third_party/qml-material/src/listitems/Divider.qml
deleted file mode 100644
index d5e5754..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/Divider.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype Divider
-   \inqmlmodule Material.ListItems
-
-   \brief A divider divides content in a list.
- */
-Item {
-        id: divider
-
-        anchors {
-                left: parent.left
-                right: parent.right
-        }
-
-    property bool darkBackground
-
-        height: 16 * Units.dp
-
-        ThinDivider {
-        anchors.verticalCenter: parent.verticalCenter
-        darkBackground: divider.darkBackground
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/listitems/SectionHeader.qml b/prototype_2016/third_party/qml-material/src/listitems/SectionHeader.qml
deleted file mode 100644
index 9a0c514..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/SectionHeader.qml
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015 Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
- *               2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.3
-
-/*!
-   \qmltype SectionHeader
-   \inqmlmodule Material.ListItems
-
-   \brief A list item that serves as the the header for an expandable list section.
- */
-BaseListItem {
-    id: listItem
-
-    property alias text: label.text
-    property alias iconName: icon.name
-    property bool expanded: false
-
-    height: 48 * Units.dp
-
-    RowLayout {
-        anchors.fill: parent
-
-        anchors.leftMargin: listItem.margins
-        anchors.rightMargin: listItem.margins
-
-        spacing: 16 * Units.dp
-
-        Item {
-            Layout.preferredWidth: 40 * Units.dp
-            Layout.preferredHeight: width
-            Layout.alignment: Qt.AlignCenter
-
-            visible: children.length > 1 || iconName != ""
-
-            Icon {
-                id: icon
-
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                }
-
-                visible: name != ""
-                color: listItem.expanded ? Theme.primaryColor
-                        : darkBackground ? Theme.dark.iconColor : Theme.light.iconColor
-                size: 24 * Units.dp
-            }
-        }
-
-        Label {
-            id: label
-
-            Layout.alignment: Qt.AlignVCenter
-            Layout.fillWidth: true
-
-            elide: Text.ElideRight
-            style: "subheading"
-
-            color: listItem.expanded ? Theme.primaryColor
-                    : darkBackground ? Theme.dark.textColor : Theme.light.textColor
-        }
-
-        Item {
-            Layout.preferredWidth: 40 * Units.dp
-            Layout.preferredHeight: width
-            Layout.alignment: Qt.AlignRight
-
-            Icon {
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                }
-
-                name: "navigation/expand_more"
-                rotation: listItem.expanded ? 180 : 0
-                size: 24 * Units.dp
-                color: darkBackground ? Theme.dark.iconColor : Theme.light.iconColor
-
-                Behavior on rotation {
-                    NumberAnimation { duration: 200 }
-                }
-            }
-        }
-    }
-
-    onClicked: listItem.expanded = !listItem.expanded
-}
diff --git a/prototype_2016/third_party/qml-material/src/listitems/SimpleMenu.qml b/prototype_2016/third_party/qml-material/src/listitems/SimpleMenu.qml
deleted file mode 100644
index f336700..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/SimpleMenu.qml
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype SimpleMenu
-   \inqmlmodule Material.ListItems
-
-   \brief A list item that opens a dropdown menu when tapped.
- */
-Subtitled {
-    id: listItem
-
-    property var model
-    property alias selectedIndex: listView.currentIndex
-
-    subText: listView.currentItem.text
-
-    onClicked: menu.open(listItem, 16 * Units.dp, 0)
-
-    property int __maxWidth: 0
-
-    Label {
-        id: hiddenLabel
-        style: "subheading"
-        visible: false
-        color: darkBackground ? Theme.dark.textColor : Theme.light.textColor
-
-        onContentWidthChanged: {
-            __maxWidth = Math.max(contentWidth + 33 * Units.dp, __maxWidth)
-        }
-    }
-
-    onModelChanged: {
-        var longestString = 0;
-        for (var i = 0; i < model.length; i++) {
-            if(model[i].length > longestString)
-            {
-                longestString = model[i].length
-                hiddenLabel.text = model[i]
-            }
-        }
-    }
-
-    Dropdown {
-        id: menu
-
-        anchor: Item.TopLeft
-
-        width: Math.max(56 * 2 * Units.dp, Math.min(listItem.width - 32 * Units.dp, __maxWidth))
-        height: Math.min(10 * 48 * Units.dp + 16 * Units.dp, model.length * 48 * Units.dp + 16 * Units.dp)
-
-        Rectangle {
-            anchors.fill: parent
-            radius: 2 * Units.dp
-        }
-
-        ListView {
-            id: listView
-
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: parent.top
-                topMargin: 8 * Units.dp
-            }
-
-            interactive: false
-            height: count > 0 ? contentHeight : 0
-            model: listItem.model
-
-            delegate: Standard {
-                id: delegateItem
-
-                text: modelData
-
-                onClicked: {
-                    listView.currentIndex = index
-                    menu.close()
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/listitems/Standard.qml b/prototype_2016/third_party/qml-material/src/listitems/Standard.qml
deleted file mode 100644
index 3c3341b..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/Standard.qml
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtGraphicalEffects 1.0
-import QtQuick.Layouts 1.1
-import Material 0.3
-
-/*!
-   \qmltype Standard
-   \inqmlmodule Material.ListItems
-
-   \brief A simple list item with a single line of text and optional primary and secondary actions.
- */
-BaseListItem {
-    id: listItem
-
-    implicitHeight: 48 * Units.dp
-    height: 48 * Units.dp
-
-    property alias text: label.text
-    property alias valueText: valueLabel.text
-
-    property alias action: actionItem.children
-    property alias iconName: icon.name
-    property alias iconSource: icon.source
-    property alias secondaryItem: secondaryItem.children
-    property alias content: contentItem.children
-
-    property alias itemLabel: label
-    property alias itemValueLabel: valueLabel
-
-    property alias textColor: label.color
-    property alias iconColor: icon.color
-
-    dividerInset: actionItem.visible ? listItem.height : 0
-
-    interactive: contentItem.children.length === 0
-
-    implicitWidth: {
-        var width = listItem.margins * 2
-
-        if (actionItem.visible)
-            width += actionItem.width + row.spacing
-
-        if (contentItem.visible)
-            width += contentItem.implicitWidth + row.spacing
-        else
-            width += label.implicitWidth + row.spacing
-
-        if (valueLabel.visible)
-            width += valueLabel.width + row.spacing
-
-        if (secondaryItem.visible)
-            width += secondaryItem.width + row.spacing
-
-        return width
-    }
-
-    RowLayout {
-        id: row
-        anchors.fill: parent
-
-        anchors.leftMargin: listItem.margins
-        anchors.rightMargin: listItem.margins
-
-        spacing: 16 * Units.dp
-
-        Item {
-            id: actionItem
-
-            Layout.preferredWidth: 40 * Units.dp
-            Layout.preferredHeight: width
-            Layout.alignment: Qt.AlignCenter
-
-            visible: children.length > 1 || icon.valid
-
-            Icon {
-                id: icon
-
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                }
-
-                visible: valid
-                color: listItem.selected ? Theme.primaryColor
-                        : darkBackground ? Theme.dark.iconColor : Theme.light.iconColor
-
-                size: 24 * Units.dp
-            }
-        }
-
-        ColumnLayout {
-            Layout.alignment: Qt.AlignVCenter
-            Layout.preferredHeight: parent.height
-
-            Item {
-                id: contentItem
-
-                Layout.fillWidth: true
-                Layout.preferredHeight: parent.height
-
-                visible: children.length > 0
-            }
-
-            Label {
-                id: label
-
-                Layout.alignment: Qt.AlignVCenter
-                Layout.fillWidth: true
-
-                elide: Text.ElideRight
-                style: "subheading"
-
-                color: listItem.selected ? Theme.primaryColor
-                        : darkBackground ? Theme.dark.textColor : Theme.light.textColor
-
-                visible: !contentItem.visible
-            }
-        }
-
-        Label {
-            id: valueLabel
-
-            Layout.alignment: Qt.AlignVCenter
-
-            color: darkBackground ? Theme.dark.subTextColor : Theme.light.subTextColor
-            elide: Text.ElideRight
-            style: "body1"
-
-            visible: text != ""
-        }
-
-        Item {
-            id: secondaryItem
-
-            Layout.alignment: Qt.AlignCenter
-            Layout.preferredWidth: childrenRect.width
-            Layout.preferredHeight: parent.height
-
-            visible: children.length > 0
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/listitems/Subheader.qml b/prototype_2016/third_party/qml-material/src/listitems/Subheader.qml
deleted file mode 100644
index 5e692a0..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/Subheader.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype Subheader
-   \inqmlmodule Material.ListItems
-
-   \brief Subheaders are special list tiles that delineate distinct sections of a list or grid list.
- */
-View {
-    id: listItem
-
-    //----- STYLE PROPERTIES -----//
-
-    height: 48 * Units.dp
-    property int margins: 16 * Units.dp
-
-    anchors {
-        left: parent.left
-        right: parent.right
-    }
-
-    property int spacing
-
-    property alias text: label.text
-    property alias style: label.style
-    property alias textColor: label.color
-    property bool darkBackground
-
-    Label {
-        id: label
-
-        font.pixelSize: 14 * Units.dp
-        font.family: "Roboto"
-        font.weight: Font.DemiBold
-
-        anchors {
-            verticalCenter: parent.verticalCenter
-            left: parent.left
-            right: parent.right
-            margins: margins
-        }
-
-        color: darkBackground ? Theme.dark.subTextColor : Theme.light.subTextColor
-    }
-
-    property bool showDivider: false
-
-    ThinDivider {
-        anchors.bottom: parent.bottom
-        visible: showDivider
-        darkBackground: listItem.darkBackground
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/listitems/Subtitled.qml b/prototype_2016/third_party/qml-material/src/listitems/Subtitled.qml
deleted file mode 100644
index a0b53da..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/Subtitled.qml
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Jordan Neidlinger <jneidlinger@barracuda.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.3
-
-/*!
-   \qmltype Subtitled
-   \inqmlmodule Material.ListItems
-
-   \brief A list item with a two or three lines of text and optional primary and secondary actions.
- */
-BaseListItem {
-    id: listItem
-
-    height: maximumLineCount == 2 ? 72 * Units.dp : 88 * Units.dp
-
-    property alias text: label.text
-    property alias subText: subLabel.text
-    property alias valueText: valueLabel.text
-
-    property alias iconName: icon.name
-    property alias iconSource: icon.source
-
-    property alias action: actionItem.children
-    property alias secondaryItem: secondaryItem.children
-    property alias content: contentItem.children
-
-    property alias itemLabel: label
-    property alias itemSubLabel: subLabel
-    property alias itemValueLabel: valueLabel
-
-    interactive: !contentItem.showing
-
-    dividerInset: actionItem.visible ? listItem.height : 0
-
-    property int maximumLineCount: 2
-
-    GridLayout {
-        anchors.fill: parent
-
-        anchors.leftMargin: listItem.margins
-        anchors.rightMargin: listItem.margins
-
-        columns: 4
-        rows: 1
-        columnSpacing: 16 * Units.dp
-
-        Item {
-            id: actionItem
-
-            Layout.preferredWidth: 40 * Units.dp
-            Layout.preferredHeight: width
-            Layout.alignment: Qt.AlignCenter
-            Layout.column: 1
-
-            visible: children.length > 1 || icon.valid
-
-            Icon {
-                id: icon
-
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                }
-
-                visible: valid
-                color: listItem.selected ? Theme.primaryColor
-                        : darkBackground ? Theme.dark.iconColor : Theme.light.iconColor
-                size: 24 * Units.dp
-            }
-        }
-
-        ColumnLayout {
-            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-            Layout.fillWidth: true
-            Layout.column: 2
-
-            spacing: 3 * Units.dp
-
-            RowLayout {
-                Layout.fillWidth: true
-
-                spacing: 8 * Units.dp
-
-                Label {
-                    id: label
-
-                    Layout.alignment: Qt.AlignVCenter
-                    Layout.fillWidth: true
-
-                    elide: Text.ElideRight
-                    style: "subheading"
-                    color: darkBackground ? Theme.dark.textColor : Theme.light.textColor
-                }
-
-                Label {
-                    id: valueLabel
-
-                    Layout.alignment: Qt.AlignVCenter
-                    Layout.preferredWidth: visible ? implicitWidth : 0
-
-                    color: darkBackground ? Theme.dark.subTextColor : Theme.light.subTextColor
-                    elide: Text.ElideRight
-                    horizontalAlignment: Qt.AlignHCenter
-                    style: "body1"
-                    visible: text != ""
-                }
-            }
-
-            Item {
-                id: contentItem
-
-                Layout.fillWidth: true
-                Layout.preferredHeight: showing ? subLabel.implicitHeight : 0
-
-                property bool showing: visibleChildren.length > 0
-            }
-
-            Label {
-                id: subLabel
-
-                Layout.fillWidth: true
-                Layout.preferredHeight: implicitHeight * maximumLineCount/lineCount
-
-                color: darkBackground ? Theme.dark.subTextColor : Theme.light.subTextColor
-                elide: Text.ElideRight
-                wrapMode: Text.WordWrap
-                style: "body1"
-
-                visible: text != "" && !contentItem.showing
-                maximumLineCount: listItem.maximumLineCount - 1
-            }
-        }
-
-        Item {
-            id: secondaryItem
-            Layout.alignment: Qt.AlignCenter
-            Layout.preferredWidth: childrenRect.width
-            Layout.preferredHeight: parent.height
-            Layout.column: 4
-
-            visible: children.length > 0
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/listitems/listitems.qrc b/prototype_2016/third_party/qml-material/src/listitems/listitems.qrc
deleted file mode 100644
index 5ff9a32..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/listitems.qrc
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material/ListItems">
-        <file>BaseListItem.qml</file>
-        <file>Divider.qml</file>
-        <file>SectionHeader.qml</file>
-        <file>SimpleMenu.qml</file>
-        <file>Standard.qml</file>
-        <file>Subheader.qml</file>
-        <file>Subtitled.qml</file>
-        <file>qmldir</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/listitems/qmldir b/prototype_2016/third_party/qml-material/src/listitems/qmldir
deleted file mode 100644
index bb37850..0000000
--- a/prototype_2016/third_party/qml-material/src/listitems/qmldir
+++ /dev/null
@@ -1,9 +0,0 @@
-module Material.ListItems
-
-BaseListItem 0.1 BaseListItem.qml
-Divider 0.1 Divider.qml
-SimpleMenu 0.1 SimpleMenu.qml
-Standard 0.1 Standard.qml
-Subheader 0.1 Subheader.qml
-Subtitled 0.1 Subtitled.qml
-SectionHeader 0.1 SectionHeader.qml
diff --git a/prototype_2016/third_party/qml-material/src/material.qrc b/prototype_2016/third_party/qml-material/src/material.qrc
deleted file mode 100644
index 2e41eee..0000000
--- a/prototype_2016/third_party/qml-material/src/material.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-<RCC>
-    <qresource prefix="/Material">
-        <file>qmldir</file>
-    </qresource>
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/plugin.cpp b/prototype_2016/third_party/qml-material/src/plugin.cpp
deleted file mode 100644
index 76c5cb8..0000000
--- a/prototype_2016/third_party/qml-material/src/plugin.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "plugin.h"
-
-#include <QtQml>
-
-#include "core/device.h"
-#include "core/units.h"
-
-class MaterialRegisterHelper {
-
-public:
-    MaterialRegisterHelper(const char *uri) {
-        qmlRegisterSingletonType<Device>(uri, 0, 1, "Device", Device::qmlSingleton);
-        qmlRegisterUncreatableType<Units>(uri, 0, 3, "Units", QStringLiteral("Units can only be used via the attached property."));
-    }
-};
-
-void MaterialPlugin::registerTypes(const char *uri)
-{
-    // @uri Material
-    Q_ASSERT(uri == QStringLiteral("Material"));
-
-    MaterialRegisterHelper helper(uri);
-}
-
-// When using QPM, the C++ plugin is not used and the QML types must be registered manually
-#ifdef QPM_INIT
-    static MaterialRegisterHelper registerHelper("Material");
-#endif
diff --git a/prototype_2016/third_party/qml-material/src/plugin.h b/prototype_2016/third_party/qml-material/src/plugin.h
deleted file mode 100644
index 0836309..0000000
--- a/prototype_2016/third_party/qml-material/src/plugin.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef MATERIAL_PLUGIN_H
-#define MATERIAL_PLUGIN_H
-
-#include <QQmlExtensionPlugin>
-
-class MaterialPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "io.papyros.Material")
-
-public:
-    void registerTypes(const char *uri);
-};
-
-#endif // MATERIAL_PLUGIN_H
diff --git a/prototype_2016/third_party/qml-material/src/popups/BottomActionSheet.qml b/prototype_2016/third_party/qml-material/src/popups/BottomActionSheet.qml
deleted file mode 100644
index 1369816..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/BottomActionSheet.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import Material.ListItems 0.1 as ListItem
-
-/*!
-   \qmltype BottomActionSheet
-   \inqmlmodule Material
-
-   \brief Represents a bottom sheet displaying a list of actions with an optional title.
-
- */
-BottomSheet {
-    id: bottomSheet
-
-    property list<Action> actions
-
-    property string title
-
-    implicitHeight: title !== "" ? header.height + listViewContainer.implicitHeight
-                                 : listViewContainer.implicitHeight
-
-    Column {
-        id: column
-
-        anchors.fill: parent
-
-        ListItem.Subheader {
-            id: header
-            text: title
-            visible: title !== ""
-            height: 56 * Units.dp
-            style: "subheading"
-            backgroundColor: "white"
-            elevation: listView.atYBeginning ? 0 : 1
-            fullWidth: true
-            z: 2
-        }
-
-        Item {
-            id: listViewContainer
-
-            width: parent.width
-            height: title !== "" ? parent.height - header.height : parent.height
-
-            implicitHeight: listView.contentHeight + listView.topMargin + listView.bottomMargin
-
-            Flickable {
-                id: listView
-                width: parent.width
-                height: parent.height
-
-                interactive: bottomSheet.height < bottomSheet.implicitHeight
-
-                topMargin: title !== "" ? 0 : 8 * Units.dp
-                bottomMargin: 8 * Units.dp
-
-                contentWidth: width
-                contentHeight: subColumn.height
-
-                Column {
-                    id: subColumn
-                    width: parent.width
-
-                    Repeater {
-                        model: actions
-
-                        delegate: Column {
-                            width: parent.width
-
-                            ListItem.Standard {
-                                id: listItem
-                                text: modelData.name
-                                iconSource: modelData.iconSource
-                                visible: modelData.visible
-                                enabled: modelData.enabled
-
-                                onClicked: {
-                                    bottomSheet.close()
-                                    modelData.triggered(listItem)
-                                }
-                            }
-
-                            ListItem.Divider {
-                                visible: modelData.hasDividerAfter
-                            }
-                        }
-                    }
-                }
-            }
-
-            Scrollbar {
-                flickableItem: listView
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/BottomSheet.qml b/prototype_2016/third_party/qml-material/src/popups/BottomSheet.qml
deleted file mode 100644
index 0aa6ee8..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/BottomSheet.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Steve Coffey <scoffey@barracuda.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype BottomSheet
-   \inqmlmodule Material
-
-   \brief A bottom sheet is a sheet of paper that slides up from the bottom edge
-   of the screen and presents a set of clear and simple actions.
- */
-PopupBase {
-    id: bottomSheet
-
-    /*!
-       The maximum height of the bottom sheet. This is useful when used with a flickable,
-       so the bottom sheet will scroll when the content is higher than the maximum height.
-     */
-    property int maxHeight: parent.height * 0.6
-
-    default property alias content: containerView.data
-
-    overlayLayer: "dialogOverlayLayer"
-    overlayColor: Qt.rgba(0, 0, 0, 0.2)
-    height: Math.min(maxHeight, implicitHeight)
-    implicitHeight: containerView.childrenRect.height
-    width: parent.width
-
-    visible: percentOpen > 0
-
-    property real percentOpen: showing ? 1 : 0
-
-    Behavior on percentOpen {
-
-        NumberAnimation {
-            duration: 200
-            easing {
-                 type: Easing.OutCubic
-            }
-        }
-    }
-
-    anchors {
-        bottom: parent.bottom
-        bottomMargin: (bottomSheet.percentOpen - 1) * height
-    }
-
-    View {
-        id:containerView
-
-        anchors.fill: parent
-
-        elevation: 2
-        backgroundColor: "#fff"
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/Dialog.qml b/prototype_2016/third_party/qml-material/src/popups/Dialog.qml
deleted file mode 100644
index dfc2cc5..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/Dialog.qml
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Bogdan Cuza <bogdan.cuza@hotmail.com>
- *               2015 Mikhail Ivchenko <ematirov@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype Dialog
-   \inqmlmodule Material
-   \brief Dialogs inform users about critical information, require users to make
-   decisions, or encapsulate multiple tasks within a discrete process
- */
-PopupBase {
-    id: dialog
-
-    overlayLayer: "dialogOverlayLayer"
-    overlayColor: Qt.rgba(0, 0, 0, 0.3)
-
-    opacity: showing ? 1 : 0
-    visible: opacity > 0
-
-    width: Math.max(minimumWidth,
-                    content.contentWidth + 2 * contentMargins)
-
-    height: Math.min(parent.height - 64 * Units.dp,
-                     headerView.height +
-                     content.contentHeight +
-                     (floatingActions ? 0 : buttonContainer.height))
-
-    property int contentMargins: 24 * Units.dp
-
-    property int minimumWidth: Device.isMobile ? 280 * Units.dp : 300 * Units.dp
-
-    property alias title: titleLabel.text
-    property alias text: textLabel.text
-
-    /*!
-       \qmlproperty Button negativeButton
-       The negative button, displayed as the leftmost button on the right of the dialog buttons.
-       This is usually used to dismiss the dialog.
-     */
-    property alias negativeButton: negativeButton
-
-    /*!
-       \qmlproperty Button primaryButton
-       The primary button, displayed as the rightmost button in the dialog buttons row. This is
-       usually used to accept the dialog's action.
-     */
-    property alias positiveButton: positiveButton
-
-    property string negativeButtonText: "Cancel"
-    property string positiveButtonText: "Ok"
-    property alias positiveButtonEnabled: positiveButton.enabled
-
-    property bool hasActions: true
-    property bool floatingActions: false
-
-    default property alias dialogContent: column.data
-
-    signal accepted()
-    signal rejected()
-
-    anchors {
-        centerIn: parent
-        verticalCenterOffset: showing ? 0 : -(dialog.height/3)
-
-        Behavior on verticalCenterOffset {
-            NumberAnimation { duration: 200 }
-        }
-    }
-
-    Behavior on opacity {
-        NumberAnimation { duration: 200 }
-    }
-
-    Keys.onPressed: {
-        if (event.key === Qt.Key_Escape) {
-            closeKeyPressed(event)
-        }
-    }
-
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Back) {
-            closeKeyPressed(event)
-        }
-    }
-
-    function closeKeyPressed(event) {
-        if (dialog.showing) {
-            if (dialog.dismissOnTap) {
-                dialog.close()
-            }
-            event.accepted = true
-        }
-    }
-
-    function show() {
-        open()
-    }
-
-    View {
-        id: dialogContainer
-
-        anchors.fill: parent
-        elevation: 5
-        radius: 2 * Units.dp
-        backgroundColor: "white"
-
-        MouseArea {
-            anchors.fill: parent
-            propagateComposedEvents: false
-
-            onClicked: {
-                mouse.accepted = false
-            }
-        }
-
-        Rectangle {
-            anchors.fill: content
-        }
-
-        Flickable {
-            id: content
-
-            contentWidth: column.implicitWidth
-            contentHeight: column.height + (column.height > 0 ? contentMargins : 0)
-            clip: true
-
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: headerView.bottom
-                bottom: floatingActions ? parent.bottom : buttonContainer.top
-            }
-
-            interactive: contentHeight > height
-
-            onContentXChanged: {
-                if(contentX != 0 && contentWidth <= width)
-                    contentX = 0
-            }
-
-            onContentYChanged: {
-                if(contentY != 0 && contentHeight <= height)
-                    contentY = 0
-            }
-
-            Column {
-                id: column
-                anchors {
-                    left: parent.left
-                    leftMargin: contentMargins
-                }
-
-                width: content.width - 2 * contentMargins
-                spacing: 8 * Units.dp
-            }
-        }
-
-        Scrollbar {
-            flickableItem: content
-        }
-
-        Item {
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: parent.top
-            }
-
-            height: headerView.height
-
-            View {
-                backgroundColor: "white"
-                elevation: content.atYBeginning ? 0 : 1
-                fullWidth: true
-                radius: dialogContainer.radius
-
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    top: parent.top
-                }
-
-                height: parent.height
-            }
-        }
-
-
-        Column {
-            id: headerView
-
-            spacing: 0
-
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: parent.top
-
-                leftMargin: contentMargins
-                rightMargin: contentMargins
-            }
-
-            Item {
-                width: parent.width
-                height: contentMargins
-                visible: titleLabel.visible || textLabel.visible
-            }
-
-            Label {
-                id: titleLabel
-
-                width: parent.width
-                wrapMode: Text.Wrap
-                style: "title"
-                visible: title != ""
-            }
-
-            Item {
-                width: parent.width
-                height: 20 * Units.dp
-                visible: titleLabel.visible
-            }
-
-            Label {
-                id: textLabel
-
-                width: parent.width
-                wrapMode: Text.Wrap
-                style: "dialog"
-                color: Theme.light.subTextColor
-                visible: text != ""
-            }
-
-            Item {
-                width: parent.width
-                height: contentMargins
-                visible: textLabel.visible
-            }
-        }
-
-        Item {
-            id: buttonContainer
-
-            anchors {
-                bottom: parent.bottom
-                right: parent.right
-                left: parent.left
-            }
-
-            height: hasActions ? 52 * Units.dp : 2 * Units.dp
-
-            View {
-                id: buttonView
-
-                height: parent.height
-                backgroundColor: floatingActions ? "transparent" : "white"
-                elevation: content.atYEnd ? 0 : 1
-                fullWidth: true
-                radius: dialogContainer.radius
-                elevationInverted: true
-
-                anchors {
-                    bottom: parent.bottom
-                    right: parent.right
-                    left: parent.left
-                }
-
-                Button {
-                    id: negativeButton
-
-                    visible: hasActions
-                    text: negativeButtonText
-                    textColor: Theme.accentColor
-                    context: "dialog"
-
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        right: positiveButton.visible ? positiveButton.left : parent.right
-                        rightMargin: 8 * Units.dp
-                    }
-
-                    onClicked: {
-                        close();
-                        rejected();
-                    }
-                }
-
-                Button {
-                    id: positiveButton
-
-                    visible: hasActions
-                    text: positiveButtonText
-                    textColor: Theme.accentColor
-                    context: "dialog"
-
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        rightMargin: 8 * Units.dp
-                        right: parent.right
-                    }
-
-                    onClicked: {
-                        close()
-                        accepted();
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/Dropdown.qml b/prototype_2016/third_party/qml-material/src/popups/Dropdown.qml
deleted file mode 100644
index 320967f..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/Dropdown.qml
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Window 2.2
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype Dropdown
-   \inqmlmodule Material
-
-   \brief Represents a dropdown menu that can display a variety of content.
- */
-PopupBase {
-    id: dropdown
-
-    default property alias data: view.data
-    property int anchor: Item.TopRight
-    property alias internalView: view
-
-    visible: view.opacity > 0
-    closeOnResize: true
-
-    function open(caller, offsetX, offsetY) {
-        __lastFocusedItem = Window.activeFocusItem
-        parent = Utils.findRootChild(dropdown, overlayLayer)
-
-        if (!parent.enabled)
-            return
-
-        if (parent.currentOverlay)
-            parent.currentOverlay.close()
-
-        if(typeof offsetX === "undefined")
-            offsetX = 0
-
-        if(typeof offsetY === "undefined")
-            offsetY = 0
-
-        var position = caller.mapToItem(dropdown.parent, 0, 0)
-
-        // Check to make sure we are within the window bounds, move if we need to
-        var globalPos = caller.mapToItem(null, 0, 0)
-        var root = Utils.findRoot(dropdown)
-
-        if (__internal.left) {
-            dropdown.x = position.x
-        } else if (__internal.center) {
-            dropdown.x = caller.width / 2 - dropdown.width / 2
-        } else {
-            dropdown.x = position.x + caller.width - dropdown.width
-        }
-
-        if (__internal.top) {
-            dropdown.y = position.y
-        } else if (__internal.center) {
-            dropdown.y = caller.height / 2 - dropdown.height / 2
-        } else {
-            dropdown.y = position.y + caller.height - dropdown.height
-        }
-
-        dropdown.x += offsetX
-        dropdown.y += offsetY
-
-        if(dropdown.y + height > root.height)
-            dropdown.y += -((dropdown.y + height + 16 * Units.dp) - root.height)
-        if(dropdown.x + width > root.width)
-            dropdown.x += -((dropdown.x + width + 16 * Units.dp) - root.width)
-
-        showing = true
-        parent.currentOverlay = dropdown
-
-        opened()
-    }
-
-    QtObject {
-        id: __internal
-
-        property bool left: dropdown.anchor == Item.Left || dropdown.anchor == Item.TopLeft ||
-        dropdown.anchor == Item.BottomLeft
-        property bool right: dropdown.anchor == Item.Right || dropdown.anchor == Item.TopRight ||
-        dropdown.anchor == Item.BottomRight
-        property bool top: dropdown.anchor == Item.Top || dropdown.anchor == Item.TopLeft ||
-        dropdown.anchor == Item.TopRight
-        property bool bottom: dropdown.anchor == Item.Bottom ||
-        dropdown.anchor == Item.BottomLeft ||
-        dropdown.anchor == Item.BottomRight
-        property bool center: dropdown.anchor == Item.Center
-    }
-
-    View {
-        id: view
-        elevation: 2
-        radius: 2 * Units.dp
-        anchors.left: __internal.left ? parent.left : undefined
-        anchors.right: __internal.right ? parent.right : undefined
-        anchors.top: __internal.top ? parent.top : undefined
-        anchors.bottom: __internal.bottom ? parent.bottom : undefined
-        anchors.horizontalCenter: __internal.center ? parent.horizontalCenter : undefined
-        anchors.verticalCenter: __internal.center ? parent.verticalCenter : undefined
-    }
-
-    state: showing ? "open" : "closed"
-
-    states: [
-        State {
-            name: "closed"
-            PropertyChanges {
-                target: view
-                opacity: 0
-            }
-        },
-
-        State {
-            name: "open"
-            PropertyChanges {
-                target: view
-                opacity: 1
-                width: dropdown.width
-                height: dropdown.height
-            }
-        }
-    ]
-
-    transitions: [
-        Transition {
-            from: "open"
-            to: "closed"
-
-            NumberAnimation {
-                target: internalView
-                property: "opacity"
-                duration: 400
-                easing.type: Easing.InOutQuad
-            }
-
-            SequentialAnimation {
-
-                PauseAnimation {
-                    duration: 200
-                }
-
-                NumberAnimation {
-                    target: internalView
-                    property: "width"
-                    duration: 200
-                    easing.type: Easing.InOutQuad
-                }
-            }
-
-            NumberAnimation {
-                target: internalView
-                property: "height"
-                duration: 400
-                easing.type: Easing.InOutQuad
-            }
-        },
-
-        Transition {
-            from: "closed"
-            to: "open"
-
-            NumberAnimation {
-                target: internalView
-                property: "opacity"
-                duration: 400
-                easing.type: Easing.InOutQuad
-            }
-
-            NumberAnimation {
-                target: internalView
-                property: "width"
-                duration: 200
-                easing.type: Easing.InOutQuad
-            }
-
-            NumberAnimation {
-                target: internalView
-                property: "height"
-                duration: 400
-                easing.type: Easing.InOutQuad
-            }
-        }
-    ]
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/InputDialog.qml b/prototype_2016/third_party/qml-material/src/popups/InputDialog.qml
deleted file mode 100644
index 8bcf81e..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/InputDialog.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype InputDialog
-   \inqmlmodule Material
-
-   \brief A dialog with a single text field input.
- */
-Dialog {
-    id: inputDialog
-
-    hasActions: true
-
-    positiveButtonEnabled: textField.acceptableInput
-
-    property alias textField: textField
-
-    property alias validator: textField.validator
-    property alias inputMask: textField.inputMask
-    property alias inputMethodHints: textField.inputMethodHints
-
-    property alias placeholderText: textField.placeholderText
-    property alias value: textField.text
-
-    TextField {
-        id: textField
-
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/MenuField.qml b/prototype_2016/third_party/qml-material/src/popups/MenuField.qml
deleted file mode 100644
index f396ed1..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/MenuField.qml
+++ /dev/null
@@ -1,209 +0,0 @@
-/***** THIS FILE CANNOT BE RELICENSED UNDER THE MPL YET *****/
-
-/*
- * QML Material - An application framework implementing Material Design.
- * Copyright (C) 2015 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-
-import Material 0.3
-import Material.ListItems 0.1
-
-/*!
-   \qmltype MenuField
-   \inqmlmodule Material
-
-   \brief A input field similar to a text field but that opens a dropdown menu.
- */
-Item {
-    id: field
-
-    implicitHeight: hasHelperText ? helperTextLabel.y + helperTextLabel.height + 4 * Units.dp
-                                  : underline.y + 8 * Units.dp
-    implicitWidth: spinBoxContents.implicitWidth
-
-    activeFocusOnTab: true
-
-    property color accentColor: Theme.accentColor
-    property color errorColor: "#F44336"
-
-    property alias model: listView.model
-
-    property string textRole
-
-    readonly property string selectedText: (listView.currentItem) ? listView.currentItem.text : ""
-
-    property alias selectedIndex: listView.currentIndex
-    property int maxVisibleItems: 4
-
-    property alias placeholderText: fieldPlaceholder.text
-    property alias helperText: helperTextLabel.text
-
-    property bool floatingLabel: false
-    property bool hasError: false
-    property bool hasHelperText: helperText.length > 0
-
-    readonly property rect inputRect: Qt.rect(spinBox.x, spinBox.y, spinBox.width, spinBox.height)
-
-    signal itemSelected(int index)
-
-    Ink {
-        anchors.fill: parent
-        onClicked: {
-            listView.positionViewAtIndex(listView.currentIndex, ListView.Center)
-            var offset = listView.currentItem.itemLabel.mapToItem(menu, 0, 0)
-            menu.open(label, 0, -offset.y)
-        }
-    }
-
-    Item {
-        id: spinBox
-
-        height: 24 * Units.dp
-        width: parent.width
-
-        y: {
-            if(!floatingLabel)
-                return 16 * Units.dp
-            if(floatingLabel && !hasHelperText)
-                return 40 * Units.dp
-            return 28 * Units.dp
-        }
-
-        RowLayout {
-            id: spinBoxContents
-
-            height: parent.height
-            width: parent.width + 5 * Units.dp
-
-            Label {
-                id: label
-
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignVCenter
-
-                text: (listView.currentItem) ? listView.currentItem.text : ""
-                style: "subheading"
-                elide: Text.ElideRight
-            }
-
-            Icon {
-                id: dropDownIcon
-
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-                Layout.preferredWidth: 24 * Units.dp
-                Layout.preferredHeight: 24 * Units.dp
-
-                name: "navigation/arrow_drop_down"
-                size: 24 * Units.dp
-            }
-        }
-
-        Dropdown {
-            id: menu
-
-            anchor: Item.TopLeft
-
-            width: spinBox.width
-
-            //If there are more than max items, show an extra half item so
-            // it's clear the user can scroll
-            height: Math.min(maxVisibleItems*48 * Units.dp + 24 * Units.dp, listView.contentHeight)
-
-            ListView {
-                id: listView
-
-                width: menu.width
-                height: count > 0 ? menu.height : 0
-
-                interactive: true
-
-                delegate: Standard {
-                    id: delegateItem
-
-                    text: textRole ? model[textRole] : modelData
-
-                    onClicked: {
-                        itemSelected(index)
-                        listView.currentIndex = index
-                        menu.close()
-                    }
-                }
-            }
-
-            Scrollbar {
-                flickableItem: listView
-            }
-        }
-    }
-
-    Label {
-        id: fieldPlaceholder
-
-        text: field.placeholderText
-        visible: floatingLabel
-
-        font.pixelSize: 12 * Units.dp
-
-        anchors.bottom: spinBox.top
-        anchors.bottomMargin: 8 * Units.dp
-
-        color: Theme.light.hintColor
-    }
-
-    Rectangle {
-        id: underline
-
-        color: field.hasError ? field.errorColor : field.activeFocus ? field.accentColor : Theme.light.hintColor
-
-        height: field.activeFocus ? 2 * Units.dp : 1 * Units.dp
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: spinBox.bottom
-            topMargin: 8 * Units.dp
-        }
-
-        Behavior on height {
-            NumberAnimation { duration: 200 }
-        }
-
-        Behavior on color {
-            ColorAnimation { duration: 200 }
-        }
-    }
-
-    Label {
-        id: helperTextLabel
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: underline.top
-            topMargin: 4 * Units.dp
-        }
-
-        visible: hasHelperText
-        font.pixelSize: 12 * Units.dp
-        color: field.hasError ? field.errorColor : Qt.darker(Theme.light.hintColor)
-
-        Behavior on color {
-            ColorAnimation { duration: 200 }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/Popover.qml b/prototype_2016/third_party/qml-material/src/popups/Popover.qml
deleted file mode 100644
index 68c7a05..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/Popover.qml
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype Tooltip
-   \inqmlmodule Material
-
-   \brief A tooltip is a label that appears on hover and explains a non-text UI element.
-
-   To display a tooltip for your view, simply create an instance of Tooltip,
-   set the text property to your tooltip text, and then set the mouseArea property
-   to your MouseArea or Ink that will trigger the tooltip. If you use a MouseArea,
-   make sure hoverEnabled is set to true.
-
-   See the Material Design guidelines for more details:
-   http://www.google.com/design/spec/components/tooltips.html
- */
-PopupBase {
-    id: popover
-
-    visible: view.opacity > 0
-    closeOnResize: true
-
-    property bool isBelow
-
-    property alias backgroundColor: view.backgroundColor
-
-    property int padding: 16 * Units.dp
-
-    default property alias data: view.data
-
-    function open(caller, offsetX, offsetY) {
-        parent = Utils.findRootChild(popover, overlayLayer)
-
-        if (!parent.enabled)
-            return
-
-        if (parent.currentOverlay)
-            parent.currentOverlay.close()
-
-        if(typeof offsetX === "undefined")
-            offsetX = 0
-
-        if(typeof offsetY === "undefined")
-            offsetY = 0
-
-        var position = caller.mapToItem(popover.parent, 0, 0)
-        var globalPos = caller.mapToItem(null, 0, 0)
-        var root = Utils.findRoot(popover)
-
-        popover.x = Qt.binding(function() {
-            var x = position.x + (caller.width / 2 - popover.width / 2) + offsetX
-
-            if(x + width > root.width - padding)
-                x = root.width - width - padding
-
-            if (x < padding)
-                x = padding
-
-            return x
-        })
-
-        popover.y = Qt.binding(function() {
-            var y = y = position.y + caller.height + offsetY
-
-            if (y + popover.height > root.height - padding) {
-                isBelow = false
-                y = position.y - popover.height - offsetY
-            } else {
-                isBelow = true
-            }
-
-            return y
-        })
-
-        showing = true
-        parent.currentOverlay = popover
-
-        opened()
-    }
-
-    function close() {
-        showing = false
-        parent.currentOverlay = null
-    }
-
-    View {
-        id: view
-
-        elevation: 2
-        radius: 2 * Units.dp
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: isBelow ? parent.top : undefined
-            topMargin: popover.showing ? 0 : -popover.height/4
-            bottom: !isBelow ? parent.bottom : undefined
-            bottomMargin: popover.showing ? 0 : -popover.height/4
-
-            Behavior on topMargin {
-                NumberAnimation { duration: 200 }
-            }
-
-            Behavior on bottomMargin {
-                NumberAnimation { duration: 200 }
-            }
-        }
-
-        height: popover.height
-
-        opacity: popover.showing ? 1 : 0
-
-        Behavior on opacity {
-            NumberAnimation { duration: 200 }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/PopupBase.qml b/prototype_2016/third_party/qml-material/src/popups/PopupBase.qml
deleted file mode 100644
index b0bb43f..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/PopupBase.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Window 2.2
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype PopupBase
-   \inqmlmodule Material
-
-   \brief A base class for popups such as dialogs or dropdowns.
- */
-FocusScope {
-    id: popup
-
-    property color overlayColor: "transparent"
-    property string overlayLayer: "overlayLayer"
-    property bool globalMouseAreaEnabled: true
-    property bool dismissOnTap: true
-    property bool showing: false
-    property bool closeOnResize: false
-    property Item __lastFocusedItem
-
-    signal opened
-    signal closed
-
-    function toggle(widget) {
-        if (showing) {
-            close()
-        } else {
-            open(widget)
-        }
-    }
-
-    function open() {
-        __lastFocusedItem = Window.activeFocusItem
-        parent = Utils.findRootChild(popup, overlayLayer)
-
-        if (!parent.enabled)
-            return
-
-        showing = true
-        forceActiveFocus()
-        parent.currentOverlay = popup
-
-        opened()
-    }
-
-    function close() {
-        showing = false
-
-        if (parent.hasOwnProperty("currentOverlay")) {
-            parent.currentOverlay = null
-        }
-
-        if (__lastFocusedItem !== null) {
-            __lastFocusedItem.forceActiveFocus()
-        }
-
-        closed()
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/TimePickerDialog.qml b/prototype_2016/third_party/qml-material/src/popups/TimePickerDialog.qml
deleted file mode 100644
index e5058ad..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/TimePickerDialog.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-Dialog {
-    contentMargins: 0
-    hasActions: true
-    floatingActions: true
-
-    property alias isHours: timePicker.isHours
-    property alias prefer24Hour: timePicker.prefer24Hour
-    signal timePicked(date timePicked)
-
-    TimePicker {
-        id: timePicker
-        isHours: true
-        bottomMargin: 48 * Units.dp
-    }
-
-    onAccepted: {
-        timePicked(timePicker.getCurrentTime())
-        timePicker.reset()
-    }
-
-    onRejected: {
-        timePicker.reset()
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/popups/popups.qrc b/prototype_2016/third_party/qml-material/src/popups/popups.qrc
deleted file mode 100644
index 8eeeca5..0000000
--- a/prototype_2016/third_party/qml-material/src/popups/popups.qrc
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material">
-        <file>BottomActionSheet.qml</file>
-        <file>BottomSheet.qml</file>
-        <file>Dialog.qml</file>
-        <file>Dropdown.qml</file>
-        <file>InputDialog.qml</file>
-        <file>MenuField.qml</file>
-        <file>Popover.qml</file>
-        <file>PopupBase.qml</file>
-        <file>TimePickerDialog.qml</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/qmldir b/prototype_2016/third_party/qml-material/src/qmldir
deleted file mode 100644
index 99e723e..0000000
--- a/prototype_2016/third_party/qml-material/src/qmldir
+++ /dev/null
@@ -1,71 +0,0 @@
-module Material
-
-# This will be automatically uncommented when installing globally
-# plugin material
-
-# Components
-ActionButton 0.1 ActionButton.qml
-Card 0.1 Card.qml
-DatePicker 0.2 DatePicker.qml
-IconButton 0.1 IconButton.qml
-ProgressCircle 0.1 ProgressCircle.qml
-Scrollbar 0.1 Scrollbar.qml
-Snackbar 0.1 Snackbar.qml
-ThinDivider 0.1 ThinDivider.qml
-TimePicker 0.2 TimePicker.qml
-Tooltip 0.1 Tooltip.qml
-Wave 0.1 Wave.qml
-
-# Controls
-Action 0.1 Action.qml
-Button 0.1 Button.qml
-CheckBox 0.1 CheckBox.qml
-Label 0.1 Label.qml
-ProgressBar 0.1 ProgressBar.qml
-RadioButton 0.1 RadioButton.qml
-Slider 0.1 Slider.qml
-Switch 0.1 Switch.qml
-Tab 0.1 Tab.qml
-TextField 0.1 TextField.qml
-
-# Core
-AwesomeIcon 0.1 AwesomeIcon.qml
-Icon 0.1 Icon.qml
-Ink 0.1 Ink.qml
-Object 0.1 Object.qml
-PlatformExtensions 0.2 PlatformExtensions.qml
-UnitsHelper 0.3 UnitsHelper.qml
-View 0.1 View.qml
-Utils 0.3 utils.js
-singleton MaterialAnimation 0.1 MaterialAnimation.qml
-singleton Palette 0.1 Palette.qml
-singleton Theme 0.1 Theme.qml
-
-# Popups
-BottomActionSheet 0.1 BottomActionSheet.qml
-BottomSheet 0.1 BottomSheet.qml
-Dialog 0.1 Dialog.qml
-Dropdown 0.1 Dropdown.qml
-InputDialog 0.1 InputDialog.qml
-MenuField 0.1 MenuField.qml
-Popover 0.2 Popover.qml
-PopupBase 0.1 PopupBase.qml
-TimePickerDialog 0.2 TimePickerDialog.qml
-
-# Window
-ActionBar 0.1 ActionBar.qml
-AppTheme 0.1 AppTheme.qml
-ApplicationWindow 0.1 ApplicationWindow.qml
-MainView 0.1 MainView.qml
-NavigationDrawer 0.1 NavigationDrawer.qml
-NavigationDrawerPage 0.2 NavigationDrawerPage.qml
-OverlayLayer 0.1 OverlayLayer.qml
-OverlayView 0.1 OverlayView.qml
-Page 0.1 Page.qml
-PageSidebar 0.1 PageSidebar.qml
-PageStack 0.1 PageStack.qml
-Window 0.1 Window.qml
-Sidebar 0.1 Sidebar.qml
-TabBar 0.1 TabBar.qml
-TabbedPage 0.2 TabbedPage.qml
-Toolbar 0.1 Toolbar.qml
diff --git a/prototype_2016/third_party/qml-material/src/src.pro b/prototype_2016/third_party/qml-material/src/src.pro
deleted file mode 100644
index 53d1118..0000000
--- a/prototype_2016/third_party/qml-material/src/src.pro
+++ /dev/null
@@ -1,55 +0,0 @@
-TEMPLATE = lib
-TARGET = material
-
-CONFIG += c++11
-QT += qml quick
-
-
-android {
-    QT += androidextras svg xml
-}
-
-HEADERS += plugin.h \
-           core/device.h \
-           core/units.h
-
-SOURCES += plugin.cpp \
-           core/device.cpp \
-           core/units.cpp
-
-RESOURCES += ../icons/core_icons.qrc
-
-isEmpty(MODULE_INSTALL_PATH) {
-    MODULE_INSTALL_PATH = $$[QT_INSTALL_QML]
-}
-
-target.path = $$MODULE_INSTALL_PATH/Material
-
-material.files +=  \
-                    components/* \
-                    controls/* \
-                    core/* \
-                    popups/* \
-                    window/*
-material.path = $$MODULE_INSTALL_PATH/Material
-
-extras.files += extras/*
-extras.path = $$MODULE_INSTALL_PATH/Material/Extras
-
-listitems.files += listitems/*
-listitems.path = $$MODULE_INSTALL_PATH/Material/ListItems
-
-styles.files += styles/*
-styles.path = $$MODULE_INSTALL_PATH/QtQuick/Controls/Styles/Material
-
-qmldir.target = $$OUT_PWD/out/qmldir
-qmldir.commands = mkdir -p $$OUT_PWD/out;
-qmldir.commands += sed \"s/$$LITERAL_HASH plugin material/plugin material/\" $$PWD/qmldir > $$qmldir.target
-qmldir.depends = $$PWD/qmldir
-qmldir.path = $$MODULE_INSTALL_PATH/Material
-qmldir.files = $$qmldir.target
-qmldir.CONFIG += no_check_exist
-
-INSTALLS += target material extras listitems styles qmldir
-
-OTHER_FILES += $$material.files $$extras.files $$listitems.files $$styles.files
diff --git a/prototype_2016/third_party/qml-material/src/styles/ApplicationWindowStyle.qml b/prototype_2016/third_party/qml-material/src/styles/ApplicationWindowStyle.qml
deleted file mode 100644
index 99fb0fa..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/ApplicationWindowStyle.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-
-ApplicationWindowStyle {
-        background: Rectangle {
-        color: Theme.backgroundColor
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/ButtonStyle.qml b/prototype_2016/third_party/qml-material/src/styles/ButtonStyle.qml
deleted file mode 100644
index 4478a9c..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/ButtonStyle.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-
-ButtonStyle {
-    id: style
-
-    padding {
-        left: 0
-        right: 0
-        top: 0
-        bottom: 0
-    }
-
-    property bool darkBackground: control.hasOwnProperty("darkBackground")
-                ? control.darkBackground : Theme.isDarkColor(controlBackground)
-
-    property int controlElevation: control.hasOwnProperty("elevation") ? control.elevation : 1
-
-    property color controlBackground: control.hasOwnProperty("backgroundColor")
-            ? control.backgroundColor : controlElevation == 0 ? "transparent" : "white"
-
-    property string context: control.hasOwnProperty("context") ? control.context : "default"
-
-    background: View {
-        id: background
-
-        implicitHeight: 36 * Units.dp
-
-        radius: 2 * Units.dp
-
-        backgroundColor: control.enabled || controlElevation === 0
-                ? controlBackground
-                : darkBackground ? Qt.rgba(1, 1, 1, 0.12)
-                                 : Qt.rgba(0, 0, 0, 0.12)
-
-        elevation: {
-            var elevation = controlElevation
-
-            if (elevation > 0 && (control.focus || mouseArea.currentCircle))
-                elevation++;
-
-            if(!control.enabled)
-                elevation = 0;
-
-            return elevation;
-        }
-
-        tintColor: mouseArea.currentCircle || control.focus || control.hovered
-           ? Qt.rgba(0,0,0, mouseArea.currentCircle ? 0.1
-                            : elevation > 0 ? 0.03
-                            : 0.05)
-           : "transparent"
-
-        Ink {
-            id: mouseArea
-
-            anchors.fill: parent
-            focused: control.focus && background.context !== "dialog"
-                    && background.context !== "snackbar"
-            focusWidth: parent.width - 30 * Units.dp
-            focusColor: Qt.darker(background.backgroundColor, 1.05)
-
-            Connections {
-                target: control.__behavior
-                onPressed: mouseArea.onPressed(mouse)
-                onCanceled: mouseArea.onCanceled()
-                onReleased: mouseArea.onReleased(mouse)
-            }
-        }
-    }
-    label: Item {
-        implicitHeight: Math.max(36 * Units.dp, label.height + 16 * Units.dp)
-        implicitWidth: context == "dialog"
-                ? Math.max(64 * Units.dp, label.width + 16 * Units.dp)
-                : context == "snackbar" ? label.width + 16 * Units.dp
-                                        : Math.max(88 * Units.dp, label.width + 32 * Units.dp)
-
-        Label {
-            id: label
-            anchors.centerIn: parent
-            text: control.text
-            style: "button"
-            color: control.enabled ? control.hasOwnProperty("textColor")
-                                     ? control.textColor : darkBackground ? Theme.dark.textColor
-                                                                          : Theme.light.textColor
-                    : control.darkBackground ? Qt.rgba(1, 1, 1, 0.30)
-                                             : Qt.rgba(0, 0, 0, 0.26)
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/CMakeLists.txt b/prototype_2016/third_party/qml-material/src/styles/CMakeLists.txt
deleted file mode 100644
index 3d1f1f6..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-file(GLOB QML_FILES *.qml)
-
-install(FILES ${QML_FILES} qmldir
-        DESTINATION ${QML_INSTALL_DIR}/QtQuick/Controls/Styles/Material)
diff --git a/prototype_2016/third_party/qml-material/src/styles/CheckBoxStyle.qml b/prototype_2016/third_party/qml-material/src/styles/CheckBoxStyle.qml
deleted file mode 100644
index be90649..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/CheckBoxStyle.qml
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-
-CheckBoxStyle {
-    id: style
-
-    property color color: control.hasOwnProperty("color")
-            ? control.color : Theme.light.accentColor
-
-    property bool darkBackground: control.hasOwnProperty("darkBackground")
-            ? control.darkBackground : false
-
-    spacing: 0
-
-    label: Item {
-        implicitWidth: control.text !== "" ? text.implicitWidth + 2 : 0
-        implicitHeight: text.implicitHeight
-
-        baselineOffset: text.baselineOffset
-
-        Label {
-            id: text
-
-            anchors.centerIn: parent
-
-            property bool darkBackground: control.hasOwnProperty("darkBackground")
-            ? control.darkBackground : false
-
-            style: "button"
-            color: control.enabled ? darkBackground ? Theme.dark.textColor
-                                                    : Theme.light.textColor
-                                   : darkBackground ? Theme.alpha("#fff", 0.30)
-                                                    : Theme.alpha("#000", 0.26)
-            text: control.text
-        }
-    }
-
-    indicator: Item {
-        id: parentRect
-
-        implicitWidth: 48 * Units.dp
-        implicitHeight: implicitWidth
-
-        Rectangle {
-            id: indicatorRect
-
-            anchors.centerIn: parent
-
-            property color __internalColor: control.enabled
-                    ? style.color
-                    : style.darkBackground ? Theme.alpha("#fff", 0.30)
-                                           : Theme.alpha("#000", 0.26)
-
-            width: 18 * Units.dp
-            height: width
-            radius: 2 * Units.dp
-
-            border.width: 2 * Units.dp
-
-            border.color: control.enabled
-                    ? control.checked ? style.color
-                                      : style.darkBackground ? Theme.alpha("#fff", 0.70)
-                                                             : Theme.alpha("#000", 0.54)
-                    : style.darkBackground ? Theme.alpha("#fff", 0.30)
-                                           : Theme.alpha("#000", 0.26)
-
-            color: control.checked ? __internalColor : "transparent"
-
-            Behavior on color {
-                ColorAnimation {
-                    easing.type: Easing.InOutQuad
-                    duration: 200
-                }
-            }
-
-            Behavior on border.color {
-                ColorAnimation {
-                    easing.type: Easing.InOutQuad
-                    duration: 200
-                }
-            }
-
-            Item {
-                id: container
-
-                anchors.centerIn: indicatorRect
-
-                height: parent.height
-                width: parent.width
-
-                opacity: control.checked ? 1 : 0
-
-                property int thickness: 3 * Units.dp
-
-                Behavior on opacity {
-                    NumberAnimation {
-                        easing.type: Easing.InOutQuad
-                        duration: 200
-                    }
-                }
-
-                Rectangle {
-                    id: vert
-
-                    anchors {
-                        top: parent.top
-                        right: parent.right
-                        bottom: parent.bottom
-                    }
-
-                    radius: 1 * Units.dp
-                    color: style.darkBackground ? Theme.light.textColor : Theme.dark.textColor
-                    width: container.thickness * 2
-
-                }
-                Rectangle {
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                        bottom: parent.bottom
-                    }
-
-                    radius: 1 * Units.dp
-                    color: style.darkBackground ? Theme.light.textColor : Theme.dark.textColor
-                    height: container.thickness
-                }
-
-                transform: [
-                    Scale {
-                        origin { x: container.width / 2; y: container.height / 2 }
-                        xScale: 0.5
-                        yScale: 1
-                    },
-                    Rotation {
-                        origin { x: container.width / 2; y: container.height / 2 }
-                        angle: 45;
-                    },
-                    Scale {
-                        id: widthScale
-
-                        origin { x: container.width / 2; y: container.height / 2 }
-                        xScale: control.checked ? 0.6 : 0.2
-                        yScale: control.checked ? 0.6 : 0.2
-
-                        Behavior on xScale {
-                            NumberAnimation {
-                                easing.type: Easing.InOutQuad
-                                duration: 200
-                            }
-                        }
-
-                        Behavior on yScale {
-                            NumberAnimation {
-                                easing.type: Easing.InOutQuad
-                                duration: 200
-                            }
-                        }
-                    },
-                    Translate { y: -(container.height - (container.height * 0.9)) }
-                ]
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/ProgressBarStyle.qml b/prototype_2016/third_party/qml-material/src/styles/ProgressBarStyle.qml
deleted file mode 100644
index 57f4157..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/ProgressBarStyle.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-
-ProgressBarStyle {
-    id: progressBarStyle
-
-    progress: Rectangle {
-        color: control.indeterminate ? "transparent" : control.color
-
-        // Indeterminate animation
-        Item {
-            id: independentRect
-            anchors.fill: parent
-            visible: control.indeterminate
-            Rectangle {
-                id: rect
-                property int end: 0
-                width: end - x
-                height: control.height
-                color: control.color
-                ParallelAnimation {
-                    running: control.indeterminate
-                    SequentialAnimation {
-                        loops: Animation.Infinite
-                        PauseAnimation {
-                            duration: 500
-                        }
-
-                        NumberAnimation{
-                            target: rect; property: "x"
-                            from: 0; to: control.width
-                            duration: 1500
-                            easing.type: Easing.InCubic
-                        }
-                    }
-                    SequentialAnimation {
-                        loops: Animation.Infinite
-                        NumberAnimation {
-                            target: rect; property: "end"
-                            from: 0; to: control.width
-                            duration: 1500
-                        }
-                        PauseAnimation {
-                            duration: 500
-                        }
-                        ScriptAction {
-                            script: rect.x = 0
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    panel: Item {
-        property bool horizontal: control.orientation == Qt.Horizontal
-        implicitWidth: horizontal ? backgroundLoader.implicitWidth : backgroundLoader.implicitHeight
-        implicitHeight: horizontal ? backgroundLoader.implicitHeight : backgroundLoader.implicitWidth
-
-        Item {
-            width: horizontal ? parent.width : parent.height
-            height: !horizontal ? parent.width : parent.height
-            y: horizontal ? 0 : width
-            rotation: horizontal ? 0 : -90
-            transformOrigin: Item.TopLeft
-
-            Rectangle {
-                id: backgroundLoader
-                implicitWidth: control.width
-                implicitHeight: control.height
-                color: control.color
-                opacity: 0.2
-            }
-
-            Loader {
-                sourceComponent: progressBarStyle.progress
-                anchors.topMargin: padding.top
-                anchors.leftMargin: padding.left
-                anchors.rightMargin: padding.right
-                anchors.bottomMargin: padding.bottom
-
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.bottom: parent.bottom
-                width: currentProgress * (parent.width - padding.left - padding.right)
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/RadioButtonStyle.qml b/prototype_2016/third_party/qml-material/src/styles/RadioButtonStyle.qml
deleted file mode 100644
index fe027cc..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/RadioButtonStyle.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-
-RadioButtonStyle {
-    id: style
-
-    spacing: 0
-
-    property color color: control.hasOwnProperty("color")
-            ? control.color : Theme.light.accentColor
-
-    property bool darkBackground: control.hasOwnProperty("darkBackground")
-            ? control.darkBackground : false
-
-    label: Label {
-        text: control.text
-        style: "button"
-        color: control.enabled ? style.darkBackground ? Theme.dark.textColor
-                                                        : Theme.light.textColor
-                               : style.darkBackground ? Theme.alpha("#fff", 0.30)
-                                                        : Theme.alpha("#000", 0.26)
-    }
-
-    background: Rectangle {
-        color: "transparent"
-    }
-
-    indicator: Rectangle {
-        implicitWidth: 48 * Units.dp
-        implicitHeight: 48 * Units.dp
-        radius: implicitHeight / 2
-        color: control.activeFocus ? Theme.alpha(control.color, 0.20) : "transparent"
-
-        Rectangle {
-            anchors.centerIn: parent
-
-            implicitWidth: 20 * Units.dp
-            implicitHeight: 20 * Units.dp
-            radius: implicitHeight / 2
-            color: "transparent"
-
-            border.color: control.enabled
-                ? control.checked ? style.color
-                                  : style.darkBackground ? Theme.alpha("#fff", 0.70)
-                                                         : Theme.alpha("#000", 0.54)
-                : style.darkBackground ? Theme.alpha("#fff", 0.30)
-                                       : Theme.alpha("#000", 0.26)
-
-            border.width: 2 * Units.dp
-            antialiasing: true
-
-            Behavior on border.color {
-                ColorAnimation { duration: 200}
-            }
-
-            Rectangle {
-                anchors {
-                    centerIn: parent
-                    alignWhenCentered: false
-                }
-                implicitWidth: control.checked ? 10 * Units.dp : 0
-                implicitHeight: control.checked ? 10 * Units.dp : 0
-                color: control.enabled ? style.color
-                                       : style.darkBackground ? Theme.alpha("#fff", 0.30)
-                                                              : Theme.alpha("#000", 0.26)
-                radius: implicitHeight / 2
-                antialiasing: true
-
-                Behavior on implicitWidth {
-                    NumberAnimation { duration: 200 }
-                }
-
-                Behavior on implicitHeight {
-                    NumberAnimation { duration: 200 }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/SliderStyle.qml b/prototype_2016/third_party/qml-material/src/styles/SliderStyle.qml
deleted file mode 100644
index e5ccf01..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/SliderStyle.qml
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-
-SliderStyle {
-    id: style
-
-    property color color: control.hasOwnProperty("color")
-            ? control.color : Theme.light.accentColor
-
-    property bool darkBackground: control.hasOwnProperty("darkBackground")
-            ? control.darkBackground : false
-
-    property bool numericValueLabel: control.hasOwnProperty("numericValueLabel")
-            ? control.numericValueLabel : false
-
-    property bool alwaysShowValueLabel: control.hasOwnProperty("alwaysShowValueLabel")
-            ? control.alwaysShowValueLabel : false
-
-    property string knobLabel: control.hasOwnProperty("knobLabel")
-            ? control.knobLabel : control.value
-
-    property int knobDiameter: control.hasOwnProperty("knobDiameter")
-            ? control.knobDiameter : 32 * Units.dp
-
-    property Component knob : Item {
-        implicitHeight: control.pressed || control.focus || control.alwaysShowValueLabel
-                ? knobDiameter : 0
-        implicitWidth: control.pressed || control.focus || control.alwaysShowValueLabel
-                ? knobDiameter : 0
-
-        Label {
-            anchors {
-                fill: parent
-                topMargin: 4 * Units.dp
-                bottomMargin: 2 * Units.dp
-                leftMargin: 4 * Units.dp
-                rightMargin: 4 * Units.dp
-            }
-
-            horizontalAlignment: Qt.AlignHCenter
-            verticalAlignment: Qt.AlignVCenter
-            text: knobLabel
-            fontSizeMode: Text.Fit
-            font.pixelSize: knobDiameter - 19 * Units.dp
-            minimumPixelSize: 6 * Units.dp
-            wrapMode: Text.WordWrap
-            color: Theme.lightDark(styleColor,
-                                    Theme.light.textColor,
-                                    Theme.dark.textColor)
-            opacity: control.pressed || control.focus || control.alwaysShowValueLabel ? 1 : 0
-            z: 1
-
-            property color styleColor: control.hasOwnProperty("color")
-                    ? control.color : Theme.light.accentColor
-
-            Behavior on opacity {
-                NumberAnimation { duration: 200}
-            }
-        }
-
-        Rectangle {
-            id: roundKnob
-            implicitHeight: parent.height
-            implicitWidth: parent.width
-            radius: implicitWidth / 2
-            color: style.color
-            antialiasing: true
-            clip: true
-
-            Rectangle {
-                implicitHeight: parent.height / 2
-                implicitWidth: parent.width / 2
-                color: style.color
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                antialiasing: true
-            }
-
-            transform: [
-                Rotation {
-                    origin { x: parent.width / 2; y: parent.height / 2 }
-                    angle: 45;
-                }
-            ]
-        }
-
-        Behavior on implicitHeight {
-            NumberAnimation { duration: 200}
-        }
-
-        Behavior on implicitWidth {
-            NumberAnimation { duration: 200}
-        }
-    }
-
-    groove: Rectangle {
-        implicitWidth: 200
-        implicitHeight: 2 * Units.dp
-
-        anchors.verticalCenter: parent.verticalCenter
-
-        color: style.darkBackground ? Theme.alpha("#FFFFFF", 0.3)
-                                    : Theme.alpha("#000000", 0.26)
-
-        Rectangle {
-            height: parent.height
-            width: styleData.handlePosition
-            implicitHeight: 2 * Units.dp
-            implicitWidth: 200
-            color: style.color
-        }
-    }
-
-    handle: Item {
-        anchors.centerIn: parent
-        implicitHeight: 8 * Units.dp
-        implicitWidth: 8 * Units.dp
-
-        Loader {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.bottom: parent.top
-            anchors.bottomMargin: 16 * Units.dp
-            sourceComponent: style.numericValueLabel ? knob : null
-        }
-
-        Rectangle {
-            anchors.centerIn: parent
-            implicitHeight: 32 * Units.dp
-            implicitWidth: 32 * Units.dp
-            color: control.focus ?
-                       Theme.alpha(style.color, 0.20) :
-                       "transparent"
-            radius: implicitHeight / 2
-            Rectangle {
-                property var diameter: control.enabled ? 16 * Units.dp : 12 * Units.dp
-                anchors.centerIn: parent
-                color: control.value === control.minimumValue ?
-                           Theme.backgroundColor : style.color
-
-                border.color: control.value === control.minimumValue
-                              ? style.darkBackground ? Theme.alpha("#FFFFFF", 0.3)
-                                                       : Theme.alpha("#000000", 0.26)
-                              : style.color
-
-                border.width: 2 * Units.dp
-
-                implicitHeight: control.pressed && !control.focus && !style.numericValueLabel ?
-                                    diameter + 8 * Units.dp :
-                                    diameter
-
-                implicitWidth: control.pressed && !control.focus && !style.numericValueLabel ?
-                                   diameter + 8 * Units.dp :
-                                   diameter
-
-                radius: implicitWidth / 2
-
-                Behavior on implicitHeight {
-                    NumberAnimation { duration: 200}
-                }
-
-                Behavior on implicitWidth {
-                    NumberAnimation { duration: 200}
-                }
-            }
-        }
-    }
-
-    tickmarks: Repeater {
-        id: repeater
-        model: control.stepSize > 0 ? 1 + (control.maximumValue - control.minimumValue) / control.stepSize : 0
-
-        Rectangle {
-            color: style.darkBackground ? "#FFFFFF" : "#000000"
-            width: Math.round(2 * Units.dp); height: 2 * Units.dp
-            y: repeater.height / 2
-            x: styleData.handleWidth / 2 + index * ((repeater.width - styleData.handleWidth) / (repeater.count-1))
-        }
-    }
-
-    panel: Item {
-        id: root
-        property int handleWidth: handleLoader.width
-        property int handleHeight: handleLoader.height
-
-        property bool horizontal : control.orientation === Qt.Horizontal
-        property int horizontalSize: grooveLoader.implicitWidth + padding.left + padding.right
-        property int verticalSize: Math.max(handleLoader.implicitHeight, grooveLoader.implicitHeight) + padding.top + padding.bottom
-
-        implicitWidth: horizontal ? horizontalSize : verticalSize
-        implicitHeight: horizontal ? verticalSize : horizontalSize
-
-        y: horizontal ? 0 : height
-        rotation: horizontal ? 0 : -90
-        transformOrigin: Item.TopLeft
-
-        Item {
-            anchors.fill: parent
-
-            Loader {
-                id: grooveLoader
-                property QtObject styleData: QtObject {
-                    readonly property int handlePosition: handleLoader.x + handleLoader.width/2
-                }
-                x: padding.left + control.__panel.handleWidth / 2
-                sourceComponent: groove
-                width: (horizontal ? parent.width : parent.height) - padding.left - padding.right - (control.__panel.handleWidth)
-                y:  Math.round(padding.top + (Math.round(horizontal ? parent.height : parent.width - padding.top - padding.bottom) - grooveLoader.item.height - control.__panel.handleHeight) / (style.numericValueLabel ? 1 : 2))
-            }
-
-            Loader {
-                id: tickMarkLoader
-                x: padding.left
-                width: (horizontal ? parent.width : parent.height) - padding.left - padding.right
-                y:  grooveLoader.y
-                sourceComponent: control.tickmarksEnabled ? tickmarks : null
-                property QtObject styleData: QtObject { readonly property int handleWidth: control.__panel.handleWidth }
-            }
-
-            Loader {
-                id: handleLoader
-                sourceComponent: handle
-                anchors.verticalCenter: grooveLoader.verticalCenter
-                x: Math.round((control.__handlePos - control.minimumValue) / (control.maximumValue - control.minimumValue) * ((horizontal ? root.width : root.height) - item.width))
-
-                Behavior on x {
-                    NumberAnimation { duration: 100 }
-                    enabled: control.tickmarksEnabled
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/SwitchStyle.qml b/prototype_2016/third_party/qml-material/src/styles/SwitchStyle.qml
deleted file mode 100644
index bb3a90c..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/SwitchStyle.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-
-SwitchStyle {
-    id: style
-
-    property color color: control.hasOwnProperty("color")
-            ? control.color : Theme.light.accentColor
-
-    property bool darkBackground: control.hasOwnProperty("darkBackground")
-            ? control.darkBackground : false
-
-    handle: View {
-        width: 22 * Units.dp
-        height: 22 * Units.dp
-
-        radius: height/2
-
-        elevation: 2
-        backgroundColor: control.enabled ? control.checked ? color : darkBackground ? "#BDBDBD"
-                                                                                    : "#FAFAFA"
-                                         : darkBackground ? "#424242" : "#BDBDBD"
-    }
-
-    groove: Item {
-        width: 40 * Units.dp
-        height: 22 * Units.dp
-
-        Rectangle {
-
-            anchors.centerIn: parent
-
-            width: parent.width - 2 * Units.dp
-            height: 16 * Units.dp
-
-            radius: height/2
-
-            color: control.enabled ? control.checked ? Theme.alpha(style.color, 0.5)
-                                                     : darkBackground ? Qt.rgba(1, 1, 1, 0.26)
-                                                                      : Qt.rgba(0, 0, 0, 0.30)
-                                   : darkBackground ? Qt.rgba(1, 1, 1, 0.12)
-                                                    : Qt.rgba(0, 0, 0, 0.12)
-
-            Behavior on color {
-
-                ColorAnimation {
-                    duration: 200
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/TextFieldStyle.qml b/prototype_2016/third_party/qml-material/src/styles/TextFieldStyle.qml
deleted file mode 100644
index b9c5fa1..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/TextFieldStyle.qml
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import QtQuick.Layouts 1.1
-import Material 0.3
-
-TextFieldStyle {
-    id: style
-
-    padding {
-        left: 0
-        right: 0
-        top: 0
-        bottom: 0
-    }
-
-    font {
-        family: echoMode == TextInput.Password ? "Default" : "Roboto"
-        pixelSize: 16 * Units.dp
-    }
-
-    renderType: Text.QtRendering
-    placeholderTextColor: "transparent"
-    selectedTextColor: "white"
-    selectionColor: control.hasOwnProperty("color") ? control.color : Theme.accentColor
-    textColor: Theme.light.textColor
-
-    background : Item {
-        id: background
-
-        property color color: control.hasOwnProperty("color") ? control.color : Theme.accentColor
-        property color errorColor: control.hasOwnProperty("errorColor")
-                ? control.errorColor : Palette.colors["red"]["500"]
-        property string helperText: control.hasOwnProperty("helperText") ? control.helperText : ""
-        property bool floatingLabel: control.hasOwnProperty("floatingLabel") ? control.floatingLabel : ""
-        property bool hasError: control.hasOwnProperty("hasError")
-                ? control.hasError : characterLimit && control.length > characterLimit
-        property int characterLimit: control.hasOwnProperty("characterLimit") ? control.characterLimit : 0
-        property bool showBorder: control.hasOwnProperty("showBorder") ? control.showBorder : true
-
-        Rectangle {
-            id: underline
-            color: background.hasError ? background.errorColor
-                                    : control.activeFocus ? background.color
-                                                          : Theme.light.hintColor
-
-            height: control.activeFocus ? 2 * Units.dp : 1 * Units.dp
-            visible: background.showBorder
-
-            anchors {
-                left: parent.left
-                right: parent.right
-                bottom: parent.bottom
-            }
-
-            Behavior on height {
-                NumberAnimation { duration: 200 }
-            }
-
-            Behavior on color {
-                ColorAnimation { duration: 200 }
-            }
-        }
-
-
-        Label {
-            id: fieldPlaceholder
-
-            anchors.verticalCenter: parent.verticalCenter
-            text: control.placeholderText
-            font.pixelSize: 16 * Units.dp
-            anchors.margins: -12 * Units.dp
-            color: background.hasError ? background.errorColor
-                                  : control.activeFocus && control.text !== ""
-                                        ? background.color : Theme.light.hintColor
-
-            states: [
-                State {
-                    name: "floating"
-                    when: control.displayText.length > 0 && background.floatingLabel
-                    AnchorChanges {
-                        target: fieldPlaceholder
-                        anchors.verticalCenter: undefined
-                        anchors.top: parent.top
-                    }
-                    PropertyChanges {
-                        target: fieldPlaceholder
-                        font.pixelSize: 12 * Units.dp
-                    }
-                },
-                State {
-                    name: "hidden"
-                    when: control.displayText.length > 0 && !background.floatingLabel
-                    PropertyChanges {
-                        target: fieldPlaceholder
-                        visible: false
-                    }
-                }
-            ]
-
-            transitions: [
-                Transition {
-                    id: floatingTransition
-                    enabled: false
-                    AnchorAnimation {
-                        duration: 200
-                    }
-                    NumberAnimation {
-                        duration: 200
-                        property: "font.pixelSize"
-                    }
-                }
-            ]
-
-            Component.onCompleted: floatingTransition.enabled = true
-        }
-
-        RowLayout {
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: underline.top
-                topMargin: 4 * Units.dp
-            }
-
-            Label {
-                id: helperTextLabel
-                visible: background.helperText && background.showBorder
-                text: background.helperText
-                font.pixelSize: 12 * Units.dp
-                color: background.hasError ? background.errorColor
-                                           : Qt.darker(Theme.light.hintColor)
-
-                Behavior on color {
-                    ColorAnimation { duration: 200 }
-                }
-
-                property string helperText: control.hasOwnProperty("helperText")
-                        ? control.helperText : ""
-            }
-
-            Label {
-                id: charLimitLabel
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-                visible: background.characterLimit && background.showBorder
-                text: control.length + " / " + background.characterLimit
-                font.pixelSize: 12 * Units.dp
-                color: background.hasError ? background.errorColor : Theme.light.hintColor
-                horizontalAlignment: Text.AlignLeft
-
-                Behavior on color {
-                    ColorAnimation { duration: 200 }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/ToolBarStyle.qml b/prototype_2016/third_party/qml-material/src/styles/ToolBarStyle.qml
deleted file mode 100644
index 2917702..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/ToolBarStyle.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-
-ToolBarStyle {
-        padding {
-        left: 16 * Units.dp
-        right: 16 * Units.dp
-        top: 0 * Units.dp
-        bottom: 0 * Units.dp
-    }
-    background: View {
-        implicitHeight: Device.type == Device.phone || Device.type === Device.phablet
-                ? 48 * Units.dp : Device.type == Device.tablet ? 56 * Units.dp : 64 * Units.dp
-        fullWidth: true
-        elevation: 2
-
-        backgroundColor: Theme.primaryColor
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/ToolButtonStyle.qml b/prototype_2016/third_party/qml-material/src/styles/ToolButtonStyle.qml
deleted file mode 100644
index 0547e75..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/ToolButtonStyle.qml
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.3
-import Material 0.3
-import "../Base/"
-
-ToolButtonStyle {
-    panel: View {
-        radius: 2 * Units.dp
-
-        implicitHeight: label.text == ""
-                ? 44 * Units.dp : Math.max(36 * Units.dp, label.height + 16 * Units.dp)
-        implicitWidth: label.text == ""
-                ? 44 * Units.dp : Math.max(64 * Units.dp, label.width + 16 * Units.dp)
-
-        Ink {
-            id: mouseArea
-
-            anchors.fill: parent
-
-            centered: true
-            circular: label.text == ""
-
-            width: parent.width + 8 * Units.dp
-            height: parent.height + 8 * Units.dp
-
-            Connections {
-                target: control.__behavior
-                onPressed: mouseArea.onPressed(mouse)
-                onCanceled: mouseArea.onCanceled()
-                onReleased: mouseArea.onReleased(mouse)
-            }
-        }
-
-        Row {
-            anchors.centerIn: parent
-
-            spacing: 8 * Units.dp
-
-            Image {
-                id: image
-                anchors.verticalCenter: parent.verticalCenter
-                source: control.iconSource
-                width: 24 * Units.dp
-                height: width
-            }
-
-            Label {
-                id: label
-                anchors.verticalCenter: parent.verticalCenter
-                text: control.iconSource !== "" ? "" : control.text
-                style: "button"
-                color: Theme.lightDark(Theme.primaryColor, Theme.light.textColor,
-                                                           Theme.dark.textColor)
-                visible: text == ""
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/styles/qmldir b/prototype_2016/third_party/qml-material/src/styles/qmldir
deleted file mode 100644
index 06d164b..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/qmldir
+++ /dev/null
@@ -1,12 +0,0 @@
-module QtQuick.Controls.Styles.Material
-
-ApplicationWindowStyle 0.1 ApplicationWindowStyle.qml
-ButtonStyle 0.1 ButtonStyle.qml
-CheckBoxStyle 0.1 CheckBoxStyle.qml
-ProgressBarStyle 0.1 ProgressBarStyle.qml
-SwitchStyle 0.1 SwitchStyle.qml
-ToolBarStyle.qml 0.1 ToolBarStyle.qml
-ToolButtonStyle.qml 0.1 ToolButtonStyle.qml
-RadioButtonStyle 0.1 RadioButtonStyle.qml
-SliderStyle 0.1 SliderStyle.qml
-TextFieldStyle 0.1 TextFieldStyle.qml
diff --git a/prototype_2016/third_party/qml-material/src/styles/styles.qrc b/prototype_2016/third_party/qml-material/src/styles/styles.qrc
deleted file mode 100644
index fdf547a..0000000
--- a/prototype_2016/third_party/qml-material/src/styles/styles.qrc
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/QtQuick/Controls/Styles/Material">
-        <file>ApplicationWindowStyle.qml</file>
-        <file>ButtonStyle.qml</file>
-        <file>CheckBoxStyle.qml</file>
-        <file>ProgressBarStyle.qml</file>
-        <file>RadioButtonStyle.qml</file>
-        <file>SliderStyle.qml</file>
-        <file>SwitchStyle.qml</file>
-        <file>TextFieldStyle.qml</file>
-        <file>ToolBarStyle.qml</file>
-        <file>ToolButtonStyle.qml</file>
-        <file>qmldir</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/window/ActionBar.qml b/prototype_2016/third_party/qml-material/src/window/ActionBar.qml
deleted file mode 100644
index e659d76..0000000
--- a/prototype_2016/third_party/qml-material/src/window/ActionBar.qml
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.3
-import Material.ListItems 0.1 as ListItem
-
-/*!
-   \qmltype ActionBar
-   \inqmlmodule Material
-
-   \brief An action bar holds the title and actions displayed in the application toolbar.
-
-   The reason this exists separately from \l Toolbar is for animation purposes.
-   Each page contains its own \c ActionBar, and when the application transitions
-   between pages, the toolbar animates the transition between action bars.
-
-   Normally, you don't need to manually create an instance of this class, and just
-   use the instance provided by the page. See the example in the \l Page documentation
-   for more details.
- */
-Item {
-    id: actionBar
-
-    implicitHeight: 1 * Device.gridUnit * Units.dp
-
-    anchors {
-        left: parent.left
-        right: parent.right
-    }
-
-    /*!
-       A list of actions to show in the action bar. These actions will be shown
-       anchored to the right, and will overflow if there are more than the
-       maximum number of actions as defined in \l maxActionCount.
-
-       When used with a page, the actions will be set to the page's \l Page::actions
-       property, so set that instead of changing this directly.
-     */
-    property list<Action> actions
-
-    /*!
-       The back action to display to the left of the title in the action bar.
-       When used with a page, this will pick up the page's back action, which
-       by default is a back arrow when there is a page behind the current page
-       on the page stack. However, you can customize this, for example, to show
-       a navigation drawer at the root of your app.
-
-       When using an action bar in a page, set the \l Page::backAction instead of
-       directly setting this property.
-     */
-    property Action backAction
-
-    /*!
-       The background color of the window decoration when the action bar's page is active,
-       usually a darker version of the \l backgroundColor.
-       By default this is the primary dark color defined in \l Theme::primaryDarkColor
-     */
-    property color decorationColor: Theme.primaryDarkColor
-
-    /*!
-       The background color for the toolbar when the action bar's page is active.
-       By default this is the primary color defined in \l Theme::primaryColor
-     */
-    property color backgroundColor: Theme.primaryColor
-
-    /*!
-       \qmlproperty Item customContent
-
-       A custom view to show instead of the title in the action bar.
-     */
-    property alias customContent: customContentView.data
-
-    /*!
-       \qmlproperty Item extendedContent
-
-       A custom view to show under the row containing the title and actions.
-       Causes the action bar to be extend in height to contain this view.
-     */
-    property alias extendedContent: extendedContentView.data
-
-    /*!
-       The elevation of the action bar. Set to 0 if you want have a header or some
-       other view below the action bar that you want to appear as part of the action bar.
-     */
-    property int elevation: 2
-
-    /*!
-       \internal
-       The height of the extended content view.
-     */
-    readonly property int extendedHeight: extendedContentView.height +
-            (tabBar.visible && !integratedTabBar ? tabBar.height : 0)
-
-    /*!
-       Set to true to hide the action bar. This is used when displaying an
-       action bar in a toolbar through the use of a page and the page stack.
-       If you are using an action bar for custom purposes, set the opacity or visibility
-       instead.
-     */
-    property bool hidden: false
-
-    /*!
-     * \internal
-     * The size of the left icon and the action icons.
-     *
-     * \since 0.3
-     */
-    property int iconSize: Units.gridUnit == 48 * Units.dp ? 20 * Units.dp : 24 * Units.dp
-
-    /*!
-     * Set to true to integrate the tab bar into a single row with the actions.
-     *
-     * \since 0.3
-     */
-    property bool integratedTabBar: false
-
-    /*!
-       The maximum number of actions that can be displayed before they spill over
-       into a drop-down menu. When using an action bar with a page, this inherits
-       from the global \l Toolbar::maxActionCount. If you are using an action bar
-       for custom purposes outside of a toolbar, this defaults to \c 3.
-     */
-    property int maxActionCount: toolbar ? toolbar.maxActionCount : 3
-
-    /*!
-       The index of the selected tab. This will be an index from the \l tabs
-       property.
-     */
-    property alias selectedTabIndex: tabBar.selectedIndex
-
-    /*!
-       The tab bar displayed below the actions in the action bar. Exposed for
-       additional customization.
-     */
-    property alias tabBar: tabBar
-
-    /*!
-       The model to use as the tab items in the action bar. This can either be a Javascript
-       array wih an object for each tab, or it can be a TabView object to display tabs for.
-
-       If it is a Javascript array, each object represents one tab, and can either be a simple
-       string (used as the tab title), or an object with title, iconName, and/or iconSource
-       properties.
-
-       If it is a TabView component, the title of each Tab object will be used, as well as
-       iconName and iconSource properties if present (as provided by the Material subclass of Tab).
-
-       When used in a page, this will be set to the tabs of the page, so set the \l Page::tabs
-       property instead of changing this directly.
-     */
-    property alias tabs: tabBar.tabs
-
-    /*!
-       The title displayed in the action bar. When used in a page, the title will
-       be set to the title of the page, so set the \l Page::title property instead
-       of changing this directly.
-     */
-    property string title
-
-    /*!
-       \internal
-       The toolbar containing this action bar.
-     */
-    property Item toolbar
-
-    property int leftKeyline: label.x
-
-    /*!
-       \internal
-       \qmlproperty bool overflowMenuShowing
-
-       Returns \c true if the overflow menu is open.
-     */
-    readonly property alias overflowMenuShowing: overflowMenu.showing
-
-    /*!
-       \internal
-
-       Returns true if the overflow menu is available.
-     */
-    readonly property bool overflowMenuAvailable: __internal.visibleActions.length > maxActionCount
-
-    /*!
-       \internal
-
-       Opens the overflow menu, if it is present and not already open open.
-     */
-    function openOverflowMenu() {
-        if (overflowMenuAvailable && !overflowMenuShowing)
-            overflowMenu.open(overflowButton, 4 * Units.dp, -4 * Units.dp);
-    }
-
-    /*!
-       \internal
-
-       Closes the overflow menu, if it is present and already open open.
-     */
-    function closeOverflowMenu() {
-        if (overflowMenuAvailable && overflowMenuShowing)
-            overflowMenu.close();
-    }
-
-    QtObject {
-        id: __internal
-
-        property var visibleActions: Utils.filter(actions, function(action) {
-            return action.visible
-        })
-    }
-
-    IconButton {
-        id: leftItem
-
-        anchors {
-            verticalCenter: actionsRow.verticalCenter
-            left: parent.left
-            leftMargin: leftItem.show ? 16 * Units.dp : -leftItem.width
-
-            Behavior on leftMargin {
-                NumberAnimation { duration: 200 }
-            }
-        }
-
-        color: Theme.lightDark(actionBar.backgroundColor, Theme.light.iconColor,
-                                                            Theme.dark.iconColor)
-        size: iconSize
-        action: backAction
-
-        opacity: show ? enabled ? 1 : 0.6 : 0
-        visible: opacity > 0
-
-        Behavior on opacity {
-            NumberAnimation { duration: 200 }
-        }
-
-        property bool show: backAction && backAction.visible
-    }
-
-    Label {
-        id: label
-
-        anchors {
-            verticalCenter: actionsRow.verticalCenter
-            left: parent.left
-            right: actionsRow.left
-            leftMargin:16 * Units.dp + (leftItem.show ? 1 * Device.gridUnit * Units.dp : 0)
-            rightMargin: 16 * Units.dp
-
-            Behavior on leftMargin {
-                NumberAnimation { duration: 200 }
-            }
-        }
-
-        visible: customContentView.children.length === 0 &&
-                (!integratedTabBar || !tabBar.visible)
-
-        textFormat: Text.PlainText
-        text: actionBar.title
-        style: "title"
-        color: Theme.lightDark(actionBar.backgroundColor, Theme.light.textColor,
-                                                            Theme.dark.textColor)
-        elide: Text.ElideRight
-    }
-
-    Row {
-        id: actionsRow
-
-        anchors {
-            right: parent.right
-            rightMargin: 16 * Units.dp
-        }
-
-        height: parent.implicitHeight
-
-        spacing: 24 * Units.dp
-
-        Repeater {
-            model: __internal.visibleActions.length > maxActionCount
-                    ? maxActionCount - 1
-                    : __internal.visibleActions.length
-
-            delegate: IconButton {
-                id: iconAction
-
-                objectName: "action/" + action.objectName
-
-                action: __internal.visibleActions[index]
-
-                color: Theme.lightDark(actionBar.backgroundColor, Theme.light.iconColor,
-                                                                  Theme.dark.iconColor)
-                size: iconSize
-
-                anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-            }
-        }
-
-        IconButton {
-            id: overflowButton
-
-            iconName: "navigation/more_vert"
-            objectName: "action/overflow"
-            size: 27 * Units.dp
-            color: Theme.lightDark(actionBar.backgroundColor, Theme.light.iconColor,
-                                                              Theme.dark.iconColor)
-            visible: actionBar.overflowMenuAvailable
-            anchors.verticalCenter: parent.verticalCenter
-
-            onClicked: openOverflowMenu()
-        }
-    }
-
-    Item {
-        id: customContentView
-
-        height: parent.height
-
-        anchors {
-            left: label.left
-            right: label.right
-        }
-    }
-
-    Item {
-        id: extendedContentView
-        anchors {
-            top: actionsRow.bottom
-            left: label.left
-            right: parent.right
-            rightMargin: 16 * Units.dp
-        }
-
-        height: childrenRect.height
-    }
-
-    TabBar {
-        id: tabBar
-
-        darkBackground: Theme.isDarkColor(actionBar.backgroundColor)
-        leftKeyline: actionBar.leftKeyline
-        height: integratedTabBar ? parent.implicitHeight : implicitHeight
-
-        anchors {
-            top: integratedTabBar ? undefined : extendedContentView.bottom
-            bottom: integratedTabBar ? actionsRow.bottom : undefined
-            left: parent.left
-            right: integratedTabBar ? actionsRow.left : parent.right
-        }
-    }
-
-    Dropdown {
-        id: overflowMenu
-        objectName: "overflowMenu"
-
-        width: 250 * Units.dp
-        height: columnView.height + 16 * Units.dp
-
-        ColumnLayout {
-            id: columnView
-            width: parent.width
-            anchors.centerIn: parent
-
-            Repeater {
-                model: __internal.visibleActions.length - (maxActionCount - 1)
-
-                ListItem.Standard {
-                    id: listItem
-
-                    objectName: "action/" + action.objectName
-
-                    property Action action: __internal.visibleActions[index + maxActionCount - 1]
-
-                    text: action.name
-                    iconSource: action.iconSource
-                    enabled: action.enabled
-
-                    onClicked: {
-                        action.triggered(listItem)
-                        overflowMenu.close()
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/AppTheme.qml b/prototype_2016/third_party/qml-material/src/window/AppTheme.qml
deleted file mode 100644
index bef7e30..0000000
--- a/prototype_2016/third_party/qml-material/src/window/AppTheme.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype AppTheme
-   \inqmlmodule Material
-
-   \brief A helper class used in \l ApplicationWindow to set your app's theme colors.
- */
-QtObject {
-    id: appTheme
-
-    /*!
-       The accent theme color used in your app for a highlight color in many UI components.
-       This is a helper property to set \l Theme::accentColor.
-     */
-    property string accentColor
-
-    /*!
-       The default background color used throughout the app. This is a helper property
-       to set \l Theme::backgroundColor.
-     */
-    property string backgroundColor
-    property string tabHighlightColor
-
-
-    /*!
-       The primary theme color used in your app for the toolbar and other primary UI elements.
-       This is a helper property to set \l Theme::primaryColor.
-     */
-    property string primaryColor
-
-    /*!
-       A darker version of the primary theme color used by the system status bar and
-       window decorations. This is a helper property to set \l Theme::primaryDarkColor.
-     */
-    property string primaryDarkColor: primaryColor
-
-    onPrimaryColorChanged: Theme.primaryColor = getColor(primaryColor, "500")
-    onPrimaryDarkColorChanged: Theme.primaryDarkColor = getColor(primaryDarkColor, "700")
-    onAccentColorChanged: Theme.accentColor = getColor(accentColor, "A200")
-    onBackgroundColorChanged: Theme.backgroundColor = getColor(backgroundColor, "500")
-    onTabHighlightColorChanged: Theme.tabHighlightColor = getColor(tabHighlightColor, "500")
-
-    function getColor(color, shade) {
-        if (Palette.colors.hasOwnProperty(color)) {
-            return Palette.colors[color][shade]
-        } else {
-            return color
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/ApplicationWindow.qml b/prototype_2016/third_party/qml-material/src/window/ApplicationWindow.qml
deleted file mode 100644
index e4a2171..0000000
--- a/prototype_2016/third_party/qml-material/src/window/ApplicationWindow.qml
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Window 2.2
-import Material 0.3
-import Material.Extras 0.1
-
-/*!
-   \qmltype ApplicationWindow
-   \inqmlmodule Material
-
-   \brief A window that provides features commonly used for Material Design apps.
-
-   This is normally what you should use as your root component. It provides a \l Toolbar and
-   \l PageStack to provide access to standard features used by Material Design applications.
-
-   Here is a short working example of an application:
-
-   \qml
-   import QtQuick 2.4
-   import Material 0.3
-
-   ApplicationWindow {
-       title: "Application Name"
-
-       initialPage: page
-
-       Page {
-           id: page
-           title: "Page Title"
-
-           Label {
-               anchors.centerIn: parent
-               text: "Hello World!"
-           }
-       }
-   }
-   \endqml
-*/
-Controls.ApplicationWindow {
-    id: app
-
-    /*!
-       Set to \c true to include window decorations in your app's toolbar and hide
-       the regular window decorations header.
-     */
-    property bool clientSideDecorations: false
-
-    /*!
-       \qmlproperty Page initialPage
-
-       The initial page shown when the application starts.
-     */
-    property alias initialPage: __pageStack.initialItem
-
-    /*!
-       \qmlproperty PageStack pageStack
-
-       The \l PageStack used for controlling pages and transitions between pages.
-     */
-    property alias pageStack: __pageStack
-
-    /*!
-       \qmlproperty AppTheme theme
-
-       A grouped property that allows the application to customize the the primary color, the
-       primary dark color, and the accent color. See \l Theme for more details.
-     */
-    property alias theme: __theme
-
-    AppTheme {
-        id: __theme
-    }
-
-    PlatformExtensions {
-        id: platformExtensions
-        decorationColor: __toolbar.decorationColor
-        window: app
-    }
-
-    PageStack {
-        id: __pageStack
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: __toolbar.bottom
-            bottom: parent.bottom
-        }
-
-        onPushed: __toolbar.push(page)
-        onPopped: __toolbar.pop(page)
-        onReplaced: __toolbar.replace(page)
-    }
-
-    Toolbar {
-        id: __toolbar
-        clientSideDecorations: app.clientSideDecorations
-    }
-
-    OverlayLayer {
-        id: dialogOverlayLayer
-        objectName: "dialogOverlayLayer"
-    }
-
-    OverlayLayer {
-        id: tooltipOverlayLayer
-        objectName: "tooltipOverlayLayer"
-    }
-
-    OverlayLayer {
-        id: overlayLayer
-    }
-
-    width: dp(800)
-    height: dp(600)
-
-    Dialog {
-        id: errorDialog
-
-        property var promise
-
-        positiveButtonText: "Retry"
-
-        onAccepted: {
-            promise.resolve()
-            promise = null
-        }
-
-        onRejected: {
-            promise.reject()
-            promise = null
-        }
-    }
-
-    /*!
-       Show an error in a dialog, with the specified secondary button text (defaulting to "Close")
-       and an optional retry button.
-
-       Returns a promise which will be resolved if the user taps retry and rejected if the user
-       cancels the dialog.
-     */
-    function showError(title, text, secondaryButtonText, retry) {
-        if (errorDialog.promise) {
-            errorDialog.promise.reject()
-            errorDialog.promise = null
-        }
-
-        errorDialog.negativeButtonText = secondaryButtonText ? secondaryButtonText : "Close"
-        errorDialog.positiveButton.visible = retry || false
-
-        errorDialog.promise = new Promises.Promise()
-        errorDialog.title = title
-        errorDialog.text = text
-        errorDialog.open()
-
-        return errorDialog.promise
-    }
-
-    // Units
-
-    function dp(dp) {
-        return dp * Units.dp
-    }
-
-    function gu(gu) {
-        return units.gu(gu)
-    }
-
-    UnitsHelper {
-        id: units
-    }
-
-    Component.onCompleted: {
-        if (clientSideDecorations)
-            flags |= Qt.FramelessWindowHint
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/MainView.qml b/prototype_2016/third_party/qml-material/src/window/MainView.qml
deleted file mode 100644
index f33c45b..0000000
--- a/prototype_2016/third_party/qml-material/src/window/MainView.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Window 2.2
-import Material 0.3
-
-/*!
-   \qmltype MainView
-   \inqmlmodule Material
-
-   \brief A root component with support for overlays and configuring the app theme.
- */
-Item {
-    id: mainView
-
-    /*!
-       \qmlproperty AppTheme theme
-
-       A grouped property that allows the application to customize the the primary color, the
-       primary dark color, and the accent color. See \l Theme for more details.
-     */
-    property alias theme: __theme
-
-    AppTheme {
-        id: __theme
-    }
-
-    PlatformExtensions {
-        id: platformExtensions
-    }
-
-    OverlayLayer {
-        id: dialogOverlayLayer
-        objectName: "dialogOverlayLayer"
-        z: 100
-    }
-
-    OverlayLayer {
-        id: tooltipOverlayLayer
-        objectName: "tooltipOverlayLayer"
-        z: 100
-    }
-
-    OverlayLayer {
-        id: overlayLayer
-        z: 100
-    }
-
-    width: dp(800)
-    height: dp(600)
-
-    // Units
-
-    function dp(dp) {
-        return dp * Units.dp
-    }
-
-    function gu(gu) {
-        return units.gu(gu)
-    }
-
-    UnitsHelper {
-        id: units
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/NavigationDrawer.qml b/prototype_2016/third_party/qml-material/src/window/NavigationDrawer.qml
deleted file mode 100644
index 39a9545..0000000
--- a/prototype_2016/third_party/qml-material/src/window/NavigationDrawer.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2015 Pierre Jacquier <pierrejacquier39@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-
-/*!
-   \qmltype NavigationDrawer
-   \inqmlmodule Material
-
-   \brief The navigation drawer slides in from the left and is a common pattern in apps.
- */
-PopupBase {
-    id: navDrawer
-    objectName: "navDrawer"
-
-    overlayLayer: "dialogOverlayLayer"
-    overlayColor: Qt.rgba(0, 0, 0, 0.3)
-
-    width: Math.min(parent.width - 1 * Device.gridUnit * Units.dp, 5 * Device.gridUnit * Units.dp)
-
-    anchors {
-        left: mode === "left" ? parent.left : undefined
-        right: mode === "right" ? parent.right : undefined
-        top: parent.top
-        bottom: parent.bottom
-
-        leftMargin: showing ? 0 : -width - 10 * Units.dp
-        rightMargin: showing ? 0 : -width - 10 * Units.dp
-
-        Behavior on leftMargin {
-            NumberAnimation { duration: 200 }
-        }
-        Behavior on rightMargin {
-            NumberAnimation { duration: 200 }
-        }
-    }
-
-    property string mode: "left" // or "right"
-
-    property alias enabled: action.visible
-
-    readonly property Action action: action
-
-    onEnabledChanged: {
-        if (!enabled)
-            close()
-    }
-
-    Action {
-        id: action
-        iconName: "navigation/menu"
-        name: "Navigation Drawer"
-        onTriggered: navDrawer.toggle()
-    }
-
-    View {
-        anchors.fill: parent
-        fullHeight: true
-        elevation: 3
-        backgroundColor: "white"
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/NavigationDrawerPage.qml b/prototype_2016/third_party/qml-material/src/window/NavigationDrawerPage.qml
deleted file mode 100644
index 5344a90..0000000
--- a/prototype_2016/third_party/qml-material/src/window/NavigationDrawerPage.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-
-Page {
-    id: navPage
-
-    backAction: navDrawer.action
-    title: page.title
-    actions: page.actions
-    actionBar.backgroundColor: page.actionBar.backgroundColor
-    actionBar.decorationColor: page.actionBar.decorationColor
-
-    property var navDrawer
-
-    property var page
-
-    function navigate(page) {
-        navPage.page = page
-        navDrawer.close()
-    }
-
-    onNavDrawerChanged: navDrawer.parent = navPage
-
-    onPageChanged: stackView.push({ item: page, replace: true })
-
-    Controls.StackView {
-        id: stackView
-        anchors.fill: parent
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/Page.qml b/prototype_2016/third_party/qml-material/src/window/Page.qml
deleted file mode 100644
index 51007dd..0000000
--- a/prototype_2016/third_party/qml-material/src/window/Page.qml
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import Material 0.3
-
-/*!
-   \qmltype Page
-   \inqmlmodule Material
-
-   \brief Represents a page on the navigation page stack.
-
-   Example:
-
-   \qml
-   import QtQuick 2.4
-   import Material 0.3
-
-   Page {
-       title: "Application Name"
-
-       actions: [
-           Action {
-               name: "Print"
-
-               // Icon name from the Google Material Design icon pack
-               iconName: "action/print"
-           }
-       ]
-
-       actionBar {
-           // Set a custom background color, if you don't want to use
-           // the theme's primary color
-           backgroundColor: Palette.colors.red["500"]
-
-           // You can also set a custom content view instead of the title
-           customContent: TextField {
-               placeholderText: "Search..."
-               anchors {
-                   left: parent.left
-                   right: parent.right
-                   verticalCenter: parent.verticalCenter
-               }
-           }
-       }
-   }
-   \endqml
- */
-FocusScope {
-    id: page
-
-    /*
-      \qmlproperty ActionBar actionBar
-
-      The action bar for this page. Use it as a group property to customize
-      this page's action bar. See the \l Page example for details on how to use
-      this property.
-     */
-    property alias actionBar: __actionBar
-
-    /*!
-       The page's actions shown in the action bar.
-     */
-    property list<Action> actions
-
-    /*!
-       The action shown to the left of the title in the action bar. By default,
-       this is a back button which shows when there is a page behind the current
-       page in the page stack. However, you can replace it with your own action,
-       for example, an icon to open a navigation drawer when on your root page.
-     */
-    property Action backAction: Action {
-        name: "Back"
-        iconName: "navigation/arrow_back"
-        onTriggered: page.pop()
-        visible: canGoBack
-    }
-
-    /*!
-       The background color of the page. Defaults to the global background color
-       defined in \l Theme::backgroundColor
-     */
-    property color backgroundColor: Theme.backgroundColor
-
-    /*!
-       \internal
-       Set by the page stack to true if there is a page behind this page on the
-       page stack.
-     */
-    property bool canGoBack: false
-
-    /*!
-       \internal
-       The default property is set to the content view so the page's content
-       properly fits in with left or right sidebars.
-     */
-    default property alias data: content.data
-
-    /*!
-       \qmlproperty PageSidebar rightSidebar
-       A sidebar to show on the right of the page. This will have its own
-       action bar and title, which will split the toolbar into two action bars.
-     */
-    property Item rightSidebar
-
-    /*!
-       The index of the selected tab. This will be an index from the \l tabs
-       property.
-     */
-    property alias selectedTabIndex: __actionBar.selectedTabIndex
-
-    /*!
-       The tab bar displayed below the actions in the action bar. Exposed for
-       additional customization.
-     */
-    property alias tabBar: __actionBar.tabBar
-
-    /*!
-       The model to use as the tab items in the action bar. This can either be a Javascript
-       array wih an object for each tab, or it can be a TabView object to display tabs for.
-
-       If it is a Javascript array, each object represents one tab, and can either be a simple
-       string (used as the tab title), or an object with title, iconName, and/or iconSource
-       properties.
-
-       If it is a TabView component, the title of each Tab object will be used, as well as
-       iconName and iconSource properties if present (as provided by the Material subclass of Tab).
-     */
-    property alias tabs: __actionBar.tabs
-
-    /*!
-       The title of the page shown in the action bar.
-     */
-    property string title
-
-    /*!
-       This signal is emitted when the back action is triggered or back key is released.
-
-       By default, the page will be popped from the page stack. To change the default
-       behavior, for example to show a confirmation dialog, listen for this signal using
-       \c onGoBack and set \c event.accepted to \c true. To dismiss the page from your
-       dialog without triggering this signal and re-showing the dialog, call
-       \c page.forcePop().
-     */
-    signal goBack(var event)
-
-    /*!
-       Pop this page from the page stack. This does nothing if this page is not
-       the current page on the page stack.
-
-       Use \c force to avoid calling the \l goBack signal. This is useful if you
-       use the \l goBack signal to show a confirmation dialog, and want to close
-       the page from your dialog without showing the dialog again. You can also
-       use \c forcePop() as a shortcut to this behavior.
-     */
-    function pop(event, force) {
-        if (Controls.Stack.view.currentItem !== page)
-            return false
-
-        if (!event)
-            event = {accepted: false}
-
-        if (!force)
-            goBack(event)
-
-        if (event.accepted) {
-            return true
-        } else {
-            return Controls.Stack.view.pop()
-        }
-    }
-
-    function forcePop() {
-        pop(null, true)
-    }
-
-    /*!
-       Push the specified component onto the page stack.
-     */
-    function push(component, properties) {
-        return Controls.Stack.view.push({item: component, properties: properties});
-    }
-
-    onRightSidebarChanged: {
-        if (rightSidebar)
-            rightSidebar.mode = "right"
-    }
-
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Back) {
-            // When the Android back button is tapped
-            if (__actionBar.overflowMenuShowing) {
-                // Close the action bar overflow menu if it's open
-                __actionBar.closeOverflowMenu();
-                event.accepted = true;
-            } else {
-                // Or pop the page from the page stack
-                if (pop()) {
-                    event.accepted = true;
-                }
-            }
-        } else if (event.key === Qt.Key_Menu) {
-            // Display or hide the action bar overflow menu when the Android menu button is tapped
-            if (__actionBar.overflowMenuAvailable) {
-                if (__actionBar.overflowMenuShowing) {
-                    __actionBar.closeOverflowMenu();
-                } else {
-                    __actionBar.openOverflowMenu();
-                }
-                event.accepted = true;
-            }
-        }
-    }
-
-    ActionBar {
-        id: __actionBar
-
-        title: page.title
-        backAction: page.backAction
-        actions: page.actions
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        color: backgroundColor
-    }
-
-    Item {
-        id: content
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            left: parent.left
-            right: rightSidebarContent.left
-        }
-    }
-
-    Item {
-        id: rightSidebarContent
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            right: parent.right
-        }
-
-        children: [rightSidebar]
-
-        width: rightSidebar
-               ? rightSidebar.width + rightSidebar.anchors.rightMargin
-               : 0
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/PageSidebar.qml b/prototype_2016/third_party/qml-material/src/window/PageSidebar.qml
deleted file mode 100644
index 91f9e7d..0000000
--- a/prototype_2016/third_party/qml-material/src/window/PageSidebar.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import Material 0.3
-
-/*!
-   \qmltype PageSidebar
-   \inqmlmodule Material
-
-   \brief Represents a split sidebar in a page, with its own title, actions, and color
-   in the action bar.
- */
-Page {
-    id: pageSidebar
-
-    default property alias sidebar: sidebar.data
-    property alias mode: sidebar.mode
-    property bool showing: true
-
-    anchors {
-        rightMargin: showing ? 0 : -width
-
-        Behavior on rightMargin {
-            id: behavior
-            enabled: false
-
-            NumberAnimation { duration: 200 }
-        }
-    }
-
-    height: parent.height
-
-    Sidebar {
-        id: sidebar
-
-        anchors.fill: parent
-    }
-
-    Component.onCompleted: behavior.enabled = true
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/PageStack.qml b/prototype_2016/third_party/qml-material/src/window/PageStack.qml
deleted file mode 100644
index 11fc2b9..0000000
--- a/prototype_2016/third_party/qml-material/src/window/PageStack.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import Material 0.3
-
-/*!
-   \qmltype PageStack
-   \inqmlmodule Material
-
-   \brief Manages the page stack used for navigation.
-*/
-Controls.StackView {
-    id: stackView
-
-    signal pushed(Item page)
-    signal popped(Item page)
-    signal replaced(Item page)
-
-    property int __lastDepth: 0
-    property Item __oldItem: null
-
-    onCurrentItemChanged: {
-        if (stackView.currentItem) {
-            stackView.currentItem.canGoBack = stackView.depth > 1;
-            stackView.currentItem.forceActiveFocus()
-
-            if (__lastDepth > stackView.depth) {
-                popped(stackView.currentItem);
-            } else if (__lastDepth < stackView.depth) {
-                pushed(stackView.currentItem);
-            } else {
-                replaced(stackView.currentItem);
-            }
-        }
-
-        __lastDepth = stackView.depth;
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/Sidebar.qml b/prototype_2016/third_party/qml-material/src/window/Sidebar.qml
deleted file mode 100644
index 7954294..0000000
--- a/prototype_2016/third_party/qml-material/src/window/Sidebar.qml
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import "ListItems" as ListItem
-
-/*!
-   \qmltype Sidebar
-   \inqmlmodule Material
-
-   \brief A sidebar component for use in adaptive layouts
-
-   To use, simply add an instance to your code, and anchor other components to it.
-
-   To show or hide, set the expanded property.
-
-   By default, the sidebar has a flickable built in, and whatever contents are added
-   will be placed in the flickable. When you want this disabled, or want to fill the
-   entire sidebar, set the autoFill property to false.
-
-   Examples:
-   \qml
-   Item{
-       property bool wideAspect: width > gu(80)
-
-       Sidebar {
-           expanded: wideAspect
-
-           // Anchoring is automatic
-       }
-   }
-   \endqml
- */
-View {
-    id: root
-
-    backgroundColor: style === "default" ? "white" : "#333"
-
-    anchors {
-        left: mode === "left" ? parent.left : undefined
-        right: mode === "right" ? parent.right : undefined
-        top: parent.top
-        bottom: parent.bottom
-        leftMargin: expanded ? 0 : -width
-        rightMargin: expanded ? 0 : -width
-    }
-
-    width: 250 * Units.dp
-
-    property bool expanded: true
-
-    property string mode: "left" // or "right"
-    property alias header: headerItem.text
-
-    property color borderColor: style === "dark" ? Qt.rgba(0.5,0.5,0.5,0.5) : Theme.light.dividerColor
-
-    property bool autoFlick: true
-
-    default property alias contents: contents.data
-
-    Behavior on anchors.leftMargin {
-        NumberAnimation { duration: 200 }
-    }
-
-    Behavior on anchors.rightMargin {
-        NumberAnimation { duration: 200 }
-    }
-
-    Rectangle {
-        color: borderColor
-        width: 1
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            right: mode === "left" ? parent.right : undefined
-            left: mode === "right" ? parent.left : undefined
-            //rightMargin: -1
-        }
-    }
-
-    Item {
-        clip: true
-
-        anchors {
-            fill: parent
-            rightMargin: mode === "left" ? 1 : 0
-            leftMargin: mode === "right" ? 1 : 0
-        }
-
-        ListItem.Subheader {
-            id: headerItem
-
-            visible: text !== ""
-            backgroundColor: root.backgroundColor
-            elevation: flickable.atYBeginning ? 0 : 1
-            fullWidth: true
-            z: 2
-        }
-
-        Flickable {
-            id: flickable
-
-            clip: true
-
-            anchors {
-                top: headerItem.visible ? headerItem.bottom : parent.top
-                left: parent.left
-                right: parent.right
-                bottom: parent.bottom
-            }
-
-            contentWidth: width
-            contentHeight: autoFlick ? contents.height : height
-            interactive: contentHeight > height
-
-            Item {
-                id: contents
-
-                width: flickable.width
-                height: autoFlick ? childrenRect.height : flickable.height
-            }
-
-            function getFlickableChild(item) {
-                if (item && item.hasOwnProperty("children")) {
-                    for (var i=0; i < item.children.length; i++) {
-                        var child = item.children[i];
-                        if (internal.isVerticalFlickable(child)) {
-                            if (child.anchors.top === page.top || child.anchors.fill === page) {
-                                return item.children[i];
-                            }
-                        }
-                    }
-                }
-                return null;
-            }
-        }
-
-        Scrollbar {
-            flickableItem: flickable
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/TabBar.qml b/prototype_2016/third_party/qml-material/src/window/TabBar.qml
deleted file mode 100644
index 263866d..0000000
--- a/prototype_2016/third_party/qml-material/src/window/TabBar.qml
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-
-import Material 0.3
-import Material.ListItems 0.1
-
-Item {
-    id: tabBar
-
-    property bool centered: false
-
-    property var tabs: []
-    property int leftKeyline
-
-    property bool isLargeDevice: Device.type == Device.desktop || Device.type == Device.tablet
-
-    property bool fullWidth: isLargeDevice
-            ? false : width - maxTabsWidth <= 16 * Units.dp && tabsWidth <= width
-
-    property int tabsWidth: {
-        var width = 0
-
-        for (var i = 0; i < tabRow.children.length; i++) {
-            width += tabRow.children[i].implicitWidth
-        }
-
-        return width
-    }
-
-    property int maxTabsWidth: {
-        var tabWidth = 0
-
-        for (var i = 0; i < tabRow.children.length; i++) {
-            tabWidth = Math.max(tabRow.children[i].implicitWidth, tabWidth)
-        }
-
-        return tabWidth * tabRow.children.length
-    }
-
-    property int tabPadding: isLargeDevice ? 24 * Units.dp : 12 * Units.dp
-
-    property int tabMinWidth: isLargeDevice ? 160 * Units.dp : 72 * Units.dp
-
-    property int selectedIndex: 0
-
-    property bool darkBackground
-
-    property color highlightColor: Theme.tabHighlightColor
-    property color textColor: darkBackground ? Theme.dark.textColor : Theme.light.accentColor
-
-    property bool isTabView: String(tabs).indexOf("TabView") != -1
-
-    readonly property int tabCount: isTabView ? tabs.count : tabs.length
-
-    visible: tabCount > 0
-    implicitHeight: 48 * Units.dp
-
-    onTabCountChanged: {
-        selectedIndex = Math.min(selectedIndex, tabCount)
-    }
-
-    function removeTab(tab, index) {
-        if (tab.hasOwnProperty("close")) {
-            tab.close()
-        } else if (tabs.hasOwnProperty("removeTab")) {
-            tabs.removeTab(index)
-        }
-    }
-
-    property Item activeTab: selectedIndex < tabCount &&
-                             tabRow.children[selectedIndex] !== undefined
-            ? tabRow.children[selectedIndex] : null
-
-    property int activeTabX: activeTab ? activeTab.x : -1
-    property int activeTabWidth: activeTab ? activeTab.width : -1
-
-    property int __animated
-
-    onActiveTabChanged: __animated = false
-
-    Component.onCompleted: animateStablization.restart()
-
-    onActiveTabXChanged: {
-        if (activeTabX == -1)
-            return
-        if (__animated) {
-            selectionIndicator.x = activeTab.x
-        } else {
-            animateStablization.restart()
-        }
-    }
-    onActiveTabWidthChanged: {
-        if (activeTabWidth == -1)
-            return
-        if (__animated) {
-            selectionIndicator.width = activeTab.width
-        } else {
-            animateStablization.restart()
-        }
-    }
-
-    Timer {
-        id: animateStablization
-        interval: 5
-        onTriggered: {
-            __animated = true
-            seqX.to = activeTabX
-            seqWidth.to = activeTabWidth
-            selectionAnimation.restart()
-        }
-    }
-
-    ParallelAnimation {
-        id: selectionAnimation
-
-        NumberAnimation {
-            id: seqX
-            target: selectionIndicator; property: "x"; duration: 200
-        }
-        NumberAnimation {
-            id: seqWidth
-            target: selectionIndicator; property: "width"; duration: 200
-        }
-    }
-
-    Item {
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            left: centered ? undefined : parent.left
-            leftMargin: fullWidth ? 0 : Math.max(leftKeyline - tabPadding, 0)
-            horizontalCenter: centered ? parent.horizontalCenter : undefined
-        }
-
-        width: tabRow.width
-
-        Row {
-            id: tabRow
-
-            height: parent.height
-
-            Repeater {
-                id: repeater
-                model: isTabView ? tabs.count : tabs
-                delegate: tabDelegate
-            }
-        }
-
-        Rectangle {
-            id: selectionIndicator
-            anchors {
-                bottom: parent.bottom
-            }
-
-            height: 2 * Units.dp
-            color: tabBar.highlightColor
-        }
-    }
-
-    Component {
-        id: tabDelegate
-
-        View {
-            id: tabItem
-
-            width: tabBar.fullWidth ? tabBar.width/repeater.count : implicitWidth
-            height: tabBar.height
-
-            implicitWidth: isLargeDevice
-                    ? Math.min(2 * tabPadding + row.width, 264 * Units.dp)
-                    : Math.min(Math.max(2 * tabPadding + row.width, tabMinWidth), 264 * Units.dp)
-
-
-            property bool selected: index == tabBar.selectedIndex
-
-            property var tab: isTabView ? tabs.getTab(index) : modelData
-
-            Ink {
-                anchors.fill: parent
-                enabled: tab.enabled
-                onClicked: tabBar.selectedIndex = index
-
-                Row {
-                    id: row
-
-                    anchors.centerIn: parent
-                    spacing: 10 * Units.dp
-
-                    Icon {
-                        anchors.verticalCenter: parent.verticalCenter
-
-                        source: tabItem.tab.hasOwnProperty("iconSource")
-                                ? tabItem.tab.iconSource : tabItem.tab.hasOwnProperty("iconName")
-                                ? "icon://" + tabItem.tab.iconName : ""
-                        color: tabItem.selected
-                                ? darkBackground ? Theme.dark.iconColor : Theme.light.accentColor
-                                : darkBackground ? Theme.dark.shade(tab.enabled ? 0.6 : 0.2) : Theme.light.shade(tab.enabled ? 0.6 : 0.2)
-
-                        visible: source != "" && source != "icon://"
-
-                        Behavior on color {
-                            ColorAnimation { duration: 200 }
-                        }
-                    }
-
-                    Label {
-                        id: label
-
-                        text: typeof(tabItem.tab) == "string"
-                                ? tabItem.tab : tabItem.tab.title
-                        color: tabItem.selected
-                                ? darkBackground ? Theme.dark.textColor : Theme.light.accentColor
-                                : darkBackground ? Theme.dark.shade(tab.enabled ? 0.6 : 0.2) : Theme.light.shade(tab.enabled ? 0.6 : 0.2)
-
-                        style: "body2"
-                        font.capitalization: Font.AllUppercase
-                        anchors.verticalCenter: parent.verticalCenter
-                        maximumLineCount: 2
-
-                        Behavior on color {
-                            ColorAnimation { duration: 200 }
-                        }
-                    }
-
-                    IconButton {
-                        iconName: "navigation/close"
-                        visible: tab.hasOwnProperty("canRemove") && tab.canRemove && (tabs.hasOwnProperty("removeTab") || tab.hasOwnProperty("close"))
-                        color: tabItem.selected
-                                ? darkBackground ? Theme.dark.iconColor : Theme.light.accentColor
-                                : darkBackground ? Theme.dark.shade(tab.enabled ? 0.6 : 0.2) : Theme.light.shade(tab.enabled ? 0.6 : 0.2)
-                        onClicked: tabBar.removeTab(tab, index)
-                        size: 20 * Units.dp
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/TabbedPage.qml b/prototype_2016/third_party/qml-material/src/window/TabbedPage.qml
deleted file mode 100644
index 423abb8..0000000
--- a/prototype_2016/third_party/qml-material/src/window/TabbedPage.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls.Styles 1.3 as Styles
-
-/*!
-   \qmltype TabbedPage
-   \inqmlmodule Material
-
-   \brief A special page for tabs.
-
-   This adds a full-size TabView to a page add hooks up the tab bar to the TabView.
- */
-Page {
-    id: page
-
-    default property alias content: tabView.data
-
-    /*!
-     * The currently selected tab.
-     *
-     * \since 0.3
-     */
-    readonly property Tab selectedTab: tabView.count > 0
-            ? tabView.getTab(selectedTabIndex) : null
-
-    tabs: tabView
-
-    onSelectedTabIndexChanged: tabView.currentIndex = page.selectedTabIndex
-
-    Controls.TabView {
-        id: tabView
-
-        currentIndex: page.selectedTabIndex
-        anchors.fill: parent
-
-        tabsVisible: false
-
-        // Override the style to remove the frame
-        style: Styles.TabViewStyle {
-            frameOverlap: 0
-            frame: Item {}
-        }
-
-        onCurrentIndexChanged: page.selectedTabIndex = currentIndex
-
-        onCountChanged: {
-            for (var i = 0; i < count; i++) {
-                var tab = getTab(i)
-                if (tab.hasOwnProperty("index"))
-                    tab.index = i
-                if (tab.hasOwnProperty("__tabView"))
-                    tab.__tabView = tabView
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/Toolbar.qml b/prototype_2016/third_party/qml-material/src/window/Toolbar.qml
deleted file mode 100644
index b361adf..0000000
--- a/prototype_2016/third_party/qml-material/src/window/Toolbar.qml
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import QtQuick.Layouts 1.1
-import Material 0.3
-
-
-/*!
-   \qmltype Toolbar
-   \inqmlmodule Material
-
-   \brief Provides the container used to hold the action bar of pages.
-*/
-View {
-    id: toolbar
-
-    anchors {
-        top: parent.top
-        left: parent.left
-        right: parent.right
-    }
-
-    property int actionBarHeight: {
-        if (!page || page.actionBar.hidden)
-            return 0
-
-        var height = implicitHeight + page.actionBar.extendedHeight
-
-        if (page.rightSidebar && page.rightSidebar.showing) {
-            var sidebarHeight = implicitHeight + page.rightSidebar.actionBar.extendedHeight
-
-            height = Math.max(height, sidebarHeight)
-        }
-
-        return height
-    }
-    property int targetHeight: actionBarHeight
-    property int maxActionCount: Device.type === Device.desktop
-                                 ? 5 : Device.type === Device.tablet ? 4 : 3
-    property bool clientSideDecorations: false
-    property string color: "white"
-    property var page
-    property bool showBackButton
-
-    property color decorationColor: page && page.actionBar
-            ? page.actionBar.decorationColor
-            : Theme.primaryDarkColor
-
-    opacity: page && page.actionBar.hidden ? 0 : 1
-
-    backgroundColor: page ? page.actionBar.backgroundColor.a === 0
-                            ? page.backgroundColor : page.actionBar.backgroundColor
-                          : Theme.primaryColor
-
-    implicitHeight: 1 * Device.gridUnit * Units.dp
-    height: targetHeight
-    elevation: backgroundColor === page.color ? 0 : page.actionBar.elevation
-    fullWidth: true
-    clipContent: true
-
-    Behavior on decorationColor {
-        ColorAnimation { duration: MaterialAnimation.pageTransitionDuration }
-    }
-
-    Behavior on height {
-        NumberAnimation { duration: MaterialAnimation.pageTransitionDuration }
-    }
-
-    Behavior on opacity {
-        NumberAnimation { duration: MaterialAnimation.pageTransitionDuration }
-    }
-
-    function pop(page) {
-        stack.pop(page.actionBar)
-
-        if (page.rightSidebar && page.rightSidebar.actionBar)
-            rightSidebarStack.pop(page.rightSidebar.actionBar)
-        else
-            rightSidebarStack.pop(emptyRightSidebar)
-
-        toolbar.page = page
-    }
-
-    function push(page) {
-        stack.push(page.actionBar)
-
-        page.actionBar.toolbar = toolbar
-        toolbar.page = page
-
-        if (page.rightSidebar && page.rightSidebar.actionBar)
-            rightSidebarStack.push(page.rightSidebar.actionBar)
-        else
-            rightSidebarStack.push(emptyRightSidebar)
-    }
-
-    function replace(page) {
-        page.actionBar.maxActionCount = Qt.binding(function() { return toolbar.maxActionCount })
-        toolbar.page = page
-
-        stack.replace(page.actionBar)
-
-        if (page.rightSidebar && page.rightSidebar.actionBar)
-            rightSidebarStack.replace(page.rightSidebar.actionBar)
-        else
-            rightSidebarStack.replace(emptyRightSidebar)
-    }
-
-    Rectangle {
-        anchors.fill: rightSidebarStack
-
-        color: page.rightSidebar && page.rightSidebar.actionBar.backgroundColor
-               ? Qt.darker(page.rightSidebar.actionBar.backgroundColor,1).a === 0
-                 ? page.rightSidebar.color
-                 : page.rightSidebar.actionBar.backgroundColor
-               : Theme.primaryColor
-    }
-
-    Controls.StackView {
-        id: stack
-        height: actionBarHeight
-
-        Behavior on height {
-            NumberAnimation { duration: MaterialAnimation.pageTransitionDuration }
-        }
-
-        anchors {
-            left: parent.left
-            right: page && page.rightSidebar
-                   ? rightSidebarStack.left
-                   : clientSideDecorations ? windowControls.left : parent.right
-            rightMargin: 0
-        }
-
-        delegate: toolbarDelegate
-    }
-
-    Controls.StackView {
-        id: rightSidebarStack
-        height: actionBarHeight
-        width: page && page.rightSidebar
-               ? page.rightSidebar.width
-               : 0
-
-        Behavior on height {
-            NumberAnimation { duration: MaterialAnimation.pageTransitionDuration }
-        }
-
-        anchors {
-            right: clientSideDecorations ? windowControls.left : parent.right
-            rightMargin: page.rightSidebar ? page.rightSidebar.anchors.rightMargin : 0
-        }
-
-        delegate: toolbarDelegate
-    }
-
-    Controls.StackViewDelegate {
-        id: toolbarDelegate
-
-        pushTransition: Controls.StackViewTransition {
-            SequentialAnimation {
-                id: actionBarShowAnimation
-
-                ParallelAnimation {
-                    NumberAnimation {
-                        duration: MaterialAnimation.pageTransitionDuration
-                        target: enterItem
-                        property: "opacity"
-                        from: 0
-                        to: 1
-                    }
-
-                    NumberAnimation {
-                        duration: MaterialAnimation.pageTransitionDuration
-                        target: enterItem
-                        property: "y"
-                        from: enterItem.height
-                        to: 0
-                    }
-                }
-            }
-            SequentialAnimation {
-                id: previousHideAnimation
-
-                ParallelAnimation {
-
-                    NumberAnimation {
-                        duration: MaterialAnimation.pageTransitionDuration
-                        target: exitItem
-                        property: "opacity"
-                        to: 0
-                    }
-
-                    NumberAnimation {
-                        duration: MaterialAnimation.pageTransitionDuration
-                        target: exitItem
-                        property: "y"
-                        to: exitItem ? -exitItem.height : 0
-                    }
-                }
-            }
-        }
-    }
-
-    Row {
-        id: windowControls
-
-        visible: clientSideDecorations
-
-        anchors {
-            verticalCenter: stack.verticalCenter
-            right: parent.right
-            rightMargin: 16 * Units.dp
-        }
-
-        spacing: 24 * Units.dp
-
-        IconButton {
-            iconName: "navigation/close"
-            color: Theme.lightDark(toolbar.backgroundColor, Theme.light.textColor,
-                Theme.dark.textColor)
-            onClicked: Qt.quit()
-        }
-    }
-
-    Component {
-        id: emptyRightSidebar
-
-        Item {}
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/Window.qml b/prototype_2016/third_party/qml-material/src/window/Window.qml
deleted file mode 100644
index ebf3883..0000000
--- a/prototype_2016/third_party/qml-material/src/window/Window.qml
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import QtQuick 2.4
-import Material 0.3
-import QtQuick.Window 2.2
-
-/*!
-   \qmltype Window
-   \inqmlmodule Material
-
-   \brief A subclass of QtQuick.Window that provides some additional features for developing Applications
-   that conform to Material Design.
-
-   Here is a short working example of an application:
-
-   \qml
-   import QtQuick 2.4
-   import Material 0.3
-
-   Window {
-       title: "Application Name"
-   }
-   \endqml
-*/
-Window {
-    id: window
-
-    /*!
-       \qmlproperty AppTheme theme
-
-       A grouped property that allows the application to customize the the primary color, the
-       primary dark color, and the accent color. See \l Theme for more details.
-     */
-    property alias theme: __theme
-
-    PlatformExtensions {
-        id: platformExtensions
-        decorationColor: Theme.primaryDarkColor
-        window: window
-    }
-
-    AppTheme {
-        id: __theme
-    }
-
-    OverlayLayer {
-        id: dialogOverlayLayer
-        objectName: "dialogOverlayLayer"
-    }
-
-    OverlayLayer {
-        id: tooltipOverlayLayer
-        objectName: "tooltipOverlayLayer"
-    }
-
-    OverlayLayer {
-        id: overlayLayer
-    }
-
-    width: dp(800)
-    height: dp(600)
-
-    // Units
-
-    function dp(dp) {
-        return dp * Units.dp
-    }
-
-    function gu(gu) {
-        return units.gu(gu)
-    }
-
-    UnitsHelper {
-        id: units
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/src/window/window.qrc b/prototype_2016/third_party/qml-material/src/window/window.qrc
deleted file mode 100644
index 3fa81d0..0000000
--- a/prototype_2016/third_party/qml-material/src/window/window.qrc
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material">
-        <file>ActionBar.qml</file>
-        <file>AppTheme.qml</file>
-        <file>ApplicationWindow.qml</file>
-        <file>MainView.qml</file>
-        <file>NavigationDrawer.qml</file>
-        <file>NavigationDrawerPage.qml</file>
-        <file>Page.qml</file>
-        <file>PageSidebar.qml</file>
-        <file>PageStack.qml</file>
-        <file>Sidebar.qml</file>
-        <file>TabBar.qml</file>
-        <file>TabbedPage.qml</file>
-        <file>Toolbar.qml</file>
-        <file>Window.qml</file>
-</qresource>
-
-</RCC>