merge fluid_icons_problem

450 files changed, 13125 insertions, 17435 deletions

diff --git a/prototype_2016/Cargo.toml b/prototype_2016/Cargo.toml
index 20c764e..0af6aa8 100644
--- a/prototype_2016/Cargo.toml
+++ b/prototype_2016/Cargo.toml
@@ -1,10 +1,13 @@
 [package]
 name = "secushare"
 version = "0.0.1"
-#build = "build.rs"
+build = "build.rs"
 
 [dependencies]
-#qml = { path = "third_party/qml-rust", version = "0.0.5" }
+qml = ">=0.0.9"
 psyc = { path = "third_party/libpsyc/rust", version = "1.0" }
-futures = "0.1"
-tokio-core = "0.1"
+futures = ">=0.1"
+tokio-core = ">=0.1"
+
+[build-dependencies]
+fs-utils = "*"
diff --git a/prototype_2016/build-fluid.sh b/prototype_2016/build-fluid.sh
new file mode 100644
index 0000000..d4aef7c
--- /dev/null
+++ b/prototype_2016/build-fluid.sh
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+BUILD_DIR=$(pwd)/third_party/fluid/build
+TARGET_DIR=$(pwd)/target/$PROFILE
+
+mkdir $BUILD_DIR
+cd $BUILD_DIR
+
+cmake -DCMAKE_INSTALL_PREFIX=../install ..
+make install
+cp -R ../install/lib64/qml/Fluid/ $TARGET_DIR
diff --git a/prototype_2016/build-qml-material.sh b/prototype_2016/build-qml-material.sh
deleted file mode 100755
index b2ee46e..0000000
--- a/prototype_2016/build-qml-material.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-
-BUILD_DIR=$(pwd)/third_party/qml-material/build
-INSTALL_DIR=$BUILD_DIR/qml_modules
-
-#rm -rf $BUILD_DIR
-mkdir $BUILD_DIR
-cd $BUILD_DIR
-qtchooser -run-tool=qmake -qt=5 MODULE_INSTALL_PATH=$INSTALL_DIR ..
-make
-make install
diff --git a/prototype_2016/build.rs b/prototype_2016/build.rs
index 1bc7e06..126368d 100644
--- a/prototype_2016/build.rs
+++ b/prototype_2016/build.rs
@@ -1,38 +1,71 @@
+extern crate fs_utils;
+
 use std::process::Command;
-//use std::env;
-//use std::path::*;
+use std::str::from_utf8;
+use std::env;
+use std::path::Path;
+use std::fs;
+use fs_utils::*;
 
 fn main()
 {
-    Command::new("sh")
-        .arg("build-qml-material.sh")
+    let out_dir = env::var("OUT_DIR").unwrap();
+    let out_dir_path = Path::new(&out_dir);
+
+    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+    let resources_path = Path::new(&manifest_dir).join("resources");
+
+    let _ = fs::remove_dir_all(out_dir_path.join("resources"));
+    let path_res = copy::copy_directory(&resources_path, &out_dir_path);
+    let path = match path_res {
+        Ok(path) => path,
+        Err(err) => {
+            match err {
+                copy::Error::DestinationDirectoryExists(dir) => dir,
+                _ => panic!("failed to copy resources dir: {}", err),
+            }
+        }
+    };
+
+    let qml_lib_build_output = Command::new("sh")
+        .current_dir(&path)
+        .arg("build-resources-lib.sh")
         .output()
         .unwrap_or_else(|e| panic!("failed to execute process: {}", e));
 
-    Command::new("qtchooser")
-        .arg("-run-tool=rcc")
-        .arg("-binary")
-        .arg("-o")
-        .arg("resources.rcc")
-        .arg("icons/icons.qrc")
-        .arg("third_party/qml-material/fonts/fonts.qrc")
-        //.arg("third_party/qml-material/src/styles/styles.qrc")
-        //.arg("third_party/qml-material/src/components/components.qrc")
-        //.arg("third_party/qml-material/src/core/core.qrc")
-        //.arg("third_party/qml-material/src/listitems/listitems.qrc")
-        //.arg("third_party/qml-material/src/popups/popups.qrc")
-        //.arg("third_party/qml-material/src/extras/extras.qrc")
-        //.arg("third_party/qml-material/src/window/window.qrc")
-        //.arg("third_party/qml-material/src/material.qrc")
-        //.arg("third_party/qml-material/src/controls/controls.qrc")
-        //.arg("third_party/qml-material/icons/core_icons.qrc")
-        //.arg("third_party/qml-material/fonts/fonts.qrc")
+    if !qml_lib_build_output.status.success() {
+        panic!("Cannot build qml lib:\n{:#?}\n{:#?}",
+               to_utf(&qml_lib_build_output.stdout),
+               to_utf(&qml_lib_build_output.stderr));
+    }
+
+    let fluid_build_output = Command::new("sh")
+        .arg("build-fluid.sh")
         .output()
         .unwrap_or_else(|e| panic!("failed to execute process: {}", e));
 
-    //let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-    //let path = Path::new(&manifest_dir).join("third_party").join("qml-material").join("build").join("src");
+    if !fluid_build_output.status.success() {
+        panic!("Cannot build qml lib:\n{:#?}\n{:#?}",
+               to_utf(&fluid_build_output.stdout),
+               to_utf(&fluid_build_output.stderr));
+    }
+
+    println!("cargo:rerun-if-changed={}", resources_path.display());
+    println!("cargo:rerun-if-changed={}", resources_path.join("qml").display());
+    println!("cargo:rerun-if-changed={}", resources_path.join("qml").join("+material").display());
+    println!("cargo:rerun-if-changed={}", resources_path.join("qml").join("+universal").display());
+    println!("cargo:rerun-if-changed={}", resources_path.join("qml").join("Pages").join("Basic").display());
+    println!("cargo:rerun-if-changed={}", resources_path.join("qml").join("Pages").join("Material").display());
+    println!("cargo:rerun-if-changed={}", resources_path.join("qml").join("Pages").join("Navigation").display());
+    println!("cargo:rerun-if-changed={}", resources_path.join("qml").join("Pages").join("Style").display());
+    println!("cargo:rustc-link-search=native={}", path.display());
+    println!("cargo:rustc-link-lib=static=resources");
+    println!("cargo:rustc-link-lib=dylib=Qt5Svg");
+}
 
-    //println!("cargo:rustc-link-search=native={}", path.display());
-    //println!("cargo:rustc-link-lib=static=material");
+fn to_utf(buf: &[u8]) -> &str {
+    match from_utf8(buf) {
+        Ok(v) => v,
+        Err(e) => panic!("Invalid UTF-8 sequence: {}", e),
+    }
 }
diff --git a/prototype_2016/icons.yml b/prototype_2016/icons.yml
deleted file mode 100644
index b24452e..0000000
--- a/prototype_2016/icons.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-icons:
-  - action/search
-  - action/settings
diff --git a/prototype_2016/icons/action_search.svg b/prototype_2016/icons/action_search.svg
deleted file mode 100644
index be555cd..0000000
--- a/prototype_2016/icons/action_search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M31 28h-1.59l-.55-.55C30.82 25.18 32 22.23 32 19c0-7.18-5.82-13-13-13S6 11.82 6 19s5.82 13 13 13c3.23 0 6.18-1.18 8.45-3.13l.55.55V31l10 9.98L40.98 38 31 28zm-12 0c-4.97 0-9-4.03-9-9s4.03-9 9-9 9 4.03 9 9-4.03 9-9 9z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/icons/action_settings.svg b/prototype_2016/icons/action_settings.svg
deleted file mode 100644
index 7a01c33..0000000
--- a/prototype_2016/icons/action_settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38.86 25.95c.08-.64.14-1.29.14-1.95s-.06-1.31-.14-1.95l4.23-3.31c.38-.3.49-.84.24-1.28l-4-6.93c-.25-.43-.77-.61-1.22-.43l-4.98 2.01c-1.03-.79-2.16-1.46-3.38-1.97L29 4.84c-.09-.47-.5-.84-1-.84h-8c-.5 0-.91.37-.99.84l-.75 5.3c-1.22.51-2.35 1.17-3.38 1.97L9.9 10.1c-.45-.17-.97 0-1.22.43l-4 6.93c-.25.43-.14.97.24 1.28l4.22 3.31C9.06 22.69 9 23.34 9 24s.06 1.31.14 1.95l-4.22 3.31c-.38.3-.49.84-.24 1.28l4 6.93c.25.43.77.61 1.22.43l4.98-2.01c1.03.79 2.16 1.46 3.38 1.97l.75 5.3c.08.47.49.84.99.84h8c.5 0 .91-.37.99-.84l.75-5.3c1.22-.51 2.35-1.17 3.38-1.97l4.98 2.01c.45.17.97 0 1.22-.43l4-6.93c.25-.43.14-.97-.24-1.28l-4.22-3.31zM24 31c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/icons/icons.qrc b/prototype_2016/icons/icons.qrc
deleted file mode 100644
index 438f540..0000000
--- a/prototype_2016/icons/icons.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/icons/action">
-        <file alias="search.svg">action_search.svg</file>
-        <file alias="settings.svg">action_settings.svg</file>
-</qresource>
-
-</RCC>
\ No newline at end of file
diff --git a/prototype_2016/resources/build-resources-lib.sh b/prototype_2016/resources/build-resources-lib.sh
new file mode 100644
index 0000000..360ac1a
--- /dev/null
+++ b/prototype_2016/resources/build-resources-lib.sh
@@ -0,0 +1,15 @@
+#! /bin/bash
+
+#SOURCE_DIR=$(pwd)/src/view
+#BUILD_DIR=$SOURCE_DIR/build
+
+#cp -R $SOURCE_DIR/* $OUT_DIR
+
+#rm -rf $BUILD_DIR
+#mkdir $BUILD_DIR
+#cd $BUILD_DIR
+#cd $OUT_DIR
+
+set -e
+qtchooser -run-tool=qmake -qt=5 resources.pro
+make
diff --git a/prototype_2016/resources/qml/+material/StyledRectangle.qml b/prototype_2016/resources/qml/+material/StyledRectangle.qml
new file mode 100644
index 0000000..7da64ab
--- /dev/null
+++ b/prototype_2016/resources/qml/+material/StyledRectangle.qml
@@ -0,0 +1,22 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls.Material 2.0
+
+Rectangle {
+    color: Material.background
+
+    Material.theme: index == 0 ? Material.Light : Material.Dark
+}
diff --git a/prototype_2016/resources/qml/+universal/StyledRectangle.qml b/prototype_2016/resources/qml/+universal/StyledRectangle.qml
new file mode 100644
index 0000000..ca1999b
--- /dev/null
+++ b/prototype_2016/resources/qml/+universal/StyledRectangle.qml
@@ -0,0 +1,22 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls.Universal 2.0
+
+Rectangle {
+    color: Universal.background
+
+    Universal.theme: index == 0 ? Universal.Light : Universal.Dark
+}
diff --git a/prototype_2016/resources/qml/BasicComponents.qml b/prototype_2016/resources/qml/BasicComponents.qml
new file mode 100644
index 0000000..a46f083
--- /dev/null
+++ b/prototype_2016/resources/qml/BasicComponents.qml
@@ -0,0 +1,80 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Basic"
+
+Tab {
+    title: qsTr("Basic")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("Button"); source: "qrc:/Pages/Basic/ButtonPage.qml" }
+                ListElement { title: qsTr("CheckBox"); source: "qrc:/Pages/Basic/CheckBoxPage.qml" }
+                ListElement { title: qsTr("RadioButton"); source: "qrc:/Pages/Basic/RadioButtonPage.qml" }
+                ListElement { title: qsTr("Switch"); source: "qrc:/Pages/Basic/SwitchPage.qml" }
+                ListElement { title: qsTr("ProgressBar"); source: "qrc:/Pages/Basic/ProgressBarPage.qml" }
+                ListElement { title: qsTr("BusyIndicator"); source: "qrc:/Pages/Basic/BusyIndicatorPage.qml" }
+                ListElement { title: qsTr("Slider"); source: "qrc:/Pages/Basic/SliderPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: ButtonPage {}
+    }
+}
diff --git a/prototype_2016/resources/qml/CMakeLists.txt b/prototype_2016/resources/qml/CMakeLists.txt
new file mode 100644
index 0000000..a4f9ab6
--- /dev/null
+++ b/prototype_2016/resources/qml/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(SOURCES main.cpp demo.qrc)
+file(GLOB_RECURSE QML_SOURCES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.qml")
+
+add_executable(fluid-demo ${SOURCES} ${QML_SOURCES})
+target_link_libraries(fluid-demo Qt5::Gui Qt5::Qml Qt5::QuickControls2)
+
+install(TARGETS fluid-demo
+        BUNDLE DESTINATION .
+        RUNTIME DESTINATION ${BIN_INSTALL_DIR})
diff --git a/prototype_2016/resources/qml/CompoundComponents.qml b/prototype_2016/resources/qml/CompoundComponents.qml
new file mode 100644
index 0000000..2de7bd2
--- /dev/null
+++ b/prototype_2016/resources/qml/CompoundComponents.qml
@@ -0,0 +1,76 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Compound"
+
+Tab {
+    title: qsTr("Compound")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("ListItem"); source: "qrc:/Pages/Compound/ListItemPage.qml" }
+                ListElement { title: qsTr("Card"); source: "qrc:/Pages/Compound/CardPage.qml" }
+                ListElement { title: qsTr("InfoBar"); source: "qrc:/Pages/Compound/InfoBarPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: ListItemPage {}
+    }
+}
diff --git a/prototype_2016/resources/qml/MaterialComponents.qml b/prototype_2016/resources/qml/MaterialComponents.qml
new file mode 100644
index 0000000..444b049
--- /dev/null
+++ b/prototype_2016/resources/qml/MaterialComponents.qml
@@ -0,0 +1,74 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Material"
+
+Tab {
+    title: qsTr("Material")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("ActionButton"); source: "qrc:/Pages/Material/ActionButtonPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: ActionButtonPage {}
+    }
+}
diff --git a/prototype_2016/resources/qml/NavigationComponents.qml b/prototype_2016/resources/qml/NavigationComponents.qml
new file mode 100644
index 0000000..ce0a2fd
--- /dev/null
+++ b/prototype_2016/resources/qml/NavigationComponents.qml
@@ -0,0 +1,74 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Navigation"
+
+Tab {
+    title: qsTr("Navigation")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("NavigationDrawer"); source: "qrc:/Pages/Navigation/NavDrawerPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: NavDrawerPage {}
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Basic/BusyIndicatorPage.qml b/prototype_2016/resources/qml/Pages/Basic/BusyIndicatorPage.qml
new file mode 100644
index 0000000..1a6341e
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Basic/BusyIndicatorPage.qml
@@ -0,0 +1,44 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+
+                BusyIndicator {
+                    anchors.centerIn: parent
+                    running: true
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Basic/ButtonPage.qml b/prototype_2016/resources/qml/Pages/Basic/ButtonPage.qml
new file mode 100644
index 0000000..6cf94fe
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Basic/ButtonPage.qml
@@ -0,0 +1,115 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 2
+                    rows: 4
+
+                    // Row 1
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Button {
+                        text: qsTr("Button")
+                    }
+
+                    Button {
+                        text: qsTr("Button")
+                        enabled: false
+                    }
+
+                    // Row 3
+
+                    Button {
+                        text: qsTr("Checked")
+                        checkable: false
+                        checked: true
+                    }
+
+                    Button {
+                        text: qsTr("Checked")
+                        checkable: false
+                        checked: true
+                        enabled: false
+                    }
+
+                    // Row 4
+
+                    Button {
+                        text: qsTr("Flat")
+                        flat: true
+                    }
+
+                    Button {
+                        text: qsTr("Flat")
+                        flat: true
+                        enabled: false
+                    }
+
+                    // Row 5
+
+                    Button {
+                        text: qsTr("Highlighted")
+                        highlighted: true
+                    }
+
+                    Button {
+                        text: qsTr("Highlighted")
+                        highlighted: true
+                        enabled: false
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Basic/CheckBoxPage.qml b/prototype_2016/resources/qml/Pages/Basic/CheckBoxPage.qml
new file mode 100644
index 0000000..6e53e73
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Basic/CheckBoxPage.qml
@@ -0,0 +1,101 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+                    rows: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("On")
+                    }
+
+                    CheckBox {
+                        checked: true
+                        text: qsTr("CheckBox")
+                    }
+
+                    CheckBox {
+                        checked: true
+                        enabled: false
+                        text: qsTr("CheckBox")
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Off")
+                    }
+
+                    CheckBox {
+                        text: qsTr("CheckBox")
+                    }
+
+                    CheckBox {
+                        text: qsTr("CheckBox")
+                        enabled: false
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Basic/ProgressBarPage.qml b/prototype_2016/resources/qml/Pages/Basic/ProgressBarPage.qml
new file mode 100644
index 0000000..440db51
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Basic/ProgressBarPage.qml
@@ -0,0 +1,127 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Determinate")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Indeterminate")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("Static")
+                    }
+
+                    ProgressBar {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        indeterminate: false
+                    }
+
+                    ProgressBar {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        indeterminate: true
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Animated")
+                    }
+
+                    ProgressBar {
+                        from: 0.0
+                        to: 1.0
+                        indeterminate: false
+
+                        SequentialAnimation on value {
+                            running: true
+                            loops: NumberAnimation.Infinite
+
+                            NumberAnimation {
+                                from: 0.0
+                                to: 1.0
+                                duration: 3000
+                            }
+                        }
+                    }
+
+                    ProgressBar {
+                        from: 0.0
+                        to: 1.0
+                        indeterminate: true
+
+                        SequentialAnimation on value {
+                            running: true
+                            loops: NumberAnimation.Infinite
+
+                            NumberAnimation {
+                                from: 0.0
+                                to: 1.0
+                                duration: 3000
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Basic/RadioButtonPage.qml b/prototype_2016/resources/qml/Pages/Basic/RadioButtonPage.qml
new file mode 100644
index 0000000..80c98d5
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Basic/RadioButtonPage.qml
@@ -0,0 +1,100 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+                    rows: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("On")
+                    }
+
+                    RadioButton {
+                        checked: true
+                        text: qsTr("RadioButton")
+                    }
+
+                    RadioButton {
+                        checked: true
+                        enabled: false
+                        text: qsTr("RadioButton")
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Off")
+                    }
+
+                    RadioButton {
+                        text: qsTr("RadioButton")
+                    }
+
+                    RadioButton {
+                        text: qsTr("RadioButton")
+                        enabled: false
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Basic/SliderPage.qml b/prototype_2016/resources/qml/Pages/Basic/SliderPage.qml
new file mode 100644
index 0000000..72d9c11
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Basic/SliderPage.qml
@@ -0,0 +1,152 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+                    rows: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("Horizontal / Single")
+                    }
+
+                    Slider {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                    }
+
+                    Slider {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        enabled: false
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Horizontal / Range")
+                    }
+
+                    RangeSlider {
+                        from: 0.0
+                        to: 1.0
+                        first.value: 0.4
+                        second.value: 0.6
+                    }
+
+                    RangeSlider {
+                        from: 0.0
+                        to: 1.0
+                        first.value: 0.4
+                        second.value: 0.6
+                        enabled: false
+                    }
+
+                    // Row 4
+
+                    Label {
+                        text: qsTr("Vertical / Single")
+                    }
+
+                    Slider {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        orientation: Qt.Vertical
+                    }
+
+                    Slider {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        enabled: false
+                        orientation: Qt.Vertical
+                    }
+
+                    // Row 5
+
+                    Label {
+                        text: qsTr("Vertical / Range")
+                    }
+
+                    RangeSlider {
+                        from: 0.0
+                        to: 1.0
+                        first.value: 0.4
+                        second.value: 0.6
+                        orientation: Qt.Vertical
+                    }
+
+                    RangeSlider {
+                        from: 0.0
+                        to: 1.0
+                        first.value: 0.4
+                        second.value: 0.6
+                        enabled: false
+                        orientation: Qt.Vertical
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Basic/SwitchPage.qml b/prototype_2016/resources/qml/Pages/Basic/SwitchPage.qml
new file mode 100644
index 0000000..15c679b
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Basic/SwitchPage.qml
@@ -0,0 +1,100 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+                    rows: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("On")
+                    }
+
+                    Switch {
+                        checked: true
+                        text: qsTr("Switch")
+                    }
+
+                    Switch {
+                        checked: true
+                        enabled: false
+                        text: qsTr("Switch")
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Off")
+                    }
+
+                    Switch {
+                        text: qsTr("Switch")
+                    }
+
+                    Switch {
+                        text: qsTr("Switch")
+                        enabled: false
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Compound/CardPage.qml b/prototype_2016/resources/qml/Pages/Compound/CardPage.qml
new file mode 100644
index 0000000..ec33a3e
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Compound/CardPage.qml
@@ -0,0 +1,76 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+
+Item {
+    Card {
+        id: card
+        anchors.centerIn: parent
+        width: 400
+        height: 400
+
+        Image {
+            id: picture
+            anchors {
+                left: parent.left
+                top: parent.top
+                right: parent.right
+            }
+            height: 200
+            source: "https://www.nps.gov/yose/planyourvisit/images/glacier-point-people-960web.jpg"
+        }
+
+        Column {
+            id: column
+            anchors {
+                left: parent.left
+                top: picture.bottom
+                right: parent.right
+                margins: Units.smallSpacing * 2
+            }
+            spacing: Units.smallSpacing * 2
+
+            TitleLabel {
+                text: qsTr("Yosemite National Park")
+            }
+
+            BodyLabel {
+                text: qsTr("First protected in 1864, Yosemite National Park " +
+                           "is best known for its waterfalls, but within its " +
+                           "nearly 1,200 square miles, you can find deep " +
+                           "valleys, grand meadows, ancient giant sequoias, " +
+                           "a vast wilderness area, and much more.")
+                wrapMode: Text.WordWrap
+                width: parent.width
+            }
+
+            Row {
+                spacing: Units.smallSpacing
+
+                Button {
+                    text: qsTr("Share")
+                    flat: true
+                }
+
+                Button {
+                    text: qsTr("Explore")
+                    flat: true
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Compound/InfoBarPage.qml b/prototype_2016/resources/qml/Pages/Compound/InfoBarPage.qml
new file mode 100644
index 0000000..1830e39
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Compound/InfoBarPage.qml
@@ -0,0 +1,30 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+
+Item {
+    Button {
+        anchors.centerIn: parent
+        text: qsTr("Open")
+        onClicked: infoBar.open(qsTr("Message sent"))
+    }
+
+    InfoBar {
+        id: infoBar
+        buttonText: qsTr("OK")
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Compound/ListItemPage.qml b/prototype_2016/resources/qml/Pages/Compound/ListItemPage.qml
new file mode 100644
index 0000000..f86f81b
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Compound/ListItemPage.qml
@@ -0,0 +1,40 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+import "../.."
+
+Page {
+    ListView {
+        anchors.fill: parent
+        model: ListModel {
+            ListElement { title: "List Item 1"; source: "qrc:/Pages/Compound/SubPage.qml" }
+            ListElement { title: "List Item 2"; source: "qrc:/Pages/Compound/SubPage.qml" }
+            ListElement { title: "List Item 3"; source: "qrc:/Pages/Compound/SubPage.qml" }
+            ListElement { title: "List Item 4"; source: "qrc:/Pages/Compound/SubPage.qml" }
+            ListElement { title: "List Item 5"; source: "qrc:/Pages/Compound/SubPage.qml" }
+        }
+        header: Subheader {
+            text: "Header"
+        }
+        delegate: ListItem {
+            text: model.title
+            onClicked: pageStack.push(model.source)
+        }
+
+        ScrollIndicator.vertical: ScrollIndicator {}
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Compound/SubPage.qml b/prototype_2016/resources/qml/Pages/Compound/SubPage.qml
new file mode 100644
index 0000000..8a86a28
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Compound/SubPage.qml
@@ -0,0 +1,31 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+
+Page {
+    title: "Sub page demo"
+
+    actions: [
+        Action {
+            iconName: "action/settings"
+        }
+    ]
+
+    Label {
+        anchors.centerIn: parent
+        text: "Testing"
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Material/ActionButtonPage.qml b/prototype_2016/resources/qml/Pages/Material/ActionButtonPage.qml
new file mode 100644
index 0000000..1fcf516
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Material/ActionButtonPage.qml
@@ -0,0 +1,68 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Material 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    Column {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                //y: height * index
+                width: parent.width
+                height: parent.height / 2
+
+                Column {
+                    anchors.centerIn: parent
+
+                    ActionButton {
+                        iconName: "device/airplanemode_active"
+                    }
+
+                    ActionButton {
+                        iconName: "navigation/check"
+
+                        Material.elevation: 1
+                    }
+
+                    ActionButton {
+                        iconName: "device/airplanemode_active"
+
+                        Material.background: Material.primaryColor
+                    }
+
+                    ActionButton {
+                        iconName: "navigation/check"
+
+                        Material.elevation: 1
+                        Material.background: Material.primaryColor
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Material/WavePage.qml b/prototype_2016/resources/qml/Pages/Material/WavePage.qml
new file mode 100644
index 0000000..58cae01
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Material/WavePage.qml
@@ -0,0 +1,41 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Controls 1.0
+import Fluid.Material 1.0
+import "../.."
+
+Item {
+    Wave {
+        id: wave
+        initialX: parent.width - size
+        initialY: parent.height - size
+        size: 48
+        color: Material.accentColor
+    }
+
+    Button {
+        anchors.centerIn: parent
+        text: qsTr("Toggle")
+        onClicked: {
+            if (wave.opened)
+                wave.close(parent.width - wave.size, parent.height - wave.size)
+            else
+                wave.open(0, 0)
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Navigation/NavDrawerPage.qml b/prototype_2016/resources/qml/Pages/Navigation/NavDrawerPage.qml
new file mode 100644
index 0000000..4c7dd21
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Navigation/NavDrawerPage.qml
@@ -0,0 +1,26 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+import "../.."
+
+Item {
+    Button {
+        anchors.centerIn: parent
+        text: qsTr("Open")
+        onClicked: navDrawer.open()
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Style/PalettePage.qml b/prototype_2016/resources/qml/Pages/Style/PalettePage.qml
new file mode 100644
index 0000000..bc34dab
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Style/PalettePage.qml
@@ -0,0 +1,135 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(grid.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    property color whiteColor: Qt.rgba(255, 255, 255, 1)
+    property color blackColor: Qt.rgba(0, 0, 0, 1)
+
+    GridLayout {
+        id: grid
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+            topMargin: Units.largeSpacing
+        }
+
+        width: parent.width * 0.8
+
+        columns: width / 300
+        rowSpacing: Units.smallSpacing
+        columnSpacing: Units.smallSpacing
+
+        Repeater {
+            model: ListModel {
+                ListElement {
+                    paletteIndex: Material.Red
+                    name: "Red"
+                }
+                ListElement {
+                    paletteIndex: Material.Pink
+                    name: "Pink"
+                }
+                ListElement {
+                    paletteIndex: Material.Purple
+                    name: "Purple"
+                }
+                ListElement {
+                    paletteIndex: Material.DeepPurple
+                    name: "DeepPurple"
+                }
+                ListElement {
+                    paletteIndex: Material.Indigo
+                    name: "Indigo"
+                }
+                ListElement {
+                    paletteIndex: Material.Blue
+                    name: "Blue"
+                }
+                ListElement {
+                    paletteIndex: Material.LightBlue
+                    name: "LightBlue"
+                }
+                ListElement {
+                    paletteIndex: Material.Cyan
+                    name: "Cyan"
+                }
+                ListElement {
+                    paletteIndex: Material.Teal
+                    name: "Teal"
+                }
+                ListElement {
+                    paletteIndex: Material.Green
+                    name: "Green"
+                }
+                ListElement {
+                    paletteIndex: Material.LightGreen
+                    name: "LightGreen"
+                }
+                ListElement {
+                    paletteIndex: Material.Lime
+                    name: "Lime"
+                }
+                ListElement {
+                    paletteIndex: Material.Yellow
+                    name: "Yellow"
+                }
+                ListElement {
+                    paletteIndex: Material.Amber
+                    name: "Amber"
+                }
+                ListElement {
+                    paletteIndex: Material.Orange
+                    name: "Orange"
+                }
+                ListElement {
+                    paletteIndex: Material.DeepOrange
+                    name: "DeepOrange"
+                }
+                ListElement {
+                    paletteIndex: Material.Grey
+                    name: "Grey"
+                }
+                ListElement {
+                    paletteIndex: Material.BlueGrey
+                    name: "BlueGrey"
+                }
+                ListElement {
+                    paletteIndex: Material.Brown
+                    name: "Brown"
+                }
+            }
+
+            PaletteSwatch {
+                paletteIndex: model.paletteIndex
+                paletteName: model.name
+                paletteColor: Material.color(model.paletteIndex, Material.Shade500)
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Style/PaletteSwatch.qml b/prototype_2016/resources/qml/Pages/Style/PaletteSwatch.qml
new file mode 100644
index 0000000..ac5c9b3
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Style/PaletteSwatch.qml
@@ -0,0 +1,173 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Column {
+    id: mainLayout
+
+    property int paletteIndex
+    property string paletteName
+    property color paletteColor
+
+    spacing: 0
+
+    Rectangle {
+        width: 300
+        height: 80
+        color: paletteColor
+
+        Label {
+            anchors {
+                top: parent.top
+                left: parent.left
+                margins: Units.smallSpacing * 2
+            }
+            font.bold: true
+            color: Utils.lightDark(parent.color, blackColor, whiteColor)
+            text: paletteName
+        }
+    }
+
+    Column {
+        spacing: 0
+
+        Repeater {
+            model: ListModel {
+                ListElement {
+                    shadeIndex: Material.Shade100
+                    name: "100"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade200
+                    name: "200"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade300
+                    name: "300"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade400
+                    name: "400"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade500
+                    name: "500"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade600
+                    name: "600"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade700
+                    name: "700"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade800
+                    name: "800"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade900
+                    name: "900"
+                }
+            }
+
+            Rectangle {
+                width: 300
+                height: 40
+                color: Material.color(paletteIndex, model.shadeIndex)
+
+                Label {
+                    anchors {
+                        left: parent.left
+                        verticalCenter: parent.verticalCenter
+                        margins: Units.smallSpacing * 2
+                    }
+                    font.bold: true
+                    color: Utils.lightDark(parent.color, blackColor, whiteColor)
+                    text: model.name
+                }
+
+                Label {
+                    anchors {
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                        margins: Units.smallSpacing * 2
+                    }
+                    font.bold: true
+                    color: Utils.lightDark(parent.color, blackColor, whiteColor)
+                    text: parent.color
+                }
+            }
+        }
+    }
+
+    Column {
+        spacing: 0
+
+        Repeater {
+            model: ListModel {
+                ListElement {
+                    shadeIndex: Material.ShadeA100
+                    name: "A100"
+                }
+                ListElement {
+                    shadeIndex: Material.ShadeA200
+                    name: "A200"
+                }
+                ListElement {
+                    shadeIndex: Material.ShadeA400
+                    name: "A400"
+                }
+                ListElement {
+                    shadeIndex: Material.ShadeA700
+                    name: "A700"
+                }
+            }
+
+            Rectangle {
+                width: 300
+                height: 40
+                color: Material.color(paletteIndex, model.shadeIndex)
+
+                Label {
+                    anchors {
+                        left: parent.left
+                        verticalCenter: parent.verticalCenter
+                        margins: Units.smallSpacing * 2
+                    }
+                    font.bold: true
+                    color: Utils.lightDark(parent.color, blackColor, whiteColor)
+                    text: model.name
+                }
+
+                Label {
+                    anchors {
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                        margins: Units.smallSpacing * 2
+                    }
+                    font.bold: true
+                    color: Utils.lightDark(parent.color, blackColor, whiteColor)
+                    text: parent.color
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Pages/Style/TypographyPage.qml b/prototype_2016/resources/qml/Pages/Style/TypographyPage.qml
new file mode 100644
index 0000000..d87d00c
--- /dev/null
+++ b/prototype_2016/resources/qml/Pages/Style/TypographyPage.qml
@@ -0,0 +1,87 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+        anchors.margins: Units.mediumSpacing
+        spacing: Units.smallSpacing
+
+        DisplayLabel {
+            level: 4
+            text: "Display 4"
+        }
+
+        DisplayLabel {
+            level: 3
+            text: "Display 3"
+        }
+
+        DisplayLabel {
+            level: 2
+            text: "Display 2"
+        }
+
+        DisplayLabel {
+            level: 1
+            text: "Display 1"
+        }
+
+        HeadlineLabel {
+            text: "Headline"
+        }
+
+        TitleLabel {
+            text: "Title"
+        }
+
+        SubheadingLabel {
+            text: "Subheading"
+        }
+
+        BodyLabel {
+            level: 2
+            text: "Body 2"
+        }
+
+        BodyLabel {
+            level: 1
+            text: "Body 1"
+        }
+
+        CaptionLabel {
+            text: "Caption"
+        }
+
+        Label {
+            text: "Label"
+        }
+
+        Item {
+            Layout.fillHeight: true
+        }
+    }
+}
diff --git a/prototype_2016/resources/qml/Style.qml b/prototype_2016/resources/qml/Style.qml
new file mode 100644
index 0000000..9f997bd
--- /dev/null
+++ b/prototype_2016/resources/qml/Style.qml
@@ -0,0 +1,75 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Style"
+
+Tab {
+    title: qsTr("Style")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("Palette"); source: "qrc:/Pages/Style/PalettePage.qml" }
+                ListElement { title: qsTr("Typography"); source: "qrc:/Pages/Style/TypographyPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: PalettePage {}
+    }
+}
diff --git a/prototype_2016/resources/qml/StyledRectangle.qml b/prototype_2016/resources/qml/StyledRectangle.qml
new file mode 100644
index 0000000..3af12dd
--- /dev/null
+++ b/prototype_2016/resources/qml/StyledRectangle.qml
@@ -0,0 +1,21 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+Rectangle {
+    // Default styled rectangle is red to spot errors
+    // related to how styles are loaded
+    color: "red"
+}
diff --git a/prototype_2016/resources/qml/main.qml b/prototype_2016/resources/qml/main.qml
new file mode 100644
index 0000000..37b0077
--- /dev/null
+++ b/prototype_2016/resources/qml/main.qml
@@ -0,0 +1,104 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import QtQuick.Layouts 1.3
+import Fluid.Controls 1.0
+
+FluidWindow {
+    id: window
+
+    visible: true
+
+    width: 1024
+    height: 800
+
+    title: qsTr("Fluid Demo")
+
+    Material.primary: Material.LightBlue
+    Material.accent: Material.Blue
+
+    Universal.accent: Universal.Cobalt
+
+    NavigationDrawer {
+        id: navDrawer
+
+        //width: Math.min(window.width, window.height) / 3 * 2
+        height: window.height
+
+        topContent: [
+            Rectangle {
+                color: Material.primary
+                height: 48
+
+                Label {
+                    anchors.centerIn: parent
+                    text: qsTr("Top Content")
+                }
+
+                Layout.fillWidth: true
+            }
+        ]
+
+        actions: [
+            Action {
+                text: qsTr("Action 1")
+                iconName: "action/info"
+                onTriggered: console.log("action1 triggered")
+            },
+            Action {
+                text: qsTr("Action 2")
+                iconName: "action/info"
+                onTriggered: console.log("action2 triggered")
+            },
+            Action {
+                text: qsTr("Action 3")
+                iconName: "action/info"
+                onTriggered: console.log("action3 triggered")
+            }
+        ]
+    }
+
+    initialPage: TabbedPage {
+        title: window.title
+
+        actions: [
+            Action {
+                text: qsTr("Dummy error")
+                iconName: "alert/warning"
+                onTriggered: console.log("Dummy error")
+            },
+            Action {
+                text: qsTr("Colors")
+                iconName: "image/color_lens"
+                onTriggered: console.log("Colors")
+            },
+            Action {
+                text: qsTr("Settings")
+                iconName: "action/settings"
+                onTriggered: console.log("Settings clicked")
+            }
+        ]
+
+        BasicComponents {}
+        CompoundComponents {}
+        MaterialComponents {}
+        NavigationComponents {}
+        Style {}
+    }
+}
diff --git a/prototype_2016/resources/qml/qml.qrc b/prototype_2016/resources/qml/qml.qrc
new file mode 100644
index 0000000..2f31ad9
--- /dev/null
+++ b/prototype_2016/resources/qml/qml.qrc
@@ -0,0 +1,31 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qtquickcontrols2.conf</file>
+        <file>main.qml</file>
+        <file>BasicComponents.qml</file>
+        <file>CompoundComponents.qml</file>
+        <file>MaterialComponents.qml</file>
+        <file>NavigationComponents.qml</file>
+        <file>Style.qml</file>
+        <file>StyledRectangle.qml</file>
+        <file>+material/StyledRectangle.qml</file>
+        <file>+universal/StyledRectangle.qml</file>
+        <file>Pages/Basic/BusyIndicatorPage.qml</file>
+        <file>Pages/Basic/ButtonPage.qml</file>
+        <file>Pages/Basic/CheckBoxPage.qml</file>
+        <file>Pages/Basic/ProgressBarPage.qml</file>
+        <file>Pages/Basic/RadioButtonPage.qml</file>
+        <file>Pages/Basic/SliderPage.qml</file>
+        <file>Pages/Basic/SwitchPage.qml</file>
+        <file>Pages/Compound/ListItemPage.qml</file>
+        <file>Pages/Compound/SubPage.qml</file>
+        <file>Pages/Compound/CardPage.qml</file>
+        <file>Pages/Compound/InfoBarPage.qml</file>
+        <file>Pages/Style/PalettePage.qml</file>
+        <file>Pages/Style/PaletteSwatch.qml</file>
+        <file>Pages/Style/TypographyPage.qml</file>
+        <file>Pages/Material/ActionButtonPage.qml</file>
+        <file>Pages/Material/WavePage.qml</file>
+        <file>Pages/Navigation/NavDrawerPage.qml</file>
+    </qresource>
+</RCC>
diff --git a/prototype_2016/resources/qml/qtquickcontrols2.conf b/prototype_2016/resources/qml/qtquickcontrols2.conf
new file mode 100644
index 0000000..b6c7c87
--- /dev/null
+++ b/prototype_2016/resources/qml/qtquickcontrols2.conf
@@ -0,0 +1,2 @@
+[Controls]
+Style=Material
diff --git a/prototype_2016/resources/resources.pro b/prototype_2016/resources/resources.pro
new file mode 100644
index 0000000..3247633
--- /dev/null
+++ b/prototype_2016/resources/resources.pro
@@ -0,0 +1,8 @@
+TEMPLATE = lib
+TARGET = resources
+
+QT += qml gui quickcontrols2
+CONFIG += c++11
+CONFIG += staticlib
+
+RESOURCES += qml/qml.qrc
diff --git a/prototype_2016/src/secushare_qml.rs b/prototype_2016/src/secushare_qml.rs
index c2f8286..7ccf12c 100644
--- a/prototype_2016/src/secushare_qml.rs
+++ b/prototype_2016/src/secushare_qml.rs
@@ -6,52 +6,47 @@ use std::time::Duration;
 use futures::Future;
 
 pub struct SecushareQml {
-    //engine: QmlEngine,
-    psyc_client: PsycClient
+    engine: QmlEngine,
+    //psyc_client: PsycClient
 }
 
 impl SecushareQml {
     pub fn new() -> Self {
-        //register_resources("resources.rcc");
-        //let mut engine = QmlEngine::new();
-        //engine.add_import_path("qrc://");
+        let mut engine = QmlEngine::new();
         
-        //// FIXME: importing qml-material via Qt resource system does not work yet,
-        //// so we have to tell the QML engine where the module is
-        //engine.add_import_path("third_party/qml-material/build/qml_modules");
-
-        //engine.set_and_store_property("version", "0.0.1");
+       //engine.set_and_store_property("version", "0.0.1");
 
         //let mut contacts = QListModel::new(&["first_name", "surname"]);
         //contacts.insert_row(qvarlist!["Paul", "McCartney"].into_iter());
         //contacts.insert_row(qvarlist!["Ringo", "Starr"].into_iter());
         //engine.set_property("contacts", &contacts.get_qvar());
 
+        engine.load_url("qrc:///main.qml");
         //engine.load_file("src/view/main.qml");
 
-        let psyc_client = PsycClient::new();
+        //let psyc_client = PsycClient::new();
 
         SecushareQml {
-            //engine: engine,
-            psyc_client: psyc_client
+            engine: engine,
+            //psyc_client: psyc_client
         }
     }
 
     pub fn run(&mut self) {
-        self.psyc_client.run();
+        //self.psyc_client.run();
 
-        println!("sending");
+        //println!("sending");
         
-        let recipe = LoginRecipe {
+        /*let recipe = LoginRecipe {
             recipient: b"psyc://localhost/~bob"
-        };
-        let task = self.psyc_client.make_task(recipe).map(|response| {
+        };*/
+        /*let task = self.psyc_client.make_task(recipe).map(|response| {
             println!("got result: {}", response.payload);
-        });
+        });*/
 
-        self.psyc_client.start_task(task);
-        thread::sleep(Duration::from_millis(3000));
-        //self.engine.exec();
-        //self.engine.quit();
+        //self.psyc_client.start_task(task);
+        //thread::sleep(Duration::from_millis(3000));
+        self.engine.exec();
+        self.engine.quit();
     }
 }
diff --git a/prototype_2016/src/view/main.qml b/prototype_2016/src/view/main.qml
deleted file mode 100644
index 67ce80e..0000000
--- a/prototype_2016/src/view/main.qml
+++ /dev/null
@@ -1,86 +0,0 @@
-import QtQuick 2.6
-import Material 0.3
-import Material.ListItems 0.1 as ListItem
-
-ApplicationWindow {
-    id: app
-
-    title: "secushare %1".arg(version)
-
-    theme {
-        primaryColor: "orange"
-        accentColor: "purple"
-        tabHighlightColor: "white"
-    }
-
-    visible: true
-
-    initialPage: TabbedPage {
-        title: "Secushare"
-
-        // FIXME: no qrc files yet
-        actions: [
-            Action {
-                iconName: 'action/search'
-                text: 'Search'
-            },
-
-
-            Action {
-                iconName: 'action/settings'
-                text: 'Settings'
-            }
-        ]
-
-        Tab {
-            title: "Conversations"
-
-            Item {
-                Sidebar {
-                    Column {
-                        anchors.fill: parent
-
-                        Item {
-                            width: parent.width
-                            height: 8
-                        }
-
-                        ListItem.Standard {
-                            text: "Conversation with Paul"
-                        }
-
-                        ListItem.Standard {
-                            text: "Secushare prototype release"
-                        }
-                    }
-                }
-            }
-        }
-
-        Tab {
-            title: "Contacts"
-
-            Item {
-                Sidebar {
-                    Column {
-                        anchors.fill: parent
-
-                        Item {
-                            width: parent.width
-                            height: 8
-                        }
-
-                        Repeater {
-                            model: contacts
-
-                            delegate: ListItem.Standard {
-                                text: "%1 %2".arg(first_name).arg(surname)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-    }
-}
diff --git a/prototype_2016/third_party/fluid/.gitignore b/prototype_2016/third_party/fluid/.gitignore
new file mode 100644
index 0000000..305f772
--- /dev/null
+++ b/prototype_2016/third_party/fluid/.gitignore
@@ -0,0 +1,4 @@
+build/
+material-design-icons/
+icons/
+*.user
diff --git a/prototype_2016/third_party/fluid/.mailmap b/prototype_2016/third_party/fluid/.mailmap
new file mode 100644
index 0000000..dccdf66
--- /dev/null
+++ b/prototype_2016/third_party/fluid/.mailmap
@@ -0,0 +1,2 @@
+Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> <plfiorini@users.noreply.github.com>
+Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> <pierluigi.fiorini@hawaiios.org>
diff --git a/prototype_2016/third_party/fluid/.travis.yml b/prototype_2016/third_party/fluid/.travis.yml
new file mode 100644
index 0000000..e0d227d
--- /dev/null
+++ b/prototype_2016/third_party/fluid/.travis.yml
@@ -0,0 +1,54 @@
+language: c
+
+compiler:
+  - gcc
+  - clang
+
+sudo: required
+
+env:
+  global:
+    # BINTRAY_USER
+    - secure: "vEoMBcWLvExapeJ7644Qa5j8zQcIRvSmZawrDWciQAVv47ckjS4CzeKxfniwYuVcMY+G8mk+NANM/cvEYhBuBx1YLRz7qR9WkLtIGs5ZN/Tqna8bEYDx4fz/grsaPIO0zSCOlFy4gjW4OTZc0Pi6h82UNkbu4VruCA0+KHRMeLbqP2SnhLTlKibofp3YgFLK+MpBjQ9m99rfkRlVWSdY6dscST3s5ROreTepoaP1Q4XzG1eRp2aLSqKurWnDdFdXZhInHeWxWwZ5lRPcCj29+oYgU8cvxA/D2DuDfPlM92XzqTTqD9tTztnz0klN/tQaXECaFZYu5/BC/o71FmWtYzuc7SScggFU1XLmEPdsYy8B/bDyvP+QueiwO/i3ZnEiSLccuN7fkEi2qCHLjpcMRJb/A6NKcgkyFHN65ncqcvG3xrk7mcCAMiupkpx0MVskiYI0HD3g/2auIEjDcqKbOGYV1mRwGhWwV51qfDYsAtSQcn5JaTN3ioFjfPpSI4swevAfOdBp1vhkFXvYQHDEWtyaQWQkiZN/D2osO3VoTgXMUF68I2BNskUVXqU/X18f3xzcv3PXsUCTWAY8tQ7iDt93UQyC/rtqnxUhKJqcnM2ri7GGk2yK/GHyjUonf9GO5mucPyAWzkPP13T6gj1Y/XH76wFBurdP89FUidyiVVE="
+    # BINTRAY_API_KEY
+    - secure: "Z4721k6LWdc7/UDVkBSVxr1G2nRWJu1817jCpuE+6pub65WhGqBB20xwI3jsp/J2U2iX3RUgLiJTCRPuQnLoxaDRXY1WZa2qXLumgGcYwgwgCLQgBIvV5OWwPgBpSl40f7w1c8qfEVTeFt4X51fwZR+2WSNzCn9dHZFICHwweasNXMe/1/nnopvZmTmnAICLTTGM3QL8TgrqnAevNtR9/ILGli6YewFmpPBiy/nV5SIPlay4s0gtpr4WOACHbCjyi2dY+OMgln+zcrV2Xe75b/G9G+JbjmQj2wb3MviQhQ9EXGhxcRZTmpgLmZ4VXuFizsl1ssfte7p8JEHdwJi1nnGkjuP0xcmfc/t8y3u/QFQbPd0K/xgQhrHVlVytDGgrwZdfGoHV43E5v338E6vPd0R4PaZbKKwvEfze3T+X04wrnMm2SgtVQnr4l0WBwYEsOLP+MdFyfHsXs74MMg+1VQcz6gnD7YPOPqftds0ZaEltIn6VOZqt72K06t544jjFv1fIxA0bWDFBgIECfF6dGRykaw/Jo/29VoUT9K4dfMX/V9LMxy1x3p/ltW1U0VryqUCzj/QqSJw82rEYkMMvQYq8x+eBdlYjbAZZhRGvMHYa+1uHwiKbyRyQQZlc+r8b1/usI9B2E4y12dPPGmHBW8gbRHfoGCX5m3aBkaqUpeE="
+    # BINTRAY_REPO_OWNER
+    - secure: "fHxkvRKupN+jmbncPeNIVxvAxmHpZskJ89jJoDM3Fdmheq08+BPCLVUaDX3C1Ux4ETCONKKFwiQ152M30TczU95OXCfs9N3Uo631CL0AFH0vavBPDtAdZyOdljS+gkFMRCT/NFxdTgaju128jYVqumJw6fSVke8Edh43cDURhhpD6Xr6qm45620Iua3/Vieu/IBzoCISV4RgBxSgPOBew8diIk9nVqk4nSeU9aP110lJ5ExhI++G7sRaZvlMTkHdti5Wcg2/MXy883IVAacieOALRmdBuW1lv1lgEkV6KZ0cjmiG8B0XuvkWCgx05wbY4FWnAZlU6mkuTUPo4Sg2JhtGUr1ejAHe3TF1g05s2JBiP8oX2vdflh5Immyi0afpdzJGxinrEXY39QBmfK8Donkn78Flz7NdLQz882bdQsQ3MnFGHG8FOqMdJWAAUxpn7L5SCgShH/GpspFnvONWKmJybsRAdMZTHJL7d4pwYgo854vo43p9RDGSZX/jdQ6Gb874rNUdtfWXZLWpaq4jH/jigC+WGG4r78kNIMoylRRqINfg2F7jjR4Z/rieePZ7d0IUeD4+a0XFriYuix415FPpRcogB4cpXmDn6ZQTCfd4QDBxILlv6phHMcTOvrwgBMd40OCtewkXrODIKqC6xaeWf99/8sJti5ZUZK5DiuA="
+
+arch:
+  packages:
+    - qt5-declarative
+    - qt5-quickcontrols2
+    - qt5-graphicaleffects
+    - qt5-svg
+    - extra-cmake-modules
+    - xorg-server-xvfb
+    - clang
+    #- clazy-git
+  script:
+    - scripts/fetch_icons.sh
+    - if [ "$CC" = "gcc" ]; then cmake . -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_INSTALL_PREFIX=/usr; fi
+    #- if [ "$CC" = "clang" ]; then env CLAZY_CHECKS="level1" cmake . -DCMAKE_CXX_COMPILER=clazy -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_INSTALL_PREFIX=/usr; fi
+    - if [ "$CC" = "clang" ]; then cmake . -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_INSTALL_PREFIX=/usr; fi
+    - make
+    - sudo make install
+    - xvfb-run -a -s "-screen 0 800x600x24" make check
+    - ./.travis/bintray-wrapper.sh
+
+script:
+  - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"
+
+deploy:
+  provider: bintray
+  on:
+    branch: develop
+    condition: "$CC = gcc"
+  file: cibuild/bintray.json
+  user:
+    secure: "ABQ0Vh69XIJ38UOTGQOmnJ/zr1E0zNK6bDkqJ+ioujqBE8pvZuppdb9DyPmqscUgJWLQy8C7qfRMXMkkBUdecqV7LAFplO08yMxXmSNCq2gYi7l8jY6WCp+dyno+8tO7P7zO/8Vgae99c2MNkCVw8FpN7vFC3l5QLBUuEuSgCWYInW4aXkQnTkKNPN5hiMb7pJ7c1WMo6YKydkKs6yL4ACUkTzoR8iuTLqIAvi2w9UMzIUE16FGOHHUSZZI0UwExhSPTmH30pLddKexvdip6AyROGPDSqgh1zh9mIpYyz6BRWoTPR8LCpAFE2soTF2t0XdkRoQeZS6+zXJdU3AdJnEj1y2n9zxR3CSl+MfeJCz24yAJ+2shLyl+LZwhert7z45GC5CNrFsxliA7wMCuP3AeBEwCYaTgNcB5mQWK7+nyQuEZ43v/ffQiZUziEPOsHpxdggPN4TQ/KLSwC9eSKyh7dvlvupfd5p509d06239gXVNwDU45H3in2XKv9WQQIBXLW48IoY7YQFDvKCsAuNNn1fJLMLhg4MUqSYWSCYGjGn3nHBm9IJ0Y176dzN7c+2kP+Vm6x9PhWR6ZDpRVh4ygh+TKVNTVpzQ2bD/J+vWcGTf1KP4GJOLPWe7S0BsXNWry1jGz8v+9IDDPMVf9bFRSBZNSGD/qU8FCsS6nVXOU="
+  key:
+    secure: "x5L7Cc9ncaXhjLjGi/+0P1Yjzo5yPTPqB47odKvnvHVG91n7LR0tCY8pKMAITSlnKqxlV6q/jlr5Ur8JzY0hwwi1KaM7t80cjWn9feE79DsA2Tpdxks2eRLQs1kXoqepa+tpuxOCysrYL5KMw/ly3vnnnkeXleb05bdadZLxdf54BK+6pA8djwKoVAba4lQDBL4RrdN7yQYB5ZBdGHFO6BScaVR1xuykOalfSQsQWAQqENbnOSFpxkdxYt0FUsP2N0UwqZ7kbX7XtdRKCfubnRJ9YoNh4kbImRLKbosl1NX8+MAwbudnKa6AV3P+LxQZA6cU1T8JIu6W54A7pXJYnf2bOezSy4ifzE0L+4rgbrIQVL9AUcWpK8gDkdpPJ6B6gwWW8+VP+wDCnzXEk9DXBlOLCGeHBaDOJAeOkCC2NJ64hC0bQfILO79KKYkpQTTf1uepngeie7y50CmOq4CaxAX1rQcPz2GlZlp5XIOZX5ZV5GABxORCn4zANrs7hmhY44ooky6KltiA35vgFxJGfqkgSUWWFqHvEPwDN2anRLjlY+trMN3YRMBCnhL3WCtHjiJ5sUW6drUcBfzcoJxGY7JF31q8N7y0ZhdXNc5P6GC/f62ggHDnk9lklOb4DlEqh+npREk+o89TUU/RkXNPuLBpNiq3UwCrDlKbpoULhgs="
+
+notifications:
+  email: false
+  slack: lirios:fdUqVmPzqPskEL1UBhqapZ0w
diff --git a/prototype_2016/third_party/fluid/.travis/PKGBUILD.in b/prototype_2016/third_party/fluid/.travis/PKGBUILD.in
new file mode 100644
index 0000000..82a49c2
--- /dev/null
+++ b/prototype_2016/third_party/fluid/.travis/PKGBUILD.in
@@ -0,0 +1,47 @@
+# Maintainer: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+
+pkgname=fluid-git
+pkgver=@PKGVER@
+pkgrel=1
+pkgdesc="Components for Qt Quick applications"
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+url='https://github.com/lirios'
+license=('MPL2')
+depends=('qt5-quickcontrols2' 'qt5-graphicaleffects' 'qt5-svg')
+makedepends=('git' 'extra-cmake-modules')
+conflicts=('fluid')
+replaces=('fluid')
+provides=('fluid')
+groups=('liri-git')
+
+_gitroot="git://github.com/lirios/fluid.git"
+_gitbranch=@GITBRANCH@
+_gitname=$pkgname
+source=(${_gitname}::${_gitroot}#branch=${_gitbranch})
+md5sums=('SKIP')
+
+pkgver() {
+        cd ${srcdir}/${_gitname}
+        echo "$(git log -1 --format="%cd" --date=short | tr -d '-').$(git log -1 --format="%h")"
+}
+
+prepare() {
+        mkdir -p build
+}
+
+build() {
+        cd build
+        cmake ../${_gitname} \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DLIB_INSTALL_DIR=lib \
+                -DLIBEXEC_INSTALL_DIR=lib \
+                -DQML_INSTALL_DIR=lib/qt/qml \
+                -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+                -DCMAKE_BUILD_TYPE=RelWithDebInfo
+        make
+}
+
+package() {
+        cd build
+        make DESTDIR="${pkgdir}" install
+}
diff --git a/prototype_2016/third_party/fluid/.travis/bintray-wrapper.sh b/prototype_2016/third_party/fluid/.travis/bintray-wrapper.sh
new file mode 100755
index 0000000..04c2ebd
--- /dev/null
+++ b/prototype_2016/third_party/fluid/.travis/bintray-wrapper.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# This file is part of Liri.
+#
+# Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+#
+# $BEGIN_LICENSE:BSD$
+#
+# You may use this file under the terms of the BSD license as follows:
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#    * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright
+#      notice, this list of conditions and the following disclaimer in the
+#      documentation and/or other materials provided with the distribution.
+#    * Neither the name of the Hawaii Project nor the
+#      names of its contributors may be used to endorse or promote products
+#      derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Pier Luigi Fiorini BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# $END_LICENSE$
+#
+
+if [ "$CC" = "gcc" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
+    if [ "$TRAVIS_BRANCH" = "develop" -o "$TRAVIS_BRANCH" = "master" ]; then
+        curl -s https://raw.githubusercontent.com/lirios/repotools/${TRAVIS_BRANCH}/travis/bintray.sh > .travis/bintray.sh
+        chmod 755 .travis/bintray.sh
+        exec ./.travis/bintray.sh
+    fi
+fi
diff --git a/prototype_2016/third_party/fluid/.travis/bintray.json.in b/prototype_2016/third_party/fluid/.travis/bintray.json.in
new file mode 100644
index 0000000..690b379
--- /dev/null
+++ b/prototype_2016/third_party/fluid/.travis/bintray.json.in
@@ -0,0 +1,29 @@
+{
+  "package": {
+    "name": "fluid",
+    "repo": "archlinux-@GITBRANCH@",
+    "subject": "liri",
+    "desc": "A collection of cross-platform QtQuick components for building fluid and dynamic applications",
+    "website_url": "http://liri.io",
+    "issue_tracker_url": "https://github.com/lirios/fluid",
+    "vcs_url": "https://github.com/lirios/fluid",
+    "licenses": ["MPL-2.0"],
+    "labels": ["qt", "qml", "quick", "controls", "material"]
+  },
+  "version": {
+    "name": "@PKGVER@",
+    "desc": "Arch Linux build from CI",
+    "released": "@TODAY@",
+    "vcs_tag": "@GITREV@",
+    "attributes": [
+      {"name": "gitrevision", "values": ["@GITREV@"], "type": "string"},
+      {"name": "gitdate", "values": ["@GITDATE@"], "type": "date"}
+    ],
+    "gpgSign": false
+  },
+  "files": [
+    {"includePattern": "cibuild/(fluid-git-.*.pkg.tar.xz)", "uploadPattern": "@ARCH@/$1", "matrixParams": {"override": 1}},
+    {"includePattern": "cibuild/(fluid.db.tar.gz)", "uploadPattern": "@ARCH@/fluid.db", "matrixParams": {"override": 1}}
+  ],
+  "publish": true
+}
diff --git a/prototype_2016/third_party/fluid/AUTHORS.md b/prototype_2016/third_party/fluid/AUTHORS.md
new file mode 100644
index 0000000..77aee46
--- /dev/null
+++ b/prototype_2016/third_party/fluid/AUTHORS.md
@@ -0,0 +1,25 @@
+Fluid
+=====
+
+# Authors
+
+ * Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Michael Spencer <sonrisesoftware@gmail.com>
+
+This is the list of contributors to this code base.
+
+Names are sorted by number of commits at the time of this writing.
+Commit data has been generated with:
+
+```sh
+git shortlog -s -e -n
+```
+
+Commit counts have been removed, since they change pretty frequently.
+
+Remember to update this file before any release is made, also make sure
+a .mailmap file is maintained if committer names and email addresses
+change over time.
+
+ * Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Michael Spencer <sonrisesoftware@gmail.com>
diff --git a/prototype_2016/third_party/fluid/CMakeLists.txt b/prototype_2016/third_party/fluid/CMakeLists.txt
new file mode 100644
index 0000000..3411262
--- /dev/null
+++ b/prototype_2016/third_party/fluid/CMakeLists.txt
@@ -0,0 +1,84 @@
+project(Fluid)
+
+cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+cmake_policy(VERSION 3.4.1)
+
+# Instruct CMake to run moc and rrc automatically when needed
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+# Apple-specific configuration
+set(APPLE_SUPPRESS_X11_WARNING ON)
+
+# Set version
+set(PROJECT_VERSION "0.9.0")
+set(PROJECT_VERSION_MAJOR 0)
+set(PROJECT_SOVERSION 0)
+
+# Set up packaging
+if(NOT USE_SUPERBUILD)
+    set(CPACK_PACKAGE_NAME "fluid")
+    set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+    set(CPACK_GENERATOR "TGZ")
+    set(CPACK_SET_DESTDIR FALSE)
+    set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+    set(CPACK_SOURCE_IGNORE_FILES "/build/;/.git;/.tx/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+    include(CPack)
+    add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+endif()
+
+# ECM
+find_package(ECM 1.7.0 REQUIRED NO_MODULE)
+list(APPEND CMAKE_MODULE_PATH
+    "${ECM_MODULE_PATH}"
+    "${ECM_KDE_MODULE_DIR}"
+)
+
+# Macros
+include(FeatureSummary)
+include(KDEInstallDirs)
+include(KDECompilerSettings)
+include(KDECMakeSettings)
+
+# Build flags
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Werror -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11")
+
+# Assume release build by default
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)
+endif()
+
+# Find Qt5
+set(REQUIRED_QT_VERSION "5.7.0")
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS
+             Svg Gui Qml Quick QuickTest QuickControls2)
+
+# Find QT_INSTALL_DOCS
+get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+if(NOT QT_INSTALL_DOCS)
+    exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DOCS" RETURN_VALUE return_code OUTPUT_VARIABLE QT_INSTALL_DOCS)
+endif()
+
+# Documentation target
+find_program(QDOC_EXECUTABLE qdoc-qt5 qdoc)
+add_custom_target(docs
+                  COMMAND QT_INSTALL_DOCS=${QT_INSTALL_DOCS} QT_VERSION_TAG=5.7 FLUID_VERSION=${PROJECT_VERSION} FLUID_VERSION_TAG=1.0 FLUID_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} ${QDOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/doc/fluid.qdocconf)
+
+# Subdirectories
+add_subdirectory(controls)
+add_subdirectory(core)
+add_subdirectory(demo)
+add_subdirectory(effects)
+add_subdirectory(src)
+add_subdirectory(tests)
+add_subdirectory(material)
+
+# Install icons
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/icons")
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icons"
+            DESTINATION ${QML_INSTALL_DIR}/Fluid/Controls
+            PATTERN "icons/icons.qrc" EXCLUDE)
+endif()
+
+# Display feature summary
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/prototype_2016/third_party/fluid/LICENSE.MPL2 b/prototype_2016/third_party/fluid/LICENSE.MPL2
new file mode 100644
index 0000000..14e2f77
--- /dev/null
+++ b/prototype_2016/third_party/fluid/LICENSE.MPL2
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  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/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/prototype_2016/third_party/fluid/README.md b/prototype_2016/third_party/fluid/README.md
new file mode 100644
index 0000000..70d04ba
--- /dev/null
+++ b/prototype_2016/third_party/fluid/README.md
@@ -0,0 +1,77 @@
+Fluid
+=====
+
+[![ZenHub.io](https://img.shields.io/badge/supercharged%20by-zenhub.io-blue.svg)](https://zenhub.io)
+
+[![License](https://img.shields.io/badge/license-MPL2-blue.svg)](https://www.mozilla.org/en-US/MPL/2.0/)
+[![GitHub release](https://img.shields.io/github/release/lirios/fluid.svg)](https://github.com/lirios/fluid)
+[![Build Status](https://travis-ci.org/lirios/fluid.svg?branch=develop)](https://travis-ci.org/lirios/fluid)
+[![GitHub issues](https://img.shields.io/github/issues/lirios/fluid.svg)](https://github.com/lirios/fluid/issues)
+[![Maintained](https://img.shields.io/maintenance/yes/2017.svg)](https://github.com/lirios/fluid/commits/develop)
+
+Fluid is a collection of cross-platform QtQuick components for building fluid and dynamic applications.
+
+## Dependencies
+
+Qt >= 5.7.0 with at least the following modules is required:
+
+ * [qtbase](http://code.qt.io/cgit/qt/qtbase.git)
+ * [qtdeclarative](http://code.qt.io/cgit/qt/qtdeclarative.git)
+ * [qtquickcontrols2](http://code.qt.io/cgit/qt/qtquickcontrols2.git)
+ * [qtgraphicaleffects](http://code.qt.io/cgit/qt/qtgraphicaleffects.git)
+ * [qtsvg](http://code.qt.io/cgit/qt/qtsvg.git)
+
+## System-wide installation
+
+First, if you want to include the Material Design icons used with the `Icon` component, run:
+
+```sh
+./scripts/fetch_icons.sh
+```
+
+This will clone the Google repository holding the icons and copy the SVG icons into the `icons` directory.
+
+From the root of the repository, run:
+
+```sh
+mkdir build; cd build
+cmake .. -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+make
+make install # use sudo if necessary
+```
+
+On the `cmake` line, you can specify additional configuration parameters:
+
+ * `-DCMAKE_INSTALL_PREFIX=/path/to/install` (for example, `/opt/liri` or `/usr`)
+ * `-DCMAKE_BUILD_TYPE=<build_type>`, where `<build_type>` is one of:
+   * **Debug:** debug build
+   * **Release:** release build
+   * **RelWithDebInfo:** release build with debugging information
+
+## Per-project installation using QMake
+
+First, clone this repository.
+
+Run the icon script located here:
+
+```sh
+./scripts/fetch_icons.sh
+```
+
+In your project file, include the fluid.pri file:  
+  `include(path/to/fluid.pri)`
+
+Then, in your `main.cpp` file or wherever you set up a `QQmlApplicationEngine`:
+* add this include directive :  
+`#include "iconthemeimageprovider.h"`  
+* add the resources files to your `QQmlApplicationEngine` import paths :  
+`engine.addImportPath(QStringLiteral("qrc:/"));`
+* register fluid's image providers to the engine :
+`engine.addImageProvider(QLatin1String("fluidicons"), new IconsImageProvider());`
+`engine.addImageProvider(QLatin1String("fluidicontheme"), new IconThemeImageProvider());`
+* and after that you can load your qml file:  
+`engine.load(QUrl(QStringLiteral("qrc:/main.qml")));`
+
+## Licensing
+
+Licensed under the terms of the Mozilla Public License version 2.0.
diff --git a/prototype_2016/third_party/fluid/controls/+material/BaseListItem.qml b/prototype_2016/third_party/fluid/controls/+material/BaseListItem.qml
new file mode 100644
index 0000000..2a956bc
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/BaseListItem.qml
@@ -0,0 +1,45 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import Fluid.Material 1.0
+
+ListItemDelegate {
+    id: listItem
+
+    background: Rectangle {
+        color: listItem.highlighted ? Qt.rgba(0,0,0,0.05)
+                                    : ripple.containsMouse ? Qt.rgba(0,0,0,0.03)
+                                                           : Qt.rgba(0,0,0,0)
+
+        Ripple {
+            id: ripple
+            width: parent.width
+            height: parent.height
+            enabled: interactive
+
+            control: listItem
+        }
+
+        ThinDivider {
+            x: dividerInset
+            y: parent.height - height
+
+            width: parent.width - x
+
+            visible: showDivider
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/+material/BodyLabel.qml b/prototype_2016/third_party/fluid/controls/+material/BodyLabel.qml
new file mode 100644
index 0000000..9445a1e
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/BodyLabel.qml
@@ -0,0 +1,30 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import Fluid.Core 1.0
+
+Label {
+    property int level: 1
+
+    font.pixelSize: Device.isMobile ? 14 : 13
+    font.weight: level == 1 ? Font.Normal : Font.Medium
+    lineHeight: level <= 1 ? 20.0 : 24.0
+    lineHeightMode: Text.FixedHeight
+    onLevelChanged: {
+        if (level < 1 || level > 2)
+            console.error("BodyLabel level must be either 1 or 2")
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/+material/CaptionLabel.qml b/prototype_2016/third_party/fluid/controls/+material/CaptionLabel.qml
new file mode 100644
index 0000000..66d5638
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/CaptionLabel.qml
@@ -0,0 +1,20 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+
+Label {
+    font.pixelSize: 12
+}
diff --git a/prototype_2016/third_party/fluid/controls/+material/DialogLabel.qml b/prototype_2016/third_party/fluid/controls/+material/DialogLabel.qml
new file mode 100644
index 0000000..4230d4c
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/DialogLabel.qml
@@ -0,0 +1,23 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0 as FluidCore
+
+Label {
+   font.pixelSize: FluidCore.Device.isMobile ? 18 : 17
+   color: Material.secondaryTextColor
+}
diff --git a/prototype_2016/third_party/fluid/controls/+material/DisplayLabel.qml b/prototype_2016/third_party/fluid/controls/+material/DisplayLabel.qml
new file mode 100644
index 0000000..67b9e4b
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/DisplayLabel.qml
@@ -0,0 +1,48 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import Fluid.Core 1.0
+
+Label {
+    property int level: 1
+
+    font.pixelSize: {
+        if (level <= 1)
+            return 34
+        else if (level == 2)
+            return 45
+        else if (level == 3)
+            return 56
+        return 112
+    }
+    lineHeight: {
+        if (level <= 1)
+            return 40.0
+        else if (level == 2)
+            return 48.0
+        return 1.0
+    }
+    lineHeightMode: {
+        if (level <= 2)
+            return Text.FixedHeight
+        return Text.ProportionalHeight
+    }
+    font.weight: level >= 4 ? Font.Light : Font.Normal
+    onLevelChanged: {
+        if (level < 1 || level > 4)
+            console.error("DisplayLabel level must be between 1 and 4")
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/+material/HeadlineLabel.qml b/prototype_2016/third_party/fluid/controls/+material/HeadlineLabel.qml
new file mode 100644
index 0000000..b001aa9
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/HeadlineLabel.qml
@@ -0,0 +1,22 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+
+Label {
+   font.pixelSize: 24
+   lineHeight: 32.0
+   lineHeightMode: Text.FixedHeight
+}
diff --git a/prototype_2016/third_party/fluid/controls/+material/SubheadingLabel.qml b/prototype_2016/third_party/fluid/controls/+material/SubheadingLabel.qml
new file mode 100644
index 0000000..d7f23bf
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/SubheadingLabel.qml
@@ -0,0 +1,29 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import Fluid.Core 1.0
+
+Label {
+    property int level: 1
+
+    font.pixelSize: Device.isMobile ? 16 : 15
+    lineHeight: level <= 1 ? 24.0 : 28.0
+    lineHeightMode: Text.FixedHeight
+    onLevelChanged: {
+        if (level < 1 || level > 2)
+            console.error("SubheadingLabel level must be either 1 or 2 with the Material style")
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/+material/ThinDivider.qml b/prototype_2016/third_party/fluid/controls/+material/ThinDivider.qml
new file mode 100644
index 0000000..0b69ef5
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/ThinDivider.qml
@@ -0,0 +1,22 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls.Material 2.0
+
+Rectangle {
+    color: Material.dividerColor
+    width: parent.width
+    height: 1
+}
diff --git a/prototype_2016/third_party/fluid/controls/+material/TitleLabel.qml b/prototype_2016/third_party/fluid/controls/+material/TitleLabel.qml
new file mode 100644
index 0000000..486abff
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/+material/TitleLabel.qml
@@ -0,0 +1,21 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+
+Label {
+    font.pixelSize: 20
+    font.weight: Font.Medium
+}
diff --git a/prototype_2016/third_party/qml-material/src/controls/Action.qml b/prototype_2016/third_party/fluid/controls/Action.qml
index a8ad35b..582b945 100644
--- a/prototype_2016/third_party/qml-material/src/controls/Action.qml
+++ b/prototype_2016/third_party/fluid/controls/Action.qml
@@ -1,32 +1,40 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
  *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
+import QtQuick 2.5
+import Fluid.Core 1.0
+
 /*!
    \qmltype Action
-   \inqmlmodule Material
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
 
    \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 {
+Object {
     id: action
 
     /*!
-       Set to \c true to display a divider between this action and the next action. Used in lists
-       or context menus.
+       Set to \c false to disable the action in the UI.
      */
-    property bool hasDividerAfter
+    property bool enabled: true
+
+    property string iconName
 
     /*!
        A URL pointing to an image to display as the icon. By default, this is
@@ -37,30 +45,35 @@ Controls.Action {
        \sa iconName
        \sa Icon
      */
-    property string iconSource: "icon://" + iconName
+    property url iconSource: Utils.getSourceForIconName(iconName)
+
+    /*!
+       \qmlproperty keysequence shortcut
+
+       This property holds the shortcut bound to the action.
+       The keysequence can be a string or a standard key.
+     */
+    property alias shortcut: shortcutItem.sequence
 
     /*!
        The text displayed for the action.
      */
-    property string name
+    property string text
 
     /*!
-      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.
+       The tooltip displayed for the action.
      */
-    property string summary
+    property string tooltip
 
     /*!
        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
+    signal triggered(var source)
 
-    property alias text: action.name
-    property alias tooltip: action.summary
+    Shortcut {
+        id: shortcutItem
+        onActivated: action.triggered(shortcutItem)
+    }
 }
diff --git a/prototype_2016/third_party/fluid/controls/AppBar.qml b/prototype_2016/third_party/fluid/controls/AppBar.qml
new file mode 100644
index 0000000..822b258
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/AppBar.qml
@@ -0,0 +1,194 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+import Fluid.Material 1.0 as FluidMaterial
+
+/*!
+   \qmltype AppBar
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief Application tool bar.
+ */
+ToolBar {
+    id: appBar
+
+    Material.elevation: toolbar && !tabBar.visible ? 0 : elevation
+    Material.theme: toolbar ? toolbar.Material.theme : Material.Light
+
+    /*!
+       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 leftAction
+
+    /*!
+       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 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 size of the left icon and the action icons.
+     */
+    property int iconSize: Device.gridUnit <= 48 ? 20 : 24
+
+    property alias leftKeyline: titleLabel.x
+
+    /*!
+       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 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 alias title: titleLabel.text
+
+    property alias tabs: tabBar.contentData
+
+    property alias currentTabIndex: tabBar.currentIndex
+
+    property AppToolBar toolbar
+
+    implicitHeight: background.implicitHeight
+
+    background: Rectangle {
+        color: appBar.Material.toolBarColor
+        height: implicitHeight
+        implicitHeight: Device.gridUnit + (tabBar.visible ? tabBar.implicitHeight : 0)
+
+        layer.enabled: appBar.Material.elevation > 0
+        layer.effect: FluidMaterial.ElevationEffect {
+            elevation: appBar.Material.elevation
+            fullWidth: true
+        }
+
+        ColumnLayout {
+            anchors.fill: parent
+            spacing: 0
+
+            RowLayout {
+                spacing: 0
+
+                Layout.preferredHeight: Device.gridUnit
+                Layout.fillWidth: true
+
+                IconButton {
+                    id: leftButton
+
+                    property bool showing: leftAction && leftAction.visible
+                    property int margin: (width - 24)/2
+
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.leftMargin: leftButton.showing ? 16 - leftButton.margin : -leftButton.width
+
+                    iconSize: appBar.iconSize
+
+                    iconSource: leftAction ? leftAction.iconSource : ""
+                    visible: leftAction && leftAction.visible
+                    enabled: leftAction && leftAction.enabled
+                    onClicked: {
+                        if (leftAction)
+                            leftAction.triggered(leftButton)
+                    }
+                }
+
+                TitleLabel {
+                    id: titleLabel
+
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.leftMargin: 16 + (leftButton.showing ? Device.gridUnit - leftButton.margin : 0)
+                    Layout.rightMargin: 16
+
+                    textFormat: Text.PlainText
+                    color: Material.primaryTextColor
+                    elide: Text.ElideRight
+                }
+
+                Item {
+                    Layout.fillWidth: true
+                }
+
+                Row {
+                    id: actionsRow
+
+                    Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                    Layout.rightMargin: 16 - leftButton.margin
+                    Layout.preferredHeight: Device.gridUnit
+
+                    spacing: 24 - 2 * leftButton.margin
+
+                    Repeater {
+                        model: appBar.actions
+                        delegate: IconButton {
+                            id: actionButton
+
+                            anchors.verticalCenter: parent.verticalCenter
+
+                            iconSize: appBar.iconSize
+
+                            iconSource: modelData.iconSource
+                            visible: modelData.visible
+                            enabled: modelData.enabled
+                            onClicked: modelData.triggered(actionButton)
+                        }
+                    }
+                }
+            }
+
+            TabBar {
+                id: tabBar
+
+                property bool fixed: true
+                property bool centered: false
+
+                Material.accent: appBar.Material.foreground
+
+                Layout.alignment: centered ? Qt.AlignHCenter : Qt.AlignLeft
+                Layout.leftMargin: centered ? 0 : leftKeyline - 12
+
+                visible: count > 0
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/AppToolBar.qml b/prototype_2016/third_party/fluid/controls/AppToolBar.qml
new file mode 100644
index 0000000..1f81816
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/AppToolBar.qml
@@ -0,0 +1,62 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0
+
+/*!
+   \qmltype AppToolBar
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief Application tool bar.
+ */
+ToolBar {
+    id: toolbar
+
+    Material.elevation: page ? page.appBar.elevation : 2
+    Material.background: Material.primaryColor
+    Material.theme: Utils.lightDark(Material.background, Material.Light, Material.Dark)
+
+    property Page page
+    property int maxActionCount: 3
+
+    function pop(page) {
+        stack.pop(page.appBar)
+
+        toolbar.page = page
+    }
+
+    function push(page) {
+        stack.push(page.appBar)
+
+        page.appBar.toolbar = toolbar
+        toolbar.page = page
+    }
+
+    function replace(page) {
+        toolbar.page = page
+
+        stack.replace(page.appBar)
+    }
+
+    StackView {
+        id: stack
+
+        width: parent.width
+        height: parent.height
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/BaseListItem.qml b/prototype_2016/third_party/fluid/controls/BaseListItem.qml
new file mode 100644
index 0000000..3a4d989
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/BaseListItem.qml
@@ -0,0 +1,43 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+
+/*!
+   \qmltype BaseListItem
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief The base class for list items.
+
+   Provides ripple effects, mouse/touch handling and tinting on mouse hover.
+ */
+ListItemDelegate {
+    id: listItem
+
+    background: Rectangle {
+        color: listItem.interactive && (listItem.highlighted || listItem.down)
+                ? Qt.rgba(0,0,0,0.05) : Qt.rgba(0,0,0,0)
+
+        ThinDivider {
+            x: dividerInset
+            y: parent.height - height
+
+            width: parent.width - x
+
+            visible: showDivider
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/BodyLabel.qml b/prototype_2016/third_party/fluid/controls/BodyLabel.qml
new file mode 100644
index 0000000..ff63cec
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/BodyLabel.qml
@@ -0,0 +1,51 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Templates 2.0 as T
+
+/*!
+    \qmltype BodyLabel
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Text label with standard font and styling suitable to body text.
+
+    \code
+    BodyLabel {
+        text: qsTr("Body text")
+    }
+    \endcode
+*/
+T.Label {
+    /*!
+        \qmlproperty int level
+
+        This property holds the label level that controls
+        font style and size.
+
+        It can be either 1 or 2.
+
+        Default value is 1.
+    */
+    property int level: 1
+
+    font.pixelSize: 14
+    color: "#26282a"
+    linkColor: "#45a7d7"
+    onLevelChanged: {
+        if (level < 1 || level > 2)
+            console.error("BodyLabel level must be either 1 or 2")
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/CMakeLists.txt b/prototype_2016/third_party/fluid/controls/CMakeLists.txt
new file mode 100644
index 0000000..0c190ab
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/CMakeLists.txt
@@ -0,0 +1,67 @@
+set(SOURCES
+    iconthemeimageprovider.cpp
+    plugin.cpp
+)
+
+set(QML_FILES
+    plugins.qmltypes
+    qmldir
+    Action.qml
+    AppBar.qml
+    AppToolBar.qml
+    BaseListItem.qml
+    BodyLabel.qml
+    CaptionLabel.qml
+    Card.qml
+    CircleImage.qml
+    Dialog.qml
+    DialogLabel.qml
+    DisplayLabel.qml
+    FluidStyle.qml
+    FluidWindow.qml
+    HeadlineLabel.qml
+    IconButton.qml
+    Icon.qml
+    InfoBar.qml
+    ListItemDelegate.qml
+    ListItem.qml
+    Loadable.qml
+    NavigationDrawer.qml
+    NoiseBackground.qml
+    Page.qml
+    PageStack.qml
+    Placeholder.qml
+    Showable.qml
+    Sidebar.qml
+    SmoothFadeImage.qml
+    SmoothFadeLoader.qml
+    Subheader.qml
+    SubheadingLabel.qml
+    Tab.qml
+    TabbedPage.qml
+    ThinDivider.qml
+    TitleLabel.qml
+    Units.qml
+)
+
+set(MATERIAL_FILES
+    +material/BaseListItem.qml
+    +material/BodyLabel.qml
+    +material/CaptionLabel.qml
+    +material/DialogLabel.qml
+    +material/DisplayLabel.qml
+    +material/HeadlineLabel.qml
+    +material/SubheadingLabel.qml
+    +material/ThinDivider.qml
+    +material/TitleLabel.qml
+)
+
+add_library(fluidcontrols SHARED ${SOURCES} ${QML_FILES} ${MATERIAL_FILES})
+target_link_libraries(fluidcontrols Qt5::Gui Qt5::Quick)
+
+install(TARGETS fluidcontrols LIBRARY
+        DESTINATION ${QML_INSTALL_DIR}/Fluid/Controls)
+install(FILES ${QML_FILES}
+        DESTINATION ${QML_INSTALL_DIR}/Fluid/Controls)
+install(FILES ${MATERIAL_FILES}
+        DESTINATION ${QML_INSTALL_DIR}/Fluid/Controls/+material)
diff --git a/prototype_2016/third_party/fluid/controls/CaptionLabel.qml b/prototype_2016/third_party/fluid/controls/CaptionLabel.qml
new file mode 100644
index 0000000..b62f1c2
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/CaptionLabel.qml
@@ -0,0 +1,35 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Templates 2.0 as T
+
+/*!
+    \qmltype CaptionLabel
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Text label with standard font and styling suitable to captions.
+
+    \code
+    Caption {
+        text: qsTr("A translatable caption")
+    }
+    \endcode
+*/
+T.Label {
+    font.pixelSize: 10
+    color: "#26282a"
+    linkColor: "#45a7d7"
+}
diff --git a/prototype_2016/third_party/fluid/controls/Card.qml b/prototype_2016/third_party/fluid/controls/Card.qml
new file mode 100644
index 0000000..4b4f666
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Card.qml
@@ -0,0 +1,88 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick.Controls 2.0 as C
+import QtQuick.Controls.Material 2.0
+
+/*!
+    \qmltype Card
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Cards display content composed of different elements.
+
+    \code
+    Card {
+        anchors.centerIn: parent
+        width: 400
+        height: 400
+
+        Image {
+            id: picture
+            anchors {
+                left: parent.left
+                top: parent.top
+                right: parent.right
+            }
+            height: 200
+            source: "Yosemite.jpg"
+        }
+
+        Column {
+            id: column
+            anchors {
+                left: parent.left
+                top: picture.bottom
+                right: parent.right
+                margins: Units.smallSpacing * 2
+            }
+            spacing: Units.smallSpacing * 2
+
+            TitleLabel {
+                text: qsTr("Yosemite National Park")
+            }
+
+            BodyLabel {
+                text: qsTr("First protected in 1864, Yosemite National Park " +
+                           "is best known for its waterfalls, but within its " +
+                           "nearly 1,200 square miles, you can find deep " +
+                           "valleys, grand meadows, ancient giant sequoias, " +
+                           "a vast wilderness area, and much more.")
+                wrapMode: Text.WordWrap
+                width: parent.width
+            }
+
+            Row {
+                spacing: Units.smallSpacing
+
+                Button {
+                    text: qsTr("Share")
+                    flat: true
+                }
+
+                Button {
+                    text: qsTr("Explore")
+                    flat: true
+                }
+            }
+        }
+    }
+    \endcode
+*/
+C.Pane {
+    padding: 0
+
+    Material.background: "white"
+    Material.elevation: 1
+}
diff --git a/prototype_2016/third_party/qml-material/src/extras/CircleImage.qml b/prototype_2016/third_party/fluid/controls/CircleImage.qml
index 777f412..c846109 100644
--- a/prototype_2016/third_party/qml-material/src/extras/CircleImage.qml
+++ b/prototype_2016/third_party/fluid/controls/CircleImage.qml
@@ -1,23 +1,33 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
  *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
 import QtQuick 2.4
-import Material.Extras 0.1 as Extras
 import QtGraphicalEffects 1.0
+import Fluid.Effects 1.0
+
+/*!
+    \qmltype CircleImage
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
 
+    \brief Circular image.
+*/
 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
@@ -26,12 +36,10 @@ Item {
     width: image.implicitWidth
     height: image.implicitHeight
 
-    Extras.Image {
+    Image {
         id: image
         anchors.fill: parent
-        smooth: true
         visible: false
-        mipmap: true
     }
 
     CircleMask {
diff --git a/prototype_2016/third_party/fluid/controls/Dialog.qml b/prototype_2016/third_party/fluid/controls/Dialog.qml
new file mode 100644
index 0000000..b9d1b77
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Dialog.qml
@@ -0,0 +1,169 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+
+/*!
+    \qmltype Dialog
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Dialog.
+*/
+Popup {
+    property alias title: titleLabel.text
+    property alias text: textLabel.text
+
+    property alias positiveButton: positiveButton
+    property alias negativeButton: negativeButton
+
+    property string positiveButtonText: qsTr("Ok")
+    property string negativeButtonText: qsTr("Cancel")
+
+    default property alias dialogContent: dialogContentItem.data
+
+    property bool __triggered
+
+    padding: 0
+    modal: true
+    focus: true
+
+    x: (parent.width - width)/2
+    y: (parent.height - height)/2
+
+    signal accepted
+    signal rejected
+    signal canceled
+
+    onOpened: __triggered = false
+
+    onAccepted: {
+        __triggered = true
+        close()
+    }
+
+    onRejected: {
+        __triggered = true
+        close()
+    }
+
+    onClosed: {
+        if (!__triggered)
+            canceled()
+    }
+
+    ColumnLayout {
+        width: parent.width
+        spacing: 0
+
+        Rectangle {
+            Layout.fillWidth: true
+            Layout.preferredWidth: column.implicitWidth + 48
+            Layout.preferredHeight: column.implicitHeight + 48
+            Layout.minimumWidth: Device.isMobile ? 280 : 300
+
+            ColumnLayout {
+                id: column
+
+                anchors.centerIn: parent
+                spacing: 0
+
+                width: parent.width - 48
+
+                TitleLabel {
+                    id: titleLabel
+
+                    Layout.fillWidth: true
+
+                    wrapMode: Text.Wrap
+                    visible: title != ""
+                }
+
+                Item {
+                    Layout.fillWidth: true
+                    Layout.preferredHeight: 20
+                    visible: titleLabel.visible && textLabel.visible
+                }
+
+                Label {
+                    id: textLabel
+
+                    Layout.fillWidth: true
+
+                    font: FluidStyle.dialogFont
+                    wrapMode: Text.Wrap
+                    color: Material.secondaryTextColor
+                    visible: text != ""
+                }
+
+                Item {
+                    Layout.fillWidth: true
+                    Layout.preferredHeight: 20
+                    visible: textLabel.visible
+                }
+
+                Item {
+                    id: dialogContentItem
+                    Layout.fillWidth: true
+                    Layout.preferredHeight: childrenRect.height
+                }
+            }
+        }
+
+        RowLayout {
+            Layout.alignment: Qt.AlignRight
+            Layout.preferredHeight: 52
+
+            spacing: 0
+
+            Button {
+                id: negativeButton
+
+                Layout.alignment: Qt.AlignVCenter
+                Material.foreground: Material.primaryColor
+
+                text: negativeButtonText
+                flat: true
+
+                onClicked: rejected()
+            }
+
+            Item {
+                Layout.preferredWidth: 8
+            }
+
+            Button {
+                id: positiveButton
+
+                Layout.alignment: Qt.AlignVCenter
+                Material.foreground: Material.primaryColor
+
+                text: positiveButtonText
+                flat: true
+
+                onClicked: accepted()
+            }
+
+            Item {
+                Layout.preferredWidth: 8
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/DialogLabel.qml b/prototype_2016/third_party/fluid/controls/DialogLabel.qml
new file mode 100644
index 0000000..2777027
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/DialogLabel.qml
@@ -0,0 +1,38 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Templates 2.0 as T
+
+/*!
+   \qmltype DialogLabel
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief Text label with standard font and styling suitable to message box text.
+
+   \code
+   import QtQuick 2.0
+   import Fluid.Controls 1.0 as FluidControls
+
+   FluidControls.DialogLabel {
+       text: "Text to display"
+   }
+   \endcode
+*/
+T.Label {
+   font.pixelSize: 18
+   color: "#909090"
+   linkColor: "#45a7d7"
+}
diff --git a/prototype_2016/third_party/fluid/controls/DisplayLabel.qml b/prototype_2016/third_party/fluid/controls/DisplayLabel.qml
new file mode 100644
index 0000000..8f27f05
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/DisplayLabel.qml
@@ -0,0 +1,59 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Templates 2.0 as T
+
+/*!
+    \qmltype DisplayLabel
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Text label with standard font and styling suitable to display text.
+
+    \code
+    DisplayLabel {
+        text: qsTr("Display text")
+    }
+    \endcode
+*/
+T.Label {
+    /*!
+        \qmlproperty int level
+
+        This property holds the label level that controls
+        font style and size.
+
+        Only values between 1 and 4 are allowed.
+
+        Default value is 1.
+    */
+    property int level: 1
+
+    font.pixelSize: {
+        if (level <= 1)
+            return 30
+        else if (level == 2)
+            return 40
+        else if (level == 3)
+            return 50
+        return 100
+    }
+    color: "#26282a"
+    linkColor: "#45a7d7"
+    onLevelChanged: {
+        if (level < 1 || level > 4)
+            console.error("DisplayLabel level must be between 1 and 4")
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/FluidStyle.qml b/prototype_2016/third_party/fluid/controls/FluidStyle.qml
new file mode 100644
index 0000000..4d3afea
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/FluidStyle.qml
@@ -0,0 +1,68 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import Fluid.Core 1.0
+
+pragma Singleton
+
+/*!
+    \qmltype FluidStyle
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Style.
+*/
+QtObject {
+    id: fluidStyle
+
+    readonly property color iconColorLight: Qt.rgba(0,0,0,0.54)
+    readonly property color iconColorDark: Qt.rgba(1,1,1)
+
+    readonly property font display4Font: Qt.font({ family: "Roboto", weight: Font.Light,
+                                                   pixelSize: 112 })
+
+    readonly property font display3Font: Qt.font({ family: "Roboto", pixelSize: 56 })
+
+    readonly property font display2Font: Qt.font({ family: "Roboto", pixelSize: 45 })
+
+    readonly property font display1Font: Qt.font({ family: "Roboto", pixelSize: 34 })
+
+    readonly property font headlineFont: Qt.font({ family: "Roboto", pixelSize: 24 })
+
+    readonly property font titleFont: Qt.font({ family: "Roboto", weight: Font.DemiBold,
+                                                pixelSize: 20 })
+
+    readonly property font subheadingFont: Qt.font({ family: "Roboto",
+                                                     pixelSize: Device.isMobile ? 16 : 15 })
+
+    readonly property font body2Font: Qt.font({ family: "Roboto", weight: Font.DemiBold,
+                                                pixelSize: Device.isMobile ? 14 : 13 })
+
+    readonly property font body1Font: Qt.font({ family: "Roboto",
+                                                pixelSize: Device.isMobile ? 14 : 13 })
+
+    readonly property font captionFont: Qt.font({ family: "Roboto", pixelSize: 12 })
+
+    readonly property font buttonFont: Qt.font({ family: "Roboto", weight: Font.DemiBold,
+                                                 pixelSize: 14, capitalization: Font.AllUppercase })
+
+    /* Control fonts that don't fit into the standard font styles */
+
+    readonly property font subheaderFont: Qt.font({ family: "Roboto", weight: Font.DemiBold,
+                                                    pixelSize: 14 })
+
+    readonly property font dialogFont: Qt.font({ family: "Roboto",
+                                                 pixelSize: Device.isMobile ? 18 : 17 })
+}
diff --git a/prototype_2016/third_party/fluid/controls/FluidWindow.qml b/prototype_2016/third_party/fluid/controls/FluidWindow.qml
new file mode 100644
index 0000000..e7b0b67
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/FluidWindow.qml
@@ -0,0 +1,101 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0 as FluidControls
+
+/*!
+   \qmltype FluidWindow
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \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 Fluid.Controls 1.0 as FluidControls
+
+   FluidControls.ApplicationWindow {
+       title: "Application Name"
+
+       initialPage: page
+
+       Page {
+           id: page
+           title: "Page Title"
+
+           Label {
+               anchors.centerIn: parent
+               text: "Hello World!"
+           }
+       }
+   }
+   \endqml
+*/
+ApplicationWindow {
+    id: window
+
+    /*!
+       \qmlproperty color decorationColor
+
+       The color of the status bar or window decorations, if the current
+       platform supports it.
+     */
+    property alias decorationColor: platformExtensions.decorationColor
+
+    property alias appBar: appBar
+
+    /*!
+       \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
+
+    header: FluidControls.AppToolBar {
+        id: appBar
+    }
+
+    FluidControls.PageStack {
+        id: pageStack
+
+        width: parent.width
+        height: parent.height
+
+        onPushed: appBar.push(page)
+        onPopped: appBar.pop(page)
+        onReplaced: appBar.replace(page)
+    }
+
+    PlatformExtensions {
+        id: platformExtensions
+        window: window
+        decorationColor: Material.shade(window.Material.primaryColor, Material.Shade700)
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/HeadlineLabel.qml b/prototype_2016/third_party/fluid/controls/HeadlineLabel.qml
new file mode 100644
index 0000000..93d2bf6
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/HeadlineLabel.qml
@@ -0,0 +1,35 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Templates 2.0 as T
+
+/*!
+   \qmltype HeadlineLabel
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief Text label with standard font and styling suitable to headlines.
+
+   \code
+   HeadlineLabel {
+       text: qsTr("A translatable headline")
+   }
+   \endcode
+*/
+T.Label {
+   font.pixelSize: 22
+   color: "#26282a"
+   linkColor: "#45a7d7"
+}
diff --git a/prototype_2016/third_party/fluid/controls/Icon.qml b/prototype_2016/third_party/fluid/controls/Icon.qml
new file mode 100644
index 0000000..3f0d4c5
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Icon.qml
@@ -0,0 +1,173 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2015 Bogdan Cuza <bogdan.cuza@hotmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Window 2.2
+import QtGraphicalEffects 1.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+
+/*!
+    \qmltype Icon
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Displays an icon from the Material Design icon collection, the platform's icon theme,
+    or another (local or remote) location.
+
+    To use an icon from the \l{}{Material Design icon collection}, set the \c name property to the name of the icon in its group in the form of \c group/icon_name. For example:
+    \code
+    Icon {
+        name: "action/settings"
+    }
+    \endcode
+
+    This icon will by default use the light icon color from Material Design. To use the dark icon
+    color:
+    \code
+    Icon {
+        Material.theme: Material.Dark
+
+        name: "action/settings"
+    }
+    \endcode
+
+    In addition to using icons from Material Design, you can also use icons from the platform's
+    \l{http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html}{Freedesktop icon theme}. For example:
+
+    \code
+    Icon {
+        name: "gimp"
+    }
+    \endcode
+
+    By default, icons from the Freedesktop icon theme are not colorized unless they include the word "symbolic" in the icon name. For example, "gimp" would be full-colored by "edit-cut-symbolic" would be colored using the set \c color property (based off of \c Material.theme). If you need to colorize an icon manually, you can do so like this:
+
+    \code
+    Icon {
+        name: "gimp"
+        colorize: true
+    }
+    \endcode
+
+    You can also use custom icons like this:
+    \code
+    Icon {
+        source: Qt.resolvedUrl("icons/fun_icon.png")
+    }
+    \endcode
+ */
+Item {
+    id: icon
+
+    /*!
+       The color of the icon. Defaults to \c FluidStyle.iconColorLight. For dark backgrounds,
+       set \c Material.theme to Material.Dark or set this to \c FluidStyle.iconColorDark.
+     */
+    property color color: Material.theme == Material.Light ? FluidStyle.iconColorLight
+                                                           : FluidStyle.iconColorDark
+
+    /*!
+       The size of the icon. Defaults to 24px.
+     */
+    property real size: 24
+
+    /*!
+       The name of the icon to display.
+
+       \sa source
+     */
+    property string name
+
+    /*!
+       \brief A URL pointing to an image to display as the icon.
+
+       By default, this is a special URL representing the icon named by \ref name from the Material
+       Design icon collection when using the form of "collection/icon_name", or in the case of a
+       single "icon_name", the platform's Freedesktop icon theme will be used.
+
+       By default, icons from the Material Design icons collection will be treated as symbolic icons and colored using the specified \ref color, while icons from the Freedesktop icon theme will
+       not be colorized. To override this, or set the behavior for your own custom icons, use
+       \ref colorize.
+
+       \sa name
+     */
+     property url source: Utils.getSourceForIconName(name)
+
+    /*!
+       \qmlproperty enumeration status
+       \list
+         \li Image.Null - no image has been set
+         \li Image.Ready - the image has been loaded
+         \li Image.Loading - the image is currently being loaded
+         \li Image.Error - an error occurred while loading the image
+       \endlist
+     */
+    property alias status: image.status
+
+    /*!
+       Specifies whether the image should be cached.
+       The default value is true.
+
+       Setting cache to false is useful when dealing with large images,
+       to make sure that they aren't cached at the expense of small
+       'ui element' images.
+    */
+    property alias cache: image.cache
+
+    /*!
+       \c true if the icon is valid and fully loaded.
+     */
+    readonly property bool valid: status == Image.Ready
+
+    /*!
+       Set to \c false if you want the icon to use the original image's colors and not be
+       colored using the specified \ref color.
+     */
+    property bool colorize: (String(icon.source).indexOf(".color.") === -1 &&
+                             String(icon.source).indexOf("image://fluidicontheme/") === -1) ||
+                            String(icon.source).indexOf("symbolic") !== -1
+
+    readonly property real sourceSize: String(icon.source).indexOf("image://fluidicontheme/") === 0 ? Units.roundToIconSize(size) : size
+
+    width: size
+    height: size
+
+    Image {
+        id: image
+
+        anchors.fill: parent
+        visible: !colorize
+
+        source: icon.source
+
+        sourceSize {
+            width: icon.sourceSize * Screen.devicePixelRatio
+            height: icon.sourceSize * Screen.devicePixelRatio
+        }
+    }
+
+    ColorOverlay {
+        id: overlay
+
+        anchors.fill: parent
+        source: image
+        color: Utils.alpha(icon.color, 1)
+        cached: true
+        visible: icon.valid && colorize
+        opacity: icon.color.a
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/IconButton.qml b/prototype_2016/third_party/fluid/controls/IconButton.qml
new file mode 100644
index 0000000..7b74d53
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/IconButton.qml
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+
+/*!
+    \qmltype IconButton
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Tool button with an \l Icon.
+*/
+ToolButton {
+    id: iconButton
+
+    property alias iconName: icon.name
+    property alias iconSource: icon.source
+    property alias iconSize: icon.size
+    property alias iconColor: icon.color
+
+    indicator: Icon {
+        id: icon
+
+        anchors.centerIn: parent
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/InfoBar.qml b/prototype_2016/third_party/fluid/controls/InfoBar.qml
new file mode 100644
index 0000000..27fbfcb
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/InfoBar.qml
@@ -0,0 +1,149 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2014 Bogdan Cuza <bogdan.cuza@hotmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0
+
+/*!
+   \qmltype InfoBar
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief InfoBar provide lightweight feedback about an operation.
+
+   \code
+   Page {
+       title: qsTr("Send a message")
+
+       Button {
+           anchors.centerIn: parent
+           text: qsTr("Send Message")
+           onClicked: infoBar.open(qsTr("Message sent"))
+       }
+
+       InfoBar {
+           id: infoBar
+       }
+   }
+   \endcode
+*/
+Rectangle {
+    id: infoBar
+
+    property string buttonText
+    property color buttonColor: Material.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) {
+        infoBar.text = text
+        opened = true
+        timer.restart()
+    }
+
+    anchors {
+        left: fullWidth ? parent.left : undefined
+        right: fullWidth ? parent.right : undefined
+        bottom: parent.bottom
+        bottomMargin: opened ? 0 :  -infoBar.height
+        horizontalCenter: fullWidth ? undefined : parent.horizontalCenter
+
+        Behavior on bottomMargin {
+            NumberAnimation { duration: 300 }
+        }
+    }
+    radius: fullWidth ? 0 : 2
+    color: "#323232"
+    height: snackLayout.height
+    width: fullWidth ? undefined : snackLayout.width
+    opacity: opened ? 1 : 0
+
+    Timer {
+        id: timer
+
+        interval: infoBar.duration
+
+        onTriggered: {
+            if (!running)
+                infoBar.opened = false
+        }
+    }
+
+    RowLayout {
+        id: snackLayout
+
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: infoBar.fullWidth ? parent.left : undefined
+            right: infoBar.fullWidth ? parent.right : undefined
+        }
+
+        spacing: 0
+
+        Item {
+            width: 24
+        }
+
+        Label {
+            id: snackText
+            Layout.fillWidth: true
+            Layout.minimumWidth: infoBar.fullWidth ? -1 : 216 - snackButton.width
+            Layout.maximumWidth: infoBar.fullWidth ? -1 :
+                Math.min(496 - snackButton.width - middleSpacer.width - 48,
+                         infoBar.parent.width - snackButton.width - middleSpacer.width - 48)
+
+            Layout.preferredHeight: lineCount == 2 ? 80 : 48
+            verticalAlignment: Text.AlignVCenter
+            maximumLineCount: 2
+            wrapMode: Text.Wrap
+            elide: Text.ElideRight
+            text: infoBar.text
+            color: "white"
+        }
+
+        Item {
+            id: middleSpacer
+            width: infoBar.buttonText == "" ? 0 : infoBar.fullWidth ? 24 : 48
+        }
+
+        Button {
+            id: snackButton
+            visible: infoBar.buttonText != ""
+            text: infoBar.buttonText
+            flat: true
+            width: visible ? implicitWidth : 0
+            font.bold: true
+            onClicked: infoBar.clicked()
+
+            Material.foreground: infoBar.buttonColor
+        }
+
+        Item {
+            width: 24
+        }
+    }
+
+    Behavior on opacity {
+        NumberAnimation { duration: 300 }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/ListItem.qml b/prototype_2016/third_party/fluid/controls/ListItem.qml
new file mode 100644
index 0000000..252e9fd
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/ListItem.qml
@@ -0,0 +1,155 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Layouts 1.1
+import Fluid.Controls 1.0
+
+/*!
+   \qmltype BaseListItem
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief A standard list item, with one or more lines of text and optional left and right items.
+ */
+BaseListItem {
+    id: listItem
+
+    implicitHeight: Math.max(subText != "" ? maximumLineCount == 2 ? 72 : 88
+                                           : secondaryItem.showing ? secondaryItem.childrenRect.height + Units.smallSpacing * 2 : 48,
+                             leftItem.childrenRect.height + Units.smallSpacing * 2,
+                             rightItem.childrenRect.height + Units.smallSpacing * 2)
+
+    dividerInset: leftItem.visible ? listItem.height : 0
+
+    property int maximumLineCount: 2
+
+    property alias subText: subLabel.text
+    property alias valueText: valueLabel.text
+
+    property alias iconName: icon.name
+    property alias iconSource: icon.source
+
+    property alias leftItem: leftItem.children
+    property alias rightItem: rightItem.children
+    property alias secondaryItem: secondaryItem.children
+
+    contentItem: RowLayout {
+        spacing: Units.smallSpacing * 2
+
+        Item {
+            id: leftItem
+            objectName: "leftItem"
+
+            Layout.preferredWidth: showing ? 40 : 0
+            Layout.preferredHeight: width
+            Layout.alignment: Qt.AlignCenter
+
+            property bool showing: visibleChildren.length > 0
+
+            Icon {
+                id: icon
+                objectName: "icon"
+
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                }
+
+                visible: icon.valid
+                color: listItem.highlighted ? Material.primaryColor
+                        : Material.theme == Material.Light ? FluidStyle.iconColorLight
+                                                           : FluidStyle.iconColorDark
+            }
+        }
+
+        ColumnLayout {
+            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+            Layout.fillWidth: true
+
+            spacing: 0
+
+            RowLayout {
+                Layout.fillWidth: true
+
+                visible: label.text != "" || valueLabel.text != ""
+                spacing: Units.smallSpacing
+
+                SubheadingLabel {
+                    id: label
+                    objectName: "textLabel"
+
+                    Layout.alignment: Qt.AlignVCenter
+                    Layout.fillWidth: true
+
+                    text: listItem.text
+                    elide: Text.ElideRight
+                    color: listItem.highlighted ? Material.primaryColor
+                                                : Material.primaryTextColor
+                    visible: text != ""
+                }
+
+                BodyLabel {
+                    id: valueLabel
+                    objectName: "valueLabel"
+
+                    Layout.alignment: Qt.AlignVCenter
+                    Layout.preferredWidth: visible ? implicitWidth : 0
+
+                    color: Material.secondaryTextColor
+                    elide: Text.ElideRight
+
+                    visible: text != ""
+                }
+            }
+
+            BodyLabel {
+                id: subLabel
+                objectName: "subTextLabel"
+
+                Layout.fillWidth: true
+                Layout.preferredHeight: implicitHeight * maximumLineCount/lineCount
+
+                color: Material.secondaryTextColor
+                elide: Text.ElideRight
+                wrapMode: Text.WordWrap
+
+                visible: text != "" && !contentItem.showing
+                maximumLineCount: listItem.maximumLineCount - 1
+            }
+
+            Item {
+                id: secondaryItem
+                objectName: "secondaryItem"
+
+                Layout.fillWidth: true
+                Layout.preferredHeight: showing ? childrenRect.height + Units.smallSpacing : 0
+
+                property bool showing: visibleChildren.length > 0
+            }
+        }
+
+        Item {
+            id: rightItem
+            objectName: "rightItem"
+            Layout.preferredWidth: showing ? childrenRect.width : 0
+            Layout.preferredHeight: parent.height
+
+            property bool showing: visibleChildren.length > 0
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/ListItemDelegate.qml b/prototype_2016/third_party/fluid/controls/ListItemDelegate.qml
new file mode 100644
index 0000000..576f271
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/ListItemDelegate.qml
@@ -0,0 +1,42 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.0
+import QtQuick.Controls 2.0
+import Fluid.Material 1.0
+
+/*!
+    \qmltype ListItemDelegate
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief A delegate for list views.
+*/
+ItemDelegate {
+    Layout.fillWidth: true
+
+    property int dividerInset: 0
+    property bool showDivider: false
+    property bool interactive: true
+
+    width: parent ? parent.width : undefined
+
+    leftPadding: 16
+    rightPadding: 16
+    topPadding: 0
+    bottomPadding: 0
+
+    opacity: enabled ? 1 : 0.6
+}
diff --git a/prototype_2016/third_party/fluid/controls/Loadable.qml b/prototype_2016/third_party/fluid/controls/Loadable.qml
new file mode 100644
index 0000000..f1c9176
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Loadable.qml
@@ -0,0 +1,70 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+/*!
+    \qmltype Loadable
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Loadable component.
+*/
+Item {
+    property Component component
+    property var showAnimation
+    property var hideAnimation
+    property alias asynchronous: loader.asynchronous
+    property alias item: loader.item
+
+    id: root
+    visible: false
+
+    Loader {
+        id: loader
+        anchors.fill: parent
+        asynchronous: true
+        onStatusChanged: {
+            if (status != Loader.Ready)
+                return;
+            if (item.showAnimation == undefined && root.showAnimation != undefined)
+                item.showAnimation = root.showAnimation;
+            if (item.hideAnimation == undefined && root.hideAnimation != undefined)
+                item.hideAnimation = root.hideAnimation;
+            root.visible = true;
+            if (item.show != undefined)
+                item.show();
+        }
+    }
+
+    Connections {
+        target: loader.item
+        onVisibleChanged: {
+            // Unload component as soon as it's hidden and hide this item as well
+            if (!loader.item.visible) {
+                loader.sourceComponent = undefined;
+                root.visible = false;
+            }
+        }
+    }
+
+    function show() {
+        loader.sourceComponent = root.component;
+    }
+
+    function hide() {
+        if (loader.item && loader.item.hide != undefined)
+            loader.item.hide();
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/NavigationDrawer.qml b/prototype_2016/third_party/fluid/controls/NavigationDrawer.qml
new file mode 100644
index 0000000..36d3547
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/NavigationDrawer.qml
@@ -0,0 +1,195 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.0
+import QtQuick.Controls 2.0
+import QtQml 2.2
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+
+/*!
+    \qmltype NavigationDrawer
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief The navigation drawer slides in from the left and is a common pattern in apps.
+
+    \code
+    import QtQuick.Window 2.2
+    import Fluid.Controls 2.0 as FluidControls
+
+    Window {
+        id: window
+        width: 400
+        height: 400
+        visible: true
+
+        Button {
+            text: "Open"
+            onClicked: drawer.open()
+        }
+
+        FluidControls.NavigationDrawer {
+            topContent: [
+                Button {
+                    text: "Push me"
+                    onClicked: console.log("Pushed")
+                }
+            ]
+
+            actions: [
+                Action {
+                    text: "Action 1"
+                },
+                Action {
+                    text: "Action 1"
+                }
+            ]
+        }
+    }
+    \endcode
+*/
+
+Drawer {
+    id: drawer
+
+    /*!
+        \qmlproperty list<Item> topContent
+
+        The items added to this list will be displayed on top of the
+        actions list.
+
+        \code
+        import QtQuick.Window 2.2
+        import Fluid.Controls 2.0 as FluidControls
+
+        Window {
+            id: window
+            width: 400
+            height: 400
+            visible: true
+
+            Button {
+                text: "Open"
+                onClicked: drawer.open()
+            }
+
+            FluidControls.NavigationDrawer {
+                topContent: [
+                    Button {
+                        text: "Push me"
+                        onClicked: console.log("Pushed")
+                    }
+                ]
+            }
+        }
+        \endcode
+    */
+    property alias topContent: topContent.data
+
+    /*!
+        \qmlproperty list<QtObject> actions
+
+        List of actions to be displayed by the drawer.
+
+        \code
+        import QtQuick.Window 2.2
+        import Fluid.Controls 2.0 as FluidControls
+
+        Window {
+            id: window
+            width: 400
+            height: 400
+            visible: true
+
+            Button {
+                text: "Open"
+                onClicked: drawer.open()
+            }
+
+            FluidControls.NavigationDrawer {
+                actions: [
+                    Action {
+                        text: "Action 1"
+                    },
+                    Action {
+                        text: "Action 1"
+                    }
+                ]
+            }
+        }
+        \endcode
+    */
+    property list<QtObject> actions
+
+    width: {
+        switch (Device.formFactor) {
+        case Device.Phone:
+            return 280
+        case Device.Tablet:
+            return 320
+        default:
+            break
+        }
+        return 56 * 4
+    }
+    height: ApplicationWindow.height
+
+    padding: 0
+
+    Pane {
+        id: pane
+
+        anchors.fill: parent
+        padding: 0
+
+        ColumnLayout {
+            anchors.fill: parent
+            spacing: 0
+
+            ColumnLayout {
+                id: topContent
+
+                height: childrenRect.height + 2 * drawer.padding
+
+                spacing: 0
+                visible: children.length > 0
+
+                Layout.margins: drawer.padding
+                Layout.fillWidth: true
+            }
+
+            ListView {
+                currentIndex: -1
+                spacing: 0
+
+                model: drawer.actions
+
+                delegate: ListItem {
+                    iconName: modelData.iconName
+                    text: modelData.text
+                    onClicked: modelData.triggered(drawer)
+                }
+
+                visible: count > 0
+
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+
+                ScrollBar.vertical: ScrollBar {}
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/NoiseBackground.qml b/prototype_2016/third_party/fluid/controls/NoiseBackground.qml
new file mode 100644
index 0000000..e3513de
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/NoiseBackground.qml
@@ -0,0 +1,99 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Fluid and is derived from NoisyGradient.qml
+** from the Qt 5 launch demo.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+/*!
+    \qmltype NoiseBackground
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Background with noise.
+*/
+ShaderEffect {
+    property alias gradient: rect.gradient
+    property alias color: rect.color
+
+    Rectangle {
+        id: rect
+        anchors.fill: parent
+        layer.enabled: true
+        layer.smooth: true
+        visible: false
+    }
+
+    readonly property variant source: rect
+
+    blending: false
+    fragmentShader: "
+        #ifdef GL_ES
+            precision lowp float;
+        #endif
+
+        uniform sampler2D source;
+        varying highp vec2 qt_TexCoord0;
+        uniform lowp float qt_Opacity;
+
+        // Noise function from: http://stackoverflow.com/questions/4200224/random-noise-functions-for-glsl
+        float rand(vec2 n) {
+            return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233))) * 43758.5453);
+        }
+
+        void main() {
+            lowp float len = clamp(length(vec2(0.5, 0.0) - qt_TexCoord0), 0.0, 1.0);
+            gl_FragColor = texture2D(source, vec2(0, len)) * qt_Opacity + rand(qt_TexCoord0) * 0.05;
+        }
+    "
+}
diff --git a/prototype_2016/third_party/fluid/controls/Page.qml b/prototype_2016/third_party/fluid/controls/Page.qml
new file mode 100644
index 0000000..7cd93f5
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Page.qml
@@ -0,0 +1,139 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0 as FluidControls
+
+/*!
+   \qmltype Page
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief Represents a page on the navigation page stack.
+
+   Example:
+
+   \qml
+   import QtQuick 2.4
+   import Fluid.Controls 1.0 as FluidControls
+
+   FluidControls.Page {
+       title: "Application Name"
+
+       actions: [
+           FluidControls.Action {
+               name: "Print"
+
+               // Icon name from the Google Material Design icon pack
+               iconName: "action/print"
+           }
+       ]
+   }
+   \endqml
+ */
+Page {
+    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 appBar: appBar
+
+    /*!
+       The page's actions shown in the action bar.
+     */
+    property alias actions: appBar.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 alias leftAction: appBar.leftAction
+
+    /*!
+       \internal
+       Set by the page stack to true if there is a page behind this page on the
+       page stack.
+     */
+    property bool canGoBack: false
+
+    /*!
+       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 (StackView.view.currentItem !== page)
+            return false
+
+        if (!event)
+            event = {accepted: false}
+
+        if (!force)
+            goBack(event)
+
+        if (event.accepted) {
+            return true
+        } else {
+            return StackView.view.pop()
+        }
+    }
+
+    function forcePop() {
+        pop(null, true)
+    }
+
+    /*!
+       Push the specified component onto the page stack.
+     */
+    function push(component, properties) {
+        return StackView.view.push({item: component, properties: properties});
+    }
+
+    header: FluidControls.AppBar {
+        id: appBar
+
+        title: page.title
+
+        leftAction: FluidControls.Action {
+            text: "Back"
+            iconName: "navigation/arrow_back"
+            onTriggered: page.pop()
+            visible: page.canGoBack
+        }
+    }
+}
diff --git a/prototype_2016/third_party/qml-material/src/window/PageStack.qml b/prototype_2016/third_party/fluid/controls/PageStack.qml
index 11fc2b9..4c948da 100644
--- a/prototype_2016/third_party/qml-material/src/window/PageStack.qml
+++ b/prototype_2016/third_party/fluid/controls/PageStack.qml
@@ -1,24 +1,28 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
  *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
 import QtQuick 2.4
-import QtQuick.Controls 1.3 as Controls
-import Material 0.3
+import QtQuick.Controls 2.0
 
 /*!
    \qmltype PageStack
-   \inqmlmodule Material
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
 
    \brief Manages the page stack used for navigation.
 */
-Controls.StackView {
+StackView {
     id: stackView
 
     signal pushed(Item page)
diff --git a/prototype_2016/third_party/fluid/controls/Placeholder.qml b/prototype_2016/third_party/fluid/controls/Placeholder.qml
new file mode 100644
index 0000000..f1e7996
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Placeholder.qml
@@ -0,0 +1,66 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.2
+import QtQuick.Layouts 1.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Controls 1.0
+
+/*!
+    \qmltype Placeholder
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Placeholder.
+*/
+Item {
+    property alias iconName: icon.name
+    property alias iconSource: icon.source
+    property alias text: textLabel.text
+    property alias subText: subTextLabel.text
+
+    ColumnLayout {
+        anchors.centerIn: parent
+        
+        width: parent.width - 2 * Units.mediumSpacing
+
+        Icon {
+            id: icon
+            size: 96
+
+            Layout.alignment: Qt.AlignHCenter
+        }
+
+        Label {
+            id: textLabel
+            font: FluidStyle.titleFont
+            color: Material.secondaryTextColor
+            horizontalAlignment: Qt.AlignHCenter
+
+            Layout.fillWidth: true
+        }
+
+        Label {
+            id: subTextLabel
+            font: FluidStyle.subheadingFont
+            color: Material.secondaryTextColor
+            horizontalAlignment: Qt.AlignHCenter
+            wrapMode: Text.Wrap
+            visible: text !== ""
+
+            Layout.fillWidth: true
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/Showable.qml b/prototype_2016/third_party/fluid/controls/Showable.qml
new file mode 100644
index 0000000..c7ceb9f
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Showable.qml
@@ -0,0 +1,68 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+/*!
+    \qmltype Showable
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Showtable component.
+*/
+FocusScope {
+    property var showAnimation
+    property var hideAnimation
+
+    id: root
+    visible: false
+    onHideAnimationChanged: {
+        // Automatically set animation target when it's possible
+        if (showAnimation && showAnimation.target != undefined)
+            showAnimation.target = root;
+        if (hideAnimation && hideAnimation.target != undefined)
+            hideAnimation.target = root;
+
+        // Hide the item when the animation is over
+        if (hideAnimation) {
+            hideAnimation.runningChanged.connect(function() {
+                if (!hideAnimation.running)
+                    root.visible = false;
+            });
+        }
+    }
+
+    function show() {
+        // Stop hide animation if it's still running
+        if (hideAnimation != undefined && hideAnimation.running)
+            hideAnimation.stop();
+
+        // Show the item otherwise we won't see the animation
+        visible = true;
+
+        // Restart show animation if available
+        if (showAnimation != undefined && !showAnimation.running)
+            showAnimation.restart();
+    }
+
+    function hide() {
+        // Stop show animation if it's still running
+        if (showAnimation != undefined && showAnimation.running)
+            showAnimation.stop();
+
+        // Restart hide animation if available
+        if (hideAnimation != undefined && !hideAnimation.running)
+            hideAnimation.restart();
+    }
+}
diff --git a/prototype_2016/third_party/qml-material/src/window/Sidebar.qml b/prototype_2016/third_party/fluid/controls/Sidebar.qml
index 7954294..8632a03 100644
--- a/prototype_2016/third_party/qml-material/src/window/Sidebar.qml
+++ b/prototype_2016/third_party/fluid/controls/Sidebar.qml
@@ -1,20 +1,27 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
  *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
-import QtQuick 2.4
-import Material 0.3
-import "ListItems" as ListItem
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Controls 1.0
 
 /*!
    \qmltype Sidebar
-   \inqmlmodule Material
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
 
    \brief A sidebar component for use in adaptive layouts
 
@@ -27,9 +34,9 @@ import "ListItems" as ListItem
    entire sidebar, set the autoFill property to false.
 
    Examples:
-   \qml
-   Item{
-       property bool wideAspect: width > gu(80)
+   \code
+   Item {
+       property bool wideAspect: width > Units.gu(80)
 
        Sidebar {
            expanded: wideAspect
@@ -37,34 +44,32 @@ import "ListItems" as ListItem
            // Anchoring is automatic
        }
    }
-   \endqml
+   \endcode
  */
-View {
-    id: root
+Pane {
+    id: sidebar
 
-    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
-    }
+    default property alias contents: contents.data
 
-    width: 250 * Units.dp
+    /*!
+       The text displayed for the action.
+     */
+    property int edge: Qt.LeftEdge
 
+    /*!
+       Show or hide the sidebar.
+     */
     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
-
+    /*!
+       Flick automatically.
+     */
     property bool autoFlick: true
 
-    default property alias contents: contents.data
+    /*!
+       The text displayed as header.
+     */
+    property alias header: headerItem.text
 
     Behavior on anchors.leftMargin {
         NumberAnimation { duration: 200 }
@@ -74,15 +79,31 @@ View {
         NumberAnimation { duration: 200 }
     }
 
+    Material.background: Material.theme === Material.Light ? "white" : "#333"
+    Material.elevation: 1
+
+    anchors {
+        left: edge === Qt.LeftEdge ? parent.left : undefined
+        top: parent.top
+        right: edge === Qt.RightEdge ? parent.right : undefined
+        bottom: parent.bottom
+        leftMargin: expanded ? 0 : -width
+        rightMargin: expanded ? 0 : -width
+    }
+
+    width: 250
+
+    padding: 0
+
     Rectangle {
-        color: borderColor
+        color: Material.dividerColor
         width: 1
 
         anchors {
+            left: edge === Qt.RightEdge ? parent.left : undefined
             top: parent.top
+            right: edge === Qt.LeftEdge ? parent.right : undefined
             bottom: parent.bottom
-            right: mode === "left" ? parent.right : undefined
-            left: mode === "right" ? parent.left : undefined
             //rightMargin: -1
         }
     }
@@ -92,17 +113,16 @@ View {
 
         anchors {
             fill: parent
-            rightMargin: mode === "left" ? 1 : 0
-            leftMargin: mode === "right" ? 1 : 0
+            leftMargin: edge === Qt.RightEdge ? 1 : 0
+            rightMargin: edge === Qt.LeftEdge ? 1 : 0
         }
 
-        ListItem.Subheader {
+        Subheader {
             id: headerItem
 
+            Material.elevation: flickable.atYBeginning ? 0 : 1
+
             visible: text !== ""
-            backgroundColor: root.backgroundColor
-            elevation: flickable.atYBeginning ? 0 : 1
-            fullWidth: true
             z: 2
         }
 
@@ -111,9 +131,11 @@ View {
 
             clip: true
 
+            ScrollBar.vertical: ScrollBar {}
+
             anchors {
-                top: headerItem.visible ? headerItem.bottom : parent.top
                 left: parent.left
+                top: headerItem.visible ? headerItem.bottom : parent.top
                 right: parent.right
                 bottom: parent.bottom
             }
@@ -131,21 +153,16 @@ View {
 
             function getFlickableChild(item) {
                 if (item && item.hasOwnProperty("children")) {
-                    for (var i=0; i < item.children.length; i++) {
-                        var child = item.children[i];
+                    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];
-                            }
+                            if (child.anchors.top === page.top || child.anchors.fill === page)
+                                return item.children[i]
                         }
                     }
                 }
-                return null;
+                return null
             }
         }
-
-        Scrollbar {
-            flickableItem: flickable
-        }
     }
 }
diff --git a/prototype_2016/third_party/fluid/controls/SmoothFadeImage.qml b/prototype_2016/third_party/fluid/controls/SmoothFadeImage.qml
new file mode 100644
index 0000000..fbd0a94
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/SmoothFadeImage.qml
@@ -0,0 +1,309 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+/*!
+    \qmltype SmoothFadeImage
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Displays an image and smoothly fade when the source is changed.
+
+    This component can be used in place of an Image when a smooth fade animation
+    between two sources is needed.
+
+    When the source is changed and the fade animation ends, the image loaded before
+    is unloaded; this means that only one image at a time is loaded.
+
+    Images are loaded asynchronously and are not cache, so unlike the Image
+    component the \c asynchronous and \c cache properties are not available.
+
+    Example of usage:
+    \code
+    import QtQuick 2.0
+    import Fluid.Controls 1.0
+
+    Item {
+        width: 128
+        height: 128
+
+        SmoothFadeImage {
+            anchors.fill: parent
+            source: "http://www.maui-project.org/images/logos/m.png"
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+            fadeDuration: 400
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: parent.source = "http://www.maui-project.org/images/logos/qt.png"
+            }
+        }
+    }
+    \endcode
+*/
+Item {
+    id: root
+
+    /*!
+        The image being displayed.
+        SmoothFadeImage can handle any image format supported by Qt, loaded
+        from any URL scheme supported by Qt.
+
+        \sa Image::source
+    */
+    property url source
+
+    /*!
+        \qmlproperty enumeration fillMode
+
+        Set this property to define what happens when the source image has a
+        different size than the item.
+
+        \list
+          \li Image.Stretch - the image is scaled to fit (default)
+          \li Image.PreserveAspectFit - the image is scaled uniformly to fit without cropping
+          \li Image.PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary
+          \li Image.Tile - the image is duplicated horizontally and vertically
+          \li Image.TileVertically - the image is stretched horizontally and tiled vertically
+          \li Image.TileHorizontally - the image is stretched vertically and tiled horizontally
+          \li Image.Pad - the image is not transformed
+        \endlist
+
+        Defaults to \c Image.Stretch.
+
+        Note that \c clip is false by default which means that the item might
+        paint outside its bounding rectangle even if the fillMode is set to PreserveAspectCrop.
+    */
+    property int fillMode : Image.Stretch
+
+    /*!
+        Set this to change the fade animation time (in milliseconds).
+        Default value is 250 ms.
+    */
+    property int fadeDuration: 250
+
+    /*!
+        This property holds whether the fade animation is running or not.
+    */
+    readonly property bool running: animation.running
+
+    /*!
+        Set this property to false to disable the fade animation.
+        If the animation is disable, SmoothFadeImage behaves like a normal Image.
+
+        The fade animation is enabled by default.
+    */
+    property bool animationEnabled: true
+
+    /*!
+        This property holds the actual width and height of the loaded image.
+
+        Unlike the \c width and \c height properties, which scale the painting of the
+        image, this property sets the actual number of pixels stored for the
+        loaded image so that large images do not use more memory than necessary.
+
+        For example, this ensures the image in memory is no larger than
+        1024x1024 pixels, regardless of the SmoothFadeImage's width and height values:
+
+        \code
+            Rectangle {
+                width: ...
+                height: ...
+
+                Image {
+                    anchors.fill: parent
+                    source: "reallyBigImage.jpg"
+                    sourceSize.width: 1024
+                    sourceSize.height: 1024
+                }
+            }
+        \endcode
+
+        If the image's actual size is larger than the sourceSize, the image is
+        scaled down. If only one dimension of the size is set to greater than 0,
+        the other dimension is set in proportion to preserve the source image's
+        aspect ratio. (The \c fillMode is independent of this.)
+
+        If both the sourceSize.width and sourceSize.height are set the image
+        will be scaled down to fit within the specified size, maintaining the
+        image's aspect ratio. The actual size of the image after scaling is
+        available via \c Item::implicitWidth and \c Item::implicitHeight.
+
+        If the source is an intrinsically scalable image (eg. SVG), this property
+        determines the size of the loaded image regardless of intrinsic size.
+        Avoid changing this property dynamically; rendering an SVG is slow compared
+        to an image.
+
+        If the source is a non-scalable image (eg. JPEG), the loaded image will be
+        no greater than this property specifies. For some formats (currently only
+        JPEG), the whole image will never actually be loaded into memory.
+
+        sourceSize can be cleared to the natural size of the image by setting
+        sourceSize to undefined.
+
+        Note: Changing this property dynamically causes the image source to be
+        reloaded, potentially even from the network, if it is not in the disk cache.
+    */
+    property alias sourceSize: __priv.sourceSize
+
+    /*!
+        \qmlproperty enumeration status
+
+        This property holds the status of image loading. It can be one of:
+
+        \list
+          \li Image.Null - no image has been set
+          \li Image.Ready - the image has been loaded
+          \li Image.Loading - the image is currently being loaded
+          \li Image.Error - an error occurred while loading the image
+        \endlist
+    */
+    readonly property int status: __priv.loadingImage ? __priv.loadingImage.status : Image.Null
+
+    /*!
+        This property holds whether the image is smoothly filtered when scaled or
+        transformed. Smooth filtering gives better visual quality, but it may be
+        slower on some hardware.
+
+        If the image is displayed at its natural size, this property has no
+        visual or performance effect.
+
+        By default, this property is set to \c true.
+    */
+    property bool smooth: true
+
+    /*!
+        This signal is emitted when the swap between the old source and the new
+        one has happened.
+    */
+    signal imageSwapped()
+
+    QtObject {
+        id: __priv
+
+        property size sourceSize: undefined
+
+        property Image currentImage: image1
+        property Image nextImage: image2
+        property Image loadingImage: currentImage
+
+        onSourceSizeChanged: {
+            // Change source size for both images
+            image1.sourceSize = sourceSize;
+            image2.sourceSize = sourceSize;
+        }
+
+        function swapImages() {
+            // Swap images stacking order and start fading animation
+            __priv.currentImage.z = 0;
+            __priv.nextImage.z = 1;
+            if (root.animationEnabled)
+                animation.start();
+
+            // Swap images pointers
+            var oldImage = __priv.currentImage;
+            __priv.currentImage = __priv.nextImage;
+            __priv.nextImage = oldImage;
+        }
+    }
+
+    onSourceChanged: {
+        // Set image pointers at creation time
+        if (__priv.currentImage === null) {
+            __priv.currentImage = image1;
+            __priv.nextImage = image2;
+        }
+
+        // Stop the animation if the source is changed while
+        // it's still running
+        animation.stop();
+
+        // Unload both images
+        if (root.source == "") {
+            __priv.currentImage.source = "";
+            __priv.nextImage.source = "";
+            __priv.loadingImage = null;
+            return;
+        }
+
+        if (__priv.currentImage.source == "") {
+            // Assign the source to the current image for the first time
+            __priv.currentImage.source = root.source;
+            __priv.loadingImage = __priv.currentImage;
+        } else {
+            // Image source is changed, make sure the animation is not running
+            animation.stop();
+
+            // Prepare the next image
+            __priv.nextImage.opacity = 0.0;
+            __priv.nextImage.source = root.source;
+            __priv.loadingImage = __priv.nextImage;
+
+            // If the next image is still cached the status will already be Ready
+            // otherwise it's not loaded, either way we need to swap
+            if (__priv.nextImage.status === Image.Ready || __priv.nextImage.source === "")
+                __priv.swapImages();
+        }
+    }
+
+    Connections {
+        target: __priv.nextImage
+        onOpacityChanged: {
+            if (__priv.nextImage.opacity == 1.0)
+                root.imageSwapped();
+        }
+        onStatusChanged: {
+            if (__priv.nextImage.status === Image.Ready)
+                __priv.swapImages();
+        }
+    }
+
+    Image {
+        id: image1
+        anchors.fill: parent
+        cache: false
+        asynchronous: true
+        fillMode: root.fillMode
+        smooth: root.smooth
+        clip: root.clip
+        z: 1
+    }
+
+    Image {
+        id: image2
+        anchors.fill: parent
+        cache: false
+        asynchronous: true
+        fillMode: root.fillMode
+        smooth: root.smooth
+        clip: root.clip
+        z: 0
+    }
+
+    NumberAnimation {
+        id: animation
+        target: __priv.nextImage
+        property: "opacity"
+        to: 1.0
+        duration: root.fadeDuration
+        onRunningChanged: {
+            // When the fade animation stops, we unload the second image in
+            // order to save some memory (only one image will be load at a time)
+            if (!running)
+                __priv.nextImage.source = "";
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/SmoothFadeLoader.qml b/prototype_2016/third_party/fluid/controls/SmoothFadeLoader.qml
new file mode 100644
index 0000000..0c76a67
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/SmoothFadeLoader.qml
@@ -0,0 +1,137 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+/*!
+    \qmltype SmoothFadeLoader
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Displays an item and smoothly fade when the source is changed.
+
+    This component loads an item with a Loader and smoothly fade to another item when
+    the source URL is changed.
+
+    Items are loaded synchronously, also the item being hidden is not unloaded to
+    avoid an unpleasant "flash" after the transition.
+
+    Example of usage:
+    \code
+    import QtQuick 2.0
+    import Fluid.Controls 1.0
+
+    Item {
+        width: 640
+        height: 480
+
+        SmoothFadeLoader {
+            anchors.fill: parent
+            source: "MyComponent.qml"
+            fadeDuration: 400
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: parent.source = "AnotherComponent.qml"
+            }
+        }
+    }
+    \endcode
+*/
+Item {
+    /*!
+        The item being displayed.
+
+        \sa Loader::source
+    */
+    property url source
+
+    /*!
+        Set this to change the fade animation time (in milliseconds).
+        Default value is 250 ms.
+    */
+    property int fadeDuration: 250
+
+    /*!
+        This property holds whether the fade animation is running or not.
+    */
+    readonly property bool running: animation.running
+
+    id: root
+    onSourceChanged: {
+        animation.running = false;
+
+        if (__priv.currentLoader == loader1) {
+            __priv.currentLoader = loader2;
+            __priv.nextLoader = loader1;
+        } else {
+            __priv.currentLoader = loader1;
+            __priv.nextLoader = loader2;
+        }
+
+        __priv.currentLoader.source = sourceUrl;
+        __priv.currentLoader.opacity = 0;
+        __priv.currentLoader.z = 1;
+        __priv.nextLoader.z = 0;
+
+        if (__priv.firstTime) {
+            __priv.currentLoader.opacity = 1.0;
+            __priv.nextLoader.opacity = 0.0;
+            __priv.firstTime = false;
+        } else {
+            animation.running = true;
+        }
+    }
+
+    QtObject {
+        id: __priv
+
+        property bool firstTime: true
+        property Loader currentLoader: loader1
+        property Loader nextLoader: loader2
+    }
+
+    SequentialAnimation {
+        id: animation
+        running: false
+
+        NumberAnimation {
+            target: __priv.currentLoader
+            properties: "opacity"
+            from: 0.0
+            to: 1.0
+            duration: root.fadeDuration
+            easing.type: Easing.OutQuad
+        }
+
+        ScriptAction {
+            script: {
+                __priv.nextLoader.opacity = 0;
+                //__priv.nextLoader.source = "";
+            }
+        }
+    }
+
+    Loader {
+        id: loader1
+        anchors.fill: parent
+        z: 1
+    }
+
+    Loader {
+        id: loader2
+        anchors.fill: parent
+        z: 0
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/Subheader.qml b/prototype_2016/third_party/fluid/controls/Subheader.qml
new file mode 100644
index 0000000..329d683
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Subheader.qml
@@ -0,0 +1,45 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Controls 1.0
+
+/*!
+   \qmltype Subheader
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief Subheaders are special list tiles that delineate distinct sections of a list or grid list.
+ */
+BaseListItem {
+    id: listItem
+
+    implicitHeight: 48
+    interactive: false
+
+    property alias textColor: label.color
+
+    contentItem: Label {
+        id: label
+
+        font: FluidStyle.subheaderFont
+        text: listItem.text
+
+        verticalAlignment: Text.AlignVCenter
+
+        color: Material.secondaryTextColor
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/SubheadingLabel.qml b/prototype_2016/third_party/fluid/controls/SubheadingLabel.qml
new file mode 100644
index 0000000..e43d1f5
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/SubheadingLabel.qml
@@ -0,0 +1,51 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Templates 2.0 as T
+
+/*!
+    \qmltype SubheadingLabel
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Text label with standard font and styling suitable to subheading.
+
+    \code
+    SubheadingLabel {
+        text: qsTr("A translatable subheading")
+    }
+    \endcode
+*/
+T.Label {
+    /*!
+        \qmlproperty int level
+
+        This property holds the label level that controls
+        font style and size.
+
+        Only values between 1 and 4 are allowed.
+
+        Default value is 1.
+    */
+    property int level: 1
+
+    font.pixelSize: 14
+    color: "#26282a"
+    linkColor: "#45a7d7"
+    onLevelChanged: {
+        if (level < 1 || level > 2)
+            console.error("BodyLabel level must be either 1 or 2")
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/Tab.qml b/prototype_2016/third_party/fluid/controls/Tab.qml
new file mode 100644
index 0000000..80038d4
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Tab.qml
@@ -0,0 +1,47 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import Fluid.Core 1.0
+
+Item {
+    id: tab
+
+    /*!
+       The title of this tab.
+     */
+    property string title
+
+    /*!
+       The icon displayed for this tab. 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 of this tab. By default, this is
+       a special URL representing the icon named by \l iconName from the Material Design
+       icon collection. 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: Utils.getSourceForIconName(iconName)
+
+    /*!
+     * Controls whether a close button will be shown for this tab.
+     */
+    property bool canRemove: false
+}
diff --git a/prototype_2016/third_party/fluid/controls/TabbedPage.qml b/prototype_2016/third_party/fluid/controls/TabbedPage.qml
new file mode 100644
index 0000000..bec0543
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/TabbedPage.qml
@@ -0,0 +1,90 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0 as FluidCore
+import Fluid.Controls 1.0 as FluidControls
+
+FluidControls.Page {
+    id: page
+
+    default property alias contents: swipeView.contentChildren
+
+    property alias count: swipeView.count
+
+    readonly property int currentIndex: appBar.currentTabIndex
+
+    /*!
+       The currently selected tab.
+     */
+    readonly property Tab selectedTab: count > 0
+            ? swipeView.contentChildren[currentIndex] : null
+
+    onCurrentIndexChanged: swipeView.currentIndex = currentIndex
+
+    appBar.tabs: Repeater {
+        model: swipeView.contentChildren
+        delegate: TabButton {
+            text: modelData.title
+            width: parent.fixed ? parent.width / parent.count : implicitWidth
+
+            // Active color
+            Material.accent: appBar.Material.foreground
+
+            // Unfocused color
+            Material.foreground: FluidCore.Utils.alpha(appBar.Material.foreground, 0.7)
+
+            FluidControls.Icon {
+                id: tabIcon
+
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: FluidControls.Units.smallSpacing
+
+                name: modelData.iconName
+                source: modelData.iconSource
+                visible: status == Image.Ready
+            }
+
+            FluidControls.IconButton {
+                id: tabCloseButton
+
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.rightMargin: FluidControls.Units.smallSpacing
+
+                iconName: "navigation/close"
+                visible: modelData.canRemove
+
+                onClicked: swipeView.removeItem(swipeView.currentIndex)
+            }
+        }
+    }
+
+    SwipeView {
+        id: swipeView
+        anchors.fill: parent
+        currentIndex: appBar.currentTabIndex
+
+        onCurrentIndexChanged: appBar.currentTabIndex = currentIndex
+    }
+
+    function addTab(tab) {
+        swipeView.addItem(tab);
+        appBar.currentTabIndex = swipeView.count - 1;
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/ThinDivider.qml b/prototype_2016/third_party/fluid/controls/ThinDivider.qml
new file mode 100644
index 0000000..7d2def5
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/ThinDivider.qml
@@ -0,0 +1,28 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+
+/*!
+   \qmltype ThinDivider
+   \inqmlmodule Fluid.Controls
+   \ingroup fluidcontrols
+
+   \brief A 1px high divider for use in lists and other columns of content.
+ */
+Rectangle {
+    color: "#999"
+    width: parent.width
+    height: 1
+}
diff --git a/prototype_2016/third_party/fluid/controls/TitleLabel.qml b/prototype_2016/third_party/fluid/controls/TitleLabel.qml
new file mode 100644
index 0000000..8742d7e
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/TitleLabel.qml
@@ -0,0 +1,36 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Templates 2.0 as T
+
+/*!
+    \qmltype TitleLabel
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Text label with standard font and styling suitable to titles.
+
+    \code
+    Title {
+        text: qsTr("Translatable title")
+    }
+    \endcode
+*/
+T.Label {
+    font.pixelSize: 18
+    font.bold: true
+    color: "#26282a"
+    linkColor: "#45a7d7"
+}
diff --git a/prototype_2016/third_party/fluid/controls/Units.qml b/prototype_2016/third_party/fluid/controls/Units.qml
new file mode 100644
index 0000000..e702e33
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/Units.qml
@@ -0,0 +1,125 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+pragma Singleton
+
+import QtQuick 2.4
+import Fluid.Core 1.0
+
+/*!
+    \qmltype Units
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Units.
+*/
+Item {
+    /*
+        \qmlproperty int gridUnit
+        Fundamental unit of space for sizes depending on the current font.
+        It correspond to the capital letter M width in pixel.
+    */
+    readonly property int gridUnit: textMetrics.height
+
+    /*!
+        \qmlproperty real smallSpacing
+        The amount of spacing that should be used around smaller UI
+        elements. It can be used as margin around button box and
+        spacing between buttons.
+    */
+    readonly property real smallSpacing: 8
+
+    /*!
+        \qmlproperty real mediumSpacing
+        The amount of spacing that should be used inside medium UI
+        elements such as padding between title and body text in a dialog box.
+    */
+    readonly property real mediumSpacing: 20
+
+    /*!
+        \qmlproperty real largeSpacing
+        The amount of spacing that should be used inside bigger UI
+        elements such as padding in a dialog box.
+    */
+    readonly property real largeSpacing: 24
+
+    /*!
+        \qmlproperty int shortDuration
+        Duration for short animations to make UI events noticeable.
+    */
+    readonly property int shortDuration: 100
+
+    /*!
+        \qmlproperty int mediumDuration
+        Duration for medium length animations.
+    */
+    readonly property int mediumDuration: 200
+
+    /*!
+        \qmlproperty int longDuration
+        Duration for long animations such as windows opening or closing.
+    */
+    readonly property int longDuration: 400
+
+    /*!
+        \qmlproperty object iconSizes
+        Standard icon sizes.
+    */
+    readonly property QtObject iconSizes: QtObject {
+        readonly property int tiny: 8
+        readonly property int small: 16
+        readonly property int smallMedium: 22
+        readonly property int medium: 32
+        readonly property int large: 48
+        readonly property int huge: 64
+        readonly property int enormous: 128
+    }
+
+    TextMetrics {
+        id: textMetrics
+        text: "M"
+    }
+
+    /*!
+        Returns a round size in pixels multiplied by grid unit.
+    */
+    function gu(x) {
+        return Math.round(x * gridUnit);
+    }
+
+    /*!
+        Returns the size in pixel closes to the icon size.
+    */
+    function roundToIconSize(x) {
+        // Find the size closest to icon size
+        if (x <= 0)
+            return 0;
+        else if (x < 8)
+            return 8;
+        else if (x < 16)
+            return 16;
+        else if (x < 22)
+            return 22;
+        else if (x < 32)
+            return 32;
+        else if (x < 48)
+            return 48;
+        else if (x < 64)
+            return 64;
+        else if (x < 128)
+            return 128;
+
+        return x;
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/controls.pri b/prototype_2016/third_party/fluid/controls/controls.pri
new file mode 100644
index 0000000..db09cef
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/controls.pri
@@ -0,0 +1,4 @@
+HEADERS += $$PWD/iconthemeimageprovider.h
+SOURCES += $$PWD/iconthemeimageprovider.cpp
+INCLUDEPATH += $$PWD
+RESOURCES += $$PWD/controls.qrc
diff --git a/prototype_2016/third_party/fluid/controls/controls.qrc b/prototype_2016/third_party/fluid/controls/controls.qrc
new file mode 100644
index 0000000..8f0c46c
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/controls.qrc
@@ -0,0 +1,46 @@
+<RCC>
+    <qresource prefix="/Fluid/Controls">
+        <file>Action.qml</file>
+        <file>AppBar.qml</file>
+        <file>AppToolBar.qml</file>
+        <file>BaseListItem.qml</file>
+        <file>BodyLabel.qml</file>
+        <file>CaptionLabel.qml</file>
+        <file>Card.qml</file>
+        <file>CircleImage.qml</file>
+        <file>Dialog.qml</file>
+        <file>DisplayLabel.qml</file>
+        <file>FluidStyle.qml</file>
+        <file>FluidWindow.qml</file>
+        <file>HeadlineLabel.qml</file>
+        <file>Icon.qml</file>
+        <file>IconButton.qml</file>
+        <file>InfoBar.qml</file>
+        <file>ListItem.qml</file>
+        <file>ListItemDelegate.qml</file>
+        <file>Loadable.qml</file>
+        <file>NavigationDrawer.qml</file>
+        <file>NoiseBackground.qml</file>
+        <file>Page.qml</file>
+        <file>PageStack.qml</file>
+        <file>Placeholder.qml</file>
+        <file>Showable.qml</file>
+        <file>Sidebar.qml</file>
+        <file>SmoothFadeImage.qml</file>
+        <file>SmoothFadeLoader.qml</file>
+        <file>Subheader.qml</file>
+        <file>SubheadingLabel.qml</file>
+        <file>ThinDivider.qml</file>
+        <file>TitleLabel.qml</file>
+        <file>Units.qml</file>
+        <file>+material/BaseListItem.qml</file>
+        <file>+material/BodyLabel.qml</file>
+        <file>+material/CaptionLabel.qml</file>
+        <file>+material/DisplayLabel.qml</file>
+        <file>+material/HeadlineLabel.qml</file>
+        <file>+material/SubheadingLabel.qml</file>
+        <file>+material/ThinDivider.qml</file>
+        <file>+material/TitleLabel.qml</file>
+        <file alias="qmldir">qmldir_noplugin</file>
+    </qresource>
+</RCC>
diff --git a/prototype_2016/third_party/fluid/controls/iconthemeimageprovider.cpp b/prototype_2016/third_party/fluid/controls/iconthemeimageprovider.cpp
new file mode 100644
index 0000000..8b1c77b
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/iconthemeimageprovider.cpp
@@ -0,0 +1,47 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QtGui/QIcon>
+
+#include "iconthemeimageprovider.h"
+
+IconThemeImageProvider::IconThemeImageProvider()
+    : QQuickImageProvider(QQuickImageProvider::Pixmap)
+{
+}
+
+QPixmap IconThemeImageProvider::requestPixmap(const QString &id, QSize *realSize,
+                                              const QSize &requestedSize)
+{
+    // Sanitize requested size
+    QSize size(requestedSize);
+    if (size.width() < 1)
+        size.setWidth(1);
+    if (size.height() < 1)
+        size.setHeight(1);
+
+    // Return real size
+    if (realSize)
+        *realSize = size;
+
+    // Is it a path?
+    if (id.startsWith('/'))
+        return QPixmap(id).scaled(size);
+
+    // Return icon from theme or fallback to a generic icon
+    QIcon icon = QIcon::fromTheme(id);
+    if (icon.isNull())
+        icon = QIcon::fromTheme(QLatin1String("application-x-executable"));
+    return icon.pixmap(size);
+}
diff --git a/prototype_2016/third_party/fluid/controls/iconthemeimageprovider.h b/prototype_2016/third_party/fluid/controls/iconthemeimageprovider.h
new file mode 100644
index 0000000..e50008f
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/iconthemeimageprovider.h
@@ -0,0 +1,25 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#pragma once
+
+#include <QtQuick/QQuickImageProvider>
+
+class IconThemeImageProvider : public QQuickImageProvider
+{
+public:
+    IconThemeImageProvider();
+
+    QPixmap requestPixmap(const QString &id, QSize *realSize, const QSize &requestedSize);
+};
diff --git a/prototype_2016/third_party/fluid/controls/plugin.cpp b/prototype_2016/third_party/fluid/controls/plugin.cpp
new file mode 100644
index 0000000..661b234
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/plugin.cpp
@@ -0,0 +1,42 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QtQml>
+
+#include "iconthemeimageprovider.h"
+
+class FluidCorePlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+public:
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri);
+};
+
+void FluidCorePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    Q_ASSERT(QByteArray(uri) == QByteArrayLiteral("Fluid.Controls"));
+
+    engine->addImageProvider(QLatin1String("fluidicontheme"), new IconThemeImageProvider());
+}
+
+void FluidCorePlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(QByteArray(uri) == QByteArrayLiteral("Fluid.Controls"));
+
+    // @uri Fluid.Controls
+}
+
+#include "plugin.moc"
diff --git a/prototype_2016/third_party/fluid/controls/plugins.qmltypes b/prototype_2016/third_party/fluid/controls/plugins.qmltypes
new file mode 100644
index 0000000..29ef846
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/plugins.qmltypes
@@ -0,0 +1,569 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump-qt5 -nonrelocatable Fluid.Controls 1.0'
+
+Module {
+    dependencies: [
+        "Fluid.Core 1.0",
+        "Fluid.Effects 1.0",
+        "Fluid.Material 1.0",
+        "QtGraphicalEffects 1.0",
+        "QtQml 2.2",
+        "QtQuick 2.7",
+        "QtQuick.Controls 2.0",
+        "QtQuick.Controls.Material 2.0",
+        "QtQuick.Controls.Material.impl 2.0",
+        "QtQuick.Controls.Universal 2.0",
+        "QtQuick.Controls.Universal.impl 2.0",
+        "QtQuick.Controls.impl 2.0",
+        "QtQuick.Layouts 1.1",
+        "QtQuick.Templates 2.0",
+        "QtQuick.Window 2.2"
+    ]
+    Component {
+        prototype: "QQuickApplicationWindow"
+        name: "QtQuick.Controls/ApplicationWindow 2.0"
+        exports: ["QtQuick.Controls/ApplicationWindow 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.Material.impl/BoxShadow 2.0"
+        exports: ["QtQuick.Controls.Material.impl/BoxShadow 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "offsetX"; type: "int" }
+        Property { name: "offsetY"; type: "int" }
+        Property { name: "blurRadius"; type: "int" }
+        Property { name: "spreadRadius"; type: "int" }
+        Property { name: "source"; type: "QQuickItem"; isPointer: true }
+        Property { name: "fullWidth"; type: "bool" }
+        Property { name: "fullHeight"; type: "bool" }
+        Property { name: "glowRadius"; type: "double" }
+        Property { name: "spread"; type: "double" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "cornerRadius"; type: "double" }
+        Property { name: "cached"; type: "bool" }
+    }
+    Component {
+        prototype: "QQuickBusyIndicator"
+        name: "QtQuick.Controls/BusyIndicator 2.0"
+        exports: ["QtQuick.Controls/BusyIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickButton"
+        name: "QtQuick.Controls/Button 2.0"
+        exports: ["QtQuick.Controls/Button 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickCheckBox"
+        name: "QtQuick.Controls/CheckBox 2.0"
+        exports: ["QtQuick.Controls/CheckBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickCheckDelegate"
+        name: "QtQuick.Controls/CheckDelegate 2.0"
+        exports: ["QtQuick.Controls/CheckDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Material.impl/CheckIndicator 2.0"
+        exports: ["QtQuick.Controls.Material.impl/CheckIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.impl/CheckIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickComboBox"
+        name: "QtQuick.Controls/ComboBox 2.0"
+        exports: ["QtQuick.Controls/ComboBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickDial"
+        name: "QtQuick.Controls/Dial 2.0"
+        exports: ["QtQuick.Controls/Dial 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickDrawer"
+        name: "QtQuick.Controls/Drawer 2.0"
+        exports: ["QtQuick.Controls/Drawer 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.Material.impl/ElevationEffect 2.0"
+        exports: ["QtQuick.Controls.Material.impl/ElevationEffect 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "source"; type: "QVariant" }
+        Property { name: "elevation"; type: "int" }
+        Property { name: "fullWidth"; type: "bool" }
+        Property { name: "fullHeight"; type: "bool" }
+        Property { name: "sourceItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property { name: "_shadows"; type: "QVariant"; isReadonly: true }
+        Property { name: "_shadow"; type: "QVariant"; isReadonly: true }
+    }
+    Component {
+        prototype: "QObject"
+        name: "FluidStyle 1.0"
+        exports: ["FluidStyle 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        Property { name: "iconColorLight"; type: "QColor"; isReadonly: true }
+        Property { name: "iconColorDark"; type: "QColor"; isReadonly: true }
+        Property { name: "display4Font"; type: "QFont"; isReadonly: true }
+        Property { name: "display3Font"; type: "QFont"; isReadonly: true }
+        Property { name: "display2Font"; type: "QFont"; isReadonly: true }
+        Property { name: "display1Font"; type: "QFont"; isReadonly: true }
+        Property { name: "headlineFont"; type: "QFont"; isReadonly: true }
+        Property { name: "titleFont"; type: "QFont"; isReadonly: true }
+        Property { name: "subheadingFont"; type: "QFont"; isReadonly: true }
+        Property { name: "body2Font"; type: "QFont"; isReadonly: true }
+        Property { name: "body1Font"; type: "QFont"; isReadonly: true }
+        Property { name: "captionFont"; type: "QFont"; isReadonly: true }
+        Property { name: "buttonFont"; type: "QFont"; isReadonly: true }
+        Property { name: "subheaderFont"; type: "QFont"; isReadonly: true }
+        Property { name: "dialogFont"; type: "QFont"; isReadonly: true }
+    }
+    Component {
+        prototype: "QQuickFrame"
+        name: "QtQuick.Controls/Frame 2.0"
+        exports: ["QtQuick.Controls/Frame 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickGroupBox"
+        name: "QtQuick.Controls/GroupBox 2.0"
+        exports: ["QtQuick.Controls/GroupBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickItemDelegate"
+        name: "QtQuick.Controls/ItemDelegate 2.0"
+        exports: ["QtQuick.Controls/ItemDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickLabel"
+        name: "QtQuick.Controls/Label 2.0"
+        exports: ["QtQuick.Controls/Label 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickMenu"
+        name: "QtQuick.Controls/Menu 2.0"
+        exports: ["QtQuick.Controls/Menu 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickMenuItem"
+        name: "QtQuick.Controls/MenuItem 2.0"
+        exports: ["QtQuick.Controls/MenuItem 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickPage"
+        name: "QtQuick.Controls/Page 2.0"
+        exports: ["QtQuick.Controls/Page 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickPageIndicator"
+        name: "QtQuick.Controls/PageIndicator 2.0"
+        exports: ["QtQuick.Controls/PageIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickPane"
+        name: "QtQuick.Controls/Pane 2.0"
+        exports: ["QtQuick.Controls/Pane 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickPopup"
+        name: "QtQuick.Controls/Popup 2.0"
+        exports: ["QtQuick.Controls/Popup 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickProgressBar"
+        name: "QtQuick.Controls/ProgressBar 2.0"
+        exports: ["QtQuick.Controls/ProgressBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRadioButton"
+        name: "QtQuick.Controls/RadioButton 2.0"
+        exports: ["QtQuick.Controls/RadioButton 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRadioDelegate"
+        name: "QtQuick.Controls/RadioDelegate 2.0"
+        exports: ["QtQuick.Controls/RadioDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.impl/RadioIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Universal.impl/RadioIndicator 2.0"
+        exports: ["QtQuick.Controls.Universal.impl/RadioIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QVariant" }
+    }
+    Component {
+        prototype: "QQuickRangeSlider"
+        name: "QtQuick.Controls/RangeSlider 2.0"
+        exports: ["QtQuick.Controls/RangeSlider 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Material.impl/Ripple 2.0"
+        exports: ["QtQuick.Controls.Material.impl/Ripple 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "colored"; type: "bool" }
+    }
+    Component {
+        prototype: "QQuickScrollBar"
+        name: "QtQuick.Controls/ScrollBar 2.0"
+        exports: ["QtQuick.Controls/ScrollBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickScrollIndicator"
+        name: "QtQuick.Controls/ScrollIndicator 2.0"
+        exports: ["QtQuick.Controls/ScrollIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickSlider"
+        name: "QtQuick.Controls/Slider 2.0"
+        exports: ["QtQuick.Controls/Slider 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.Material.impl/SliderHandle 2.0"
+        exports: ["QtQuick.Controls.Material.impl/SliderHandle 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "value"; type: "double" }
+        Property { name: "handleHasFocus"; type: "bool" }
+        Property { name: "handlePressed"; type: "bool" }
+        Property { name: "initialSize"; type: "int"; isReadonly: true }
+        Property { name: "horizontal"; type: "bool"; isReadonly: true }
+        Property { name: "control"; type: "QVariant"; isReadonly: true }
+    }
+    Component {
+        prototype: "QQuickSpinBox"
+        name: "QtQuick.Controls/SpinBox 2.0"
+        exports: ["QtQuick.Controls/SpinBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickStackView"
+        name: "QtQuick.Controls/StackView 2.0"
+        exports: ["QtQuick.Controls/StackView 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickSwipeDelegate"
+        name: "QtQuick.Controls/SwipeDelegate 2.0"
+        exports: ["QtQuick.Controls/SwipeDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickSwipeView"
+        name: "QtQuick.Controls/SwipeView 2.0"
+        exports: ["QtQuick.Controls/SwipeView 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickSwitch"
+        name: "QtQuick.Controls/Switch 2.0"
+        exports: ["QtQuick.Controls/Switch 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickSwitchDelegate"
+        name: "QtQuick.Controls/SwitchDelegate 2.0"
+        exports: ["QtQuick.Controls/SwitchDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/SwitchIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.Material.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.Material.impl/SwitchIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickTabBar"
+        name: "QtQuick.Controls/TabBar 2.0"
+        exports: ["QtQuick.Controls/TabBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickTabButton"
+        name: "QtQuick.Controls/TabButton 2.0"
+        exports: ["QtQuick.Controls/TabButton 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickTextArea"
+        name: "QtQuick.Controls/TextArea 2.0"
+        exports: ["QtQuick.Controls/TextArea 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickTextField"
+        name: "QtQuick.Controls/TextField 2.0"
+        exports: ["QtQuick.Controls/TextField 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickToolBar"
+        name: "QtQuick.Controls/ToolBar 2.0"
+        exports: ["QtQuick.Controls/ToolBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickToolButton"
+        name: "QtQuick.Controls/ToolButton 2.0"
+        exports: ["QtQuick.Controls/ToolButton 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickToolTip"
+        name: "QtQuick.Controls/ToolTip 2.0"
+        exports: ["QtQuick.Controls/ToolTip 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickTumbler"
+        name: "QtQuick.Controls/Tumbler 2.0"
+        exports: ["QtQuick.Controls/Tumbler 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "Units 1.0"
+        exports: ["Units 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        defaultProperty: "data"
+        Property { name: "gridUnit"; type: "int"; isReadonly: true }
+        Property { name: "smallSpacing"; type: "double"; isReadonly: true }
+        Property { name: "mediumSpacing"; type: "double"; isReadonly: true }
+        Property { name: "largeSpacing"; type: "double"; isReadonly: true }
+        Property { name: "shortDuration"; type: "int"; isReadonly: true }
+        Property { name: "mediumDuration"; type: "int"; isReadonly: true }
+        Property { name: "longDuration"; type: "int"; isReadonly: true }
+        Property { name: "iconSizes"; type: "QObject"; isReadonly: true; isPointer: true }
+        Method {
+            name: "gu"
+            type: "QVariant"
+            Parameter { name: "x"; type: "QVariant" }
+        }
+        Method {
+            name: "roundToIconSize"
+            type: "QVariant"
+            Parameter { name: "x"; type: "QVariant" }
+        }
+    }
+    Component {
+        prototype: "QObject"
+        name: "Utils 1.0"
+        exports: ["Utils 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        Method {
+            name: "asColor"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "alpha"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+            Parameter { name: "alpha"; type: "QVariant" }
+        }
+        Method {
+            name: "blendColors"
+            type: "QVariant"
+            Parameter { name: "color1"; type: "QVariant" }
+            Parameter { name: "color2"; type: "QVariant" }
+            Parameter { name: "a"; type: "QVariant" }
+        }
+        Method {
+            name: "luminance"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "lightDark"
+            type: "QVariant"
+            Parameter { name: "background"; type: "QVariant" }
+            Parameter { name: "lightColor"; type: "QVariant" }
+            Parameter { name: "darkColor"; type: "QVariant" }
+        }
+        Method {
+            name: "isDarkColor"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "getSourceForIconName"
+            type: "QVariant"
+            Parameter { name: "name"; type: "QVariant" }
+        }
+        Method {
+            name: "scale"
+            type: "QVariant"
+            Parameter { name: "percent"; type: "QVariant" }
+            Parameter { name: "start"; type: "QVariant" }
+            Parameter { name: "end"; type: "QVariant" }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/controls/qmldir b/prototype_2016/third_party/fluid/controls/qmldir
new file mode 100644
index 0000000..1eb9813
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/qmldir
@@ -0,0 +1,41 @@
+module Fluid.Controls
+plugin fluidcontrols
+class FluidControlsPlugin
+typeinfo plugins.qmltypes
+
+Action 1.0 Action.qml
+AppBar 1.0 AppBar.qml
+AppToolBar 1.0 AppToolBar.qml
+BaseListItem 1.0 BaseListItem.qml
+BodyLabel 1.0 BodyLabel.qml
+CaptionLabel 1.0 CaptionLabel.qml
+Card 1.0 Card.qml
+CircleImage 1.0 CircleImage.qml
+Dialog 1.0 Dialog.qml
+DialogLabel 1.0 DialogLabel.qml
+DisplayLabel 1.0 DisplayLabel.qml
+FluidWindow 1.0 FluidWindow.qml
+HeadlineLabel 1.0 HeadlineLabel.qml
+IconButton 1.0 IconButton.qml
+Icon 1.0 Icon.qml
+InfoBar 1.0 InfoBar.qml
+ListItemDelegate 1.0 ListItemDelegate.qml
+ListItem 1.0 ListItem.qml
+Loadable 1.0 Loadable.qml
+NavigationDrawer 1.0 NavigationDrawer.qml
+NoiseBackground 1.0 NoiseBackground.qml
+Page 1.0 Page.qml
+PageStack 1.0 PageStack.qml
+Placeholder 1.0 Placeholder.qml
+Showable 1.0 Showable.qml
+Sidebar 1.0 Sidebar.qml
+SmoothFadeImage 1.0 SmoothFadeImage.qml
+SmoothFadeLoader 1.0 SmoothFadeLoader.qml
+Subheader 1.0 Subheader.qml
+SubheadingLabel 1.0 SubheadingLabel.qml
+Tab 1.0 Tab.qml
+TabbedPage 1.0 TabbedPage.qml
+ThinDivider 1.0 ThinDivider.qml
+TitleLabel 1.0 TitleLabel.qml
+singleton FluidStyle 1.0 FluidStyle.qml
+singleton Units 1.0 Units.qml
diff --git a/prototype_2016/third_party/fluid/controls/qmldir_noplugin b/prototype_2016/third_party/fluid/controls/qmldir_noplugin
new file mode 100644
index 0000000..07b7dcb
--- /dev/null
+++ b/prototype_2016/third_party/fluid/controls/qmldir_noplugin
@@ -0,0 +1,39 @@
+module Fluid.Controls
+typeinfo plugins.qmltypes
+
+Action 1.0 Action.qml
+AppBar 1.0 AppBar.qml
+AppToolBar 1.0 AppToolBar.qml
+BaseListItem 1.0 BaseListItem.qml
+BodyLabel 1.0 BodyLabel.qml
+CaptionLabel 1.0 CaptionLabel.qml
+Card 1.0 Card.qml
+CircleImage 1.0 CircleImage.qml
+Dialog 1.0 Dialog.qml
+DialogLabel 1.0 DialogLabel.qml
+DisplayLabel 1.0 DisplayLabel.qml
+FluidWindow 1.0 FluidWindow.qml
+HeadlineLabel 1.0 HeadlineLabel.qml
+IconButton 1.0 IconButton.qml
+Icon 1.0 Icon.qml
+InfoBar 1.0 InfoBar.qml
+ListItemDelegate 1.0 ListItemDelegate.qml
+ListItem 1.0 ListItem.qml
+Loadable 1.0 Loadable.qml
+NavigationDrawer 1.0 NavigationDrawer.qml
+NoiseBackground 1.0 NoiseBackground.qml
+Page 1.0 Page.qml
+PageStack 1.0 PageStack.qml
+Placeholder 1.0 Placeholder.qml
+Showable 1.0 Showable.qml
+Sidebar 1.0 Sidebar.qml
+SmoothFadeImage 1.0 SmoothFadeImage.qml
+SmoothFadeLoader 1.0 SmoothFadeLoader.qml
+Subheader 1.0 Subheader.qml
+SubheadingLabel 1.0 SubheadingLabel.qml
+Tab 1.0 Tab.qml
+TabbedPage 1.0 TabbedPage.qml
+ThinDivider 1.0 ThinDivider.qml
+TitleLabel 1.0 TitleLabel.qml
+singleton FluidStyle 1.0 FluidStyle.qml
+singleton Units 1.0 Units.qml
diff --git a/prototype_2016/third_party/fluid/core/CMakeLists.txt b/prototype_2016/third_party/fluid/core/CMakeLists.txt
new file mode 100644
index 0000000..21bd974
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/CMakeLists.txt
@@ -0,0 +1,32 @@
+include_directories(
+    "${CMAKE_CURRENT_BINARY_DIR}/../src"
+    "${CMAKE_CURRENT_BINARY_DIR}/../src/Fluid"
+)
+
+add_definitions(-DQT_PLUGIN)
+
+set(SOURCES
+    plugin.cpp
+    clipboard.cpp
+    qmldateutils.cpp
+    device.cpp
+    iconsimageprovider.cpp
+    qqmlsortfilterproxymodel.cpp
+    standardpaths.cpp
+)
+
+add_library(fluidcore SHARED ${SOURCES})
+target_link_libraries(fluidcore Qt5::Svg Qt5::Gui Qt5::Quick Fluid)
+
+set(FILES
+    plugins.qmltypes
+    qmldir
+    Object.qml
+    PlatformExtensions.qml
+    Utils.qml
+)
+
+install(TARGETS fluidcore LIBRARY
+        DESTINATION ${QML_INSTALL_DIR}/Fluid/Core)
+install(FILES ${FILES}
+        DESTINATION ${QML_INSTALL_DIR}/Fluid/Core)
diff --git a/prototype_2016/third_party/fluid/core/Object.qml b/prototype_2016/third_party/fluid/core/Object.qml
new file mode 100644
index 0000000..abfcdde
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/Object.qml
@@ -0,0 +1,38 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+/*!
+    \qmltype Object
+    \inqmlmodule Fluid.Core
+    \ingroup fluidcore
+
+    \brief A QtObject with children.
+
+    The \l Object type is a non-visual element that extends \l QtObject
+    with the ability to hold children objects.
+*/
+QtObject {
+    default property alias children: object.__children
+
+    /*!
+        \qmlproperty list<QtObject> Object::children
+
+        Children objects.
+    */
+    property list<QtObject> __children: [QtObject {}]
+
+    id: object
+}
diff --git a/prototype_2016/third_party/qml-material/src/core/PlatformExtensions.qml b/prototype_2016/third_party/fluid/core/PlatformExtensions.qml
index 8e8f4c1..ba9dcdb 100644
--- a/prototype_2016/third_party/qml-material/src/core/PlatformExtensions.qml
+++ b/prototype_2016/third_party/fluid/core/PlatformExtensions.qml
@@ -1,24 +1,27 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
  * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
  *
+ * $BEGIN_LICENSE:MPL2$
+ *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
 import QtQuick 2.0
-import Material 0.3
+import Fluid.Core 1.0
 
 Object {
     id: platform
 
     property var platformExtensions
 
-    property color decorationColor: Theme.primaryDarkColor
+    property color decorationColor
     property var window: null
-    readonly property real multiplier: platformExtensions ? platformExtensions.multiplier : 1
 
     onDecorationColorChanged: {
         if (platformExtensions && color != "#000000") {
@@ -34,8 +37,8 @@ Object {
 
     Component.onCompleted: {
         try {
-            var code = 'import Papyros.Material 0.1; PlatformExtensions {}'
-            platformExtensions = Qt.createQmlObject(code, platform, "PapyrosExtensions");
+            var code = 'import Liri.Platform 1.0; PlatformExtensions {}'
+            platformExtensions = Qt.createQmlObject(code, platform, "LiriExtensions");
 
             platformExtensions.window = window
             if (decorationColor != "#000000")
diff --git a/prototype_2016/third_party/fluid/core/Utils.qml b/prototype_2016/third_party/fluid/core/Utils.qml
new file mode 100644
index 0000000..7d3a480
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/Utils.qml
@@ -0,0 +1,106 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+pragma Singleton
+
+/*!
+    \qmltype Utils
+    \inqmlmodule Fluid.Core
+    \ingroup fluidcore
+
+    \brief A collection of helpful utility methods.
+
+    Currently the only utility methods are for working with colors.
+*/
+QtObject {
+    /*!
+        Make sure we have a real \l color object to work with (versus a string like "#ccc")
+    */
+    function asColor(color) {
+        return Qt.darker(color, 1)
+    }
+
+    /*!
+        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) {
+        color = asColor(color)
+
+        color.a = alpha
+
+        return color
+    }
+
+    /*!
+        Blend \a color1 and \a color2 together and set alpha to \a a.
+    */
+    function blendColors(color1, color2, a) {
+        return alpha(Qt.tint(color1, color2), a)
+    }
+
+    /*!
+        Calculate luminance of \a color.
+    */
+    function luminance(color) {
+        color = asColor(color)
+        return (color.r * 0.2126) + (color.g * 0.7152) + (color.b * 0.0722)
+    }
+
+    /*!
+        Select a color depending on whether \a background color is light or dark.
+        Returns \a lightColor if \a background is a light color, otherwise
+        returns \a darkColor.
+    */
+    function lightDark(background, lightColor, darkColor) {
+        return isDarkColor(background) ? darkColor : lightColor
+    }
+
+    /*!
+        Returns \c true if \a color is dark and should have light content on top.
+    */
+    function isDarkColor(color) {
+        color = asColor(color)
+
+        var a = 1 - (0.299 * color.r + 0.587 * color.g + 0.114 * color.b)
+
+        return color.a > 0 && a >= 0.3
+    }
+
+    /*!
+        Returns a source suitable for an \l Image from an icon name.
+        If \a name is an URL it will be returned verbatim, instead if it
+        contains a slash character an icon relative to Fluid icons/ directory
+        will be returned, otherwise an image://fluidicontheme/\a name URL.
+    */
+    function getSourceForIconName(name) {
+        return name ? name.indexOf("/") === 0 || name.indexOf("file://") === 0 || name.indexOf("qrc") === 0
+                      ? name
+                      : name.indexOf("/") !== -1 ? "image://fluidicons/" + name
+                                                 : "image://fluidicontheme/" + name
+                    : ""
+    }
+
+    /*!
+        Scale \a percent in the range between \a start and \a end.
+    */
+    function scale(percent, start, end) {
+        var diff = end - start
+
+        return start + percent * diff
+    }
+}
diff --git a/prototype_2016/third_party/fluid/core/clipboard.cpp b/prototype_2016/third_party/fluid/core/clipboard.cpp
new file mode 100644
index 0000000..79280d3
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/clipboard.cpp
@@ -0,0 +1,54 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include "clipboard.h"
+
+#include <QGuiApplication>
+
+/*!
+    \qmltype Clipboard
+    \inqmlmodule Fluid.Core
+    \ingroup fluidcore
+
+    \brief Clipboard.
+*/
+
+Clipboard::Clipboard(QObject *parent)
+    : QObject(parent)
+    , m_clipboard(QGuiApplication::clipboard())
+{
+    connect(m_clipboard, &QClipboard::dataChanged, this, &Clipboard::textChanged);
+}
+
+/*!
+    \qmlproperty string Clipboard::text
+
+    This property holds the clipboard text.
+*/
+
+QString Clipboard::text() const
+{
+    return m_clipboard->text();
+}
+
+void Clipboard::clear()
+{
+    m_clipboard->clear();
+}
+
+void Clipboard::setText(const QString &text)
+{
+    m_clipboard->setText(text);
+}
diff --git a/prototype_2016/third_party/fluid/core/clipboard.h b/prototype_2016/third_party/fluid/core/clipboard.h
new file mode 100644
index 0000000..72b19e7
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/clipboard.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QClipboard>
+
+class Clipboard : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
+
+public:
+    explicit Clipboard(QObject *parent = nullptr);
+
+    QString text() const;
+
+    Q_INVOKABLE void clear();
+
+public Q_SLOTS:
+    void setText(const QString &text);
+
+Q_SIGNALS:
+    void textChanged();
+
+private:
+    QClipboard *m_clipboard = nullptr;
+};
diff --git a/prototype_2016/third_party/fluid/core/core.pri b/prototype_2016/third_party/fluid/core/core.pri
new file mode 100644
index 0000000..16b7b9d
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/core.pri
@@ -0,0 +1,19 @@
+HEADERS += \
+    $$PWD/clipboard.h \
+    $$PWD/device.h \
+    $$PWD/iconsimageprovider.h \
+    $$PWD/qmldateutils.h \
+    $$PWD/qqmlsortfilterproxymodel.h \
+    $$PWD/standardpaths.h
+
+SOURCES += \
+    $$PWD/clipboard.cpp \
+    $$PWD/device.cpp \
+    $$PWD/iconsimageprovider.cpp \
+    $$PWD/plugin.cpp \
+    $$PWD/qmldateutils.cpp \
+    $$PWD/qqmlsortfilterproxymodel.cpp \
+    $$PWD/standardpaths.cpp
+
+RESOURCES += \
+    $$PWD/core.qrc
diff --git a/prototype_2016/third_party/fluid/core/core.qrc b/prototype_2016/third_party/fluid/core/core.qrc
new file mode 100644
index 0000000..3b17685
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/core.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/Fluid/Core">
+        <file>Object.qml</file>
+        <file>PlatformExtensions.qml</file>
+        <file>Utils.qml</file>
+        <file alias="qmldir">qmldir_noplugin</file>
+    </qresource>
+</RCC>
diff --git a/prototype_2016/third_party/qml-material/src/core/device.cpp b/prototype_2016/third_party/fluid/core/device.cpp
index 7ca842c..07046b8 100644
--- a/prototype_2016/third_party/qml-material/src/core/device.cpp
+++ b/prototype_2016/third_party/fluid/core/device.cpp
@@ -1,40 +1,33 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
  *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
 #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)
+    : QObject(parent)
 {
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
+    m_screen = qGuiApp->primaryScreen();
 
-    return new Device();
+    connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &Device::screenChanged);
 }
 
 Device::FormFactor Device::formFactor() const
 {
     float diagonal = calculateDiagonal();
 
-    if (diagonal >= 3.5 && diagonal < 5) { //iPhone 1st generation to phablet
+    if (diagonal >= 3.5 && diagonal < 5) {
+        // iPhone 1st generation to phablet
         return Device::Phone;
     } else if (diagonal >= 5 && diagonal < 6.5) {
         return Device::Phablet;
@@ -52,39 +45,39 @@ Device::FormFactor Device::formFactor() const
 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");
+    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";
+    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";
     }
 }
 
@@ -100,7 +93,7 @@ bool Device::hasTouchScreen() const
     return true;
 #else
     const auto devices = QTouchDevice::devices();
-    foreach(const QTouchDevice *dev, devices) {
+    foreach (const QTouchDevice *dev, devices) {
         if (dev->type() == QTouchDevice::TouchScreen)
             return true;
     }
@@ -110,7 +103,8 @@ bool Device::hasTouchScreen() const
 
 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)
+#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")) {
@@ -143,8 +137,7 @@ void Device::screenChanged()
     if (m_screen)
         m_screen->disconnect(this);
 
-    QGuiApplication *app = (QGuiApplication *) QGuiApplication::instance();
-    m_screen = app->primaryScreen();
+    m_screen = qGuiApp->primaryScreen();
 
     connect(m_screen, &QScreen::geometryChanged, this, &Device::geometryChanged);
 
@@ -153,6 +146,7 @@ void Device::screenChanged()
 
 float Device::calculateDiagonal() const
 {
-    return sqrt(pow((m_screen->physicalSize().width()), 2) +
-                pow((m_screen->physicalSize().height()), 2)) * 0.039370;
+    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/fluid/core/device.h
index 682de79..113de03 100644
--- a/prototype_2016/third_party/qml-material/src/core/device.h
+++ b/prototype_2016/third_party/fluid/core/device.h
@@ -1,15 +1,18 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
  *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
- #ifndef DEVICE_H
- #define DEVICE_H
+#pragma once
 
 #include <QObject>
 
@@ -19,7 +22,8 @@
 #include <QScreen>
 #include <QTouchDevice>
 
-class Device : public QObject {
+class Device : public QObject
+{
     Q_OBJECT
 
     Q_PROPERTY(FormFactor formFactor READ formFactor NOTIFY geometryChanged)
@@ -34,20 +38,11 @@ class Device : public QObject {
     Q_PROPERTY(int gridUnit READ gridUnit NOTIFY geometryChanged)
 
 public:
-    enum FormFactor {
-        Phone,
-        Phablet,
-        Tablet,
-        Computer,
-        TV,
-        Unknown
-    };
+    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;
@@ -58,12 +53,11 @@ public:
     bool hoverEnabled() const;
 
     int gridUnit() const;
-    int dpMultiplier() const;
 
-signals:
+Q_SIGNALS:
     void geometryChanged();
 
-private slots:
+private Q_SLOTS:
     void screenChanged();
 
 private:
@@ -71,5 +65,3 @@ private:
 
     QScreen *m_screen;
 };
-
-#endif // DEVICE_H
diff --git a/prototype_2016/third_party/fluid/core/doc/fluidcore.qdocconf b/prototype_2016/third_party/fluid/core/doc/fluidcore.qdocconf
new file mode 100644
index 0000000..ffeb2b0
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/doc/fluidcore.qdocconf
@@ -0,0 +1,47 @@
+include(../../doc/defaults.qdocconf)
+
+project                 = FluidCore
+description             = Fluid Core Reference Documentation
+version                 = $FLUID_VERSION
+
+qhp.projects            = FluidCore
+
+qhp.Fluid.file          = fluidcore.qhp
+qhp.Fluid.namespace     = io.liri.fluidcore.$FLUID_VERSION_TAG
+qhp.Fluid.virtualFolder = fluidcore
+qhp.Fluid.indexTitle    = Fluid Core
+qhp.Fluid.indexRoot     =
+
+qhp.Fluid.filterAttributes                  = fluidcore $FLUID_VERSION qtrefdoc
+qhp.Fluid.customFilters.Qt.name             = FluidCore $FLUID_VERSION
+qhp.Fluid.customFilters.Qt.filterAttributes = fluidcore $FLUID_VERSION
+
+qhp.Fluid.subprojects = qmltypes classes examples
+qhp.Fluid.subprojects.qmltypes.title = QML Types
+qhp.Fluid.subprojects.qmltypes.indexTitle = Fluid Core QML Types
+qhp.Fluid.subprojects.qmltypes.selectors = qmlclass
+qhp.Fluid.subprojects.qmltypes.sortPages = true
+qhp.Fluid.subprojects.classes.title = C++ Classes
+qhp.Fluid.subprojects.classes.indexTitle = Fluid Core C++ Classes
+qhp.Fluid.subprojects.classes.selectors = class fake:headerfile
+qhp.Fluid.subprojects.classes.sortPages = true
+qhp.Fluid.subprojects.examples.title = Examples
+qhp.Fluid.subprojects.examples.indexTitle = Fluid Core Examples
+qhp.Fluid.subprojects.examples.selectors = fake:example
+
+# Specify the install path under QT_INSTALL_EXAMPLES
+# Note: paths passed to \example command must contain the parent directory, e.g.
+# \example controls/tabs
+#exampledirs += snippets
+
+#examplesinstallpath = fluid
+
+headerdirs += .
+
+sourcedirs += . src
+
+imagedirs += images
+
+navigation.landingpage  = "Fluid Core"
+navigation.qmltypespage = "Fluid Core QML Types"
+navigation.cppclassespage = "Fluid Core C++ Classes"
diff --git a/prototype_2016/third_party/fluid/core/iconsimageprovider.cpp b/prototype_2016/third_party/fluid/core/iconsimageprovider.cpp
new file mode 100644
index 0000000..2ffbe10
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/iconsimageprovider.cpp
@@ -0,0 +1,67 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QtCore/QDir>
+#include <QtSvg/QSvgRenderer>
+#include <QtGui/QPainter>
+#include <QtQml/QQmlEngine>
+
+#include "iconsimageprovider.h"
+
+IconsImageProvider::IconsImageProvider()
+    : QQuickImageProvider(QQuickImageProvider::Image)
+{
+}
+
+QImage IconsImageProvider::requestImage(const QString &id, QSize *realSize,
+                                        const QSize &requestedSize)
+{
+    // Sanitize requested size
+    QSize size(requestedSize);
+    if (size.width() < 1)
+        size.setWidth(1);
+    if (size.height() < 1)
+        size.setHeight(1);
+
+    // Return real size
+    if (realSize)
+        *realSize = size;
+
+#ifdef FLUID_LOCAL
+    QSvgRenderer renderer(QLatin1String("qrc:/Fluid/Controls/") + id + QLatin1String(".svg"));
+    QImage image(size, QImage::Format_ARGB32);
+    image.fill(Qt::transparent);
+    QPainter painter(&image);
+    renderer.render(&painter);
+    return image;
+#else
+    const QString targetPath = QStringLiteral("Fluid/Controls/icons");
+    const QStringList importPaths = QQmlEngine().importPathList();
+
+    for (const QString &importPath: importPaths) {
+        QDir dir(importPath);
+        if (dir.exists(targetPath)) {
+            QDir targetDir(dir.absoluteFilePath(targetPath));
+            QSvgRenderer renderer(targetDir.absoluteFilePath(id + QLatin1String(".svg")));
+            QImage image(size, QImage::Format_ARGB32);
+            image.fill(Qt::transparent);
+            QPainter painter(&image);
+            renderer.render(&painter);
+            return image;
+        }
+    }
+
+    return QImage();
+#endif
+}
diff --git a/prototype_2016/third_party/fluid/core/iconsimageprovider.h b/prototype_2016/third_party/fluid/core/iconsimageprovider.h
new file mode 100644
index 0000000..f30a705
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/iconsimageprovider.h
@@ -0,0 +1,25 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#pragma once
+
+#include <QtQuick/QQuickImageProvider>
+
+class IconsImageProvider : public QQuickImageProvider
+{
+public:
+    IconsImageProvider();
+
+    QImage requestImage(const QString &id, QSize *realSize, const QSize &requestedSize);
+};
diff --git a/prototype_2016/third_party/fluid/core/plugin.cpp b/prototype_2016/third_party/fluid/core/plugin.cpp
new file mode 100644
index 0000000..511b439
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/plugin.cpp
@@ -0,0 +1,90 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QtQml/QQmlExtensionPlugin>
+#include <QtQml/qqml.h>
+
+#include "clipboard.h"
+#include "device.h"
+#include "iconsimageprovider.h"
+#include "qmldateutils.h"
+#include "qqmlsortfilterproxymodel.h"
+#include "standardpaths.h"
+
+static QObject *dateUtilsProvider(QQmlEngine *engine, QJSEngine *jsEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(jsEngine);
+
+    return new DateUtils();
+}
+
+static QObject *deviceProvider(QQmlEngine *engine, QJSEngine *jsEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(jsEngine);
+
+    return new Device();
+}
+
+static QObject *standardPathsProvider(QQmlEngine *engine, QJSEngine *jsEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(jsEngine);
+
+    return new StandardPaths();
+}
+
+class FluidCorePlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+public:
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri);
+};
+
+void FluidCorePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    Q_ASSERT(QByteArray(uri) == QByteArrayLiteral("Fluid.Core"));
+
+    engine->addImageProvider(QLatin1String("fluidicons"), new IconsImageProvider());
+}
+
+void FluidCorePlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(QByteArray("Fluid.Core") == QByteArray(uri));
+
+    // @uri Fluid.Core
+
+    qmlRegisterType<Clipboard>(uri, 1, 0, "Clipboard");
+
+    qmlRegisterType<QAbstractItemModel>();
+    qmlRegisterType<QQmlSortFilterProxyModel>(uri, 1, 0, "SortFilterProxyModel");
+
+    qmlRegisterSingletonType<DateUtils>(uri, 1, 0, "DateUtils", dateUtilsProvider);
+    qmlRegisterSingletonType<Device>(uri, 1, 0, "Device", deviceProvider);
+    qmlRegisterSingletonType<StandardPaths>(uri, 1, 0, "StandardPaths", standardPathsProvider);
+}
+
+#ifdef FLUID_LOCAL
+static void registerFluidCoreTypes() {
+    FluidCorePlugin fluidCore;
+    fluidCore.registerTypes("Fluid.Core");
+}
+
+Q_COREAPP_STARTUP_FUNCTION(registerFluidCoreTypes)
+#endif
+
+#include "plugin.moc"
diff --git a/prototype_2016/third_party/fluid/core/plugins.qmltypes b/prototype_2016/third_party/fluid/core/plugins.qmltypes
new file mode 100644
index 0000000..f8f71ef
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/plugins.qmltypes
@@ -0,0 +1,268 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump-qt5 -nonrelocatable Fluid.Core 1.0'
+
+Module {
+    dependencies: ["QtQuick 2.0"]
+    Component {
+        name: "Clipboard"
+        prototype: "QObject"
+        exports: ["Fluid.Core/Clipboard 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "text"; type: "string" }
+        Method {
+            name: "setText"
+            Parameter { name: "text"; type: "string" }
+        }
+        Method { name: "clear" }
+    }
+    Component {
+        name: "DateUtils"
+        prototype: "QObject"
+        exports: ["Fluid.Core/DateUtils 1.0"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "DurationFormat"
+            values: {
+                "Long": 0,
+                "Short": 1
+            }
+        }
+        Enum {
+            name: "DurationType"
+            values: {
+                "Seconds": 0,
+                "Minutes": 1,
+                "Hours": 2,
+                "Any": 3
+            }
+        }
+        Method {
+            name: "formatDuration"
+            type: "string"
+            Parameter { name: "duration"; type: "qlonglong" }
+            Parameter { name: "format"; type: "DurationFormat" }
+            Parameter { name: "type"; type: "DurationType" }
+        }
+        Method {
+            name: "formatDuration"
+            type: "string"
+            Parameter { name: "duration"; type: "qlonglong" }
+            Parameter { name: "format"; type: "DurationFormat" }
+        }
+        Method {
+            name: "formatDuration"
+            type: "string"
+            Parameter { name: "duration"; type: "qlonglong" }
+        }
+    }
+    Component {
+        name: "Device"
+        prototype: "QObject"
+        exports: ["Fluid.Core/Device 1.0"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "FormFactor"
+            values: {
+                "Phone": 0,
+                "Phablet": 1,
+                "Tablet": 2,
+                "Computer": 3,
+                "TV": 4,
+                "Unknown": 5
+            }
+        }
+        Property { name: "formFactor"; type: "FormFactor"; isReadonly: true }
+        Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "iconName"; type: "string"; isReadonly: true }
+        Property { name: "isPortrait"; type: "bool"; isReadonly: true }
+        Property { name: "isMobile"; type: "bool"; isReadonly: true }
+        Property { name: "hasTouchScreen"; type: "bool"; isReadonly: true }
+        Property { name: "hoverEnabled"; type: "bool"; isReadonly: true }
+        Property { name: "gridUnit"; type: "int"; isReadonly: true }
+        Signal { name: "geometryChanged" }
+    }
+    Component {
+        name: "QAbstractProxyModel"
+        prototype: "QAbstractItemModel"
+        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+        Method {
+            name: "mapToSource"
+            type: "QModelIndex"
+            Parameter { name: "proxyIndex"; type: "QModelIndex" }
+        }
+        Method {
+            name: "mapFromSource"
+            type: "QModelIndex"
+            Parameter { name: "sourceIndex"; type: "QModelIndex" }
+        }
+        Method {
+            name: "mapSelectionToSource"
+            type: "QItemSelection"
+            Parameter { name: "selection"; type: "QItemSelection" }
+        }
+        Method {
+            name: "mapSelectionFromSource"
+            type: "QItemSelection"
+            Parameter { name: "selection"; type: "QItemSelection" }
+        }
+    }
+    Component {
+        name: "QQmlSortFilterProxyModel"
+        prototype: "QSortFilterProxyModel"
+        exports: ["Fluid.Core/SortFilterProxyModel 1.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "PatternSyntax"
+            values: {
+                "RegExp": 0,
+                "Wildcard": 1,
+                "FixedString": 2,
+                "RegExp2": 3,
+                "WildcardUnix": 4,
+                "W3CXmlSchema11": 5
+            }
+        }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "filterRoleName"; type: "string" }
+        Property { name: "filterPattern"; type: "string" }
+        Property { name: "filterPatternSyntax"; type: "PatternSyntax" }
+        Property { name: "filterValue"; type: "QVariant" }
+        Property { name: "filterExpression"; type: "QQmlScriptString" }
+        Property { name: "sortRoleName"; type: "string" }
+        Property { name: "sortOrder"; type: "Qt::SortOrder" }
+        Property { name: "sortExpression"; type: "QQmlScriptString" }
+    }
+    Component {
+        name: "QSortFilterProxyModel"
+        prototype: "QAbstractProxyModel"
+        Property { name: "filterRegExp"; type: "QRegExp" }
+        Property { name: "filterKeyColumn"; type: "int" }
+        Property { name: "dynamicSortFilter"; type: "bool" }
+        Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "isSortLocaleAware"; type: "bool" }
+        Property { name: "sortRole"; type: "int" }
+        Property { name: "filterRole"; type: "int" }
+        Method {
+            name: "setFilterRegExp"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterWildcard"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterFixedString"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method { name: "clear" }
+        Method { name: "invalidate" }
+    }
+    Component {
+        name: "StandardPaths"
+        prototype: "QObject"
+        exports: ["Fluid.Core/StandardPaths 1.0"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "StandardLocation"
+            values: {
+                "DesktopLocation": 0,
+                "DocumentsLocation": 1,
+                "FontsLocation": 2,
+                "ApplicationsLocation": 3,
+                "MusicLocation": 4,
+                "MoviesLocation": 5,
+                "PicturesLocation": 6,
+                "TempLocation": 7,
+                "HomeLocation": 8,
+                "DataLocation": 9,
+                "CacheLocation": 10,
+                "GenericDataLocation": 11,
+                "RuntimeLocation": 12,
+                "ConfigLocation": 13,
+                "DownloadLocation": 14,
+                "GenericCacheLocation": 15,
+                "GenericConfigLocation": 16
+            }
+        }
+        Method {
+            name: "locateFile"
+            type: "string"
+            Parameter { name: "type"; type: "StandardLocation" }
+            Parameter { name: "fileName"; type: "string" }
+        }
+        Method {
+            name: "locateDirectory"
+            type: "string"
+            Parameter { name: "type"; type: "StandardLocation" }
+            Parameter { name: "dirName"; type: "string" }
+        }
+    }
+    Component {
+        prototype: "QObject"
+        name: "Utils 1.0"
+        exports: ["Utils 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        Method {
+            name: "asColor"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "alpha"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+            Parameter { name: "alpha"; type: "QVariant" }
+        }
+        Method {
+            name: "blendColors"
+            type: "QVariant"
+            Parameter { name: "color1"; type: "QVariant" }
+            Parameter { name: "color2"; type: "QVariant" }
+            Parameter { name: "a"; type: "QVariant" }
+        }
+        Method {
+            name: "luminance"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "lightDark"
+            type: "QVariant"
+            Parameter { name: "background"; type: "QVariant" }
+            Parameter { name: "lightColor"; type: "QVariant" }
+            Parameter { name: "darkColor"; type: "QVariant" }
+        }
+        Method {
+            name: "isDarkColor"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "getSourceForIconName"
+            type: "QVariant"
+            Parameter { name: "name"; type: "QVariant" }
+        }
+        Method {
+            name: "scale"
+            type: "QVariant"
+            Parameter { name: "percent"; type: "QVariant" }
+            Parameter { name: "start"; type: "QVariant" }
+            Parameter { name: "end"; type: "QVariant" }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/core/qmldateutils.cpp b/prototype_2016/third_party/fluid/core/qmldateutils.cpp
new file mode 100644
index 0000000..a060f26
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/qmldateutils.cpp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include "qmldateutils.h"
+
+DateUtils::DateUtils(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QString DateUtils::formatDuration(qlonglong duration, DurationFormat format,
+                                  DurationType type) const
+{
+    return Fluid::DateUtils::formatDuration(duration,
+                                            static_cast<Fluid::DateUtils::DurationFormat>(format),
+                                            static_cast<Fluid::DateUtils::DurationType>(type));
+}
+
+QString DateUtils::friendlyTime(const QDateTime &time, bool standalone) const
+{
+    return Fluid::DateUtils::friendlyTime(time, standalone);
+}
diff --git a/prototype_2016/third_party/fluid/core/qmldateutils.h b/prototype_2016/third_party/fluid/core/qmldateutils.h
new file mode 100644
index 0000000..29fffbe
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/qmldateutils.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#pragma once
+
+#ifdef FLUID_LOCAL
+    #include "../src/dateutils.h"
+#else
+    #include <Fluid/DateUtils>
+#endif
+#include <QtCore/QObject>
+
+class DateUtils : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum DurationFormat { Long, Short };
+    Q_ENUM(DurationFormat)
+
+    enum DurationType { Seconds, Minutes, Hours, Any };
+    Q_ENUM(DurationType)
+
+    DateUtils(QObject *parent = nullptr);
+
+    Q_INVOKABLE QString formatDuration(qlonglong duration,
+                                       DurationFormat format = DurationFormat::Short,
+                                       DurationType type = DurationType::Any) const;
+    Q_INVOKABLE QString friendlyTime(const QDateTime &time, bool standalone) const;
+};
diff --git a/prototype_2016/third_party/fluid/core/qmldir b/prototype_2016/third_party/fluid/core/qmldir
new file mode 100644
index 0000000..07b5022
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/qmldir
@@ -0,0 +1,8 @@
+module Fluid.Core
+plugin fluidcore
+class FluidCorePlugin
+typeinfo plugins.qmltypes
+
+Object 1.0 Object.qml
+PlatformExtensions 1.0 PlatformExtensions.qml
+singleton Utils 1.0 Utils.qml
diff --git a/prototype_2016/third_party/fluid/core/qmldir_noplugin b/prototype_2016/third_party/fluid/core/qmldir_noplugin
new file mode 100644
index 0000000..c22216e
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/qmldir_noplugin
@@ -0,0 +1,5 @@
+module Fluid.Core
+typeinfo plugins.qmltypes
+
+Object 1.0 Object.qml
+singleton Utils 1.0 Utils.qml
diff --git a/prototype_2016/third_party/fluid/core/qqmlsortfilterproxymodel.cpp b/prototype_2016/third_party/fluid/core/qqmlsortfilterproxymodel.cpp
new file mode 100644
index 0000000..0f88cc0
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/qqmlsortfilterproxymodel.cpp
@@ -0,0 +1,283 @@
+/****************************************************************************
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pierre-Yves Siret
+ *
+ * $BEGIN_LICENSE:MIT$
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * $END_LICENSE$
+ ***************************************************************************/
+
+#include "qqmlsortfilterproxymodel.h"
+#include <QtQml>
+
+QQmlSortFilterProxyModel::QQmlSortFilterProxyModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+    , m_filterExpression(0)
+    , m_compareExpression(0)
+{
+    connect(this, &QAbstractProxyModel::sourceModelChanged, this,
+            &QQmlSortFilterProxyModel::updateRoles);
+    connect(this, &QAbstractItemModel::modelReset, this, &QQmlSortFilterProxyModel::updateRoles);
+    connect(this, &QAbstractItemModel::rowsInserted, this, &QQmlSortFilterProxyModel::countChanged);
+    connect(this, &QAbstractItemModel::rowsRemoved, this, &QQmlSortFilterProxyModel::countChanged);
+    connect(this, &QAbstractItemModel::modelReset, this, &QQmlSortFilterProxyModel::countChanged);
+    connect(this, &QAbstractItemModel::layoutChanged, this,
+            &QQmlSortFilterProxyModel::countChanged);
+    setDynamicSortFilter(true);
+}
+
+int QQmlSortFilterProxyModel::count() const
+{
+    return rowCount();
+}
+
+const QString &QQmlSortFilterProxyModel::filterRoleName() const
+{
+    return m_filterRoleName;
+}
+
+void QQmlSortFilterProxyModel::setFilterRoleName(const QString &filterRoleName)
+{
+    if (m_filterRoleName == filterRoleName)
+        return;
+
+    m_filterRoleName = filterRoleName;
+    updateFilterRole();
+    emit filterRoleNameChanged();
+}
+
+QString QQmlSortFilterProxyModel::filterPattern() const
+{
+    return filterRegExp().pattern();
+}
+
+void QQmlSortFilterProxyModel::setFilterPattern(const QString &filterPattern)
+{
+    QRegExp regExp = filterRegExp();
+    if (regExp.pattern() == filterPattern)
+        return;
+
+    regExp.setPattern(filterPattern);
+    QSortFilterProxyModel::setFilterRegExp(regExp);
+    emit filterPatternChanged();
+}
+
+QQmlSortFilterProxyModel::PatternSyntax QQmlSortFilterProxyModel::filterPatternSyntax() const
+{
+    return static_cast<PatternSyntax>(filterRegExp().patternSyntax());
+}
+
+void QQmlSortFilterProxyModel::setFilterPatternSyntax(
+    QQmlSortFilterProxyModel::PatternSyntax patternSyntax)
+{
+    QRegExp regExp = filterRegExp();
+    QRegExp::PatternSyntax patternSyntaxTmp = static_cast<QRegExp::PatternSyntax>(patternSyntax);
+    if (regExp.patternSyntax() == patternSyntaxTmp)
+        return;
+
+    regExp.setPatternSyntax(patternSyntaxTmp);
+    QSortFilterProxyModel::setFilterRegExp(regExp);
+    emit filterPatternSyntaxChanged();
+}
+
+const QVariant &QQmlSortFilterProxyModel::filterValue() const
+{
+    return m_filterValue;
+}
+
+void QQmlSortFilterProxyModel::setFilterValue(const QVariant &filterValue)
+{
+    if (m_filterValue == filterValue)
+        return;
+
+    m_filterValue = filterValue;
+    invalidateFilter();
+    emit filterValueChanged();
+}
+
+const QQmlScriptString &QQmlSortFilterProxyModel::filterExpression() const
+{
+    return m_filterScriptString;
+}
+
+void QQmlSortFilterProxyModel::setFilterExpression(const QQmlScriptString &filterScriptString)
+{
+    if (m_filterScriptString == filterScriptString)
+        return;
+
+    m_filterScriptString = filterScriptString;
+    QQmlContext *context = new QQmlContext(qmlContext(this));
+
+    QVariantMap map;
+    Q_FOREACH (const QByteArray &roleName, roleNames().values())
+        map.insert(roleName, QVariant());
+
+    context->setContextProperty("model", map);
+    context->setContextProperty("index", -1);
+
+    delete (m_filterExpression);
+    m_filterExpression = new QQmlExpression(m_filterScriptString, context, 0, this);
+    connect(m_filterExpression, &QQmlExpression::valueChanged, this,
+            &QQmlSortFilterProxyModel::invalidateFilter);
+    m_filterExpression->setNotifyOnValueChanged(true);
+    m_filterExpression->evaluate();
+
+    emit filterExpressionChanged();
+}
+
+const QString &QQmlSortFilterProxyModel::sortRoleName() const
+{
+    return m_sortRoleName;
+}
+
+void QQmlSortFilterProxyModel::setSortRoleName(const QString &sortRoleName)
+{
+    if (m_sortRoleName == sortRoleName)
+        return;
+
+    m_sortRoleName = sortRoleName;
+    updateSortRole();
+    emit sortRoleNameChanged();
+}
+
+void QQmlSortFilterProxyModel::setSortOrder(Qt::SortOrder sortOrder)
+{
+    if (!m_sortRoleName.isEmpty())
+        sort(0, sortOrder);
+}
+
+const QQmlScriptString &QQmlSortFilterProxyModel::sortExpression() const
+{
+    return m_compareScriptString;
+}
+
+void QQmlSortFilterProxyModel::setSortExpression(const QQmlScriptString &compareScriptString)
+{
+    if (m_compareScriptString == compareScriptString)
+        return;
+
+    m_compareScriptString = compareScriptString;
+    QQmlContext *context = new QQmlContext(qmlContext(this));
+
+    QVariantMap map;
+    Q_FOREACH (const QByteArray &roleName, roleNames().values())
+        map.insert(roleName, QVariant());
+
+    context->setContextProperty("modelLeft", map);
+    context->setContextProperty("indexLeft", -1);
+    context->setContextProperty("modelRight", map);
+    context->setContextProperty("indexRight", -1);
+
+    delete (m_compareExpression);
+    m_compareExpression = new QQmlExpression(m_compareScriptString, context, 0, this);
+    connect(m_compareExpression, &QQmlExpression::valueChanged, this,
+            &QQmlSortFilterProxyModel::invalidate);
+    m_compareExpression->setNotifyOnValueChanged(true);
+    m_compareExpression->evaluate();
+
+    emit sortExpressionChanged();
+}
+
+bool QQmlSortFilterProxyModel::filterAcceptsRow(int source_row,
+                                                const QModelIndex &source_parent) const
+{
+    QModelIndex modelIndex = sourceModel()->index(source_row, 0, source_parent);
+    bool valueAccepted = !m_filterValue.isValid()
+        || (m_filterValue == sourceModel()->data(modelIndex, filterRole()));
+    bool baseAcceptsRow =
+        valueAccepted && QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
+    if (baseAcceptsRow && !m_filterScriptString.isEmpty()) {
+        QVariantMap map = modelDataMap(modelIndex);
+
+        QQmlContext context(qmlContext(this));
+        context.setContextProperty("model", map);
+        context.setContextProperty("index", source_row);
+        QQmlExpression expression(m_filterScriptString, &context, 0);
+        QVariant result = expression.evaluate();
+
+        if (!expression.hasError())
+            return result.toBool();
+        else
+            qWarning() << expression.error();
+    }
+    return baseAcceptsRow;
+}
+
+bool QQmlSortFilterProxyModel::lessThan(const QModelIndex &source_left,
+                                        const QModelIndex &source_right) const
+{
+    if (!m_compareScriptString.isEmpty()) {
+        QQmlContext context(qmlContext(this));
+        context.setContextProperty("modelLeft", modelDataMap(source_left));
+        context.setContextProperty("indexLeft", source_left.row());
+        context.setContextProperty("modelRight", modelDataMap(source_right));
+        context.setContextProperty("indexRight", source_right.row());
+
+        QQmlExpression expression(m_compareScriptString, &context, 0);
+        QVariant result = expression.evaluate();
+
+        if (!expression.hasError())
+            return result.toBool();
+        else
+            qWarning() << expression.error();
+    }
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
+}
+
+void QQmlSortFilterProxyModel::invalidateFilter()
+{
+    QSortFilterProxyModel::invalidateFilter();
+}
+
+void QQmlSortFilterProxyModel::updateFilterRole()
+{
+    QList<int> filterRoles = roleNames().keys(m_filterRoleName.toUtf8());
+    if (!filterRoles.empty()) {
+        setFilterRole(filterRoles.first());
+    }
+}
+
+void QQmlSortFilterProxyModel::updateSortRole()
+{
+    QList<int> sortRoles = roleNames().keys(m_sortRoleName.toUtf8());
+    if (!sortRoles.empty()) {
+        setSortRole(sortRoles.first());
+        sort(0, sortOrder());
+    }
+}
+
+void QQmlSortFilterProxyModel::updateRoles()
+{
+    updateFilterRole();
+    updateSortRole();
+}
+
+QVariantMap QQmlSortFilterProxyModel::modelDataMap(const QModelIndex &modelIndex) const
+{
+    QVariantMap map;
+    QHash<int, QByteArray> roles = roleNames();
+    for (QHash<int, QByteArray>::const_iterator it = roles.begin(); it != roles.end(); ++it)
+        map.insert(it.value(), sourceModel()->data(modelIndex, it.key()));
+    return map;
+}
+
+#include "moc_qqmlsortfilterproxymodel.cpp"
diff --git a/prototype_2016/third_party/fluid/core/qqmlsortfilterproxymodel.h b/prototype_2016/third_party/fluid/core/qqmlsortfilterproxymodel.h
new file mode 100644
index 0000000..58f09e7
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/qqmlsortfilterproxymodel.h
@@ -0,0 +1,129 @@
+/****************************************************************************
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pierre-Yves Siret
+ *
+ * $BEGIN_LICENSE:MIT$
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * $END_LICENSE$
+ ***************************************************************************/
+
+#ifndef QQMLSORTFILTERPROXYMODEL_H
+#define QQMLSORTFILTERPROXYMODEL_H
+
+#include <QSortFilterProxyModel>
+#include <QQmlExpression>
+
+class QQmlSortFilterProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(QString filterRoleName READ filterRoleName WRITE setFilterRoleName NOTIFY
+                   filterRoleNameChanged)
+    Q_PROPERTY(
+        QString filterPattern READ filterPattern WRITE setFilterPattern NOTIFY filterPatternChanged)
+    Q_PROPERTY(PatternSyntax filterPatternSyntax READ filterPatternSyntax WRITE
+                   setFilterPatternSyntax NOTIFY filterPatternSyntaxChanged)
+    Q_PROPERTY(QVariant filterValue READ filterValue WRITE setFilterValue NOTIFY filterValueChanged)
+    Q_PROPERTY(QQmlScriptString filterExpression READ filterExpression WRITE setFilterExpression
+                   NOTIFY filterExpressionChanged)
+
+    Q_PROPERTY(
+        QString sortRoleName READ sortRoleName WRITE setSortRoleName NOTIFY sortRoleNameChanged)
+    Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder)
+    Q_PROPERTY(QQmlScriptString sortExpression READ sortExpression WRITE setSortExpression NOTIFY
+                   sortExpressionChanged)
+
+public:
+    enum PatternSyntax {
+        RegExp = QRegExp::RegExp,
+        Wildcard = QRegExp::Wildcard,
+        FixedString = QRegExp::FixedString,
+        RegExp2 = QRegExp::RegExp2,
+        WildcardUnix = QRegExp::WildcardUnix,
+        W3CXmlSchema11 = QRegExp::W3CXmlSchema11
+    };
+    Q_ENUM(PatternSyntax)
+
+    QQmlSortFilterProxyModel(QObject *parent = 0);
+
+    int count() const;
+
+    const QString &filterRoleName() const;
+    void setFilterRoleName(const QString &filterRoleName);
+
+    QString filterPattern() const;
+    void setFilterPattern(const QString &filterPattern);
+
+    PatternSyntax filterPatternSyntax() const;
+    void setFilterPatternSyntax(PatternSyntax patternSyntax);
+
+    const QVariant &filterValue() const;
+    void setFilterValue(const QVariant &filterValue);
+
+    const QQmlScriptString &filterExpression() const;
+    void setFilterExpression(const QQmlScriptString &filterScriptString);
+
+    const QString &sortRoleName() const;
+    void setSortRoleName(const QString &sortRoleName);
+
+    void setSortOrder(Qt::SortOrder sortOrder);
+
+    const QQmlScriptString &sortExpression() const;
+    void setSortExpression(const QQmlScriptString &compareScriptString);
+
+signals:
+    void countChanged();
+
+    void filterRoleNameChanged();
+    void filterPatternSyntaxChanged();
+    void filterPatternChanged();
+    void filterValueChanged();
+    void filterExpressionChanged();
+
+    void sortRoleNameChanged();
+    void sortExpressionChanged();
+
+protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
+
+private slots:
+    void invalidateFilter();
+    void updateFilterRole();
+    void updateSortRole();
+    void updateRoles();
+
+private:
+    QVariantMap modelDataMap(const QModelIndex &modelIndex) const;
+
+    QString m_filterRoleName;
+    QString m_sortRoleName;
+
+    QQmlScriptString m_filterScriptString;
+    QQmlExpression *m_filterExpression;
+
+    QQmlScriptString m_compareScriptString;
+    QQmlExpression *m_compareExpression;
+    QVariant m_filterValue;
+};
+
+#endif // QQMLSORTFILTERPROXYMODEL_H
diff --git a/prototype_2016/third_party/fluid/core/standardpaths.cpp b/prototype_2016/third_party/fluid/core/standardpaths.cpp
new file mode 100644
index 0000000..ec67683
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/standardpaths.cpp
@@ -0,0 +1,36 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QtCore/QStandardPaths>
+
+#include "standardpaths.h"
+
+StandardPaths::StandardPaths(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QString StandardPaths::locateFile(StandardLocation type, const QString &fileName)
+{
+    QStandardPaths::StandardLocation qtype = static_cast<QStandardPaths::StandardLocation>(type);
+    return QStandardPaths::locate(qtype, fileName);
+}
+
+QString StandardPaths::locateDirectory(StandardLocation type, const QString &dirName)
+{
+    QStandardPaths::StandardLocation qtype = static_cast<QStandardPaths::StandardLocation>(type);
+    return QStandardPaths::locate(qtype, dirName, QStandardPaths::LocateDirectory);
+}
+
+#include "moc_standardpaths.cpp"
diff --git a/prototype_2016/third_party/fluid/core/standardpaths.h b/prototype_2016/third_party/fluid/core/standardpaths.h
new file mode 100644
index 0000000..6f3d0bc
--- /dev/null
+++ b/prototype_2016/third_party/fluid/core/standardpaths.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#ifndef STANDARDPATHS_H
+#define STANDARDPATHS_H
+
+#include <QtCore/QObject>
+
+class StandardPaths : public QObject
+{
+    Q_OBJECT
+public:
+    enum StandardLocation {
+        DesktopLocation,
+        DocumentsLocation,
+        FontsLocation,
+        ApplicationsLocation,
+        MusicLocation,
+        MoviesLocation,
+        PicturesLocation,
+        TempLocation,
+        HomeLocation,
+        DataLocation,
+        CacheLocation,
+        GenericDataLocation,
+        RuntimeLocation,
+        ConfigLocation,
+        DownloadLocation,
+        GenericCacheLocation,
+        GenericConfigLocation
+    };
+    Q_ENUM(StandardLocation)
+
+    StandardPaths(QObject *parent = 0);
+
+    Q_INVOKABLE QString locateFile(StandardLocation type, const QString &fileName);
+    Q_INVOKABLE QString locateDirectory(StandardLocation type, const QString &dirName);
+};
+
+#endif // STANDARDPATHS_H
diff --git a/prototype_2016/third_party/fluid/demo/+material/StyledRectangle.qml b/prototype_2016/third_party/fluid/demo/+material/StyledRectangle.qml
new file mode 100644
index 0000000..7da64ab
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/+material/StyledRectangle.qml
@@ -0,0 +1,22 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls.Material 2.0
+
+Rectangle {
+    color: Material.background
+
+    Material.theme: index == 0 ? Material.Light : Material.Dark
+}
diff --git a/prototype_2016/third_party/fluid/demo/+universal/StyledRectangle.qml b/prototype_2016/third_party/fluid/demo/+universal/StyledRectangle.qml
new file mode 100644
index 0000000..ca1999b
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/+universal/StyledRectangle.qml
@@ -0,0 +1,22 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls.Universal 2.0
+
+Rectangle {
+    color: Universal.background
+
+    Universal.theme: index == 0 ? Universal.Light : Universal.Dark
+}
diff --git a/prototype_2016/third_party/fluid/demo/BasicComponents.qml b/prototype_2016/third_party/fluid/demo/BasicComponents.qml
new file mode 100644
index 0000000..a46f083
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/BasicComponents.qml
@@ -0,0 +1,80 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Basic"
+
+Tab {
+    title: qsTr("Basic")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("Button"); source: "qrc:/Pages/Basic/ButtonPage.qml" }
+                ListElement { title: qsTr("CheckBox"); source: "qrc:/Pages/Basic/CheckBoxPage.qml" }
+                ListElement { title: qsTr("RadioButton"); source: "qrc:/Pages/Basic/RadioButtonPage.qml" }
+                ListElement { title: qsTr("Switch"); source: "qrc:/Pages/Basic/SwitchPage.qml" }
+                ListElement { title: qsTr("ProgressBar"); source: "qrc:/Pages/Basic/ProgressBarPage.qml" }
+                ListElement { title: qsTr("BusyIndicator"); source: "qrc:/Pages/Basic/BusyIndicatorPage.qml" }
+                ListElement { title: qsTr("Slider"); source: "qrc:/Pages/Basic/SliderPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: ButtonPage {}
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/CMakeLists.txt b/prototype_2016/third_party/fluid/demo/CMakeLists.txt
new file mode 100644
index 0000000..a4f9ab6
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(SOURCES main.cpp demo.qrc)
+file(GLOB_RECURSE QML_SOURCES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.qml")
+
+add_executable(fluid-demo ${SOURCES} ${QML_SOURCES})
+target_link_libraries(fluid-demo Qt5::Gui Qt5::Qml Qt5::QuickControls2)
+
+install(TARGETS fluid-demo
+        BUNDLE DESTINATION .
+        RUNTIME DESTINATION ${BIN_INSTALL_DIR})
diff --git a/prototype_2016/third_party/fluid/demo/CompoundComponents.qml b/prototype_2016/third_party/fluid/demo/CompoundComponents.qml
new file mode 100644
index 0000000..2de7bd2
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/CompoundComponents.qml
@@ -0,0 +1,76 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Compound"
+
+Tab {
+    title: qsTr("Compound")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("ListItem"); source: "qrc:/Pages/Compound/ListItemPage.qml" }
+                ListElement { title: qsTr("Card"); source: "qrc:/Pages/Compound/CardPage.qml" }
+                ListElement { title: qsTr("InfoBar"); source: "qrc:/Pages/Compound/InfoBarPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: ListItemPage {}
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/MaterialComponents.qml b/prototype_2016/third_party/fluid/demo/MaterialComponents.qml
new file mode 100644
index 0000000..444b049
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/MaterialComponents.qml
@@ -0,0 +1,74 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Material"
+
+Tab {
+    title: qsTr("Material")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("ActionButton"); source: "qrc:/Pages/Material/ActionButtonPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: ActionButtonPage {}
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/NavigationComponents.qml b/prototype_2016/third_party/fluid/demo/NavigationComponents.qml
new file mode 100644
index 0000000..ce0a2fd
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/NavigationComponents.qml
@@ -0,0 +1,74 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Navigation"
+
+Tab {
+    title: qsTr("Navigation")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("NavigationDrawer"); source: "qrc:/Pages/Navigation/NavDrawerPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: NavDrawerPage {}
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Basic/BusyIndicatorPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Basic/BusyIndicatorPage.qml
new file mode 100644
index 0000000..1a6341e
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Basic/BusyIndicatorPage.qml
@@ -0,0 +1,44 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+
+                BusyIndicator {
+                    anchors.centerIn: parent
+                    running: true
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Basic/ButtonPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Basic/ButtonPage.qml
new file mode 100644
index 0000000..6cf94fe
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Basic/ButtonPage.qml
@@ -0,0 +1,115 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 2
+                    rows: 4
+
+                    // Row 1
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Button {
+                        text: qsTr("Button")
+                    }
+
+                    Button {
+                        text: qsTr("Button")
+                        enabled: false
+                    }
+
+                    // Row 3
+
+                    Button {
+                        text: qsTr("Checked")
+                        checkable: false
+                        checked: true
+                    }
+
+                    Button {
+                        text: qsTr("Checked")
+                        checkable: false
+                        checked: true
+                        enabled: false
+                    }
+
+                    // Row 4
+
+                    Button {
+                        text: qsTr("Flat")
+                        flat: true
+                    }
+
+                    Button {
+                        text: qsTr("Flat")
+                        flat: true
+                        enabled: false
+                    }
+
+                    // Row 5
+
+                    Button {
+                        text: qsTr("Highlighted")
+                        highlighted: true
+                    }
+
+                    Button {
+                        text: qsTr("Highlighted")
+                        highlighted: true
+                        enabled: false
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Basic/CheckBoxPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Basic/CheckBoxPage.qml
new file mode 100644
index 0000000..6e53e73
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Basic/CheckBoxPage.qml
@@ -0,0 +1,101 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+                    rows: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("On")
+                    }
+
+                    CheckBox {
+                        checked: true
+                        text: qsTr("CheckBox")
+                    }
+
+                    CheckBox {
+                        checked: true
+                        enabled: false
+                        text: qsTr("CheckBox")
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Off")
+                    }
+
+                    CheckBox {
+                        text: qsTr("CheckBox")
+                    }
+
+                    CheckBox {
+                        text: qsTr("CheckBox")
+                        enabled: false
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Basic/ProgressBarPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Basic/ProgressBarPage.qml
new file mode 100644
index 0000000..440db51
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Basic/ProgressBarPage.qml
@@ -0,0 +1,127 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Determinate")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Indeterminate")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("Static")
+                    }
+
+                    ProgressBar {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        indeterminate: false
+                    }
+
+                    ProgressBar {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        indeterminate: true
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Animated")
+                    }
+
+                    ProgressBar {
+                        from: 0.0
+                        to: 1.0
+                        indeterminate: false
+
+                        SequentialAnimation on value {
+                            running: true
+                            loops: NumberAnimation.Infinite
+
+                            NumberAnimation {
+                                from: 0.0
+                                to: 1.0
+                                duration: 3000
+                            }
+                        }
+                    }
+
+                    ProgressBar {
+                        from: 0.0
+                        to: 1.0
+                        indeterminate: true
+
+                        SequentialAnimation on value {
+                            running: true
+                            loops: NumberAnimation.Infinite
+
+                            NumberAnimation {
+                                from: 0.0
+                                to: 1.0
+                                duration: 3000
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Basic/RadioButtonPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Basic/RadioButtonPage.qml
new file mode 100644
index 0000000..80c98d5
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Basic/RadioButtonPage.qml
@@ -0,0 +1,100 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+                    rows: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("On")
+                    }
+
+                    RadioButton {
+                        checked: true
+                        text: qsTr("RadioButton")
+                    }
+
+                    RadioButton {
+                        checked: true
+                        enabled: false
+                        text: qsTr("RadioButton")
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Off")
+                    }
+
+                    RadioButton {
+                        text: qsTr("RadioButton")
+                    }
+
+                    RadioButton {
+                        text: qsTr("RadioButton")
+                        enabled: false
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Basic/SliderPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Basic/SliderPage.qml
new file mode 100644
index 0000000..72d9c11
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Basic/SliderPage.qml
@@ -0,0 +1,152 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+                    rows: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("Horizontal / Single")
+                    }
+
+                    Slider {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                    }
+
+                    Slider {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        enabled: false
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Horizontal / Range")
+                    }
+
+                    RangeSlider {
+                        from: 0.0
+                        to: 1.0
+                        first.value: 0.4
+                        second.value: 0.6
+                    }
+
+                    RangeSlider {
+                        from: 0.0
+                        to: 1.0
+                        first.value: 0.4
+                        second.value: 0.6
+                        enabled: false
+                    }
+
+                    // Row 4
+
+                    Label {
+                        text: qsTr("Vertical / Single")
+                    }
+
+                    Slider {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        orientation: Qt.Vertical
+                    }
+
+                    Slider {
+                        from: 0.0
+                        to: 1.0
+                        value: 0.5
+                        enabled: false
+                        orientation: Qt.Vertical
+                    }
+
+                    // Row 5
+
+                    Label {
+                        text: qsTr("Vertical / Range")
+                    }
+
+                    RangeSlider {
+                        from: 0.0
+                        to: 1.0
+                        first.value: 0.4
+                        second.value: 0.6
+                        orientation: Qt.Vertical
+                    }
+
+                    RangeSlider {
+                        from: 0.0
+                        to: 1.0
+                        first.value: 0.4
+                        second.value: 0.6
+                        enabled: false
+                        orientation: Qt.Vertical
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Basic/SwitchPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Basic/SwitchPage.qml
new file mode 100644
index 0000000..15c679b
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Basic/SwitchPage.qml
@@ -0,0 +1,100 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.minimumWidth: grid.width + 80
+                Layout.minimumHeight: grid.height + 80
+
+                GridLayout {
+                    id: grid
+                    anchors.centerIn: parent
+                    columns: 3
+                    rows: 3
+
+                    // Row 1
+
+                    Item {
+                        width: 1
+                        height: 1
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Enabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    TitleLabel {
+                        text: qsTr("Disabled")
+
+                        Layout.alignment: Qt.AlignHCenter
+                    }
+
+                    // Row 2
+
+                    Label {
+                        text: qsTr("On")
+                    }
+
+                    Switch {
+                        checked: true
+                        text: qsTr("Switch")
+                    }
+
+                    Switch {
+                        checked: true
+                        enabled: false
+                        text: qsTr("Switch")
+                    }
+
+                    // Row 3
+
+                    Label {
+                        text: qsTr("Off")
+                    }
+
+                    Switch {
+                        text: qsTr("Switch")
+                    }
+
+                    Switch {
+                        text: qsTr("Switch")
+                        enabled: false
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Compound/CardPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Compound/CardPage.qml
new file mode 100644
index 0000000..ec33a3e
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Compound/CardPage.qml
@@ -0,0 +1,76 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+
+Item {
+    Card {
+        id: card
+        anchors.centerIn: parent
+        width: 400
+        height: 400
+
+        Image {
+            id: picture
+            anchors {
+                left: parent.left
+                top: parent.top
+                right: parent.right
+            }
+            height: 200
+            source: "https://www.nps.gov/yose/planyourvisit/images/glacier-point-people-960web.jpg"
+        }
+
+        Column {
+            id: column
+            anchors {
+                left: parent.left
+                top: picture.bottom
+                right: parent.right
+                margins: Units.smallSpacing * 2
+            }
+            spacing: Units.smallSpacing * 2
+
+            TitleLabel {
+                text: qsTr("Yosemite National Park")
+            }
+
+            BodyLabel {
+                text: qsTr("First protected in 1864, Yosemite National Park " +
+                           "is best known for its waterfalls, but within its " +
+                           "nearly 1,200 square miles, you can find deep " +
+                           "valleys, grand meadows, ancient giant sequoias, " +
+                           "a vast wilderness area, and much more.")
+                wrapMode: Text.WordWrap
+                width: parent.width
+            }
+
+            Row {
+                spacing: Units.smallSpacing
+
+                Button {
+                    text: qsTr("Share")
+                    flat: true
+                }
+
+                Button {
+                    text: qsTr("Explore")
+                    flat: true
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Compound/InfoBarPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Compound/InfoBarPage.qml
new file mode 100644
index 0000000..1830e39
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Compound/InfoBarPage.qml
@@ -0,0 +1,30 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+
+Item {
+    Button {
+        anchors.centerIn: parent
+        text: qsTr("Open")
+        onClicked: infoBar.open(qsTr("Message sent"))
+    }
+
+    InfoBar {
+        id: infoBar
+        buttonText: qsTr("OK")
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Compound/ListItemPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Compound/ListItemPage.qml
new file mode 100644
index 0000000..f86f81b
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Compound/ListItemPage.qml
@@ -0,0 +1,40 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+import "../.."
+
+Page {
+    ListView {
+        anchors.fill: parent
+        model: ListModel {
+            ListElement { title: "List Item 1"; source: "qrc:/Pages/Compound/SubPage.qml" }
+            ListElement { title: "List Item 2"; source: "qrc:/Pages/Compound/SubPage.qml" }
+            ListElement { title: "List Item 3"; source: "qrc:/Pages/Compound/SubPage.qml" }
+            ListElement { title: "List Item 4"; source: "qrc:/Pages/Compound/SubPage.qml" }
+            ListElement { title: "List Item 5"; source: "qrc:/Pages/Compound/SubPage.qml" }
+        }
+        header: Subheader {
+            text: "Header"
+        }
+        delegate: ListItem {
+            text: model.title
+            onClicked: pageStack.push(model.source)
+        }
+
+        ScrollIndicator.vertical: ScrollIndicator {}
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Compound/SubPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Compound/SubPage.qml
new file mode 100644
index 0000000..8a86a28
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Compound/SubPage.qml
@@ -0,0 +1,31 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+
+Page {
+    title: "Sub page demo"
+
+    actions: [
+        Action {
+            iconName: "action/settings"
+        }
+    ]
+
+    Label {
+        anchors.centerIn: parent
+        text: "Testing"
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Material/ActionButtonPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Material/ActionButtonPage.qml
new file mode 100644
index 0000000..1fcf516
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Material/ActionButtonPage.qml
@@ -0,0 +1,68 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Material 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    Column {
+        id: layout
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+
+            StyledRectangle {
+                //y: height * index
+                width: parent.width
+                height: parent.height / 2
+
+                Column {
+                    anchors.centerIn: parent
+
+                    ActionButton {
+                        iconName: "device/airplanemode_active"
+                    }
+
+                    ActionButton {
+                        iconName: "navigation/check"
+
+                        Material.elevation: 1
+                    }
+
+                    ActionButton {
+                        iconName: "device/airplanemode_active"
+
+                        Material.background: Material.primaryColor
+                    }
+
+                    ActionButton {
+                        iconName: "navigation/check"
+
+                        Material.elevation: 1
+                        Material.background: Material.primaryColor
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Material/WavePage.qml b/prototype_2016/third_party/fluid/demo/Pages/Material/WavePage.qml
new file mode 100644
index 0000000..58cae01
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Material/WavePage.qml
@@ -0,0 +1,41 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Controls 1.0
+import Fluid.Material 1.0
+import "../.."
+
+Item {
+    Wave {
+        id: wave
+        initialX: parent.width - size
+        initialY: parent.height - size
+        size: 48
+        color: Material.accentColor
+    }
+
+    Button {
+        anchors.centerIn: parent
+        text: qsTr("Toggle")
+        onClicked: {
+            if (wave.opened)
+                wave.close(parent.width - wave.size, parent.height - wave.size)
+            else
+                wave.open(0, 0)
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Navigation/NavDrawerPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Navigation/NavDrawerPage.qml
new file mode 100644
index 0000000..4c7dd21
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Navigation/NavDrawerPage.qml
@@ -0,0 +1,26 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+import "../.."
+
+Item {
+    Button {
+        anchors.centerIn: parent
+        text: qsTr("Open")
+        onClicked: navDrawer.open()
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Style/PalettePage.qml b/prototype_2016/third_party/fluid/demo/Pages/Style/PalettePage.qml
new file mode 100644
index 0000000..bc34dab
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Style/PalettePage.qml
@@ -0,0 +1,135 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Layouts 1.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(grid.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    property color whiteColor: Qt.rgba(255, 255, 255, 1)
+    property color blackColor: Qt.rgba(0, 0, 0, 1)
+
+    GridLayout {
+        id: grid
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+            topMargin: Units.largeSpacing
+        }
+
+        width: parent.width * 0.8
+
+        columns: width / 300
+        rowSpacing: Units.smallSpacing
+        columnSpacing: Units.smallSpacing
+
+        Repeater {
+            model: ListModel {
+                ListElement {
+                    paletteIndex: Material.Red
+                    name: "Red"
+                }
+                ListElement {
+                    paletteIndex: Material.Pink
+                    name: "Pink"
+                }
+                ListElement {
+                    paletteIndex: Material.Purple
+                    name: "Purple"
+                }
+                ListElement {
+                    paletteIndex: Material.DeepPurple
+                    name: "DeepPurple"
+                }
+                ListElement {
+                    paletteIndex: Material.Indigo
+                    name: "Indigo"
+                }
+                ListElement {
+                    paletteIndex: Material.Blue
+                    name: "Blue"
+                }
+                ListElement {
+                    paletteIndex: Material.LightBlue
+                    name: "LightBlue"
+                }
+                ListElement {
+                    paletteIndex: Material.Cyan
+                    name: "Cyan"
+                }
+                ListElement {
+                    paletteIndex: Material.Teal
+                    name: "Teal"
+                }
+                ListElement {
+                    paletteIndex: Material.Green
+                    name: "Green"
+                }
+                ListElement {
+                    paletteIndex: Material.LightGreen
+                    name: "LightGreen"
+                }
+                ListElement {
+                    paletteIndex: Material.Lime
+                    name: "Lime"
+                }
+                ListElement {
+                    paletteIndex: Material.Yellow
+                    name: "Yellow"
+                }
+                ListElement {
+                    paletteIndex: Material.Amber
+                    name: "Amber"
+                }
+                ListElement {
+                    paletteIndex: Material.Orange
+                    name: "Orange"
+                }
+                ListElement {
+                    paletteIndex: Material.DeepOrange
+                    name: "DeepOrange"
+                }
+                ListElement {
+                    paletteIndex: Material.Grey
+                    name: "Grey"
+                }
+                ListElement {
+                    paletteIndex: Material.BlueGrey
+                    name: "BlueGrey"
+                }
+                ListElement {
+                    paletteIndex: Material.Brown
+                    name: "Brown"
+                }
+            }
+
+            PaletteSwatch {
+                paletteIndex: model.paletteIndex
+                paletteName: model.name
+                paletteColor: Material.color(model.paletteIndex, Material.Shade500)
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Style/PaletteSwatch.qml b/prototype_2016/third_party/fluid/demo/Pages/Style/PaletteSwatch.qml
new file mode 100644
index 0000000..ac5c9b3
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Style/PaletteSwatch.qml
@@ -0,0 +1,173 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+import "../.."
+
+Column {
+    id: mainLayout
+
+    property int paletteIndex
+    property string paletteName
+    property color paletteColor
+
+    spacing: 0
+
+    Rectangle {
+        width: 300
+        height: 80
+        color: paletteColor
+
+        Label {
+            anchors {
+                top: parent.top
+                left: parent.left
+                margins: Units.smallSpacing * 2
+            }
+            font.bold: true
+            color: Utils.lightDark(parent.color, blackColor, whiteColor)
+            text: paletteName
+        }
+    }
+
+    Column {
+        spacing: 0
+
+        Repeater {
+            model: ListModel {
+                ListElement {
+                    shadeIndex: Material.Shade100
+                    name: "100"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade200
+                    name: "200"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade300
+                    name: "300"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade400
+                    name: "400"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade500
+                    name: "500"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade600
+                    name: "600"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade700
+                    name: "700"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade800
+                    name: "800"
+                }
+                ListElement {
+                    shadeIndex: Material.Shade900
+                    name: "900"
+                }
+            }
+
+            Rectangle {
+                width: 300
+                height: 40
+                color: Material.color(paletteIndex, model.shadeIndex)
+
+                Label {
+                    anchors {
+                        left: parent.left
+                        verticalCenter: parent.verticalCenter
+                        margins: Units.smallSpacing * 2
+                    }
+                    font.bold: true
+                    color: Utils.lightDark(parent.color, blackColor, whiteColor)
+                    text: model.name
+                }
+
+                Label {
+                    anchors {
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                        margins: Units.smallSpacing * 2
+                    }
+                    font.bold: true
+                    color: Utils.lightDark(parent.color, blackColor, whiteColor)
+                    text: parent.color
+                }
+            }
+        }
+    }
+
+    Column {
+        spacing: 0
+
+        Repeater {
+            model: ListModel {
+                ListElement {
+                    shadeIndex: Material.ShadeA100
+                    name: "A100"
+                }
+                ListElement {
+                    shadeIndex: Material.ShadeA200
+                    name: "A200"
+                }
+                ListElement {
+                    shadeIndex: Material.ShadeA400
+                    name: "A400"
+                }
+                ListElement {
+                    shadeIndex: Material.ShadeA700
+                    name: "A700"
+                }
+            }
+
+            Rectangle {
+                width: 300
+                height: 40
+                color: Material.color(paletteIndex, model.shadeIndex)
+
+                Label {
+                    anchors {
+                        left: parent.left
+                        verticalCenter: parent.verticalCenter
+                        margins: Units.smallSpacing * 2
+                    }
+                    font.bold: true
+                    color: Utils.lightDark(parent.color, blackColor, whiteColor)
+                    text: model.name
+                }
+
+                Label {
+                    anchors {
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                        margins: Units.smallSpacing * 2
+                    }
+                    font.bold: true
+                    color: Utils.lightDark(parent.color, blackColor, whiteColor)
+                    text: parent.color
+                }
+            }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Pages/Style/TypographyPage.qml b/prototype_2016/third_party/fluid/demo/Pages/Style/TypographyPage.qml
new file mode 100644
index 0000000..d87d00c
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Pages/Style/TypographyPage.qml
@@ -0,0 +1,87 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.0
+import QtQuick.Controls 2.0
+import Fluid.Controls 1.0
+import "../.."
+
+Flickable {
+    clip: true
+    contentHeight: Math.max(layout.implicitHeight, height)
+
+    ScrollBar.vertical: ScrollBar {}
+
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
+        anchors.margins: Units.mediumSpacing
+        spacing: Units.smallSpacing
+
+        DisplayLabel {
+            level: 4
+            text: "Display 4"
+        }
+
+        DisplayLabel {
+            level: 3
+            text: "Display 3"
+        }
+
+        DisplayLabel {
+            level: 2
+            text: "Display 2"
+        }
+
+        DisplayLabel {
+            level: 1
+            text: "Display 1"
+        }
+
+        HeadlineLabel {
+            text: "Headline"
+        }
+
+        TitleLabel {
+            text: "Title"
+        }
+
+        SubheadingLabel {
+            text: "Subheading"
+        }
+
+        BodyLabel {
+            level: 2
+            text: "Body 2"
+        }
+
+        BodyLabel {
+            level: 1
+            text: "Body 1"
+        }
+
+        CaptionLabel {
+            text: "Caption"
+        }
+
+        Label {
+            text: "Label"
+        }
+
+        Item {
+            Layout.fillHeight: true
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/Style.qml b/prototype_2016/third_party/fluid/demo/Style.qml
new file mode 100644
index 0000000..9f997bd
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/Style.qml
@@ -0,0 +1,75 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import Fluid.Controls 1.0
+import "Pages/Style"
+
+Tab {
+    title: qsTr("Style")
+
+    Pane {
+        id: listPane
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: 200
+        padding: 0
+        z: 2
+
+        Material.background: "white"
+        Material.elevation: 1
+
+        Universal.background: Universal.accent
+
+        ListView {
+            id: listView
+            anchors.fill: parent
+            currentIndex: 0
+            model: ListModel {
+                ListElement { title: qsTr("Palette"); source: "qrc:/Pages/Style/PalettePage.qml" }
+                ListElement { title: qsTr("Typography"); source: "qrc:/Pages/Style/TypographyPage.qml" }
+            }
+            header: Subheader {
+                text: qsTr("Demos")
+            }
+            delegate: ListItem {
+                text: model.title
+                highlighted: ListView.isCurrentItem
+                onClicked: {
+                    listView.currentIndex = index
+                    stackView.push(model.source)
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+    }
+
+    StackView {
+        id: stackView
+        anchors {
+            left: listPane.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        initialItem: PalettePage {}
+    }
+}
diff --git a/prototype_2016/third_party/fluid/demo/StyledRectangle.qml b/prototype_2016/third_party/fluid/demo/StyledRectangle.qml
new file mode 100644
index 0000000..3af12dd
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/StyledRectangle.qml
@@ -0,0 +1,21 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+Rectangle {
+    // Default styled rectangle is red to spot errors
+    // related to how styles are loaded
+    color: "red"
+}
diff --git a/prototype_2016/third_party/fluid/demo/demo.pro b/prototype_2016/third_party/fluid/demo/demo.pro
new file mode 100644
index 0000000..7f6c2ba
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/demo.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += qml quick quickcontrols2
+CONFIG += c++11
+
+SOURCES += main.cpp
+RESOURCES += demo.qrc
+
+include(../fluid.pri)
diff --git a/prototype_2016/third_party/fluid/demo/demo.qrc b/prototype_2016/third_party/fluid/demo/demo.qrc
new file mode 100644
index 0000000..b447c47
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/demo.qrc
@@ -0,0 +1,30 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+        <file>BasicComponents.qml</file>
+        <file>CompoundComponents.qml</file>
+        <file>MaterialComponents.qml</file>
+        <file>NavigationComponents.qml</file>
+        <file>Style.qml</file>
+        <file>StyledRectangle.qml</file>
+        <file>+material/StyledRectangle.qml</file>
+        <file>+universal/StyledRectangle.qml</file>
+        <file>Pages/Basic/BusyIndicatorPage.qml</file>
+        <file>Pages/Basic/ButtonPage.qml</file>
+        <file>Pages/Basic/CheckBoxPage.qml</file>
+        <file>Pages/Basic/ProgressBarPage.qml</file>
+        <file>Pages/Basic/RadioButtonPage.qml</file>
+        <file>Pages/Basic/SliderPage.qml</file>
+        <file>Pages/Basic/SwitchPage.qml</file>
+        <file>Pages/Compound/ListItemPage.qml</file>
+        <file>Pages/Compound/SubPage.qml</file>
+        <file>Pages/Compound/CardPage.qml</file>
+        <file>Pages/Compound/InfoBarPage.qml</file>
+        <file>Pages/Style/PalettePage.qml</file>
+        <file>Pages/Style/PaletteSwatch.qml</file>
+        <file>Pages/Style/TypographyPage.qml</file>
+        <file>Pages/Material/ActionButtonPage.qml</file>
+        <file>Pages/Material/WavePage.qml</file>
+        <file>Pages/Navigation/NavDrawerPage.qml</file>
+    </qresource>
+</RCC>
diff --git a/prototype_2016/third_party/fluid/demo/main.cpp b/prototype_2016/third_party/fluid/demo/main.cpp
new file mode 100644
index 0000000..055d695
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/main.cpp
@@ -0,0 +1,37 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+#include <QQuickStyle>
+#include <QQmlContext>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
+    QGuiApplication app(argc, argv);
+
+    if (QQuickStyle::name().isEmpty())
+        QQuickStyle::setStyle("Material");
+
+    QQmlApplicationEngine engine;
+#ifdef FLUID_LOCAL
+    engine.addImportPath(QStringLiteral("qrc:/"));
+#endif
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+
+    return app.exec();
+}
diff --git a/prototype_2016/third_party/fluid/demo/main.qml b/prototype_2016/third_party/fluid/demo/main.qml
new file mode 100644
index 0000000..37b0077
--- /dev/null
+++ b/prototype_2016/third_party/fluid/demo/main.qml
@@ -0,0 +1,104 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
+import QtQuick.Layouts 1.3
+import Fluid.Controls 1.0
+
+FluidWindow {
+    id: window
+
+    visible: true
+
+    width: 1024
+    height: 800
+
+    title: qsTr("Fluid Demo")
+
+    Material.primary: Material.LightBlue
+    Material.accent: Material.Blue
+
+    Universal.accent: Universal.Cobalt
+
+    NavigationDrawer {
+        id: navDrawer
+
+        //width: Math.min(window.width, window.height) / 3 * 2
+        height: window.height
+
+        topContent: [
+            Rectangle {
+                color: Material.primary
+                height: 48
+
+                Label {
+                    anchors.centerIn: parent
+                    text: qsTr("Top Content")
+                }
+
+                Layout.fillWidth: true
+            }
+        ]
+
+        actions: [
+            Action {
+                text: qsTr("Action 1")
+                iconName: "action/info"
+                onTriggered: console.log("action1 triggered")
+            },
+            Action {
+                text: qsTr("Action 2")
+                iconName: "action/info"
+                onTriggered: console.log("action2 triggered")
+            },
+            Action {
+                text: qsTr("Action 3")
+                iconName: "action/info"
+                onTriggered: console.log("action3 triggered")
+            }
+        ]
+    }
+
+    initialPage: TabbedPage {
+        title: window.title
+
+        actions: [
+            Action {
+                text: qsTr("Dummy error")
+                iconName: "alert/warning"
+                onTriggered: console.log("Dummy error")
+            },
+            Action {
+                text: qsTr("Colors")
+                iconName: "image/color_lens"
+                onTriggered: console.log("Colors")
+            },
+            Action {
+                text: qsTr("Settings")
+                iconName: "action/settings"
+                onTriggered: console.log("Settings clicked")
+            }
+        ]
+
+        BasicComponents {}
+        CompoundComponents {}
+        MaterialComponents {}
+        NavigationComponents {}
+        Style {}
+    }
+}
diff --git a/prototype_2016/third_party/fluid/doc/defaults.qdocconf b/prototype_2016/third_party/fluid/doc/defaults.qdocconf
new file mode 100644
index 0000000..39c8491
--- /dev/null
+++ b/prototype_2016/third_party/fluid/doc/defaults.qdocconf
@@ -0,0 +1,23 @@
+include($QT_INSTALL_DOCS/global/macros.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf)
+include($QT_INSTALL_DOCS/global/compat.qdocconf)
+include($QT_INSTALL_DOCS/global/fileextensions.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
+include(html-footer-offline.qdocconf)
+
+outputdir = $FLUID_BUILD_DIR/doc/html
+
+dist.metadata.default.author = Fluid
+dist.metadata.default.permissions = all
+dist.metadata.default.publisher = Fluid
+dist.metadata.default.copyryear = 2016
+dist.metadata.default.copyrholder = Fluid
+dist.metadata.default.audience = programmer
+
+navigation.homepage = "Fluid $FLUID_VERSION"
+
+#sourcedirs += includes
+
+url = http://doc.liri.io/sdk
+
+buildversion = "Fluid $FLUID_VERSION Reference Documentation"
diff --git a/prototype_2016/third_party/fluid/doc/fluid.qdocconf b/prototype_2016/third_party/fluid/doc/fluid.qdocconf
new file mode 100644
index 0000000..1fee46d
--- /dev/null
+++ b/prototype_2016/third_party/fluid/doc/fluid.qdocconf
@@ -0,0 +1,59 @@
+include(defaults.qdocconf)
+
+project                 = Fluid
+description             = Fluid Reference Documentation
+version                 = $FLUID_VERSION
+
+qhp.projects            = Fluid
+
+qhp.Fluid.file          = fluid.qhp
+qhp.Fluid.namespace     = io.liri.fluid.$FLUID_VERSION_TAG
+qhp.Fluid.virtualFolder = fluid
+qhp.Fluid.indexTitle    = Fluid $FLUID_VERSION Reference Documentation
+qhp.Fluid.indexRoot     =
+
+qhp.Fluid.filterAttributes                  = fluid $FLUID_VERSION qtrefdoc
+qhp.Fluid.customFilters.Qt.name             = Fluid $FLUID_VERSION
+qhp.Fluid.customFilters.Qt.filterAttributes = fluid $FLUID_VERSION
+
+qhp.Fluid.subprojects = fluidcore fluidcontrols fluideffects fluidmaterial
+qhp.Fluid.subproject.fluidcore.title = Fluid Core
+qhp.Fluid.subproject.fluidcore.indexTitle = Fluid Core QML Types
+qhp.Fluid.subprojects.fluidcore.selectors = qmlclass
+qhp.Fluid.subprojects.fluidcore.sortPages = true
+qhp.Fluid.subproject.fluidcontrols.title = Fluid Controls
+qhp.Fluid.subproject.fluidcontrols.indexTitle = Fluid Controls QML Types
+qhp.Fluid.subprojects.fluidcontrols.selectors = qmlclass
+qhp.Fluid.subprojects.fluidcontrols.sortPages = true
+qhp.Fluid.subproject.fluideffects.title = Fluid Controls
+qhp.Fluid.subproject.fluideffects.indexTitle = Fluid Effects QML Types
+qhp.Fluid.subprojects.fluideffects.selectors = qmlclass
+qhp.Fluid.subprojects.fluideffects.sortPages = true
+qhp.Fluid.subproject.fluidmaterial.title = Fluid Controls
+qhp.Fluid.subproject.fluidmaterial.indexTitle = Fluid Controls QML Types
+qhp.Fluid.subprojects.fluidmaterial.selectors = qmlclass
+qhp.Fluid.subprojects.fluidmaterial.sortPages = true
+
+indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index
+indexes += $QT_INSTALL_DOCS/qtgui/qtgui.index
+indexes += $QT_INSTALL_DOCS/qtqml/qtqml.index
+indexes += $QT_INSTALL_DOCS/qtquick/qtquick.index
+indexes += $QT_INSTALL_DOCS/qtquickcontrols2/qtquickcontrols2.index
+
+depends += qtcore qtgui qtqml qtquick qtquickcontrols2
+
+# Specify the install path under QT_INSTALL_EXAMPLES
+# Note: paths passed to \example command must contain the parent directory, e.g.
+# \example controls/tabs
+#exampledirs += snippets
+
+#examplesinstallpath = fluid
+
+sourcedirs += ../core ../controls ../effects ../material src
+
+headerdirs += ../core ../controls ../effects ../material src
+
+imagedirs += images
+
+navigation.landingpage  = "Fluid"
+navigation.homepage = "Fluid Documentation"
diff --git a/prototype_2016/third_party/fluid/doc/html-footer-offline.qdocconf b/prototype_2016/third_party/fluid/doc/html-footer-offline.qdocconf
new file mode 100644
index 0000000..26f4557
--- /dev/null
+++ b/prototype_2016/third_party/fluid/doc/html-footer-offline.qdocconf
@@ -0,0 +1,18 @@
+HTML.footer = \
+    "        </div>\n" \
+    "       </div>\n" \
+    "   </div>\n" \
+    "   </div>\n" \
+    "</div>\n" \
+    "<div class=\"footer\">\n" \
+    "   <p>\n" \
+    "   <acronym title=\"Copyright\">&copy;</acronym> 2016 Liri.\n" \
+    "   Documentation contributions included herein are the copyrights of\n" \
+    "   their respective owners.<br>" \
+    "   The documentation provided herein is licensed under the terms of the" \
+    "   <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \
+    "   License version 1.3</a> as published by the Free Software Foundation.<br>" \
+    "   Qt and respective logos are trademarks of The Qt Company Ltd. " \
+    "   in Finland and/or other countries worldwide. All other trademarks are property\n" \
+    "   of their respective owners. </p>\n" \
+    "</div>\n" \
diff --git a/prototype_2016/third_party/fluid/doc/src/fluidcontrols.qdoc b/prototype_2016/third_party/fluid/doc/src/fluidcontrols.qdoc
new file mode 100644
index 0000000..cde0ed5
--- /dev/null
+++ b/prototype_2016/third_party/fluid/doc/src/fluidcontrols.qdoc
@@ -0,0 +1,25 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+/*!
+    \qmlmodule Fluid.Controls 1.0
+    \title Fluid Controls QML Types
+    \ingroup fluidcontrols
+
+    \brief Provides additional controls to extend Qt Quick Controls 2.
+
+    \section1 References
+
+    Fluid Controls extends \l[QtQuickControls2]{Qt Quick Controls 2}.
+*/
diff --git a/prototype_2016/third_party/fluid/doc/src/fluidcore.qdoc b/prototype_2016/third_party/fluid/doc/src/fluidcore.qdoc
new file mode 100644
index 0000000..82294bd
--- /dev/null
+++ b/prototype_2016/third_party/fluid/doc/src/fluidcore.qdoc
@@ -0,0 +1,30 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+/*!
+    \qmlmodule Fluid.Core 1.0
+    \title Fluid Core QML Types
+    \ingroup fluidcore
+
+    \brief Provides basic QML types for Qt applications.
+
+    Basic QML types for Qt applications.
+
+    The Fluid Core QML Types can be imported into your application
+    using the following import statement:
+
+    \code
+    import Fluid.Core 1.0
+    \endcode
+*/
diff --git a/prototype_2016/third_party/fluid/doc/src/fluideffects.qdoc b/prototype_2016/third_party/fluid/doc/src/fluideffects.qdoc
new file mode 100644
index 0000000..751be11
--- /dev/null
+++ b/prototype_2016/third_party/fluid/doc/src/fluideffects.qdoc
@@ -0,0 +1,21 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+/*!
+    \qmlmodule Fluid.Effects 1.0
+    \title Fluid Effects QML Types
+    \ingroup fluideffects
+
+    \brief Provides effects for Qt applications.
+*/
diff --git a/prototype_2016/third_party/fluid/doc/src/fluidmaterial.qdoc b/prototype_2016/third_party/fluid/doc/src/fluidmaterial.qdoc
new file mode 100644
index 0000000..4423b7b
--- /dev/null
+++ b/prototype_2016/third_party/fluid/doc/src/fluidmaterial.qdoc
@@ -0,0 +1,21 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+/*!
+    \qmlmodule Fluid.Material 1.0
+    \title Fluid Material QML Types
+    \ingroup fluidmaterial
+
+    \brief Provides QML types specific to Material Design.
+*/
diff --git a/prototype_2016/third_party/fluid/doc/src/index.qdoc b/prototype_2016/third_party/fluid/doc/src/index.qdoc
new file mode 100644
index 0000000..0d87196
--- /dev/null
+++ b/prototype_2016/third_party/fluid/doc/src/index.qdoc
@@ -0,0 +1,31 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+/*!
+    \page index.html
+    \keyword Fluid Reference Documentation
+
+    A collection of cross-platform QtQuick components for building fluid and dynamic applications.
+
+    \section1 QML Modules
+
+    Fluid is comprised of several QML modules.
+
+    \list
+    \li \l[FluidCore]{Fluid Core QML Types}
+    \li \l[FluidControls]{Fluid Controls QML Types}
+    \li \l[FluidEffects]{Fluid Effects QML Types}
+    \li \l[FluidMaterial]{Fluid Material QML Types}
+    \endlist
+*/
diff --git a/prototype_2016/third_party/fluid/effects/BoxShadow.qml b/prototype_2016/third_party/fluid/effects/BoxShadow.qml
new file mode 100644
index 0000000..2fb3616
--- /dev/null
+++ b/prototype_2016/third_party/fluid/effects/BoxShadow.qml
@@ -0,0 +1,53 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+
+/*!
+  \qmltype BoxShadow
+  \inqmlmodule Fluid.Effects
+  \ingroup fluideffects
+
+  \brief A implementation of CSS's box-shadow.
+
+  A implementation of CSS's box-shadow, used by ElevationEffect for a Material Design
+  elevation shadow effect.
+*/
+RectangularGlow {
+    // The 4 properties from CSS box-shadow, plus the inherited color property
+    property int offsetX
+    property int offsetY
+    property int blurRadius
+    property int spreadRadius
+
+    // The source item the shadow is being applied to, used for correctly
+    // calculating the corner radius
+    property Item source
+
+    property bool fullWidth
+    property bool fullHeight
+
+    x: (parent.width - width)/2 + offsetX
+    y: (parent.height - height)/2 + offsetY
+
+    implicitWidth: source ? source.width : parent.width
+    implicitHeight: source ? source.height : parent.height
+
+    width: implicitWidth + 2 * spreadRadius + (fullWidth ? 2 * cornerRadius : 0)
+    height: implicitHeight + 2 * spreadRadius + (fullHeight ? 2 * cornerRadius : 0)
+    glowRadius: blurRadius/2
+    spread: 0.05
+    cornerRadius: blurRadius + (source && source.radius || 0)
+}
diff --git a/prototype_2016/third_party/fluid/effects/CMakeLists.txt b/prototype_2016/third_party/fluid/effects/CMakeLists.txt
new file mode 100644
index 0000000..86ab09d
--- /dev/null
+++ b/prototype_2016/third_party/fluid/effects/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(FILES
+    plugins.qmltypes
+    qmldir
+    BoxShadow.qml
+    CircleMask.qml
+    Vignette.qml
+)
+
+install(FILES ${FILES}
+        DESTINATION ${QML_INSTALL_DIR}/Fluid/Effects)
diff --git a/prototype_2016/third_party/qml-material/src/extras/CircleMask.qml b/prototype_2016/third_party/fluid/effects/CircleMask.qml
index cd92028..0a70c44 100644
--- a/prototype_2016/third_party/qml-material/src/extras/CircleMask.qml
+++ b/prototype_2016/third_party/fluid/effects/CircleMask.qml
@@ -1,16 +1,28 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
- * Copyright (C) 2015-2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
  *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
 import QtQuick 2.4
 import QtGraphicalEffects 1.0
 
+/*!
+  \qmltype CircleMask
+  \inqmlmodule Fluid.Effects
+  \ingroup fluideffects
+
+  \brief Circular mask.
+*/
 Item {
     id: item
 
@@ -18,7 +30,9 @@ Item {
 
     Rectangle {
         id: circleMask
-        anchors.fill: parent
+
+        width: parent.width
+        height: parent.height
 
         smooth: true
         visible: false
@@ -29,7 +43,9 @@ Item {
     OpacityMask {
         id: mask
 
-        anchors.fill: parent
+        width: parent.width
+        height: parent.height
+
         maskSource: circleMask
     }
 }
diff --git a/prototype_2016/third_party/fluid/effects/Vignette.qml b/prototype_2016/third_party/fluid/effects/Vignette.qml
new file mode 100644
index 0000000..2258190
--- /dev/null
+++ b/prototype_2016/third_party/fluid/effects/Vignette.qml
@@ -0,0 +1,77 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+
+/*!
+  \qmltype Vignette
+  \inqmlmodule Fluid.Effects
+  \ingroup fluideffects
+
+  \brief Vignette effect.
+*/
+Item {
+    id: root
+
+    /*!
+        This property defines the source item that is going to be used as source
+        for the generated effect.
+    */
+    property variant source
+
+    /*!
+        This property defines the vignette radius.
+    */
+    property alias radius: effect.radius
+
+    /*!
+        This property defines how much brightness will be used.
+    */
+    property alias brightness: effect.brightness
+
+    ShaderEffect {
+        id: effect
+        anchors.fill: parent
+
+        property variant source: ShaderEffectSource {
+            sourceItem: root.source
+            sourceRect: Qt.rect(0, 0, 0, 0)
+            hideSource: false
+            smooth: true
+            visible: false
+        }
+
+        property real radius: 16
+        property real brightness: 0.1
+
+        fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            uniform highp float qt_Opacity;
+            uniform highp float radius;
+            uniform highp float brightness;
+            uniform lowp sampler2D source;
+
+            void main() {
+                highp vec2 uv = qt_TexCoord0.xy;
+                highp vec2 coord = qt_TexCoord0 - 0.5;
+                lowp vec4 orig = texture2D(source, uv);
+
+                highp float vignette = 1.0 - dot(coord, coord);
+
+                lowp vec3 col = orig.rgb * clamp(pow(vignette, radius) + brightness, 0.0, 1.0);
+
+                gl_FragColor = vec4(col, 1.0);
+            }"
+    }
+}
diff --git a/prototype_2016/third_party/fluid/effects/effects.pri b/prototype_2016/third_party/fluid/effects/effects.pri
new file mode 100644
index 0000000..afb9022
--- /dev/null
+++ b/prototype_2016/third_party/fluid/effects/effects.pri
@@ -0,0 +1 @@
+RESOURCES += $$PWD/effects.qrc
diff --git a/prototype_2016/third_party/fluid/effects/effects.qrc b/prototype_2016/third_party/fluid/effects/effects.qrc
new file mode 100644
index 0000000..1331e4f
--- /dev/null
+++ b/prototype_2016/third_party/fluid/effects/effects.qrc
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/Fluid/Effects">
+        <file>BoxShadow.qml</file>
+        <file>CircleMask.qml</file>
+        <file>plugins.qmltypes</file>
+        <file>qmldir</file>
+        <file>Vignette.qml</file>
+    </qresource>
+</RCC>
diff --git a/prototype_2016/third_party/fluid/effects/plugins.qmltypes b/prototype_2016/third_party/fluid/effects/plugins.qmltypes
new file mode 100644
index 0000000..85c0289
--- /dev/null
+++ b/prototype_2016/third_party/fluid/effects/plugins.qmltypes
@@ -0,0 +1,15 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump-qt5 -nonrelocatable Fluid.Effects 1.0'
+
+Module {
+    dependencies: [
+        "QtGraphicalEffects 1.0",
+        "QtQuick 2.4",
+        "QtQuick.Window 2.1"
+    ]
+}
diff --git a/prototype_2016/third_party/fluid/effects/qmldir b/prototype_2016/third_party/fluid/effects/qmldir
new file mode 100644
index 0000000..225a435
--- /dev/null
+++ b/prototype_2016/third_party/fluid/effects/qmldir
@@ -0,0 +1,6 @@
+module Fluid.Effects
+typeinfo plugins.qmltypes
+
+BoxShadow 1.0 BoxShadow.qml
+CircleMask 1.0 CircleMask.qml
+Vignette 1.0 Vignette.qml
diff --git a/prototype_2016/third_party/fluid/fluid.pri b/prototype_2016/third_party/fluid/fluid.pri
new file mode 100644
index 0000000..af7e52a
--- /dev/null
+++ b/prototype_2016/third_party/fluid/fluid.pri
@@ -0,0 +1,8 @@
+DEFINES += FLUID_LOCAL
+include(src/src.pri)
+include(core/core.pri)
+include(controls/controls.pri)
+include(effects/effects.pri)
+include(material/material.pri)
+
+RESOURCES += $$PWD/icons/icons.qrc
diff --git a/prototype_2016/third_party/fluid/material/ActionButton.qml b/prototype_2016/third_party/fluid/material/ActionButton.qml
new file mode 100644
index 0000000..e6cdcfc
--- /dev/null
+++ b/prototype_2016/third_party/fluid/material/ActionButton.qml
@@ -0,0 +1,106 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+import QtGraphicalEffects 1.0
+
+/*!
+   \qmltype ActionButton
+   \inqmlmodule Fluid.Material
+
+   \brief A floating action button.
+
+   An ActionButton is a floating action button that provides a primary action
+   on the current page.
+ */
+Button {
+    id: button
+
+    /*!
+       The name of the icon to display in the action button, selected from the Material
+       Design icon collection by Google.
+     */
+    property alias iconName: icon.name
+
+    /*!
+       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
+
+    padding: 0
+
+    width: 76
+    height: 76
+
+    contentItem: Item {
+        implicitHeight: isMiniSize ? 40 : 56
+        implicitWidth: implicitHeight
+
+        Icon {
+            id: icon
+
+            anchors.centerIn: parent
+            color: Utils.lightDark(button.Material.background, "black", "white")
+            size: 24
+        }
+    }
+
+    background: Rectangle {
+        implicitWidth: 64
+        implicitHeight: 64
+
+        x: 6
+        y: 6
+
+        width: parent.width - 12
+        height: parent.height - 12
+
+        radius: width/2
+
+        color: button.Material.background
+
+        RectangularGlow {
+            anchors.centerIn: parent
+            anchors.verticalCenterOffset: button.Material.elevation === 1 ? 1.5 : 1
+
+            width: parent.width
+            height: parent.height
+
+            z: -1
+
+            glowRadius: button.Material.elevation === 1 ? 0.75 : 0.3
+            opacity: button.Material.elevation === 1 ? 0.6 : 0.3
+            spread: button.Material.elevation === 1 ? 0.7 : 0.85
+            color: "black"
+            cornerRadius: height/2
+        }
+
+        Ripple {
+            anchors.fill: parent
+            control: button
+
+            circular: true
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/material/CMakeLists.txt b/prototype_2016/third_party/fluid/material/CMakeLists.txt
new file mode 100644
index 0000000..04be30a
--- /dev/null
+++ b/prototype_2016/third_party/fluid/material/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(FLUID_FILES
+    plugins.qmltypes
+    qmldir
+    ActionButton.qml
+    ElevationEffect.qml
+    Ripple.qml
+    Wave.qml
+)
+
+install(FILES ${FLUID_FILES}
+        DESTINATION ${QML_INSTALL_DIR}/Fluid/Material)
diff --git a/prototype_2016/third_party/fluid/material/ElevationEffect.qml b/prototype_2016/third_party/fluid/material/ElevationEffect.qml
new file mode 100644
index 0000000..e72d517
--- /dev/null
+++ b/prototype_2016/third_party/fluid/material/ElevationEffect.qml
@@ -0,0 +1,251 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.6
+import Fluid.Effects 1.0
+
+/*!
+   An effect for standard Material Design elevation shadows. Useful for using as \c layer.effect.
+ */
+Item {
+    id: effect
+
+    /*!
+       The source the effect is applied to.
+     */
+    property var source
+
+    /*!
+       The elevation of the \l source Item.
+     */
+    property int elevation: 0
+
+    /*!
+       Set to \c true if the \l source Item is the same width as its parent and the shadow
+       should be full width instead of rounding around the corner of the Item.
+       \sa fullHeight
+     */
+    property bool fullWidth: false
+
+    /*!
+       Set to \c true if the \l source Item is the same height as its parent and the shadow
+       should be full height instead of rounding around the corner of the Item.
+       \sa fullWidth
+     */
+    property bool fullHeight: false
+
+    /*!
+       \internal
+       The actual source Item the effect is applied to.
+     */
+    readonly property Item sourceItem: source.sourceItem
+
+    /*
+     * The following shadow values are taken from Angular Material
+     *
+     * The MIT License (MIT)
+     *
+     * Copyright (c) 2014-2016 Google, Inc. http://angularjs.org
+     *
+     * Permission is hereby granted, free of charge, to any person obtaining a copy
+     * of this software and associated documentation files (the "Software"), to deal
+     * in the Software without restriction, including without limitation the rights
+     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+     * copies of the Software, and to permit persons to whom the Software is
+     * furnished to do so, subject to the following conditions:
+     *
+     * The above copyright notice and this permission notice shall be included in all
+     * copies or substantial portions of the Software.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+     * SOFTWARE.
+     */
+    /*!
+       \internal
+       The shadows to use for each possible elevation. There are three shadows that when combined
+       make up the elevation.
+     */
+    readonly property var _shadows: [
+        [{offset: 0, blur: 0, spread: 0},
+         {offset: 0, blur: 0, spread: 0},
+         {offset: 0, blur: 0, spread: 0}],
+
+        [{offset: 1, blur: 3, spread: 0},
+         {offset: 1, blur: 1, spread: 0},
+         {offset: 2, blur: 1, spread: -1}],
+
+        [{offset: 1, blur: 5, spread: 0},
+         {offset: 2, blur: 2, spread: 0},
+         {offset: 3, blur: 1, spread: -2}],
+
+        [{offset: 1, blur: 8, spread: 0},
+         {offset: 3, blur: 4, spread: 0},
+         {offset: 3, blur: 3, spread: -2}],
+
+        [{offset: 2, blur: 4, spread: -1},
+         {offset: 4, blur: 5, spread: 0},
+         {offset: 1, blur: 10, spread: 0}],
+
+        [{offset: 3, blur: 5, spread: -1},
+         {offset: 5, blur: 8, spread: 0},
+         {offset: 1, blur: 14, spread: 0}],
+
+        [{offset: 3, blur: 5, spread: -1},
+         {offset: 6, blur: 10, spread: 0},
+         {offset: 1, blur: 18, spread: 0}],
+
+        [{offset: 4, blur: 5, spread: -2},
+         {offset: 7, blur: 10, spread: 1},
+         {offset: 2, blur: 16, spread: 1}],
+
+        [{offset: 5, blur: 5, spread: -3},
+         {offset: 8, blur: 10, spread: 1},
+         {offset: 3, blur: 14, spread: 2}],
+
+        [{offset: 5, blur: 6, spread: -3},
+         {offset: 9, blur: 12, spread: 1},
+         {offset: 3, blur: 16, spread: 2}],
+
+        [{offset: 6, blur: 6, spread: -3},
+         {offset: 10, blur: 14, spread: 1},
+         {offset: 4, blur: 18, spread: 3}],
+
+        [{offset: 6, blur: 7, spread: -4},
+         {offset: 11, blur: 15, spread: 1},
+         {offset: 4, blur: 20, spread: 3}],
+
+        [{offset: 7, blur: 8, spread: -4},
+         {offset: 12, blur: 17, spread: 2},
+         {offset: 5, blur: 22, spread: 4}],
+
+        [{offset: 7, blur: 8, spread: -4},
+         {offset: 13, blur: 19, spread: 2},
+         {offset: 5, blur: 24, spread: 4}],
+
+        [{offset: 7, blur: 9, spread: -4},
+         {offset: 14, blur: 21, spread: 2},
+         {offset: 5, blur: 26, spread: 4}],
+
+        [{offset: 8, blur: 9, spread: -5},
+         {offset: 15, blur: 22, spread: 2},
+         {offset: 6, blur: 28, spread: 5}],
+
+        [{offset: 8, blur: 10, spread: -5},
+         {offset: 16, blur: 24, spread: 2},
+         {offset: 6, blur: 30, spread: 5}],
+
+        [{offset: 8, blur: 11, spread: -5},
+         {offset: 17, blur: 26, spread: 2},
+         {offset: 6, blur: 32, spread: 5}],
+
+        [{offset: 9, blur: 11, spread: -5},
+         {offset: 18, blur: 28, spread: 2},
+         {offset: 7, blur: 34, spread: 6}],
+
+        [{offset: 9, blur: 12, spread: -6},
+         {offset: 19, blur: 29, spread: 2},
+         {offset: 7, blur: 36, spread: 6}],
+
+        [{offset: 10, blur: 13, spread: -6},
+         {offset: 20, blur: 31, spread: 3},
+         {offset: 8, blur: 38, spread: 7}],
+
+        [{offset: 10, blur: 13, spread: -6},
+         {offset: 21, blur: 33, spread: 3},
+         {offset: 8, blur: 40, spread: 7}],
+
+        [{offset: 10, blur: 14, spread: -6},
+         {offset: 22, blur: 35, spread: 3},
+         {offset: 8, blur: 42, spread: 7}],
+
+        [{offset: 11, blur: 14, spread: -7},
+         {offset: 23, blur: 36, spread: 3},
+         {offset: 9, blur: 44, spread: 8}],
+
+        [{offset: 11, blur: 15, spread: -7},
+         {offset: 24, blur: 38, spread: 3},
+         {offset: 9, blur: 46, spread: 8}]
+    ]
+
+    /*!
+       \internal
+       The current shadow based on the elevation.
+     */
+    readonly property var _shadow: _shadows[elevation]
+
+    // Nest the shadows and source view in two items rendered as a layer
+    // so the shadow is not clipped by the bounds of the source view
+    Item {
+        property int margin: -100
+
+        x: margin
+        y: margin
+        width: parent.width - 2 * margin
+        height: parent.height - 2 * margin
+
+        // By rendering as a layer, the shadow will never show through the source item,
+        // even when the source item's opacity is less than 1
+        layer.enabled: true
+
+        // The box shadows automatically pick up the size of the source Item and not
+        // the size of the parent, so we don't need to worry about the extra padding
+        // in the parent Item
+        BoxShadow {
+            offsetY: _shadow[0].offset
+            blurRadius: _shadow[0].blur
+            spreadRadius: _shadow[0].spread
+            color: Qt.rgba(0,0,0, 0.2)
+
+            fullWidth: effect.fullWidth
+            fullHeight: effect.fullHeight
+            source: effect.sourceItem
+        }
+
+        BoxShadow {
+            offsetY: _shadow[1].offset
+            blurRadius: _shadow[1].blur
+            spreadRadius: _shadow[1].spread
+            color: Qt.rgba(0,0,0, 0.14)
+
+            fullWidth: effect.fullWidth
+            fullHeight: effect.fullHeight
+            source: effect.sourceItem
+        }
+
+        BoxShadow {
+            offsetY: _shadow[2].offset
+            blurRadius: _shadow[2].blur
+            spreadRadius: _shadow[2].spread
+            color: Qt.rgba(0,0,0, 0.12)
+
+            fullWidth: effect.fullWidth
+            fullHeight: effect.fullHeight
+            source: effect.sourceItem
+        }
+
+        ShaderEffect {
+            property alias source: effect.source
+
+            x: (parent.width - width)/2
+            y: (parent.height - height)/2
+            width: sourceItem.width
+            height: sourceItem.height
+        }
+    }
+}
diff --git a/prototype_2016/third_party/qml-material/src/core/Ink.qml b/prototype_2016/third_party/fluid/material/Ripple.qml
index af73332..b99a46a 100644
--- a/prototype_2016/third_party/qml-material/src/core/Ink.qml
+++ b/prototype_2016/third_party/fluid/material/Ripple.qml
@@ -1,97 +1,142 @@
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
  *
- * Copyright (C) 2014-2016 Michael Spencer <sonrisesoftware@gmail.com>
- *               2014 Marcin Baszczewski
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
  *
  * 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/.
+ *
+ * $END_LICENSE$
  */
 
 import QtQuick 2.4
-import Material 0.3
-import Material.Extras 0.1
+import Fluid.Core 1.0
+import Fluid.Effects 1.0
 
 /*!
-   \qmltype Ink
-   \inqmlmodule Material
+   \qmltype Ripple
+   \inqmlmodule Fluid.UI 1.0
+   \brief Represents a Material Design ripple ink animation used in various touchable components.
 
-   \brief Represents a ripple ink animation used in buttons and many other components.
+   This component is useful for including in Material Design-specific components, which should be implemented using the +material file selector. Eventually this should be upstreamed to QtQuick
+   Controls 2.
  */
 MouseArea {
-    id: view
+    id: ripple
 
-    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)
+    /*!
+       The color of the ripple. Defaults to black with 12% opacity.
+     */
+    property color color: Qt.rgba(0,0,0,0.12)
 
+    /*!
+       Set to \c true if the ripple is used on a circular component, such as a button in an
+       action bar or a floating action button.
+     */
     property bool circular: false
+
+    /*!
+       Set to \c true if the ripple should be centered regardless of where the mouse/touch
+       input came from.
+     */
     property bool centered: false
 
-    property int focusWidth: width - 32 * Units.dp
+    /*!
+       Set to \c true if the component is focused and should display a focus ripple.
+     */
     property bool focused
+
+    /*!
+       The color of the focus ripple. Also used to determine the color of the focus background
+       behind the ripple.
+       \sa focused
+     */
     property color focusColor: "transparent"
 
-    property bool showFocus: true
+    /*!
+       The width of the focus ripple.
+       \sa focused
+     */
+    property int focusWidth: width - 32
 
-    onPressed: {
-        createTapCircle(mouse.x, mouse.y)
-    }
+    property Item control
 
-    onCanceled: {
-        lastCircle.removeCircle();
-    }
+    clip: true
+    hoverEnabled: Device.hoverEnabled
 
-    onReleased: {
-        lastCircle.removeCircle();
+    Connections {
+        target: control
+
+        onPressedChanged: {
+            if (!control.pressed)
+                __private.removeLastCircle()
+        }
     }
 
-    function createTapCircle(x, y) {
-        endRadius = centered ? width/2 : radius(x, y)
-        showFocus = false
+    onPressed: {
+        __private.createTapCircle(mouse.x, mouse.y)
 
-        lastCircle = tapCircle.createObject(view, {
-                                                       "circleX": centered ? width/2 : x,
-                                                       "circleY": centered ? height/2 : y
-                                                   });
+        if (control)
+            mouse.accepted = false
     }
 
-    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))
+    onReleased: __private.removeLastCircle()
+    onCanceled: __private.removeLastCircle()
 
-        return Math.max(dist1, dist2)
-    }
+    QtObject {
+        id: __private
+
+        property int startRadius: circular ? width/10 : width/6
+        property int endRadius
+        property bool showFocus: true
+
+        property Item lastCircle
 
-    function dist(x1, y1, x2, y2) {
-        var xs = 0;
-        var ys = 0;
+        function createTapCircle(x, y) {
+            endRadius = centered ? width/2 : radius(x, y) + 5
+            showFocus = false
 
-        xs = x2 - x1;
-        xs = xs * xs;
+            lastCircle = tapCircle.createObject(ripple, {
+                "circleX": centered ? width/2 : x,
+                "circleY": centered ? height/2 : y
+            })
+        }
+
+        function removeLastCircle() {
+            if (lastCircle)
+                lastCircle.removeCircle()
+        }
+
+        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)
+        }
 
-        ys = y2 - y1;
-        ys = ys * ys;
+        function dist(x1, y1, x2, y2) {
+            var distX = x2 - x1
+            var distY = y2 - y1
 
-        return Math.sqrt( xs + ys );
+            return Math.sqrt(distX * distX + distY * distY)
+        }
     }
 
     Rectangle {
         id: focusBackground
+        objectName: "focusBackground"
 
-        anchors.fill: parent
+        width: parent.width
+        height: parent.height
 
-        color: Theme.isDarkColor(focusColor) && focusColor.a > 0
+        color: Utils.isDarkColor(focusColor) && focusColor.a > 0
                 ? Qt.rgba(0,0,0,0.2) : Qt.rgba(0,0,0,0.1)
 
-        opacity: showFocus && focused ? 1 : 0
+        opacity: __private.showFocus && focused ? 1 : 0
 
         Behavior on opacity {
             NumberAnimation { duration: 500; easing.type: Easing.InOutQuad }
@@ -100,18 +145,24 @@ MouseArea {
 
     Rectangle {
         id: focusCircle
+        objectName: "focusRipple"
+
+        property bool focusedState
 
-        anchors.centerIn: parent
+        x: (parent.width - width)/2
+        y: (parent.height - height)/2
 
         width: focused
                 ? focusedState ? focusWidth
-                               : Math.min(parent.width - 8 * Units.dp, focusWidth + 12 * Units.dp)
+                               : Math.min(parent.width - 8, focusWidth + 12)
                 : parent.width/5
         height: width
 
         radius: width/2
 
-        opacity: showFocus && focused ? 1 : 0
+        opacity: __private.showFocus && focused ? 1 : 0
+
+        color: focusColor.a === 0 ? Qt.rgba(1,1,1,0.4) : focusColor
 
         Behavior on opacity {
             NumberAnimation { duration: 500; easing.type: Easing.InOutQuad }
@@ -121,10 +172,6 @@ MouseArea {
             NumberAnimation { duration: focusTimer.interval; }
         }
 
-        color: focusColor.a === 0 ? Qt.rgba(1,1,1,0.4) : focusColor
-
-        property bool focusedState
-
         Timer {
             id: focusTimer
             running: focused
@@ -140,11 +187,18 @@ MouseArea {
 
         Item {
             id: circleItem
-
-            anchors.fill: parent
+            objectName: "tapRipple"
 
             property bool done
 
+            property real circleX
+            property real circleY
+
+            property bool closed
+
+            width: parent.width
+            height: parent.height
+
             function removeCircle() {
                 done = true
 
@@ -154,21 +208,19 @@ MouseArea {
 
                     circleItem.destroy(500);
                 } else {
-                    showFocus = true
+                    __private.showFocus = true
                     fadeAnimation.start();
 
                     circleItem.destroy(300);
                 }
             }
 
-            property real circleX
-            property real circleY
-
-            property bool closed
-
             Item {
                 id: circleParent
-                anchors.fill: parent
+
+                width: parent.width
+                height: parent.height
+
                 visible: !circular
 
                 Rectangle {
@@ -181,18 +233,19 @@ MouseArea {
                     height: radius * 2
 
                     opacity: 0
-                    color: view.color
+                    color: ripple.color
 
                     NumberAnimation {
                         id: fillSizeAnimation
                         running: true
 
                         target: circleRectangle; property: "radius"; duration: 500;
-                        from: startRadius; to: endRadius; easing.type: Easing.InOutQuad
+                        from: __private.startRadius; to: __private.endRadius;
+                        easing.type: Easing.InOutQuad
 
                         onStopped: {
                             if (done)
-                                showFocus = true
+                                __private.showFocus = true
                         }
                     }
 
diff --git a/prototype_2016/third_party/qml-material/src/components/Wave.qml b/prototype_2016/third_party/fluid/material/Wave.qml
index 3a0afb4..50ea8ae 100644
--- a/prototype_2016/third_party/qml-material/src/components/Wave.qml
+++ b/prototype_2016/third_party/fluid/material/Wave.qml
@@ -1,29 +1,23 @@
-/***** THIS FILE CANNOT BE RELICENSED UNDER THE MPL YET *****/
-
 /*
- * QML Material - An application framework implementing Material Design.
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
  * 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.
+ * $BEGIN_LICENSE:MPL2$
  *
- * 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.
+ * 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/.
  *
- * 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/>.
+ * $END_LICENSE$
  */
 
 import QtQuick 2.4
 
 /*!
    \qmltype Wave
-   \inqmlmodule Material
-
+   \inqmlmodule Fluid.Material 1.0
    \brief Provides a wave animation for transitioning between views of content.
  */
 Rectangle {
@@ -35,19 +29,20 @@ Rectangle {
     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))
+    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.initialX = x || parent.width/2;
+        wave.initialY = y || parent.height/2;
         wave.opened = true;
     }
 
     function close(x, y) {
-        wave.initialX = x;
-        wave.initialY = y;
+        wave.initialX = x || parent.width/2;
+        wave.initialY = y || parent.height/2;
         wave.opened = false;
     }
 
diff --git a/prototype_2016/third_party/fluid/material/material.pri b/prototype_2016/third_party/fluid/material/material.pri
new file mode 100644
index 0000000..6016f5f
--- /dev/null
+++ b/prototype_2016/third_party/fluid/material/material.pri
@@ -0,0 +1,2 @@
+RESOURCES += \
+    $$PWD/material.qrc
diff --git a/prototype_2016/third_party/fluid/material/material.qrc b/prototype_2016/third_party/fluid/material/material.qrc
new file mode 100644
index 0000000..7ea8ecb
--- /dev/null
+++ b/prototype_2016/third_party/fluid/material/material.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/Fluid/Material">
+        <file>ActionButton.qml</file>
+        <file>ElevationEffect.qml</file>
+        <file>plugins.qmltypes</file>
+        <file>qmldir</file>
+        <file>Ripple.qml</file>
+        <file>Wave.qml</file>
+    </qresource>
+</RCC>
diff --git a/prototype_2016/third_party/fluid/material/plugins.qmltypes b/prototype_2016/third_party/fluid/material/plugins.qmltypes
new file mode 100644
index 0000000..238ccfe
--- /dev/null
+++ b/prototype_2016/third_party/fluid/material/plugins.qmltypes
@@ -0,0 +1,569 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump-qt5 -nonrelocatable Fluid.Material 1.0'
+
+Module {
+    dependencies: [
+        "Fluid.Controls 1.0",
+        "Fluid.Core 1.0",
+        "Fluid.Effects 1.0",
+        "QtGraphicalEffects 1.0",
+        "QtQml 2.2",
+        "QtQuick 2.7",
+        "QtQuick.Controls 2.0",
+        "QtQuick.Controls.Material 2.0",
+        "QtQuick.Controls.Material.impl 2.0",
+        "QtQuick.Controls.Universal 2.0",
+        "QtQuick.Controls.Universal.impl 2.0",
+        "QtQuick.Controls.impl 2.0",
+        "QtQuick.Layouts 1.1",
+        "QtQuick.Templates 2.0",
+        "QtQuick.Window 2.2"
+    ]
+    Component {
+        prototype: "QQuickApplicationWindow"
+        name: "QtQuick.Controls/ApplicationWindow 2.0"
+        exports: ["QtQuick.Controls/ApplicationWindow 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.Material.impl/BoxShadow 2.0"
+        exports: ["QtQuick.Controls.Material.impl/BoxShadow 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "offsetX"; type: "int" }
+        Property { name: "offsetY"; type: "int" }
+        Property { name: "blurRadius"; type: "int" }
+        Property { name: "spreadRadius"; type: "int" }
+        Property { name: "source"; type: "QQuickItem"; isPointer: true }
+        Property { name: "fullWidth"; type: "bool" }
+        Property { name: "fullHeight"; type: "bool" }
+        Property { name: "glowRadius"; type: "double" }
+        Property { name: "spread"; type: "double" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "cornerRadius"; type: "double" }
+        Property { name: "cached"; type: "bool" }
+    }
+    Component {
+        prototype: "QQuickBusyIndicator"
+        name: "QtQuick.Controls/BusyIndicator 2.0"
+        exports: ["QtQuick.Controls/BusyIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickButton"
+        name: "QtQuick.Controls/Button 2.0"
+        exports: ["QtQuick.Controls/Button 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickCheckBox"
+        name: "QtQuick.Controls/CheckBox 2.0"
+        exports: ["QtQuick.Controls/CheckBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickCheckDelegate"
+        name: "QtQuick.Controls/CheckDelegate 2.0"
+        exports: ["QtQuick.Controls/CheckDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Material.impl/CheckIndicator 2.0"
+        exports: ["QtQuick.Controls.Material.impl/CheckIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.impl/CheckIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickComboBox"
+        name: "QtQuick.Controls/ComboBox 2.0"
+        exports: ["QtQuick.Controls/ComboBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickDial"
+        name: "QtQuick.Controls/Dial 2.0"
+        exports: ["QtQuick.Controls/Dial 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickDrawer"
+        name: "QtQuick.Controls/Drawer 2.0"
+        exports: ["QtQuick.Controls/Drawer 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.Material.impl/ElevationEffect 2.0"
+        exports: ["QtQuick.Controls.Material.impl/ElevationEffect 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "source"; type: "QVariant" }
+        Property { name: "elevation"; type: "int" }
+        Property { name: "fullWidth"; type: "bool" }
+        Property { name: "fullHeight"; type: "bool" }
+        Property { name: "sourceItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property { name: "_shadows"; type: "QVariant"; isReadonly: true }
+        Property { name: "_shadow"; type: "QVariant"; isReadonly: true }
+    }
+    Component {
+        prototype: "QObject"
+        name: "FluidStyle 1.0"
+        exports: ["FluidStyle 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        Property { name: "iconColorLight"; type: "QColor"; isReadonly: true }
+        Property { name: "iconColorDark"; type: "QColor"; isReadonly: true }
+        Property { name: "display4Font"; type: "QFont"; isReadonly: true }
+        Property { name: "display3Font"; type: "QFont"; isReadonly: true }
+        Property { name: "display2Font"; type: "QFont"; isReadonly: true }
+        Property { name: "display1Font"; type: "QFont"; isReadonly: true }
+        Property { name: "headlineFont"; type: "QFont"; isReadonly: true }
+        Property { name: "titleFont"; type: "QFont"; isReadonly: true }
+        Property { name: "subheadingFont"; type: "QFont"; isReadonly: true }
+        Property { name: "body2Font"; type: "QFont"; isReadonly: true }
+        Property { name: "body1Font"; type: "QFont"; isReadonly: true }
+        Property { name: "captionFont"; type: "QFont"; isReadonly: true }
+        Property { name: "buttonFont"; type: "QFont"; isReadonly: true }
+        Property { name: "subheaderFont"; type: "QFont"; isReadonly: true }
+        Property { name: "dialogFont"; type: "QFont"; isReadonly: true }
+    }
+    Component {
+        prototype: "QQuickFrame"
+        name: "QtQuick.Controls/Frame 2.0"
+        exports: ["QtQuick.Controls/Frame 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickGroupBox"
+        name: "QtQuick.Controls/GroupBox 2.0"
+        exports: ["QtQuick.Controls/GroupBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickItemDelegate"
+        name: "QtQuick.Controls/ItemDelegate 2.0"
+        exports: ["QtQuick.Controls/ItemDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickLabel"
+        name: "QtQuick.Controls/Label 2.0"
+        exports: ["QtQuick.Controls/Label 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickMenu"
+        name: "QtQuick.Controls/Menu 2.0"
+        exports: ["QtQuick.Controls/Menu 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickMenuItem"
+        name: "QtQuick.Controls/MenuItem 2.0"
+        exports: ["QtQuick.Controls/MenuItem 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickPage"
+        name: "QtQuick.Controls/Page 2.0"
+        exports: ["QtQuick.Controls/Page 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickPageIndicator"
+        name: "QtQuick.Controls/PageIndicator 2.0"
+        exports: ["QtQuick.Controls/PageIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickPane"
+        name: "QtQuick.Controls/Pane 2.0"
+        exports: ["QtQuick.Controls/Pane 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickPopup"
+        name: "QtQuick.Controls/Popup 2.0"
+        exports: ["QtQuick.Controls/Popup 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickProgressBar"
+        name: "QtQuick.Controls/ProgressBar 2.0"
+        exports: ["QtQuick.Controls/ProgressBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRadioButton"
+        name: "QtQuick.Controls/RadioButton 2.0"
+        exports: ["QtQuick.Controls/RadioButton 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRadioDelegate"
+        name: "QtQuick.Controls/RadioDelegate 2.0"
+        exports: ["QtQuick.Controls/RadioDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.impl/RadioIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Universal.impl/RadioIndicator 2.0"
+        exports: ["QtQuick.Controls.Universal.impl/RadioIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QVariant" }
+    }
+    Component {
+        prototype: "QQuickRangeSlider"
+        name: "QtQuick.Controls/RangeSlider 2.0"
+        exports: ["QtQuick.Controls/RangeSlider 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Material.impl/Ripple 2.0"
+        exports: ["QtQuick.Controls.Material.impl/Ripple 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "colored"; type: "bool" }
+    }
+    Component {
+        prototype: "QQuickScrollBar"
+        name: "QtQuick.Controls/ScrollBar 2.0"
+        exports: ["QtQuick.Controls/ScrollBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickScrollIndicator"
+        name: "QtQuick.Controls/ScrollIndicator 2.0"
+        exports: ["QtQuick.Controls/ScrollIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickSlider"
+        name: "QtQuick.Controls/Slider 2.0"
+        exports: ["QtQuick.Controls/Slider 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.Material.impl/SliderHandle 2.0"
+        exports: ["QtQuick.Controls.Material.impl/SliderHandle 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "value"; type: "double" }
+        Property { name: "handleHasFocus"; type: "bool" }
+        Property { name: "handlePressed"; type: "bool" }
+        Property { name: "initialSize"; type: "int"; isReadonly: true }
+        Property { name: "horizontal"; type: "bool"; isReadonly: true }
+        Property { name: "control"; type: "QVariant"; isReadonly: true }
+    }
+    Component {
+        prototype: "QQuickSpinBox"
+        name: "QtQuick.Controls/SpinBox 2.0"
+        exports: ["QtQuick.Controls/SpinBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickStackView"
+        name: "QtQuick.Controls/StackView 2.0"
+        exports: ["QtQuick.Controls/StackView 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickSwipeDelegate"
+        name: "QtQuick.Controls/SwipeDelegate 2.0"
+        exports: ["QtQuick.Controls/SwipeDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickSwipeView"
+        name: "QtQuick.Controls/SwipeView 2.0"
+        exports: ["QtQuick.Controls/SwipeView 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickSwitch"
+        name: "QtQuick.Controls/Switch 2.0"
+        exports: ["QtQuick.Controls/Switch 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickSwitchDelegate"
+        name: "QtQuick.Controls/SwitchDelegate 2.0"
+        exports: ["QtQuick.Controls/SwitchDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/SwitchIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.Controls.Material.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.Material.impl/SwitchIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        prototype: "QQuickTabBar"
+        name: "QtQuick.Controls/TabBar 2.0"
+        exports: ["QtQuick.Controls/TabBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickTabButton"
+        name: "QtQuick.Controls/TabButton 2.0"
+        exports: ["QtQuick.Controls/TabButton 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickTextArea"
+        name: "QtQuick.Controls/TextArea 2.0"
+        exports: ["QtQuick.Controls/TextArea 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickTextField"
+        name: "QtQuick.Controls/TextField 2.0"
+        exports: ["QtQuick.Controls/TextField 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickToolBar"
+        name: "QtQuick.Controls/ToolBar 2.0"
+        exports: ["QtQuick.Controls/ToolBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickToolButton"
+        name: "QtQuick.Controls/ToolButton 2.0"
+        exports: ["QtQuick.Controls/ToolButton 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickToolTip"
+        name: "QtQuick.Controls/ToolTip 2.0"
+        exports: ["QtQuick.Controls/ToolTip 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickTumbler"
+        name: "QtQuick.Controls/Tumbler 2.0"
+        exports: ["QtQuick.Controls/Tumbler 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "Units 1.0"
+        exports: ["Units 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        defaultProperty: "data"
+        Property { name: "gridUnit"; type: "int"; isReadonly: true }
+        Property { name: "smallSpacing"; type: "double"; isReadonly: true }
+        Property { name: "mediumSpacing"; type: "double"; isReadonly: true }
+        Property { name: "largeSpacing"; type: "double"; isReadonly: true }
+        Property { name: "shortDuration"; type: "int"; isReadonly: true }
+        Property { name: "mediumDuration"; type: "int"; isReadonly: true }
+        Property { name: "longDuration"; type: "int"; isReadonly: true }
+        Property { name: "iconSizes"; type: "QObject"; isReadonly: true; isPointer: true }
+        Method {
+            name: "gu"
+            type: "QVariant"
+            Parameter { name: "x"; type: "QVariant" }
+        }
+        Method {
+            name: "roundToIconSize"
+            type: "QVariant"
+            Parameter { name: "x"; type: "QVariant" }
+        }
+    }
+    Component {
+        prototype: "QObject"
+        name: "Utils 1.0"
+        exports: ["Utils 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        Method {
+            name: "asColor"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "alpha"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+            Parameter { name: "alpha"; type: "QVariant" }
+        }
+        Method {
+            name: "blendColors"
+            type: "QVariant"
+            Parameter { name: "color1"; type: "QVariant" }
+            Parameter { name: "color2"; type: "QVariant" }
+            Parameter { name: "a"; type: "QVariant" }
+        }
+        Method {
+            name: "luminance"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "lightDark"
+            type: "QVariant"
+            Parameter { name: "background"; type: "QVariant" }
+            Parameter { name: "lightColor"; type: "QVariant" }
+            Parameter { name: "darkColor"; type: "QVariant" }
+        }
+        Method {
+            name: "isDarkColor"
+            type: "QVariant"
+            Parameter { name: "color"; type: "QVariant" }
+        }
+        Method {
+            name: "getSourceForIconName"
+            type: "QVariant"
+            Parameter { name: "name"; type: "QVariant" }
+        }
+        Method {
+            name: "scale"
+            type: "QVariant"
+            Parameter { name: "percent"; type: "QVariant" }
+            Parameter { name: "start"; type: "QVariant" }
+            Parameter { name: "end"; type: "QVariant" }
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/material/qmldir b/prototype_2016/third_party/fluid/material/qmldir
new file mode 100644
index 0000000..6aff2c1
--- /dev/null
+++ b/prototype_2016/third_party/fluid/material/qmldir
@@ -0,0 +1,7 @@
+module Fluid.Material
+typeinfo plugins.qmltypes
+
+ActionButton 1.0 ActionButton.qml
+ElevationEffect 1.0 ElevationEffect.qml
+Ripple 1.0 Ripple.qml
+Wave 1.0 Wave.qml
diff --git a/prototype_2016/third_party/fluid/scripts/fetch_icons.sh b/prototype_2016/third_party/fluid/scripts/fetch_icons.sh
new file mode 100755
index 0000000..9c452db
--- /dev/null
+++ b/prototype_2016/third_party/fluid/scripts/fetch_icons.sh
@@ -0,0 +1,39 @@
+#! /bin/bash
+
+GIT_DIR=material-design-icons
+TARGET_DIR=icons
+QRC_FILE=$TARGET_DIR/icons.qrc
+
+CATEGORIES=(action av communication device file image maps notification social toggle alert content editor hardware navigation)
+
+if [ -d $GIT_DIR ]; then
+    pushd $GIT_DIR; git pull; popd
+else
+    git clone https://github.com/google/material-design-icons.git $GIT_DIR
+fi
+
+mkdir -p $TARGET_DIR
+
+echo "<RCC>
+    <qresource prefix=\"/Fluid/Controls/\">" > $QRC_FILE
+for CATEGORY in ${CATEGORIES[*]}; do
+    if [ -d $TARGET_DIR/$CATEGORY ]; then
+        rm -r $TARGET_DIR/$CATEGORY
+    fi
+    
+        mkdir $TARGET_DIR/$CATEGORY
+
+        ICONS=$(ls $GIT_DIR/$CATEGORY/svg/production/*48px*)
+
+
+        for FILE in $ICONS; do
+                ICON=$(basename $FILE)
+                NEW_NAME=$(echo $ICON | sed -E 's/ic_(.*)_48px.svg/\1.svg/')
+                cp $FILE $TARGET_DIR/$CATEGORY/$NEW_NAME
+                echo "        <file>$CATEGORY/$NEW_NAME</file>" >> $QRC_FILE
+        done
+done
+
+echo "    </qresource>
+</RCC>
+" >> $QRC_FILE
\ No newline at end of file
diff --git a/prototype_2016/third_party/fluid/src/CMakeLists.txt b/prototype_2016/third_party/fluid/src/CMakeLists.txt
new file mode 100644
index 0000000..dacd2e0
--- /dev/null
+++ b/prototype_2016/third_party/fluid/src/CMakeLists.txt
@@ -0,0 +1,79 @@
+include(GenerateExportHeader)
+include(CMakePackageConfigHelpers)
+include(ECMSetupVersion)
+include(ECMGenerateHeaders)
+
+ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX FLUID
+                  VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/Fluid/fluid/fluidversion.h"
+                  PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/FluidConfigVersion.cmake"
+                  SOVERSION ${PROJECT_SOVERSION})
+
+set(FLUID_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/Fluid")
+
+set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/Fluid")
+
+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/FluidConfig.cmake.in"
+                              "${CMAKE_CURRENT_BINARY_DIR}/FluidConfig.cmake"
+                              INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FluidConfig.cmake"
+              "${CMAKE_CURRENT_BINARY_DIR}/FluidConfigVersion.cmake"
+        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+        COMPONENT Devel)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Fluid/fluid/fluidversion.h
+        DESTINATION ${FLUID_INCLUDEDIR}/fluid COMPONENT Devel)
+
+###################################
+
+add_definitions(-DQT_NO_KEYWORDS)
+
+set(SOURCES
+    dateutils.cpp
+)
+
+add_library(Fluid SHARED ${SOURCES})
+
+target_link_libraries(Fluid
+    PUBLIC
+        Qt5::Core
+)
+
+##################################################
+
+generate_export_header(Fluid EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/Fluid/fluid/fluid_export.h)
+
+target_include_directories(Fluid INTERFACE "$<INSTALL_INTERFACE:${FLUID_INCLUDEDIR}>")
+
+set_target_properties(Fluid PROPERTIES
+                      VERSION ${PROJECT_VERSION}
+                      SOVERSION ${PROJECT_SOVERSION})
+
+ecm_generate_headers(Fluid_CamelCase_HEADERS
+  HEADER_NAMES
+    DateUtils
+  REQUIRED_HEADERS
+    Fluid_HEADERS
+  PREFIX
+    Fluid
+  OUTPUT_DIR
+    ${CMAKE_CURRENT_BINARY_DIR}/Fluid
+)
+install(FILES ${Fluid_CamelCase_HEADERS}
+        DESTINATION ${FLUID_INCLUDEDIR}/Fluid
+        COMPONENT Devel)
+
+install(TARGETS Fluid EXPORT FluidTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
+install(
+    FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/Fluid/fluid/fluid_export.h
+      dateutils.h
+    DESTINATION
+      ${FLUID_INCLUDEDIR}/fluid
+    COMPONENT
+      Devel
+)
+
+install(EXPORT FluidTargets
+        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+        FILE FluidTargets.cmake NAMESPACE Fluid::)
diff --git a/prototype_2016/third_party/fluid/src/FluidConfig.cmake.in b/prototype_2016/third_party/fluid/src/FluidConfig.cmake.in
new file mode 100644
index 0000000..8cbfe85
--- /dev/null
+++ b/prototype_2016/third_party/fluid/src/FluidConfig.cmake.in
@@ -0,0 +1,11 @@
+@PACKAGE_INIT@
+
+find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
+find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
+find_dependency(Qt5Qml @REQUIRED_QT_VERSION@)
+find_dependency(Qt5Quick @REQUIRED_QT_VERSION@)
+find_dependency(Qt5QuickControls2 @REQUIRED_QT_VERSION@)
+
+set(FLUID_CMAKE_MODULES_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
+include("${FLUID_CMAKE_MODULES_DIR}/FluidTargets.cmake")
diff --git a/prototype_2016/third_party/fluid/src/dateutils.cpp b/prototype_2016/third_party/fluid/src/dateutils.cpp
new file mode 100644
index 0000000..62e6903
--- /dev/null
+++ b/prototype_2016/third_party/fluid/src/dateutils.cpp
@@ -0,0 +1,82 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include "dateutils.h"
+
+using namespace Fluid;
+
+QString DateUtils::formatDuration(qlonglong duration, DurationFormat format, DurationType type)
+{
+    int hours = duration / (1000 * 60 * 60);
+    int minutes = duration / (1000 * 60) - 60 * hours;
+    int seconds = duration / 1000 - 60 * minutes - 60 * 60 * hours;
+
+    QString string;
+
+    if (type == Any || type == Seconds) {
+        if (format == Short)
+            string = QStringLiteral("%1").arg(seconds, 2, 10, QChar('0'));
+        else
+            string = QStringLiteral("%1s").arg(seconds);
+    }
+
+    if (type == Seconds || type == Minutes || (type == Any && (minutes >= 1 || hours >= 1))) {
+        if (format == Short) {
+            if (string.length() > 0)
+                string = QStringLiteral("%1:%2").arg(minutes, 2, 10, QChar('0')).arg(string);
+            else
+                string = QStringLiteral("%1").arg(minutes, 2, 10, QChar('0'));
+        } else {
+            string = QStringLiteral("%1m %2").arg(minutes).arg(string);
+        }
+    }
+
+    if (type == Seconds || type == Minutes || type == Hours || (type == Any && (hours >= 1))) {
+        if (format == Short) {
+            if (string.length() > 0)
+                string = QStringLiteral("%1:%2").arg(hours).arg(string);
+            else
+                string = QStringLiteral("%1").arg(hours);
+        } else {
+            string = QStringLiteral("%1h %2").arg(hours).arg(string);
+        }
+    }
+
+    return string.trimmed();
+}
+
+QString DateUtils::friendlyTime(const QDateTime &time, bool standalone)
+{
+    QDateTime now = QDateTime::currentDateTime();
+    qint64 minutes = qRound64(time.secsTo(now) / 60.0f);
+    if (minutes < 1)
+        return standalone ? tr("Now") : "now";
+    else if (minutes == 1)
+        return tr("1 minute ago");
+    else if (minutes < 60)
+        return tr("%1 minutes ago").arg(minutes);
+    qint64 hours = qRound64(minutes / 60.0f);
+    if (hours == 1)
+        return tr("1 hour ago");
+    else if (hours < 24)
+        return tr("%1 hours ago").arg(hours);
+    qint64 days = qRound64(hours / 24.0f);
+    if (days == 1)
+        return tr("1 day ago");
+    else if (days <= 10)
+        return tr("%1 days ago").arg(days);
+    QString string = time.toString();
+    return standalone ? string : tr("on %1").arg(string);
+}
diff --git a/prototype_2016/third_party/fluid/src/dateutils.h b/prototype_2016/third_party/fluid/src/dateutils.h
new file mode 100644
index 0000000..e49cbac
--- /dev/null
+++ b/prototype_2016/third_party/fluid/src/dateutils.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#pragma once
+
+#ifdef FLUID_LOCAL
+    #define FLUID_EXPORT
+#else
+    #include <Fluid/fluid/fluid_export.h>
+#endif
+#include <QtCore/QObject>
+#include <QtCore/QDateTime>
+
+namespace Fluid {
+
+class FLUID_EXPORT DateUtils : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum DurationFormat { Long, Short };
+    Q_ENUM(DurationFormat)
+
+    enum DurationType { Seconds, Minutes, Hours, Any };
+    Q_ENUM(DurationType)
+
+    static QString formatDuration(qlonglong duration, DurationFormat format = Short,
+                                  DurationType type = Any);
+    static QString friendlyTime(const QDateTime &time, bool standalone);
+};
+
+} // namespace Fluid
diff --git a/prototype_2016/third_party/fluid/src/src.pri b/prototype_2016/third_party/fluid/src/src.pri
new file mode 100644
index 0000000..6b73833
--- /dev/null
+++ b/prototype_2016/third_party/fluid/src/src.pri
@@ -0,0 +1,5 @@
+HEADERS += \
+    $$PWD/dateutils.h
+
+SOURCES += \
+    $$PWD/dateutils.cpp
diff --git a/prototype_2016/third_party/fluid/tests/CMakeLists.txt b/prototype_2016/third_party/fluid/tests/CMakeLists.txt
new file mode 100644
index 0000000..0653827
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(auto)
diff --git a/prototype_2016/third_party/fluid/tests/auto/CMakeLists.txt b/prototype_2016/third_party/fluid/tests/auto/CMakeLists.txt
new file mode 100644
index 0000000..27e47a2
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/CMakeLists.txt
@@ -0,0 +1,7 @@
+if(NOT USE_SUPERBUILD)
+    add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -VV)
+endif()
+
+add_subdirectory(controls)
+add_subdirectory(core)
+add_subdirectory(material)
diff --git a/prototype_2016/third_party/fluid/tests/auto/controls/CMakeLists.txt b/prototype_2016/third_party/fluid/tests/auto/controls/CMakeLists.txt
new file mode 100644
index 0000000..ee473f8
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/controls/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(SOURCES controls.cpp)
+
+set(CMAKE_MACOSX_BUNDLE FALSE)
+
+add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_executable(tst_controls ${SOURCES})
+target_link_libraries(tst_controls Qt5::Qml Qt5::Test Qt5::QuickTest)
+add_test(tst_controls tst_controls)
+add_dependencies(check tst_controls)
diff --git a/prototype_2016/third_party/fluid/tests/auto/controls/controls.cpp b/prototype_2016/third_party/fluid/tests/auto/controls/controls.cpp
new file mode 100644
index 0000000..1d14afc
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/controls/controls.cpp
@@ -0,0 +1,16 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QtQuickTest/QtQuickTest>
+QUICK_TEST_MAIN(tst_controls)
diff --git a/prototype_2016/third_party/fluid/tests/auto/controls/tst_icon.qml b/prototype_2016/third_party/fluid/tests/auto/controls/tst_icon.qml
new file mode 100644
index 0000000..6d3fc26
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/controls/tst_icon.qml
@@ -0,0 +1,83 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Fluid.Controls 1.0
+import QtQuick.Controls.Material 2.0
+
+Icon {
+    id: icon
+
+    TestCase {
+        name: "IconTests"
+        when: windowShown
+
+        function test_source_should_use_desktop_provider_for_freedesktop_icon() {
+            icon.name = 'edit-cut-symbolic'
+
+            compare(icon.source, 'image://fluidicontheme/edit-cut-symbolic')
+        }
+
+        function test_source_should_use_icon_prefix_for_material_icon() {
+            icon.name = 'action/settings'
+
+            compare(icon.source, 'image://fluidicons/action/settings')
+        }
+
+        function test_source_should_use_file_url_for_file_name() {
+            icon.name = '/path/to/icon.png'
+
+            compare(icon.source, 'file:///path/to/icon.png')
+        }
+
+        function test_source_should_use_file_url_for_file_url() {
+            icon.name = 'file:///path/to/icon.png'
+
+            compare(icon.source, 'file:///path/to/icon.png')
+        }
+
+        function test_colorize_should_be_true_for_material_icon() {
+            icon.name = 'action/settings'
+
+            compare(icon.colorize, true)
+        }
+
+        function test_colorize_should_be_true_for_symbolic_icon() {
+            icon.name = 'edit-cut-symbolic'
+
+            compare(icon.colorize, true)
+        }
+
+        function test_colorize_should_be_false_for_regular_icon() {
+            icon.name = 'gimp'
+
+            compare(icon.colorize, false)
+        }
+
+        function test_color_should_be_light_icon_color_for_light_theme() {
+            icon.Material.theme = Material.Light
+
+            // Colors must be converted to strings for compare to work
+            compare(String(icon.color), String(FluidStyle.iconColorLight))
+        }
+
+        function test_color_should_be_dark_icon_color_for_dark_theme() {
+            icon.Material.theme = Material.Dark
+
+            // Colors must be converted to strings for compare to work
+            compare(String(icon.color), String(FluidStyle.iconColorDark))
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/tests/auto/controls/tst_listitem.qml b/prototype_2016/third_party/fluid/tests/auto/controls/tst_listitem.qml
new file mode 100644
index 0000000..1f10ee1
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/controls/tst_listitem.qml
@@ -0,0 +1,123 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import QtTest 1.0
+import Fluid.Controls 1.0
+
+Item {
+    width: 400
+    height: 400
+
+    Column {
+        anchors.fill: parent
+
+        ListItem {
+            id: listItem
+
+            width: 200
+
+            SignalSpy {
+                id: clickedSpy
+                target: listItem
+                signalName: "clicked"
+            }
+        }
+
+        ListItem {
+            id: listItemWithSubtext1
+
+            maximumLineCount: 2
+            subText: "Random Text"
+        }
+
+        ListItem {
+            id: listItemWithSubtext2
+
+            maximumLineCount: 3
+            subText: "Random Text"
+        }
+
+        ListItem {
+            id: listItemWithSecondaryItem
+
+            secondaryItem: Button {}
+        }
+
+        ListItem {
+            id: listItemWithoutSecondaryItem
+        }
+
+        ListItem {
+            id: listItemWithLeftItem
+
+            iconName: "action/settings"
+        }
+
+        ListItem {
+            id: listItemWithRightItem
+
+            text: "Random Text"
+            rightItem: ComboBox {
+                anchors.centerIn: parent
+                textRole: "text"
+                model: ListModel {
+                    ListElement { text: "One"; value: 1 }
+                    ListElement { text: "Two"; value: 2 }
+                }
+            }
+        }
+    }
+
+    TestCase {
+        name: "ListItemTests"
+        when: windowShown
+
+        function test_leftItem_shows_when_iconName_is_set() {
+            var leftItem = findChild(listItem, "leftItem")
+
+            compare(leftItem.showing, false)
+
+            listItem.iconName = "action/settings"
+
+            compare(leftItem.showing, true)
+        }
+
+        function test_click_isnt_eaten_by_ripple() {
+            clickedSpy.clear()
+
+            mouseClick(listItem)
+
+            compare(clickedSpy.count, 1)
+        }
+
+        function test_implicit_height() {
+            compare(listItemWithSubtext1.implicitHeight, 72)
+
+            compare(listItemWithSubtext2.implicitHeight, 88)
+
+            var secondaryItem = findChild(listItemWithSecondaryItem, "secondaryItem")
+            compare(listItemWithSecondaryItem.implicitHeight, secondaryItem.childrenRect.height + Units.smallSpacing * 2)
+
+            compare(listItemWithoutSecondaryItem.implicitHeight, 48)
+
+            var leftItem = findChild(listItemWithLeftItem, "leftItem")
+            compare(listItemWithLeftItem.implicitHeight, 48)
+
+            var rightItem = findChild(listItemWithRightItem, "rightItem")
+            compare(listItemWithRightItem.implicitHeight, rightItem.childrenRect.height + Units.smallSpacing * 2)
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/tests/auto/core/CMakeLists.txt b/prototype_2016/third_party/fluid/tests/auto/core/CMakeLists.txt
new file mode 100644
index 0000000..dbe79a9
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/core/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(SOURCES core.cpp)
+
+set(CMAKE_MACOSX_BUNDLE FALSE)
+
+add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_executable(tst_core ${SOURCES})
+target_link_libraries(tst_core Qt5::Qml Qt5::Test Qt5::QuickTest)
+add_test(tst_core tst_core)
+add_dependencies(check tst_core)
diff --git a/prototype_2016/third_party/fluid/tests/auto/core/core.cpp b/prototype_2016/third_party/fluid/tests/auto/core/core.cpp
new file mode 100644
index 0000000..7983d3e
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/core/core.cpp
@@ -0,0 +1,16 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QtQuickTest/QtQuickTest>
+QUICK_TEST_MAIN(tst_core)
diff --git a/prototype_2016/third_party/fluid/tests/auto/core/tst_clipboard.qml b/prototype_2016/third_party/fluid/tests/auto/core/tst_clipboard.qml
new file mode 100644
index 0000000..9c99cd6
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/core/tst_clipboard.qml
@@ -0,0 +1,59 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Fluid.Core 1.0
+
+TestCase {
+    name: "ClipboardTests"
+
+    Clipboard {
+        id: clipboard
+    }
+
+    SignalSpy {
+        id: textChangedSpy
+        target: clipboard
+        signalName: "textChanged"
+    }
+
+    function test_clipboard_works() {
+        var text = "Hello World"
+
+        clipboard.text = text
+
+        compare(clipboard.text, text)
+    }
+
+    function tests_setting_text_should_fire_textChanged() {
+        clipboard.text = ""
+
+        textChangedSpy.clear()
+
+        clipboard.text = "Random Text"
+
+        compare(textChangedSpy.count, 1)
+    }
+
+    function test_clear_should_fire_textChanged() {
+        clipboard.text = "Non empty text"
+
+        textChangedSpy.clear()
+
+        clipboard.clear()
+
+        compare(textChangedSpy.count, 1)
+    }
+}
diff --git a/prototype_2016/third_party/fluid/tests/auto/core/tst_utils.qml b/prototype_2016/third_party/fluid/tests/auto/core/tst_utils.qml
new file mode 100644
index 0000000..9d977a9
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/core/tst_utils.qml
@@ -0,0 +1,38 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Fluid.Core 1.0
+
+TestCase {
+    name: "UtilsTests"
+
+    function test_blendColors() {
+        compare(Utils.blendColors("lightsteelblue", "#10FF0000", 0.5), "#80b5b8d0")
+    }
+
+    function test_luminance() {
+        compare(Utils.luminance("lightsteelblue"), 0.7593254230563821)
+    }
+
+    function test_isDarkColor_should_return_true_for_dark_color() {
+        compare(Utils.isDarkColor("#455A64"), true)
+    }
+
+    function test_isDarkColor_should_return_false_for_light_color() {
+        compare(Utils.isDarkColor("#B0BEC5"), false)
+    }
+}
diff --git a/prototype_2016/third_party/fluid/tests/auto/material/CMakeLists.txt b/prototype_2016/third_party/fluid/tests/auto/material/CMakeLists.txt
new file mode 100644
index 0000000..78db8aa
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/material/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(SOURCES material.cpp)
+
+set(CMAKE_MACOSX_BUNDLE FALSE)
+
+add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
+
+qt5_add_resources(RESOURCES material.qrc)
+
+add_executable(tst_material ${SOURCES} ${RESOURCES})
+target_link_libraries(tst_material Qt5::Qml Qt5::QuickControls2 Qt5::Test Qt5::QuickTest)
+add_test(tst_material tst_material)
+add_dependencies(check tst_material)
diff --git a/prototype_2016/third_party/fluid/tests/auto/material/material.cpp b/prototype_2016/third_party/fluid/tests/auto/material/material.cpp
new file mode 100644
index 0000000..0d0bd81
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/material/material.cpp
@@ -0,0 +1,16 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+#include <QtQuickTest/QtQuickTest>
+QUICK_TEST_MAIN(tst_material)
diff --git a/prototype_2016/third_party/fluid/tests/auto/material/material.qrc b/prototype_2016/third_party/fluid/tests/auto/material/material.qrc
new file mode 100644
index 0000000..e313f5e
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/material/material.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+    <file>qtquickcontrols2.conf</file>
+</qresource>
+</RCC>
diff --git a/prototype_2016/third_party/fluid/tests/auto/material/qtquickcontrols2.conf b/prototype_2016/third_party/fluid/tests/auto/material/qtquickcontrols2.conf
new file mode 100644
index 0000000..b6c7c87
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/material/qtquickcontrols2.conf
@@ -0,0 +1,2 @@
+[Controls]
+Style=Material
diff --git a/prototype_2016/third_party/fluid/tests/auto/material/tst_ripple.qml b/prototype_2016/third_party/fluid/tests/auto/material/tst_ripple.qml
new file mode 100644
index 0000000..b79b18e
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/material/tst_ripple.qml
@@ -0,0 +1,88 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Fluid.Material 1.0
+
+Ripple {
+    id: ripple
+
+    width: 100
+    height: 100
+
+    TestCase {
+        name: "RippleTests"
+        when: windowShown
+
+        function test_mouse_press_shows_ripple() {
+            compare(getRipples().length, 0)
+            mousePress(ripple)
+            compare(getRipples().length, 1)
+            mouseRelease(ripple)
+            wait(1000)
+        }
+
+        function test_mouse_up_hides_ripple() {
+            mouseClick(ripple)
+            compare(getRipples().length, 1)
+            wait(1000)
+            compare(getRipples().length, 0)
+        }
+
+        function test_focused_ripple_shows_focus_background() {
+            var focusBackground = findChild(ripple, "focusBackground")
+            compare(focusBackground.opacity, 0)
+
+            ripple.focused = true
+            wait(1000)
+
+            compare(focusBackground.opacity, 1)
+
+            ripple.focused = false
+            wait(1000)
+        }
+
+        function test_focused_ripple_shows_focus_ripple() {
+            var focusRipple = findChild(ripple, "focusRipple")
+            compare(focusRipple.opacity, 0)
+
+            ripple.focused = true
+            wait(1000)
+
+            compare(focusRipple.opacity, 1)
+
+            ripple.focused = false
+            wait(1000)
+        }
+
+        function getRipples() {
+            return filteredChildren("tapRipple")
+        }
+
+        function filteredChildren(objectName) {
+            var filtered = []
+
+            for (var i = 0; i < ripple.children.length; i++) {
+                var child = ripple.children[i]
+
+                if (child.objectName == objectName) {
+                    filtered.push(child)
+                }
+            }
+
+            return filtered
+        }
+    }
+}
diff --git a/prototype_2016/third_party/fluid/tests/auto/material/tst_typography.qml b/prototype_2016/third_party/fluid/tests/auto/material/tst_typography.qml
new file mode 100644
index 0000000..3a328fb
--- /dev/null
+++ b/prototype_2016/third_party/fluid/tests/auto/material/tst_typography.qml
@@ -0,0 +1,166 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * 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/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Fluid.Core 1.0
+import Fluid.Controls 1.0
+import QtQuick.Controls 2.0
+
+TestCase {
+    id: testCase
+    name: "TypographyTests"
+    width: 200
+    height: 200
+    visible: true
+    when: windowShown
+
+    Component {
+        id: displayLabelComponent
+        DisplayLabel {}
+    }
+
+    Component {
+        id: bodyLabelComponent
+        BodyLabel {}
+    }
+
+    Component {
+        id: captionLabelComponent
+        CaptionLabel {}
+    }
+
+    Component {
+        id: headlineLabelComponent
+        HeadlineLabel {}
+    }
+
+    Component {
+        id: subheadingLabelComponent
+        SubheadingLabel {}
+    }
+
+    Component {
+        id: titleLabelComponent
+        TitleLabel {}
+    }
+
+    function test_display_label() {
+        var displayLabel = displayLabelComponent.createObject(testCase)
+        verify(displayLabel)
+
+        // FIXME: We can't apparently access +material from tests,
+        // hence these test will fail
+        return
+
+        displayLabel.level = 1
+        compare(displayLabel.font.pixelSize, 34)
+        compare(displayLabel.font.weight, Font.Normal)
+        displayLabel.level = 2
+        compare(displayLabel.font.pixelSize, 45)
+        compare(displayLabel.font.weight, Font.Normal)
+        displayLabel.level = 3
+        compare(displayLabel.font.pixelSize, 56)
+        compare(displayLabel.font.weight, Font.Normal)
+        displayLabel.level = 4
+        compare(displayLabel.font.pixelSize, 112)
+        compare(displayLabel.font.weight, Font.Light)
+    }
+
+    function test_body_label() {
+        var bodyLabel = bodyLabelComponent.createObject(testCase)
+        verify(bodyLabel)
+
+        // FIXME: We can't apparently access +material from tests,
+        // hence these test will fail
+        return
+
+        bodyLabel.level = 1
+        if (Device.isMobile)
+            compare(bodyLabel.font.pixelSize, 14)
+        else
+            compare(bodyLabel.font.pixelSize, 13)
+        compare(bodyLabel.lineHeight, 20.0)
+        compare(bodyLabel.lineHeightMode, Text.FixedHeight)
+
+        bodyLabel.level = 2
+        if (Device.isMobile)
+            compare(bodyLabel.font.pixelSize, 14)
+        else
+            compare(bodyLabel.font.pixelSize, 13)
+        compare(bodyLabel.lineHeight, 24.0)
+        compare(bodyLabel.lineHeightMode, Text.FixedHeight)
+    }
+
+    function test_caption_label() {
+        var captionLabel = captionLabelComponent.createObject(testCase)
+        verify(captionLabel)
+
+        // FIXME: We can't apparently access +material from tests,
+        // hence these test will fail
+        return
+
+        compare(captionLabel.font.pixelSize, 12)
+    }
+
+    function test_headline_label() {
+        var headlineLabel = headlineLabelComponent.createObject(testCase)
+        verify(headlineLabel)
+
+        // FIXME: We can't apparently access +material from tests,
+        // hence these test will fail
+        return
+
+        compare(headlineLabel.font.pixelSize, 24)
+        compare(headlineLabel.lineHeight, 32.0)
+        compare(headlineLabel.lineHeightMode, Text.FixedHeight)
+    }
+
+    function test_subheading_label() {
+        var subheadingLabel = subheadingLabelComponent.createObject(testCase)
+        verify(subheadingLabel)
+
+        // FIXME: We can't apparently access +material from tests,
+        // hence these test will fail
+        return
+
+        subheadingLabel.level = 1
+        if (Device.isMobile)
+            compare(subheadingLabel.font.pixelSize, 16)
+        else
+            compare(subheadingLabel.font.pixelSize, 15)
+        compare(subheadingLabel.lineHeight, 24.0)
+        compare(subheadingLabel.lineHeightMode, Text.FixedHeight)
+
+        subheadingLabel.level = 2
+        if (Device.isMobile)
+            compare(subheadingLabel.font.pixelSize, 16)
+        else
+            compare(subheadingLabel.font.pixelSize, 15)
+        compare(subheadingLabel.lineHeight, 28.0)
+        compare(subheadingLabel.lineHeightMode, Text.FixedHeight)
+    }
+
+    function test_title_label() {
+        var titleLabel = titleLabelComponent.createObject(testCase)
+        verify(titleLabel)
+
+        // FIXME: We can't apparently access +material from tests,
+        // hence these test will fail
+        return
+
+        compare(titleLabel.font.pixelSize, 20)
+        compare(titleLabel.font.weight, Font.Medium)
+    }
+}
diff --git a/prototype_2016/third_party/qml-material/.builder.yml b/prototype_2016/third_party/qml-material/.builder.yml
deleted file mode 100644
index ad8a1cc..0000000
--- a/prototype_2016/third_party/qml-material/.builder.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-dependencies:
-    - qt5-base
-    - qt5-declarative
-    - qt5-quickcontrols
-    - qt5-svg
-    - qt5-graphicaleffects
-    - cmake
-    - extra-cmake-modules
-build:
-    - cmake {srcdir}
-    - make
-    - make test
diff --git a/prototype_2016/third_party/qml-material/.gitignore b/prototype_2016/third_party/qml-material/.gitignore
deleted file mode 100644
index d3027d1..0000000
--- a/prototype_2016/third_party/qml-material/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-.qmake.stash
-Makefile
-tests/tst_material
-*.o
-*.pro.user*
-build
-*.qmlproject.user*
-*~
-
-deploy_key
-deploy_key.pub
-documentation/ditaxml
-.DS_Store
diff --git a/prototype_2016/third_party/qml-material/.travis.yml b/prototype_2016/third_party/qml-material/.travis.yml
deleted file mode 100644
index 934302a..0000000
--- a/prototype_2016/third_party/qml-material/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-sudo: required
-dist: trusty
-language: generic
-
-install:
-  - sudo add-apt-repository -y ppa:beineri/opt-qt551-trusty
-  - sudo add-apt-repository -y ppa:beineri/opt-qt561-trusty
-  - sudo apt-get update
-  - sudo apt-get -y install pep8 pyflakes python python-pip npm nodejs nodejs-legacy
-  - sudo apt-get -y install qt55declarative qt55quickcontrols qt55graphicaleffects qt55tools qt55svg
-  - sudo apt-get -y install qt56declarative qt56quickcontrols qt56graphicaleffects qt56tools qt56svg
-  - sudo apt-get -y install xvfb
-  - sudo npm install -g jshint
-
-script:
-  - source /opt/qt55/bin/qt55-env.sh
-  - qmake . && make && sudo make install
-  - xvfb-run -a -s "-screen 0 800x600x24" make check
-  - sudo git clean -xfd
-  - source /opt/qt56/bin/qt56-env.sh
-  - qmake . && make && sudo make install
-  - xvfb-run -a -s "-screen 0 800x600x24" make check
-  - sudo git clean -xfd
-  - ./scripts/lint.sh
-
-notifications:
-  slack: papyros:Z7PeY2Y4mh0GWPoypZZNLd3D
diff --git a/prototype_2016/third_party/qml-material/CHANGELOG.md b/prototype_2016/third_party/qml-material/CHANGELOG.md
deleted file mode 100644
index 4d82f88..0000000
--- a/prototype_2016/third_party/qml-material/CHANGELOG.md
+++ /dev/null
@@ -1,200 +0,0 @@
-QML Material CHANGELOG
-======================
-
-### Version 0.2.0 (January 16, 2016)
-
-**Features**
- * General:
-   * Add a showError() function for easily displaying errors
-   * Import the Material.Extras module from a separate git repository
-   * Add details about Material.Extras
-   * Use Settings from QtQuick.Controls for mobile characteristics
-   * Support using simple names for theme colors
- * Action: Have Action extend QtQuick's Action object
- * ActionButton: Follow Action iconName & visible
- * CircleImage: Expose the fillMode property
- * DatePicker: Initial add of the Material DatePicker
- * Platform extensions:
-   * Implement platform extensions for Papyros
-   * Material Design window decorations for Papyros
- * Demo:
-   * Use the new-style simple color names for the theme
-   * Replace account_child with account_circle in the form demo
-   * Modify snackbar demo to show wide and multi-line examples
-   * Set the window title of the demo app
-   * Use async loader for demo components for better performance
-   * Use Flow instead of Grid with variable columns for the icon demo
-   * Add date picker to demo
-   * Change between list and icon view on the icon demo
-   * Update dialog demo to show better examples
-   * Add example customized slider to demo
- * Dialog:
-   * Allow hiding the primary button
-   * Update dialog to latest MD spec
- * Icons:
-   * Add all the new and updated Material icons
-   * Add new and updated Material icons
-   * Update the FontAwesome icons to 4.5.0
-   * Update the Material Design icons
- * ListItem: Expose the list item labels to allow customization
- * MenuField: Simple implementation of a textRole
- * NavigationDrawer: Add NavigationDrawerPage for easy use of nav drawers
- * PageStack:
-   * Add a goBack signal to Page to allow overriding the default back behavior
-   * Allow the page stack to be popped to an arbitrary page
- * ProgressCircle: HiDPI support for ProgressCircle
- * RadioButton and CheckBox: Trigger the click event
- * Slider:
-   * Add customization options to the slider's label knob
-   * Support custom slider tooltips via a valueInfo function
- * Tabs:
-   * Improved tabs support using a TabbedPage
-   * Support disabled tabs
- * TextField:
-   * Support borderless textfields
-   * Update to latest MD spec, add multi-line support
- * TimePicker: Implement a time picker component
- * Tooltip: Improve the tooltip class and split it into a base Popover
-
-**Bug Fixes**
- * General: Fix a bug causing units to be calculated incorrectly
- * ActionBar: Only support plain text in the action bar title
- * BottomSheet: Fix wrong ID
- * Button:
-   * Fix the style of disabled buttons
-   * Fix typo in button width calculation
- * CheckBox: Update the size of the checkbox
- * Demo:
-   * Don't load the demo page twice initially
-   * Properly display the demo window when loading from C++
- * Dropdown:
-   * Close an open dropdown when resizing the app window
-   * Fix Dropdown positioning in window edges
- * IconButton: Fix alignment of the icon in the icon button
- * Ink: Allow concurrent Ink animations
- * ListItem:
-   * Fix content item not showing when it should
-   * Fix divider insets on subtitled list items
-   * Show the list item's sub text when the content item is hidden
-   * Subtitled - Fix invisible secondary item
- * MenuField:
-   * Fix bug that MenuField cannot scroll menu items
-   * Fix TypeError when no item is selected
- * PageSidebar: Properly push and pop the right sidebar actionbar
- * Page: Disable the left action when it is hidden
- * ProgressBar: Fixup style to allow use in async loader
- * ProgressCircle:
-   * Fixup style to allow use in async loader
-   * Fix a incorrect reference to the canvas
-   * Suppress meaningless error
- * RadioButton: centered the checked indicator
- * SimpleMenu: Fix all the binding loop warnings
- * Switch: Fix the groove background to match the spec
- * Tabs:
-   * Fix tabbar when navigating back up the page stack
-   * Initialize tabs to empty
-   * Properly support changing the number of tabs in a TabbedPage
- * TextField:
-   * Fix errors in the text field style
-   * Fixes bad Roboto font rendering on Windows
-
-
-### Version 0.1.0 (May 6, 2015)
-
- * Create a style for theming QtQuick.Controls apps
- * Components
-   * [ActionBar] Control the overflow menu with Android hardware keys
-   * [ActionBar] Elide titles displayed in the action bar
-   * [ActionBar] Hide non-visible actions in the action bar
-   * [ActionBar] Support disabling actions in the action bar
-   * [ActionButton] Add support for the mini and default FAB sizes
-   * [Button] Properly handle dark background for flat buttons
-   * [Dialog] Active focus is passed off when Dialog closes
-   * [Dialog] Add support for full-width content
-   * [Dialog] Correctly handle back button on Android devices
-   * [Icon] Add a valid property to Icon and AwesomeIcon
-   * [Icon] Support custom icons with an iconSource property
-   * [Icon] Update the FontAwesome icon table
-   * [Icon] Update the FontAwesome parsing script to pull from the website
-   * [IconButton] Add animation on mouse over
-   * [InputDialog] Expose the text field and input method
-   * [ListItem] Add a new expandable section header list item
-   * [ListItem] Correctly calculate the width of a simple menu item
-   * [NavigationDrawer] Update the nav drawer to work properly
-   * [PageStack] Pop pages when the Android back button is tapped
-   * [Popup] Support preventing a popup from being dismissed
-   * [RadioButton] Improve selection support
-   * [Tabs] Allow switching tabs programmatically in a page
-   * [Tabs] Capitalize tab titles
-   * [Tabs] Implement the MD spec for coloring tab text
-   * [TextField] Port to QtQuick.Controls
- * Documentation
-   * Publish documentation to http://papyros.io/qml-material
-   * Write brief summaries for all the components
-   * Fix qdoc warnings
- * Demo
-   * Add a Typography section to the demo
-   * Organize the different demos into tabs
-   * Display all the Material Design icons in the Icons demo
-   * Update radio button demo with grouping
- * Testing
-   * Add UI tests for the ActionBar component
-
-
-### Version 0.0.6 (April 16, 2015)
-
- * Add a ProgressCircle component following the Google spec
- * Add a tooltip component and use it in the ActionBar
- * Add an OverlayView component for view transitions  
- * [Snackbar] Bug fixes and style improvements
- * [Button] Remove default Qt Quick Controls padding
- * [SimpleMenu/MenuField] Fixes some binding loops
- * [TextField] Fixes floating label behavior on devices
- * [Action] Support for keybindings in Action
- * [ListItem] Fix bug with Subtitled action not showing
- * [ListItem] Add support for a custom view in the subtitled list item
- * [Button] Add disabled state to button
- * General bug fixing and code refactoring
-
-
-### Version 0.0.5 (March 4, 2015)
-
- * Move popovers as necessary to prevent them being clipped by the window
- * [PageStack] Add support for a divided page and toolbar
- * Rename list item and IconButton onTriggered to onClicked
- * [Toolbar] Add support for custom and extended content in the toolbar
- * [PageStack] Make Page a FocusScope
- * [Dialog] Refactor the dialog code to use anchors
- * [Snackbar] Improve the snackbar and add support for mobile layouts
- * [PageStack] Fix going back from a pushed page
- * [ListItems] Add direct support for icons to Standard
- * [Ink] Polished the ink animations
- * [Dialog] Improved the dialog component
- * [Icon] Switch to using SVGs instead of PNGs
- * [Demo] Add the color palette to the demo
- * [ProgressBar] Port ProgressBar to inherit from QtQuick Controls
- * Minor bug fixes and code improvements
- * [BottomSheet] Add a basic bottom sheet and an action list subclass
-
-
-### Version 0.0.4 (February 20, 2015)
-
- * Hide the CSD window controls when client-side decorations are disabled
- * Improve the dialog component to better follow Material Design
- * Add the Material Design Checkbox component
- * Support replacing the current page in a PageStack
- * Improve the layout of the Subtitled list item
- * Add the Material Design menu field component
- * Improve the layout of the Standard list item
- * Add an equals symbol to the "extra" icon collection
- * Add a right mode to the navigation drawer
- * Allow pages to customize the action count in the toolbar
- * [Palette] Update with color swatches from Material Design
- * [Demo] Add color picker to change theme colors
- * [Dialog] Fix an issue preventing popovers from working
- * [MenuField] Fix issues with the menu not being the right size
- * [Demo] Clean up and refactor the demo
- * [Slider] change check for activeFocus to focus so we can set it
- * [Ink] Remove PRESSED debug message
- * [Theme] Add a method for determining if a color is dark or light
- * [PageStack] Fixes and improvements to the page stack and toolbar
diff --git a/prototype_2016/third_party/qml-material/CONTRIBUTING.md b/prototype_2016/third_party/qml-material/CONTRIBUTING.md
deleted file mode 100644
index 11a51fe..0000000
--- a/prototype_2016/third_party/qml-material/CONTRIBUTING.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Contributing to QML Material
-----------------------------
-
-We welcome contributions to QML Material! This is what makes open source so awesome. We have a few simple guidelines for contributing outlined below.
-
-### Submitting Code
-
-We welcome code contributions via pull requests. Here are some guidelines to follow:
-
- * If your change is more than a simple fix, make sure there is an [issue](https://github.com/quantum-os/qml-material/issues)  open for the change you are making, and that there has been discussion and approval of the correct solution.
-
- * When working on code, try to keep your commits as clean as possible. We have a [commit checklist](https://github.com/quantum-os/quantum-os/wiki/Commit-Checklist) with some guidelines for writing great commits.
-
- * We use [GitFlow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for a strict workflow to ensure that our code remains stable and neatly versioned for end users. So make sure you create your working branch off of `develop`, and submit the pull request back to `develop`.
-
- * Before submitting the pull request, make sure you run the unit tests. Travis CI will test your branch anyway, and we won't merge a pull request until the tests pass, so you should fix them before submitting the pull request.
-
- * Make sure all relevant documentation is updated for the change. If you're adding a new component, please document it.
-
- * If you are adding new features, please add new unit tests that test the changes you added.
-
- * If you're adding a new component, make sure you link to the [Material Design spec](http://www.google.com/design/spec/components/) for it, along with a screenshot of your component.
diff --git a/prototype_2016/third_party/qml-material/LICENSE b/prototype_2016/third_party/qml-material/LICENSE
deleted file mode 100644
index 4362b49..0000000
--- a/prototype_2016/third_party/qml-material/LICENSE
+++ /dev/null
@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library 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 library 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 library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/prototype_2016/third_party/qml-material/LICENSE.CC-BY b/prototype_2016/third_party/qml-material/LICENSE.CC-BY
deleted file mode 100644
index dc8853a..0000000
--- a/prototype_2016/third_party/qml-material/LICENSE.CC-BY
+++ /dev/null
@@ -1,393 +0,0 @@
-Attribution 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-        wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More_considerations
-     for the public: 
-        wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution 4.0 International Public License ("Public License"). To the
-extent this Public License may be interpreted as a contract, You are
-granted the Licensed Rights in consideration of Your acceptance of
-these terms and conditions, and the Licensor grants You such rights in
-consideration of benefits the Licensor receives from making the
-Licensed Material available under these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  d. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  e. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  f. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  g. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  h. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  i. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  j. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  k. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-       4. If You Share Adapted Material You produce, the Adapter's
-          License You apply must not prevent recipients of the Adapted
-          Material from complying with this Public License.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material; and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public licenses.
-Notwithstanding, Creative Commons may elect to apply one of its public
-licenses to material it publishes and in those instances will be
-considered the "Licensor." Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the public
-licenses.
-
-Creative Commons may be contacted at creativecommons.org.
diff --git a/prototype_2016/third_party/qml-material/LICENSE.MPL b/prototype_2016/third_party/qml-material/LICENSE.MPL
deleted file mode 100644
index e69de29..0000000
--- a/prototype_2016/third_party/qml-material/LICENSE.MPL
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/README.md b/prototype_2016/third_party/qml-material/README.md
deleted file mode 100644
index 7c5eb5b..0000000
--- a/prototype_2016/third_party/qml-material/README.md
+++ /dev/null
@@ -1,108 +0,0 @@
-Material Design implemented in QtQuick
-======================================
-
-[![Join the chat at https://gitter.im/papyros/qml-material](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/papyros/qml-material?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-[![License](https://img.shields.io/badge/license-LGPLv2.1%2B-blue.svg)](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
-[![GitHub release](https://img.shields.io/github/release/papyros/qml-material.svg)](https://github.com/papyros/qml-material)
-[![Build Status](https://travis-ci.org/papyros/qml-material.svg?branch=develop)](https://travis-ci.org/papyros/qml-material)
-[![GitHub issues](https://img.shields.io/github/issues/papyros/qml-material.svg)](https://github.com/papyros/qml-material/issues)
-[![Bountysource](https://img.shields.io/bountysource/team/papyros/activity.svg)](https://www.bountysource.com/teams/papyros)
-
-This is a library of QML widgets implementing Google's [Material Design](https://www.google.com/design/spec). It is completely cross platform, and runs on Linux, OS X, and Windows. It may also run on iOS and Android, though those platforms have not been tested and are not currently officially supported.
-
-Brought to you by the [Papyros development team](https://github.com/papyros/qml-material/graphs/contributors).
-
-### Dependencies
-
- * Qt 5.5 or higher
-
-### Per-project installation using QPM
-
-QPM package coming soon!
-
-Just install using:
-
-    qpm install io.papyros.material
-
-If you want to bundle the Roboto fonts in your project, file **ABOVE** the `include(vendor/vendor.pri)` line, add the following line:
-
-    OPTIONS += roboto
-
-### Per-project installation using git submodules and QMake
-
-Add the submodule:
-
-    git submodule add git@github.com:papyros/qml-material.git material
-
-Add the following DEFINE and `.pri` file to your project:
-
-    DEFINES += QPM_INIT\\(E\\)=\"E.addImportPath(QStringLiteral(\\\"qrc:/\\\"));\"
-
-    include(material/material.pri)
-
-Then, in your `main.cpp` file or wherever you set up a `QQmlApplicationEngine`, call `QPM_INIT` on the engine like this:
-
-    QQmlApplicationEngine engine;
-    QPM_INIT(engine)
-    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
-
-You should then be able to `import Material 0.3` from your QML.
-
-To optionally bundle the Roboto fonts in your project, add this line **ABOVE** the previously added `include()`:
-
-    OPTIONS += roboto
-
-### Per-project installation using git submodules and CMake
-
-Add the submodule:
-
-    git submodule add git@github.com:papyros/qml-material.git material
-
-Add the following lines to your project's `CMakeLists.txt`, and make sure you add `${VENDOR_SOURCES}` to your `add_executable` line:
-
-    add_definitions("-DQPM_INIT\\(E\\)=E.addImportPath\\(QStringLiteral\\(\\\"qrc:/\\\"\\)\\)\\;")
-
-    include(material/vendor.cmake)
-
-Then, in your `main.cpp` file or wherever you set up a `QQmlApplicationEngine`, call `QPM_INIT` on the engine like this:
-
-    QQmlApplicationEngine engine;
-    QPM_INIT(engine)
-    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
-
-You should then be able to `import Material 0.3` from your QML.
-
-Check out [this example](https://github.com/iBeliever/bible-app) of an app using QML Material and CMake if you need further guidance.
-
-### System-wide installation
-
-From the root of the repository, run:
-
-    mkdir build; cd build
-    qmake ..
-    make
-    make install # use sudo if necessary
-
-Now check out the `demo` folder to see how to use Material Design from QtQuick!
-
-### Icons usage
-
-When using the `Icon` component or the `iconName` property, qml-material looks for icons in the form of `qrc:/icons/<category>/<name>.svg`. Only a core set of icons used by qml-material icons are actually bundled with qml-material. To use icons in your own programs, you can either manually create a qrc file, or you can create `icons.yml` file and use the `icons.py` script from qml-material.
-
-To use the `icons.py` script, create a file called `icons.yml` that looks like this:
-
-    icons:
-      - action/settings
-      - alert/warning
-      - ...
-
-Run `icons.py`, located in the `scripts` folder of the repository. This will download the latest version of all the icons listed in this file, storing them in a folder called `icons`. It also generates a resource file called `icons/icons.qrc`, which you should add to your QMake or CMake project.
-
-Now whenever you add icons to the `icons.yml` file, just rerun `icons.py` and the new icons will be downloaded. To update your icons, just delete the `icons` folder and rerun `icons.py`.
-
-### Licensing
-
-QML Material is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
-
-The Material Design icons by Google are released under an [Attribution 4.0 International](http://creativecommons.org/licenses/by/4.0/) license. The icons are directly copied from Google's GitHub repository at https://github.com/google/material-design-icons.
diff --git a/prototype_2016/third_party/qml-material/demo/BottomSheetDemo.qml b/prototype_2016/third_party/qml-material/demo/BottomSheetDemo.qml
deleted file mode 100644
index e73344c..0000000
--- a/prototype_2016/third_party/qml-material/demo/BottomSheetDemo.qml
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- * Copyright (C) 2015 Steve Coffey <scoffey@barracuda.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 Material 0.2
-import Material.ListItems 0.1
-
-Item {
-    anchors.fill: parent
-    id: bottomSheetDemo
-
-    Button {
-        anchors.centerIn: parent
-        elevation: 1
-        text: "Open Bottom Sheet"
-        onClicked: {
-            actionSheet.open()
-        }
-    }
-
-    BottomActionSheet {
-        id: actionSheet
-
-        title: "Demo!"
-
-        actions: [
-            Action {
-                iconName: "social/share"
-                name: "Share"
-            },
-
-            Action {
-                iconName: "file/file_download"
-                name: "Download (Disabled)"
-                enabled: false
-            },
-
-            Action {
-                iconName: "action/autorenew"
-                name: "THIS SHOULD BE HIDDEN"
-                visible: false
-            },
-
-            Action {
-                iconName: "action/settings"
-                name: "Details"
-                hasDividerAfter: true
-            },
-
-            Action {
-                iconName: "content/forward"
-                name: "Move"
-            },
-
-            Action {
-                iconName: "action/delete"
-                name: "Delete"
-            },
-
-            Action {
-                iconName: "content/create"
-                name: "Rename"
-            }
-        ]    
-    }
-}
-
diff --git a/prototype_2016/third_party/qml-material/demo/ButtonDemo.qml b/prototype_2016/third_party/qml-material/demo/ButtonDemo.qml
deleted file mode 100644
index df74e45..0000000
--- a/prototype_2016/third_party/qml-material/demo/ButtonDemo.qml
+++ /dev/null
@@ -1,89 +0,0 @@
-import QtQuick 2.4
-import Material 0.2
-import QtQuick.Controls 1.3 as Controls
-
-Item {
-
-    Column {
-        anchors.centerIn: parent
-        spacing: dp(20)
-
-        Button {
-            text: "Simple Button"
-            anchors.horizontalCenter: parent.horizontalCenter
-            onClicked: snackbar.open("Simple, isn't it?")
-        }
-
-        Button {
-            text: "Raised Button"
-            elevation: 1
-            anchors.horizontalCenter: parent.horizontalCenter
-            onClicked: snackbar.open("This is a snackbar")
-        }
-
-        Button {
-            text: "Disabled Raised Button"
-            elevation: 1
-            enabled: false
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        Button {
-            text: "Wide Button"
-
-            width: dp(200)
-            elevation: 1
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            onClicked: snackbar.open("That button is wide, and so is this snackbar!")
-        }
-
-        Button {
-            id: focusableButton
-            text: "Focusable with really long text"
-            elevation: 1
-            activeFocusOnPress: true
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            onClicked: snackbar.open("The text is really very very very very very long and now it needs to wrap, so this should show as two lines!")
-        }
-
-        Button {
-            text: "Colored button"
-            textColor: Theme.accentColor
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            onClicked: snackbar.open("That button is colored!")
-        }
-
-        Button {
-            text: "Focusable button #2"
-            elevation: 1
-            activeFocusOnPress: true
-            backgroundColor: Theme.primaryColor
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            onClicked: snackbar.open("That button is colored!")
-        }
-    }
-
-    ActionButton {
-        anchors {
-            right: parent.right
-            bottom: snackbar.top
-            margins: dp(32)
-        }
-
-        action: Action {
-            id: addContent
-            text: "&Copy"
-            shortcut: "Ctrl+C"
-            onTriggered: snackbar.open("We do actions too!")
-        }
-        iconName: "content/add"
-    }
-
-    Snackbar {
-        id: snackbar
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/CheckBoxDemo.qml b/prototype_2016/third_party/qml-material/demo/CheckBoxDemo.qml
deleted file mode 100644
index 27f626e..0000000
--- a/prototype_2016/third_party/qml-material/demo/CheckBoxDemo.qml
+++ /dev/null
@@ -1,74 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.2
-
-ColumnLayout {
-    spacing: 0
-
-    Repeater {
-        model: 2
-
-        Rectangle {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            Layout.minimumHeight: grid.height + dp(80)
-            Layout.minimumWidth: grid.width + dp(80)
-            color: index == 0 ? "#EEE" : "#333"
-
-            GridLayout {
-                id: grid
-                anchors.centerIn: parent
-                columns: 3
-
-                // Empty filler
-                Item { width: 1; height: 1 }
-
-                Label {
-                    Layout.alignment : Qt.AlignHCenter
-                    text: "Normal"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Label {
-                    Layout.alignment : Qt.AlignHCenter
-                    text: "Disabled"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Label {
-                    text: "On"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                CheckBox {
-                    checked: true
-                    text: "On"
-                    darkBackground: index == 1
-                }
-
-                CheckBox {
-                    checked: true
-                    enabled: false
-                    text: "Disabled"
-                    darkBackground: index == 1
-                }
-
-                Label {
-                    text: "Off"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                CheckBox {
-                    text: "Off"
-                    darkBackground: index == 1
-                }
-
-                CheckBox {
-                    text: "Disabled"
-                    enabled: false
-                    darkBackground: index == 1
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/ColorPaletteDemo.qml b/prototype_2016/third_party/qml-material/demo/ColorPaletteDemo.qml
deleted file mode 100644
index 0f8a748..0000000
--- a/prototype_2016/third_party/qml-material/demo/ColorPaletteDemo.qml
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- * Copyright (C) 2015 Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
- *
- * 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.2
-
-Item {
-    implicitHeight: palette.height
-
-    GridLayout {
-        id: palette
-        anchors.centerIn: parent
-        width: parent.width
-        columns: parseInt(parent.width / dp(300)) || 1
-        rowSpacing: dp(20)
-
-        Repeater {
-            model: [ "Red", "Pink", "Purple", "Deep Purple", "Indigo",
-                     "Blue", "Light Blue", "Cyan", "Teal", "Green",
-                     "Light Green", "Lime", "Yellow", "Amber", "Orange",
-                     "Deep Orange", "Grey", "Blue Grey", "Brown" ]
-
-            ColumnLayout {
-                Layout.alignment: Qt.AlignCenter
-                spacing: dp(5)
-                property var currentColor: modelData.charAt(0).toLowerCase() +
-                                           modelData.slice(1).replace(" ", "")
-
-                Rectangle {
-                    width: dp(300)
-                    height: dp(126)
-                    color: Palette.colors[currentColor]["500"]
-
-                    Label {
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.margins: dp(16)
-                        text: modelData
-                        style: "body2"
-                        color: Theme.lightDark(parent.color,
-                                               Theme.light.textColor,
-                                               Theme.dark.textColor)
-                    }
-
-                    Label {
-                        anchors.left: parent.left
-                        anchors.bottom: parent.bottom
-                        anchors.margins: dp(16)
-                        text: "500"
-                        style: "body2"
-                        color: Theme.lightDark(parent.color,
-                                               Theme.light.textColor,
-                                               Theme.dark.textColor)
-                    }
-
-                    Label {
-                        anchors.right: parent.right
-                        anchors.bottom: parent.bottom
-                        anchors.margins: dp(16)
-                        text: Palette.colors[currentColor]["500"]
-                        style: "body2"
-                        color: Theme.lightDark(parent.color,
-                                               Theme.light.textColor,
-                                               Theme.dark.textColor)
-                    }
-                }
-
-                ColumnLayout {
-                    spacing: 0
-
-                    Repeater {
-                        model: ["100", "200", "300", "400", "600", "700", "800", "900"]
-
-                        Rectangle {
-                            width: dp(300)
-                            height: dp(46)
-                            color: Palette.colors[currentColor][modelData]
-
-                            Label {
-                                anchors.left: parent.left
-                                anchors.margins: dp(16)
-                                anchors.verticalCenter: parent.verticalCenter
-                                text: modelData
-                                style: "body2"
-                                color: Theme.lightDark(parent.color,
-                                                       Theme.light.textColor,
-                                                       Theme.dark.textColor)
-                            }
-
-                            Label {
-                                anchors.right: parent.right
-                                anchors.margins: dp(16)
-                                anchors.verticalCenter: parent.verticalCenter
-                                text: Palette.colors[currentColor][modelData]
-                                style: "body2"
-                                color: Theme.lightDark(parent.color,
-                                                       Theme.light.textColor,
-                                                       Theme.dark.textColor)
-                            }
-                        }
-                    }
-                }
-
-                ColumnLayout {
-                    spacing: 0
-                    visible: typeof Palette.colors[currentColor]["A100"] != 'undefined'
-
-                    Repeater {
-                        model: visible ? ["A100", "A200", "A400", "A700"] : 0
-
-                        Rectangle {
-                            width: dp(300)
-                            height: dp(46)
-                            color: Palette.colors[currentColor][modelData]
-
-                            Label {
-                                anchors.left: parent.left
-                                anchors.margins: dp(16)
-                                anchors.verticalCenter: parent.verticalCenter
-                                text: modelData
-                                style: "body2"
-                                color: Theme.lightDark(parent.color,
-                                                       Theme.light.textColor,
-                                                       Theme.dark.textColor)
-                            }
-
-                            Label {
-                                anchors.right: parent.right
-                                anchors.margins: dp(16)
-                                anchors.verticalCenter: parent.verticalCenter
-                                text: Palette.colors[currentColor][modelData]
-                                style: "body2"
-                                color: Theme.lightDark(parent.color,
-                                                       Theme.light.textColor,
-                                                       Theme.dark.textColor)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/CustomIconsDemo.qml b/prototype_2016/third_party/qml-material/demo/CustomIconsDemo.qml
deleted file mode 100644
index 06355d9..0000000
--- a/prototype_2016/third_party/qml-material/demo/CustomIconsDemo.qml
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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 Material 0.2
-import Material.ListItems 0.1 as ListItem
-
-Column {
-    id: column
-
-    anchors.fill: parent
-
-    ListItem.Subheader {
-        text: "Custom icons with different colors"
-    }
-
-    Row {
-        Item {
-            width: dp(56)
-            height: dp(56)
-
-            Icon {
-                anchors.centerIn: parent
-                source: Qt.resolvedUrl("images/weather-sunset.svg")
-                color: Theme.light.iconColor
-            }
-        }
-
-        Item {
-            width: dp(56)
-            height: dp(56)
-
-            Icon {
-                anchors.centerIn: parent
-                source: Qt.resolvedUrl("images/weather-pouring.svg")
-                color: Theme.light.iconColor
-            }
-        }
-
-        Rectangle {
-            width: dp(56)
-            height: dp(56)
-            color: "#333"
-            Icon {
-                anchors.centerIn: parent
-                source: Qt.resolvedUrl("images/weather-sunset.svg")
-                color: Theme.dark.iconColor
-            }
-        }
-
-        Rectangle {
-            width: dp(56)
-            height: dp(56)
-            color: "#333"
-            Icon {
-                anchors.centerIn: parent
-                source: Qt.resolvedUrl("images/weather-pouring.svg")
-                color: Theme.dark.iconColor
-            }
-        }
-    }
-
-    ListItem.Subheader {
-        text: "Non-colorized custom icons"
-    }
-
-    Row {
-        Item {
-            width: dp(56)
-            height: dp(40)
-
-            Icon {
-                anchors.centerIn: parent
-                source: Qt.resolvedUrl("images/go-last.color.svg")
-                color: Theme.light.iconColor
-            }
-        }
-
-        Item {
-            width: dp(56)
-            height: dp(40)
-
-            Icon {
-                anchors.centerIn: parent
-                source: Qt.resolvedUrl("images/list-add.color.svg")
-                color: Theme.light.iconColor
-            }
-        }
-    }
-
-    ListItem.Subheader {
-        text: "Custom icons in IconButtons"
-    }
-
-    Row {
-        Item {
-            width: dp(56)
-            height: dp(40)
-
-            IconButton {
-                anchors.centerIn: parent
-                iconSource: Qt.resolvedUrl("images/weather-sunset.svg")
-                color: Theme.light.iconColor
-            }
-        }
-
-        Item {
-            width: dp(56)
-            height: dp(40)
-
-            IconButton {
-                anchors.centerIn: parent
-                iconSource: Qt.resolvedUrl("images/list-add.color.svg")
-                color: Theme.light.iconColor
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/DatePickerDemo.qml b/prototype_2016/third_party/qml-material/demo/DatePickerDemo.qml
deleted file mode 100644
index 20509be..0000000
--- a/prototype_2016/third_party/qml-material/demo/DatePickerDemo.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.2
-import Material.ListItems 0.1 as ListItem
-import Material.Extras 0.1
-
-ColumnLayout {
-
-    Dialog {
-        id: datePickerDialog
-        hasActions: true
-        contentMargins: 0
-        floatingActions: true
-
-        DatePicker {
-            frameVisible: false
-            dayAreaBottomMargin : dp(48)
-        }
-
-    }
-
-    Dialog {
-        id: landscapeDatePickerDialog
-        hasActions: true
-        contentMargins: 0
-        floatingActions: true
-
-        DatePicker {
-            frameVisible: false
-            dayAreaBottomMargin : dp(48)
-            isLandscape: true
-        }
-
-    }
-
-    ColumnLayout {
-        anchors.centerIn: parent
-        spacing: dp(16)
-
-        Button {
-            Layout.alignment: Qt.AlignCenter
-            text: "Show DatePicker Dialog"
-            elevation: 1
-            onClicked: {
-                datePickerDialog.show()
-            }
-        }
-
-        Button {
-            Layout.alignment: Qt.AlignCenter
-            text: "Show Landscape DatePicker Dialog"
-            elevation: 1
-            onClicked: {
-                landscapeDatePickerDialog.show()
-            }
-        }
-
-        DatePicker {
-            Layout.alignment: Qt.AlignCenter
-        }
-
-        DatePicker {
-            Layout.alignment: Qt.AlignCenter
-            isLandscape: true
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/DialogDemo.qml b/prototype_2016/third_party/qml-material/demo/DialogDemo.qml
deleted file mode 100644
index 7c909d4..0000000
--- a/prototype_2016/third_party/qml-material/demo/DialogDemo.qml
+++ /dev/null
@@ -1,134 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Controls 1.3 as QuickControls
-import Material 0.2
-import Material.Extras 0.1
-
-Item {
-
-    Dialog {
-        id: alertNoTitleBar
-        width: dp(300)
-        text: "Discard draft?"
-        hasActions: true
-        positiveButtonText: "discard"
-        negativeButtonText: "cancel"
-    }
-
-    Dialog {
-        id: alertWithTitleBar
-        width: dp(300)
-        title: "Use Google's location service?"
-        text: "Let Google help apps determine location. This means sending anonymous location data to Google, even when no apps are running."
-        hasActions: true
-        positiveButtonText: "agree"
-        negativeButtonText: "disagree"
-    }
-
-    Dialog {
-        id: textFieldDialog
-        title: "Change Text"
-        hasActions: true
-
-        TextField {
-            id: optionText
-            width: parent.width
-            placeholderText: "New Option to Confirm"
-        }
-
-        onAccepted: {
-            dialogSnackBar.open("You entered: %1".arg(optionText.text))
-        }
-    }
-
-    Dialog {
-        id: scrollingDialog
-        title: "Phone ringtone"
-
-        QuickControls.ExclusiveGroup {
-            id: optionGroup
-        }
-
-        RadioButton {
-            text: "None"
-            checked: true
-            exclusiveGroup: optionGroup
-        }
-        RadioButton {
-            text: "Callisto"
-            exclusiveGroup: optionGroup
-        }
-        RadioButton {
-            text: "Dione"
-            exclusiveGroup: optionGroup
-        }
-        RadioButton {
-            text: "Ganymede"
-            exclusiveGroup: optionGroup
-        }
-        RadioButton {
-            text: "Hangouts Call"
-            exclusiveGroup: optionGroup
-        }
-        RadioButton {
-            text: "Luna"
-            exclusiveGroup: optionGroup
-        }
-        RadioButton {
-            text: "Oberon"
-            exclusiveGroup: optionGroup
-        }
-        RadioButton {
-            text: "Phobos"
-            exclusiveGroup: optionGroup
-        }
-        RadioButton {
-            text: "Pyxis"
-            exclusiveGroup: optionGroup
-        }
-    }
-
-    Column {
-        anchors.centerIn: parent
-        spacing: dp(20)
-
-        Button {
-            text: "Show alert without title bar"
-            anchors.horizontalCenter: parent.horizontalCenter
-            elevation: 1
-            onClicked: {
-                alertNoTitleBar.show()
-            }
-        }
-
-        Button {
-            text: "Show alert with title bar"
-            anchors.horizontalCenter: parent.horizontalCenter
-            elevation: 1
-            onClicked: {
-                alertWithTitleBar.show()
-            }
-        }
-
-        Button {
-            text: "Show text field dialog"
-            anchors.horizontalCenter: parent.horizontalCenter
-            elevation: 1
-            onClicked: {
-                textFieldDialog.show()
-            }
-        }
-
-        Button {
-            text: "Show scrolling dialog"
-            anchors.horizontalCenter: parent.horizontalCenter
-            elevation: 1
-            onClicked: {
-                scrollingDialog.show()
-            }
-        }
-    }
-
-    Snackbar {
-        id: dialogSnackBar
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/FormsDemo.qml b/prototype_2016/third_party/qml-material/demo/FormsDemo.qml
deleted file mode 100644
index 4a764c8..0000000
--- a/prototype_2016/third_party/qml-material/demo/FormsDemo.qml
+++ /dev/null
@@ -1,142 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.2
-import Material.ListItems 0.1 as ListItem
-import Material.Extras 0.1
-
-Item {
-    View {
-        anchors.centerIn: parent
-
-        width: dp(350)
-        height: column.implicitHeight + dp(32)
-
-        elevation: 1
-        radius: dp(2)
-
-        ColumnLayout {
-            id: column
-
-            anchors {
-                fill: parent
-                topMargin: dp(16)
-                bottomMargin: dp(16)
-            }
-
-            Label {
-                id: titleLabel
-
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: dp(16)
-                }
-
-                style: "title"
-                text: "Edit shipping info"
-            }
-
-            Item {
-                Layout.fillWidth: true
-                Layout.preferredHeight: dp(8)
-            }
-
-            ListItem.Standard {
-                action: Icon {
-                    anchors.centerIn: parent
-                    name: "action/account_circle"
-                }
-
-                content: TextField {
-                    anchors.centerIn: parent
-                    width: parent.width
-
-                    text: "Alex Nelson"
-                }
-            }
-
-            ListItem.Standard {
-                action: Icon {
-                    anchors.centerIn: parent
-                    name: "maps/place"
-                }
-
-                content: TextField {
-                    anchors.centerIn: parent
-                    width: parent.width
-
-                    text: "100 Main Street"
-                }
-            }
-
-            ListItem.Standard {
-                action: Item {}
-
-                content: RowLayout {
-                    anchors.centerIn: parent
-                    width: parent.width
-
-                    TextField {
-                        Layout.alignment: Qt.AlignVCenter
-                        Layout.preferredWidth: 0.4 * parent.width
-
-                        text: "New York"
-                    }
-
-                    MenuField {
-                        Layout.alignment: Qt.AlignVCenter
-                        Layout.preferredWidth: 0.2 * parent.width
-
-                        model: ["NY", "NC", "ND"]
-                    }
-
-                    TextField {
-                        Layout.alignment: Qt.AlignVCenter
-                        Layout.preferredWidth: 0.3 * parent.width
-
-                        text: "10011"
-                    }
-                }
-            }
-
-            ListItem.Standard {
-                action: Icon {
-                    anchors.centerIn: parent
-                    name: "communication/email"
-                }
-
-                content: TextField {
-                    anchors.centerIn: parent
-                    width: parent.width
-
-                    placeholderText: "Email"
-                }
-            }
-
-            Item {
-                Layout.fillWidth: true
-                Layout.preferredHeight: dp(8)
-            }
-
-            RowLayout {
-                Layout.alignment: Qt.AlignRight
-                spacing: dp(8)
-
-                anchors {
-                    right: parent.right
-                    margins: dp(16)
-                }
-
-                Button {
-                    text: "Cancel"
-                    textColor: Theme.primaryColor
-                }
-
-                Button {
-                    text: "Done"
-                    textColor: Theme.primaryColor
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/ListItemsDemo.qml b/prototype_2016/third_party/qml-material/demo/ListItemsDemo.qml
deleted file mode 100644
index 7061b40..0000000
--- a/prototype_2016/third_party/qml-material/demo/ListItemsDemo.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import QtQuick 2.4
-import Material 0.2
-import Material.ListItems 0.1 as ListItem
-import Material.Extras 0.1
-
-Item {
-    View {
-        anchors {
-            fill: parent
-            margins: dp(32)
-        }
-
-        elevation: 1
-
-        Column {
-            anchors.fill: parent
-
-            ListItem.Subheader {
-                text: "Section Subheader"
-            }
-
-            ListItem.Standard {
-                text: "Standard list item"
-            }
-
-            ListItem.Subtitled {
-                text: "Subtitled list item"
-                subText: "With some subtext!"
-            }
-
-            ListItem.Subtitled {
-                text: "Subtitled list item"
-                subText: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec eleifend arcu, eu convallis nisi."
-                valueText: "2h ago"
-
-                maximumLineCount: 3
-            }
-
-            ListItem.Subtitled {
-                text: "Subtitled list item"
-                subText: "With some subtext, icon, and secondary item!"
-                secondaryItem: Switch {
-                    id: enablingSwitch
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                onClicked: enablingSwitch.checked = !enablingSwitch.checked
-
-                action: Icon {
-                    anchors.centerIn: parent
-                    name: "device/access_alarm"
-                    size: dp(32)
-                }
-            }
-
-            ListItem.SimpleMenu {
-                text: "Subtitled list item"
-                model: ["A", "B and some long text that should not clip", "C"]
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/PageStackDemo.qml b/prototype_2016/third_party/qml-material/demo/PageStackDemo.qml
deleted file mode 100644
index cc5f446..0000000
--- a/prototype_2016/third_party/qml-material/demo/PageStackDemo.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-import QtQuick 2.4
-import Material 0.2
-import Material.Extras 0.1
-
-Item {
-
-    Column {
-        anchors.centerIn: parent
-        spacing: dp(20)
-
-        Button {
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            text: "Push subpage"
-            elevation: 1
-            onClicked: pageStack.push(Qt.resolvedUrl("SubPage.qml"))
-        }
-
-        Button {
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            text: "Push subpage with sidebar"
-            elevation: 1
-            onClicked: pageStack.push(Qt.resolvedUrl("SidebarPage.qml"))
-        }
-
-        Image {
-            id: image
-
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            source: Qt.resolvedUrl("images/balloon.jpg")
-            width: dp(400)
-            height: dp(250)
-
-            Ink {
-                anchors.fill: parent
-
-                onClicked: overlayView.open(image)
-            }
-        }
-
-        Label {
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            style: "subheading"
-            color: Theme.light.subTextColor
-            text: "Tap to edit picture"
-            font.italic: true
-        }
-    }
-
-    OverlayView {
-        id: overlayView
-
-        width: dp(800)
-        height: dp(500)
-
-        Image {
-            id: contentImage
-            source: Qt.resolvedUrl("images/balloon.jpg")
-            anchors.fill: parent
-        }
-
-        Row {
-            anchors {
-                top: parent.top
-                right: parent.right
-                rightMargin: dp(16)
-            }
-            height: dp(48)
-            opacity: overlayView.transitionOpacity
-
-            spacing: dp(24)
-
-            Repeater {
-                model: ["content/add", "image/edit", "action/delete"]
-
-                delegate: IconButton {
-                    id: iconAction
-
-                    iconName: modelData
-
-                    color: Theme.dark.iconColor
-                    size: iconName == "content/add" ? dp(27) : dp(24)
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/ProgressBarDemo.qml b/prototype_2016/third_party/qml-material/demo/ProgressBarDemo.qml
deleted file mode 100644
index 6c03054..0000000
--- a/prototype_2016/third_party/qml-material/demo/ProgressBarDemo.qml
+++ /dev/null
@@ -1,165 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.2
-
-Item {
-    implicitHeight: grid.implicitHeight + dp(40)
-    GridLayout {
-        id: grid
-        anchors.centerIn: parent
-        columns: 2
-        columnSpacing: dp(20)
-        rowSpacing: dp(20)
-
-        Label {
-            text: "Determinate"
-        }
-
-        ProgressBar {
-            Layout.fillWidth: true
-            color: theme.accentColor
-
-            SequentialAnimation on value {
-                running: true
-                loops: NumberAnimation.Infinite
-
-                NumberAnimation {
-                    duration: 3000
-                    from: 0
-                    to: 1
-                }
-
-                PauseAnimation { duration: 1000 } // This puts a bit of time between the loop
-            }
-        }
-
-        Label {
-            text: "Indeterminate"
-        }
-
-        ProgressBar {
-            Layout.fillWidth: true
-            color: theme.accentColor
-            indeterminate: true
-        }
-
-        Label {
-            text: "Default"
-        }
-
-        ProgressCircle {
-            Layout.alignment: Qt.AlignCenter
-        }
-
-        Label {
-            text: "Custom Color"
-        }
-
-        ProgressCircle {
-            Layout.alignment: Qt.AlignCenter
-            color: "#E91E63"
-        }
-
-        Label {
-            text: "Cyclic Colors"
-        }
-
-        ProgressCircle {
-            id: cyclicColorProgress
-            Layout.alignment: Qt.AlignCenter
-            SequentialAnimation {
-                running: true
-                loops: Animation.Infinite
-
-                ColorAnimation {
-                    from: "red"
-                    to: "blue"
-                    target: cyclicColorProgress
-                    properties: "color"
-                    easing.type: Easing.InOutQuad
-                    duration: 2400
-                }
-
-                ColorAnimation {
-                    from: "blue"
-                    to: "green"
-                    target: cyclicColorProgress
-                    properties: "color"
-                    easing.type: Easing.InOutQuad
-                    duration: 1560
-                }
-
-                ColorAnimation {
-                    from: "green"
-                    to: "#FFCC00"
-                    target: cyclicColorProgress
-                    properties: "color"
-                    easing.type: Easing.InOutQuad
-                    duration:  840
-                }
-
-                ColorAnimation {
-                    from: "#FFCC00"
-                    to: "red"
-                    target: cyclicColorProgress
-                    properties: "color"
-                    easing.type: Easing.InOutQuad
-                    duration:  1200
-                }
-            }
-        }
-
-        Label {
-            text: "Custom Size"
-        }
-
-        ProgressCircle {
-            Layout.alignment: Qt.AlignCenter
-            width: dp(64)
-            height: dp(64)
-        }
-
-        Label {
-            text: "Custom Size + Thickness"
-        }
-
-        ProgressCircle {
-            Layout.alignment: Qt.AlignCenter
-            width: dp(64)
-            height: dp(64)
-            dashThickness: dp(8)
-        }
-
-        Label {
-            text: "Determinate Value"
-        }
-
-        ProgressCircle {
-            id: determinateProgress
-            Layout.alignment: Qt.AlignCenter
-            width: dp(64)
-            height: dp(64)
-            indeterminate: false
-            minimumValue: 0
-            maximumValue: 100
-
-            SequentialAnimation on value {
-                running: true
-                loops: NumberAnimation.Infinite
-
-                NumberAnimation {
-                    duration: 3000
-                    from: determinateProgress.minimumValue
-                    to: determinateProgress.maximumValue
-                }
-
-                PauseAnimation { duration: 1000 }
-            }
-
-            Label {
-                anchors.centerIn: parent
-                text: Math.round(determinateProgress.value) + "%"
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/RadioButtonDemo.qml b/prototype_2016/third_party/qml-material/demo/RadioButtonDemo.qml
deleted file mode 100644
index de08ac1..0000000
--- a/prototype_2016/third_party/qml-material/demo/RadioButtonDemo.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.3 as QuickControls
-import Material 0.2
-
-ColumnLayout {
-    spacing: 0
-
-    Repeater {
-        model: 2
-
-        Rectangle {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            Layout.minimumHeight: grid.height + dp(80)
-            Layout.minimumWidth: grid.width + dp(80)
-            color: index == 0 ? "#EEE" : "#333"
-
-            GridLayout {
-                id: grid
-                anchors.centerIn: parent
-                rowSpacing: dp(20)
-                columnSpacing: dp(20)
-                columns: 2
-
-                QuickControls.ExclusiveGroup { id: optionGroup }
-
-                Label {
-                    Layout.alignment : Qt.AlignHCenter
-                    text: "Normal"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Label {
-                    Layout.alignment : Qt.AlignHCenter
-                    text: "Disabled"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                RadioButton {
-                    checked: true
-                    text: "Option 1"
-                    darkBackground: index == 1
-                    canToggle: true
-                    exclusiveGroup: optionGroup
-                }
-
-                RadioButton {
-                    checked: true
-                    enabled: false
-                    text: "Disabled"
-                    darkBackground: index == 1
-                }
-
-                RadioButton {
-                    text: "Option 2"
-                    darkBackground: index == 1
-                    canToggle: true
-                    exclusiveGroup: optionGroup
-                }
-
-                RadioButton {
-                    enabled: false
-                    text: "Disabled"
-                    darkBackground: index == 1
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/SidebarPage.qml b/prototype_2016/third_party/qml-material/demo/SidebarPage.qml
deleted file mode 100644
index 9c94135..0000000
--- a/prototype_2016/third_party/qml-material/demo/SidebarPage.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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 Material 0.2
-import Material.ListItems 0.1 as ListItem
-
-Page {
-    id: page
-    title: "Page with right sidebar"
-
-    actions: [
-        Action {
-            iconName: "action/search"
-            text: "Search"
-        }
-    ]
-
-    Button {
-        anchors.centerIn: parent
-        text: "Sub page"
-        onClicked: pageStack.push(Qt.resolvedUrl("SubPage.qml"))
-    }
-
-    rightSidebar: PageSidebar {
-        title: "Sidebar"
-
-        width: dp(320)
-
-        actions: [
-            Action {
-                iconName: "action/delete"
-                text: "Delete"
-            }
-        ]
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/SliderDemo.qml b/prototype_2016/third_party/qml-material/demo/SliderDemo.qml
deleted file mode 100644
index 88a2abb..0000000
--- a/prototype_2016/third_party/qml-material/demo/SliderDemo.qml
+++ /dev/null
@@ -1,120 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.2
-
-ColumnLayout {
-    spacing: 0
-
-    Repeater {
-        model: 2
-
-        Rectangle {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            Layout.minimumHeight: grid.height + dp(80)
-            Layout.minimumWidth: grid.width + dp(80)
-            color: index == 0 ? "#EEE" : "#333"
-
-            GridLayout {
-                id: grid
-                anchors.centerIn: parent
-                rowSpacing: dp(20)
-                columnSpacing: dp(10)
-                columns: 2
-
-                Label {
-                    text: "Normal"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Slider {
-                    Layout.alignment: Qt.AlignCenter
-                    value: 0.2
-                    darkBackground: index == 1
-                }
-
-                Label {
-                    text: "Tickmarks"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Slider {
-                    Layout.alignment: Qt.AlignCenter
-                    value: 40
-                    tickmarksEnabled: true
-                    stepSize: 20
-                    minimumValue: 0
-                    maximumValue: 100
-                    darkBackground: index == 1
-                }
-
-                Label {
-                    text: "Numeric Value Label"
-                    Layout.alignment:  Qt.AlignBottom
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Slider {
-                    Layout.alignment: Qt.AlignCenter
-                    value: 60
-                    tickmarksEnabled: true
-                    numericValueLabel: true
-                    stepSize: 20
-                    minimumValue: 0
-                    maximumValue: 100
-                    darkBackground: index == 1
-                }
-
-                Label {
-                    text: "Numeric Value Label + Active Focus on Press"
-                    wrapMode: Text.WordWrap
-                    Layout.alignment:  Qt.AlignBottom
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Slider {
-                    Layout.alignment: Qt.AlignCenter
-                    value: 80
-                    focus: true
-                    tickmarksEnabled: true
-                    numericValueLabel: true
-                    stepSize: 20
-                    minimumValue: 0
-                    maximumValue: 100
-                    activeFocusOnPress: true
-                    darkBackground: index == 1
-                }
-
-                Label {
-                    text: "Customized Numeric Value Label"
-                    wrapMode: Text.WordWrap
-                    Layout.alignment:  Qt.AlignBottom
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Slider {
-                    Layout.alignment: Qt.AlignCenter
-                    numericValueLabel: true
-                    stepSize: 1
-                    minimumValue: 0
-                    maximumValue: 100
-                    alwaysShowValueLabel: true
-                    knobLabel: value + "%"
-                    knobDiameter: dp(42)
-                    darkBackground: index == 1
-                }
-
-                Label {
-                    text: "Disabled"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Slider {
-                    enabled: false
-                    Layout.alignment: Qt.AlignCenter
-                    darkBackground: index == 1
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/SubPage.qml b/prototype_2016/third_party/qml-material/demo/SubPage.qml
deleted file mode 100644
index 0f43d4f..0000000
--- a/prototype_2016/third_party/qml-material/demo/SubPage.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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 Material 0.2
-import Material.ListItems 0.1 as ListItem
-
-TabbedPage {
-    id: page
-    title: "Page Title that is very long to demonstrate eliding titles in ActionBar"
-
-    actionBar.backgroundColor: Palette.colors.grey['200']
-    actionBar.decorationColor: Palette.colors.grey['300']
-
-    onGoBack: {
-        confirmationDialog.show()
-        event.accepted = true
-    }
-
-    Tab {
-        title: "Overview"
-        iconName: "action/home"
-
-        Rectangle {
-            color: Palette.colors.red["200"]
-
-            Button {
-                anchors.centerIn: parent
-                darkBackground: true
-                text: "Go to tab 3"
-                onClicked: page.selectedTab = 2
-            }
-        }
-    }
-
-    Tab {
-        title: "Projects"
-
-        Rectangle { color: Palette.colors.purple["200"] }
-    }
-
-    Tab {
-        title: "Inbox"
-
-        Rectangle { color: Palette.colors.orange["200"] }
-    }
-
-    Tab {
-        title: "Disabled Tab"
-        enabled: false
-        Rectangle { color: Palette.colors.purple["200"] }
-    }
-
-    Dialog {
-        id: confirmationDialog
-
-        title: "Do you want to go back?"
-        positiveButtonText: "Go Back"
-        negativeButtonText: "Cancel"
-
-        onAccepted: page.forcePop()
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/SwitchDemo.qml b/prototype_2016/third_party/qml-material/demo/SwitchDemo.qml
deleted file mode 100644
index fb7cc21..0000000
--- a/prototype_2016/third_party/qml-material/demo/SwitchDemo.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.2
-
-ColumnLayout {
-    spacing: 0
-
-    Repeater {
-        model: 2
-
-        Rectangle {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            Layout.minimumHeight: grid.height + dp(80)
-            Layout.minimumWidth: grid.width + dp(80)
-            color: index == 0 ? "#EEE" : "#333"
-
-            GridLayout {
-                id: grid
-                anchors.centerIn: parent
-                rowSpacing: dp(40)
-                columnSpacing: dp(40)
-                columns: 3
-
-                // Empty filler
-                Item { width: 1; height: 1 }
-
-                Label {
-                    text: "Normal"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Label {
-                    text: "Disabled"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Label {
-                    text: "On"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Switch {
-                    checked: true
-                    darkBackground: index == 1
-                }
-
-                Switch {
-                    checked: true
-                    enabled: false
-                    darkBackground: index == 1
-                }
-
-                Label {
-                    text: "Off"
-                    color: index == 0 ? Theme.light.textColor : Theme.dark.textColor
-                }
-
-                Switch {
-                    darkBackground: index == 1
-                }
-
-                Switch {
-                    enabled: false
-                    darkBackground: index == 1
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/TextFieldDemo.qml b/prototype_2016/third_party/qml-material/demo/TextFieldDemo.qml
deleted file mode 100644
index d0dad27..0000000
--- a/prototype_2016/third_party/qml-material/demo/TextFieldDemo.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.2
-
-Item {
-    implicitHeight: column.height
-
-    ColumnLayout {
-        id: column
-        anchors.centerIn: parent
-        spacing: dp(32)
-
-        TextField {
-            text: "Big Field with text"
-            font.pixelSize: dp(32)
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        TextField {
-            placeholderText: "Search..."
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        TextField {
-            text: "Text under label"
-            placeholderText: "Floating label"
-            floatingLabel: true
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        TextField {
-            placeholderText: "Character limit"
-            floatingLabel: true
-            characterLimit: 10
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        TextField {
-            id: passwordField
-            placeholderText: "Password"
-            floatingLabel: true
-            echoMode: TextInput.Password
-            helperText: "Hint: It's not password."
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            onAccepted: {
-                if (passwordField.text === "password") {
-                    passwordField.helperText = "Told ya."
-                    passwordField.hasError = true
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/TimePickerDemo.qml b/prototype_2016/third_party/qml-material/demo/TimePickerDemo.qml
deleted file mode 100644
index 743944f..0000000
--- a/prototype_2016/third_party/qml-material/demo/TimePickerDemo.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-import QtQuick 2.4
-import Material 0.2
-
-
-Item {
-
-    TimePickerDialog {
-        id: timePicker
-        onTimePicked: {
-            updateLabelForDate(timePicked)
-        }
-        prefer24Hour: twentyFourHourSwitch.checked
-    }
-
-    Column {
-        anchors.centerIn: parent
-        spacing: dp(20)
-
-        Button {
-            text: "Show Time Picker Dialog"
-            anchors.horizontalCenter: parent.horizontalCenter
-            elevation: 1
-            onClicked: {
-                timePicker.show()
-            }
-        }
-
-        Label {
-            id: timeLabel
-            style: "display1"
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        Row {
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: dp(16)
-
-            Label {
-                text: "24 hour clock:"
-                style: "dialog"
-            }
-
-            Switch {
-                id: twentyFourHourSwitch
-                checked: false
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        var date = new Date(Date.now())
-        updateLabelForDate(new Date(Date.now()))
-    }
-
-    function updateLabelForDate(date) {
-        timeLabel.text = date.toLocaleTimeString(Qt.locale(), "hh:mm ap")
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/TypographyDemo.qml b/prototype_2016/third_party/qml-material/demo/TypographyDemo.qml
deleted file mode 100644
index 8bf5f27..0000000
--- a/prototype_2016/third_party/qml-material/demo/TypographyDemo.qml
+++ /dev/null
@@ -1,121 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Material 0.2
-import Material.ListItems 0.1 as ListItem
-
-Item {
-
-    implicitHeight: column.height
-
-    property var styles: [
-        "display4",
-        "display3",
-        "display2",
-        "display1",
-        "headline",
-        "title",
-        "subheading",
-        "body2",
-        "body1",
-        "caption",
-        "button"
-    ]
-
-    ColumnLayout {
-        id: column
-        spacing: dp(16)
-
-        ListItem.Subheader {
-            text: "Font Weights"
-        }
-
-        Label {
-            font.family: "Roboto"
-            font.weight: Font.Light
-            text: "Roboto Light"
-            font.pixelSize: dp(34)
-
-            anchors {
-                left: parent.left
-                margins: dp(16)
-            }
-        }
-
-        Label {
-            font.family: "Roboto"
-            text: "Roboto Regular"
-            font.pixelSize: dp(34)
-
-            anchors {
-                left: parent.left
-                margins: dp(16)
-            }
-        }
-
-        Label {
-            font.family: "Roboto"
-            font.weight: Font.DemiBold
-            text: "Roboto Medium"
-            font.pixelSize: dp(34)
-
-            anchors {
-                left: parent.left
-                margins: dp(16)
-            }
-        }
-
-        Label {
-            font.family: "Roboto"
-            font.weight: Font.Bold
-            text: "Roboto Bold"
-            font.pixelSize: dp(34)
-
-            anchors {
-                left: parent.left
-                margins: dp(16)
-            }
-        }
-
-        ListItem.Subheader {
-            text: "Label Styles"
-        }
-
-        Repeater {
-            model: styles
-            delegate: Row {
-                anchors {
-                    left: parent.left
-                    margins: dp(16)
-                }
-
-                Label {
-                    text: modelData
-                    width: dp(100)
-                }
-
-                Label {
-                    style: modelData
-                    text: {
-                        var text = fontInfo["font"].substring(0,1).toUpperCase() + fontInfo["font"].substring(1)
-
-                        if (style == "button")
-                            text += " (ALL CAPS)"
-
-                        text += " " + fontInfo["size"] + "sp"
-
-                        if (fontInfo.size_desktop) {
-                            text += " (Device), " + fontInfo["font"].substring(0,1).toUpperCase() + fontInfo["font"].substring(1)
-
-                            if (style == "button")
-                                text += " (ALL CAPS)"
-
-                            text += " " + fontInfo["size_desktop"] + "sp (Desktop)"
-                        }
-
-                        return text
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/demo/demo.pro b/prototype_2016/third_party/qml-material/demo/demo.pro
deleted file mode 100644
index dae5240..0000000
--- a/prototype_2016/third_party/qml-material/demo/demo.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-
-SOURCES += main.cpp
-RESOURCES += demo.qrc icons/icons.qrc
diff --git a/prototype_2016/third_party/qml-material/demo/demo.qmlproject b/prototype_2016/third_party/qml-material/demo/demo.qmlproject
deleted file mode 100644
index d55cf9b..0000000
--- a/prototype_2016/third_party/qml-material/demo/demo.qmlproject
+++ /dev/null
@@ -1,20 +0,0 @@
-/* File generated by Qt Creator */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "main.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-
-    importPaths: [ "../modules"]
-}
diff --git a/prototype_2016/third_party/qml-material/demo/demo.qrc b/prototype_2016/third_party/qml-material/demo/demo.qrc
deleted file mode 100644
index 47ed947..0000000
--- a/prototype_2016/third_party/qml-material/demo/demo.qrc
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource>
-        <file>BottomSheetDemo.qml</file>
-        <file>ButtonDemo.qml</file>
-        <file>CheckBoxDemo.qml</file>
-        <file>ColorPaletteDemo.qml</file>
-        <file>CustomIconsDemo.qml</file>
-        <file>DatePickerDemo.qml</file>
-        <file>DialogDemo.qml</file>
-        <file>FormsDemo.qml</file>
-        <file>ListItemsDemo.qml</file>
-        <file>PageStackDemo.qml</file>
-        <file>ProgressBarDemo.qml</file>
-        <file>RadioButtonDemo.qml</file>
-        <file>SidebarPage.qml</file>
-        <file>SliderDemo.qml</file>
-        <file>SubPage.qml</file>
-        <file>SwitchDemo.qml</file>
-        <file>TextFieldDemo.qml</file>
-        <file>TimePickerDemo.qml</file>
-        <file>TypographyDemo.qml</file>
-        <file>icons/action_account_circle.svg</file>
-        <file>icons/action_autorenew.svg</file>
-        <file>icons/action_delete.svg</file>
-        <file>icons/action_language.svg</file>
-        <file>icons/action_settings.svg</file>
-        <file>icons/alert_warning.svg</file>
-        <file>icons/communication_email.svg</file>
-        <file>icons/content_add.svg</file>
-        <file>icons/content_create.svg</file>
-        <file>icons/content_forward.svg</file>
-        <file>icons/device_access_alarm.svg</file>
-        <file>icons/file_file_download.svg</file>
-        <file>icons/image_color_lens.svg</file>
-        <file>icons/maps_place.svg</file>
-        <file>icons/navigation_arrow_drop_down.svg</file>
-        <file>icons/social_share.svg</file>
-        <file>images/balloon.jpg</file>
-        <file>images/go-last.color.svg</file>
-        <file>images/list-add.color.svg</file>
-        <file>images/weather-pouring.svg</file>
-        <file>images/weather-sunset.svg</file>
-        <file>main.qml</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/demo/icons.yml b/prototype_2016/third_party/qml-material/demo/icons.yml
deleted file mode 100644
index 85c523c..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-out: icons
-icons:
-  - action/account_circle
-  - action/autorenew
-  - action/delete
-  - action/language
-  - action/settings
-  - alert/warning
-  - communication/email
-  - content/add
-  - content/create
-  - content/forward
-  - device/access_alarm
-  - file/file_download
-  - image/color_lens
-  - image/edit
-  - maps/place
-  - navigation/arrow_drop_down
-  - social/share
diff --git a/prototype_2016/third_party/qml-material/demo/icons/action_account_circle.svg b/prototype_2016/third_party/qml-material/demo/icons/action_account_circle.svg
deleted file mode 100644
index 3cfbe0c..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/action_account_circle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm0 6c3.31 0 6 2.69 6 6 0 3.32-2.69 6-6 6s-6-2.68-6-6c0-3.31 2.69-6 6-6zm0 28.4c-5.01 0-9.41-2.56-12-6.44.05-3.97 8.01-6.16 12-6.16s11.94 2.19 12 6.16c-2.59 3.88-6.99 6.44-12 6.44z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/action_autorenew.svg b/prototype_2016/third_party/qml-material/demo/icons/action_autorenew.svg
deleted file mode 100644
index 27b0d39..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/action_autorenew.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M24 12v6l8-8-8-8v6C15.16 8 8 15.16 8 24c0 3.14.92 6.05 2.48 8.52l2.92-2.92c-.89-1.67-1.4-3.57-1.4-5.6 0-6.63 5.37-12 12-12zm13.52 3.48L34.6 18.4c.89 1.67 1.4 3.57 1.4 5.6 0 6.63-5.37 12-12 12v-6l-8 8 8 8v-6c8.84 0 16-7.16 16-16 0-3.14-.92-6.05-2.48-8.52z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/action_delete.svg b/prototype_2016/third_party/qml-material/demo/icons/action_delete.svg
deleted file mode 100644
index 3051156..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/action_delete.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M12 38c0 2.21 1.79 4 4 4h16c2.21 0 4-1.79 4-4V14H12v24zM38 8h-7l-2-2H19l-2 2h-7v4h28V8z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/action_language.svg b/prototype_2016/third_party/qml-material/demo/icons/action_language.svg
deleted file mode 100644
index 8eba04c..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/action_language.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M23.99 4C12.94 4 4 12.95 4 24s8.94 20 19.99 20C35.04 44 44 35.05 44 24S35.04 4 23.99 4zm13.85 12h-5.9c-.65-2.5-1.56-4.9-2.76-7.12 3.68 1.26 6.74 3.81 8.66 7.12zM24 8.07c1.67 2.4 2.97 5.07 3.82 7.93h-7.64c.85-2.86 2.15-5.53 3.82-7.93zM8.52 28C8.19 26.72 8 25.38 8 24s.19-2.72.52-4h6.75c-.16 1.31-.27 2.64-.27 4 0 1.36.11 2.69.28 4H8.52zm1.63 4h5.9c.65 2.5 1.56 4.9 2.76 7.13-3.68-1.26-6.74-3.82-8.66-7.13zm5.9-16h-5.9c1.92-3.31 4.98-5.87 8.66-7.13-1.2 2.23-2.11 4.63-2.76 7.13zM24 39.93c-1.66-2.4-2.96-5.07-3.82-7.93h7.64c-.86 2.86-2.16 5.53-3.82 7.93zM28.68 28h-9.36c-.19-1.31-.32-2.64-.32-4 0-1.36.13-2.69.32-4h9.36c.19 1.31.32 2.64.32 4 0 1.36-.13 2.69-.32 4zm.51 11.12c1.2-2.23 2.11-4.62 2.76-7.12h5.9c-1.93 3.31-4.99 5.86-8.66 7.12zM32.72 28c.16-1.31.28-2.64.28-4 0-1.36-.11-2.69-.28-4h6.75c.33 1.28.53 2.62.53 4s-.19 2.72-.53 4h-6.75z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/action_settings.svg b/prototype_2016/third_party/qml-material/demo/icons/action_settings.svg
deleted file mode 100644
index 7a01c33..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/action_settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38.86 25.95c.08-.64.14-1.29.14-1.95s-.06-1.31-.14-1.95l4.23-3.31c.38-.3.49-.84.24-1.28l-4-6.93c-.25-.43-.77-.61-1.22-.43l-4.98 2.01c-1.03-.79-2.16-1.46-3.38-1.97L29 4.84c-.09-.47-.5-.84-1-.84h-8c-.5 0-.91.37-.99.84l-.75 5.3c-1.22.51-2.35 1.17-3.38 1.97L9.9 10.1c-.45-.17-.97 0-1.22.43l-4 6.93c-.25.43-.14.97.24 1.28l4.22 3.31C9.06 22.69 9 23.34 9 24s.06 1.31.14 1.95l-4.22 3.31c-.38.3-.49.84-.24 1.28l4 6.93c.25.43.77.61 1.22.43l4.98-2.01c1.03.79 2.16 1.46 3.38 1.97l.75 5.3c.08.47.49.84.99.84h8c.5 0 .91-.37.99-.84l.75-5.3c1.22-.51 2.35-1.17 3.38-1.97l4.98 2.01c.45.17.97 0 1.22-.43l4-6.93c.25-.43.14-.97-.24-1.28l-4.22-3.31zM24 31c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/alert_warning.svg b/prototype_2016/third_party/qml-material/demo/icons/alert_warning.svg
deleted file mode 100644
index 31ef9ab..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/alert_warning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M2 42h44L24 4 2 42zm24-6h-4v-4h4v4zm0-8h-4v-8h4v8z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/communication_email.svg b/prototype_2016/third_party/qml-material/demo/icons/communication_email.svg
deleted file mode 100644
index 533da60..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/communication_email.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M40 8H8c-2.21 0-3.98 1.79-3.98 4L4 36c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4zm0 8L24 26 8 16v-4l16 10 16-10v4z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/content_add.svg b/prototype_2016/third_party/qml-material/demo/icons/content_add.svg
deleted file mode 100644
index 2b3a796..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/content_add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38 26H26v12h-4V26H10v-4h12V10h4v12h12v4z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/content_create.svg b/prototype_2016/third_party/qml-material/demo/icons/content_create.svg
deleted file mode 100644
index 7bc2969..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/content_create.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M6 34.5V42h7.5l22.13-22.13-7.5-7.5L6 34.5zm35.41-20.41c.78-.78.78-2.05 0-2.83l-4.67-4.67c-.78-.78-2.05-.78-2.83 0l-3.66 3.66 7.5 7.5 3.66-3.66z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/content_forward.svg b/prototype_2016/third_party/qml-material/demo/icons/content_forward.svg
deleted file mode 100644
index 62bae42..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/content_forward.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M24 16V8l16 16-16 16v-8H8V16z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/device_access_alarm.svg b/prototype_2016/third_party/qml-material/demo/icons/device_access_alarm.svg
deleted file mode 100644
index 1a5c539..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/device_access_alarm.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M44 11.44l-9.19-7.71-2.57 3.06 9.19 7.71L44 11.44zM15.76 6.78l-2.57-3.06L4 11.43l2.57 3.06 9.19-7.71zM25 16h-3v12l9.49 5.71L33 31.24l-8-4.74V16zm-1.01-8C14.04 8 6 16.06 6 26s8.04 18 17.99 18S42 35.94 42 26 33.94 8 23.99 8zM24 40c-7.73 0-14-6.27-14-14s6.27-14 14-14 14 6.27 14 14-6.26 14-14 14z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/file_file_download.svg b/prototype_2016/third_party/qml-material/demo/icons/file_file_download.svg
deleted file mode 100644
index b14aa39..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/file_file_download.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38 18h-8V6H18v12h-8l14 14 14-14zM10 36v4h28v-4H10z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/icons.qrc b/prototype_2016/third_party/qml-material/demo/icons/icons.qrc
deleted file mode 100644
index 09383aa..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/icons.qrc
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/icons/maps">
-        <file alias="place.svg">maps_place.svg</file>
-</qresource>
-
-<qresource prefix="/icons/communication">
-        <file alias="email.svg">communication_email.svg</file>
-</qresource>
-
-<qresource prefix="/icons/image">
-        <file alias="color_lens.svg">image_color_lens.svg</file>
-        <file alias="edit.svg">image_edit.svg</file>
-</qresource>
-
-<qresource prefix="/icons/alert">
-        <file alias="warning.svg">alert_warning.svg</file>
-</qresource>
-
-<qresource prefix="/icons/content">
-        <file alias="add.svg">content_add.svg</file>
-        <file alias="create.svg">content_create.svg</file>
-        <file alias="forward.svg">content_forward.svg</file>
-</qresource>
-
-<qresource prefix="/icons/device">
-        <file alias="access_alarm.svg">device_access_alarm.svg</file>
-</qresource>
-
-<qresource prefix="/icons/file">
-        <file alias="file_download.svg">file_file_download.svg</file>
-</qresource>
-
-<qresource prefix="/icons/social">
-        <file alias="share.svg">social_share.svg</file>
-</qresource>
-
-<qresource prefix="/icons/action">
-        <file alias="account_circle.svg">action_account_circle.svg</file>
-        <file alias="autorenew.svg">action_autorenew.svg</file>
-        <file alias="delete.svg">action_delete.svg</file>
-        <file alias="language.svg">action_language.svg</file>
-        <file alias="settings.svg">action_settings.svg</file>
-</qresource>
-
-<qresource prefix="/icons/navigation">
-        <file alias="arrow_drop_down.svg">navigation_arrow_drop_down.svg</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/demo/icons/image_color_lens.svg b/prototype_2016/third_party/qml-material/demo/icons/image_color_lens.svg
deleted file mode 100644
index d1b14e9..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/image_color_lens.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M24 6C14.06 6 6 14.06 6 24s8.06 18 18 18c1.66 0 3-1.34 3-3 0-.78-.29-1.48-.78-2.01-.47-.53-.75-1.22-.75-1.99 0-1.66 1.34-3 3-3H32c5.52 0 10-4.48 10-10 0-8.84-8.06-16-18-16zM13 24c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm6-8c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm10 0c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm6 8c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/image_edit.svg b/prototype_2016/third_party/qml-material/demo/icons/image_edit.svg
deleted file mode 100644
index 7bc2969..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/image_edit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M6 34.5V42h7.5l22.13-22.13-7.5-7.5L6 34.5zm35.41-20.41c.78-.78.78-2.05 0-2.83l-4.67-4.67c-.78-.78-2.05-.78-2.83 0l-3.66 3.66 7.5 7.5 3.66-3.66z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/maps_place.svg b/prototype_2016/third_party/qml-material/demo/icons/maps_place.svg
deleted file mode 100644
index b17fb9d..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/maps_place.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/navigation_arrow_drop_down.svg b/prototype_2016/third_party/qml-material/demo/icons/navigation_arrow_drop_down.svg
deleted file mode 100644
index 16f5422..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/navigation_arrow_drop_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M14 20l10 10 10-10z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/icons/social_share.svg b/prototype_2016/third_party/qml-material/demo/icons/social_share.svg
deleted file mode 100644
index 2896a1b..0000000
--- a/prototype_2016/third_party/qml-material/demo/icons/social_share.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M36 32.17c-1.52 0-2.89.59-3.93 1.54L17.82 25.4c.11-.45.18-.92.18-1.4s-.07-.95-.18-1.4l14.1-8.23c1.07 1 2.5 1.62 4.08 1.62 3.31 0 6-2.69 6-6s-2.69-6-6-6-6 2.69-6 6c0 .48.07.95.18 1.4l-14.1 8.23c-1.07-1-2.5-1.62-4.08-1.62-3.31 0-6 2.69-6 6s2.69 6 6 6c1.58 0 3.01-.62 4.08-1.62l14.25 8.31c-.1.42-.16.86-.16 1.31 0 3.22 2.61 5.83 5.83 5.83s5.83-2.61 5.83-5.83-2.61-5.83-5.83-5.83z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/images/balloon.jpg b/prototype_2016/third_party/qml-material/demo/images/balloon.jpg
deleted file mode 100644
index 9f8b281..0000000
--- a/prototype_2016/third_party/qml-material/demo/images/balloon.jpg
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/demo/images/go-last.color.svg b/prototype_2016/third_party/qml-material/demo/images/go-last.color.svg
deleted file mode 100644
index 861e81a..0000000
--- a/prototype_2016/third_party/qml-material/demo/images/go-last.color.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg2491">
-  <defs
-     id="defs2493">
-    <linearGradient
-       x1="11.767765"
-       y1="-4.4393449"
-       x2="41.116112"
-       y2="-7.0000062"
-       id="linearGradient6723"
-       xlink:href="#linearGradient5113"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,47.00001)" />
-    <linearGradient
-       id="linearGradient3166">
-      <stop
-         id="stop3168"
-         style="stop-color:#a7cc5c;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3170"
-         style="stop-color:#789e2d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="9.9999981"
-       y1="41.5"
-       x2="41.999996"
-       y2="41.5"
-       id="linearGradient3173"
-       xlink:href="#linearGradient3166"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5113">
-      <stop
-         id="stop5115"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5117"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="16.067961"
-       y1="11.133182"
-       x2="37.73064"
-       y2="42.793934"
-       id="linearGradient5315"
-       xlink:href="#linearGradient5113"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.004639,0,0,1,-4.037671,-0.05462481)" />
-    <linearGradient
-       id="linearGradient2264">
-      <stop
-         id="stop2266"
-         style="stop-color:#d7e866;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2268"
-         style="stop-color:#8cab2a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.131361"
-       y1="13.152157"
-       x2="21.131361"
-       y2="38.714657"
-       id="linearGradient3172"
-       xlink:href="#linearGradient2264"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5105">
-      <stop
-         id="stop5107"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5109"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="11.25"
-       cy="19.03125"
-       r="8.0625"
-       fx="11.25"
-       fy="19.03125"
-       id="radialGradient4354"
-       xlink:href="#linearGradient5105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.282946,0,13.64644)" />
-  </defs>
-  <metadata
-     id="metadata2496">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <g
-       transform="translate(0.9999938,-2.9999963)"
-       id="g2571"
-       style="display:inline">
-      <path
-         d="m 19.3125,19.03125 a 8.0625,2.28125 0 1 1 -16.125,0 8.0625,2.28125 0 1 1 16.125,0 z"
-         transform="matrix(-2.48062,0,0,2.410961,50.90698,-5.38361)"
-         id="path4346"
-         style="opacity:0.16292138;fill:url(#radialGradient4354);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-      <path
-         d="m 19.502209,9.4374998 19.004144,16.5060242 -19.004144,16.423291 0,-7.869835 -14.9958391,0 0,-17.055132 14.9958391,0 0,-8.0043482 z"
-         inkscape:connector-curvature="0"
-         id="path4348"
-         style="fill:url(#linearGradient3172);fill-opacity:1;fill-rule:nonzero;stroke:#548820;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-      <path
-         d="m 20.573058,11.578557 16.516638,14.386273 -16.516638,14.199301 0,-6.738369 -15.0666831,0 0,-14.978334 15.0666831,0 0,-6.868871 z"
-         inkscape:connector-curvature="0"
-         id="path4360"
-         style="opacity:0.35400008;fill:none;stroke:url(#linearGradient5315);stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         width="33.000008"
-         height="4.0000119"
-         x="9.5"
-         y="39.500008"
-         transform="matrix(0,1,1,0,0,0)"
-         id="rect4242"
-         style="fill:#b3c360;fill-opacity:1;fill-rule:nonzero;stroke:#548820;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         width="31"
-         height="2.0000019"
-         x="10.499998"
-         y="40.5"
-         transform="matrix(0,1,1,0,0,0)"
-         id="rect6697"
-         style="opacity:0.35400008;fill:url(#linearGradient3173);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient6723);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>
diff --git a/prototype_2016/third_party/qml-material/demo/images/list-add.color.svg b/prototype_2016/third_party/qml-material/demo/images/list-add.color.svg
deleted file mode 100644
index 1e80aef..0000000
--- a/prototype_2016/third_party/qml-material/demo/images/list-add.color.svg
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg3941">
-  <defs
-     id="defs3943">
-    <linearGradient
-       x1="25"
-       y1="15"
-       x2="25"
-       y2="35"
-       id="linearGradient3897"
-       xlink:href="#linearGradient3891"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3891">
-      <stop
-         id="stop3893"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3895"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="71.204407"
-       y1="6.2375584"
-       x2="71.204407"
-       y2="44.340794"
-       id="linearGradient3403-4"
-       xlink:href="#linearGradient4011-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-47.733516,-0.3572398)" />
-    <linearGradient
-       id="linearGradient4011-3">
-      <stop
-         id="stop4013-5"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4015-1"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.507761" />
-      <stop
-         id="stop4017-7"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.83456558" />
-      <stop
-         id="stop4019-4"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="23.895569"
-       cy="3.9900031"
-       r="20.397499"
-       fx="23.895569"
-       fy="3.9900031"
-       id="radialGradient3013-3"
-       xlink:href="#linearGradient3242-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,2.2874593,-3.0194057,0,36.047438,-50.630156)" />
-    <linearGradient
-       id="linearGradient3242-7">
-      <stop
-         id="stop3244-5"
-         style="stop-color:#eef87e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3246-9"
-         style="stop-color:#cde34f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3248-7"
-         style="stop-color:#93b723;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3250-8"
-         style="stop-color:#5a7e0d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="18.379412"
-       y1="44.980297"
-       x2="18.379412"
-       y2="3.0816143"
-       id="linearGradient3015-2"
-       xlink:href="#linearGradient2490-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9584364,0,0,0.9584366,0.9975247,1.9975255)" />
-    <linearGradient
-       id="linearGradient2490-3">
-      <stop
-         id="stop2492-3"
-         style="stop-color:#3f7010;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2494-8"
-         style="stop-color:#84a718;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8838-2">
-      <stop
-         id="stop8840-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop8842-8"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="62.625"
-       cy="4.625"
-       r="10.625"
-       fx="62.625"
-       fy="4.625"
-       id="radialGradient3939"
-       xlink:href="#linearGradient8838-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1647059,0,0,0.7529402,-111.5647,36.517647)" />
-  </defs>
-  <metadata
-     id="metadata3946">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <path
-       d="m 47,40 c 0,4.418278 -10.297451,8 -22.999999,8 -12.702548,0 -23.0000013,-3.581722 -23.0000013,-8 0,-4.418278 10.2974533,-8 23.0000013,-8 C 36.702549,32 47,35.581722 47,40 l 0,0 z"
-       inkscape:connector-curvature="0"
-       id="path8836-9"
-       style="opacity:0.3;fill:url(#radialGradient3939);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible" />
-    <path
-       d="M 24.000003,5.501809 C 13.241574,5.501809 4.5018087,14.24157 4.5018087,25 c 0,10.75843 8.7397653,19.498195 19.4981943,19.498192 10.758425,0 19.498198,-8.739762 19.498188,-19.498192 0,-10.75843 -8.739763,-19.498191 -19.498188,-19.498191 z"
-       inkscape:connector-curvature="0"
-       id="path2555-2"
-       style="fill:url(#radialGradient3013-3);fill-opacity:1;stroke:url(#linearGradient3015-2);stroke-width:1.003654;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    <path
-       d="M 42.500001,24.999344 C 42.500001,35.216942 34.216659,43.5 24.000234,43.5 13.782874,43.5 5.4999992,35.216848 5.4999992,24.999344 c 0,-10.217125 8.2828748,-18.4993438 18.5002348,-18.4993438 10.216425,0 18.499767,8.2822188 18.499767,18.4993438 l 0,0 z"
-       inkscape:connector-curvature="0"
-       id="path8655-8"
-       style="opacity:0.7;color:#000000;fill:none;stroke:url(#linearGradient3403-4);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 21,14 0,7 -7,0 0,6 7,0 0,7 6,0 0,-7 7,0 0,-6 -7,0 0,-7 z"
-       inkscape:connector-curvature="0"
-       id="rect3007-9"
-       style="color:#000000;fill:#638d14;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 21,15 0,7 -7,0 0,6 7,0 0,7 6,0 0,-7 7,0 0,-6 -7,0 0,-7 z"
-       inkscape:connector-curvature="0"
-       id="rect3007"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 21.53125,15.53125 0,6.46875 A 0.52273827,0.52273827 0 0 1 21,22.53125 l -6.46875,0 0,4.9375 6.46875,0 A 0.52273827,0.52273827 0 0 1 21.53125,28 l 0,6.46875 4.9375,0 0,-6.46875 A 0.52273827,0.52273827 0 0 1 27,27.46875 l 6.46875,0 0,-4.9375 -6.46875,0 A 0.52273827,0.52273827 0 0 1 26.46875,22 l 0,-6.46875 -4.9375,0 z"
-       id="path3889"
-       style="opacity:0.1;color:#000000;fill:none;stroke:url(#linearGradient3897);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/prototype_2016/third_party/qml-material/demo/images/weather-pouring.svg b/prototype_2016/third_party/qml-material/demo/images/weather-pouring.svg
deleted file mode 100644
index bf20e9b..0000000
--- a/prototype_2016/third_party/qml-material/demo/images/weather-pouring.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M9,12C9.53,12.14 9.85,12.69 9.71,13.22L8.41,18.05C8.27,18.59 7.72,18.9 7.19,18.76C6.65,18.62 6.34,18.07 6.5,17.54L7.78,12.71C7.92,12.17 8.47,11.86 9,12M13,12C13.53,12.14 13.85,12.69 13.71,13.22L11.64,20.95C11.5,21.5 10.95,21.8 10.41,21.66C9.88,21.5 9.56,20.97 9.7,20.43L11.78,12.71C11.92,12.17 12.47,11.86 13,12M17,12C17.53,12.14 17.85,12.69 17.71,13.22L16.41,18.05C16.27,18.59 15.72,18.9 15.19,18.76C14.65,18.62 14.34,18.07 14.5,17.54L15.78,12.71C15.92,12.17 16.47,11.86 17,12M17,10V9A5,5 0 0,0 12,4C9.5,4 7.45,5.82 7.06,8.19C6.73,8.07 6.37,8 6,8A3,3 0 0,0 3,11C3,12.11 3.6,13.08 4.5,13.6V13.59C5,13.87 5.14,14.5 4.87,14.96C4.59,15.43 4,15.6 3.5,15.32V15.33C2,14.47 1,12.85 1,11A5,5 0 0,1 6,6C7,3.65 9.3,2 12,2C15.43,2 18.24,4.66 18.5,8.03L19,8A4,4 0 0,1 23,12C23,13.5 22.2,14.77 21,15.46V15.46C20.5,15.73 19.91,15.57 19.63,15.09C19.36,14.61 19.5,14 20,13.72V13.73C20.6,13.39 21,12.74 21,12A2,2 0 0,0 19,10H17Z" /></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/images/weather-sunset.svg b/prototype_2016/third_party/qml-material/demo/images/weather-sunset.svg
deleted file mode 100644
index 1a3babd..0000000
--- a/prototype_2016/third_party/qml-material/demo/images/weather-sunset.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M3,12H7A5,5 0 0,1 12,7A5,5 0 0,1 17,12H21A1,1 0 0,1 22,13A1,1 0 0,1 21,14H3A1,1 0 0,1 2,13A1,1 0 0,1 3,12M5,16H19A1,1 0 0,1 20,17A1,1 0 0,1 19,18H5A1,1 0 0,1 4,17A1,1 0 0,1 5,16M17,20A1,1 0 0,1 18,21A1,1 0 0,1 17,22H7A1,1 0 0,1 6,21A1,1 0 0,1 7,20H17M15,12A3,3 0 0,0 12,9A3,3 0 0,0 9,12H15M12,2L14.39,5.42C13.65,5.15 12.84,5 12,5C11.16,5 10.35,5.15 9.61,5.42L12,2M3.34,7L7.5,6.65C6.9,7.16 6.36,7.78 5.94,8.5C5.5,9.24 5.25,10 5.11,10.79L3.34,7M20.65,7L18.88,10.79C18.74,10 18.47,9.23 18.05,8.5C17.63,7.78 17.1,7.15 16.5,6.64L20.65,7Z" /></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/demo/main.cpp b/prototype_2016/third_party/qml-material/demo/main.cpp
deleted file mode 100644
index d1e6dc0..0000000
--- a/prototype_2016/third_party/qml-material/demo/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
-
-int main(int argc, char *argv[])
-{
-    QGuiApplication app(argc, argv);
-
-    QQmlApplicationEngine engine(QUrl(QStringLiteral("qrc:/main.qml")));
-
-    return app.exec();
-}
diff --git a/prototype_2016/third_party/qml-material/demo/main.qml b/prototype_2016/third_party/qml-material/demo/main.qml
deleted file mode 100644
index f628cb8..0000000
--- a/prototype_2016/third_party/qml-material/demo/main.qml
+++ /dev/null
@@ -1,268 +0,0 @@
-import QtQuick 2.4
-import Material 0.2
-import Material.ListItems 0.1 as ListItem
-
-ApplicationWindow {
-    id: demo
-
-    title: "Material for QtQuick Demo"
-
-    // Necessary when loading the window from C++
-    visible: true
-
-    theme {
-        primaryColor: "blue"
-        accentColor: "red"
-        tabHighlightColor: "white"
-    }
-
-    property var styles: [
-            "Custom Icons", "Color Palette", "Typography"
-    ]
-
-    property var basicComponents: [
-            "Button", "CheckBox", "Progress Bar", "Radio Button",
-            "Slider", "Switch", "TextField"
-    ]
-
-    property var compoundComponents: [
-            "Bottom Sheet", "Dialog", "Forms", "List Items", "Page Stack", "Time Picker", "Date Picker"
-    ]
-
-    property var sections: [ basicComponents, styles, compoundComponents ]
-
-    property var sectionTitles: [ "Basic Components", "Style", "Compound Components" ]
-
-    property string selectedComponent: sections[0][0]
-
-    initialPage: TabbedPage {
-        id: page
-
-        title: "Demo"
-
-        actionBar.maxActionCount: navDrawer.enabled ? 3 : 4
-
-        actions: [
-            Action {
-                iconName: "alert/warning"
-                name: "Dummy error"
-                onTriggered: demo.showError("Something went wrong", "Do you want to retry?", "Close", true)
-            },
-
-            Action {
-                iconName: "image/color_lens"
-                name: "Colors"
-                onTriggered: colorPicker.show()
-            },
-
-            Action {
-                iconName: "action/settings"
-                name: "Settings"
-                hoverAnimation: true
-            },
-
-            Action {
-                iconName: "alert/warning"
-                name: "THIS SHOULD BE HIDDEN!"
-                visible: false
-            },
-
-            Action {
-                iconName: "action/language"
-                name: "Language"
-                enabled: false
-            },
-
-            Action {
-                iconName: "action/account_circle"
-                name: "Accounts"
-            }
-        ]
-
-        backAction: navDrawer.action
-
-        NavigationDrawer {
-            id: navDrawer
-
-            enabled: page.width < dp(500)
-
-            onEnabledChanged: smallLoader.active = enabled
-
-            Flickable {
-                anchors.fill: parent
-
-                contentHeight: Math.max(content.implicitHeight, height)
-
-                Column {
-                    id: content
-                    anchors.fill: parent
-
-                    Repeater {
-                        model: sections
-
-                        delegate: Column {
-                            width: parent.width
-
-                            ListItem.Subheader {
-                                text: sectionTitles[index]
-                            }
-
-                            Repeater {
-                                model: modelData
-                                delegate: ListItem.Standard {
-                                    text: modelData
-                                    selected: modelData == demo.selectedComponent
-                                    onClicked: {
-                                        demo.selectedComponent = modelData
-                                        navDrawer.close()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Repeater {
-            model: !navDrawer.enabled ? sections : 0
-
-            delegate: Tab {
-                title: sectionTitles[index]
-
-                property string selectedComponent: modelData[0]
-                property var section: modelData
-
-                sourceComponent: tabDelegate
-            }
-        }
-
-        Loader {
-            id: smallLoader
-            anchors.fill: parent
-            sourceComponent: tabDelegate
-
-            property var section: []
-            visible: active
-            active: false
-        }
-    }
-
-    Dialog {
-        id: colorPicker
-        title: "Pick color"
-
-        positiveButtonText: "Done"
-
-        MenuField {
-            id: selection
-            model: ["Primary color", "Accent color", "Background color"]
-            width: dp(160)
-        }
-
-        Grid {
-            columns: 7
-            spacing: dp(8)
-
-            Repeater {
-                model: [
-                    "red", "pink", "purple", "deepPurple", "indigo",
-                    "blue", "lightBlue", "cyan", "teal", "green",
-                    "lightGreen", "lime", "yellow", "amber", "orange",
-                    "deepOrange", "grey", "blueGrey", "brown", "black",
-                    "white"
-                ]
-
-                Rectangle {
-                    width: dp(30)
-                    height: dp(30)
-                    radius: dp(2)
-                    color: Palette.colors[modelData]["500"]
-                    border.width: modelData === "white" ? dp(2) : 0
-                    border.color: Theme.alpha("#000", 0.26)
-
-                    Ink {
-                        anchors.fill: parent
-
-                        onPressed: {
-                            switch(selection.selectedIndex) {
-                                case 0:
-                                    theme.primaryColor = parent.color
-                                    break;
-                                case 1:
-                                    theme.accentColor = parent.color
-                                    break;
-                                case 2:
-                                    theme.backgroundColor = parent.color
-                                    break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        onRejected: {
-            // TODO set default colors again but we currently don't know what that is
-        }
-    }
-
-    Component {
-        id: tabDelegate
-
-        Item {
-
-            Sidebar {
-                id: sidebar
-
-                expanded: !navDrawer.enabled
-
-                Column {
-                    width: parent.width
-
-                    Repeater {
-                        model: section
-                        delegate: ListItem.Standard {
-                            text: modelData
-                            selected: modelData == selectedComponent
-                            onClicked: selectedComponent = modelData
-                        }
-                    }
-                }
-            }
-            Flickable {
-                id: flickable
-                anchors {
-                    left: sidebar.right
-                    right: parent.right
-                    top: parent.top
-                    bottom: parent.bottom
-                }
-                clip: true
-                contentHeight: Math.max(example.implicitHeight + 40, height)
-                Loader {
-                    id: example
-                    anchors.fill: parent
-                    asynchronous: true
-                    visible: status == Loader.Ready
-                    // selectedComponent will always be valid, as it defaults to the first component
-                    source: {
-                        if (navDrawer.enabled) {
-                            return Qt.resolvedUrl("%1Demo.qml").arg(demo.selectedComponent.replace(" ", ""))
-                        } else {
-                            return Qt.resolvedUrl("%1Demo.qml").arg(selectedComponent.replace(" ", ""))
-                        }
-                    }
-                }
-
-                ProgressCircle {
-                    anchors.centerIn: parent
-                    visible: example.status == Loader.Loading
-                }
-            }
-            Scrollbar {
-                flickableItem: flickable
-            }
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/deploy_key.enc b/prototype_2016/third_party/qml-material/deploy_key.enc
deleted file mode 100644
index 8ec6492..0000000
--- a/prototype_2016/third_party/qml-material/deploy_key.enc
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/documentation/.gitignore b/prototype_2016/third_party/qml-material/documentation/.gitignore
deleted file mode 100644
index 1936cc1..0000000
--- a/prototype_2016/third_party/qml-material/documentation/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-html
diff --git a/prototype_2016/third_party/qml-material/documentation/images/buttons.png b/prototype_2016/third_party/qml-material/documentation/images/buttons.png
deleted file mode 100644
index aeda026..0000000
--- a/prototype_2016/third_party/qml-material/documentation/images/buttons.png
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/documentation/material.qdoc b/prototype_2016/third_party/qml-material/documentation/material.qdoc
deleted file mode 100644
index 5f07656..0000000
--- a/prototype_2016/third_party/qml-material/documentation/material.qdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
-    \qmlmodule Material 0.2
-    \title Material Design UI components
-    This implements Material Design for QtQuick.
-*/
diff --git a/prototype_2016/third_party/qml-material/documentation/material.qdocconf b/prototype_2016/third_party/qml-material/documentation/material.qdocconf
deleted file mode 100644
index 8638c64..0000000
--- a/prototype_2016/third_party/qml-material/documentation/material.qdocconf
+++ /dev/null
@@ -1,16 +0,0 @@
-project = Material
-url = http://developer.ubuntu.com/api/ubuntu-12.10/qml/mobile/
-description = Material for QtQuick
-sourcedirs = ./
-sourcedirs += ../modules/Material/
-sourcedirs += ../modules/Material/ListItems
-exampledirs += snippets
-imagedirs = images
-sources.fileextensions = "*.qml *.qdoc *.cpp"
-headers.fileextensions = "*.h"
-version = 0.2
-syntaxhighlighting = true
-sourceencoding = UTF-8
-outputencoding = UTF-8
-outputdir                  = ditaxml
-outputformats              = DITAXML
diff --git a/prototype_2016/third_party/qml-material/fonts/MaterialFontLoader.qml b/prototype_2016/third_party/qml-material/fonts/MaterialFontLoader.qml
deleted file mode 100644
index b91f341..0000000
--- a/prototype_2016/third_party/qml-material/fonts/MaterialFontLoader.qml
+++ /dev/null
@@ -1,33 +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.0
-
-Item {
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-BlackItalic.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-Black.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-Bold.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-BoldItalic.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/RobotoCondensed-Bold.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/RobotoCondensed-BoldItalic.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-Medium.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-MediumItalic.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-Regular.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/RobotoCondensed-Italic.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/RobotoCondensed-Light.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/RobotoCondensed-LightItalic.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/RobotoCondensed-Regular.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-Italic.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-Light.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-LightItalic.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-Thin.ttf")}
-    FontLoader {source: Qt.resolvedUrl("roboto/Roboto-ThinItalic.ttf")}
-}
diff --git a/prototype_2016/third_party/qml-material/fonts/fonts.qrc b/prototype_2016/third_party/qml-material/fonts/fonts.qrc
deleted file mode 100644
index e795bb7..0000000
--- a/prototype_2016/third_party/qml-material/fonts/fonts.qrc
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material/Fonts">
-        <file>MaterialFontLoader.qml</file>
-        <file>qmldir</file>
-        <file>roboto/Roboto-Black.ttf</file>
-        <file>roboto/Roboto-BlackItalic.ttf</file>
-        <file>roboto/Roboto-Bold.ttf</file>
-        <file>roboto/Roboto-BoldItalic.ttf</file>
-        <file>roboto/Roboto-Italic.ttf</file>
-        <file>roboto/Roboto-Light.ttf</file>
-        <file>roboto/Roboto-LightItalic.ttf</file>
-        <file>roboto/Roboto-Medium.ttf</file>
-        <file>roboto/Roboto-MediumItalic.ttf</file>
-        <file>roboto/Roboto-Regular.ttf</file>
-        <file>roboto/Roboto-Thin.ttf</file>
-        <file>roboto/Roboto-ThinItalic.ttf</file>
-        <file>roboto/RobotoCondensed-Bold.ttf</file>
-        <file>roboto/RobotoCondensed-BoldItalic.ttf</file>
-        <file>roboto/RobotoCondensed-Italic.ttf</file>
-        <file>roboto/RobotoCondensed-Light.ttf</file>
-        <file>roboto/RobotoCondensed-LightItalic.ttf</file>
-        <file>roboto/RobotoCondensed-Regular.ttf</file>
-</qresource>
-
-</RCC>
diff --git a/prototype_2016/third_party/qml-material/fonts/qmldir b/prototype_2016/third_party/qml-material/fonts/qmldir
deleted file mode 100644
index d1f5ee9..0000000
--- a/prototype_2016/third_party/qml-material/fonts/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module Material.fonts
-
-MaterialFontLoader 0.1 MaterialFontLoader.qml
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Black.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Black.ttf
deleted file mode 100644
index 2cd263f..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Black.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-BlackItalic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-BlackItalic.ttf
deleted file mode 100644
index 2cbab76..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-BlackItalic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Bold.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Bold.ttf
deleted file mode 100644
index 30264a0..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Bold.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-BoldItalic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-BoldItalic.ttf
deleted file mode 100644
index 67b010e..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-BoldItalic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Italic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Italic.ttf
deleted file mode 100644
index 2c66b82..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Italic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Light.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Light.ttf
deleted file mode 100644
index f887c0c..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Light.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-LightItalic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-LightItalic.ttf
deleted file mode 100644
index 66b3bf0..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-LightItalic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Medium.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Medium.ttf
deleted file mode 100644
index f908a39..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Medium.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-MediumItalic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-MediumItalic.ttf
deleted file mode 100644
index ae193cf..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-MediumItalic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Regular.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Regular.ttf
deleted file mode 100644
index e8f41e4..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Regular.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Thin.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Thin.ttf
deleted file mode 100644
index a607ef1..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-Thin.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-ThinItalic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-ThinItalic.ttf
deleted file mode 100644
index 67ef530..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/Roboto-ThinItalic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Bold.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Bold.ttf
deleted file mode 100644
index 738f9ec..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Bold.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-BoldItalic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-BoldItalic.ttf
deleted file mode 100644
index 21fe077..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-BoldItalic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Italic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Italic.ttf
deleted file mode 100644
index 4466d00..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Italic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Light.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Light.ttf
deleted file mode 100644
index 9bce9c0..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Light.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-LightItalic.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-LightItalic.ttf
deleted file mode 100644
index 7151253..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-LightItalic.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Regular.ttf b/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Regular.ttf
deleted file mode 100644
index 6fe33b6..0000000
--- a/prototype_2016/third_party/qml-material/fonts/roboto/RobotoCondensed-Regular.ttf
+++ /dev/null
diff --git a/prototype_2016/third_party/qml-material/icons.yml b/prototype_2016/third_party/qml-material/icons.yml
deleted file mode 100644
index e76ae0b..0000000
--- a/prototype_2016/third_party/qml-material/icons.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-out: icons/core_icons.qrc
-icons:
-  - navigation/arrow_back
-  - navigation/chevron_left
-  - navigation/chevron_right
-  - navigation/close
-  - navigation/menu
-  - navigation/more_vert
diff --git a/prototype_2016/third_party/qml-material/icons/core_icons.qrc b/prototype_2016/third_party/qml-material/icons/core_icons.qrc
deleted file mode 100644
index 25aaa6f..0000000
--- a/prototype_2016/third_party/qml-material/icons/core_icons.qrc
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/icons/navigation">
-        <file alias="arrow_back.svg">navigation_arrow_back.svg</file>
-        <file alias="chevron_left.svg">navigation_chevron_left.svg</file>
-        <file alias="chevron_right.svg">navigation_chevron_right.svg</file>
-        <file alias="close.svg">navigation_close.svg</file>
-        <file alias="menu.svg">navigation_menu.svg</file>
-        <file alias="more_vert.svg">navigation_more_vert.svg</file>
-</qresource>
-
-</RCC>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/icons/navigation_arrow_back.svg b/prototype_2016/third_party/qml-material/icons/navigation_arrow_back.svg
deleted file mode 100644
index 0b26387..0000000
--- a/prototype_2016/third_party/qml-material/icons/navigation_arrow_back.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M40 22H15.66l11.17-11.17L24 8 8 24l16 16 2.83-2.83L15.66 26H40v-4z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/icons/navigation_chevron_left.svg b/prototype_2016/third_party/qml-material/icons/navigation_chevron_left.svg
deleted file mode 100644
index 4449fbd..0000000
--- a/prototype_2016/third_party/qml-material/icons/navigation_chevron_left.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M30.83 14.83L28 12 16 24l12 12 2.83-2.83L21.66 24z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/icons/navigation_chevron_right.svg b/prototype_2016/third_party/qml-material/icons/navigation_chevron_right.svg
deleted file mode 100644
index ab7c4c5..0000000
--- a/prototype_2016/third_party/qml-material/icons/navigation_chevron_right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M20 12l-2.83 2.83L26.34 24l-9.17 9.17L20 36l12-12z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/icons/navigation_close.svg b/prototype_2016/third_party/qml-material/icons/navigation_close.svg
deleted file mode 100644
index 40b5e39..0000000
--- a/prototype_2016/third_party/qml-material/icons/navigation_close.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38 12.83L35.17 10 24 21.17 12.83 10 10 12.83 21.17 24 10 35.17 12.83 38 24 26.83 35.17 38 38 35.17 26.83 24z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/icons/navigation_menu.svg b/prototype_2016/third_party/qml-material/icons/navigation_menu.svg
deleted file mode 100644
index 6c9b6bf..0000000
--- a/prototype_2016/third_party/qml-material/icons/navigation_menu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M6 36h36v-4H6v4zm0-10h36v-4H6v4zm0-14v4h36v-4H6z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/icons/navigation_more_vert.svg b/prototype_2016/third_party/qml-material/icons/navigation_more_vert.svg
deleted file mode 100644
index e0750c5..0000000
--- a/prototype_2016/third_party/qml-material/icons/navigation_more_vert.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M24 16c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 4c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 12c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/material.pri b/prototype_2016/third_party/qml-material/material.pri
deleted file mode 100644
index 4538f4c..0000000
--- a/prototype_2016/third_party/qml-material/material.pri
+++ /dev/null
@@ -1,31 +0,0 @@
-CONFIG += c++11
-QT += qml quick
-
-android {
-    QT += androidextras svg xml
-}
-
-HEADERS += $$PWD/src/plugin.h \
-           $$PWD/src/core/device.h \
-           $$PWD/src/core/units.h
-
-SOURCES += $$PWD/src/plugin.cpp \
-           $$PWD/src/core/device.cpp \
-           $$PWD/src/core/units.cpp
-
-RESOURCES += $$PWD/src/material.qrc \
-             $$PWD/src/components/components.qrc \
-             $$PWD/src/controls/controls.qrc \
-             $$PWD/src/core/core.qrc \
-             $$PWD/src/extras/extras.qrc \
-             $$PWD/src/listitems/listitems.qrc \
-             $$PWD/src/popups/popups.qrc \
-             $$PWD/src/styles/styles.qrc \
-             $$PWD/src/window/window.qrc \
-             $$PWD/icons/core_icons.qrc
-
-OTHER_FILES = $$PWD/README.md $$PWD/CHANGELOG.md
-
-contains(OPTIONS, roboto) {
-    RESOURCES += $$PWD/fonts/fonts.qrc
-}
diff --git a/prototype_2016/third_party/qml-material/qml-material.pro b/prototype_2016/third_party/qml-material/qml-material.pro
deleted file mode 100644
index 8e44140..0000000
--- a/prototype_2016/third_party/qml-material/qml-material.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = src demo tests
-
-OTHER_FILES = $$PWD/README.md $$PWD/CHANGELOG.md
diff --git a/prototype_2016/third_party/qml-material/qpm.json b/prototype_2016/third_party/qml-material/qpm.json
deleted file mode 100644
index 6b49c1a..0000000
--- a/prototype_2016/third_party/qml-material/qpm.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "io.papyros.material",
-  "description": "",
-  "author": {
-    "name": "Michael Spencer",
-    "email": "sonrisesoftware@gmail.com"
-  },
-  "repository": {
-    "type": "GITHUB",
-    "url": "git@github.com:papyros/qml-material.git"
-  },
-  "version": {
-    "label": "0.3.0",
-    "revision": "",
-    "fingerprint": ""
-  },
-  "dependencies": [
-  ],
-  "license": "LGPL_2_1",
-  "pri_filename": "material.pri",
-  "webpage": "http://papyros.io/qml-material"
-}
diff --git a/prototype_2016/third_party/qml-material/scripts/build_docs.sh b/prototype_2016/third_party/qml-material/scripts/build_docs.sh
deleted file mode 100755
index 6bef30f..0000000
--- a/prototype_2016/third_party/qml-material/scripts/build_docs.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/bash
-
-cd documentation
-rm -r ditaxml html
-
-qdoc material.qdocconf
-docmaker.py ditaxml html
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/scripts/deploy.sh b/prototype_2016/third_party/qml-material/scripts/deploy.sh
deleted file mode 100755
index eb75d5a..0000000
--- a/prototype_2016/third_party/qml-material/scripts/deploy.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ -n "$TRAVIS_BUILD_ID" ]; then
-    # When running on Travis we need to use SSH to deploy to GitHub
-    #
-    # The following converts the repo URL to an SSH location,
-    # decrypts the SSH key and sets up the Git config with
-    # the correct user name and email (globally as this is a
-    # temporary travis environment)
-    #
-    # Set the following environment variables in the travis configuration (.travis.yml)
-    #
-    #   DEPLOY_BRANCH    - The only branch that Travis should deploy from
-    #   ENCRYPTION_LABEL - The label assigned when encrypting the SSH key using travis encrypt-file
-    #   GIT_NAME         - The Git user name
-    #   GIT_EMAIL        - The Git user email
-    #
-    echo SOURCE_BRANCH: $SOURCE_BRANCH
-    echo ENCRYPTION_LABEL: $ENCRYPTION_LABEL
-    echo GIT_NAME: $GIT_NAME
-    echo GIT_EMAIL: $GIT_EMAIL
-
-    if [ "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then
-        echo "Travis should only deploy from the SOURCE_BRANCH ($SOURCE_BRANCH) branch"
-        exit 0
-    else
-        if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-            echo "Travis should not deploy from pull requests"
-            exit 0
-        else
-            ENCRYPTED_KEY_VAR=encrypted_${ENCRYPTION_LABEL}_key
-            ENCRYPTED_IV_VAR=encrypted_${ENCRYPTION_LABEL}_iv
-            ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
-            ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
-            REPO=${REPO/git:\/\/github.com\//git@github.com:}
-
-            # The `deploy_key.enc` file should have been added to the repo and should
-            # have been created from the deploy private key using `travis encrypt-file`
-            openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in deploy_key.enc -out deploy_key -d
-
-            chmod 600 deploy_key
-            eval `ssh-agent -s`
-            ssh-add deploy_key
-
-            git config --global user.name "$GIT_NAME"
-            git config --global user.email "$GIT_EMAIL"
-        fi
-    fi
-fi
-
-REPO=git@github.com:papyros/qml-material
-TARGET_BRANCH=gh-pages
-SOURCE_DIR=documentation/html
-
-if [ ! -d "$SOURCE_DIR" ]; then
-  echo "SOURCE_DIR ($SOURCE_DIR) does not exist, build the documentation before deploying"
-  exit 1
-fi
-
-REPO_NAME=$(basename $REPO)
-TARGET_DIR=$(mktemp -d /tmp/$REPO_NAME.XXXX)
-REV=$(git rev-parse HEAD)
-git clone --branch ${TARGET_BRANCH} ${REPO} ${TARGET_DIR}
-rsync -rt --delete --exclude=".git" $SOURCE_DIR/ $TARGET_DIR/
-cd $TARGET_DIR
-git add -A .
-git commit --allow-empty -m "Documentation built from commit $REV"
-git push origin $TARGET_BRANCH
diff --git a/prototype_2016/third_party/qml-material/scripts/icons.py b/prototype_2016/third_party/qml-material/scripts/icons.py
deleted file mode 100755
index 5c134cd..0000000
--- a/prototype_2016/third_party/qml-material/scripts/icons.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /usr/bin/env python2
-import sys
-import os.path
-import urllib
-
-
-def download_icon(name, out_dirname):
-    print(' - ' + name)
-    group, name = name.split('/')
-    url = ('https://raw.githubusercontent.com/google/material-design-icons/master/{}/svg/production/ic_{}_48px.svg'
-           .format(group, name))
-    filename = os.path.join(out_dirname, group + '_' + name + '.svg')
-
-    if not os.path.exists(filename):
-        urllib.urlretrieve(url, filename)
-
-
-def load_yaml(fileName):
-    from yaml import load
-    try:
-        from yaml import CLoader as Loader
-    except ImportError:
-        from yaml import Loader
-    stream = open(fileName, "r")
-    return load(stream, Loader=Loader)
-
-
-def download_icons(names, out_dirname):
-    resources = {}
-    for icon in names:
-        download_icon(icon, out_dirname)
-        group, name = icon.split('/')
-        if group in resources:
-            resources[group].append(name)
-        else:
-            resources[group] = [name]
-
-    text = '<!DOCTYPE RCC>\n<RCC version="1.0">\n\n'
-
-    for group, names in resources.items():
-        text += '<qresource prefix="/icons/{}">\n'.format(group)
-        for name in names:
-            text += '\t<file alias="{name}.svg">{group}_{name}.svg</file>\n'.format(group=group, name=name)
-        text += '</qresource>\n\n'
-
-    text += '</RCC>'
-
-    return text
-
-
-if __name__ == '__main__':
-    if len(sys.argv) > 1:
-        filename = sys.argv[1]
-    else:
-        filename = 'icons.yml'
-
-    config = load_yaml(filename)
-
-    icons = config.get('icons', [])
-    out_filename = config.get('out', 'icons')
-
-    if out_filename.endswith('.qrc'):
-        out_dirname = os.path.dirname(out_filename)
-    else:
-        out_dirname = out_filename
-        out_filename = os.path.join(out_dirname, 'icons.qrc')
-
-    if not os.path.exists(out_dirname):
-        os.makedirs(out_dirname)
-
-    qrc = download_icons(icons, out_dirname)
-
-    with open(out_filename, 'w') as f:
-        f.write(qrc)
diff --git a/prototype_2016/third_party/qml-material/scripts/lint.sh b/prototype_2016/third_party/qml-material/scripts/lint.sh
deleted file mode 100755
index 0f4785d..0000000
--- a/prototype_2016/third_party/qml-material/scripts/lint.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/bash
-
-tempdir=$(mktemp -d /tmp/$REPO_NAME.XXXX)
-
-qmlfiles=$(find modules -type f -name \*qml -print)
-jsfiles=$(find modules -type f -name \*js -print)
-pyfiles=$(find modules -type f -name \*py -print)
-
-fail=0
-
-echo ">>> Checking QML files using qmllint"
-
-for file in $qmlfiles; do
-        qmllint $file || fail=1
-done
-
-echo ">>> Checking Python files using pyflakes and pep8"
-
-for file in $pyfiles; do
-        pyflakes $file || fail=1
-        pep8 $file || fail=1
-done
-
-echo ">>> Checking Javascript files using jshint"
-
-srcdir=$(pwd)
-
-cd $tempdir
-
-for file in $jsfiles; do
-        mkdir -p $(dirname $file)
-        sed "s/\.pragma .*//g; s/\.import .*//g" < $srcdir/$file > $file
-        jshint $file || fail=1
-done
-
-if [[ $fail == 1 ]]; then
-        exit 1
-fi
diff --git a/prototype_2016/third_party/qml-material/scripts/make_awesome.py b/prototype_2016/third_party/qml-material/scripts/make_awesome.py
deleted file mode 100755
index d21f89f..0000000
--- a/prototype_2016/third_party/qml-material/scripts/make_awesome.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env python3
-
-import requests
-import codecs
-import re
-
-# Don't include the gender icons from FontAwesome
-icon_blacklist = [
-    "genderless", "transgender.*", "neuter", "mars.*", "venus.*", "mercury.*",
-    "intersex"
-]
-
-js_template_header = """
-.pragma library
-
-var map = {
-"""
-
-js_template_footer = """
-};
-"""
-
-fontFilename = ''
-
-
-def is_blacklisted(icon_name):
-    for blacklisted_icon in icon_blacklist:
-        if re.match(blacklisted_icon, icon_name):
-            return True
-
-    return False
-
-
-def get_awesome_icons():
-    print('Downloading SCSS file...')
-
-    response = requests.get('http://raw.githubusercontent.com/FortAwesome/' +
-                            'Font-Awesome/master/scss/_variables.scss')
-    icons = []
-
-    for line in response.text.split('\n'):
-        if not line.startswith('$fa-var-'):
-            continue
-
-        line_array = line[8:].strip().split(': ')
-
-        name = line_array[0].replace('-', '_')
-        code = line_array[1][2:].strip(';').strip('"')
-
-        icons.append((name, code))
-
-    return icons
-
-
-def save_icons(icons, filename):
-    saved_count = 0
-
-    with codecs.open(filename, encoding='utf-8', mode='w') as f:
-        f.write(js_template_header)
-
-        for icon_name, code in icons:
-            if not is_blacklisted(icon_name):
-                saved_count += 1
-                f.write("    '{0}': '\\u{1}',\n".format(icon_name, code))
-
-        f.write(js_template_footer)
-
-    print('Wrote {0} of {1} icons to {2}'.format(saved_count,
-                                                 len(icons), filename))
-
-
-def download_font(url, filename):
-    print('Downloading font...')
-
-    response = requests.get(url)
-
-    with open(filename, 'wb') as out_file:
-        out_file.write(response.content)
-
-    print('Wrote {0}'.format(filename))
-
-
-if __name__ == '__main__':
-    icons = get_awesome_icons()
-    save_icons(icons, 'src/core/awesome.js')
-
-    download_font('http://github.com/FortAwesome/Font-Awesome/' +
-                  'raw/master/fonts/FontAwesome.otf',
-                  'src/core/FontAwesome.otf')
diff --git a/prototype_2016/third_party/qml-material/scripts/normalize_imports.sh b/prototype_2016/third_party/qml-material/scripts/normalize_imports.sh
deleted file mode 100755
index 3479316..0000000
--- a/prototype_2016/third_party/qml-material/scripts/normalize_imports.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-ROOT=$1
-VERSION=$2
-
-for F in  $(grep -rl "${ROOT}" .)
-do
-    sed -i '' -E "s/import ${ROOT} [0-9]+.[0-9]+/import ${ROOT} ${VERSION}/g" $F
-done
diff --git a/prototype_2016/third_party/qml-material/scripts/qrc.py b/prototype_2016/third_party/qml-material/scripts/qrc.py
deleted file mode 100755
index 0aeca11..0000000
--- a/prototype_2016/third_party/qml-material/scripts/qrc.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/bin/env python3
-
-# Generate a Qt Resource file from the contents of a list of directories
-# qrc.py <dir1> <dir2> ...
-
-import os
-import os.path
-
-
-def create_qrc(dirname, prefix=None):
-    basename = os.path.basename(dirname)
-
-    file_list = []
-
-    for root, dirs, files in os.walk(dirname):
-        file_list += [os.path.relpath(os.path.join(root, filename), dirname)
-                      for filename in files]
-
-    file_list.sort()
-
-    contents = '<!DOCTYPE RCC>\n<RCC version="1.0">\n\n'
-
-    if prefix:
-        contents += '<qresource prefix="/{}">\n'.format(prefix)
-    else:
-        contents += '<qresource>\n'
-
-    for filename in file_list:
-        if (filename.endswith('.js') or filename.endswith('.qml') or
-                filename.endswith('.otf') or filename.endswith('.ttf') or
-                filename.endswith('.png') or filename.endswith('.jpg') or
-                filename.endswith('.jpeg') or filename.endswith('.svg') or
-                filename == 'qmldir'):
-            contents += '\t<file>' + filename + '</file>\n'
-
-    contents += '</qresource>\n\n</RCC>\n'
-
-    with open(os.path.join(dirname, basename + '.qrc'), 'w') as f:
-        f.write(contents)
-
-
-if __name__ == '__main__':
-    create_qrc('demo')
-    create_qrc('src/core', 'Material')
-    create_qrc('src/controls', 'Material')
-    create_qrc('src/components', 'Material')
-    create_qrc('src/extras', 'Material/Extras')
-    create_qrc('src/listitems', 'Material/ListItems')
-    create_qrc('src/popups', 'Material')
-    create_qrc('src/styles', 'QtQuick/Controls/Styles/Material')
-    create_qrc('src/window', 'Material')
-    create_qrc('fonts', 'Material/Fonts')
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/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/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/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/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/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/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/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>
diff --git a/prototype_2016/third_party/qml-material/styles_demo/Makefile b/prototype_2016/third_party/qml-material/styles_demo/Makefile
deleted file mode 100644
index e105b26..0000000
--- a/prototype_2016/third_party/qml-material/styles_demo/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-run:
-        QT_QUICK_CONTROLS_STYLE=Material qmlscene -I ../modules/ main.qml
diff --git a/prototype_2016/third_party/qml-material/styles_demo/main.qml b/prototype_2016/third_party/qml-material/styles_demo/main.qml
deleted file mode 100644
index 77ee716..0000000
--- a/prototype_2016/third_party/qml-material/styles_demo/main.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.Controls 1.3
-import QtQuick.Window 2.2
-import QtQuick.Dialogs 1.2
-import QtQuick.Layouts 1.1
-
-ApplicationWindow {
-    title: qsTr("Hello World")
-    width: 640
-    height: 480
-
-    menuBar: MenuBar {
-        Menu {
-            title: qsTr("&File")
-            MenuItem {
-                text: qsTr("&Open")
-                onTriggered: messageDialog.show(qsTr("Open action triggered"));
-            }
-            MenuItem {
-                text: qsTr("E&xit")
-                onTriggered: Qt.quit();
-            }
-        }
-    }
-
-    toolBar: ToolBar {
-        ToolButton {
-            text: "Test" 
-            anchors.verticalCenter: parent.verticalCenter
-        }
-    }
-
-    ColumnLayout {
-        anchors.centerIn: parent
-
-        CheckBox {
-            id: checkBox1
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: qsTr("Check Box")
-        }
-
-        RadioButton {
-            id: radioButton1
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: qsTr("Radio button")
-        }
-
-        Slider {
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        GridLayout {
-            anchors.horizontalCenter: parent.horizontalCenter
-            TextField {
-                placeholderText: "Type in contact's name"
-            }
-            TextField {
-                placeholderText: "Type in contact's phone"
-             }
-        }
-
-        RowLayout {
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            Button {
-                id: button1
-                text: qsTr("Press Me 1")
-                onClicked: messageDialog.show(qsTr("Button 1 pressed"))
-            }
-
-            Button {
-                id: button2
-                text: qsTr("Press Me 2")
-                onClicked: messageDialog.show(qsTr("Button 2 pressed"))
-            }
-
-            Button {
-                id: button3
-                text: qsTr("Press Me 3")
-                onClicked: messageDialog.show(qsTr("Button 3 pressed"))
-            }
-        }
-    }
-
-    MessageDialog {
-        id: messageDialog
-        title: qsTr("May I have your attention, please?")
-
-        function show(caption) {
-            messageDialog.text = caption;
-            messageDialog.open();
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/tests/icons.yml b/prototype_2016/third_party/qml-material/tests/icons.yml
deleted file mode 100644
index 3fe1625..0000000
--- a/prototype_2016/third_party/qml-material/tests/icons.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-out: icons
-icons:
-  - action/alarm
-  - action/search
-  - action/settings
-  - content/add
diff --git a/prototype_2016/third_party/qml-material/tests/icons/action_alarm.svg b/prototype_2016/third_party/qml-material/tests/icons/action_alarm.svg
deleted file mode 100644
index 1a5c539..0000000
--- a/prototype_2016/third_party/qml-material/tests/icons/action_alarm.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M44 11.44l-9.19-7.71-2.57 3.06 9.19 7.71L44 11.44zM15.76 6.78l-2.57-3.06L4 11.43l2.57 3.06 9.19-7.71zM25 16h-3v12l9.49 5.71L33 31.24l-8-4.74V16zm-1.01-8C14.04 8 6 16.06 6 26s8.04 18 17.99 18S42 35.94 42 26 33.94 8 23.99 8zM24 40c-7.73 0-14-6.27-14-14s6.27-14 14-14 14 6.27 14 14-6.26 14-14 14z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/tests/icons/action_search.svg b/prototype_2016/third_party/qml-material/tests/icons/action_search.svg
deleted file mode 100644
index be555cd..0000000
--- a/prototype_2016/third_party/qml-material/tests/icons/action_search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M31 28h-1.59l-.55-.55C30.82 25.18 32 22.23 32 19c0-7.18-5.82-13-13-13S6 11.82 6 19s5.82 13 13 13c3.23 0 6.18-1.18 8.45-3.13l.55.55V31l10 9.98L40.98 38 31 28zm-12 0c-4.97 0-9-4.03-9-9s4.03-9 9-9 9 4.03 9 9-4.03 9-9 9z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/tests/icons/action_settings.svg b/prototype_2016/third_party/qml-material/tests/icons/action_settings.svg
deleted file mode 100644
index 7a01c33..0000000
--- a/prototype_2016/third_party/qml-material/tests/icons/action_settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38.86 25.95c.08-.64.14-1.29.14-1.95s-.06-1.31-.14-1.95l4.23-3.31c.38-.3.49-.84.24-1.28l-4-6.93c-.25-.43-.77-.61-1.22-.43l-4.98 2.01c-1.03-.79-2.16-1.46-3.38-1.97L29 4.84c-.09-.47-.5-.84-1-.84h-8c-.5 0-.91.37-.99.84l-.75 5.3c-1.22.51-2.35 1.17-3.38 1.97L9.9 10.1c-.45-.17-.97 0-1.22.43l-4 6.93c-.25.43-.14.97.24 1.28l4.22 3.31C9.06 22.69 9 23.34 9 24s.06 1.31.14 1.95l-4.22 3.31c-.38.3-.49.84-.24 1.28l4 6.93c.25.43.77.61 1.22.43l4.98-2.01c1.03.79 2.16 1.46 3.38 1.97l.75 5.3c.08.47.49.84.99.84h8c.5 0 .91-.37.99-.84l.75-5.3c1.22-.51 2.35-1.17 3.38-1.97l4.98 2.01c.45.17.97 0 1.22-.43l4-6.93c.25-.43.14-.97-.24-1.28l-4.22-3.31zM24 31c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/tests/icons/content_add.svg b/prototype_2016/third_party/qml-material/tests/icons/content_add.svg
deleted file mode 100644
index 2b3a796..0000000
--- a/prototype_2016/third_party/qml-material/tests/icons/content_add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M38 26H26v12h-4V26H10v-4h12V10h4v12h12v4z"/></svg>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/tests/icons/icons.qrc b/prototype_2016/third_party/qml-material/tests/icons/icons.qrc
deleted file mode 100644
index b0e9440..0000000
--- a/prototype_2016/third_party/qml-material/tests/icons/icons.qrc
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/icons/action">
-        <file alias="alarm.svg">action_alarm.svg</file>
-        <file alias="search.svg">action_search.svg</file>
-        <file alias="settings.svg">action_settings.svg</file>
-</qresource>
-
-<qresource prefix="/icons/content">
-        <file alias="add.svg">content_add.svg</file>
-</qresource>
-
-</RCC>
\ No newline at end of file
diff --git a/prototype_2016/third_party/qml-material/tests/tests.cpp b/prototype_2016/third_party/qml-material/tests/tests.cpp
deleted file mode 100755
index 6d01cdf..0000000
--- a/prototype_2016/third_party/qml-material/tests/tests.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- * Copyright (C) 2014 Michael Spencer
- *
- * 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/>.
- */
-
-#include <QtQuickTest/QtQuickTest>
-QUICK_TEST_MAIN(material)
diff --git a/prototype_2016/third_party/qml-material/tests/tests.pro b/prototype_2016/third_party/qml-material/tests/tests.pro
deleted file mode 100644
index dd81acd..0000000
--- a/prototype_2016/third_party/qml-material/tests/tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET = tst_material
-CONFIG += warn_on qmltestcase no_testcase_installs
-SOURCES += tests.cpp
-
-RESOURCES += icons/icons.qrc
-
-OTHER_FILES += tst_card.qml \
-    tst_pagestack.qml
diff --git a/prototype_2016/third_party/qml-material/tests/tst_actionbar.qml b/prototype_2016/third_party/qml-material/tests/tst_actionbar.qml
deleted file mode 100644
index bc52522..0000000
--- a/prototype_2016/third_party/qml-material/tests/tst_actionbar.qml
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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 QtTest 1.0
-import Material 0.2
-
-Rectangle {
-    width: 400
-    height: 800
-
-    ActionBar {
-        id: actionBar
-
-        width: parent.width
-
-        actions: [
-            Action {
-                id: action1
-                name: "Action 1"
-                iconName: "content/add"
-                objectName: "action1"
-            },
-            Action {
-                name: "Action 2"
-                iconName: "action/search"
-            },
-            Action {
-                name: "Action 3"
-                iconName: "action/settings"
-            },
-            Action {
-                id: action4
-                name: "Action 4"
-                objectName: "action4"
-                iconName: "action/alarm"
-            }
-        ]
-    }
-
-    OverlayLayer {
-        id: tooltipOverlayLayer
-        objectName: "tooltipOverlayLayer"
-    }
-
-    OverlayLayer {
-        id: overlayLayer
-    }
-
-    SignalSpy {
-        id: action1Spy
-        target: action1
-        signalName: "triggered"
-    }
-
-    SignalSpy {
-        id: action4Spy
-        target: action4
-        signalName: "triggered"
-    }
-
-    SignalSpy {
-        id: overflowSpy
-        target: testCase.findChild(actionBar, "action/overflow")
-        signalName: "clicked"
-    }
-
-    TestCase {
-        id: testCase
-        when: windowShown
-        name: "ActionBar Test"
-
-        function init() {
-            var button = testCase.findChild(actionBar, "action/overflow")
-            var overflow = testCase.findChild(actionBar, "overflowMenu")
-            verify(button != null)
-            verify(overflow != null)
-
-            if (overflow.showing) {
-                mouseClick(button, 10, 10)
-                wait(10000)
-            }
-
-            verify(!overflow.showing)
-
-            overflowSpy.clear()
-        }
-
-        function test_click_action() {
-            var button = testCase.findChild(actionBar, "action/" + action1.objectName)
-
-            verify(button != null)
-
-            compare(action1Spy.count, 0)
-            mouseClick(button, 10, 10)
-            wait(10000) // Wait for the overflow to fully open
-            compare(action1Spy.count, 1)
-        }
-
-        function test_open_overflow() {
-            var button = testCase.findChild(actionBar, "action/overflow")
-            var overflow = testCase.findChild(actionBar, "overflowMenu")
-
-            verify(button != null)
-            verify(overflow != null)
-
-            verify(!overflow.showing)
-            compare(overflowSpy.count, 0)
-            mouseClick(button, 10, 10)
-            wait(10000) // Wait for the overflow to fully open
-            compare(overflowSpy.count, 1)
-            verify(overflow.showing)
-        }
-
-        function test_click_action_in_overflow() {
-            var button = testCase.findChild(actionBar, "action/overflow")
-            var listItem = testCase.findChild(actionBar, "action/" + action4.objectName)
-            var overflow = testCase.findChild(actionBar, "overflowMenu")
-
-            verify(button != null)
-            verify(listItem != null)
-            verify(overflow != null)
-
-            compare(action4Spy.count, 0)
-            mouseClick(button, 10, 10)
-
-            wait(10000) // Wait for the overflow to fully open
-
-            verify(overflow.showing)
-            mouseClick(listItem, 10, 10)
-            compare(action4Spy.count, 1)
-
-            wait(400)
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-material/tests/tst_card.qml b/prototype_2016/third_party/qml-material/tests/tst_card.qml
deleted file mode 100755
index 8ef29c1..0000000
--- a/prototype_2016/third_party/qml-material/tests/tst_card.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- * Copyright (C) 2014 Michael Spencer
- *
- * 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 QtTest 1.0
-import Material 0.2
-
-Card {
-    width: 100
-    height: 100
-    id: card
-
-    TestCase {
-        name: "Card Test"
-        when: windowShown
-
-        function test_showCard() {
-            wait(2000);
-        }
-    }
-
-}
diff --git a/prototype_2016/third_party/qml-material/tests/tst_pagestack.qml b/prototype_2016/third_party/qml-material/tests/tst_pagestack.qml
deleted file mode 100755
index 6b90c9a..0000000
--- a/prototype_2016/third_party/qml-material/tests/tst_pagestack.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * QML Material - An application framework implementing Material Design.
- * Copyright (C) 2014 Michael Spencer
- *
- * 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 QtTest 1.0
-import Material 0.2
-
-Rectangle {
-    width: 100
-    height: 100
-
-    ApplicationWindow {
-        id: mainwin
-        title: "Application Name"
-        width: 100
-        height: 100
-
-        initialPage: Page {
-            id: page
-            title: "Page Title"
-
-            Label {
-                anchors.centerIn: parent
-                text: "Hello World!"
-            }
-        }
-
-        Component.onCompleted: mainwin.show()
-    }
-
-    TestCase {
-        name: "PageStack Test"
-        when: mainwin.visible
-
-        function test_showCard() {
-            wait(2000);
-            console.log('here');
-
-            verify( page !== null )
-            verify( page !== undefined )
-        }
-    }
-
-}
diff --git a/prototype_2016/third_party/qml-material/vendor.cmake b/prototype_2016/third_party/qml-material/vendor.cmake
deleted file mode 100644
index 9bb3abf..0000000
--- a/prototype_2016/third_party/qml-material/vendor.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
-set(VENDOR_SOURCES ${VENDOR_SOURCES}
-            ${CMAKE_CURRENT_LIST_DIR}/src/plugin.h
-            ${CMAKE_CURRENT_LIST_DIR}/src/core/device.h
-            ${CMAKE_CURRENT_LIST_DIR}/src/core/units.h
-            ${CMAKE_CURRENT_LIST_DIR}/src/plugin.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/src/core/device.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/src/core/units.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/src/material.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/src/components/components.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/src/controls/controls.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/src/core/core.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/src/extras/extras.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/src/listitems/listitems.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/src/popups/popups.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/src/styles/styles.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/src/window/window.qrc
-            ${CMAKE_CURRENT_LIST_DIR}/icons/core_icons.qrc)
diff --git a/prototype_2016/third_party/qml-rust/.gitignore b/prototype_2016/third_party/qml-rust/.gitignore
deleted file mode 100644
index 4497ede..0000000
--- a/prototype_2016/third_party/qml-rust/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target
-Cargo.lock
-DOtherSide
-/*.qml
diff --git a/prototype_2016/third_party/qml-rust/Cargo.toml b/prototype_2016/third_party/qml-rust/Cargo.toml
deleted file mode 100644
index 404dd7f..0000000
--- a/prototype_2016/third_party/qml-rust/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "qml"
-version = "0.0.5"
-authors = ["White-Oak <lpzhelud@gmail.com>"]
-build = "build.rs"
-
-description = "Safe QML bindings for Rust"
-repository = "https://github.com/White-Oak/qml-rust"
-readme = "README.md"
-keywords = ["QML", "FFI", "Qt", "bindings", "GUI"]
-license = "MIT"
-
-
-[dependencies]
-libc = { path = "../libc", version = "0.2" }
-lazy_static = { path = "../lazy-static.rs", version = "0.2" }
-
-[build-dependencies]
-pkg-config = { path = "../pkg-config-rs", version = "0.3" }
diff --git a/prototype_2016/third_party/qml-rust/LICENSE b/prototype_2016/third_party/qml-rust/LICENSE
deleted file mode 100644
index 63b6955..0000000
--- a/prototype_2016/third_party/qml-rust/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2016 White-Oak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/prototype_2016/third_party/qml-rust/README.md b/prototype_2016/third_party/qml-rust/README.md
deleted file mode 100644
index aca316e..0000000
--- a/prototype_2016/third_party/qml-rust/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# QML-rust - bindings for [Qt Quick](http://doc.qt.io/qt-5/qtquick-index.html)
-Bindings are based on [DOtherSide](https://github.com/filcuc/DOtherSide) C bindings for QML
-Library is mostly feature-compliant with other bindings based on the library, but lacks some minor features and has quite a few bugs.
-
-## [Early documentation](https://white-oak.github.io/qml-rust/qml/)
-# Examples
-All examples are located in a folder [`examples/`](examples), under `example_name.rs` and `example_name.qml` names.
-
-* `cargo run --example properties` for setting properties from Rust to QML.
-* `cargo run --example listmodel` for an example of providing QML with list model from Rust.
-* `cargo run --example listmodel_macro` for the same example, but using `Q_LISTMODEL!` macro.
-* `cargo run --example sigslots` for an example of how to create your own `QObject` with signals and slots, and to communicate between QML and Rust. Also shows how to use `Q_OBJECT!` macro.
-* `cargo run --example qvarlists` for an example of how to use `qvarlist!` macro to easily form `QVariant` (used to pass data to QML) of a complex array.
-* `cargo run --example threaded` for an example of multithreading.
-* `cargo run --example qmlregister` for an example of how to register and use your own types from Rust in QML.
-
-Requires CMake, Make, Qt (Core, Gui, Widgets, Quick) and, of course, Rust.
-
-## In-app examples
-
-* [Architect](https://github.com/White-Oak/architect) - an app showing some git stats,
-using qml-rust to provide properties and lists to QML in [here](https://github.com/White-Oak/architect/blob/master/src/view/qt.rs).
-* [Kefia](https://github.com/White-Oak/kefia) - A simple package manager, that provides a QListModel to QML, registers a QObject with slots and communicates between QML and Rust,
-[here](https://github.com/White-Oak/kefia/blob/master/src/view.rs).
-
-# Status
-Done:
-* Basic initialization and execution.
-* Providing properties to QML files.
-* QAbstractListModels - provides changable models for QML items (early draft, still lacks proper mutability).
-* QObjects: slots, signals (limited properties support). Emitting signals and receiving slots works.
-* Registering your own QML types (singletons or not) from Rust code.
-
-To be done:
-* the library is mostly done, but some stuff is lacking polish, like possible memory leaks or better macro designs.
diff --git a/prototype_2016/third_party/qml-rust/build.rs b/prototype_2016/third_party/qml-rust/build.rs
deleted file mode 100644
index 606d653..0000000
--- a/prototype_2016/third_party/qml-rust/build.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-extern crate pkg_config;
-use std::env;
-use std::process::Command;
-use std::path::*;
-use pkg_config::*;
-
-fn main() {
-    Command::new("sh")
-        .arg("build_lib.sh")
-        .output()
-        .unwrap_or_else(|e| panic!("failed to execute process: {}", e));
-    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-    let path = Path::new(&manifest_dir).join("DOtherSide").join("build").join("lib");
-
-    println!("cargo:rustc-link-search=native={}", path.display());
-    println!("cargo:rerun-if-changed={}", path.display());
-    println!("cargo:rustc-link-lib=static=DOtherSideStatic");
-    println!("cargo:rustc-link-lib=dylib=stdc++");
-
-    Config::new().probe("Qt5Core Qt5Gui Qt5Qml Qt5Quick Qt5Widgets").unwrap();
-}
diff --git a/prototype_2016/third_party/qml-rust/build_lib.sh b/prototype_2016/third_party/qml-rust/build_lib.sh
deleted file mode 100644
index 2612e11..0000000
--- a/prototype_2016/third_party/qml-rust/build_lib.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-ln -sn ../DOtherSide DOtherSide
-cd DOtherSide
-rm -rf build
-mkdir build
-cd build
-
-cmake ..
-make DOtherSideStatic
diff --git a/prototype_2016/third_party/qml-rust/examples/listmodel.qml b/prototype_2016/third_party/qml-rust/examples/listmodel.qml
deleted file mode 100644
index 978bf1d..0000000
--- a/prototype_2016/third_party/qml-rust/examples/listmodel.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.2
-import QtQuick.Controls 1.2
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.1
-
-ApplicationWindow
-{
-  x: 400
-  y: 200
-  width: 400
-  height: 300
-  title: "SimpleData"
-  Component.onCompleted: visible = true
-
-  ListView {
-    width: 400
-    height: 300
-
-    model: listModel
-    delegate: Text {
-      text: name + ": " + number
-    }
-  }
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/listmodel.rs b/prototype_2016/third_party/qml-rust/examples/listmodel.rs
deleted file mode 100644
index 07d99e8..0000000
--- a/prototype_2016/third_party/qml-rust/examples/listmodel.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-#[macro_use]
-extern crate qml;
-
-use qml::*;
-
-fn main() {
-    let qqae = QmlEngine::new();
-    let mut qalm = QListModel::new(&["name", "number"]);
-    qalm.insert_row(qvarlist!["John", 42].into_iter());
-    qalm.insert_row(qvarlist!["Oak", 505].into_iter());
-    qqae.set_property("listModel", &qalm.get_qvar());
-
-    qqae.load_file("examples/listmodel.qml");
-    qalm.set_data(vec![qvarlist!["OMG", 13317], qvarlist!["HACKED", 228]]);
-    qqae.exec();
-    qqae.quit();
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/listmodel_macro.rs b/prototype_2016/third_party/qml-rust/examples/listmodel_macro.rs
deleted file mode 100644
index 7b4b685..0000000
--- a/prototype_2016/third_party/qml-rust/examples/listmodel_macro.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#[macro_use]
-extern crate qml;
-
-use qml::*;
-
-Q_LISTMODEL!{
-    pub QTestModel {
-        name: String,
-        number: i32,
-    }
-}
-
-fn main() {
-    let mut qqae = QmlEngine::new();
-    let mut qalm = QTestModel::new();
-    qalm.insert_row("John".into(), 42);
-    qalm.insert_row("Oak".into(), 505);
-    // `&QTestModel` implements `Into<QVariant>`
-    qqae.set_and_store_property("listModel", qalm.get_qvar());
-
-    qqae.load_file("examples/listmodel.qml");
-    qalm.set_data(vec![("OMG".into(), 13317), ("HACKED".into(), 228)]);
-    qqae.exec();
-    qqae.quit();
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/properties.qml b/prototype_2016/third_party/qml-rust/examples/properties.qml
deleted file mode 100644
index 4dd58e4..0000000
--- a/prototype_2016/third_party/qml-rust/examples/properties.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import QtQuick 2.2
-import QtQuick.Controls 1.2
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.1
-
-ApplicationWindow
-{
-  width: 400
-  height: 300
-  title: "SimpleData"
-  Component.onCompleted: visible = true
-
-  ColumnLayout
-  {
-    anchors.fill: parent
-    Text{
-      text: "Wait"
-      Component.onCompleted: text = testArrayProperty()
-
-      function testArrayProperty() {
-        if (typeof values == 'undefined')
-          return "No array"
-        return values[0] == 42 && values[1] == 43
-      }
-    }
-    SpinBox { value: qVar1 }
-    TextField { text: qVar2 }
-    CheckBox { checked: qVar3 }
-    SpinBox { value: qVar4; decimals: 1 }
-
-  }
-
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/properties.rs b/prototype_2016/third_party/qml-rust/examples/properties.rs
deleted file mode 100644
index ca85ef7..0000000
--- a/prototype_2016/third_party/qml-rust/examples/properties.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-extern crate qml;
-
-use qml::*;
-fn main() {
-    let mut qqae = QmlEngine::new();
-    let qvar: QVariant = 10.into();
-    qqae.set_and_store_property("qVar1", 5);
-    qqae.set_and_store_property("qVar2", 8.6);
-    qqae.set_property("qVar3", &qvar);
-    qqae.set_property("qVar4", &qvar);
-    let vec: Vec<QVariant> = vec![42.into(), 43.into()];
-    qqae.set_and_store_property("values", vec);
-    qqae.load_file("examples/properties.qml");
-    qqae.exec();
-    qqae.quit();
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/qmlregister.qml b/prototype_2016/third_party/qml-rust/examples/qmlregister.qml
deleted file mode 100644
index 6dafdd7..0000000
--- a/prototype_2016/third_party/qml-rust/examples/qmlregister.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick 2.2
-import TestModule 1.0
-
-Item {
-  TestRsObject{
-    id: rsRegistered
-
-    name: "Oak"
-  }
-  Component.onCompleted: {
-    console.log(rsRegistered.name)
-    rsRegistered.name = "This is working"
-    console.log(rsRegistered.name)
-    rsRegistered.assure_everything_okay()
-    console.log(TestRsSingleton.temp)
-  }
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/qmlregister.rs b/prototype_2016/third_party/qml-rust/examples/qmlregister.rs
deleted file mode 100644
index 55ab2d8..0000000
--- a/prototype_2016/third_party/qml-rust/examples/qmlregister.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-#[macro_use]
-extern crate qml;
-use std::thread;
-use std::sync::*;
-use std::time::Duration;
-
-use qml::*;
-
-#[derive(Default)]
-pub struct Test;
-
-impl QTest {
-    fn assure_everything_okay(&mut self) -> Option<&QVariant> {
-        println!("It's okay");
-        None
-    }
-}
-
-Q_OBJECT!(
-pub Test as QTest{
-    signals:
-    slots:
-        fn assure_everything_okay();
-    properties:
-        name: String; read: get_name, write: set_name, notify: name_changed;
-});
-
-Q_OBJECT!(
-pub Test as QTestSingleton{
-    signals:
-    slots:
-    properties:
-        temp: i32; read: get_temp, write: set_temp, notify: temp_changed;
-});
-
-Q_REGISTERABLE_QML!(QTest: Test as TestRsObject 1=>0, from TestModule);
-Q_REGISTERABLE_QML!(QTestSingleton: Test as TestRsSingleton 1=>0, from TestModule);
-fn main() {
-    let mut qqae = QmlEngine::new();
-    Q_REGISTER_QML!(QTest);
-    Q_REGISTER_SINGLETON_QML!(QTestSingleton);
-    qqae.load_file("examples/qmlregister.qml");
-    qqae.exec();
-
-    qqae.quit();
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/qobjects.rs b/prototype_2016/third_party/qml-rust/examples/qobjects.rs
deleted file mode 100644
index d03eda4..0000000
--- a/prototype_2016/third_party/qml-rust/examples/qobjects.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-#[macro_use]
-extern crate qml;
-
-use qml::*;
-
-pub struct Test;
-
-impl Test {
-    pub fn launchGoose(&self, i: i32, i2: String) -> Option<&QVariant> {
-        println!("GOOSE HI from {} and {}", i2, i);
-        None
-    }
-}
-
-Q_OBJECT!(
-pub Test as QTest{
-    signals:
- fn testname (a: i32, b: i32);
-    slots:
- fn launchGoose(i: i32, launchText: String);
-    properties:
-});
-
-fn main() {
-    let mut qqae = QmlEngine::new();
-    let mut qtest = QTest::new(Test);
-    qtest.testname(54, 55);
-    qtest.qslot_call("launchGoose",
-                     vec![42.into(), "QML Rust".to_string().into()]);
-    println!("{:?}", qtest.qmeta());
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/qvarlists.qml b/prototype_2016/third_party/qml-rust/examples/qvarlists.qml
deleted file mode 100644
index e0be5e4..0000000
--- a/prototype_2016/third_party/qml-rust/examples/qvarlists.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import QtQuick 2.0
-import QtCharts 2.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 1.3
-ApplicationWindow {
-  visible: true
-  title: "Architect View"
-  minimumWidth: 1200
-  minimumHeight: 800 + 100
-  x: 400
-  y: 100
-  ChartView {
-    title: "Language stats"
-    anchors.fill: parent
-    antialiasing: true
-
-    PercentBarSeries {
-      id: barS
-      axisX: BarCategoryAxis { categories: ["2005", "2006"] }
-      BarSet { label: "Bob"; values: [2, 2] }
-      BarSet { label: "Susan"; values: [5, 1] }
-      BarSet { label: "James"; values: [3, 5] }
-      Component.onCompleted: {
-        console.log(values)
-        values.forEach(function(item, index) {
-          barS.append(item[0], item[1]);
-        });
-      }
-    }
-  }
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/qvarlists.rs b/prototype_2016/third_party/qml-rust/examples/qvarlists.rs
deleted file mode 100644
index 99192e4..0000000
--- a/prototype_2016/third_party/qml-rust/examples/qvarlists.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![feature(trace_macros)]
-#[macro_use]
-extern crate qml;
-
-use qml::*;
-
-fn main() {
-    let mut qqae = QmlEngine::new();
-    trace_macros!(true);
-    let shortcut = qvarlist![["John", [2, 2]], ["Ivan", [10, 0]], ["Mary", [0, 1]]];
-    qqae.set_and_store_property("values", shortcut);
-
-    qqae.load_file("examples/qvarlists.qml");
-    qqae.exec();
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/sigslots.qml b/prototype_2016/third_party/qml-rust/examples/sigslots.qml
deleted file mode 100644
index 7a2691e..0000000
--- a/prototype_2016/third_party/qml-rust/examples/sigslots.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import QtQuick 2.2
-import QtQuick.Controls 1.2
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.1
-
-ApplicationWindow {
-  width: 400
-  height: 300
-  title: "of Signals & Slots"
-  Component.onCompleted: visible = true
-
-  ColumnLayout {
-    anchors.fill: parent
-    Text {
-      id: text
-      anchors.horizontalCenter: parent.horizontalCenter
-      text: "Not set yet"
-    }
-    Button {
-      id: butt
-      anchors.horizontalCenter: parent.horizontalCenter
-      text: "Notify Rust"
-      Component.onCompleted: {
-        clicked.connect(test.click)
-        test.updateText.connect(updateText)
-        console.log(test.name)
-        test.name = "OAK"
-        console.log(test.name)
-      }
-      function updateText(s) {
-        text.text = s
-      }
-    }
-  }
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/sigslots.rs b/prototype_2016/third_party/qml-rust/examples/sigslots.rs
deleted file mode 100644
index 1f1d744..0000000
--- a/prototype_2016/third_party/qml-rust/examples/sigslots.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-#[macro_use]
-extern crate qml;
-use std::thread;
-use std::sync::*;
-use std::time::Duration;
-
-use qml::*;
-
-pub struct Test;
-
-Q_OBJECT!(
-pub Test as QTest{
-    signals:
-        fn updateText(s: String);
-    slots:
-        fn click();
-    properties:
-        name: String; read: get_name, write: set_name, notify: name_changed;
-});
-
-impl QTest {
-    pub fn click(&self) -> Option<&QVariant> {
-        println!("IT CLICKED");
-        self.updateText("Woah, Rust has noticed you".into());
-        None
-    }
-}
-
-fn main() {
-    let mut qqae = QmlEngine::new();
-    let mut qtest = QTest::new(Test, "OAK".into());
-    qtest.set_name("Swapped".into());
-    // assert_eq!(qtest.get_name(), "Swapped".to_string());
-    qqae.set_and_store_property("test", qtest.get_qobj());
-    qqae.load_file("examples/sigslots.qml");
-    qqae.exec();
-
-    qqae.quit();
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/threaded.qml b/prototype_2016/third_party/qml-rust/examples/threaded.qml
deleted file mode 100644
index b31c3ed..0000000
--- a/prototype_2016/third_party/qml-rust/examples/threaded.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import QtQuick 2.5;
-import QtQuick.Window 2.1;
-import QtQuick.Controls 1.4;
-import QtQuick.Layouts 1.2;
-
-ApplicationWindow {
-    width: 300;
-    height: 100;
-    Component.onCompleted: visible = true;
-    ColumnLayout {
-        anchors.fill: parent;
-        TextField {
-            id: urlField;
-            Layout.fillWidth: true
-            text: "Anything"
-        }
-        RowLayout {
-            Layout.fillWidth: true
-            Item { Layout.fillWidth: true }
-            Button {
-                text: "Download Page";
-                onClicked: logic.downloadPage(urlField.text)
-            }
-            Item { Layout.fillWidth: true }
-        }
-        Connections {
-            target: logic;
-            onPageDownloaded: console.log("Page Downloaded");
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-rust/examples/threaded.rs b/prototype_2016/third_party/qml-rust/examples/threaded.rs
deleted file mode 100644
index c5389ed..0000000
--- a/prototype_2016/third_party/qml-rust/examples/threaded.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-#[macro_use]
-extern crate qml;
-
-use std::thread;
-use std::time::Duration;
-use qml::*;
-
-pub struct Logic;
-
-impl QLogic {
-    pub fn downloadPage(&mut self, url: String) -> Option<&QVariant>{
-        self.threaded(|s| {
-            thread::sleep(Duration::from_secs(2));;
-            s.pageDownloaded(url);
-        })
-        None
-    }
-}
-
-Q_OBJECT!{
-pub Logic as QLogic {
-    signals:
-        fn pageDownloaded(response: String);
-    slots:
-        fn downloadPage(url: String);
-    properties:
-}
-}
-
-fn main() {
-    let mut qqae = QmlEngine::new();
-    let qlogic = QLogic::new(Logic);
-    qqae.set_and_store_property("logic", qlogic.get_qobj());
-    qqae.load_file("examples/threaded.qml");
-    qqae.exec();
-}
diff --git a/prototype_2016/third_party/qml-rust/src/lib.rs b/prototype_2016/third_party/qml-rust/src/lib.rs
deleted file mode 100644
index a72a3ce..0000000
--- a/prototype_2016/third_party/qml-rust/src/lib.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-#![allow(non_snake_case)]
-#![allow(dead_code)]
-#![allow(unused_variables)]
-extern crate libc;
-#[macro_use]
-extern crate lazy_static;
-
-mod qmlengine;
-mod qvariant;
-mod qabstactlistmodel;
-mod qinthasharray;
-mod utils;
-mod qmodelindex;
-mod types;
-mod qresource;
-mod qurl;
-mod qobject;
-mod qmeta;
-mod qtypes;
-#[macro_use]
-mod macros;
-mod qmlregister;
-
-pub use qmlengine::QmlEngine;
-pub use qvariant::QVariant;
-pub use qabstactlistmodel::QListModel;
-pub use qobject::QObject;
-pub use qmeta::{QObjectMacro, emit_signal};
-pub use qtypes::*;
-pub use qresource::*;
-pub use qmlregister::QMLRegisterable;
-
-#[doc(hidden)]
-pub use libc::c_void;
-
-#[doc(hidden)]
-pub use qmlregister::{register_qml_type, register_qml_singleton_type};
diff --git a/prototype_2016/third_party/qml-rust/src/macros.rs b/prototype_2016/third_party/qml-rust/src/macros.rs
deleted file mode 100644
index 23c5bae..0000000
--- a/prototype_2016/third_party/qml-rust/src/macros.rs
+++ /dev/null
@@ -1,476 +0,0 @@
-/// Eases forming of `QVariantLists` ([`QVariant`](struct.QVariant.html) of array).
-///
-/// To be more precise, macro generates Vec<QVariant> which implements Into<QVariant>.
-/// # Examples
-/// ```
-/// # #[macro_use] extern crate qml;
-/// # use qml::*;
-/// # fn main() {
-/// let shortcut: QVariant = qvarlist![["John", [2, 2]], ["Ivan", [10, 0]], ["Mary", [0, 1]]].into();
-/// # }
-/// ```
-#[macro_export]
-macro_rules! qvarlist{
-    (__ $v:ident, [$($inside:tt)*], $($rest:tt)*) => {
-        $v.push(qvarlist!($($inside)*).into());
-        qvarlist!(__ $v, $($rest)*);
-    };
-    (__ $v:ident, [$($inside:tt)*]) => {
-        $v.push(qvarlist!($($inside)*).into());
-    };
-    (__ $v:ident, $varname:expr, $($rest:tt)*) => {
-        $v.push($varname.into());
-        qvarlist!(__ $v, $($rest)*);
-    };
-    (__ $v:ident, $varname:expr) => {
-        $v.push($varname.into());
-    };
-    ($($rest:tt)*) => {{
-        let mut v: Vec<QVariant> = Vec::new();
-        qvarlist!(__ v, $($rest)*);
-        v
-    }};
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! __gen_signals{
-    (fn $signalname:ident ( $( $signalvar:ident : $signalqtype:ident ),* ); $($rest:tt)*) =>{
-        pub fn $signalname(&self, $( $signalvar: $signalqtype ),*){
-            let mut vec: Vec<QVariant> = Vec::new();
-            $(
-                let $signalvar: $signalqtype = $signalvar;
-                vec.push($signalvar.into());
-            )*
-            emit_signal(self, stringify!($signalname), vec);
-        }
-
-        __gen_signals!($($rest)*);
-    };
-    () => ();
-}
-
-/// Marks the structure to be able to be used in Qt meta-object system.
-///
-/// # Examples
-///
-/// ```
-/// # #[macro_use] extern crate qml;
-/// # use qml::*;
-/// pub struct Example;
-///
-/// impl Example {
-///     pub fn simple_receiver(&mut self) {
-///         // This is a function that also will be a slot
-///     }
-/// }
-///
-/// Q_OBJECT!(
-/// pub Example as QExample{
-///     signals:
-///         fn simple_signal(s: String);
-///     slots:
-///         fn simple_receiver();
-///     properties:
-///         name: String; read: get_name, write: set_name, notify: name_changed;
-/// });
-///
-/// ...
-///
-/// # fn main() {
-/// let mut qqae = QmlEngine::new();
-/// let mut qobject = QExample::new(Example);
-/// qobject.simple_signal("Hi from Rust!".into());
-/// # }
-/// ```
-#[macro_export]
-macro_rules! Q_OBJECT{
-    (
-        pub $obj:ident as $wrapper:ident{
-            signals:
-            $(fn $signalname:ident ( $( $signalvar:ident : $signalqtype:ident ),* );)*
-
-            slots:
-            $(fn $slotname:ident ( $( $slotvar:ident : $slotqtype:ident ),* );)*
-
-            properties:
-            $($propname:ident : $proptype:ident; read: $read_slot:ident, write: $write_slot:ident,
-                notify: $notify_sig:ident;)*
-            }) =>{
-                pub struct $wrapper{
-                    origin: Box<$obj>,
-                    ptr: QObject,
-                    properties: ::std::collections::HashMap<&'static str, (QVariant, QMetaType)>,
-                }
-
-                impl ::std::ops::Deref for $wrapper {
-                    type Target = $obj;
-
-                    fn deref(&self) -> &$obj {
-                        let ref b: Box<$obj> = self.origin;
-                        b.as_ref()
-                    }
-                }
-
-                impl ::std::ops::DerefMut for $wrapper {
-                    fn deref_mut<'a>(&'a mut self) -> &'a mut $obj {
-                        self.origin.as_mut()
-                    }
-                }
-
-                impl $wrapper{
-                    __gen_signals!($(fn $signalname ( $( $signalvar : $signalqtype ),* );)*
-                    $(fn $notify_sig ();)*);
-
-                    pub fn with_no_props(origin: $obj)-> Box<Self> {
-                        unsafe{
-                            let mut local = $wrapper{
-                                origin: Box::new(origin),
-                                ptr: ::std::mem::uninitialized(),
-                                properties: ::std::collections::HashMap::new(),
-                            };
-                            $(local.properties.insert(stringify!($propname), ($proptype::default().into(), $proptype::metatype()));)*
-                            let mut local = Box::new(local);
-                            let qobj = QObject::new(&mut *local);
-                            ::std::ptr::write(&mut local.ptr, qobj);
-                            local
-                        }
-                    }
-
-                    pub fn new(origin: $obj, $($propname: $proptype),*) -> Box<Self>{
-                        let mut local = Self::with_no_props(origin);
-                        $(local.properties.insert(stringify!($propname), ($propname.into(), $proptype::metatype()));)*
-                        local
-                    }
-
-                    $(pub fn $read_slot(&self) -> &QVariant {
-                        println!("Trying to read");
-                        &self.properties.get(stringify!($propname)).unwrap().0
-                    }
-
-                    pub fn $write_slot(&mut self, input: $proptype) {
-                        self.properties.insert(stringify!($propname), (input.into(), $proptype::metatype()));
-                    })*
-
-                    fn threaded<F: FnOnce(&mut $wrapper) + Send + 'static>(&mut self, f: F){
-                        let ptr = ::std::sync::atomic::AtomicPtr::new(self);
-                        ::std::thread::spawn(move || {
-                            f(unsafe { &mut *ptr.load(::std::sync::atomic::Ordering::Relaxed) });
-                        });
-                    }
-                }
-
-                impl QObjectMacro for $wrapper{
-                    fn qslot_call(&mut self, name: &str, args: Vec<QVariant>) -> Option<&QVariant>{
-                        fn next_or_panic(qt: Option<QVariant>) -> QVariant{
-                            if let Some(o) = qt {
-                                o
-                            }else {
-                                panic!("Not enough parameters to call a slot")
-                            }
-                        }
-                        match name {
-                            $(stringify!($slotname) => {
-                                let mut iter = args.into_iter();
-                                $(
-                                    let next = next_or_panic (iter.next());
-                                    let $slotvar: $slotqtype = next.into();
-                                )*
-                                self.$slotname ($($slotvar),*)
-                            },)*
-                            $(stringify!($read_slot) => {
-                                Some(self.$read_slot ())
-                            },
-                            stringify!($write_slot) => {
-                                let mut iter = args.into_iter();
-                                let next = next_or_panic (iter.next());
-                                let property: $proptype = next.into();
-                                self.$write_slot (property);
-                                None
-                            },)*
-                            _ => panic!("Unrecognized slot call: {}", name)
-                        }
-                    }
-
-                    fn qmeta(&self) -> (Vec<(&'static str, i32, Vec<i32>)>,
-                    Vec<(&'static str, i32, i32, Vec<i32>)>,
-                    Vec<(&'static str, i32, &'static str, &'static str, &'static str)>,
-                    &'static str){
-                        let mut signals = Vec::new();
-                        $(
-                            let mut argc = 0;
-                            let mut mttypes = Vec::new();
-                            $(
-                                argc += 1;
-                                mttypes.push($signalqtype::metatype() as i32);
-                            )*
-                            signals.push((stringify!($signalname), argc, mttypes));
-                        )*
-                        let mut slots = Vec::new();
-                        $(
-                            let mut argc = 0;
-                            let mut mttypes = Vec::new();
-                            $(
-                                argc += 1;
-                                mttypes.push($slotqtype::metatype() as i32);
-                            )*
-                            slots.push((stringify!($slotname), 43, argc, mttypes));
-                        )*
-                        $(
-                            slots.push((stringify!($read_slot), $proptype::metatype() as i32, 0, Vec::new()));
-                            slots.push((stringify!($write_slot), QMetaType::Void as i32, 1, vec![$proptype::metatype() as i32]));
-                        )*
-                        let mut props: Vec<(&'static str, i32, &'static str, &'static str, &'static str)> = Vec::new();
-                        $(
-                            props.push((stringify!($propname), $proptype::metatype() as i32, stringify!($read_slot),
-                            stringify!($write_slot), stringify!($notify_sig)));
-                        )*
-                        (signals, slots, props, stringify!($obj))
-                    }
-
-                    fn get_qobj(&self) -> &QObject{
-                        &self.ptr
-                    }
-
-                    fn get_qobj_mut(&mut self) -> &mut QObject{
-                        &mut self.ptr
-                    }
-                }
-            };
-        }
-
-/// Generates a wrapper for [`QListModel`](struct.QListModel.html) for static typing and easier management.
-///
-/// # Examples
-/// ```
-/// # #[macro_use] extern crate qml;
-/// # use qml::*;
-/// Q_LISTMODEL!{
-///     pub QTestModel {
-///         name: &str,
-///         number: i32,
-///     }
-/// }
-///
-/// ...
-///
-/// # fn main() {
-/// let mut qqae = QmlEngine::new();
-/// let mut qalm = QTestModel::new();
-/// qalm.insert_row("John", 42);
-/// qalm.insert_row("Oak", 505);
-/// // `&QTestModel` implements `Into<QVariant>`
-/// qqae.set_and_store_property("listModel", &qalm);
-///
-/// qqae.load_file("examples/listmodel.qml");
-/// qalm.set_data(vec![("OMG", 13317), ("HACKED", 228)]);
-/// qqae.exec();
-/// # }
-/// ```
-#[macro_export]
-macro_rules! Q_LISTMODEL{
-            (pub $wrapper:ident{
-                $($rolename:ident : $roletype:ty,)*
-            }) => {
-                pub struct $wrapper {
-                    qalm: Box<QListModel<'static>>,
-                }
-
-                impl $wrapper {
-                    pub fn new() -> Self{
-                        $wrapper{ qalm: QListModel::new(&[$(stringify!($rolename)),*])}
-                    }
-
-                    /// Inserts a row into this model
-                    pub fn insert_row(&mut self, $($rolename : $roletype),*) {
-                        let mut vec = Vec::new();
-                        $(
-                            vec.push($rolename.into());
-                        )*
-                        self.qalm.insert_row(vec.into_iter());
-                    }
-
-                    /// Gets an accoiated qvariant
-                    pub fn get_qvar(&self) -> QVariant{
-                        self.qalm.get_qvar()
-                    }
-
-                    /// Sets a specified data for this model
-                    pub fn set_data(&mut self, vec: Vec<($($roletype),*)>) {
-                        self.qalm.set_data(vec.into_iter()
-                        .map(|($($rolename),*)| {
-                            let mut vec = Vec::new();
-                            $(
-                                vec.push($rolename.into());
-                            )*
-                            vec
-                        }).collect::<Vec<Vec<QVariant>>>())
-                    }
-
-                    /// View contents of this model as a slice of rows of QVariants
-                    pub fn view_raw_data(&self) -> &[Vec<QVariant>]{
-                        self.qalm.view_data()
-                    }
-
-                    /// View contents of this model as a row
-                    pub fn view_data(&self) -> Vec<($($roletype),*)>{
-                        let view = self.qalm.view_data();
-                        view.into_iter().map(|v| {
-                            let mut v = v.iter();
-                            $(
-                                let $rolename = v.next().unwrap().into();
-                            )*
-                            ($($rolename),*)
-                        }).collect()
-                    }
-                }
-
-                impl<'a, 'b> From<&'a $wrapper> for QVariant {
-                    fn from(i: &$wrapper) -> QVariant {
-                        i.get_qvar()
-                    }
-                }
-            }
-        }
-
-/// Provides definitions for a type that can be used from QML.
-///
-/// The same macro is used to prepare a type for being used as a normal type or a singleton.
-/// The only requirement is that the type in question should provide `Default` implementation.
-/// # Examples
-/// ```
-///
-/// #[derive(Default)]
-/// pub struct Test;
-///
-/// Q_OBJECT!(
-/// pub Test as QTest{
-///     signals:
-///     slots:
-///     properties:
-///         name: String; read: get_name, write: set_name, notify: name_changed;
-/// });
-///
-/// Q_REGISTERABLE_QML!(QTest: Test as TestRsObject 1=>0, from TestModule);
-/// ```
-/// Later on a type that was made registerable can be used in [`Q_REGISTER_QML`](macro.Q_REGISTER_QML!.html)
-/// or in [`Q_REGISTER_SINGLETON_QML`](macro.Q_REGISTER_SINGLETON_QML!.html) macros to be used as a type in QML.
-#[macro_export]
-macro_rules! Q_REGISTERABLE_QML(
-            ($wrapper:ident : $origin:ident as $qml:ident $major:expr=>$minor:expr, from $uri:ident) => {
-                impl QMLRegisterable for $wrapper{
-                    fn qualify_to_register(&self) ->  (i32, i32, &'static str, &'static str) {
-                        ($major, $minor, stringify!($uri), stringify!($qml))
-                    }
-
-                    fn get_new(&self) -> *mut c_void {
-                        unsafe {
-                            let obj = $wrapper::with_no_props($origin::default());
-                            let res = Box::into_raw(obj) as *mut c_void;
-                            res
-                        }
-                    }
-
-                    fn get_qobj_from_ptr(&self, ptr: *mut c_void) -> *mut QObject {
-                        unsafe {
-                            let mut obj: Box<$wrapper> = Box::from_raw(ptr as *mut $wrapper);
-                            let res = obj.get_qobj_mut() as *mut QObject;
-                            ::std::mem::forget(obj);
-                            res
-                        }
-                    }
-                }
-
-                impl $wrapper {
-                    pub fn get_shallow() -> Self {
-                        unsafe {
-                            ::std::mem::uninitialized()
-                        }
-                    }
-                }
-            }
-        );
-
-/// Registers a type as a QML type.
-///
-/// To use this macro [`Q_REGISTERABLE_QML`](macro.Q_REGISTERABLE_QML!.html) should be used first.
-/// # Examples
-/// ```
-///
-/// #[derive(Default)]
-/// pub struct Test;
-///
-/// Q_OBJECT!(
-/// pub Test as QTest{
-///     signals:
-///     slots:
-///     properties:
-///         name: String; read: get_name, write: set_name, notify: name_changed;
-/// });
-///
-/// Q_REGISTERABLE_QML!(QTest: Test as TestRsObject 1=>0, from TestModule);
-///
-/// // ...
-///
-/// # fn main() {
-/// Q_REGISTER_QML!(QTest);
-/// # }
-/// ```
-/// Then in qml:
-///
-/// ```qml
-/// import TestModule 1.0
-///
-/// TestRsObject{
-///     name: "Oak"
-/// }
-/// ```
-#[macro_export]
-macro_rules! Q_REGISTER_QML(
-                ($wrapper:ident) => {
-                    register_qml_type($wrapper::get_shallow());
-                }
-        );
-
-/// Registers a type as a singleton type in QML.
-///
-/// To use this macro [`Q_REGISTERABLE_QML`](macro.Q_REGISTERABLE_QML!.html) should be used first.
-/// # Examples
-/// ```
-///
-/// #[derive(Default)]
-/// pub struct Test;
-///
-/// Q_OBJECT!(
-/// pub Test as QTest{
-///     signals:
-///     slots:
-///     properties:
-///         name: String; read: get_name, write: set_name, notify: name_changed;
-/// });
-///
-/// Q_REGISTERABLE_QML!(QTest: Test as TestRsSingleton 1=>0, from TestModule);
-///
-/// // ...
-///
-/// # fn main() {
-/// Q_REGISTER_SINGLETON_QML!(QTest);
-/// # }
-/// ```
-/// Then in qml:
-///
-/// ```qml
-/// import TestModule 1.0
-///
-/// Item {
-///     Component.onCompleted: {
-///         console.log(TestRsSingleton.name)
-///     }
-/// }
-/// ```
-#[macro_export]
-macro_rules! Q_REGISTER_SINGLETON_QML(
-                ($wrapper:ident) => {
-                    register_qml_singleton_type($wrapper::get_shallow());
-                }
-        );
diff --git a/prototype_2016/third_party/qml-rust/src/qabstactlistmodel.rs b/prototype_2016/third_party/qml-rust/src/qabstactlistmodel.rs
deleted file mode 100644
index e3c0dd3..0000000
--- a/prototype_2016/third_party/qml-rust/src/qabstactlistmodel.rs
+++ /dev/null
@@ -1,224 +0,0 @@
-use libc;
-use std::ptr::null_mut;
-
-use qvariant::*;
-use types::*;
-use qmodelindex::*;
-use qinthasharray::*;
-
-extern "C" {
-
-    fn dos_qabstractlistmodel_qmetaobject() -> DosQMetaObject;
-    fn dos_qabstractlistmodel_create(callbackObject: *const libc::c_void,
-                                     metaObject: DosQMetaObject,
-                                     dObjectCallback: DObjectCallback,
-                                     rowCountCallback: RowCountCallback,
-                                     columnCountCallback: ColumnCountCallback,
-                                     dataCallback: DataCallback,
-                                     setDataCallback: SetDataCallback,
-                                     roleNamesCallback: RoleNamesCallback,
-                                     flagsCallback: FlagsCallback,
-                                     headerDataCallback: HeaderDataCallback)
-                                     -> DosQAbstractListModel;
-}
-
-/// Called when a slot should be executed
-/// @param self The pointer to the `QObject` in the binded language
-/// @param slotName The slotName as `DosQVariant`. It should not be deleted
-/// @param argc The number of arguments
-/// @param argv An array of `DosQVariant` pointers. They should not be deleted
-extern "C" fn RustObjectCallback(Qself: *const libc::c_void,
-                                 slotname: DosQVariant,
-                                 argc: i32,
-                                 argv: *const DosQVariant) {
-    println!("SLOT WAS EXECUTED. hi");
-}
-pub type DObjectCallback = extern "C" fn(*const libc::c_void, DosQVariant, i32, *const DosQVariant);
-
-/// Called when the `QAbstractListModel::rowCount` method must be executed
-/// @param self The pointer to the `QAbstractListModel` in the binded language
-/// @param index The parent `DosQModelIndex`. It should not be deleted
-/// @param result The rowCount result. This must be deferenced and filled from the binded language.
-/// It should not be deleted
-pub type RowCountCallback = extern "C" fn(*const libc::c_void, DosQModelIndex, *mut i32);
-
-/// Called when the `QAbstractListModel::columnCount` method must be executed
-/// @param self The pointer to the `QAbstractListModel` in the binded language
-/// @param index The parent `DosQModelIndex`. It should not be deleted
-/// @param result The rowCount result. This must be deferenced and filled from the binded language.
-/// It should not be deleted
-extern "C" fn RustColumnCountCallback(Qself: *const libc::c_void,
-                                      parent: DosQModelIndex,
-                                      result: *mut i32) {
-}
-pub type ColumnCountCallback = extern "C" fn(*const libc::c_void, DosQModelIndex, *mut i32);
-
-/// Called when the `QAbstractListModel::data` method must be executed
-/// @param self The pointer to the `QAbstractListModel` in the binded language
-/// @param index The `DosQModelIndex` to which we request the data. It should not be deleted
-/// @param result The `DosQVariant` result. This must be deferenced and filled from the binded language.
-/// It should not be deleted. See `dos_qvariant_assign` or other `DosQVariant` setters
-pub type DataCallback = extern "C" fn(*const libc::c_void, DosQModelIndex, i32, MutDosQVariant);
-
-extern "C" fn RustSetDataCallback(Qself: *const libc::c_void,
-                                  index: DosQModelIndex,
-                                  value: DosQVariant,
-                                  role: i32,
-                                  result: *mut bool) {
-    println!("SET DATA HELLO");
-}
-pub type SetDataCallback = extern "C" fn(*const libc::c_void,
-                                         DosQModelIndex,
-                                         DosQVariant,
-                                         i32,
-                                         *mut bool);
-
-pub type RoleNamesCallback = extern "C" fn(*const libc::c_void, MutDosQHashIntQByteArray);
-
-extern "C" fn RustFlagsCallback(Qself: *const libc::c_void,
-                                index: DosQModelIndex,
-                                result: *mut i32) {
-    println!("IVE GOT FLAGS CALLBACK");
-}
-pub type FlagsCallback = extern "C" fn(*const libc::c_void, DosQModelIndex, *mut i32);
-
-extern "C" fn RustHeaderDataCallback(Qself: *const libc::c_void,
-                                     section: i32,
-                                     orientation: i32,
-                                     role: i32,
-                                     result: MutDosQVariant) {
-    println!("FINAL CALLBACK");
-}
-pub type HeaderDataCallback = extern "C" fn(*const libc::c_void, i32, i32, i32, MutDosQVariant);
-
-use std::sync::atomic::{AtomicPtr, Ordering};
-/// Allows providing a custom model to QML
-pub struct QListModel<'a> {
-    wrapped: AtomicPtr<WQAbstractListModel>,
-    model: Vec<Vec<QVariant>>,
-    rolenames: Vec<&'a str>,
-}
-
-extern "C" {
-    fn dos_qabstractlistmodel_beginInsertRows(vptr: DosQAbstractListModel,
-                                              parent: DosQModelIndex,
-                                              first: i32,
-                                              last: i32);
-    fn dos_qabstractlistmodel_endInsertRows(vptr: DosQAbstractListModel);
-
-    fn dos_qabstractlistmodel_beginResetModel(vptr: DosQAbstractListModel);
-    fn dos_qabstractlistmodel_endResetModel(vptr: DosQAbstractListModel);
-}
-
-impl<'a> QListModel<'a> {
-    /// Rolenames are roles of provided data, that are mapped to corresponding roles in QML.
-    pub fn new<'b>(rolenames: &'b [&'a str]) -> Box<Self> {
-        unsafe {
-            let mut rs = Vec::new();
-            rs.extend_from_slice(rolenames);
-            let result = QListModel {
-                wrapped: AtomicPtr::new(null_mut()),
-                model: Vec::new(),
-                rolenames: rs,
-            };
-            // Probably need an explanation on why do I need a box
-            let mut boxer = Box::new(result);
-
-            let dqmo = dos_qabstractlistmodel_qmetaobject();
-            let dqalm =
-                dos_qabstractlistmodel_create(&*boxer as *const QListModel as *const libc::c_void,
-                                              dqmo,
-                                              RustObjectCallback, // no need
-                                              RustRowCountCallback,
-                                              RustColumnCountCallback, // no need
-                                              RustDataCallback,
-                                              RustSetDataCallback, // no need
-                                              RustRoleNamesCallback,
-                                              RustFlagsCallback, // no need
-                                              RustHeaderDataCallback);// no need
-            boxer.wrapped = AtomicPtr::new(dqalm);
-
-            boxer
-        }
-    }
-
-    /// Returns an amount of rows in this model
-    pub fn row_count(&self) -> usize {
-        self.model.len()
-    }
-
-    /// Gets a `QVariant` associate
-    pub fn get_qvar(&self) -> QVariant {
-        self.wrapped.load(Ordering::Relaxed).into()
-    }
-
-    /// Inserts a row into model
-    ///
-    /// Note that it clones all incoming qvariants as modifying them is not allowed.
-    pub fn insert_row<T>(&mut self, qvars: T)
-        where T: Iterator<Item = QVariant>
-    {
-        unsafe {
-            let index = QModelIndex::new();
-            dos_qabstractlistmodel_beginInsertRows(self.wrapped.load(Ordering::Relaxed),
-                                                   get_model_ptr(&index),
-                                                   self.model.len() as i32,
-                                                   (self.model.len() + 1) as i32);
-            self.model.push(qvars.collect());
-            dos_qabstractlistmodel_endInsertRows(self.wrapped.load(Ordering::Relaxed));
-        }
-    }
-
-    /// Sets a data for this QAbstractListModel
-    pub fn set_data(&mut self, qvars: Vec<Vec<QVariant>>) {
-        unsafe {
-            dos_qabstractlistmodel_beginResetModel(self.wrapped.load(Ordering::Relaxed));
-            self.model = qvars;
-            dos_qabstractlistmodel_endResetModel(self.wrapped.load(Ordering::Relaxed));
-        }
-    }
-
-    /// Gets an immutable view of the data
-    pub fn view_data(&self) -> &[Vec<QVariant>] {
-        &self.model
-    }
-}
-
-impl<'a, 'b> From<&'a QListModel<'b>> for QVariant {
-    fn from(i: &QListModel) -> QVariant {
-        i.get_qvar()
-    }
-}
-
-extern "C" fn RustRowCountCallback(Qself: *const libc::c_void,
-                                   index: DosQModelIndex,
-                                   result: *mut i32) {
-    unsafe {
-        let qlist = &*(Qself as *const QListModel);
-        *result = qlist.row_count() as i32;
-    }
-}
-
-extern "C" fn RustDataCallback(Qself: *const libc::c_void,
-                               index: DosQModelIndex,
-                               role: i32,
-                               result: MutDosQVariant) {
-    let qindex: QModelIndex = index.into();
-    unsafe {
-        let qlist = &*(Qself as *const QListModel);
-        let data = &qlist.model[qindex.row() as usize][(role - START_ROLE) as usize];
-        let mut qvar: QVariant = result.into();
-        qvar.set(data);
-    }
-}
-
-const START_ROLE: i32 = 0x0100;
-extern "C" fn RustRoleNamesCallback(Qself: *const libc::c_void, result: MutDosQHashIntQByteArray) {
-    unsafe {
-        let qlist = &*(Qself as *const QListModel);
-        let hash: QHashIntQByteArray = result.into();
-        for (i, name) in qlist.rolenames.iter().enumerate() {
-            hash.insert(START_ROLE + i as i32, name);
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qinthasharray.rs b/prototype_2016/third_party/qml-rust/src/qinthasharray.rs
deleted file mode 100644
index 0c296ad..0000000
--- a/prototype_2016/third_party/qml-rust/src/qinthasharray.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use libc;
-
-use utils::*;
-use types::*;
-
-extern "C" {
-
-    fn dos_qhash_int_qbytearray_create() -> MutDosQHashIntQByteArray;
-    fn dos_qhash_int_qbytearray_delete(vptr: MutDosQHashIntQByteArray);
-    fn dos_qhash_int_qbytearray_insert(vptr: MutDosQHashIntQByteArray,
-                                       key: i32,
-                                       value: *const libc::c_char);
-    fn dos_qhash_int_qbytearray_value(vptr: MutDosQHashIntQByteArray,
-                                      key: i32)
-                                      -> *const libc::c_char;
-}
-
-pub struct QHashIntQByteArray(MutDosQHashIntQByteArray);
-
-impl QHashIntQByteArray {
-    pub fn new() -> Self {
-        unsafe { QHashIntQByteArray(dos_qhash_int_qbytearray_create()) }
-    }
-
-    pub fn insert(&self, key: i32, value: &str) {
-        unsafe { dos_qhash_int_qbytearray_insert(self.0, key, stoptr(value)) }
-    }
-}
-
-// impl Drop for QHashIntQByteArray {
-//     fn drop(&mut self) {
-//         unsafe { dos_qhash_int_qbytearray_delete(self.0) }
-//     }
-// }
-
-pub fn get_dqhiqba_ptr(o: QHashIntQByteArray) -> MutDosQHashIntQByteArray {
-    o.0
-}
-
-impl From<MutDosQHashIntQByteArray> for QHashIntQByteArray {
-    fn from(i: MutDosQHashIntQByteArray) -> Self {
-        QHashIntQByteArray(i)
-    }
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qmeta.rs b/prototype_2016/third_party/qml-rust/src/qmeta.rs
deleted file mode 100644
index 1804402..0000000
--- a/prototype_2016/third_party/qml-rust/src/qmeta.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use std::mem::forget;
-use libc;
-
-use qvariant::*;
-use utils::*;
-use types::*;
-use qobject::*;
-
-extern "C" {
-    fn dos_qmetaobject_create(superClassMetaObject: DosQMetaObject,
-                              className: *const libc::c_char,
-                              signalDefinitions: *const SignalDefinitions,
-                              slotDefinitions: *const SlotDefinitions,
-                              propertyDefinitions: *const PropertyDefinitions)
-                              -> DosQMetaObject;
-    fn dos_qobject_qmetaobject() -> DosQMetaObject;
-    fn dos_qobject_signal_emit(vptr: DosQObject,
-                               name: *const libc::c_char,
-                               parametersCount: i32,
-                               parameters: *const DosQVariant);
-}
-
-#[doc(hidden)]
-/// Used by [`Q_OBJECT`](macro.Q_OBJECT!.html) macro to send signals to Qt.
-pub fn emit_signal(obj: &QObjectMacro, signalname: &str, args: Vec<QVariant>) {
-    let vec: Vec<DosQVariant> = args.iter()
-        .map(|qvar| get_private_variant(qvar))
-        .collect();
-    forget(args);
-    unsafe {
-        println!("about to send signal");
-        dos_qobject_signal_emit(get_qobj_ptr(obj.get_qobj()),
-                                stoptr(signalname),
-                                vec.len() as i32,
-                                vec.as_ptr())
-    }
-}
-
-pub struct QMeta {
-    ptr: DosQMetaObject,
-}
-
-pub fn get_dos_qmeta(meta: &QMeta) -> DosQMetaObject {
-    meta.ptr
-}
-
-impl QMeta {
-    pub fn new_for_qobject(def: QMetaDefinition) -> QMeta {
-        unsafe {
-            let meta_obj = dos_qobject_qmetaobject();
-            let dos_meta = dos_qmetaobject_create(meta_obj,
-                                                  stoptr(def.name),
-                                                  &def.sig_defs as *const SignalDefinitions,
-                                                  &def.slot_defs as *const SlotDefinitions,
-                                                  &def.prop_defs as *const PropertyDefinitions);
-            QMeta { ptr: dos_meta }
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct QMetaDefinition {
-    sig_defs: SignalDefinitions,
-    slot_defs: SlotDefinitions,
-    prop_defs: PropertyDefinitions,
-    name: &'static str,
-}
-
-pub fn get_qmetadef_name(o: &QMetaDefinition) -> &'static str {
-    o.name
-}
-
-pub type QMetaDef = (Vec<(&'static str, i32, Vec<i32>)>,
-                     Vec<(&'static str, i32, i32, Vec<i32>)>,
-                     Vec<(&'static str, i32, &'static str, &'static str, &'static str)>,
-                     &'static str);
-impl QMetaDefinition {
-    pub fn new(input: QMetaDef) -> Self {
-        let (signals, slots, props, name) = input;
-        let signals: Vec<SignalDefinition> = signals.into_iter()
-            .map(|(s, argc, types)| {
-                let def = SignalDefinition {
-                    name: stoptr(s),
-                    parametersCount: argc,
-                    parametersMetaTypes: types.as_ptr(),
-                };
-                forget(types);
-                def
-            })
-            .collect();
-        let sig_defs = SignalDefinitions {
-            count: signals.len() as i32,
-            definitions: signals.as_ptr(),
-        };
-        forget(signals);
-
-        let slots: Vec<SlotDefinition> = slots.into_iter()
-            .map(|(s, ret_type, argc, types)| {
-                let def = SlotDefinition {
-                    name: stoptr(s),
-                    returnMetaType: ret_type,
-                    parametersCount: argc,
-                    parametersMetaTypes: types.as_ptr(),
-                };
-                forget(types);
-                def
-            })
-            .collect();
-        let slot_defs = SlotDefinitions {
-            count: slots.len() as i32,
-            definitions: slots.as_ptr(),
-        };
-        forget(slots);
-
-        let props: Vec<PropertyDefinition> = props.into_iter()
-            .map(|(name, propertyMetaType, readSlot, writeSlot, notifySignal)| {
-                PropertyDefinition {
-                    name: stoptr(name),
-                    propertyMetaType: propertyMetaType,
-                    readSlot: stoptr(readSlot),
-                    writeSlot: stoptr(writeSlot),
-                    notifySignal: stoptr(notifySignal),
-                }
-            })
-            .collect();
-        let prop_defs = PropertyDefinitions {
-            count: props.len() as i32,
-            definitions: props.as_ptr(),
-        };
-        forget(props);
-        QMetaDefinition {
-            sig_defs: sig_defs,
-            slot_defs: slot_defs,
-            prop_defs: prop_defs,
-            name: name,
-        }
-    }
-}
-
-#[doc(hidden)]
-// Provides `qml-rust` with the neccessary information and an ability to callback slots.
-pub trait QObjectMacro {
-    fn qslot_call(&mut self, name: &str, args: Vec<QVariant>) -> Option<&QVariant>;
-    fn qmeta(&self) -> QMetaDef;
-    fn get_qobj(&self) -> &QObject;
-    fn get_qobj_mut(&mut self) -> &mut QObject;
-}
-
-#[derive(Debug)]
-#[repr(C)]
-struct SignalDefinition {
-    name: *const libc::c_char,
-    parametersCount: i32,
-    parametersMetaTypes: *const i32,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-struct SignalDefinitions {
-    count: i32,
-    definitions: *const SignalDefinition,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-struct SlotDefinition {
-    name: *const libc::c_char,
-    returnMetaType: i32,
-    parametersCount: i32,
-    parametersMetaTypes: *const i32,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-struct SlotDefinitions {
-    count: i32,
-    definitions: *const SlotDefinition,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-struct PropertyDefinition {
-    name: *const libc::c_char,
-    propertyMetaType: i32,
-    readSlot: *const libc::c_char,
-    writeSlot: *const libc::c_char,
-    notifySignal: *const libc::c_char,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-struct PropertyDefinitions {
-    count: i32,
-    definitions: *const PropertyDefinition,
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qmlengine.rs b/prototype_2016/third_party/qml-rust/src/qmlengine.rs
deleted file mode 100644
index b3a02a6..0000000
--- a/prototype_2016/third_party/qml-rust/src/qmlengine.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use std::ops::Deref;
-
-use qvariant::*;
-use types::*;
-use qurl::*;
-use qmeta::*;
-
-extern "C" {
-    fn dos_qapplication_create();
-    fn dos_qapplication_exec();
-    fn dos_qapplication_quit();
-    fn dos_qapplication_delete();
-
-    fn dos_qqmlapplicationengine_create() -> DosQmlApplicationEngine;
-    fn dos_qqmlapplicationengine_load(vptr: DosQmlApplicationEngine, filename: DosCStr);
-    fn dos_qqmlapplicationengine_load_url(vptr: DosQmlApplicationEngine, url: DosQUrl);
-    fn dos_qqmlapplicationengine_load_data(vptr: DosQmlApplicationEngine, data: DosCStr);
-    fn dos_qqmlapplicationengine_add_import_path(vptr: DosQmlApplicationEngine, path: DosCStr);
-    fn dos_qqmlapplicationengine_context(vptr: DosQmlApplicationEngine) -> DosQQmlContext;
-    fn dos_qqmlapplicationengine_delete(vptr: DosQmlApplicationEngine);
-
-    fn dos_qqmlcontext_setcontextproperty(vptr: DosQQmlContext,
-                                          name: DosCStr,
-                                          value: DosQVariant);
-
-}
-
-/// Provides an entry point for building QML applications from Rust
-pub struct QmlEngine {
-    ptr: DosQmlApplicationEngine,
-    stored: Vec<QVariant>,
-}
-
-impl QmlEngine {
-    /// Creates a QML context of a non-headless application
-    pub fn new() -> Self {
-        unsafe {
-            dos_qapplication_create();
-            QmlEngine {
-                ptr: dos_qqmlapplicationengine_create(),
-                stored: Vec::new(),
-            }
-        }
-    }
-
-    pub fn registered_type<T: Deref<Target = QObjectMacro>>(&mut self, id: i32, registered: T) {}
-    /// Loads a file as a qml file
-    pub fn load_file(&self, path: &str) {
-        let path_raw = ::std::env::current_dir().unwrap().join(path);
-        let path = if cfg!(windows) {
-            format!("file:///{}", path_raw.display())
-        } else {
-            format!("file://{}", path_raw.display())
-        };
-        unsafe { dos_qqmlapplicationengine_load_url(self.ptr, construct_qurl(&path)) }
-    }
-
-    /// Loads a string as a qml file
-    pub fn load_data(&self, data: &str) {
-        unsafe { dos_qqmlapplicationengine_load_data(self.ptr, stoptr(data)) }
-    }
-
-    /// Adds a directory path where the engine searches for installed modules
-    pub fn add_import_path(&self, path: &str) {
-        unsafe { dos_qqmlapplicationengine_add_import_path(self.ptr, stoptr(path)) }
-    }
-
-    /// Launches the application
-    pub fn exec(&self) {
-        unsafe {
-            dos_qapplication_exec();
-        }
-    }
-    /// Closes the application
-    pub fn quit(&self) {
-        unsafe {
-            dos_qapplication_quit();
-        }
-    }
-
-    /// Sets a property for this QML context
-    ///
-    /// This variant stores qvariant, so it is removed, only when this QmlEngine is removed.
-    pub fn set_and_store_property<T: Into<QVariant>>(&mut self, name: &str, value: T) {
-        let val = value.into();
-        unsafe {
-            let context = dos_qqmlapplicationengine_context(self.ptr);
-            dos_qqmlcontext_setcontextproperty(context, stoptr(name), get_private_variant(&val));
-        }
-        self.stored.push(val);
-    }
-
-    /// Sets a property for this QML context
-    pub fn set_property(&self, name: &str, value: &QVariant) {
-        unsafe {
-            let context = dos_qqmlapplicationengine_context(self.ptr);
-            dos_qqmlcontext_setcontextproperty(context, stoptr(name), get_private_variant(value));
-        }
-    }
-}
-
-use utils::*;
-
-impl Default for QmlEngine {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Drop for QmlEngine {
-    fn drop(&mut self) {
-        unsafe {
-            dos_qapplication_quit();
-            dos_qqmlapplicationengine_delete(self.ptr);
-            dos_qapplication_delete();
-        }
-    }
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qmlregister.rs b/prototype_2016/third_party/qml-rust/src/qmlregister.rs
deleted file mode 100644
index 99c11a9..0000000
--- a/prototype_2016/third_party/qml-rust/src/qmlregister.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use libc;
-
-use std::mem::forget;
-use std::collections::HashMap;
-use std::cell::UnsafeCell;
-
-use types::*;
-use qobject::*;
-use qmeta::*;
-use utils::*;
-
-extern "C" {
-    fn dos_qdeclarative_qmlregistertype(qmlRegisterType: *const QmlRegisterType) -> i32;
-    fn dos_qdeclarative_qmlregistersingletontype(qmlRegisterType: *const QmlRegisterType) -> i32;
-}
-
-#[repr(C)]
-pub struct QmlRegisterType {
-    major: i32,
-    minor: i32,
-    uri: DosCStr,
-    qml: DosCStr,
-    static_meta_object: DosQMetaObject,
-    create_dobject: CreateDObject,
-    delete_dobject: DeleteDObject,
-}
-
-pub type CreateDObject = extern "C" fn(i32, DosQObject, *mut *const libc::c_void, *mut DosQObject);
-pub type DeleteDObject = extern "C" fn(i32, *const libc::c_void);
-
-extern "C" fn delete_dobject(id: i32, ptr: *const libc::c_void) {}
-
-pub type RegisterQualifier = (i32, i32, &'static str, &'static str);
-#[doc(hidden)]
-pub trait QMLRegisterable: QObjectMacro {
-    fn qualify_to_register(&self) -> RegisterQualifier;
-    fn get_new(&self) -> *mut libc::c_void;
-    fn get_qobj_from_ptr(&self, ptr: *mut libc::c_void) -> *mut QObject;
-}
-
-extern "C" fn create_dobject(id: i32,
-                             wrapper: DosQObject,
-                             binded_ptr: *mut *const libc::c_void,
-                             dosQObject: *mut DosQObject) {
-    let map = unsafe { &*(REGISTERED_TYPES.0.get()) };
-    // Getting shallow object from the map
-    let shallow = map.get(&id).unwrap();
-    // Getting pointer to a created object
-    let binded = shallow.get_new();
-
-    // Returning pointers to a wrapper and to an DosQObject, then swapping DosQObject with a fresh one
-    // Comments are copied 'as is' from the DOtherSide docs to ensure correctness
-    unsafe {
-        let mut qobj = &mut *shallow.get_qobj_from_ptr(binded);
-        // # Retrieve the DosQObject created dos_qobject_create() inside the nimQObject
-        *dosQObject = get_qobj_ptr(qobj);
-        // # Store the pointer to the nimQObject
-        *binded_ptr = get_binded_ptr(qobj);
-        // # Swap the vptr inside the nimQObject with the wrapper
-        set_qobj_ptr(qobj, wrapper);
-    }
-    forget(binded);
-}
-
-struct UnsafeWrapper(UnsafeCell<HashMap<i32, Box<QMLRegisterable>>>);
-unsafe impl Sync for UnsafeWrapper {}
-unsafe impl Send for UnsafeWrapper {}
-
-lazy_static!{
-    static ref REGISTERED_TYPES: UnsafeWrapper = UnsafeWrapper(UnsafeCell::new(HashMap::new()));
-}
-
-type Registerer = unsafe extern "C" fn(*const QmlRegisterType) -> i32;
-fn register_with<T: QMLRegisterable + 'static>(t: T, r: Registerer) {
-    let (major, minor, uri, qml) = t.qualify_to_register();
-    let qmeta = QMetaDefinition::new(t.qmeta());
-    let meta = QMeta::new_for_qobject(qmeta);
-    let mut map = unsafe { &mut *(REGISTERED_TYPES.0.get()) };
-
-    let qrt = QmlRegisterType {
-        major: major,
-        minor: minor,
-        uri: stoptr(uri),
-        qml: stoptr(qml),
-        static_meta_object: get_dos_qmeta(&meta),
-        create_dobject: create_dobject,
-        delete_dobject: delete_dobject,
-    };
-    forget(meta);
-    let id = unsafe { r(&qrt as *const QmlRegisterType) };
-    map.insert(id, Box::new(t));
-    forget(qrt);
-}
-
-pub fn register_qml_type<T: QMLRegisterable + 'static>(t: T) {
-    register_with(t, dos_qdeclarative_qmlregistertype)
-}
-
-pub fn register_qml_singleton_type<T: QMLRegisterable + 'static>(t: T) {
-    register_with(t, dos_qdeclarative_qmlregistersingletontype)
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qmodelindex.rs b/prototype_2016/third_party/qml-rust/src/qmodelindex.rs
deleted file mode 100644
index 6b6d3e1..0000000
--- a/prototype_2016/third_party/qml-rust/src/qmodelindex.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-
-use types::*;
-
-extern "C" {
-
-    fn dos_qmodelindex_create() -> DosQModelIndex;
-    // DOS_API DosQModelIndex *DOS_CALL dos_qmodelindex_create_qmodelindex(DosQModelIndex *index);
-    // DOS_API void DOS_CALL dos_qmodelindex_delete (DosQModelIndex *vptr);
-    fn dos_qmodelindex_row(vptr: DosQModelIndex) -> i32;
-    fn dos_qmodelindex_column(vptr: DosQModelIndex) -> i32;
-// DOS_API bool DOS_CALL dos_qmodelindex_isValid(const DosQModelIndex *vptr);
-// DOS_API DosQVariant *DOS_CALL dos_qmodelindex_data (const DosQModelIndex *vptr, int role);
-// DOS_API DosQModelIndex *DOS_CALL dos_qmodelindex_parent (const DosQModelIndex *vptr);
-// DOS_API DosQModelIndex *DOS_CALL dos_qmodelindex_child  (const DosQModelIndex *vptr, int row, int column);
-// DOS_API DosQModelIndex *DOS_CALL dos_qmodelindex_sibling(const DosQModelIndex *vptr, int row, int column);
-// DOS_API void DOS_CALL dos_qmodelindex_assign (DosQModelIndex *l, const DosQModelIndex *r);
-}
-
-pub struct QModelIndex(DosQModelIndex);
-
-pub fn get_model_ptr(o: &QModelIndex) -> DosQModelIndex {
-    o.0
-}
-
-impl QModelIndex {
-    pub fn new() -> Self {
-        unsafe { QModelIndex(dos_qmodelindex_create()) }
-    }
-
-    pub fn row(&self) -> i32 {
-        unsafe { dos_qmodelindex_row(self.0) }
-    }
-
-    pub fn column(&self) -> i32 {
-        unsafe { dos_qmodelindex_column(self.0) }
-    }
-}
-
-impl From<DosQModelIndex> for QModelIndex {
-    fn from(i: DosQModelIndex) -> Self {
-        QModelIndex(i)
-    }
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qobject.rs b/prototype_2016/third_party/qml-rust/src/qobject.rs
deleted file mode 100644
index f7caf4f..0000000
--- a/prototype_2016/third_party/qml-rust/src/qobject.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use libc;
-use std::mem::forget;
-use std::slice::from_raw_parts_mut;
-
-use qvariant::*;
-use types::*;
-use qmeta::*;
-
-#[doc(hidden)]
-/// Contains a pointer to raw Qt object.
-#[derive(Debug)]
-pub struct QObject {
-    ptr: DosQObject,
-    qmeta: DosQMetaObject,
-    binded_ptr: *mut libc::c_void,
-}
-
-extern "C" {
-
-    fn dos_qobject_create(dObjectPointer: *mut libc::c_void,
-                          metaObject: DosQMetaObject,
-                          dObjectCallback: DObjectCallback)
-                          -> DosQObject;
-    fn dos_qobject_signal_connect(senderVPtr: DosQObject,
-                                  signal: *const libc::c_char,
-                                  receiverVPtr: DosQObject,
-                                  method: *const libc::c_char,
-                                  qtype: i32)
-                                  -> bool;
-    fn dos_qobject_delete(deleted: DosQObject);
-    fn dos_qmetaobject_delete(vptr: DosQMetaObject);
-}
-
-impl Drop for QObject {
-    fn drop(&mut self) {
-        unsafe {
-            dos_qobject_delete(self.ptr);
-            dos_qmetaobject_delete(self.qmeta);
-        }
-    }
-}
-
-macro_rules! QT_connect {
-    ($sender:ident, $signal:ident, $receiver:ident, $method:tt) => {{
-        unimplemented!()
-    }}
-}
-
-/// This enum describes the types of connection that can be used between signals and slots.
-/// In particular, it determines whether a particular signal is delivered to a slot immediately or queued for delivery at a later time.
-pub enum QtConnectionType {
-    /// **(Default)** If the receiver lives in the thread that emits the signal, Qt::DirectConnection is used. Otherwise, Qt::QueuedConnection is used. The connection type is determined when the signal is emitted.
-    Auto = 0,
-    /// The slot is invoked immediately when the signal is emitted. The slot is executed in the signalling thread.
-    Direct = 1,
-    /// The slot is invoked when control returns to the event loop of the receiver's thread. The slot is executed in the receiver's thread.
-    Queued = 2,
-    /// Same as Qt::QueuedConnection, except that the signalling thread blocks until the slot returns. This connection must not be used if the receiver lives in the signalling thread, or else the application will deadlock.
-    BlockingQueued = 3,
-    /// This is a flag that can be combined with any one of the above connection types, using a bitwise OR. When Qt::UniqueConnection is set, QObject::connect() will fail if the connection already exists (i.e. if the same signal is already connected to the same slot for the same pair of objects). This flag was introduced in Qt 4.6.
-    Unique = 0x80,
-}
-
-/// Called when a slot should be executed
-/// @param self The pointer to the `QObject` in the binded language
-/// @param slotName The slotName as `DosQVariant`. It should not be deleted
-/// @param argc The number of arguments
-/// @param argv An array of `DosQVariant` pointers. They should not be deleted
-type DObjectCallback = extern "C" fn(*mut libc::c_void, DosQVariant, i32, *mut DosQVariant);
-
-impl QObject {
-    pub fn new(obj: &mut QObjectMacro) -> QObject {
-        unsafe {
-            let qmeta = QMetaDefinition::new(obj.qmeta());
-            let meta = QMeta::new_for_qobject(qmeta);
-
-            // println!("Adress of wrapper {:p}", obj);
-            let obj = Box::new(obj);
-            let binded_ptr = Box::into_raw(obj) as *mut libc::c_void;
-            QObject {
-                ptr: dos_qobject_create(binded_ptr, get_dos_qmeta(&meta), callback),
-                qmeta: get_dos_qmeta(&meta),
-                binded_ptr: binded_ptr,
-            }
-        }
-    }
-}
-
-pub fn get_qobj_ptr(o: &QObject) -> DosQObject {
-    o.ptr
-}
-
-pub fn get_binded_ptr(o: &QObject) -> *mut libc::c_void {
-    o.binded_ptr
-}
-
-pub fn set_qobj_ptr(o: &mut QObject, ptr: DosQObject) {
-    o.ptr = ptr;
-}
-
-extern "C" fn callback(obj: *mut libc::c_void,
-                       slotName: DosQVariant,
-                       argc: i32,
-                       argv: *mut DosQVariant) {
-    unsafe {
-        let mut obj: Box<&mut QObjectMacro> = Box::from_raw(obj as *mut &mut QObjectMacro);
-        // println!("Calling adress of wrapper  {:p}", *obj.as_mut());
-        let slice = from_raw_parts_mut(argv, argc as usize);
-        let vec: Vec<QVariant> = slice.iter().skip(1).map(|&dq| dq.into()).collect();
-        let slotName: String = new_qvariant(slotName).into();
-        // println!("Right before going in... name: {}, argc: {}",
-        //  slotName,
-        //  argc);
-        if let Some(qvar) = obj.qslot_call(&slotName, vec) {
-            let mut qv: QVariant = slice[0].into();
-            qv.set(qvar);
-        }
-        forget(obj);
-    }
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qresource.rs b/prototype_2016/third_party/qml-rust/src/qresource.rs
deleted file mode 100644
index efe3705..0000000
--- a/prototype_2016/third_party/qml-rust/src/qresource.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use types::*;
-use utils::*;
-
-extern "C" {
-    fn dos_qresource_register(filename: DosCStr);
-}
-
-/// Registers a binary resource file created by rcc
-pub fn register_resources(filename: &str) {
-    unsafe { dos_qresource_register(stoptr(filename)) }
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qtypes.rs b/prototype_2016/third_party/qml-rust/src/qtypes.rs
deleted file mode 100644
index eea7278..0000000
--- a/prototype_2016/third_party/qml-rust/src/qtypes.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-//! Contains definitions required to communicate with Qt with the use of `named types`.
-//!
-//! Provides definition of [`QMetaType`](enum.QMetaType.html) enum, that contains mapping of named types
-//! and a trait [`QMetaTypable`](trait.QMetaTypable.html), that controls which types are able to be used in signals, slots or properties.
-
-/// Provides an associated variant of enum for a type.
-///
-/// Only types that implement this, may be used as types in signals, slots or properties.
-pub trait QMetaTypable {
-    /// Returns an associate variant of QMetaType
-    fn metatype() -> QMetaType;
-}
-
-impl QMetaTypable for i32 {
-    fn metatype() -> QMetaType {
-        QMetaType::Int
-    }
-}
-
-impl QMetaTypable for String {
-    fn metatype() -> QMetaType {
-        QMetaType::QString
-    }
-}
-
-/// Analogue of [`Qt::QMetaType::Type`](http://doc.qt.io/qt-5/qmetatype.html#Type-enum)
-///
-/// `QMetaType` in Qt manages named types in the meta-object system.
-pub enum QMetaType {
-    Void = 43,
-    Bool = 1,
-    Int = 2,
-    Double = 6,
-    Long = 32,
-    QString = 10,
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qurl.rs b/prototype_2016/third_party/qml-rust/src/qurl.rs
deleted file mode 100644
index e9948b8..0000000
--- a/prototype_2016/third_party/qml-rust/src/qurl.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use libc;
-
-use utils::*;
-use types::*;
-
-extern "C" {
-
-    // QUrl
-    fn dos_qurl_create(url: *const libc::c_char, parsingMode: i32) -> DosQUrl;
-// DOS_API void  DOS_CALL dos_qurl_delete(DosQUrl *vptr);
-// DOS_API char *DOS_CALL dos_qurl_to_string(const DosQUrl *vptr);
-// DOS_API bool dos_qurl_isValid(const DosQUrl *vptr);
-}
-
-pub fn construct_qurl(url: &str) -> DosQUrl {
-    unsafe { dos_qurl_create(stoptr(url), 0) }
-}
diff --git a/prototype_2016/third_party/qml-rust/src/qvariant.rs b/prototype_2016/third_party/qml-rust/src/qvariant.rs
deleted file mode 100644
index 40fda96..0000000
--- a/prototype_2016/third_party/qml-rust/src/qvariant.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-use libc;
-use std::ffi::CStr;
-use std::sync::atomic::{AtomicPtr, Ordering};
-
-use utils::*;
-use types::*;
-use qobject::*;
-
-extern "C" {
-    fn dos_qvariant_create() -> DosQVariant;
-    fn dos_qvariant_create_int(value: i32) -> DosQVariant;
-    fn dos_qvariant_create_bool(value: bool) -> DosQVariant;
-    fn dos_qvariant_create_string(value: DosCStr) -> DosQVariant;
-    fn dos_qvariant_create_qobject(value: DosQObject) -> DosQVariant;
-    fn dos_qvariant_create_qvariant(value: DosQVariant) -> DosQVariant;
-    fn dos_qvariant_create_float(value: f32) -> DosQVariant;
-    fn dos_qvariant_create_double(value: f64) -> DosQVariant;
-    fn dos_qvariant_create_array(size: i32, array: *const DosQVariant) -> DosQVariant;
-
-    fn dos_qvariant_toInt(val: DosQVariant) -> i32;
-    fn dos_qvariant_toBool(val: DosQVariant) -> bool;
-    fn dos_qvariant_toString(val: DosQVariant) -> *mut libc::c_char;
-    fn dos_qvariant_toFloat(val: DosQVariant) -> f32;
-    fn dos_qvariant_toDouble(val: DosQVariant) -> f64;
-    // DOS_API DosQObject *DOS_CALL dos_qvariant_toQObject(const DosQVariant *vptr);
-
-    fn dos_qvariant_isnull(val: DosQVariant) -> bool;
-    fn dos_qvariant_assign(val: MutDosQVariant, other: DosQVariant);
-    fn dos_qvariant_delete(val: DosQVariant);
-    fn dos_chararray_delete(ptr: DosCStr);
-// DOS_API void   DOS_CALL dos_qvariant_setInt    (DosQVariant *vptr, int value);
-// DOS_API void   DOS_CALL dos_qvariant_setBool   (DosQVariant *vptr, bool value);
-// DOS_API void   DOS_CALL dos_qvariant_setFloat  (DosQVariant *vptr, float value);
-// DOS_API void   DOS_CALL dos_qvariant_setDouble (DosQVariant *vptr, double value);
-// DOS_API void   DOS_CALL dos_qvariant_setString (DosQVariant *vptr, const char *value);
-// DOS_API void   DOS_CALL dos_qvariant_setQObject(DosQVariant *vptr, DosQObject *value);
-
-}
-
-/// This holds a value to be providen for a QML context.
-///
-/// A value can be different: int, string, float, double, bool or even a custom object.
-#[derive(Debug)]
-pub struct QVariant {
-    ptr: AtomicPtr<WQVariant>,
-    owned: bool,
-}
-
-impl PartialEq for QVariant {
-    fn eq(&self, other: &QVariant) -> bool {
-        self.ptr.load(Ordering::Relaxed) == other.ptr.load(Ordering::Relaxed)
-    }
-}
-
-impl Clone for QVariant {
-    fn clone(&self) -> Self {
-        unsafe {
-            new_qvar(dos_qvariant_create_qvariant(self.ptr.load(Ordering::Relaxed)),
-                     true)
-        }
-    }
-}
-
-impl QVariant {
-    pub fn to_int(&self) -> i32 {
-        unsafe { dos_qvariant_toInt(self.ptr.load(Ordering::Relaxed)) }
-    }
-
-    pub fn into_bool(self) -> bool {
-        unsafe { dos_qvariant_toBool(self.ptr.load(Ordering::Relaxed)) }
-    }
-
-    pub fn into_float(self) -> f32 {
-        unsafe { dos_qvariant_toFloat(self.ptr.load(Ordering::Relaxed)) }
-    }
-
-    pub fn into_double(self) -> f64 {
-        unsafe { dos_qvariant_toDouble(self.ptr.load(Ordering::Relaxed)) }
-    }
-
-    /// Sets the value for this `QVariant`
-    pub fn set(&mut self, other: &QVariant) {
-        unsafe {
-            dos_qvariant_assign(self.ptr.load(Ordering::Relaxed),
-                                other.ptr.load(Ordering::Relaxed));
-        }
-    }
-}
-
-pub fn throw(qvar: &mut QVariant, flag: bool) {
-    qvar.owned = flag;
-}
-fn new_qvar(ptr: DosQVariant, owned: bool) -> QVariant {
-    QVariant {
-        ptr: AtomicPtr::new(ptr as MutDosQVariant),
-        owned: owned,
-    }
-}
-
-pub fn new_qvariant(ptr: DosQVariant) -> QVariant {
-    new_qvar(ptr, false)
-}
-
-pub fn get_private_variant(from: &QVariant) -> DosQVariant {
-    from.ptr.load(Ordering::Relaxed)
-}
-
-impl Drop for QVariant {
-    fn drop(&mut self) {
-        if self.owned {
-            unsafe { dos_qvariant_delete(self.ptr.load(Ordering::Relaxed)) }
-        }
-    }
-}
-
-#[doc(hidden)]
-impl From<DosQObject> for QVariant {
-    fn from(i: DosQObject) -> Self {
-        unsafe { new_qvar(dos_qvariant_create_qobject(i), true) }
-    }
-}
-
-#[doc(hidden)]
-impl From<DosQAbstractListModel> for QVariant {
-    fn from(i: DosQAbstractListModel) -> Self {
-        unsafe { new_qvar(dos_qvariant_create_qobject(i as DosQObject), true) }
-    }
-}
-
-#[doc(hidden)]
-impl From<DosQVariant> for QVariant {
-    fn from(vptr: DosQVariant) -> Self {
-        new_qvar(vptr, false)
-    }
-}
-
-#[doc(hidden)]
-impl From<MutDosQVariant> for QVariant {
-    fn from(vptr: MutDosQVariant) -> Self {
-        new_qvar(vptr, false)
-    }
-}
-
-#[doc(hidden)]
-impl From<QObject> for QVariant {
-    fn from(i: QObject) -> Self {
-        unsafe { new_qvar(dos_qvariant_create_qobject(get_qobj_ptr(&i)), true) }
-    }
-}
-
-impl<'a> From<&'a [QVariant]> for QVariant {
-    fn from(i: &'a [QVariant]) -> Self {
-        unsafe {
-            let vec = i.iter()
-                .map(|qvar| qvar.ptr.load(Ordering::Relaxed) as DosQVariant)
-                .collect::<Vec<DosQVariant>>();
-            let ptr = vec.as_ptr();
-            forget(vec);
-            new_qvar(dos_qvariant_create_array(i.len() as i32, ptr), true)
-        }
-    }
-}
-
-use std::mem::forget;
-
-impl From<Vec<QVariant>> for QVariant {
-    fn from(i: Vec<QVariant>) -> Self {
-        unsafe {
-            let len = i.len();
-            let vec = i.iter()
-                .map(|qvar| qvar.ptr.load(Ordering::Relaxed) as DosQVariant)
-                .collect::<Vec<DosQVariant>>();
-            let ptr = vec.as_ptr();
-            forget(vec);
-            new_qvar(dos_qvariant_create_array(len as i32, ptr), true)
-        }
-    }
-}
-
-#[doc(hidden)]
-impl<'a> From<&'a QObject> for QVariant {
-    fn from(i: &'a QObject) -> Self {
-        unsafe { new_qvar(dos_qvariant_create_qobject(get_qobj_ptr(i)), true) }
-    }
-}
-
-impl From<i32> for QVariant {
-    fn from(i: i32) -> Self {
-        unsafe { new_qvar(dos_qvariant_create_int(i), true) }
-    }
-}
-
-impl From<f32> for QVariant {
-    fn from(i: f32) -> Self {
-        unsafe { new_qvar(dos_qvariant_create_float(i), true) }
-    }
-}
-
-impl From<f64> for QVariant {
-    fn from(i: f64) -> Self {
-        unsafe { new_qvar(dos_qvariant_create_double(i), true) }
-    }
-}
-
-impl From<bool> for QVariant {
-    fn from(i: bool) -> Self {
-        unsafe { new_qvar(dos_qvariant_create_bool(i), true) }
-    }
-}
-
-impl<'a> From<&'a str> for QVariant {
-    fn from(i: &'a str) -> Self {
-        unsafe {
-            let ptr = stoptr(i);
-            let qvar = new_qvar(dos_qvariant_create_string(ptr), true);
-            // Dropping CString
-            ptrtos(ptr);
-            qvar
-        }
-    }
-}
-
-impl From<String> for QVariant {
-    fn from(i: String) -> Self {
-        QVariant::from(i.as_str())
-    }
-}
-
-// reverse Froms
-impl From<QVariant> for i32 {
-    fn from(i: QVariant) -> Self {
-        unsafe { dos_qvariant_toInt(i.ptr.load(Ordering::Relaxed)) }
-    }
-}
-
-impl<'a> From<&'a QVariant> for i32 {
-    fn from(i: &'a QVariant) -> Self {
-        i.to_int()
-    }
-}
-
-impl From<QVariant> for String {
-    fn from(i: QVariant) -> Self {
-        unsafe {
-            let ch_ar = dos_qvariant_toString(load_self(&i));
-            let res = CStr::from_ptr(ch_ar)
-                .to_string_lossy()
-                .into_owned();
-            dos_chararray_delete(ch_ar);
-            res
-        }
-    }
-}
-
-impl<'a> From<&'a QVariant> for String {
-    fn from(i: &'a QVariant) -> Self {
-        unsafe {
-            let ch_ar = dos_qvariant_toString(load_self(i));
-            let res = CStr::from_ptr(ch_ar)
-                .to_string_lossy()
-                .into_owned();
-            dos_chararray_delete(ch_ar);
-            res
-        }
-    }
-}
-
-fn load_self(s: &QVariant) -> DosQVariant {
-    s.ptr.load(Ordering::Relaxed)
-}
diff --git a/prototype_2016/third_party/qml-rust/src/types.rs b/prototype_2016/third_party/qml-rust/src/types.rs
deleted file mode 100644
index 11b24d4..0000000
--- a/prototype_2016/third_party/qml-rust/src/types.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use libc;
-
-pub type DosQVariant = *const WQVariant;
-pub type MutDosQVariant = *mut WQVariant;
-pub type DosQObject = *mut WQObject;
-pub type DosQmlApplicationEngine = *mut WQmlApplicationEngine;
-pub type DosQQmlContext = *const WQQmlContext;
-pub type DosQModelIndex = *const WQModelIndex;
-pub type MutDosQHashIntQByteArray = *mut WQHashIntQByteArray;
-pub type DosQMetaObject = *const WQMetaObject;
-pub type DosQAbstractListModel = *mut WQAbstractListModel;
-pub type DosQUrl = *mut WQUrl;
-
-pub type DosCStr = *const libc::c_char;
-
-pub enum WQVariant {}
-pub enum WQObject {}
-pub enum WQmlApplicationEngine {}
-pub enum WQQmlContext {}
-pub enum WQModelIndex {}
-pub enum WQHashIntQByteArray {}
-pub enum WQMetaObject {}
-pub enum WQAbstractListModel {}
-pub enum WQUrl {}
diff --git a/prototype_2016/third_party/qml-rust/src/utils.rs b/prototype_2016/third_party/qml-rust/src/utils.rs
deleted file mode 100644
index 8b9b063..0000000
--- a/prototype_2016/third_party/qml-rust/src/utils.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use libc;
-
-use std::ffi::CString;
-pub fn stoptr(s: &str) -> *const libc::c_char {
-    let cstr = CString::new(s).unwrap();
-    cstr.into_raw() as *const i8
-}
-
-pub fn ptrtos(ptr: *const i8) -> CString {
-    unsafe { CString::from_raw(ptr as *mut i8) }
-}