286 files changed, 109 insertions, 66 deletions

diff --git a/styles/lucee/Button.qml b/styles/LuceeStyle/Button.qml
index 18c8676b..18c8676b 100644
--- a/styles/lucee/Button.qml
+++ b/styles/LuceeStyle/Button.qml
diff --git a/styles/lucee/ComboBox.qml b/styles/LuceeStyle/ComboBox.qml
index 5bf320de..5bf320de 100644
--- a/styles/lucee/ComboBox.qml
+++ b/styles/LuceeStyle/ComboBox.qml
diff --git a/styles/neptune/Control.qml b/styles/LuceeStyle/Control.qml
index db705268..94a58481 100644
--- a/styles/neptune/Control.qml
+++ b/styles/LuceeStyle/Control.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick.Templates 2.3 as T
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/lucee/Dialog.qml b/styles/LuceeStyle/Dialog.qml
index cb279989..cb279989 100644
--- a/styles/lucee/Dialog.qml
+++ b/styles/LuceeStyle/Dialog.qml
diff --git a/styles/lucee/Frame.qml b/styles/LuceeStyle/Frame.qml
index a9ab74cb..a9ab74cb 100644
--- a/styles/lucee/Frame.qml
+++ b/styles/LuceeStyle/Frame.qml
diff --git a/styles/lucee/ItemDelegate.qml b/styles/LuceeStyle/ItemDelegate.qml
index f2a550db..f2a550db 100644
--- a/styles/lucee/ItemDelegate.qml
+++ b/styles/LuceeStyle/ItemDelegate.qml
diff --git a/styles/neptune/Label.qml b/styles/LuceeStyle/Label.qml
index cb9c731a..ca0675dc 100644
--- a/styles/neptune/Label.qml
+++ b/styles/LuceeStyle/Label.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/lucee/Page.qml b/styles/LuceeStyle/Page.qml
index d8ddb751..d8ddb751 100644
--- a/styles/lucee/Page.qml
+++ b/styles/LuceeStyle/Page.qml
diff --git a/styles/lucee/PageIndicator.qml b/styles/LuceeStyle/PageIndicator.qml
index 7859bf86..7859bf86 100644
--- a/styles/lucee/PageIndicator.qml
+++ b/styles/LuceeStyle/PageIndicator.qml
diff --git a/styles/lucee/Pane.qml b/styles/LuceeStyle/Pane.qml
index aa56a550..aa56a550 100644
--- a/styles/lucee/Pane.qml
+++ b/styles/LuceeStyle/Pane.qml
diff --git a/styles/lucee/ProgressBar.qml b/styles/LuceeStyle/ProgressBar.qml
index 3597f009..3597f009 100644
--- a/styles/lucee/ProgressBar.qml
+++ b/styles/LuceeStyle/ProgressBar.qml
diff --git a/styles/lucee/RadioButton.qml b/styles/LuceeStyle/RadioButton.qml
index b24f8f9c..b24f8f9c 100644
--- a/styles/lucee/RadioButton.qml
+++ b/styles/LuceeStyle/RadioButton.qml
diff --git a/styles/lucee/ScrollIndicator.qml b/styles/LuceeStyle/ScrollIndicator.qml
index 6e98d9bc..6e98d9bc 100644
--- a/styles/lucee/ScrollIndicator.qml
+++ b/styles/LuceeStyle/ScrollIndicator.qml
diff --git a/styles/lucee/Slider.qml b/styles/LuceeStyle/Slider.qml
index f833e740..f833e740 100644
--- a/styles/lucee/Slider.qml
+++ b/styles/LuceeStyle/Slider.qml
diff --git a/styles/lucee/Switch.qml b/styles/LuceeStyle/Switch.qml
index 6bdaff47..6bdaff47 100644
--- a/styles/lucee/Switch.qml
+++ b/styles/LuceeStyle/Switch.qml
diff --git a/styles/lucee/SwitchDelegate.qml b/styles/LuceeStyle/SwitchDelegate.qml
index d8321ca9..d8321ca9 100644
--- a/styles/lucee/SwitchDelegate.qml
+++ b/styles/LuceeStyle/SwitchDelegate.qml
diff --git a/styles/lucee/TabBar.qml b/styles/LuceeStyle/TabBar.qml
index 4ad06691..d49ad854 100644
--- a/styles/lucee/TabBar.qml
+++ b/styles/LuceeStyle/TabBar.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/lucee/TabButton.qml b/styles/LuceeStyle/TabButton.qml
index a4aa7589..a4aa7589 100644
--- a/styles/lucee/TabButton.qml
+++ b/styles/LuceeStyle/TabButton.qml
diff --git a/styles/lucee/ToolBar.qml b/styles/LuceeStyle/ToolBar.qml
index 8e8e9bc0..8e8e9bc0 100644
--- a/styles/lucee/ToolBar.qml
+++ b/styles/LuceeStyle/ToolBar.qml
diff --git a/styles/lucee/ToolButton.qml b/styles/LuceeStyle/ToolButton.qml
index 55efd6c6..55efd6c6 100644
--- a/styles/lucee/ToolButton.qml
+++ b/styles/LuceeStyle/ToolButton.qml
diff --git a/styles/lucee/images/album-art-mask.png b/styles/LuceeStyle/images/album-art-mask.png
index fc6cf82d..fc6cf82d 100644
--- a/styles/lucee/images/album-art-mask.png
+++ b/styles/LuceeStyle/images/album-art-mask.png
diff --git a/styles/lucee/images/album-art-placeholder.png b/styles/LuceeStyle/images/album-art-placeholder.png
index 2d08913d..2d08913d 100644
--- a/styles/lucee/images/album-art-placeholder.png
+++ b/styles/LuceeStyle/images/album-art-placeholder.png
diff --git a/styles/lucee/images/album-art-shadow-widget.png b/styles/LuceeStyle/images/album-art-shadow-widget.png
index c365a642..c365a642 100644
--- a/styles/lucee/images/album-art-shadow-widget.png
+++ b/styles/LuceeStyle/images/album-art-shadow-widget.png
diff --git a/styles/lucee/images/album-art-shadow.png b/styles/LuceeStyle/images/album-art-shadow.png
index e7ba6682..e7ba6682 100644
--- a/styles/lucee/images/album-art-shadow.png
+++ b/styles/LuceeStyle/images/album-art-shadow.png
diff --git a/styles/lucee/images/app-fullscreen-top-bg-dark.png b/styles/LuceeStyle/images/app-fullscreen-top-bg-dark.png
index 9fe3f124..9fe3f124 100644
--- a/styles/lucee/images/app-fullscreen-top-bg-dark.png
+++ b/styles/LuceeStyle/images/app-fullscreen-top-bg-dark.png
diff --git a/styles/lucee/images/app-fullscreen-top-bg.png b/styles/LuceeStyle/images/app-fullscreen-top-bg.png
index 9fe3f124..9fe3f124 100644
--- a/styles/lucee/images/app-fullscreen-top-bg.png
+++ b/styles/LuceeStyle/images/app-fullscreen-top-bg.png
diff --git a/styles/lucee/images/bg-home-dark.png b/styles/LuceeStyle/images/bg-home-dark.png
index 10ed8c10..10ed8c10 100644
--- a/styles/lucee/images/bg-home-dark.png
+++ b/styles/LuceeStyle/images/bg-home-dark.png
diff --git a/styles/lucee/images/bg-home.png b/styles/LuceeStyle/images/bg-home.png
index 31a47804..31a47804 100644
--- a/styles/lucee/images/bg-home.png
+++ b/styles/LuceeStyle/images/bg-home.png
diff --git a/styles/LuceeStyle/images/colorSelector/#51a7f4.png b/styles/LuceeStyle/images/colorSelector/#51a7f4.png
new file mode 100644
index 00000000..bd254df3
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#51a7f4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f95d42c7b69c1498b22f74acded592bdc655043f41857f9cbab4ce7fd0dcbf6
+size 23598
diff --git a/styles/LuceeStyle/images/colorSelector/#535258.png b/styles/LuceeStyle/images/colorSelector/#535258.png
new file mode 100644
index 00000000..de45c6ab
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#535258.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f253cb692517e06c5feac2dcf5217c6411fdc984d858a059b0915093325c330
+size 22841
diff --git a/styles/LuceeStyle/images/colorSelector/#78887b.png b/styles/LuceeStyle/images/colorSelector/#78887b.png
new file mode 100644
index 00000000..b7bc4bbe
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#78887b.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46da0efd2c5311d3af54b3352d6143ce596c5663289fb9b2ea176e5fe0bedfdd
+size 22275
diff --git a/styles/LuceeStyle/images/colorSelector/#7ba2a5.png b/styles/LuceeStyle/images/colorSelector/#7ba2a5.png
new file mode 100644
index 00000000..3004fb92
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#7ba2a5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46b3ce57f1894c44cab5344f8b230576c5025804acdb18bf3c002249fc49c4af
+size 24955
diff --git a/styles/LuceeStyle/images/colorSelector/#9eae83.png b/styles/LuceeStyle/images/colorSelector/#9eae83.png
new file mode 100644
index 00000000..add478cf
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#9eae83.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddb2570d34d386e2b574e0ec63204ad81118b1c695fb5eacfe00b5d943c65045
+size 26422
diff --git a/styles/LuceeStyle/images/colorSelector/#d35756.png b/styles/LuceeStyle/images/colorSelector/#d35756.png
new file mode 100644
index 00000000..91803177
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#d35756.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2603b3d079d038761a4b7c62f323996498350831cef28db58b33d7e8fc40480
+size 23173
diff --git a/styles/LuceeStyle/images/colorSelector/#db3b9f.png b/styles/LuceeStyle/images/colorSelector/#db3b9f.png
new file mode 100644
index 00000000..79c5b540
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#db3b9f.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82d60a33f8b16c55887a5983cfdd4615a161d237d3d24db4de1df2d5f78c54dc
+size 23879
diff --git a/styles/LuceeStyle/images/colorSelector/#fba054.png b/styles/LuceeStyle/images/colorSelector/#fba054.png
new file mode 100644
index 00000000..aff2e969
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#fba054.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84c345395a7de785552ef58e231ce0a0fc34c5c38eff4ba1edce3d0d13e672ec
+size 25211
diff --git a/styles/LuceeStyle/images/colorSelector/color-wheel.png b/styles/LuceeStyle/images/colorSelector/color-wheel.png
new file mode 100644
index 00000000..79466fae
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/color-wheel.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4a31577e3ea41b34cf619e60e199cd529da2dcb2611211487fb2986004f3377
+size 38001
diff --git a/styles/lucee/images/divider-dark.png b/styles/LuceeStyle/images/divider-dark.png
index b4ff3ba0..b4ff3ba0 100644
--- a/styles/lucee/images/divider-dark.png
+++ b/styles/LuceeStyle/images/divider-dark.png
diff --git a/styles/lucee/images/divider.png b/styles/LuceeStyle/images/divider.png
index c944b8a4..c944b8a4 100644
--- a/styles/lucee/images/divider.png
+++ b/styles/LuceeStyle/images/divider.png
diff --git a/styles/lucee/images/fan-speed-5.png b/styles/LuceeStyle/images/fan-speed-5.png
index d199e72c..d199e72c 100644
--- a/styles/lucee/images/fan-speed-5.png
+++ b/styles/LuceeStyle/images/fan-speed-5.png
diff --git a/styles/lucee/images/floating-panel-top-bg.png b/styles/LuceeStyle/images/floating-panel-top-bg.png
index de009b70..de009b70 100644
--- a/styles/lucee/images/floating-panel-top-bg.png
+++ b/styles/LuceeStyle/images/floating-panel-top-bg.png
diff --git a/styles/lucee/images/home-widget-bg.png b/styles/LuceeStyle/images/home-widget-bg.png
index d5361540..d5361540 100644
--- a/styles/lucee/images/home-widget-bg.png
+++ b/styles/LuceeStyle/images/home-widget-bg.png
diff --git a/styles/lucee/images/ic-app-active-bg.png b/styles/LuceeStyle/images/ic-app-active-bg.png
index 5a794c81..5a794c81 100644
--- a/styles/lucee/images/ic-app-active-bg.png
+++ b/styles/LuceeStyle/images/ic-app-active-bg.png
diff --git a/styles/lucee/images/ic-calculator-dark.png b/styles/LuceeStyle/images/ic-calculator-dark.png
index c38d1400..c38d1400 100644
--- a/styles/lucee/images/ic-calculator-dark.png
+++ b/styles/LuceeStyle/images/ic-calculator-dark.png
diff --git a/styles/lucee/images/ic-call.png b/styles/LuceeStyle/images/ic-call.png
index 0454eaed..0454eaed 100644
--- a/styles/lucee/images/ic-call.png
+++ b/styles/LuceeStyle/images/ic-call.png
diff --git a/styles/lucee/images/ic-expand-dark.png b/styles/LuceeStyle/images/ic-expand-dark.png
index 19548ae6..19548ae6 100644
--- a/styles/lucee/images/ic-expand-dark.png
+++ b/styles/LuceeStyle/images/ic-expand-dark.png
diff --git a/styles/lucee/images/ic-expand-to-fullscreen-dark.png b/styles/LuceeStyle/images/ic-expand-to-fullscreen-dark.png
index 81bcc768..81bcc768 100644
--- a/styles/lucee/images/ic-expand-to-fullscreen-dark.png
+++ b/styles/LuceeStyle/images/ic-expand-to-fullscreen-dark.png
diff --git a/styles/lucee/images/ic-expand-to-fullscreen.png b/styles/LuceeStyle/images/ic-expand-to-fullscreen.png
index 30b610b2..30b610b2 100644
--- a/styles/lucee/images/ic-expand-to-fullscreen.png
+++ b/styles/LuceeStyle/images/ic-expand-to-fullscreen.png
diff --git a/styles/lucee/images/ic-expand-up-dark.png b/styles/LuceeStyle/images/ic-expand-up-dark.png
index 0346da66..0346da66 100644
--- a/styles/lucee/images/ic-expand-up-dark.png
+++ b/styles/LuceeStyle/images/ic-expand-up-dark.png
diff --git a/styles/lucee/images/ic-expand-up.png b/styles/LuceeStyle/images/ic-expand-up.png
index 82562f01..82562f01 100644
--- a/styles/lucee/images/ic-expand-up.png
+++ b/styles/LuceeStyle/images/ic-expand-up.png
diff --git a/styles/lucee/images/ic-expand.png b/styles/LuceeStyle/images/ic-expand.png
index 3f05e117..3f05e117 100644
--- a/styles/lucee/images/ic-expand.png
+++ b/styles/LuceeStyle/images/ic-expand.png
diff --git a/styles/lucee/images/ic-favorite-dark.png b/styles/LuceeStyle/images/ic-favorite-dark.png
index 93ab4bb6..93ab4bb6 100644
--- a/styles/lucee/images/ic-favorite-dark.png
+++ b/styles/LuceeStyle/images/ic-favorite-dark.png
diff --git a/styles/lucee/images/ic-favorite.png b/styles/LuceeStyle/images/ic-favorite.png
index 075df9cd..075df9cd 100644
--- a/styles/lucee/images/ic-favorite.png
+++ b/styles/LuceeStyle/images/ic-favorite.png
diff --git a/styles/lucee/images/ic-music-dark.png b/styles/LuceeStyle/images/ic-music-dark.png
index 8e1302c1..8e1302c1 100644
--- a/styles/lucee/images/ic-music-dark.png
+++ b/styles/LuceeStyle/images/ic-music-dark.png
diff --git a/styles/lucee/images/ic-navigation-dark.png b/styles/LuceeStyle/images/ic-navigation-dark.png
index 6e48a601..6e48a601 100644
--- a/styles/lucee/images/ic-navigation-dark.png
+++ b/styles/LuceeStyle/images/ic-navigation-dark.png
diff --git a/styles/lucee/images/ic-next-level-dark.png b/styles/LuceeStyle/images/ic-next-level-dark.png
index 700fb96c..700fb96c 100644
--- a/styles/lucee/images/ic-next-level-dark.png
+++ b/styles/LuceeStyle/images/ic-next-level-dark.png
diff --git a/styles/lucee/images/ic-next-level.png b/styles/LuceeStyle/images/ic-next-level.png
index 5fc33846..5fc33846 100644
--- a/styles/lucee/images/ic-next-level.png
+++ b/styles/LuceeStyle/images/ic-next-level.png
diff --git a/styles/lucee/images/ic-rain-amount.png b/styles/LuceeStyle/images/ic-rain-amount.png
index 823d430b..823d430b 100644
--- a/styles/lucee/images/ic-rain-amount.png
+++ b/styles/LuceeStyle/images/ic-rain-amount.png
diff --git a/styles/lucee/images/ic-search_OFF-dark.png b/styles/LuceeStyle/images/ic-search_OFF-dark.png
index 7d96e114..7d96e114 100644
--- a/styles/lucee/images/ic-search_OFF-dark.png
+++ b/styles/LuceeStyle/images/ic-search_OFF-dark.png
diff --git a/styles/lucee/images/ic-search_OFF.png b/styles/LuceeStyle/images/ic-search_OFF.png
index 0e2ca5df..0e2ca5df 100644
--- a/styles/lucee/images/ic-search_OFF.png
+++ b/styles/LuceeStyle/images/ic-search_OFF.png
diff --git a/styles/lucee/images/ic-search_ON-dark.png b/styles/LuceeStyle/images/ic-search_ON-dark.png
index 8e2814bc..8e2814bc 100644
--- a/styles/lucee/images/ic-search_ON-dark.png
+++ b/styles/LuceeStyle/images/ic-search_ON-dark.png
diff --git a/styles/lucee/images/ic-search_ON.png b/styles/LuceeStyle/images/ic-search_ON.png
index 8e2814bc..8e2814bc 100644
--- a/styles/lucee/images/ic-search_ON.png
+++ b/styles/LuceeStyle/images/ic-search_ON.png
diff --git a/styles/lucee/images/ic-statusbar-battery-dark.png b/styles/LuceeStyle/images/ic-statusbar-battery-dark.png
index 851d64a2..851d64a2 100644
--- a/styles/lucee/images/ic-statusbar-battery-dark.png
+++ b/styles/LuceeStyle/images/ic-statusbar-battery-dark.png
diff --git a/styles/lucee/images/ic-statusbar-battery.png b/styles/LuceeStyle/images/ic-statusbar-battery.png
index 59031feb..59031feb 100644
--- a/styles/lucee/images/ic-statusbar-battery.png
+++ b/styles/LuceeStyle/images/ic-statusbar-battery.png
diff --git a/styles/lucee/images/ic-statusbar-bluetooth-dark.png b/styles/LuceeStyle/images/ic-statusbar-bluetooth-dark.png
index 71a11f3e..71a11f3e 100644
--- a/styles/lucee/images/ic-statusbar-bluetooth-dark.png
+++ b/styles/LuceeStyle/images/ic-statusbar-bluetooth-dark.png
diff --git a/styles/lucee/images/ic-statusbar-bluetooth.png b/styles/LuceeStyle/images/ic-statusbar-bluetooth.png
index 20ec6a11..20ec6a11 100644
--- a/styles/lucee/images/ic-statusbar-bluetooth.png
+++ b/styles/LuceeStyle/images/ic-statusbar-bluetooth.png
diff --git a/styles/lucee/images/ic-statusbar-reception-dark.png b/styles/LuceeStyle/images/ic-statusbar-reception-dark.png
index 640223be..640223be 100644
--- a/styles/lucee/images/ic-statusbar-reception-dark.png
+++ b/styles/LuceeStyle/images/ic-statusbar-reception-dark.png
diff --git a/styles/lucee/images/ic-statusbar-reception.png b/styles/LuceeStyle/images/ic-statusbar-reception.png
index e8b0f2b8..e8b0f2b8 100644
--- a/styles/lucee/images/ic-statusbar-reception.png
+++ b/styles/LuceeStyle/images/ic-statusbar-reception.png
diff --git a/styles/lucee/images/ic-statusbar-reception_OFF.png b/styles/LuceeStyle/images/ic-statusbar-reception_OFF.png
index 5190ad83..5190ad83 100644
--- a/styles/lucee/images/ic-statusbar-reception_OFF.png
+++ b/styles/LuceeStyle/images/ic-statusbar-reception_OFF.png
diff --git a/styles/lucee/images/ic-statusbar-reception_ON.png b/styles/LuceeStyle/images/ic-statusbar-reception_ON.png
index e969c768..e969c768 100644
--- a/styles/lucee/images/ic-statusbar-reception_ON.png
+++ b/styles/LuceeStyle/images/ic-statusbar-reception_ON.png
diff --git a/styles/lucee/images/ic-statusbar-wifi-dark.png b/styles/LuceeStyle/images/ic-statusbar-wifi-dark.png
index 11b6c15b..11b6c15b 100644
--- a/styles/lucee/images/ic-statusbar-wifi-dark.png
+++ b/styles/LuceeStyle/images/ic-statusbar-wifi-dark.png
diff --git a/styles/lucee/images/ic-statusbar-wifi.png b/styles/LuceeStyle/images/ic-statusbar-wifi.png
index e12dbc98..e12dbc98 100644
--- a/styles/lucee/images/ic-statusbar-wifi.png
+++ b/styles/LuceeStyle/images/ic-statusbar-wifi.png
diff --git a/styles/lucee/images/ic-weather-partly-rain-dark.png b/styles/LuceeStyle/images/ic-weather-partly-rain-dark.png
index e8ca6be6..e8ca6be6 100644
--- a/styles/lucee/images/ic-weather-partly-rain-dark.png
+++ b/styles/LuceeStyle/images/ic-weather-partly-rain-dark.png
diff --git a/styles/lucee/images/ic-weather-partly-rain.png b/styles/LuceeStyle/images/ic-weather-partly-rain.png
index 69bb6701..69bb6701 100644
--- a/styles/lucee/images/ic-weather-partly-rain.png
+++ b/styles/LuceeStyle/images/ic-weather-partly-rain.png
diff --git a/styles/lucee/images/ic-weather-rain-dark.png b/styles/LuceeStyle/images/ic-weather-rain-dark.png
index 82a1dacd..82a1dacd 100644
--- a/styles/lucee/images/ic-weather-rain-dark.png
+++ b/styles/LuceeStyle/images/ic-weather-rain-dark.png
diff --git a/styles/lucee/images/ic-weather-rain.png b/styles/LuceeStyle/images/ic-weather-rain.png
index c96d9602..c96d9602 100644
--- a/styles/lucee/images/ic-weather-rain.png
+++ b/styles/LuceeStyle/images/ic-weather-rain.png
diff --git a/styles/lucee/images/ic-weather-snow-dark.png b/styles/LuceeStyle/images/ic-weather-snow-dark.png
index 51512d26..51512d26 100644
--- a/styles/lucee/images/ic-weather-snow-dark.png
+++ b/styles/LuceeStyle/images/ic-weather-snow-dark.png
diff --git a/styles/lucee/images/ic-weather-snow.png b/styles/LuceeStyle/images/ic-weather-snow.png
index a2ef5405..a2ef5405 100644
--- a/styles/lucee/images/ic-weather-snow.png
+++ b/styles/LuceeStyle/images/ic-weather-snow.png
diff --git a/styles/lucee/images/ic-weather-sun-dark.png b/styles/LuceeStyle/images/ic-weather-sun-dark.png
index 30acedf1..30acedf1 100644
--- a/styles/lucee/images/ic-weather-sun-dark.png
+++ b/styles/LuceeStyle/images/ic-weather-sun-dark.png
diff --git a/styles/lucee/images/ic-weather-sun.png b/styles/LuceeStyle/images/ic-weather-sun.png
index 593035ff..593035ff 100644
--- a/styles/lucee/images/ic-weather-sun.png
+++ b/styles/LuceeStyle/images/ic-weather-sun.png
diff --git a/styles/lucee/images/ic-widget-close.png b/styles/LuceeStyle/images/ic-widget-close.png
index e5e65832..e5e65832 100644
--- a/styles/lucee/images/ic-widget-close.png
+++ b/styles/LuceeStyle/images/ic-widget-close.png
diff --git a/styles/lucee/images/ic-widget-move.png b/styles/LuceeStyle/images/ic-widget-move.png
index 36a267d9..36a267d9 100644
--- a/styles/lucee/images/ic-widget-move.png
+++ b/styles/LuceeStyle/images/ic-widget-move.png
diff --git a/styles/lucee/images/ic-widget-music.png b/styles/LuceeStyle/images/ic-widget-music.png
index b2a4958a..b2a4958a 100644
--- a/styles/lucee/images/ic-widget-music.png
+++ b/styles/LuceeStyle/images/ic-widget-music.png
diff --git a/styles/lucee/images/ic-widget-navigation.png b/styles/LuceeStyle/images/ic-widget-navigation.png
index dca356a3..dca356a3 100644
--- a/styles/lucee/images/ic-widget-navigation.png
+++ b/styles/LuceeStyle/images/ic-widget-navigation.png
diff --git a/styles/lucee/images/ic-widget-tuner.png b/styles/LuceeStyle/images/ic-widget-tuner.png
index 13dace7b..13dace7b 100644
--- a/styles/lucee/images/ic-widget-tuner.png
+++ b/styles/LuceeStyle/images/ic-widget-tuner.png
diff --git a/styles/lucee/images/ic-widget-weather.png b/styles/LuceeStyle/images/ic-widget-weather.png
index ffe5c0ec..ffe5c0ec 100644
--- a/styles/lucee/images/ic-widget-weather.png
+++ b/styles/LuceeStyle/images/ic-widget-weather.png
diff --git a/styles/lucee/images/ic_button-bg-red.png b/styles/LuceeStyle/images/ic_button-bg-red.png
index 0d30973d..0d30973d 100644
--- a/styles/lucee/images/ic_button-bg-red.png
+++ b/styles/LuceeStyle/images/ic_button-bg-red.png
diff --git a/styles/lucee/images/ic_button-bg.png b/styles/LuceeStyle/images/ic_button-bg.png
index 941fd420..941fd420 100644
--- a/styles/lucee/images/ic_button-bg.png
+++ b/styles/LuceeStyle/images/ic_button-bg.png
diff --git a/styles/lucee/images/input-overlay.png b/styles/LuceeStyle/images/input-overlay.png
index bbc1d17c..bbc1d17c 100644
--- a/styles/lucee/images/input-overlay.png
+++ b/styles/LuceeStyle/images/input-overlay.png
diff --git a/styles/lucee/images/instrument-cluster-bg-dark.png b/styles/LuceeStyle/images/instrument-cluster-bg-dark.png
index 455e3f19..455e3f19 100644
--- a/styles/lucee/images/instrument-cluster-bg-dark.png
+++ b/styles/LuceeStyle/images/instrument-cluster-bg-dark.png
diff --git a/styles/lucee/images/instrument-cluster-bg.png b/styles/LuceeStyle/images/instrument-cluster-bg.png
index 8cd4c905..8cd4c905 100644
--- a/styles/lucee/images/instrument-cluster-bg.png
+++ b/styles/LuceeStyle/images/instrument-cluster-bg.png
diff --git a/styles/lucee/images/list-divider-dark.png b/styles/LuceeStyle/images/list-divider-dark.png
index 78ae5372..78ae5372 100644
--- a/styles/lucee/images/list-divider-dark.png
+++ b/styles/LuceeStyle/images/list-divider-dark.png
diff --git a/styles/lucee/images/list-divider.png b/styles/LuceeStyle/images/list-divider.png
index 1db5ec08..1db5ec08 100644
--- a/styles/lucee/images/list-divider.png
+++ b/styles/LuceeStyle/images/list-divider.png
diff --git a/styles/lucee/images/logo-kdab.png b/styles/LuceeStyle/images/logo-kdab.png
index 99e67295..99e67295 100644
--- a/styles/lucee/images/logo-kdab.png
+++ b/styles/LuceeStyle/images/logo-kdab.png
diff --git a/styles/lucee/images/logo-luxoft.png b/styles/LuceeStyle/images/logo-luxoft.png
index 285be51f..285be51f 100644
--- a/styles/lucee/images/logo-luxoft.png
+++ b/styles/LuceeStyle/images/logo-luxoft.png
diff --git a/styles/lucee/images/logo-theqtcompany.png b/styles/LuceeStyle/images/logo-theqtcompany.png
index d36228b3..d36228b3 100644
--- a/styles/lucee/images/logo-theqtcompany.png
+++ b/styles/LuceeStyle/images/logo-theqtcompany.png
diff --git a/styles/lucee/images/luxoft-footer.png b/styles/LuceeStyle/images/luxoft-footer.png
index 285be51f..285be51f 100644
--- a/styles/lucee/images/luxoft-footer.png
+++ b/styles/LuceeStyle/images/luxoft-footer.png
diff --git a/styles/lucee/images/panel-inner-shadow-dark.png b/styles/LuceeStyle/images/panel-inner-shadow-dark.png
index 5533d7eb..5533d7eb 100644
--- a/styles/lucee/images/panel-inner-shadow-dark.png
+++ b/styles/LuceeStyle/images/panel-inner-shadow-dark.png
diff --git a/styles/lucee/images/panel-inner-shadow.png b/styles/LuceeStyle/images/panel-inner-shadow.png
index a52e197b..a52e197b 100644
--- a/styles/lucee/images/panel-inner-shadow.png
+++ b/styles/LuceeStyle/images/panel-inner-shadow.png
diff --git a/styles/lucee/images/popup-background-9patch.png b/styles/LuceeStyle/images/popup-background-9patch.png
index 69906137..69906137 100644
--- a/styles/lucee/images/popup-background-9patch.png
+++ b/styles/LuceeStyle/images/popup-background-9patch.png
diff --git a/styles/lucee/images/popup-title-shadow.png b/styles/LuceeStyle/images/popup-title-shadow.png
index b75e399a..b75e399a 100644
--- a/styles/lucee/images/popup-title-shadow.png
+++ b/styles/LuceeStyle/images/popup-title-shadow.png
diff --git a/styles/lucee/images/tabbar-bg-left-dark.png b/styles/LuceeStyle/images/tabbar-bg-left-dark.png
index baa75f07..baa75f07 100644
--- a/styles/lucee/images/tabbar-bg-left-dark.png
+++ b/styles/LuceeStyle/images/tabbar-bg-left-dark.png
diff --git a/styles/lucee/images/tabbar-bg-left.png b/styles/LuceeStyle/images/tabbar-bg-left.png
index ddc91d26..ddc91d26 100644
--- a/styles/lucee/images/tabbar-bg-left.png
+++ b/styles/LuceeStyle/images/tabbar-bg-left.png
diff --git a/styles/lucee/images/tabbar-bg-middle-dark.png b/styles/LuceeStyle/images/tabbar-bg-middle-dark.png
index aad5677f..aad5677f 100644
--- a/styles/lucee/images/tabbar-bg-middle-dark.png
+++ b/styles/LuceeStyle/images/tabbar-bg-middle-dark.png
diff --git a/styles/lucee/images/tabbar-bg-middle.png b/styles/LuceeStyle/images/tabbar-bg-middle.png
index 84b2a6fb..84b2a6fb 100644
--- a/styles/lucee/images/tabbar-bg-middle.png
+++ b/styles/LuceeStyle/images/tabbar-bg-middle.png
diff --git a/styles/lucee/images/tabbar-bg-right-dark.png b/styles/LuceeStyle/images/tabbar-bg-right-dark.png
index 7e54bea8..7e54bea8 100644
--- a/styles/lucee/images/tabbar-bg-right-dark.png
+++ b/styles/LuceeStyle/images/tabbar-bg-right-dark.png
diff --git a/styles/lucee/images/tabbar-bg-right.png b/styles/LuceeStyle/images/tabbar-bg-right.png
index d9332858..d9332858 100644
--- a/styles/lucee/images/tabbar-bg-right.png
+++ b/styles/LuceeStyle/images/tabbar-bg-right.png
diff --git a/styles/lucee/images/temperature-slider-bg.png b/styles/LuceeStyle/images/temperature-slider-bg.png
index 77fc3ca9..77fc3ca9 100644
--- a/styles/lucee/images/temperature-slider-bg.png
+++ b/styles/LuceeStyle/images/temperature-slider-bg.png
diff --git a/styles/lucee/images/vertical-slider-handle-dark.png b/styles/LuceeStyle/images/vertical-slider-handle-dark.png
index c13a6135..c13a6135 100644
--- a/styles/lucee/images/vertical-slider-handle-dark.png
+++ b/styles/LuceeStyle/images/vertical-slider-handle-dark.png
diff --git a/styles/lucee/images/vertical-slider-handle.png b/styles/LuceeStyle/images/vertical-slider-handle.png
index ab19782b..ab19782b 100644
--- a/styles/lucee/images/vertical-slider-handle.png
+++ b/styles/LuceeStyle/images/vertical-slider-handle.png
diff --git a/styles/lucee/images/weather-cloudy.png b/styles/LuceeStyle/images/weather-cloudy.png
index bfb9bbc7..bfb9bbc7 100644
--- a/styles/lucee/images/weather-cloudy.png
+++ b/styles/LuceeStyle/images/weather-cloudy.png
diff --git a/styles/lucee/images/widget-bg-dark.png b/styles/LuceeStyle/images/widget-bg-dark.png
index 9990505a..9990505a 100644
--- a/styles/lucee/images/widget-bg-dark.png
+++ b/styles/LuceeStyle/images/widget-bg-dark.png
diff --git a/styles/lucee/images/widget-bg.png b/styles/LuceeStyle/images/widget-bg.png
index 43d0ae50..43d0ae50 100644
--- a/styles/lucee/images/widget-bg.png
+++ b/styles/LuceeStyle/images/widget-bg.png
diff --git a/styles/lucee/images/widget-corner-dark.png b/styles/LuceeStyle/images/widget-corner-dark.png
index aace3ab6..aace3ab6 100644
--- a/styles/lucee/images/widget-corner-dark.png
+++ b/styles/LuceeStyle/images/widget-corner-dark.png
diff --git a/styles/lucee/images/widget-corner.png b/styles/LuceeStyle/images/widget-corner.png
index 99068874..99068874 100644
--- a/styles/lucee/images/widget-corner.png
+++ b/styles/LuceeStyle/images/widget-corner.png
diff --git a/styles/lucee/images/widget-dragged-bg.png b/styles/LuceeStyle/images/widget-dragged-bg.png
index f46ba822..f46ba822 100644
--- a/styles/lucee/images/widget-dragged-bg.png
+++ b/styles/LuceeStyle/images/widget-dragged-bg.png
diff --git a/styles/lucee/images/widget-left-section-bg-dark.png b/styles/LuceeStyle/images/widget-left-section-bg-dark.png
index e95928c8..e95928c8 100644
--- a/styles/lucee/images/widget-left-section-bg-dark.png
+++ b/styles/LuceeStyle/images/widget-left-section-bg-dark.png
diff --git a/styles/lucee/images/widget-left-section-bg.png b/styles/LuceeStyle/images/widget-left-section-bg.png
index eabb8767..eabb8767 100644
--- a/styles/lucee/images/widget-left-section-bg.png
+++ b/styles/LuceeStyle/images/widget-left-section-bg.png
diff --git a/styles/lucee/images/widget-resize-bottom.png b/styles/LuceeStyle/images/widget-resize-bottom.png
index f315d153..f315d153 100644
--- a/styles/lucee/images/widget-resize-bottom.png
+++ b/styles/LuceeStyle/images/widget-resize-bottom.png
diff --git a/styles/lucee/images/widget-resize-top.png b/styles/LuceeStyle/images/widget-resize-top.png
index fb43cc99..fb43cc99 100644
--- a/styles/lucee/images/widget-resize-top.png
+++ b/styles/LuceeStyle/images/widget-resize-top.png
diff --git a/styles/lucee/images/widget-stripe.png b/styles/LuceeStyle/images/widget-stripe.png
index c9ed373e..c9ed373e 100644
--- a/styles/lucee/images/widget-stripe.png
+++ b/styles/LuceeStyle/images/widget-stripe.png
diff --git a/styles/lucee/images/widget-window-mask.png b/styles/LuceeStyle/images/widget-window-mask.png
index 82d8990e..82d8990e 100644
--- a/styles/lucee/images/widget-window-mask.png
+++ b/styles/LuceeStyle/images/widget-window-mask.png
diff --git a/styles/LuceeStyle/qmldir b/styles/LuceeStyle/qmldir
new file mode 100644
index 00000000..3baa4da2
--- /dev/null
+++ b/styles/LuceeStyle/qmldir
@@ -0,0 +1,21 @@
+module LuceeStyle
+Button 1.0 Button.qml
+ComboBox 1.0 ComboBox.qml
+Control 1.0 Control.qml
+Dialog 1.0 Dialog.qml
+Frame 1.0 Frame.qml
+ItemDelegate 1.0 ItemDelegate.qml
+Label 1.0 Label.qml
+Page 1.0 Page.qml
+PageIndicator 1.0 PageIndicator.qml
+Pane 1.0 Pane.qml
+ProgressBar 1.0 ProgressBar.qml
+RadioButton 1.0 RadioButton.qml
+ScrollIndicator 1.0 ScrollIndicator.qml
+Slider 1.0 Slider.qml
+Switch 1.0 Switch.qml
+SwitchDelegate 1.0 SwitchDelegate.qml
+TabBar 1.0 TabBar.qml
+TabButton 1.0 TabButton.qml
+ToolBar 1.0 ToolBar.qml
+ToolButton 1.0 ToolButton.qml
diff --git a/styles/lucee/style.conf b/styles/LuceeStyle/style.conf
index b5d943eb..b5d943eb 100644
--- a/styles/lucee/style.conf
+++ b/styles/LuceeStyle/style.conf
diff --git a/styles/neptune/Button.qml b/styles/NeptuneStyle/Button.qml
index 18c8676b..18c8676b 100644
--- a/styles/neptune/Button.qml
+++ b/styles/NeptuneStyle/Button.qml
diff --git a/styles/neptune/ComboBox.qml b/styles/NeptuneStyle/ComboBox.qml
index c4848b8f..c4848b8f 100644
--- a/styles/neptune/ComboBox.qml
+++ b/styles/NeptuneStyle/ComboBox.qml
diff --git a/styles/lucee/Control.qml b/styles/NeptuneStyle/Control.qml
index db705268..94a58481 100644
--- a/styles/lucee/Control.qml
+++ b/styles/NeptuneStyle/Control.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick.Templates 2.3 as T
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/neptune/Dialog.qml b/styles/NeptuneStyle/Dialog.qml
index cb279989..cb279989 100644
--- a/styles/neptune/Dialog.qml
+++ b/styles/NeptuneStyle/Dialog.qml
diff --git a/styles/neptune/Frame.qml b/styles/NeptuneStyle/Frame.qml
index a9ab74cb..a9ab74cb 100644
--- a/styles/neptune/Frame.qml
+++ b/styles/NeptuneStyle/Frame.qml
diff --git a/styles/neptune/ItemDelegate.qml b/styles/NeptuneStyle/ItemDelegate.qml
index abc101ee..abc101ee 100644
--- a/styles/neptune/ItemDelegate.qml
+++ b/styles/NeptuneStyle/ItemDelegate.qml
diff --git a/styles/lucee/Label.qml b/styles/NeptuneStyle/Label.qml
index cb9c731a..ca0675dc 100644
--- a/styles/lucee/Label.qml
+++ b/styles/NeptuneStyle/Label.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/neptune/Page.qml b/styles/NeptuneStyle/Page.qml
index d8ddb751..d8ddb751 100644
--- a/styles/neptune/Page.qml
+++ b/styles/NeptuneStyle/Page.qml
diff --git a/styles/neptune/PageIndicator.qml b/styles/NeptuneStyle/PageIndicator.qml
index 7859bf86..7859bf86 100644
--- a/styles/neptune/PageIndicator.qml
+++ b/styles/NeptuneStyle/PageIndicator.qml
diff --git a/styles/neptune/Pane.qml b/styles/NeptuneStyle/Pane.qml
index aa56a550..aa56a550 100644
--- a/styles/neptune/Pane.qml
+++ b/styles/NeptuneStyle/Pane.qml
diff --git a/styles/neptune/ProgressBar.qml b/styles/NeptuneStyle/ProgressBar.qml
index 36b135c9..36b135c9 100644
--- a/styles/neptune/ProgressBar.qml
+++ b/styles/NeptuneStyle/ProgressBar.qml
diff --git a/styles/neptune/RadioButton.qml b/styles/NeptuneStyle/RadioButton.qml
index 466a791b..da3775be 100644
--- a/styles/neptune/RadioButton.qml
+++ b/styles/NeptuneStyle/RadioButton.qml
@@ -31,8 +31,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
 
 import shared.utils 1.0
 import shared.Style 1.0
diff --git a/styles/neptune/ScrollIndicator.qml b/styles/NeptuneStyle/ScrollIndicator.qml
index 6e98d9bc..6e98d9bc 100644
--- a/styles/neptune/ScrollIndicator.qml
+++ b/styles/NeptuneStyle/ScrollIndicator.qml
diff --git a/styles/neptune/Slider.qml b/styles/NeptuneStyle/Slider.qml
index 313cc68a..313cc68a 100644
--- a/styles/neptune/Slider.qml
+++ b/styles/NeptuneStyle/Slider.qml
diff --git a/styles/neptune/Switch.qml b/styles/NeptuneStyle/Switch.qml
index 2a906fc0..2a906fc0 100644
--- a/styles/neptune/Switch.qml
+++ b/styles/NeptuneStyle/Switch.qml
diff --git a/styles/neptune/SwitchDelegate.qml b/styles/NeptuneStyle/SwitchDelegate.qml
index 563a8e51..563a8e51 100644
--- a/styles/neptune/SwitchDelegate.qml
+++ b/styles/NeptuneStyle/SwitchDelegate.qml
diff --git a/styles/neptune/TabBar.qml b/styles/NeptuneStyle/TabBar.qml
index 1d7f8d73..bbed8875 100644
--- a/styles/neptune/TabBar.qml
+++ b/styles/NeptuneStyle/TabBar.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/neptune/TabButton.qml b/styles/NeptuneStyle/TabButton.qml
index 7b0b5d05..7b0b5d05 100644
--- a/styles/neptune/TabButton.qml
+++ b/styles/NeptuneStyle/TabButton.qml
diff --git a/styles/neptune/ToolBar.qml b/styles/NeptuneStyle/ToolBar.qml
index 8e8e9bc0..8e8e9bc0 100644
--- a/styles/neptune/ToolBar.qml
+++ b/styles/NeptuneStyle/ToolBar.qml
diff --git a/styles/neptune/ToolButton.qml b/styles/NeptuneStyle/ToolButton.qml
index 55efd6c6..55efd6c6 100644
--- a/styles/neptune/ToolButton.qml
+++ b/styles/NeptuneStyle/ToolButton.qml
diff --git a/styles/neptune/images/album-art-placeholder-dark.png b/styles/NeptuneStyle/images/album-art-placeholder-dark.png
index fc7b3726..fc7b3726 100644
--- a/styles/neptune/images/album-art-placeholder-dark.png
+++ b/styles/NeptuneStyle/images/album-art-placeholder-dark.png
diff --git a/styles/neptune/images/album-art-placeholder.png b/styles/NeptuneStyle/images/album-art-placeholder.png
index 03c265f1..03c265f1 100644
--- a/styles/neptune/images/album-art-placeholder.png
+++ b/styles/NeptuneStyle/images/album-art-placeholder.png
diff --git a/styles/neptune/images/album-art-shadow-dark.png b/styles/NeptuneStyle/images/album-art-shadow-dark.png
index acc15650..acc15650 100644
--- a/styles/neptune/images/album-art-shadow-dark.png
+++ b/styles/NeptuneStyle/images/album-art-shadow-dark.png
diff --git a/styles/neptune/images/album-art-shadow-widget.png b/styles/NeptuneStyle/images/album-art-shadow-widget.png
index c365a642..c365a642 100644
--- a/styles/neptune/images/album-art-shadow-widget.png
+++ b/styles/NeptuneStyle/images/album-art-shadow-widget.png
diff --git a/styles/neptune/images/album-art-shadow.png b/styles/NeptuneStyle/images/album-art-shadow.png
index e7ba6682..e7ba6682 100644
--- a/styles/neptune/images/album-art-shadow.png
+++ b/styles/NeptuneStyle/images/album-art-shadow.png
diff --git a/styles/neptune/images/app-fullscreen-top-bg-dark.png b/styles/NeptuneStyle/images/app-fullscreen-top-bg-dark.png
index 9fe3f124..9fe3f124 100644
--- a/styles/neptune/images/app-fullscreen-top-bg-dark.png
+++ b/styles/NeptuneStyle/images/app-fullscreen-top-bg-dark.png
diff --git a/styles/neptune/images/app-fullscreen-top-bg.png b/styles/NeptuneStyle/images/app-fullscreen-top-bg.png
index 9fe3f124..9fe3f124 100644
--- a/styles/neptune/images/app-fullscreen-top-bg.png
+++ b/styles/NeptuneStyle/images/app-fullscreen-top-bg.png
diff --git a/styles/neptune/images/bg-home-dark.png b/styles/NeptuneStyle/images/bg-home-dark.png
index a2f4663d..a2f4663d 100644
--- a/styles/neptune/images/bg-home-dark.png
+++ b/styles/NeptuneStyle/images/bg-home-dark.png
diff --git a/styles/neptune/images/bg-home.png b/styles/NeptuneStyle/images/bg-home.png
index 98e38db2..98e38db2 100644
--- a/styles/neptune/images/bg-home.png
+++ b/styles/NeptuneStyle/images/bg-home.png
diff --git a/styles/NeptuneStyle/images/colorSelector/#087559.png b/styles/NeptuneStyle/images/colorSelector/#087559.png
new file mode 100644
index 00000000..56bd7f7e
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#087559.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df8d330c009d9dc856f5a2788dfbb440fa38ce629c923a72c20aba3eb37c6a61
+size 24723
diff --git a/styles/NeptuneStyle/images/colorSelector/#417eb6.png b/styles/NeptuneStyle/images/colorSelector/#417eb6.png
new file mode 100644
index 00000000..97c81993
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#417eb6.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:702ae95c5cfedac4ac5b645d05ba568ec6d5e52efbdb5caed294ff659b9a4c46
+size 22717
diff --git a/styles/NeptuneStyle/images/colorSelector/#4c878b.png b/styles/NeptuneStyle/images/colorSelector/#4c878b.png
new file mode 100644
index 00000000..d6b8c344
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#4c878b.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da884caaafd87eb28abd3c91274c5440bd2b412cc1a0d0b642cad2a3cc7ac460
+size 23564
diff --git a/styles/NeptuneStyle/images/colorSelector/#4f4c4a.png b/styles/NeptuneStyle/images/colorSelector/#4f4c4a.png
new file mode 100644
index 00000000..dff6cd1b
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#4f4c4a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70792aeda8b02ad491fa354f483d3de6920b4b105cbc1ba2b8c132c856cd2213
+size 23689
diff --git a/styles/lucee/images/colorSelector/#51a7f4.png b/styles/NeptuneStyle/images/colorSelector/#51a7f4.png
index ac8ef8ac..ac8ef8ac 100644
--- a/styles/lucee/images/colorSelector/#51a7f4.png
+++ b/styles/NeptuneStyle/images/colorSelector/#51a7f4.png
diff --git a/styles/lucee/images/colorSelector/#535258.png b/styles/NeptuneStyle/images/colorSelector/#535258.png
index 3463d5d8..3463d5d8 100644
--- a/styles/lucee/images/colorSelector/#535258.png
+++ b/styles/NeptuneStyle/images/colorSelector/#535258.png
diff --git a/styles/NeptuneStyle/images/colorSelector/#698563.png b/styles/NeptuneStyle/images/colorSelector/#698563.png
new file mode 100644
index 00000000..7330e8a0
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#698563.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93d3259208844487996c405454f1036057ba7b4eb384e14d00252a6455727040
+size 22297
diff --git a/styles/lucee/images/colorSelector/#78887b.png b/styles/NeptuneStyle/images/colorSelector/#78887b.png
index f6401303..f6401303 100644
--- a/styles/lucee/images/colorSelector/#78887b.png
+++ b/styles/NeptuneStyle/images/colorSelector/#78887b.png
diff --git a/styles/lucee/images/colorSelector/#7ba2a5.png b/styles/NeptuneStyle/images/colorSelector/#7ba2a5.png
index 6f3efb46..6f3efb46 100644
--- a/styles/lucee/images/colorSelector/#7ba2a5.png
+++ b/styles/NeptuneStyle/images/colorSelector/#7ba2a5.png
diff --git a/styles/NeptuneStyle/images/colorSelector/#916755.png b/styles/NeptuneStyle/images/colorSelector/#916755.png
new file mode 100644
index 00000000..6d59f111
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#916755.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6131ff97e05f0b98e922a8e9c8520ffe68bc906bba2d1c5961071e5cdb414dc1
+size 25333
diff --git a/styles/NeptuneStyle/images/colorSelector/#977b35.png b/styles/NeptuneStyle/images/colorSelector/#977b35.png
new file mode 100644
index 00000000..81c03b86
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#977b35.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a6e442e6796b81df21b26186c6324f6db860bd26a4ada30ca669a66ab07e8db
+size 26211
diff --git a/styles/lucee/images/colorSelector/#9eae83.png b/styles/NeptuneStyle/images/colorSelector/#9eae83.png
index c902d564..c902d564 100644
--- a/styles/lucee/images/colorSelector/#9eae83.png
+++ b/styles/NeptuneStyle/images/colorSelector/#9eae83.png
diff --git a/styles/NeptuneStyle/images/colorSelector/#b75034.png b/styles/NeptuneStyle/images/colorSelector/#b75034.png
new file mode 100644
index 00000000..a221521a
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#b75034.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:752f5d753f198e0dc35d7a6edcf988663bd4b89f4d5f2c75525165e754060830
+size 23277
diff --git a/styles/lucee/images/colorSelector/#d35756.png b/styles/NeptuneStyle/images/colorSelector/#d35756.png
index 5bb7f192..5bb7f192 100644
--- a/styles/lucee/images/colorSelector/#d35756.png
+++ b/styles/NeptuneStyle/images/colorSelector/#d35756.png
diff --git a/styles/lucee/images/colorSelector/#db3b9f.png b/styles/NeptuneStyle/images/colorSelector/#db3b9f.png
index ec052635..ec052635 100644
--- a/styles/lucee/images/colorSelector/#db3b9f.png
+++ b/styles/NeptuneStyle/images/colorSelector/#db3b9f.png
diff --git a/styles/lucee/images/colorSelector/#fba054.png b/styles/NeptuneStyle/images/colorSelector/#fba054.png
index b46f6d2b..b46f6d2b 100644
--- a/styles/lucee/images/colorSelector/#fba054.png
+++ b/styles/NeptuneStyle/images/colorSelector/#fba054.png
diff --git a/styles/NeptuneStyle/images/colorSelector/color-wheel-dark.png b/styles/NeptuneStyle/images/colorSelector/color-wheel-dark.png
new file mode 100644
index 00000000..890a0b48
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/color-wheel-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:711921573018521d44f694c3652930e9ceac7588f202ef4e0a92b590c5e45348
+size 38216
diff --git a/styles/lucee/images/colorSelector/color-wheel.png b/styles/NeptuneStyle/images/colorSelector/color-wheel.png
index 923de750..923de750 100644
--- a/styles/lucee/images/colorSelector/color-wheel.png
+++ b/styles/NeptuneStyle/images/colorSelector/color-wheel.png
diff --git a/styles/neptune/images/divider-dark.png b/styles/NeptuneStyle/images/divider-dark.png
index b4ff3ba0..b4ff3ba0 100644
--- a/styles/neptune/images/divider-dark.png
+++ b/styles/NeptuneStyle/images/divider-dark.png
diff --git a/styles/neptune/images/divider.png b/styles/NeptuneStyle/images/divider.png
index c944b8a4..c944b8a4 100644
--- a/styles/neptune/images/divider.png
+++ b/styles/NeptuneStyle/images/divider.png
diff --git a/styles/neptune/images/fan-speed-5.png b/styles/NeptuneStyle/images/fan-speed-5.png
index d199e72c..d199e72c 100644
--- a/styles/neptune/images/fan-speed-5.png
+++ b/styles/NeptuneStyle/images/fan-speed-5.png
diff --git a/styles/neptune/images/floating-panel-top-bg.png b/styles/NeptuneStyle/images/floating-panel-top-bg.png
index aa06e90e..aa06e90e 100644
--- a/styles/neptune/images/floating-panel-top-bg.png
+++ b/styles/NeptuneStyle/images/floating-panel-top-bg.png
diff --git a/styles/neptune/images/highlighted-button-shadow.png b/styles/NeptuneStyle/images/highlighted-button-shadow.png
index d274654d..d274654d 100644
--- a/styles/neptune/images/highlighted-button-shadow.png
+++ b/styles/NeptuneStyle/images/highlighted-button-shadow.png
diff --git a/styles/neptune/images/home-widget-bg.png b/styles/NeptuneStyle/images/home-widget-bg.png
index d5361540..d5361540 100644
--- a/styles/neptune/images/home-widget-bg.png
+++ b/styles/NeptuneStyle/images/home-widget-bg.png
diff --git a/styles/neptune/images/ic-app-active-bg.png b/styles/NeptuneStyle/images/ic-app-active-bg.png
index e9c9f5b6..e9c9f5b6 100644
--- a/styles/neptune/images/ic-app-active-bg.png
+++ b/styles/NeptuneStyle/images/ic-app-active-bg.png
diff --git a/styles/neptune/images/ic-calculator-dark.png b/styles/NeptuneStyle/images/ic-calculator-dark.png
index c38d1400..c38d1400 100644
--- a/styles/neptune/images/ic-calculator-dark.png
+++ b/styles/NeptuneStyle/images/ic-calculator-dark.png
diff --git a/styles/neptune/images/ic-call.png b/styles/NeptuneStyle/images/ic-call.png
index 0454eaed..0454eaed 100644
--- a/styles/neptune/images/ic-call.png
+++ b/styles/NeptuneStyle/images/ic-call.png
diff --git a/styles/neptune/images/ic-expand-down-dark.png b/styles/NeptuneStyle/images/ic-expand-down-dark.png
index 3ce57ca3..3ce57ca3 100644
--- a/styles/neptune/images/ic-expand-down-dark.png
+++ b/styles/NeptuneStyle/images/ic-expand-down-dark.png
diff --git a/styles/neptune/images/ic-expand-down.png b/styles/NeptuneStyle/images/ic-expand-down.png
index 7b2b2102..7b2b2102 100644
--- a/styles/neptune/images/ic-expand-down.png
+++ b/styles/NeptuneStyle/images/ic-expand-down.png
diff --git a/styles/neptune/images/ic-expand-to-fullscreen-dark.png b/styles/NeptuneStyle/images/ic-expand-to-fullscreen-dark.png
index 81bcc768..81bcc768 100644
--- a/styles/neptune/images/ic-expand-to-fullscreen-dark.png
+++ b/styles/NeptuneStyle/images/ic-expand-to-fullscreen-dark.png
diff --git a/styles/neptune/images/ic-expand-to-fullscreen.png b/styles/NeptuneStyle/images/ic-expand-to-fullscreen.png
index 30b610b2..30b610b2 100644
--- a/styles/neptune/images/ic-expand-to-fullscreen.png
+++ b/styles/NeptuneStyle/images/ic-expand-to-fullscreen.png
diff --git a/styles/neptune/images/ic-expand-up-dark.png b/styles/NeptuneStyle/images/ic-expand-up-dark.png
index c2396bec..c2396bec 100644
--- a/styles/neptune/images/ic-expand-up-dark.png
+++ b/styles/NeptuneStyle/images/ic-expand-up-dark.png
diff --git a/styles/neptune/images/ic-expand-up.png b/styles/NeptuneStyle/images/ic-expand-up.png
index 57a81a3a..57a81a3a 100644
--- a/styles/neptune/images/ic-expand-up.png
+++ b/styles/NeptuneStyle/images/ic-expand-up.png
diff --git a/styles/neptune/images/ic-favorite-dark.png b/styles/NeptuneStyle/images/ic-favorite-dark.png
index 93ab4bb6..93ab4bb6 100644
--- a/styles/neptune/images/ic-favorite-dark.png
+++ b/styles/NeptuneStyle/images/ic-favorite-dark.png
diff --git a/styles/neptune/images/ic-favorite.png b/styles/NeptuneStyle/images/ic-favorite.png
index 075df9cd..075df9cd 100644
--- a/styles/neptune/images/ic-favorite.png
+++ b/styles/NeptuneStyle/images/ic-favorite.png
diff --git a/styles/neptune/images/ic-music-dark.png b/styles/NeptuneStyle/images/ic-music-dark.png
index 8e1302c1..8e1302c1 100644
--- a/styles/neptune/images/ic-music-dark.png
+++ b/styles/NeptuneStyle/images/ic-music-dark.png
diff --git a/styles/neptune/images/ic-navigation-dark.png b/styles/NeptuneStyle/images/ic-navigation-dark.png
index 6e48a601..6e48a601 100644
--- a/styles/neptune/images/ic-navigation-dark.png
+++ b/styles/NeptuneStyle/images/ic-navigation-dark.png
diff --git a/styles/neptune/images/ic-next-level-dark.png b/styles/NeptuneStyle/images/ic-next-level-dark.png
index 700fb96c..700fb96c 100644
--- a/styles/neptune/images/ic-next-level-dark.png
+++ b/styles/NeptuneStyle/images/ic-next-level-dark.png
diff --git a/styles/neptune/images/ic-next-level.png b/styles/NeptuneStyle/images/ic-next-level.png
index 5fc33846..5fc33846 100644
--- a/styles/neptune/images/ic-next-level.png
+++ b/styles/NeptuneStyle/images/ic-next-level.png
diff --git a/styles/neptune/images/ic-rain-amount.png b/styles/NeptuneStyle/images/ic-rain-amount.png
index 823d430b..823d430b 100644
--- a/styles/neptune/images/ic-rain-amount.png
+++ b/styles/NeptuneStyle/images/ic-rain-amount.png
diff --git a/styles/neptune/images/ic-search_OFF-dark.png b/styles/NeptuneStyle/images/ic-search_OFF-dark.png
index 7d96e114..7d96e114 100644
--- a/styles/neptune/images/ic-search_OFF-dark.png
+++ b/styles/NeptuneStyle/images/ic-search_OFF-dark.png
diff --git a/styles/neptune/images/ic-search_OFF.png b/styles/NeptuneStyle/images/ic-search_OFF.png
index 0e2ca5df..0e2ca5df 100644
--- a/styles/neptune/images/ic-search_OFF.png
+++ b/styles/NeptuneStyle/images/ic-search_OFF.png
diff --git a/styles/neptune/images/ic-search_ON-dark.png b/styles/NeptuneStyle/images/ic-search_ON-dark.png
index 8e2814bc..8e2814bc 100644
--- a/styles/neptune/images/ic-search_ON-dark.png
+++ b/styles/NeptuneStyle/images/ic-search_ON-dark.png
diff --git a/styles/neptune/images/ic-search_ON.png b/styles/NeptuneStyle/images/ic-search_ON.png
index 8e2814bc..8e2814bc 100644
--- a/styles/neptune/images/ic-search_ON.png
+++ b/styles/NeptuneStyle/images/ic-search_ON.png
diff --git a/styles/neptune/images/ic-statusbar-battery-dark.png b/styles/NeptuneStyle/images/ic-statusbar-battery-dark.png
index 851d64a2..851d64a2 100644
--- a/styles/neptune/images/ic-statusbar-battery-dark.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-battery-dark.png
diff --git a/styles/neptune/images/ic-statusbar-battery.png b/styles/NeptuneStyle/images/ic-statusbar-battery.png
index 59031feb..59031feb 100644
--- a/styles/neptune/images/ic-statusbar-battery.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-battery.png
diff --git a/styles/neptune/images/ic-statusbar-bluetooth-dark.png b/styles/NeptuneStyle/images/ic-statusbar-bluetooth-dark.png
index 71a11f3e..71a11f3e 100644
--- a/styles/neptune/images/ic-statusbar-bluetooth-dark.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-bluetooth-dark.png
diff --git a/styles/neptune/images/ic-statusbar-bluetooth.png b/styles/NeptuneStyle/images/ic-statusbar-bluetooth.png
index 20ec6a11..20ec6a11 100644
--- a/styles/neptune/images/ic-statusbar-bluetooth.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-bluetooth.png
diff --git a/styles/neptune/images/ic-statusbar-reception-dark.png b/styles/NeptuneStyle/images/ic-statusbar-reception-dark.png
index 640223be..640223be 100644
--- a/styles/neptune/images/ic-statusbar-reception-dark.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-reception-dark.png
diff --git a/styles/neptune/images/ic-statusbar-reception.png b/styles/NeptuneStyle/images/ic-statusbar-reception.png
index e8b0f2b8..e8b0f2b8 100644
--- a/styles/neptune/images/ic-statusbar-reception.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-reception.png
diff --git a/styles/neptune/images/ic-statusbar-wifi-dark.png b/styles/NeptuneStyle/images/ic-statusbar-wifi-dark.png
index 11b6c15b..11b6c15b 100644
--- a/styles/neptune/images/ic-statusbar-wifi-dark.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-wifi-dark.png
diff --git a/styles/neptune/images/ic-statusbar-wifi.png b/styles/NeptuneStyle/images/ic-statusbar-wifi.png
index e12dbc98..e12dbc98 100644
--- a/styles/neptune/images/ic-statusbar-wifi.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-wifi.png
diff --git a/styles/neptune/images/ic-weather-partly-rain-dark.png b/styles/NeptuneStyle/images/ic-weather-partly-rain-dark.png
index e8ca6be6..e8ca6be6 100644
--- a/styles/neptune/images/ic-weather-partly-rain-dark.png
+++ b/styles/NeptuneStyle/images/ic-weather-partly-rain-dark.png
diff --git a/styles/neptune/images/ic-weather-partly-rain.png b/styles/NeptuneStyle/images/ic-weather-partly-rain.png
index 69bb6701..69bb6701 100644
--- a/styles/neptune/images/ic-weather-partly-rain.png
+++ b/styles/NeptuneStyle/images/ic-weather-partly-rain.png
diff --git a/styles/neptune/images/ic-weather-rain-dark.png b/styles/NeptuneStyle/images/ic-weather-rain-dark.png
index 82a1dacd..82a1dacd 100644
--- a/styles/neptune/images/ic-weather-rain-dark.png
+++ b/styles/NeptuneStyle/images/ic-weather-rain-dark.png
diff --git a/styles/neptune/images/ic-weather-rain.png b/styles/NeptuneStyle/images/ic-weather-rain.png
index c96d9602..c96d9602 100644
--- a/styles/neptune/images/ic-weather-rain.png
+++ b/styles/NeptuneStyle/images/ic-weather-rain.png
diff --git a/styles/neptune/images/ic-weather-snow-dark.png b/styles/NeptuneStyle/images/ic-weather-snow-dark.png
index 51512d26..51512d26 100644
--- a/styles/neptune/images/ic-weather-snow-dark.png
+++ b/styles/NeptuneStyle/images/ic-weather-snow-dark.png
diff --git a/styles/neptune/images/ic-weather-snow.png b/styles/NeptuneStyle/images/ic-weather-snow.png
index a2ef5405..a2ef5405 100644
--- a/styles/neptune/images/ic-weather-snow.png
+++ b/styles/NeptuneStyle/images/ic-weather-snow.png
diff --git a/styles/neptune/images/ic-weather-sun-dark.png b/styles/NeptuneStyle/images/ic-weather-sun-dark.png
index 30acedf1..30acedf1 100644
--- a/styles/neptune/images/ic-weather-sun-dark.png
+++ b/styles/NeptuneStyle/images/ic-weather-sun-dark.png
diff --git a/styles/neptune/images/ic-weather-sun.png b/styles/NeptuneStyle/images/ic-weather-sun.png
index 593035ff..593035ff 100644
--- a/styles/neptune/images/ic-weather-sun.png
+++ b/styles/NeptuneStyle/images/ic-weather-sun.png
diff --git a/styles/neptune/images/ic-widget-close.png b/styles/NeptuneStyle/images/ic-widget-close.png
index eb18b529..eb18b529 100644
--- a/styles/neptune/images/ic-widget-close.png
+++ b/styles/NeptuneStyle/images/ic-widget-close.png
diff --git a/styles/neptune/images/ic-widget-move.png b/styles/NeptuneStyle/images/ic-widget-move.png
index 36a267d9..36a267d9 100644
--- a/styles/neptune/images/ic-widget-move.png
+++ b/styles/NeptuneStyle/images/ic-widget-move.png
diff --git a/styles/neptune/images/ic-widget-music.png b/styles/NeptuneStyle/images/ic-widget-music.png
index b2a4958a..b2a4958a 100644
--- a/styles/neptune/images/ic-widget-music.png
+++ b/styles/NeptuneStyle/images/ic-widget-music.png
diff --git a/styles/neptune/images/ic-widget-navigation.png b/styles/NeptuneStyle/images/ic-widget-navigation.png
index dca356a3..dca356a3 100644
--- a/styles/neptune/images/ic-widget-navigation.png
+++ b/styles/NeptuneStyle/images/ic-widget-navigation.png
diff --git a/styles/neptune/images/ic-widget-tuner.png b/styles/NeptuneStyle/images/ic-widget-tuner.png
index 13dace7b..13dace7b 100644
--- a/styles/neptune/images/ic-widget-tuner.png
+++ b/styles/NeptuneStyle/images/ic-widget-tuner.png
diff --git a/styles/neptune/images/ic-widget-weather.png b/styles/NeptuneStyle/images/ic-widget-weather.png
index ffe5c0ec..ffe5c0ec 100644
--- a/styles/neptune/images/ic-widget-weather.png
+++ b/styles/NeptuneStyle/images/ic-widget-weather.png
diff --git a/styles/neptune/images/ic_button-bg-red.png b/styles/NeptuneStyle/images/ic_button-bg-red.png
index 0d30973d..0d30973d 100644
--- a/styles/neptune/images/ic_button-bg-red.png
+++ b/styles/NeptuneStyle/images/ic_button-bg-red.png
diff --git a/styles/neptune/images/ic_button-bg.png b/styles/NeptuneStyle/images/ic_button-bg.png
index 941fd420..941fd420 100644
--- a/styles/neptune/images/ic_button-bg.png
+++ b/styles/NeptuneStyle/images/ic_button-bg.png
diff --git a/styles/neptune/images/input-overlay.png b/styles/NeptuneStyle/images/input-overlay.png
index bbc1d17c..bbc1d17c 100644
--- a/styles/neptune/images/input-overlay.png
+++ b/styles/NeptuneStyle/images/input-overlay.png
diff --git a/styles/neptune/images/instrument-cluster-bg-dark.png b/styles/NeptuneStyle/images/instrument-cluster-bg-dark.png
index 1a89136b..1a89136b 100644
--- a/styles/neptune/images/instrument-cluster-bg-dark.png
+++ b/styles/NeptuneStyle/images/instrument-cluster-bg-dark.png
diff --git a/styles/neptune/images/instrument-cluster-bg.png b/styles/NeptuneStyle/images/instrument-cluster-bg.png
index 8cd4c905..8cd4c905 100644
--- a/styles/neptune/images/instrument-cluster-bg.png
+++ b/styles/NeptuneStyle/images/instrument-cluster-bg.png
diff --git a/styles/neptune/images/list-divider-dark.png b/styles/NeptuneStyle/images/list-divider-dark.png
index 78ae5372..78ae5372 100644
--- a/styles/neptune/images/list-divider-dark.png
+++ b/styles/NeptuneStyle/images/list-divider-dark.png
diff --git a/styles/neptune/images/list-divider.png b/styles/NeptuneStyle/images/list-divider.png
index 1db5ec08..1db5ec08 100644
--- a/styles/neptune/images/list-divider.png
+++ b/styles/NeptuneStyle/images/list-divider.png
diff --git a/styles/neptune/images/logo-kdab-dark.png b/styles/NeptuneStyle/images/logo-kdab-dark.png
index 1f440c21..1f440c21 100644
--- a/styles/neptune/images/logo-kdab-dark.png
+++ b/styles/NeptuneStyle/images/logo-kdab-dark.png
diff --git a/styles/neptune/images/logo-kdab.png b/styles/NeptuneStyle/images/logo-kdab.png
index 99e67295..99e67295 100644
--- a/styles/neptune/images/logo-kdab.png
+++ b/styles/NeptuneStyle/images/logo-kdab.png
diff --git a/styles/neptune/images/logo-luxoft-dark.png b/styles/NeptuneStyle/images/logo-luxoft-dark.png
index 792f1114..792f1114 100644
--- a/styles/neptune/images/logo-luxoft-dark.png
+++ b/styles/NeptuneStyle/images/logo-luxoft-dark.png
diff --git a/styles/neptune/images/logo-luxoft.png b/styles/NeptuneStyle/images/logo-luxoft.png
index 285be51f..285be51f 100644
--- a/styles/neptune/images/logo-luxoft.png
+++ b/styles/NeptuneStyle/images/logo-luxoft.png
diff --git a/styles/neptune/images/logo-theqtcompany-dark.png b/styles/NeptuneStyle/images/logo-theqtcompany-dark.png
index 276617b6..276617b6 100644
--- a/styles/neptune/images/logo-theqtcompany-dark.png
+++ b/styles/NeptuneStyle/images/logo-theqtcompany-dark.png
diff --git a/styles/neptune/images/logo-theqtcompany.png b/styles/NeptuneStyle/images/logo-theqtcompany.png
index d36228b3..d36228b3 100644
--- a/styles/neptune/images/logo-theqtcompany.png
+++ b/styles/NeptuneStyle/images/logo-theqtcompany.png
diff --git a/styles/neptune/images/panel-inner-shadow-dark.png b/styles/NeptuneStyle/images/panel-inner-shadow-dark.png
index 5533d7eb..5533d7eb 100644
--- a/styles/neptune/images/panel-inner-shadow-dark.png
+++ b/styles/NeptuneStyle/images/panel-inner-shadow-dark.png
diff --git a/styles/neptune/images/panel-inner-shadow.png b/styles/NeptuneStyle/images/panel-inner-shadow.png
index a52e197b..a52e197b 100644
--- a/styles/neptune/images/panel-inner-shadow.png
+++ b/styles/NeptuneStyle/images/panel-inner-shadow.png
diff --git a/styles/neptune/images/phone-widget-section-gradient-dark.png b/styles/NeptuneStyle/images/phone-widget-section-gradient-dark.png
index 29a9e9fb..29a9e9fb 100644
--- a/styles/neptune/images/phone-widget-section-gradient-dark.png
+++ b/styles/NeptuneStyle/images/phone-widget-section-gradient-dark.png
diff --git a/styles/neptune/images/phone-widget-section-gradient.png b/styles/NeptuneStyle/images/phone-widget-section-gradient.png
index a6f5fde5..a6f5fde5 100644
--- a/styles/neptune/images/phone-widget-section-gradient.png
+++ b/styles/NeptuneStyle/images/phone-widget-section-gradient.png
diff --git a/styles/neptune/images/playing-dark.gif b/styles/NeptuneStyle/images/playing-dark.gif
index 01c23b2e..01c23b2e 100644
--- a/styles/neptune/images/playing-dark.gif
+++ b/styles/NeptuneStyle/images/playing-dark.gif
diff --git a/styles/neptune/images/playing.gif b/styles/NeptuneStyle/images/playing.gif
index 3c9e15a6..3c9e15a6 100644
--- a/styles/neptune/images/playing.gif
+++ b/styles/NeptuneStyle/images/playing.gif
diff --git a/styles/neptune/images/popup-background-9patch-dark.png b/styles/NeptuneStyle/images/popup-background-9patch-dark.png
index 617f585e..617f585e 100644
--- a/styles/neptune/images/popup-background-9patch-dark.png
+++ b/styles/NeptuneStyle/images/popup-background-9patch-dark.png
diff --git a/styles/neptune/images/popup-background-9patch.png b/styles/NeptuneStyle/images/popup-background-9patch.png
index e5239de5..e5239de5 100644
--- a/styles/neptune/images/popup-background-9patch.png
+++ b/styles/NeptuneStyle/images/popup-background-9patch.png
diff --git a/styles/neptune/images/popup-close-button-bg-dark.png b/styles/NeptuneStyle/images/popup-close-button-bg-dark.png
index f3782193..f3782193 100644
--- a/styles/neptune/images/popup-close-button-bg-dark.png
+++ b/styles/NeptuneStyle/images/popup-close-button-bg-dark.png
diff --git a/styles/neptune/images/popup-close-button-bg.png b/styles/NeptuneStyle/images/popup-close-button-bg.png
index 571d7336..571d7336 100644
--- a/styles/neptune/images/popup-close-button-bg.png
+++ b/styles/NeptuneStyle/images/popup-close-button-bg.png
diff --git a/styles/neptune/images/popup-title-shadow.png b/styles/NeptuneStyle/images/popup-title-shadow.png
index b75e399a..b75e399a 100644
--- a/styles/neptune/images/popup-title-shadow.png
+++ b/styles/NeptuneStyle/images/popup-title-shadow.png
diff --git a/styles/neptune/images/slider-handle-horizontal-dark.png b/styles/NeptuneStyle/images/slider-handle-horizontal-dark.png
index 07215da8..07215da8 100644
--- a/styles/neptune/images/slider-handle-horizontal-dark.png
+++ b/styles/NeptuneStyle/images/slider-handle-horizontal-dark.png
diff --git a/styles/neptune/images/slider-handle-horizontal.png b/styles/NeptuneStyle/images/slider-handle-horizontal.png
index b11c62a8..b11c62a8 100644
--- a/styles/neptune/images/slider-handle-horizontal.png
+++ b/styles/NeptuneStyle/images/slider-handle-horizontal.png
diff --git a/styles/neptune/images/slider-handle-vertical-dark.png b/styles/NeptuneStyle/images/slider-handle-vertical-dark.png
index 7bc964cd..7bc964cd 100644
--- a/styles/neptune/images/slider-handle-vertical-dark.png
+++ b/styles/NeptuneStyle/images/slider-handle-vertical-dark.png
diff --git a/styles/neptune/images/slider-handle-vertical.png b/styles/NeptuneStyle/images/slider-handle-vertical.png
index 2974afba..2974afba 100644
--- a/styles/neptune/images/slider-handle-vertical.png
+++ b/styles/NeptuneStyle/images/slider-handle-vertical.png
diff --git a/styles/neptune/images/tabbar-bg-left-dark.png b/styles/NeptuneStyle/images/tabbar-bg-left-dark.png
index baa75f07..baa75f07 100644
--- a/styles/neptune/images/tabbar-bg-left-dark.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-left-dark.png
diff --git a/styles/neptune/images/tabbar-bg-left.png b/styles/NeptuneStyle/images/tabbar-bg-left.png
index ddc91d26..ddc91d26 100644
--- a/styles/neptune/images/tabbar-bg-left.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-left.png
diff --git a/styles/neptune/images/tabbar-bg-middle-dark.png b/styles/NeptuneStyle/images/tabbar-bg-middle-dark.png
index aad5677f..aad5677f 100644
--- a/styles/neptune/images/tabbar-bg-middle-dark.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-middle-dark.png
diff --git a/styles/neptune/images/tabbar-bg-middle.png b/styles/NeptuneStyle/images/tabbar-bg-middle.png
index 84b2a6fb..84b2a6fb 100644
--- a/styles/neptune/images/tabbar-bg-middle.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-middle.png
diff --git a/styles/neptune/images/tabbar-bg-right-dark.png b/styles/NeptuneStyle/images/tabbar-bg-right-dark.png
index 7e54bea8..7e54bea8 100644
--- a/styles/neptune/images/tabbar-bg-right-dark.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-right-dark.png
diff --git a/styles/neptune/images/tabbar-bg-right.png b/styles/NeptuneStyle/images/tabbar-bg-right.png
index d9332858..d9332858 100644
--- a/styles/neptune/images/tabbar-bg-right.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-right.png
diff --git a/styles/neptune/images/temperature-slider-bg.png b/styles/NeptuneStyle/images/temperature-slider-bg.png
index 77fc3ca9..77fc3ca9 100644
--- a/styles/neptune/images/temperature-slider-bg.png
+++ b/styles/NeptuneStyle/images/temperature-slider-bg.png
diff --git a/styles/neptune/images/vertical-slider-handle-dark.png b/styles/NeptuneStyle/images/vertical-slider-handle-dark.png
index c13a6135..c13a6135 100644
--- a/styles/neptune/images/vertical-slider-handle-dark.png
+++ b/styles/NeptuneStyle/images/vertical-slider-handle-dark.png
diff --git a/styles/neptune/images/vertical-slider-handle.png b/styles/NeptuneStyle/images/vertical-slider-handle.png
index ab19782b..ab19782b 100644
--- a/styles/neptune/images/vertical-slider-handle.png
+++ b/styles/NeptuneStyle/images/vertical-slider-handle.png
diff --git a/styles/neptune/images/weather-cloudy.png b/styles/NeptuneStyle/images/weather-cloudy.png
index bfb9bbc7..bfb9bbc7 100644
--- a/styles/neptune/images/weather-cloudy.png
+++ b/styles/NeptuneStyle/images/weather-cloudy.png
diff --git a/styles/neptune/images/widget-bg-dark.png b/styles/NeptuneStyle/images/widget-bg-dark.png
index 1c2c85d7..1c2c85d7 100644
--- a/styles/neptune/images/widget-bg-dark.png
+++ b/styles/NeptuneStyle/images/widget-bg-dark.png
diff --git a/styles/neptune/images/widget-bg.png b/styles/NeptuneStyle/images/widget-bg.png
index 060845bf..060845bf 100644
--- a/styles/neptune/images/widget-bg.png
+++ b/styles/NeptuneStyle/images/widget-bg.png
diff --git a/styles/neptune/images/widget-corner-dark.png b/styles/NeptuneStyle/images/widget-corner-dark.png
index 4ae8be69..4ae8be69 100644
--- a/styles/neptune/images/widget-corner-dark.png
+++ b/styles/NeptuneStyle/images/widget-corner-dark.png
diff --git a/styles/neptune/images/widget-corner.png b/styles/NeptuneStyle/images/widget-corner.png
index 99068874..99068874 100644
--- a/styles/neptune/images/widget-corner.png
+++ b/styles/NeptuneStyle/images/widget-corner.png
diff --git a/styles/neptune/images/widget-dragged-bg.png b/styles/NeptuneStyle/images/widget-dragged-bg.png
index 9990505a..9990505a 100644
--- a/styles/neptune/images/widget-dragged-bg.png
+++ b/styles/NeptuneStyle/images/widget-dragged-bg.png
diff --git a/styles/neptune/images/widget-left-section-bg-dark.png b/styles/NeptuneStyle/images/widget-left-section-bg-dark.png
index db985c5b..db985c5b 100644
--- a/styles/neptune/images/widget-left-section-bg-dark.png
+++ b/styles/NeptuneStyle/images/widget-left-section-bg-dark.png
diff --git a/styles/neptune/images/widget-left-section-bg.png b/styles/NeptuneStyle/images/widget-left-section-bg.png
index eabb8767..eabb8767 100644
--- a/styles/neptune/images/widget-left-section-bg.png
+++ b/styles/NeptuneStyle/images/widget-left-section-bg.png
diff --git a/styles/neptune/images/widget-stripe.png b/styles/NeptuneStyle/images/widget-stripe.png
index a81387bc..a81387bc 100644
--- a/styles/neptune/images/widget-stripe.png
+++ b/styles/NeptuneStyle/images/widget-stripe.png
diff --git a/styles/neptune/images/widget-window-mask.png b/styles/NeptuneStyle/images/widget-window-mask.png
index f2f506a8..f2f506a8 100644
--- a/styles/neptune/images/widget-window-mask.png
+++ b/styles/NeptuneStyle/images/widget-window-mask.png
diff --git a/styles/NeptuneStyle/qmldir b/styles/NeptuneStyle/qmldir
new file mode 100644
index 00000000..770623f0
--- /dev/null
+++ b/styles/NeptuneStyle/qmldir
@@ -0,0 +1,21 @@
+module NeptuneStyle
+Button 1.0 Button.qml
+ComboBox 1.0 ComboBox.qml
+Control 1.0 Control.qml
+Dialog 1.0 Dialog.qml
+Frame 1.0 Frame.qml
+ItemDelegate 1.0 ItemDelegate.qml
+Label 1.0 Label.qml
+Page 1.0 Page.qml
+PageIndicator 1.0 PageIndicator.qml
+Pane 1.0 Pane.qml
+ProgressBar 1.0 ProgressBar.qml
+RadioButton 1.0 RadioButton.qml
+ScrollIndicator 1.0 ScrollIndicator.qml
+Slider 1.0 Slider.qml
+Switch 1.0 Switch.qml
+SwitchDelegate 1.0 SwitchDelegate.qml
+TabBar 1.0 TabBar.qml
+TabButton 1.0 TabButton.qml
+ToolBar 1.0 ToolBar.qml
+ToolButton 1.0 ToolButton.qml
diff --git a/styles/neptune/style.conf b/styles/NeptuneStyle/style.conf
index 88283ef2..88283ef2 100644
--- a/styles/neptune/style.conf
+++ b/styles/NeptuneStyle/style.conf
diff --git a/styles/neptune/images/colorSelector/#087559.png b/styles/neptune/images/colorSelector/#087559.png
deleted file mode 100644
index a162669e..00000000
--- a/styles/neptune/images/colorSelector/#087559.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b2b2845d2df523b2bb92b32e62719ef598c616e94b4109f3376064e2b68a617b
-size 257
diff --git a/styles/neptune/images/colorSelector/#417eb6.png b/styles/neptune/images/colorSelector/#417eb6.png
deleted file mode 100644
index 055d1b84..00000000
--- a/styles/neptune/images/colorSelector/#417eb6.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1f853cab7785eb257c9c27487c03d8036d7ea52a4b7dec656070fb7e7943d51
-size 257
diff --git a/styles/neptune/images/colorSelector/#4c878b.png b/styles/neptune/images/colorSelector/#4c878b.png
deleted file mode 100644
index ec5cecac..00000000
--- a/styles/neptune/images/colorSelector/#4c878b.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78ae36465a08af2da7cd60d44f30ffda00a6c5a0cc98e53e6775c7d189a7288e
-size 257
diff --git a/styles/neptune/images/colorSelector/#4f4c4a.png b/styles/neptune/images/colorSelector/#4f4c4a.png
deleted file mode 100644
index 03ef8162..00000000
--- a/styles/neptune/images/colorSelector/#4f4c4a.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f577d358ad8313348c3de119fc8227d2a3f86acf20091bd53f9fa1b05c1912a
-size 257
diff --git a/styles/neptune/images/colorSelector/#51a7f4.png b/styles/neptune/images/colorSelector/#51a7f4.png
deleted file mode 100644
index 766d3a77..00000000
--- a/styles/neptune/images/colorSelector/#51a7f4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbb1f7335b488867dad05bf7ebe65738254d05c1c20581fc79cafaee047a75ff
-size 257
diff --git a/styles/neptune/images/colorSelector/#535258.png b/styles/neptune/images/colorSelector/#535258.png
deleted file mode 100644
index 338c6700..00000000
--- a/styles/neptune/images/colorSelector/#535258.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8f4460625f2e473f58f2f70509c2478318652b5ee5b58692290b5a40a176b2d
-size 257
diff --git a/styles/neptune/images/colorSelector/#698563.png b/styles/neptune/images/colorSelector/#698563.png
deleted file mode 100644
index bc9e9536..00000000
--- a/styles/neptune/images/colorSelector/#698563.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:714b46f826ca46fe894192e67cbc94ea953c2cf421aca34b8d64150e91b2d8f0
-size 257
diff --git a/styles/neptune/images/colorSelector/#78887b.png b/styles/neptune/images/colorSelector/#78887b.png
deleted file mode 100644
index fa9e13cf..00000000
--- a/styles/neptune/images/colorSelector/#78887b.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1de8160b624bb282f65c023c22ec5e5be7c486d37acae4b2a37efc3fcbc83a4d
-size 257
diff --git a/styles/neptune/images/colorSelector/#7ba2a5.png b/styles/neptune/images/colorSelector/#7ba2a5.png
deleted file mode 100644
index a35edff0..00000000
--- a/styles/neptune/images/colorSelector/#7ba2a5.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9a9c77660e1420b6bb7f7eb3e18c9c58aada5802cf0e91f651933ddcd8bb018
-size 257
diff --git a/styles/neptune/images/colorSelector/#916755.png b/styles/neptune/images/colorSelector/#916755.png
deleted file mode 100644
index d0445cfd..00000000
--- a/styles/neptune/images/colorSelector/#916755.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46cc000a9702709887891e8dc4bf36d3f5656d7129858e29cc0fa5e61c98ec79
-size 257
diff --git a/styles/neptune/images/colorSelector/#977b35.png b/styles/neptune/images/colorSelector/#977b35.png
deleted file mode 100644
index 53dd3955..00000000
--- a/styles/neptune/images/colorSelector/#977b35.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d1c4e82c69d82ab7c1280cd2745d8b95d87192102d129d0e2038ba94f4f05cb
-size 257
diff --git a/styles/neptune/images/colorSelector/#9eae83.png b/styles/neptune/images/colorSelector/#9eae83.png
deleted file mode 100644
index 1ebe4288..00000000
--- a/styles/neptune/images/colorSelector/#9eae83.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a56f5ff39d4560c4cc9554faedd395ed04603752aeb9f5806a25b2ba7b31ae01
-size 257
diff --git a/styles/neptune/images/colorSelector/#b75034.png b/styles/neptune/images/colorSelector/#b75034.png
deleted file mode 100644
index 0e7033e3..00000000
--- a/styles/neptune/images/colorSelector/#b75034.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93f93260d8b4247910c43c1fa5f22dbeb5097d8c1d55927c99be54e856861a27
-size 257
diff --git a/styles/neptune/images/colorSelector/#d35756.png b/styles/neptune/images/colorSelector/#d35756.png
deleted file mode 100644
index 1b975cc7..00000000
--- a/styles/neptune/images/colorSelector/#d35756.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a295f43cf45825668316420df405889ccc11e82d899668929168c20682d3fb4
-size 257
diff --git a/styles/neptune/images/colorSelector/#db3b9f.png b/styles/neptune/images/colorSelector/#db3b9f.png
deleted file mode 100644
index deb90d1a..00000000
--- a/styles/neptune/images/colorSelector/#db3b9f.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22a777d0160ac99fa023b0d6df32b9ea05ea7db41205a914f48262e1b10d4ba8
-size 257
diff --git a/styles/neptune/images/colorSelector/#fba054.png b/styles/neptune/images/colorSelector/#fba054.png
deleted file mode 100644
index f983197d..00000000
--- a/styles/neptune/images/colorSelector/#fba054.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c90e840bb1c129f8a8990e3523a4ff680ec8100bfac6bf3e50d77ac2e1f7a4f
-size 257
diff --git a/styles/neptune/images/colorSelector/color-wheel-dark.png b/styles/neptune/images/colorSelector/color-wheel-dark.png
deleted file mode 100644
index 2cf92998..00000000
--- a/styles/neptune/images/colorSelector/color-wheel-dark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf54abd7224bbca7061a2cfe83a467e6ea88766f42a0eaab016f8d2fc002b0b3
-size 258
diff --git a/styles/neptune/images/colorSelector/color-wheel.png b/styles/neptune/images/colorSelector/color-wheel.png
deleted file mode 100644
index 5838acc8..00000000
--- a/styles/neptune/images/colorSelector/color-wheel.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f77a9fb5275e2c7d7a35e4584cca714f458d34b42f1177d09685fea5ff13b35f
-size 258