314 files changed, 821 insertions, 19 deletions

diff --git a/am-config.yaml b/am-config.yaml
index d8020400..0fee0f10 100644
--- a/am-config.yaml
+++ b/am-config.yaml
@@ -14,12 +14,12 @@ applications:
 
 runtimes:
   qml:
-    importPaths: [ "${CONFIG_PWD}/imports" ]
+    importPaths: [ "${CONFIG_PWD}/imports_shared" ]
     environmentVariables:
        QT_PLUGIN_PATH: ${CONFIG_PWD}
        SERVER_CONF_PATH: ${CONFIG_PWD}/server.conf
   native:
-    importPaths: [ "${CONFIG_PWD}/imports" ]
+    importPaths: [ "${CONFIG_PWD}/imports_shared" ]
     environmentVariables:
       QT_PLUGIN_PATH: ${CONFIG_PWD}
       SERVER_CONF_PATH: ${CONFIG_PWD}/server.conf
@@ -30,10 +30,10 @@ ui:
   fullscreen: no
   style: "${CONFIG_PWD}/styles/neptune"
   iconThemeName: "neptune"
-  iconThemeSearchPaths: [ "${CONFIG_PWD}/imports/assets/icons" ]
+  iconThemeSearchPaths: [ "${CONFIG_PWD}/imports_shared/assets/icons" ]
   mainQml: "${CONFIG_PWD}/Main.qml"
-  importPaths: [ "${CONFIG_PWD}/imports", "${CONFIG_PWD}/sysui" ]
-  windowIcon: "${CONFIG_PWD}/imports/assets/icons/neptune/sysui/ic-menu-home.png"
+  importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/imports_system", "${CONFIG_PWD}/sysui" ]
+  windowIcon: "${CONFIG_PWD}/imports_shared/assets/icons/neptune/sysui/ic-menu-home.png"
 
 systemProperties:
     public:
diff --git a/copydata.pro b/copydata.pro
index 237417c7..f3976ed9 100644
--- a/copydata.pro
+++ b/copydata.pro
@@ -3,7 +3,7 @@ TEMPLATE = aux
 # On a debug_and_release configuration, do the copying in the meta Makefile, not in the respective debug and release Makefiles
 if(!debug_and_release | !build_pass) {
     # Copy all QML files during the build time
-    DIRECTORIES = apps dev/apps imports sysui styles
+    DIRECTORIES = apps dev/apps imports_shared imports_system sysui styles
     FILES = am-config.yaml Main.qml server.conf
 
     for (d , DIRECTORIES) {
diff --git a/imports/application/windows/ApplicationCCWindow.qml b/imports_shared/application/windows/ApplicationCCWindow.qml
index 17ca08d1..17ca08d1 100644
--- a/imports/application/windows/ApplicationCCWindow.qml
+++ b/imports_shared/application/windows/ApplicationCCWindow.qml
diff --git a/imports/application/windows/ApplicationICWindow.qml b/imports_shared/application/windows/ApplicationICWindow.qml
index ef40cf54..ef40cf54 100644
--- a/imports/application/windows/ApplicationICWindow.qml
+++ b/imports_shared/application/windows/ApplicationICWindow.qml
diff --git a/imports/application/windows/NeptuneWindow.qml b/imports_shared/application/windows/NeptuneWindow.qml
index 4ab99d89..4ab99d89 100644
--- a/imports/application/windows/NeptuneWindow.qml
+++ b/imports_shared/application/windows/NeptuneWindow.qml
diff --git a/imports/application/windows/PopupWindow.qml b/imports_shared/application/windows/PopupWindow.qml
index ef3ace56..ef3ace56 100644
--- a/imports/application/windows/PopupWindow.qml
+++ b/imports_shared/application/windows/PopupWindow.qml
diff --git a/imports/application/windows/qmldir b/imports_shared/application/windows/qmldir
index f4330b4b..f4330b4b 100644
--- a/imports/application/windows/qmldir
+++ b/imports_shared/application/windows/qmldir
diff --git a/imports/assets/fonts/LICENSE.txt b/imports_shared/assets/fonts/LICENSE.txt
index d6456956..d6456956 100644
--- a/imports/assets/fonts/LICENSE.txt
+++ b/imports_shared/assets/fonts/LICENSE.txt
diff --git a/imports/assets/fonts/OpenSans-Bold.ttf b/imports_shared/assets/fonts/OpenSans-Bold.ttf
index f29ca129..f29ca129 100644
--- a/imports/assets/fonts/OpenSans-Bold.ttf
+++ b/imports_shared/assets/fonts/OpenSans-Bold.ttf
diff --git a/imports/assets/fonts/OpenSans-BoldItalic.ttf b/imports_shared/assets/fonts/OpenSans-BoldItalic.ttf
index 2ba527c9..2ba527c9 100644
--- a/imports/assets/fonts/OpenSans-BoldItalic.ttf
+++ b/imports_shared/assets/fonts/OpenSans-BoldItalic.ttf
diff --git a/imports/assets/fonts/OpenSans-ExtraBold.ttf b/imports_shared/assets/fonts/OpenSans-ExtraBold.ttf
index a3e7e2da..a3e7e2da 100644
--- a/imports/assets/fonts/OpenSans-ExtraBold.ttf
+++ b/imports_shared/assets/fonts/OpenSans-ExtraBold.ttf
diff --git a/imports/assets/fonts/OpenSans-ExtraBoldItalic.ttf b/imports_shared/assets/fonts/OpenSans-ExtraBoldItalic.ttf
index ed0c9553..ed0c9553 100644
--- a/imports/assets/fonts/OpenSans-ExtraBoldItalic.ttf
+++ b/imports_shared/assets/fonts/OpenSans-ExtraBoldItalic.ttf
diff --git a/imports/assets/fonts/OpenSans-Italic.ttf b/imports_shared/assets/fonts/OpenSans-Italic.ttf
index 1ea7e897..1ea7e897 100644
--- a/imports/assets/fonts/OpenSans-Italic.ttf
+++ b/imports_shared/assets/fonts/OpenSans-Italic.ttf
diff --git a/imports/assets/fonts/OpenSans-Light.ttf b/imports_shared/assets/fonts/OpenSans-Light.ttf
index d8a4f461..d8a4f461 100644
--- a/imports/assets/fonts/OpenSans-Light.ttf
+++ b/imports_shared/assets/fonts/OpenSans-Light.ttf
diff --git a/imports/assets/fonts/OpenSans-LightItalic.ttf b/imports_shared/assets/fonts/OpenSans-LightItalic.ttf
index 59dbe189..59dbe189 100644
--- a/imports/assets/fonts/OpenSans-LightItalic.ttf
+++ b/imports_shared/assets/fonts/OpenSans-LightItalic.ttf
diff --git a/imports/assets/fonts/OpenSans-Regular.ttf b/imports_shared/assets/fonts/OpenSans-Regular.ttf
index e210b6b1..e210b6b1 100644
--- a/imports/assets/fonts/OpenSans-Regular.ttf
+++ b/imports_shared/assets/fonts/OpenSans-Regular.ttf
diff --git a/imports/assets/fonts/OpenSans-SemiBold.ttf b/imports_shared/assets/fonts/OpenSans-SemiBold.ttf
index 7f2753ed..7f2753ed 100644
--- a/imports/assets/fonts/OpenSans-SemiBold.ttf
+++ b/imports_shared/assets/fonts/OpenSans-SemiBold.ttf
diff --git a/imports/assets/fonts/OpenSans-SemiBoldItalic.ttf b/imports_shared/assets/fonts/OpenSans-SemiBoldItalic.ttf
index dad16326..dad16326 100644
--- a/imports/assets/fonts/OpenSans-SemiBoldItalic.ttf
+++ b/imports_shared/assets/fonts/OpenSans-SemiBoldItalic.ttf
diff --git a/imports/assets/gfx/air-flow-bottom-active-dark.png b/imports_shared/assets/gfx/air-flow-bottom-active-dark.png
index 3578437c..3578437c 100644
--- a/imports/assets/gfx/air-flow-bottom-active-dark.png
+++ b/imports_shared/assets/gfx/air-flow-bottom-active-dark.png
diff --git a/imports/assets/gfx/air-flow-bottom-active.png b/imports_shared/assets/gfx/air-flow-bottom-active.png
index 3578437c..3578437c 100644
--- a/imports/assets/gfx/air-flow-bottom-active.png
+++ b/imports_shared/assets/gfx/air-flow-bottom-active.png
diff --git a/imports/assets/gfx/air-flow-bottom-dark.png b/imports_shared/assets/gfx/air-flow-bottom-dark.png
index 89410a76..89410a76 100644
--- a/imports/assets/gfx/air-flow-bottom-dark.png
+++ b/imports_shared/assets/gfx/air-flow-bottom-dark.png
diff --git a/imports/assets/gfx/air-flow-bottom.png b/imports_shared/assets/gfx/air-flow-bottom.png
index ad429f0d..ad429f0d 100644
--- a/imports/assets/gfx/air-flow-bottom.png
+++ b/imports_shared/assets/gfx/air-flow-bottom.png
diff --git a/imports/assets/gfx/air-flow-middle-active-dark.png b/imports_shared/assets/gfx/air-flow-middle-active-dark.png
index b1ed795a..b1ed795a 100644
--- a/imports/assets/gfx/air-flow-middle-active-dark.png
+++ b/imports_shared/assets/gfx/air-flow-middle-active-dark.png
diff --git a/imports/assets/gfx/air-flow-middle-active.png b/imports_shared/assets/gfx/air-flow-middle-active.png
index b1ed795a..b1ed795a 100644
--- a/imports/assets/gfx/air-flow-middle-active.png
+++ b/imports_shared/assets/gfx/air-flow-middle-active.png
diff --git a/imports/assets/gfx/air-flow-middle-dark.png b/imports_shared/assets/gfx/air-flow-middle-dark.png
index 1195b399..1195b399 100644
--- a/imports/assets/gfx/air-flow-middle-dark.png
+++ b/imports_shared/assets/gfx/air-flow-middle-dark.png
diff --git a/imports/assets/gfx/air-flow-middle.png b/imports_shared/assets/gfx/air-flow-middle.png
index 09796b64..09796b64 100644
--- a/imports/assets/gfx/air-flow-middle.png
+++ b/imports_shared/assets/gfx/air-flow-middle.png
diff --git a/imports/assets/gfx/air-flow-top-active-dark.png b/imports_shared/assets/gfx/air-flow-top-active-dark.png
index 861a8630..861a8630 100644
--- a/imports/assets/gfx/air-flow-top-active-dark.png
+++ b/imports_shared/assets/gfx/air-flow-top-active-dark.png
diff --git a/imports/assets/gfx/air-flow-top-active.png b/imports_shared/assets/gfx/air-flow-top-active.png
index 861a8630..861a8630 100644
--- a/imports/assets/gfx/air-flow-top-active.png
+++ b/imports_shared/assets/gfx/air-flow-top-active.png
diff --git a/imports/assets/gfx/air-flow-top-dark.png b/imports_shared/assets/gfx/air-flow-top-dark.png
index a5bef2f2..a5bef2f2 100644
--- a/imports/assets/gfx/air-flow-top-dark.png
+++ b/imports_shared/assets/gfx/air-flow-top-dark.png
diff --git a/imports/assets/gfx/air-flow-top.png b/imports_shared/assets/gfx/air-flow-top.png
index 6580c258..6580c258 100644
--- a/imports/assets/gfx/air-flow-top.png
+++ b/imports_shared/assets/gfx/air-flow-top.png
diff --git a/imports/assets/gfx/album-art-placeholder.png b/imports_shared/assets/gfx/album-art-placeholder.png
index 77b6c874..77b6c874 100644
--- a/imports/assets/gfx/album-art-placeholder.png
+++ b/imports_shared/assets/gfx/album-art-placeholder.png
diff --git a/imports/assets/gfx/album-art-shadow-widget.png b/imports_shared/assets/gfx/album-art-shadow-widget.png
index c365a642..c365a642 100644
--- a/imports/assets/gfx/album-art-shadow-widget.png
+++ b/imports_shared/assets/gfx/album-art-shadow-widget.png
diff --git a/imports/assets/gfx/album-art-shadow.png b/imports_shared/assets/gfx/album-art-shadow.png
index e7ba6682..e7ba6682 100644
--- a/imports/assets/gfx/album-art-shadow.png
+++ b/imports_shared/assets/gfx/album-art-shadow.png
diff --git a/imports/assets/gfx/app-fullscreen-top-bg-dark.png b/imports_shared/assets/gfx/app-fullscreen-top-bg-dark.png
index 9fe3f124..9fe3f124 100644
--- a/imports/assets/gfx/app-fullscreen-top-bg-dark.png
+++ b/imports_shared/assets/gfx/app-fullscreen-top-bg-dark.png
diff --git a/imports/assets/gfx/app-fullscreen-top-bg.png b/imports_shared/assets/gfx/app-fullscreen-top-bg.png
index 9fe3f124..9fe3f124 100644
--- a/imports/assets/gfx/app-fullscreen-top-bg.png
+++ b/imports_shared/assets/gfx/app-fullscreen-top-bg.png
diff --git a/imports/assets/gfx/bg-home-dark.png b/imports_shared/assets/gfx/bg-home-dark.png
index 10ed8c10..10ed8c10 100644
--- a/imports/assets/gfx/bg-home-dark.png
+++ b/imports_shared/assets/gfx/bg-home-dark.png
diff --git a/imports/assets/gfx/bg-home.png b/imports_shared/assets/gfx/bg-home.png
index 98e38db2..98e38db2 100644
--- a/imports/assets/gfx/bg-home.png
+++ b/imports_shared/assets/gfx/bg-home.png
diff --git a/imports/assets/gfx/divider-dark.png b/imports_shared/assets/gfx/divider-dark.png
index b4ff3ba0..b4ff3ba0 100644
--- a/imports/assets/gfx/divider-dark.png
+++ b/imports_shared/assets/gfx/divider-dark.png
diff --git a/imports/assets/gfx/divider.png b/imports_shared/assets/gfx/divider.png
index c944b8a4..c944b8a4 100644
--- a/imports/assets/gfx/divider.png
+++ b/imports_shared/assets/gfx/divider.png
diff --git a/imports/assets/gfx/fan-speed-0-dark.png b/imports_shared/assets/gfx/fan-speed-0-dark.png
index e5752735..e5752735 100644
--- a/imports/assets/gfx/fan-speed-0-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-0-dark.png
diff --git a/imports/assets/gfx/fan-speed-0.png b/imports_shared/assets/gfx/fan-speed-0.png
index 2a85e831..2a85e831 100644
--- a/imports/assets/gfx/fan-speed-0.png
+++ b/imports_shared/assets/gfx/fan-speed-0.png
diff --git a/imports/assets/gfx/fan-speed-1-dark.png b/imports_shared/assets/gfx/fan-speed-1-dark.png
index 15004e1c..15004e1c 100644
--- a/imports/assets/gfx/fan-speed-1-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-1-dark.png
diff --git a/imports/assets/gfx/fan-speed-1.png b/imports_shared/assets/gfx/fan-speed-1.png
index 9c066a17..9c066a17 100644
--- a/imports/assets/gfx/fan-speed-1.png
+++ b/imports_shared/assets/gfx/fan-speed-1.png
diff --git a/imports/assets/gfx/fan-speed-2-dark.png b/imports_shared/assets/gfx/fan-speed-2-dark.png
index 8abeb8be..8abeb8be 100644
--- a/imports/assets/gfx/fan-speed-2-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-2-dark.png
diff --git a/imports/assets/gfx/fan-speed-2.png b/imports_shared/assets/gfx/fan-speed-2.png
index fe685d4f..fe685d4f 100644
--- a/imports/assets/gfx/fan-speed-2.png
+++ b/imports_shared/assets/gfx/fan-speed-2.png
diff --git a/imports/assets/gfx/fan-speed-3-dark.png b/imports_shared/assets/gfx/fan-speed-3-dark.png
index 55c57cd5..55c57cd5 100644
--- a/imports/assets/gfx/fan-speed-3-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-3-dark.png
diff --git a/imports/assets/gfx/fan-speed-3.png b/imports_shared/assets/gfx/fan-speed-3.png
index e6beef27..e6beef27 100644
--- a/imports/assets/gfx/fan-speed-3.png
+++ b/imports_shared/assets/gfx/fan-speed-3.png
diff --git a/imports/assets/gfx/fan-speed-4-dark.png b/imports_shared/assets/gfx/fan-speed-4-dark.png
index a039d2be..a039d2be 100644
--- a/imports/assets/gfx/fan-speed-4-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-4-dark.png
diff --git a/imports/assets/gfx/fan-speed-4.png b/imports_shared/assets/gfx/fan-speed-4.png
index 46d401ca..46d401ca 100644
--- a/imports/assets/gfx/fan-speed-4.png
+++ b/imports_shared/assets/gfx/fan-speed-4.png
diff --git a/imports/assets/gfx/fan-speed-5-dark.png b/imports_shared/assets/gfx/fan-speed-5-dark.png
index afa811a1..afa811a1 100644
--- a/imports/assets/gfx/fan-speed-5-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-5-dark.png
diff --git a/imports/assets/gfx/fan-speed-5.png b/imports_shared/assets/gfx/fan-speed-5.png
index d199e72c..d199e72c 100644
--- a/imports/assets/gfx/fan-speed-5.png
+++ b/imports_shared/assets/gfx/fan-speed-5.png
diff --git a/imports/assets/gfx/fan-speed-6-dark.png b/imports_shared/assets/gfx/fan-speed-6-dark.png
index 695cb9d3..695cb9d3 100644
--- a/imports/assets/gfx/fan-speed-6-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-6-dark.png
diff --git a/imports/assets/gfx/fan-speed-6.png b/imports_shared/assets/gfx/fan-speed-6.png
index 55ad7da8..55ad7da8 100644
--- a/imports/assets/gfx/fan-speed-6.png
+++ b/imports_shared/assets/gfx/fan-speed-6.png
diff --git a/imports/assets/gfx/fan-speed-7-dark.png b/imports_shared/assets/gfx/fan-speed-7-dark.png
index 1416fedf..1416fedf 100644
--- a/imports/assets/gfx/fan-speed-7-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-7-dark.png
diff --git a/imports/assets/gfx/fan-speed-7.png b/imports_shared/assets/gfx/fan-speed-7.png
index 1416fedf..1416fedf 100644
--- a/imports/assets/gfx/fan-speed-7.png
+++ b/imports_shared/assets/gfx/fan-speed-7.png
diff --git a/imports/assets/gfx/fan-speed-8-dark.png b/imports_shared/assets/gfx/fan-speed-8-dark.png
index 45e7e3fa..45e7e3fa 100644
--- a/imports/assets/gfx/fan-speed-8-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-8-dark.png
diff --git a/imports/assets/gfx/fan-speed-8.png b/imports_shared/assets/gfx/fan-speed-8.png
index 45e7e3fa..45e7e3fa 100644
--- a/imports/assets/gfx/fan-speed-8.png
+++ b/imports_shared/assets/gfx/fan-speed-8.png
diff --git a/imports/assets/gfx/fan-speed-background-dark.png b/imports_shared/assets/gfx/fan-speed-background-dark.png
index 079ce370..079ce370 100644
--- a/imports/assets/gfx/fan-speed-background-dark.png
+++ b/imports_shared/assets/gfx/fan-speed-background-dark.png
diff --git a/imports/assets/gfx/fan-speed-background.png b/imports_shared/assets/gfx/fan-speed-background.png
index 2a85e831..2a85e831 100644
--- a/imports/assets/gfx/fan-speed-background.png
+++ b/imports_shared/assets/gfx/fan-speed-background.png
diff --git a/imports/assets/gfx/floating-panel-top-bg.png b/imports_shared/assets/gfx/floating-panel-top-bg.png
index aa06e90e..aa06e90e 100644
--- a/imports/assets/gfx/floating-panel-top-bg.png
+++ b/imports_shared/assets/gfx/floating-panel-top-bg.png
diff --git a/imports/assets/gfx/here-about.txt b/imports_shared/assets/gfx/here-about.txt
index a0167ecd..a0167ecd 100644
--- a/imports/assets/gfx/here-about.txt
+++ b/imports_shared/assets/gfx/here-about.txt
diff --git a/imports/assets/gfx/hero-appstore.png b/imports_shared/assets/gfx/hero-appstore.png
index 59ed56ec..59ed56ec 100644
--- a/imports/assets/gfx/hero-appstore.png
+++ b/imports_shared/assets/gfx/hero-appstore.png
diff --git a/imports/assets/gfx/hero-appstore.txt b/imports_shared/assets/gfx/hero-appstore.txt
index a0167ecd..a0167ecd 100644
--- a/imports/assets/gfx/hero-appstore.txt
+++ b/imports_shared/assets/gfx/hero-appstore.txt
diff --git a/imports/assets/gfx/home-widget-bg.png b/imports_shared/assets/gfx/home-widget-bg.png
index d5361540..d5361540 100644
--- a/imports/assets/gfx/home-widget-bg.png
+++ b/imports_shared/assets/gfx/home-widget-bg.png
diff --git a/imports/assets/gfx/input-overlay.png b/imports_shared/assets/gfx/input-overlay.png
index bbc1d17c..bbc1d17c 100644
--- a/imports/assets/gfx/input-overlay.png
+++ b/imports_shared/assets/gfx/input-overlay.png
diff --git a/imports/assets/gfx/instrument-cluster-bg-dark.png b/imports_shared/assets/gfx/instrument-cluster-bg-dark.png
index 455e3f19..455e3f19 100644
--- a/imports/assets/gfx/instrument-cluster-bg-dark.png
+++ b/imports_shared/assets/gfx/instrument-cluster-bg-dark.png
diff --git a/imports/assets/gfx/instrument-cluster-bg.png b/imports_shared/assets/gfx/instrument-cluster-bg.png
index 8cd4c905..8cd4c905 100644
--- a/imports/assets/gfx/instrument-cluster-bg.png
+++ b/imports_shared/assets/gfx/instrument-cluster-bg.png
diff --git a/imports/assets/gfx/list-divider-dark.png b/imports_shared/assets/gfx/list-divider-dark.png
index 78ae5372..78ae5372 100644
--- a/imports/assets/gfx/list-divider-dark.png
+++ b/imports_shared/assets/gfx/list-divider-dark.png
diff --git a/imports/assets/gfx/list-divider.png b/imports_shared/assets/gfx/list-divider.png
index 1db5ec08..1db5ec08 100644
--- a/imports/assets/gfx/list-divider.png
+++ b/imports_shared/assets/gfx/list-divider.png
diff --git a/imports/assets/gfx/logo-kdab.png b/imports_shared/assets/gfx/logo-kdab.png
index 10cfd84e..10cfd84e 100644
--- a/imports/assets/gfx/logo-kdab.png
+++ b/imports_shared/assets/gfx/logo-kdab.png
diff --git a/imports/assets/gfx/logo-luxoft.png b/imports_shared/assets/gfx/logo-luxoft.png
index 4bfa4289..4bfa4289 100644
--- a/imports/assets/gfx/logo-luxoft.png
+++ b/imports_shared/assets/gfx/logo-luxoft.png
diff --git a/imports/assets/gfx/logo-theqtcompany.png b/imports_shared/assets/gfx/logo-theqtcompany.png
index dd844267..dd844267 100644
--- a/imports/assets/gfx/logo-theqtcompany.png
+++ b/imports_shared/assets/gfx/logo-theqtcompany.png
diff --git a/imports/assets/gfx/panel-inner-shadow-dark.png b/imports_shared/assets/gfx/panel-inner-shadow-dark.png
index 5533d7eb..5533d7eb 100644
--- a/imports/assets/gfx/panel-inner-shadow-dark.png
+++ b/imports_shared/assets/gfx/panel-inner-shadow-dark.png
diff --git a/imports/assets/gfx/panel-inner-shadow.png b/imports_shared/assets/gfx/panel-inner-shadow.png
index a52e197b..a52e197b 100644
--- a/imports/assets/gfx/panel-inner-shadow.png
+++ b/imports_shared/assets/gfx/panel-inner-shadow.png
diff --git a/imports/assets/gfx/popup-background-9patch-dark.png b/imports_shared/assets/gfx/popup-background-9patch-dark.png
index e930a17b..e930a17b 100644
--- a/imports/assets/gfx/popup-background-9patch-dark.png
+++ b/imports_shared/assets/gfx/popup-background-9patch-dark.png
diff --git a/imports/assets/gfx/popup-background-9patch.png b/imports_shared/assets/gfx/popup-background-9patch.png
index e5239de5..e5239de5 100644
--- a/imports/assets/gfx/popup-background-9patch.png
+++ b/imports_shared/assets/gfx/popup-background-9patch.png
diff --git a/imports/assets/gfx/popup-close-button-bg-dark.png b/imports_shared/assets/gfx/popup-close-button-bg-dark.png
index f3782193..f3782193 100644
--- a/imports/assets/gfx/popup-close-button-bg-dark.png
+++ b/imports_shared/assets/gfx/popup-close-button-bg-dark.png
diff --git a/imports/assets/gfx/popup-close-button-bg.png b/imports_shared/assets/gfx/popup-close-button-bg.png
index 571d7336..571d7336 100644
--- a/imports/assets/gfx/popup-close-button-bg.png
+++ b/imports_shared/assets/gfx/popup-close-button-bg.png
diff --git a/imports/assets/gfx/popup-title-shadow.png b/imports_shared/assets/gfx/popup-title-shadow.png
index b75e399a..b75e399a 100644
--- a/imports/assets/gfx/popup-title-shadow.png
+++ b/imports_shared/assets/gfx/popup-title-shadow.png
diff --git a/imports/assets/gfx/seat-dark.png b/imports_shared/assets/gfx/seat-dark.png
index 68306863..68306863 100644
--- a/imports/assets/gfx/seat-dark.png
+++ b/imports_shared/assets/gfx/seat-dark.png
diff --git a/imports/assets/gfx/seat.png b/imports_shared/assets/gfx/seat.png
index 6bc6cbff..6bc6cbff 100644
--- a/imports/assets/gfx/seat.png
+++ b/imports_shared/assets/gfx/seat.png
diff --git a/imports/assets/gfx/slider-handle-horizontal-dark.png b/imports_shared/assets/gfx/slider-handle-horizontal-dark.png
index 07215da8..07215da8 100644
--- a/imports/assets/gfx/slider-handle-horizontal-dark.png
+++ b/imports_shared/assets/gfx/slider-handle-horizontal-dark.png
diff --git a/imports/assets/gfx/slider-handle-horizontal.png b/imports_shared/assets/gfx/slider-handle-horizontal.png
index b11c62a8..b11c62a8 100644
--- a/imports/assets/gfx/slider-handle-horizontal.png
+++ b/imports_shared/assets/gfx/slider-handle-horizontal.png
diff --git a/imports/assets/gfx/slider-handle-vertical-dark.png b/imports_shared/assets/gfx/slider-handle-vertical-dark.png
index 7bc964cd..7bc964cd 100644
--- a/imports/assets/gfx/slider-handle-vertical-dark.png
+++ b/imports_shared/assets/gfx/slider-handle-vertical-dark.png
diff --git a/imports/assets/gfx/slider-handle-vertical.png b/imports_shared/assets/gfx/slider-handle-vertical.png
index 2974afba..2974afba 100644
--- a/imports/assets/gfx/slider-handle-vertical.png
+++ b/imports_shared/assets/gfx/slider-handle-vertical.png
diff --git a/imports/assets/gfx/tabbar-bg-left-dark.png b/imports_shared/assets/gfx/tabbar-bg-left-dark.png
index baa75f07..baa75f07 100644
--- a/imports/assets/gfx/tabbar-bg-left-dark.png
+++ b/imports_shared/assets/gfx/tabbar-bg-left-dark.png
diff --git a/imports/assets/gfx/tabbar-bg-left.png b/imports_shared/assets/gfx/tabbar-bg-left.png
index ddc91d26..ddc91d26 100644
--- a/imports/assets/gfx/tabbar-bg-left.png
+++ b/imports_shared/assets/gfx/tabbar-bg-left.png
diff --git a/imports/assets/gfx/tabbar-bg-middle-dark.png b/imports_shared/assets/gfx/tabbar-bg-middle-dark.png
index aad5677f..aad5677f 100644
--- a/imports/assets/gfx/tabbar-bg-middle-dark.png
+++ b/imports_shared/assets/gfx/tabbar-bg-middle-dark.png
diff --git a/imports/assets/gfx/tabbar-bg-middle.png b/imports_shared/assets/gfx/tabbar-bg-middle.png
index 84b2a6fb..84b2a6fb 100644
--- a/imports/assets/gfx/tabbar-bg-middle.png
+++ b/imports_shared/assets/gfx/tabbar-bg-middle.png
diff --git a/imports/assets/gfx/tabbar-bg-right-dark.png b/imports_shared/assets/gfx/tabbar-bg-right-dark.png
index 7e54bea8..7e54bea8 100644
--- a/imports/assets/gfx/tabbar-bg-right-dark.png
+++ b/imports_shared/assets/gfx/tabbar-bg-right-dark.png
diff --git a/imports/assets/gfx/tabbar-bg-right.png b/imports_shared/assets/gfx/tabbar-bg-right.png
index d9332858..d9332858 100644
--- a/imports/assets/gfx/tabbar-bg-right.png
+++ b/imports_shared/assets/gfx/tabbar-bg-right.png
diff --git a/imports/assets/gfx/temperature-slider-bg.png b/imports_shared/assets/gfx/temperature-slider-bg.png
index 77fc3ca9..77fc3ca9 100644
--- a/imports/assets/gfx/temperature-slider-bg.png
+++ b/imports_shared/assets/gfx/temperature-slider-bg.png
diff --git a/imports/assets/gfx/vertical-slider-handle-dark.png b/imports_shared/assets/gfx/vertical-slider-handle-dark.png
index c13a6135..c13a6135 100644
--- a/imports/assets/gfx/vertical-slider-handle-dark.png
+++ b/imports_shared/assets/gfx/vertical-slider-handle-dark.png
diff --git a/imports/assets/gfx/vertical-slider-handle.png b/imports_shared/assets/gfx/vertical-slider-handle.png
index ab19782b..ab19782b 100644
--- a/imports/assets/gfx/vertical-slider-handle.png
+++ b/imports_shared/assets/gfx/vertical-slider-handle.png
diff --git a/imports/assets/gfx/weather-cloudy.png b/imports_shared/assets/gfx/weather-cloudy.png
index bfb9bbc7..bfb9bbc7 100644
--- a/imports/assets/gfx/weather-cloudy.png
+++ b/imports_shared/assets/gfx/weather-cloudy.png
diff --git a/imports/assets/gfx/widget-bg-2-dark.png b/imports_shared/assets/gfx/widget-bg-2-dark.png
index 9990505a..9990505a 100644
--- a/imports/assets/gfx/widget-bg-2-dark.png
+++ b/imports_shared/assets/gfx/widget-bg-2-dark.png
diff --git a/imports/assets/gfx/widget-bg-2.png b/imports_shared/assets/gfx/widget-bg-2.png
index 060845bf..060845bf 100644
--- a/imports/assets/gfx/widget-bg-2.png
+++ b/imports_shared/assets/gfx/widget-bg-2.png
diff --git a/imports/assets/gfx/widget-bg-dark.png b/imports_shared/assets/gfx/widget-bg-dark.png
index 1835ee72..1835ee72 100644
--- a/imports/assets/gfx/widget-bg-dark.png
+++ b/imports_shared/assets/gfx/widget-bg-dark.png
diff --git a/imports/assets/gfx/widget-bg.png b/imports_shared/assets/gfx/widget-bg.png
index 13e0b1ae..13e0b1ae 100644
--- a/imports/assets/gfx/widget-bg.png
+++ b/imports_shared/assets/gfx/widget-bg.png
diff --git a/imports/assets/gfx/widget-corner-dark.png b/imports_shared/assets/gfx/widget-corner-dark.png
index aace3ab6..aace3ab6 100644
--- a/imports/assets/gfx/widget-corner-dark.png
+++ b/imports_shared/assets/gfx/widget-corner-dark.png
diff --git a/imports/assets/gfx/widget-corner.png b/imports_shared/assets/gfx/widget-corner.png
index 99068874..99068874 100644
--- a/imports/assets/gfx/widget-corner.png
+++ b/imports_shared/assets/gfx/widget-corner.png
diff --git a/imports/assets/gfx/widget-left-section-bg-dark.png b/imports_shared/assets/gfx/widget-left-section-bg-dark.png
index e95928c8..e95928c8 100644
--- a/imports/assets/gfx/widget-left-section-bg-dark.png
+++ b/imports_shared/assets/gfx/widget-left-section-bg-dark.png
diff --git a/imports/assets/gfx/widget-left-section-bg.png b/imports_shared/assets/gfx/widget-left-section-bg.png
index eabb8767..eabb8767 100644
--- a/imports/assets/gfx/widget-left-section-bg.png
+++ b/imports_shared/assets/gfx/widget-left-section-bg.png
diff --git a/imports/assets/gfx/widget-stripe.png b/imports_shared/assets/gfx/widget-stripe.png
index a81387bc..a81387bc 100644
--- a/imports/assets/gfx/widget-stripe.png
+++ b/imports_shared/assets/gfx/widget-stripe.png
diff --git a/imports/assets/gfx/widget-window-mask.png b/imports_shared/assets/gfx/widget-window-mask.png
index f2f506a8..f2f506a8 100644
--- a/imports/assets/gfx/widget-window-mask.png
+++ b/imports_shared/assets/gfx/widget-window-mask.png
diff --git a/imports/assets/icons/ic-app-active-bg.png b/imports_shared/assets/icons/ic-app-active-bg.png
index e9c9f5b6..e9c9f5b6 100644
--- a/imports/assets/icons/ic-app-active-bg.png
+++ b/imports_shared/assets/icons/ic-app-active-bg.png
diff --git a/imports/assets/icons/ic-calculator-dark.png b/imports_shared/assets/icons/ic-calculator-dark.png
index c38d1400..c38d1400 100644
--- a/imports/assets/icons/ic-calculator-dark.png
+++ b/imports_shared/assets/icons/ic-calculator-dark.png
diff --git a/imports/assets/icons/ic-call.png b/imports_shared/assets/icons/ic-call.png
index 0454eaed..0454eaed 100644
--- a/imports/assets/icons/ic-call.png
+++ b/imports_shared/assets/icons/ic-call.png
diff --git a/imports/assets/icons/ic-expand-dark.png b/imports_shared/assets/icons/ic-expand-dark.png
index 19548ae6..19548ae6 100644
--- a/imports/assets/icons/ic-expand-dark.png
+++ b/imports_shared/assets/icons/ic-expand-dark.png
diff --git a/imports/assets/icons/ic-expand-to-fullscreen-dark.png b/imports_shared/assets/icons/ic-expand-to-fullscreen-dark.png
index 81bcc768..81bcc768 100644
--- a/imports/assets/icons/ic-expand-to-fullscreen-dark.png
+++ b/imports_shared/assets/icons/ic-expand-to-fullscreen-dark.png
diff --git a/imports/assets/icons/ic-expand-to-fullscreen.png b/imports_shared/assets/icons/ic-expand-to-fullscreen.png
index 30b610b2..30b610b2 100644
--- a/imports/assets/icons/ic-expand-to-fullscreen.png
+++ b/imports_shared/assets/icons/ic-expand-to-fullscreen.png
diff --git a/imports/assets/icons/ic-expand-up-dark.png b/imports_shared/assets/icons/ic-expand-up-dark.png
index 0346da66..0346da66 100644
--- a/imports/assets/icons/ic-expand-up-dark.png
+++ b/imports_shared/assets/icons/ic-expand-up-dark.png
diff --git a/imports/assets/icons/ic-expand-up.png b/imports_shared/assets/icons/ic-expand-up.png
index 82562f01..82562f01 100644
--- a/imports/assets/icons/ic-expand-up.png
+++ b/imports_shared/assets/icons/ic-expand-up.png
diff --git a/imports/assets/icons/ic-expand.png b/imports_shared/assets/icons/ic-expand.png
index 3f05e117..3f05e117 100644
--- a/imports/assets/icons/ic-expand.png
+++ b/imports_shared/assets/icons/ic-expand.png
diff --git a/imports/assets/icons/ic-favorite-dark.png b/imports_shared/assets/icons/ic-favorite-dark.png
index 93ab4bb6..93ab4bb6 100644
--- a/imports/assets/icons/ic-favorite-dark.png
+++ b/imports_shared/assets/icons/ic-favorite-dark.png
diff --git a/imports/assets/icons/ic-favorite.png b/imports_shared/assets/icons/ic-favorite.png
index 075df9cd..075df9cd 100644
--- a/imports/assets/icons/ic-favorite.png
+++ b/imports_shared/assets/icons/ic-favorite.png
diff --git a/imports/assets/icons/ic-music-dark.png b/imports_shared/assets/icons/ic-music-dark.png
index 8e1302c1..8e1302c1 100644
--- a/imports/assets/icons/ic-music-dark.png
+++ b/imports_shared/assets/icons/ic-music-dark.png
diff --git a/imports/assets/icons/ic-navigation-dark.png b/imports_shared/assets/icons/ic-navigation-dark.png
index 6e48a601..6e48a601 100644
--- a/imports/assets/icons/ic-navigation-dark.png
+++ b/imports_shared/assets/icons/ic-navigation-dark.png
diff --git a/imports/assets/icons/ic-next-level-dark.png b/imports_shared/assets/icons/ic-next-level-dark.png
index 700fb96c..700fb96c 100644
--- a/imports/assets/icons/ic-next-level-dark.png
+++ b/imports_shared/assets/icons/ic-next-level-dark.png
diff --git a/imports/assets/icons/ic-next-level.png b/imports_shared/assets/icons/ic-next-level.png
index 5fc33846..5fc33846 100644
--- a/imports/assets/icons/ic-next-level.png
+++ b/imports_shared/assets/icons/ic-next-level.png
diff --git a/imports/assets/icons/ic-rain-amount.png b/imports_shared/assets/icons/ic-rain-amount.png
index 823d430b..823d430b 100644
--- a/imports/assets/icons/ic-rain-amount.png
+++ b/imports_shared/assets/icons/ic-rain-amount.png
diff --git a/imports/assets/icons/ic-search_OFF-dark.png b/imports_shared/assets/icons/ic-search_OFF-dark.png
index 7d96e114..7d96e114 100644
--- a/imports/assets/icons/ic-search_OFF-dark.png
+++ b/imports_shared/assets/icons/ic-search_OFF-dark.png
diff --git a/imports/assets/icons/ic-search_OFF.png b/imports_shared/assets/icons/ic-search_OFF.png
index 0e2ca5df..0e2ca5df 100644
--- a/imports/assets/icons/ic-search_OFF.png
+++ b/imports_shared/assets/icons/ic-search_OFF.png
diff --git a/imports/assets/icons/ic-search_ON-dark.png b/imports_shared/assets/icons/ic-search_ON-dark.png
index 8e2814bc..8e2814bc 100644
--- a/imports/assets/icons/ic-search_ON-dark.png
+++ b/imports_shared/assets/icons/ic-search_ON-dark.png
diff --git a/imports/assets/icons/ic-search_ON.png b/imports_shared/assets/icons/ic-search_ON.png
index 8e2814bc..8e2814bc 100644
--- a/imports/assets/icons/ic-search_ON.png
+++ b/imports_shared/assets/icons/ic-search_ON.png
diff --git a/imports/assets/icons/ic-statusbar-battery-dark.png b/imports_shared/assets/icons/ic-statusbar-battery-dark.png
index 851d64a2..851d64a2 100644
--- a/imports/assets/icons/ic-statusbar-battery-dark.png
+++ b/imports_shared/assets/icons/ic-statusbar-battery-dark.png
diff --git a/imports/assets/icons/ic-statusbar-battery.png b/imports_shared/assets/icons/ic-statusbar-battery.png
index 59031feb..59031feb 100644
--- a/imports/assets/icons/ic-statusbar-battery.png
+++ b/imports_shared/assets/icons/ic-statusbar-battery.png
diff --git a/imports/assets/icons/ic-statusbar-bluetooth-dark.png b/imports_shared/assets/icons/ic-statusbar-bluetooth-dark.png
index 71a11f3e..71a11f3e 100644
--- a/imports/assets/icons/ic-statusbar-bluetooth-dark.png
+++ b/imports_shared/assets/icons/ic-statusbar-bluetooth-dark.png
diff --git a/imports/assets/icons/ic-statusbar-bluetooth.png b/imports_shared/assets/icons/ic-statusbar-bluetooth.png
index 20ec6a11..20ec6a11 100644
--- a/imports/assets/icons/ic-statusbar-bluetooth.png
+++ b/imports_shared/assets/icons/ic-statusbar-bluetooth.png
diff --git a/imports/assets/icons/ic-statusbar-reception-dark.png b/imports_shared/assets/icons/ic-statusbar-reception-dark.png
index 640223be..640223be 100644
--- a/imports/assets/icons/ic-statusbar-reception-dark.png
+++ b/imports_shared/assets/icons/ic-statusbar-reception-dark.png
diff --git a/imports/assets/icons/ic-statusbar-reception.png b/imports_shared/assets/icons/ic-statusbar-reception.png
index e8b0f2b8..e8b0f2b8 100644
--- a/imports/assets/icons/ic-statusbar-reception.png
+++ b/imports_shared/assets/icons/ic-statusbar-reception.png
diff --git a/imports/assets/icons/ic-statusbar-wifi-dark.png b/imports_shared/assets/icons/ic-statusbar-wifi-dark.png
index 11b6c15b..11b6c15b 100644
--- a/imports/assets/icons/ic-statusbar-wifi-dark.png
+++ b/imports_shared/assets/icons/ic-statusbar-wifi-dark.png
diff --git a/imports/assets/icons/ic-statusbar-wifi.png b/imports_shared/assets/icons/ic-statusbar-wifi.png
index e12dbc98..e12dbc98 100644
--- a/imports/assets/icons/ic-statusbar-wifi.png
+++ b/imports_shared/assets/icons/ic-statusbar-wifi.png
diff --git a/imports/assets/icons/ic-weather-partly-rain-dark.png b/imports_shared/assets/icons/ic-weather-partly-rain-dark.png
index e8ca6be6..e8ca6be6 100644
--- a/imports/assets/icons/ic-weather-partly-rain-dark.png
+++ b/imports_shared/assets/icons/ic-weather-partly-rain-dark.png
diff --git a/imports/assets/icons/ic-weather-partly-rain.png b/imports_shared/assets/icons/ic-weather-partly-rain.png
index 69bb6701..69bb6701 100644
--- a/imports/assets/icons/ic-weather-partly-rain.png
+++ b/imports_shared/assets/icons/ic-weather-partly-rain.png
diff --git a/imports/assets/icons/ic-weather-rain-dark.png b/imports_shared/assets/icons/ic-weather-rain-dark.png
index 82a1dacd..82a1dacd 100644
--- a/imports/assets/icons/ic-weather-rain-dark.png
+++ b/imports_shared/assets/icons/ic-weather-rain-dark.png
diff --git a/imports/assets/icons/ic-weather-rain.png b/imports_shared/assets/icons/ic-weather-rain.png
index c96d9602..c96d9602 100644
--- a/imports/assets/icons/ic-weather-rain.png
+++ b/imports_shared/assets/icons/ic-weather-rain.png
diff --git a/imports/assets/icons/ic-weather-snow-dark.png b/imports_shared/assets/icons/ic-weather-snow-dark.png
index 51512d26..51512d26 100644
--- a/imports/assets/icons/ic-weather-snow-dark.png
+++ b/imports_shared/assets/icons/ic-weather-snow-dark.png
diff --git a/imports/assets/icons/ic-weather-snow.png b/imports_shared/assets/icons/ic-weather-snow.png
index a2ef5405..a2ef5405 100644
--- a/imports/assets/icons/ic-weather-snow.png
+++ b/imports_shared/assets/icons/ic-weather-snow.png
diff --git a/imports/assets/icons/ic-weather-sun-dark.png b/imports_shared/assets/icons/ic-weather-sun-dark.png
index 30acedf1..30acedf1 100644
--- a/imports/assets/icons/ic-weather-sun-dark.png
+++ b/imports_shared/assets/icons/ic-weather-sun-dark.png
diff --git a/imports/assets/icons/ic-weather-sun.png b/imports_shared/assets/icons/ic-weather-sun.png
index 593035ff..593035ff 100644
--- a/imports/assets/icons/ic-weather-sun.png
+++ b/imports_shared/assets/icons/ic-weather-sun.png
diff --git a/imports/assets/icons/ic-widget-close.png b/imports_shared/assets/icons/ic-widget-close.png
index eb18b529..eb18b529 100644
--- a/imports/assets/icons/ic-widget-close.png
+++ b/imports_shared/assets/icons/ic-widget-close.png
diff --git a/imports/assets/icons/ic-widget-move.png b/imports_shared/assets/icons/ic-widget-move.png
index 36a267d9..36a267d9 100644
--- a/imports/assets/icons/ic-widget-move.png
+++ b/imports_shared/assets/icons/ic-widget-move.png
diff --git a/imports/assets/icons/ic-widget-music.png b/imports_shared/assets/icons/ic-widget-music.png
index b2a4958a..b2a4958a 100644
--- a/imports/assets/icons/ic-widget-music.png
+++ b/imports_shared/assets/icons/ic-widget-music.png
diff --git a/imports/assets/icons/ic-widget-navigation.png b/imports_shared/assets/icons/ic-widget-navigation.png
index dca356a3..dca356a3 100644
--- a/imports/assets/icons/ic-widget-navigation.png
+++ b/imports_shared/assets/icons/ic-widget-navigation.png
diff --git a/imports/assets/icons/ic-widget-tuner.png b/imports_shared/assets/icons/ic-widget-tuner.png
index 13dace7b..13dace7b 100644
--- a/imports/assets/icons/ic-widget-tuner.png
+++ b/imports_shared/assets/icons/ic-widget-tuner.png
diff --git a/imports/assets/icons/ic-widget-weather.png b/imports_shared/assets/icons/ic-widget-weather.png
index ffe5c0ec..ffe5c0ec 100644
--- a/imports/assets/icons/ic-widget-weather.png
+++ b/imports_shared/assets/icons/ic-widget-weather.png
diff --git a/imports/assets/icons/ic_button-bg-red.png b/imports_shared/assets/icons/ic_button-bg-red.png
index 0d30973d..0d30973d 100644
--- a/imports/assets/icons/ic_button-bg-red.png
+++ b/imports_shared/assets/icons/ic_button-bg-red.png
diff --git a/imports/assets/icons/ic_button-bg.png b/imports_shared/assets/icons/ic_button-bg.png
index 941fd420..941fd420 100644
--- a/imports/assets/icons/ic_button-bg.png
+++ b/imports_shared/assets/icons/ic_button-bg.png
diff --git a/imports/assets/icons/neptune/calendar/ic-calendar_OFF.png b/imports_shared/assets/icons/neptune/calendar/ic-calendar_OFF.png
index 8a38ae4b..8a38ae4b 100644
--- a/imports/assets/icons/neptune/calendar/ic-calendar_OFF.png
+++ b/imports_shared/assets/icons/neptune/calendar/ic-calendar_OFF.png
diff --git a/imports/assets/icons/neptune/calendar/ic-calendar_ON.png b/imports_shared/assets/icons/neptune/calendar/ic-calendar_ON.png
index 9e8e9082..9e8e9082 100644
--- a/imports/assets/icons/neptune/calendar/ic-calendar_ON.png
+++ b/imports_shared/assets/icons/neptune/calendar/ic-calendar_ON.png
diff --git a/imports/assets/icons/neptune/car/ic-doors_OFF.png b/imports_shared/assets/icons/neptune/car/ic-doors_OFF.png
index 495585c9..495585c9 100644
--- a/imports/assets/icons/neptune/car/ic-doors_OFF.png
+++ b/imports_shared/assets/icons/neptune/car/ic-doors_OFF.png
diff --git a/imports/assets/icons/neptune/car/ic-doors_ON.png b/imports_shared/assets/icons/neptune/car/ic-doors_ON.png
index 6e75cef8..6e75cef8 100644
--- a/imports/assets/icons/neptune/car/ic-doors_ON.png
+++ b/imports_shared/assets/icons/neptune/car/ic-doors_ON.png
diff --git a/imports/assets/icons/neptune/car/ic-driving-support_OFF.png b/imports_shared/assets/icons/neptune/car/ic-driving-support_OFF.png
index db2a180a..db2a180a 100644
--- a/imports/assets/icons/neptune/car/ic-driving-support_OFF.png
+++ b/imports_shared/assets/icons/neptune/car/ic-driving-support_OFF.png
diff --git a/imports/assets/icons/neptune/car/ic-driving-support_ON.png b/imports_shared/assets/icons/neptune/car/ic-driving-support_ON.png
index 0136c1bc..0136c1bc 100644
--- a/imports/assets/icons/neptune/car/ic-driving-support_ON.png
+++ b/imports_shared/assets/icons/neptune/car/ic-driving-support_ON.png
diff --git a/imports/assets/icons/neptune/car/ic-energy_OFF.png b/imports_shared/assets/icons/neptune/car/ic-energy_OFF.png
index dd94ab35..dd94ab35 100644
--- a/imports/assets/icons/neptune/car/ic-energy_OFF.png
+++ b/imports_shared/assets/icons/neptune/car/ic-energy_OFF.png
diff --git a/imports/assets/icons/neptune/car/ic-energy_ON.png b/imports_shared/assets/icons/neptune/car/ic-energy_ON.png
index 763fe875..763fe875 100644
--- a/imports/assets/icons/neptune/car/ic-energy_ON.png
+++ b/imports_shared/assets/icons/neptune/car/ic-energy_ON.png
diff --git a/imports/assets/icons/neptune/car/ic-tires_OFF.png b/imports_shared/assets/icons/neptune/car/ic-tires_OFF.png
index 6f019e44..6f019e44 100644
--- a/imports/assets/icons/neptune/car/ic-tires_OFF.png
+++ b/imports_shared/assets/icons/neptune/car/ic-tires_OFF.png
diff --git a/imports/assets/icons/neptune/car/ic-tires_ON.png b/imports_shared/assets/icons/neptune/car/ic-tires_ON.png
index d975c62c..d975c62c 100644
--- a/imports/assets/icons/neptune/car/ic-tires_ON.png
+++ b/imports_shared/assets/icons/neptune/car/ic-tires_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-front-defrost_OFF.png b/imports_shared/assets/icons/neptune/climate/ic-front-defrost_OFF.png
index bf0d9a4d..bf0d9a4d 100644
--- a/imports/assets/icons/neptune/climate/ic-front-defrost_OFF.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-front-defrost_OFF.png
diff --git a/imports/assets/icons/neptune/climate/ic-front-defrost_ON.png b/imports_shared/assets/icons/neptune/climate/ic-front-defrost_ON.png
index d9b4b9f4..d9b4b9f4 100644
--- a/imports/assets/icons/neptune/climate/ic-front-defrost_ON.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-front-defrost_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-link_OFF.png b/imports_shared/assets/icons/neptune/climate/ic-link_OFF.png
index 871a0f27..871a0f27 100644
--- a/imports/assets/icons/neptune/climate/ic-link_OFF.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-link_OFF.png
diff --git a/imports/assets/icons/neptune/climate/ic-link_ON.png b/imports_shared/assets/icons/neptune/climate/ic-link_ON.png
index 2eff32ba..2eff32ba 100644
--- a/imports/assets/icons/neptune/climate/ic-link_ON.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-link_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-rear-defrost_OFF.png b/imports_shared/assets/icons/neptune/climate/ic-rear-defrost_OFF.png
index a7601567..a7601567 100644
--- a/imports/assets/icons/neptune/climate/ic-rear-defrost_OFF.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-rear-defrost_OFF.png
diff --git a/imports/assets/icons/neptune/climate/ic-rear-defrost_ON.png b/imports_shared/assets/icons/neptune/climate/ic-rear-defrost_ON.png
index 5186a41d..5186a41d 100644
--- a/imports/assets/icons/neptune/climate/ic-rear-defrost_ON.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-rear-defrost_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-recirculation_OFF.png b/imports_shared/assets/icons/neptune/climate/ic-recirculation_OFF.png
index 2521482d..2521482d 100644
--- a/imports/assets/icons/neptune/climate/ic-recirculation_OFF.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-recirculation_OFF.png
diff --git a/imports/assets/icons/neptune/climate/ic-recirculation_ON.png b/imports_shared/assets/icons/neptune/climate/ic-recirculation_ON.png
index 597ceb67..597ceb67 100644
--- a/imports/assets/icons/neptune/climate/ic-recirculation_ON.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-recirculation_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-seat-heat-driver_OFF.png b/imports_shared/assets/icons/neptune/climate/ic-seat-heat-driver_OFF.png
index 68dffe66..68dffe66 100644
--- a/imports/assets/icons/neptune/climate/ic-seat-heat-driver_OFF.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-seat-heat-driver_OFF.png
diff --git a/imports/assets/icons/neptune/climate/ic-seat-heat-driver_ON.png b/imports_shared/assets/icons/neptune/climate/ic-seat-heat-driver_ON.png
index 957fd3fa..957fd3fa 100644
--- a/imports/assets/icons/neptune/climate/ic-seat-heat-driver_ON.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-seat-heat-driver_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-seat-heat-passenger_OFF.png b/imports_shared/assets/icons/neptune/climate/ic-seat-heat-passenger_OFF.png
index 9946f8a0..9946f8a0 100644
--- a/imports/assets/icons/neptune/climate/ic-seat-heat-passenger_OFF.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-seat-heat-passenger_OFF.png
diff --git a/imports/assets/icons/neptune/climate/ic-seat-heat-passenger_ON.png b/imports_shared/assets/icons/neptune/climate/ic-seat-heat-passenger_ON.png
index 61c93b51..61c93b51 100644
--- a/imports/assets/icons/neptune/climate/ic-seat-heat-passenger_ON.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-seat-heat-passenger_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-seat-heat_OFF.png b/imports_shared/assets/icons/neptune/climate/ic-seat-heat_OFF.png
index 65310837..65310837 100644
--- a/imports/assets/icons/neptune/climate/ic-seat-heat_OFF.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-seat-heat_OFF.png
diff --git a/imports/assets/icons/neptune/climate/ic-seat-heat_ON.png b/imports_shared/assets/icons/neptune/climate/ic-seat-heat_ON.png
index 340be71a..340be71a 100644
--- a/imports/assets/icons/neptune/climate/ic-seat-heat_ON.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-seat-heat_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-steering-wheel-heat_OFF.png b/imports_shared/assets/icons/neptune/climate/ic-steering-wheel-heat_OFF.png
index 660781eb..660781eb 100644
--- a/imports/assets/icons/neptune/climate/ic-steering-wheel-heat_OFF.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-steering-wheel-heat_OFF.png
diff --git a/imports/assets/icons/neptune/climate/ic-steering-wheel-heat_ON.png b/imports_shared/assets/icons/neptune/climate/ic-steering-wheel-heat_ON.png
index cc63ae09..cc63ae09 100644
--- a/imports/assets/icons/neptune/climate/ic-steering-wheel-heat_ON.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-steering-wheel-heat_ON.png
diff --git a/imports/assets/icons/neptune/climate/ic-temperature-minus.png b/imports_shared/assets/icons/neptune/climate/ic-temperature-minus.png
index 8f671a3f..8f671a3f 100644
--- a/imports/assets/icons/neptune/climate/ic-temperature-minus.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-temperature-minus.png
diff --git a/imports/assets/icons/neptune/climate/ic-temperature-plus.png b/imports_shared/assets/icons/neptune/climate/ic-temperature-plus.png
index 3b187128..3b187128 100644
--- a/imports/assets/icons/neptune/climate/ic-temperature-plus.png
+++ b/imports_shared/assets/icons/neptune/climate/ic-temperature-plus.png
diff --git a/imports/assets/icons/neptune/index.theme b/imports_shared/assets/icons/neptune/index.theme
index dfaf47fb..dfaf47fb 100644
--- a/imports/assets/icons/neptune/index.theme
+++ b/imports_shared/assets/icons/neptune/index.theme
diff --git a/imports/assets/icons/neptune/music/ic-albums_OFF.png b/imports_shared/assets/icons/neptune/music/ic-albums_OFF.png
index 69713871..69713871 100644
--- a/imports/assets/icons/neptune/music/ic-albums_OFF.png
+++ b/imports_shared/assets/icons/neptune/music/ic-albums_OFF.png
diff --git a/imports/assets/icons/neptune/music/ic-albums_ON.png b/imports_shared/assets/icons/neptune/music/ic-albums_ON.png
index cd01b381..cd01b381 100644
--- a/imports/assets/icons/neptune/music/ic-albums_ON.png
+++ b/imports_shared/assets/icons/neptune/music/ic-albums_ON.png
diff --git a/imports/assets/icons/neptune/music/ic-artists_OFF.png b/imports_shared/assets/icons/neptune/music/ic-artists_OFF.png
index f663ded6..f663ded6 100644
--- a/imports/assets/icons/neptune/music/ic-artists_OFF.png
+++ b/imports_shared/assets/icons/neptune/music/ic-artists_OFF.png
diff --git a/imports/assets/icons/neptune/music/ic-artists_ON.png b/imports_shared/assets/icons/neptune/music/ic-artists_ON.png
index c8795134..c8795134 100644
--- a/imports/assets/icons/neptune/music/ic-artists_ON.png
+++ b/imports_shared/assets/icons/neptune/music/ic-artists_ON.png
diff --git a/imports/assets/icons/neptune/music/ic-folder-browse_OFF.png b/imports_shared/assets/icons/neptune/music/ic-folder-browse_OFF.png
index 3e222e8a..3e222e8a 100644
--- a/imports/assets/icons/neptune/music/ic-folder-browse_OFF.png
+++ b/imports_shared/assets/icons/neptune/music/ic-folder-browse_OFF.png
diff --git a/imports/assets/icons/neptune/music/ic-folder-browse_ON.png b/imports_shared/assets/icons/neptune/music/ic-folder-browse_ON.png
index 6f655e91..6f655e91 100644
--- a/imports/assets/icons/neptune/music/ic-folder-browse_ON.png
+++ b/imports_shared/assets/icons/neptune/music/ic-folder-browse_ON.png
diff --git a/imports/assets/icons/neptune/music/ic-pause.png b/imports_shared/assets/icons/neptune/music/ic-pause.png
index 8eaffc10..8eaffc10 100644
--- a/imports/assets/icons/neptune/music/ic-pause.png
+++ b/imports_shared/assets/icons/neptune/music/ic-pause.png
diff --git a/imports/assets/icons/neptune/music/ic-playlists_OFF.png b/imports_shared/assets/icons/neptune/music/ic-playlists_OFF.png
index d38661c8..d38661c8 100644
--- a/imports/assets/icons/neptune/music/ic-playlists_OFF.png
+++ b/imports_shared/assets/icons/neptune/music/ic-playlists_OFF.png
diff --git a/imports/assets/icons/neptune/music/ic-playlists_ON.png b/imports_shared/assets/icons/neptune/music/ic-playlists_ON.png
index f4ba854c..f4ba854c 100644
--- a/imports/assets/icons/neptune/music/ic-playlists_ON.png
+++ b/imports_shared/assets/icons/neptune/music/ic-playlists_ON.png
diff --git a/imports/assets/icons/neptune/music/ic-repeat.png b/imports_shared/assets/icons/neptune/music/ic-repeat.png
index d689bfd5..d689bfd5 100644
--- a/imports/assets/icons/neptune/music/ic-repeat.png
+++ b/imports_shared/assets/icons/neptune/music/ic-repeat.png
diff --git a/imports/assets/icons/neptune/music/ic-shuffle.png b/imports_shared/assets/icons/neptune/music/ic-shuffle.png
index 043a4b59..043a4b59 100644
--- a/imports/assets/icons/neptune/music/ic-shuffle.png
+++ b/imports_shared/assets/icons/neptune/music/ic-shuffle.png
diff --git a/imports/assets/icons/neptune/music/ic-sources-bt_OFF.png b/imports_shared/assets/icons/neptune/music/ic-sources-bt_OFF.png
index 6fa37bce..6fa37bce 100644
--- a/imports/assets/icons/neptune/music/ic-sources-bt_OFF.png
+++ b/imports_shared/assets/icons/neptune/music/ic-sources-bt_OFF.png
diff --git a/imports/assets/icons/neptune/music/ic-sources-bt_ON.png b/imports_shared/assets/icons/neptune/music/ic-sources-bt_ON.png
index c874fc86..c874fc86 100644
--- a/imports/assets/icons/neptune/music/ic-sources-bt_ON.png
+++ b/imports_shared/assets/icons/neptune/music/ic-sources-bt_ON.png
diff --git a/imports/assets/icons/neptune/music/ic_play.png b/imports_shared/assets/icons/neptune/music/ic_play.png
index 280a9f2c..280a9f2c 100644
--- a/imports/assets/icons/neptune/music/ic_play.png
+++ b/imports_shared/assets/icons/neptune/music/ic_play.png
diff --git a/imports/assets/icons/neptune/music/ic_skipnext.png b/imports_shared/assets/icons/neptune/music/ic_skipnext.png
index 3f15ace7..3f15ace7 100644
--- a/imports/assets/icons/neptune/music/ic_skipnext.png
+++ b/imports_shared/assets/icons/neptune/music/ic_skipnext.png
diff --git a/imports/assets/icons/neptune/music/ic_skipprevious.png b/imports_shared/assets/icons/neptune/music/ic_skipprevious.png
index 4a3ece96..4a3ece96 100644
--- a/imports/assets/icons/neptune/music/ic_skipprevious.png
+++ b/imports_shared/assets/icons/neptune/music/ic_skipprevious.png
diff --git a/imports/assets/icons/neptune/phone/ic-call-contrast.png b/imports_shared/assets/icons/neptune/phone/ic-call-contrast.png
index 7abd4925..7abd4925 100644
--- a/imports/assets/icons/neptune/phone/ic-call-contrast.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-call-contrast.png
diff --git a/imports/assets/icons/neptune/phone/ic-contacts_OFF.png b/imports_shared/assets/icons/neptune/phone/ic-contacts_OFF.png
index 195c3309..195c3309 100644
--- a/imports/assets/icons/neptune/phone/ic-contacts_OFF.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-contacts_OFF.png
diff --git a/imports/assets/icons/neptune/phone/ic-contacts_ON.png b/imports_shared/assets/icons/neptune/phone/ic-contacts_ON.png
index 0e6c6bd1..0e6c6bd1 100644
--- a/imports/assets/icons/neptune/phone/ic-contacts_ON.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-contacts_ON.png
diff --git a/imports/assets/icons/neptune/phone/ic-end-call.png b/imports_shared/assets/icons/neptune/phone/ic-end-call.png
index e17135c6..e17135c6 100644
--- a/imports/assets/icons/neptune/phone/ic-end-call.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-end-call.png
diff --git a/imports/assets/icons/neptune/phone/ic-keypad-ongoing.png b/imports_shared/assets/icons/neptune/phone/ic-keypad-ongoing.png
index 5d044388..5d044388 100644
--- a/imports/assets/icons/neptune/phone/ic-keypad-ongoing.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-keypad-ongoing.png
diff --git a/imports/assets/icons/neptune/phone/ic-keypad_OFF.png b/imports_shared/assets/icons/neptune/phone/ic-keypad_OFF.png
index 97da66eb..97da66eb 100644
--- a/imports/assets/icons/neptune/phone/ic-keypad_OFF.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-keypad_OFF.png
diff --git a/imports/assets/icons/neptune/phone/ic-keypad_ON.png b/imports_shared/assets/icons/neptune/phone/ic-keypad_ON.png
index eb87e2ff..eb87e2ff 100644
--- a/imports/assets/icons/neptune/phone/ic-keypad_ON.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-keypad_ON.png
diff --git a/imports/assets/icons/neptune/phone/ic-message-contrast.png b/imports_shared/assets/icons/neptune/phone/ic-message-contrast.png
index 752f10e1..752f10e1 100644
--- a/imports/assets/icons/neptune/phone/ic-message-contrast.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-message-contrast.png
diff --git a/imports/assets/icons/neptune/phone/ic-messages_OFF.png b/imports_shared/assets/icons/neptune/phone/ic-messages_OFF.png
index 04830c5b..04830c5b 100644
--- a/imports/assets/icons/neptune/phone/ic-messages_OFF.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-messages_OFF.png
diff --git a/imports/assets/icons/neptune/phone/ic-messages_ON.png b/imports_shared/assets/icons/neptune/phone/ic-messages_ON.png
index eb1e338d..eb1e338d 100644
--- a/imports/assets/icons/neptune/phone/ic-messages_ON.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-messages_ON.png
diff --git a/imports/assets/icons/neptune/phone/ic-mute-ongoing.png b/imports_shared/assets/icons/neptune/phone/ic-mute-ongoing.png
index 8f1f33d3..8f1f33d3 100644
--- a/imports/assets/icons/neptune/phone/ic-mute-ongoing.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-mute-ongoing.png
diff --git a/imports/assets/icons/neptune/phone/ic-phone-incoming.png b/imports_shared/assets/icons/neptune/phone/ic-phone-incoming.png
index 0983e1c6..0983e1c6 100644
--- a/imports/assets/icons/neptune/phone/ic-phone-incoming.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-phone-incoming.png
diff --git a/imports/assets/icons/neptune/phone/ic-phone-missed-last.png b/imports_shared/assets/icons/neptune/phone/ic-phone-missed-last.png
index be0af875..be0af875 100644
--- a/imports/assets/icons/neptune/phone/ic-phone-missed-last.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-phone-missed-last.png
diff --git a/imports/assets/icons/neptune/phone/ic-phone-missed.png b/imports_shared/assets/icons/neptune/phone/ic-phone-missed.png
index ae97e78c..ae97e78c 100644
--- a/imports/assets/icons/neptune/phone/ic-phone-missed.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-phone-missed.png
diff --git a/imports/assets/icons/neptune/phone/ic-phone-outgoing.png b/imports_shared/assets/icons/neptune/phone/ic-phone-outgoing.png
index 9964435a..9964435a 100644
--- a/imports/assets/icons/neptune/phone/ic-phone-outgoing.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-phone-outgoing.png
diff --git a/imports/assets/icons/neptune/phone/ic-recents_OFF.png b/imports_shared/assets/icons/neptune/phone/ic-recents_OFF.png
index 4b90922a..4b90922a 100644
--- a/imports/assets/icons/neptune/phone/ic-recents_OFF.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-recents_OFF.png
diff --git a/imports/assets/icons/neptune/phone/ic-recents_ON.png b/imports_shared/assets/icons/neptune/phone/ic-recents_ON.png
index 36ac9c68..36ac9c68 100644
--- a/imports/assets/icons/neptune/phone/ic-recents_ON.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-recents_ON.png
diff --git a/imports/assets/icons/neptune/phone/ic-voicemail_OFF.png b/imports_shared/assets/icons/neptune/phone/ic-voicemail_OFF.png
index 0f56dc2f..0f56dc2f 100644
--- a/imports/assets/icons/neptune/phone/ic-voicemail_OFF.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-voicemail_OFF.png
diff --git a/imports/assets/icons/neptune/phone/ic-voicemail_ON.png b/imports_shared/assets/icons/neptune/phone/ic-voicemail_ON.png
index a48a94ac..a48a94ac 100644
--- a/imports/assets/icons/neptune/phone/ic-voicemail_ON.png
+++ b/imports_shared/assets/icons/neptune/phone/ic-voicemail_ON.png
diff --git a/imports/assets/icons/neptune/store/ic-business_OFF.png b/imports_shared/assets/icons/neptune/store/ic-business_OFF.png
index 375f55a0..375f55a0 100644
--- a/imports/assets/icons/neptune/store/ic-business_OFF.png
+++ b/imports_shared/assets/icons/neptune/store/ic-business_OFF.png
diff --git a/imports/assets/icons/neptune/store/ic-business_ON.png b/imports_shared/assets/icons/neptune/store/ic-business_ON.png
index cdd73482..cdd73482 100644
--- a/imports/assets/icons/neptune/store/ic-business_ON.png
+++ b/imports_shared/assets/icons/neptune/store/ic-business_ON.png
diff --git a/imports/assets/icons/neptune/store/ic-download_OFF.png b/imports_shared/assets/icons/neptune/store/ic-download_OFF.png
index cd01dd7b..cd01dd7b 100644
--- a/imports/assets/icons/neptune/store/ic-download_OFF.png
+++ b/imports_shared/assets/icons/neptune/store/ic-download_OFF.png
diff --git a/imports/assets/icons/neptune/store/ic-download_ON.png b/imports_shared/assets/icons/neptune/store/ic-download_ON.png
index ecbe29a0..ecbe29a0 100644
--- a/imports/assets/icons/neptune/store/ic-download_ON.png
+++ b/imports_shared/assets/icons/neptune/store/ic-download_ON.png
diff --git a/imports/assets/icons/neptune/store/ic-entertainment_OFF.png b/imports_shared/assets/icons/neptune/store/ic-entertainment_OFF.png
index 8b4b9bd7..8b4b9bd7 100644
--- a/imports/assets/icons/neptune/store/ic-entertainment_OFF.png
+++ b/imports_shared/assets/icons/neptune/store/ic-entertainment_OFF.png
diff --git a/imports/assets/icons/neptune/store/ic-entertainment_ON.png b/imports_shared/assets/icons/neptune/store/ic-entertainment_ON.png
index 409be849..409be849 100644
--- a/imports/assets/icons/neptune/store/ic-entertainment_ON.png
+++ b/imports_shared/assets/icons/neptune/store/ic-entertainment_ON.png
diff --git a/imports/assets/icons/neptune/store/ic-games_OFF.png b/imports_shared/assets/icons/neptune/store/ic-games_OFF.png
index c48f1b16..c48f1b16 100644
--- a/imports/assets/icons/neptune/store/ic-games_OFF.png
+++ b/imports_shared/assets/icons/neptune/store/ic-games_OFF.png
diff --git a/imports/assets/icons/neptune/store/ic-games_ON.png b/imports_shared/assets/icons/neptune/store/ic-games_ON.png
index 873b559f..873b559f 100644
--- a/imports/assets/icons/neptune/store/ic-games_ON.png
+++ b/imports_shared/assets/icons/neptune/store/ic-games_ON.png
diff --git a/imports/assets/icons/neptune/store/ic-installed_OFF.png b/imports_shared/assets/icons/neptune/store/ic-installed_OFF.png
index 8a38ae4b..8a38ae4b 100644
--- a/imports/assets/icons/neptune/store/ic-installed_OFF.png
+++ b/imports_shared/assets/icons/neptune/store/ic-installed_OFF.png
diff --git a/imports/assets/icons/neptune/store/ic-installed_ON.png b/imports_shared/assets/icons/neptune/store/ic-installed_ON.png
index 9e8e9082..9e8e9082 100644
--- a/imports/assets/icons/neptune/store/ic-installed_ON.png
+++ b/imports_shared/assets/icons/neptune/store/ic-installed_ON.png
diff --git a/imports/assets/icons/neptune/sysui/ic-addwidget-plus.png b/imports_shared/assets/icons/neptune/sysui/ic-addwidget-plus.png
index 213b7b31..213b7b31 100644
--- a/imports/assets/icons/neptune/sysui/ic-addwidget-plus.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-addwidget-plus.png
diff --git a/imports/assets/icons/neptune/sysui/ic-close.png b/imports_shared/assets/icons/neptune/sysui/ic-close.png
index 8d2d4c90..8d2d4c90 100644
--- a/imports/assets/icons/neptune/sysui/ic-close.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-close.png
diff --git a/imports/assets/icons/neptune/sysui/ic-color_OFF.png b/imports_shared/assets/icons/neptune/sysui/ic-color_OFF.png
index ae6af040..ae6af040 100644
--- a/imports/assets/icons/neptune/sysui/ic-color_OFF.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-color_OFF.png
diff --git a/imports/assets/icons/neptune/sysui/ic-color_ON.png b/imports_shared/assets/icons/neptune/sysui/ic-color_ON.png
index b9bc0008..b9bc0008 100644
--- a/imports/assets/icons/neptune/sysui/ic-color_ON.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-color_ON.png
diff --git a/imports/assets/icons/neptune/sysui/ic-erase.png b/imports_shared/assets/icons/neptune/sysui/ic-erase.png
index 97a4e1dd..97a4e1dd 100644
--- a/imports/assets/icons/neptune/sysui/ic-erase.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-erase.png
diff --git a/imports/assets/icons/neptune/sysui/ic-favorites_OFF.png b/imports_shared/assets/icons/neptune/sysui/ic-favorites_OFF.png
index 3beb5b95..3beb5b95 100644
--- a/imports/assets/icons/neptune/sysui/ic-favorites_OFF.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-favorites_OFF.png
diff --git a/imports/assets/icons/neptune/sysui/ic-favorites_ON.png b/imports_shared/assets/icons/neptune/sysui/ic-favorites_ON.png
index a44a19eb..a44a19eb 100644
--- a/imports/assets/icons/neptune/sysui/ic-favorites_ON.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-favorites_ON.png
diff --git a/imports/assets/icons/neptune/sysui/ic-languages_OFF.png b/imports_shared/assets/icons/neptune/sysui/ic-languages_OFF.png
index 95fb7635..95fb7635 100644
--- a/imports/assets/icons/neptune/sysui/ic-languages_OFF.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-languages_OFF.png
diff --git a/imports/assets/icons/neptune/sysui/ic-languages_ON.png b/imports_shared/assets/icons/neptune/sysui/ic-languages_ON.png
index 57598e9c..57598e9c 100644
--- a/imports/assets/icons/neptune/sysui/ic-languages_ON.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-languages_ON.png
diff --git a/imports/assets/icons/neptune/sysui/ic-menu-allapps.png b/imports_shared/assets/icons/neptune/sysui/ic-menu-allapps.png
index 6b1fb8ca..6b1fb8ca 100644
--- a/imports/assets/icons/neptune/sysui/ic-menu-allapps.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-menu-allapps.png
diff --git a/imports/assets/icons/neptune/sysui/ic-menu-home.png b/imports_shared/assets/icons/neptune/sysui/ic-menu-home.png
index e314e45e..e314e45e 100644
--- a/imports/assets/icons/neptune/sysui/ic-menu-home.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-menu-home.png
diff --git a/imports/assets/icons/neptune/sysui/ic-placeholder.png b/imports_shared/assets/icons/neptune/sysui/ic-placeholder.png
index efdc8a2d..efdc8a2d 100644
--- a/imports/assets/icons/neptune/sysui/ic-placeholder.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-placeholder.png
diff --git a/imports/assets/icons/neptune/sysui/ic-themes_OFF.png b/imports_shared/assets/icons/neptune/sysui/ic-themes_OFF.png
index ec219090..ec219090 100644
--- a/imports/assets/icons/neptune/sysui/ic-themes_OFF.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-themes_OFF.png
diff --git a/imports/assets/icons/neptune/sysui/ic-themes_ON.png b/imports_shared/assets/icons/neptune/sysui/ic-themes_ON.png
index 5aafd1fa..5aafd1fa 100644
--- a/imports/assets/icons/neptune/sysui/ic-themes_ON.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-themes_ON.png
diff --git a/imports/assets/icons/neptune/sysui/ic-time_OFF.png b/imports_shared/assets/icons/neptune/sysui/ic-time_OFF.png
index 677ee466..677ee466 100644
--- a/imports/assets/icons/neptune/sysui/ic-time_OFF.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-time_OFF.png
diff --git a/imports/assets/icons/neptune/sysui/ic-time_ON.png b/imports_shared/assets/icons/neptune/sysui/ic-time_ON.png
index 5f597758..5f597758 100644
--- a/imports/assets/icons/neptune/sysui/ic-time_ON.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-time_ON.png
diff --git a/imports/assets/icons/neptune/sysui/ic-toolbar-sources-tuner.png b/imports_shared/assets/icons/neptune/sysui/ic-toolbar-sources-tuner.png
index 2c15c480..2c15c480 100644
--- a/imports/assets/icons/neptune/sysui/ic-toolbar-sources-tuner.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-toolbar-sources-tuner.png
diff --git a/imports/assets/icons/neptune/sysui/ic-update.png b/imports_shared/assets/icons/neptune/sysui/ic-update.png
index 0b0fd332..0b0fd332 100644
--- a/imports/assets/icons/neptune/sysui/ic-update.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-update.png
diff --git a/imports/assets/icons/neptune/sysui/ic-volume-0.png b/imports_shared/assets/icons/neptune/sysui/ic-volume-0.png
index 8372f7cc..8372f7cc 100644
--- a/imports/assets/icons/neptune/sysui/ic-volume-0.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-volume-0.png
diff --git a/imports/assets/icons/neptune/sysui/ic-volume-1.png b/imports_shared/assets/icons/neptune/sysui/ic-volume-1.png
index adb0a219..adb0a219 100644
--- a/imports/assets/icons/neptune/sysui/ic-volume-1.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-volume-1.png
diff --git a/imports/assets/icons/neptune/sysui/ic-volume-2.png b/imports_shared/assets/icons/neptune/sysui/ic-volume-2.png
index 96ed2d6f..96ed2d6f 100644
--- a/imports/assets/icons/neptune/sysui/ic-volume-2.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-volume-2.png
diff --git a/imports/assets/icons/neptune/sysui/ic-volume-3.png b/imports_shared/assets/icons/neptune/sysui/ic-volume-3.png
index 589b2a16..589b2a16 100644
--- a/imports/assets/icons/neptune/sysui/ic-volume-3.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic-volume-3.png
diff --git a/imports/assets/icons/neptune/sysui/ic_back.png b/imports_shared/assets/icons/neptune/sysui/ic_back.png
index 341b93a0..341b93a0 100644
--- a/imports/assets/icons/neptune/sysui/ic_back.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic_back.png
diff --git a/imports/assets/icons/neptune/sysui/ic_forward.png b/imports_shared/assets/icons/neptune/sysui/ic_forward.png
index 4db5e649..4db5e649 100644
--- a/imports/assets/icons/neptune/sysui/ic_forward.png
+++ b/imports_shared/assets/icons/neptune/sysui/ic_forward.png
diff --git a/imports/assets/icons/neptune/sysui/qt-badge.png b/imports_shared/assets/icons/neptune/sysui/qt-badge.png
index 313be35d..313be35d 100644
--- a/imports/assets/icons/neptune/sysui/qt-badge.png
+++ b/imports_shared/assets/icons/neptune/sysui/qt-badge.png
diff --git a/imports/assets/icons/neptune/tuner/ic-app-tuner.png b/imports_shared/assets/icons/neptune/tuner/ic-app-tuner.png
index 626c84f4..626c84f4 100644
--- a/imports/assets/icons/neptune/tuner/ic-app-tuner.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-app-tuner.png
diff --git a/imports/assets/icons/neptune/tuner/ic-favorite-tuner_OFF.png b/imports_shared/assets/icons/neptune/tuner/ic-favorite-tuner_OFF.png
index 0389fc42..0389fc42 100644
--- a/imports/assets/icons/neptune/tuner/ic-favorite-tuner_OFF.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-favorite-tuner_OFF.png
diff --git a/imports/assets/icons/neptune/tuner/ic-favorite-tuner_ON.png b/imports_shared/assets/icons/neptune/tuner/ic-favorite-tuner_ON.png
index e0c254d8..e0c254d8 100644
--- a/imports/assets/icons/neptune/tuner/ic-favorite-tuner_ON.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-favorite-tuner_ON.png
diff --git a/imports/assets/icons/neptune/tuner/ic-toolbar-am-band_OFF.png b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-am-band_OFF.png
index 6db8ffd9..6db8ffd9 100644
--- a/imports/assets/icons/neptune/tuner/ic-toolbar-am-band_OFF.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-am-band_OFF.png
diff --git a/imports/assets/icons/neptune/tuner/ic-toolbar-am-band_ON.png b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-am-band_ON.png
index db185c84..db185c84 100644
--- a/imports/assets/icons/neptune/tuner/ic-toolbar-am-band_ON.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-am-band_ON.png
diff --git a/imports/assets/icons/neptune/tuner/ic-toolbar-fm-band_OFF.png b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-fm-band_OFF.png
index 61b383e1..61b383e1 100644
--- a/imports/assets/icons/neptune/tuner/ic-toolbar-fm-band_OFF.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-fm-band_OFF.png
diff --git a/imports/assets/icons/neptune/tuner/ic-toolbar-fm-band_ON.png b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-fm-band_ON.png
index 164aadc6..164aadc6 100644
--- a/imports/assets/icons/neptune/tuner/ic-toolbar-fm-band_ON.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-fm-band_ON.png
diff --git a/imports/assets/icons/neptune/tuner/ic-toolbar-sources-tuner_OFF.png b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-sources-tuner_OFF.png
index 2c15c480..2c15c480 100644
--- a/imports/assets/icons/neptune/tuner/ic-toolbar-sources-tuner_OFF.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-sources-tuner_OFF.png
diff --git a/imports/assets/icons/neptune/tuner/ic-toolbar-sources-tuner_ON.png b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-sources-tuner_ON.png
index 69551c11..69551c11 100644
--- a/imports/assets/icons/neptune/tuner/ic-toolbar-sources-tuner_ON.png
+++ b/imports_shared/assets/icons/neptune/tuner/ic-toolbar-sources-tuner_ON.png
diff --git a/imports/assets/translations/cs_CZ.ts b/imports_shared/assets/translations/cs_CZ.ts
index 7e599bcf..7e599bcf 100644
--- a/imports/assets/translations/cs_CZ.ts
+++ b/imports_shared/assets/translations/cs_CZ.ts
diff --git a/imports/assets/translations/de_DE.ts b/imports_shared/assets/translations/de_DE.ts
index a024ab5e..a024ab5e 100644
--- a/imports/assets/translations/de_DE.ts
+++ b/imports_shared/assets/translations/de_DE.ts
diff --git a/imports/assets/translations/en_GB.ts b/imports_shared/assets/translations/en_GB.ts
index c4e15f14..c4e15f14 100644
--- a/imports/assets/translations/en_GB.ts
+++ b/imports_shared/assets/translations/en_GB.ts
diff --git a/imports/assets/translations/en_US.ts b/imports_shared/assets/translations/en_US.ts
index b349d2c4..b349d2c4 100644
--- a/imports/assets/translations/en_US.ts
+++ b/imports_shared/assets/translations/en_US.ts
diff --git a/imports_shared/assets/translations/he_IL.ts b/imports_shared/assets/translations/he_IL.ts
new file mode 100644
index 00000000..3a7abeee
--- /dev/null
+++ b/imports_shared/assets/translations/he_IL.ts
@@ -0,0 +1,802 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>AboutPerformance</name>
+    <message>
+        <source>Enabling performance monitoring forces System UI  to constantly redraw itself, therefore having a constant, unnecessary, GPU/CPU consumption.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center Console Performance Overlay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Instrument Cluster Performance Overlay</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AboutPopup</name>
+    <message>
+        <source>System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running Apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Diagnostics</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AboutRunningApps</name>
+    <message>
+        <source>Enabling performance monitoring forces the chosen application  to constantly redraw itself, therefore having a constant, unnecessary, GPU/CPU consumption.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU: %L1 %; Virtual: %L2 MB; RSS: %L3 MB; PSS: %L4 MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Primary Window, on Center Console</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time to first frame: %1 ms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Performance monitor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Secondary Window, on Instrument Cluster</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AddWidgetPopup</name>
+    <message>
+        <source>Add widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No more widgets available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppStoreServer</name>
+    <message>
+        <source>%1 Successfully Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 successfully installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Successfully Uninstalled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 successfully uninstalled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ApplicationStoreView</name>
+    <message>
+        <source>Fetching data from Neptune Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No apps found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot Connect to the Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An Internet connection is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CalendarToolsColumn</name>
+    <message>
+        <source>year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CalendarWidgetPanel</name>
+    <message>
+        <source>Partly cloudy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CenterConsoleMonitorOverlay</name>
+    <message>
+        <source>System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU: %1 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM: %1 MB (%2 %)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ClimateButtonsGrid</name>
+    <message>
+        <source>DRIVER</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PASSENGER</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ClimatePopup</name>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CpuMonitor</name>
+    <message>
+        <source>CPU: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>50%</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DateTimePanel</name>
+    <message>
+        <source>24h time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialPower</name>
+    <message>
+        <source>% power</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialSpeed</name>
+    <message>
+        <source>km/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DoorsPanel</name>
+    <message>
+        <source>Sun roof</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Doors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trunk</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditableGridView</name>
+    <message>
+        <source>Finish Editing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EnergyPanel</name>
+    <message>
+        <source>Present</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Projected distance to empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>184</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging stations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show on map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>21</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Donald Weese Ct, Las Vegas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Route</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>27</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Faiss Dr, Las Vegas</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FavDestinationButtonsPanel</name>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FavoritesWidgetView</name>
+    <message>
+        <source>more</source>
+        <comment>more contacts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FrontDoorsPanel</name>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FullScreenTopView</name>
+    <message>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MANUAL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BROWSE</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Helper</name>
+    <message>
+        <source>Offline mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search and navigation not available in offline mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ICMusicView</name>
+    <message>
+        <source>Track unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>UI screenshot has been taken successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI screenshot and diagnostics information are stored in %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery level is low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start route to nearest charging station?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show on Map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning: Battery level is low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please consider charging it in the next available station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Instrument Cluster</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MapStore</name>
+    <message numerus="yes">
+        <source>%n kilometer(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>MonitorOverlay</name>
+    <message>
+        <source>FPS: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MonitorView</name>
+    <message>
+        <source>System Monitor Overlay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Startup timings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>From boot to System UI process start: %1 ms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>From System UI process start to first frame drawn: %1 ms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Startup timings not available. Make sure the environment variable AM_STARTUP_TIMER was set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Neptune 3: %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qt Application Manager: %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single-process mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multi-process mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qt IVI: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusicBrowseListPanel</name>
+    <message>
+        <source>Play All</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusicSourcesPopup</name>
+    <message>
+        <source>Choose Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusicStore</name>
+    <message>
+        <source>Unknown Artist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown Album</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusicToolsColumn</name>
+    <message>
+        <source>favorites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>artists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>albums</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sources</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NavigationConfirmPanel</name>
+    <message>
+        <source>Start Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NavigationSearchPanel</name>
+    <message>
+        <source>Where do you wanna go today?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search not available offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NotificationCenter</name>
+    <message>
+        <source>No Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneToolsColumn</name>
+    <message>
+        <source>recents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>favorites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>keypad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RamMonitor</name>
+    <message>
+        <source>RAM: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>50%</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RoofPanel</name>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RootStore</name>
+    <message>
+        <source>UI Language changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI Language changed into %1 (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI Theme changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI Theme changed into Light Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI Theme changed into Dark Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI Accent Color changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI Accent Color changed into %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchOverlayPanel</name>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsToolsColumn</name>
+    <message>
+        <source>languages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TiresPanel</name>
+    <message>
+        <source>240</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kPa</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target: 240 kPa</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target: 270 kPa</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TrunkPanel</name>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TunerStore</name>
+    <message>
+        <source>AM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MHz</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TunerToolsColumn</name>
+    <message>
+        <source>favorites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AM band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM 1 band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM 2 band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sources</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VehicleStore</name>
+    <message>
+        <source>Fees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hill Descent Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Traffic Jam Assist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Intelligent speed adaptation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VehicleToolsColumn</name>
+    <message>
+        <source>support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>energy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>doors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tires</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/imports/assets/translations/ja_JP.ts b/imports_shared/assets/translations/ja_JP.ts
index cf39535d..cf39535d 100644
--- a/imports/assets/translations/ja_JP.ts
+++ b/imports_shared/assets/translations/ja_JP.ts
diff --git a/imports/assets/translations/ko_KR.ts b/imports_shared/assets/translations/ko_KR.ts
index 62bbaca0..62bbaca0 100644
--- a/imports/assets/translations/ko_KR.ts
+++ b/imports_shared/assets/translations/ko_KR.ts
diff --git a/imports/assets/translations/zh_CN.ts b/imports_shared/assets/translations/zh_CN.ts
index 679233fd..679233fd 100644
--- a/imports/assets/translations/zh_CN.ts
+++ b/imports_shared/assets/translations/zh_CN.ts
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/backspace-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/backspace-868482.svg
index d96d56ca..d96d56ca 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/backspace-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/backspace-868482.svg
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/check-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/check-868482.svg
index 82db68a4..82db68a4 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/check-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/check-868482.svg
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/enter-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/enter-868482.svg
index fce3431a..fce3431a 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/enter-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/enter-868482.svg
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/globe-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/globe-868482.svg
index 2da3a1e7..2da3a1e7 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/globe-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/globe-868482.svg
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/handwriting-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/handwriting-868482.svg
index f128b3d4..f128b3d4 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/handwriting-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/handwriting-868482.svg
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/hidekeyboard-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/hidekeyboard-868482.svg
index 694bcc12..694bcc12 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/hidekeyboard-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/hidekeyboard-868482.svg
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/search-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/search-868482.svg
index 6ee0ba97..6ee0ba97 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/search-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/search-868482.svg
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/textmode-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/textmode-868482.svg
index 709cd284..709cd284 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/textmode-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/textmode-868482.svg
diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
index 0de75894..0de75894 100644
--- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
diff --git a/imports/shared/animations/DefaultNumberAnimation.qml b/imports_shared/shared/animations/DefaultNumberAnimation.qml
index 859f3562..859f3562 100644
--- a/imports/shared/animations/DefaultNumberAnimation.qml
+++ b/imports_shared/shared/animations/DefaultNumberAnimation.qml
diff --git a/imports/shared/animations/DefaultSmoothedAnimation.qml b/imports_shared/shared/animations/DefaultSmoothedAnimation.qml
index 3c5b96fe..3c5b96fe 100644
--- a/imports/shared/animations/DefaultSmoothedAnimation.qml
+++ b/imports_shared/shared/animations/DefaultSmoothedAnimation.qml
diff --git a/imports/shared/animations/qmldir b/imports_shared/shared/animations/qmldir
index 00392e08..00392e08 100644
--- a/imports/shared/animations/qmldir
+++ b/imports_shared/shared/animations/qmldir
diff --git a/imports/shared/controls/ListItem.qml b/imports_shared/shared/controls/ListItem.qml
index ed221536..ed221536 100644
--- a/imports/shared/controls/ListItem.qml
+++ b/imports_shared/shared/controls/ListItem.qml
diff --git a/imports/shared/controls/ListItemBasic.qml b/imports_shared/shared/controls/ListItemBasic.qml
index 3618d4a0..3618d4a0 100644
--- a/imports/shared/controls/ListItemBasic.qml
+++ b/imports_shared/shared/controls/ListItemBasic.qml
diff --git a/imports/shared/controls/ListItemFlatButton.qml b/imports_shared/shared/controls/ListItemFlatButton.qml
index 5cbec4e2..5cbec4e2 100644
--- a/imports/shared/controls/ListItemFlatButton.qml
+++ b/imports_shared/shared/controls/ListItemFlatButton.qml
diff --git a/imports/shared/controls/ListItemProgress.qml b/imports_shared/shared/controls/ListItemProgress.qml
index 82dd8bcc..82dd8bcc 100644
--- a/imports/shared/controls/ListItemProgress.qml
+++ b/imports_shared/shared/controls/ListItemProgress.qml
diff --git a/imports/shared/controls/ListItemSwitch.qml b/imports_shared/shared/controls/ListItemSwitch.qml
index 5d0e042e..5d0e042e 100644
--- a/imports/shared/controls/ListItemSwitch.qml
+++ b/imports_shared/shared/controls/ListItemSwitch.qml
diff --git a/imports/shared/controls/ListItemTwoButtons.qml b/imports_shared/shared/controls/ListItemTwoButtons.qml
index 04c8fb0c..04c8fb0c 100644
--- a/imports/shared/controls/ListItemTwoButtons.qml
+++ b/imports_shared/shared/controls/ListItemTwoButtons.qml
diff --git a/imports/shared/controls/ScalableBorderImage.qml b/imports_shared/shared/controls/ScalableBorderImage.qml
index 08ab19f2..08ab19f2 100644
--- a/imports/shared/controls/ScalableBorderImage.qml
+++ b/imports_shared/shared/controls/ScalableBorderImage.qml
diff --git a/imports/shared/controls/ToolsColumn.qml b/imports_shared/shared/controls/ToolsColumn.qml
index 452d2e8b..452d2e8b 100644
--- a/imports/shared/controls/ToolsColumn.qml
+++ b/imports_shared/shared/controls/ToolsColumn.qml
diff --git a/imports/shared/controls/qmldir b/imports_shared/shared/controls/qmldir
index ad2361ba..ad2361ba 100644
--- a/imports/shared/controls/qmldir
+++ b/imports_shared/shared/controls/qmldir
diff --git a/imports/shared/service/notification/NotificationInterface.qml b/imports_shared/shared/service/notification/NotificationInterface.qml
index 81e2596a..81e2596a 100644
--- a/imports/shared/service/notification/NotificationInterface.qml
+++ b/imports_shared/shared/service/notification/NotificationInterface.qml
diff --git a/imports/shared/service/notification/qmldir b/imports_shared/shared/service/notification/qmldir
index 4c1b488c..4c1b488c 100644
--- a/imports/shared/service/notification/qmldir
+++ b/imports_shared/shared/service/notification/qmldir
diff --git a/imports/shared/utils/Logging.qml b/imports_shared/shared/utils/Logging.qml
index ca07d0d9..ca07d0d9 100644
--- a/imports/shared/utils/Logging.qml
+++ b/imports_shared/shared/utils/Logging.qml
diff --git a/imports/shared/utils/MonitorOverlay.qml b/imports_shared/shared/utils/MonitorOverlay.qml
index 3dba8887..3dba8887 100644
--- a/imports/shared/utils/MonitorOverlay.qml
+++ b/imports_shared/shared/utils/MonitorOverlay.qml
diff --git a/imports/shared/utils/StageLoader.qml b/imports_shared/shared/utils/StageLoader.qml
index 86e752b3..86e752b3 100644
--- a/imports/shared/utils/StageLoader.qml
+++ b/imports_shared/shared/utils/StageLoader.qml
diff --git a/imports/shared/utils/Store.qml b/imports_shared/shared/utils/Store.qml
index 2dd69c1f..2dd69c1f 100644
--- a/imports/shared/utils/Store.qml
+++ b/imports_shared/shared/utils/Store.qml
diff --git a/imports/shared/utils/Style.qml b/imports_shared/shared/utils/Style.qml
index af03f26a..af03f26a 100644
--- a/imports/shared/utils/Style.qml
+++ b/imports_shared/shared/utils/Style.qml
diff --git a/imports/shared/utils/Tracer.qml b/imports_shared/shared/utils/Tracer.qml
index b1450c94..b1450c94 100644
--- a/imports/shared/utils/Tracer.qml
+++ b/imports_shared/shared/utils/Tracer.qml
diff --git a/imports/shared/utils/qmldir b/imports_shared/shared/utils/qmldir
index cc425778..cc425778 100644
--- a/imports/shared/utils/qmldir
+++ b/imports_shared/shared/utils/qmldir
diff --git a/imports/system/controls/ApplicationCCWindowItem.qml b/imports_system/system/controls/ApplicationCCWindowItem.qml
index 5d268c66..5d268c66 100644
--- a/imports/system/controls/ApplicationCCWindowItem.qml
+++ b/imports_system/system/controls/ApplicationCCWindowItem.qml
diff --git a/imports/system/controls/ApplicationICWindowItem.qml b/imports_system/system/controls/ApplicationICWindowItem.qml
index c8cfe6c5..c8cfe6c5 100644
--- a/imports/system/controls/ApplicationICWindowItem.qml
+++ b/imports_system/system/controls/ApplicationICWindowItem.qml
diff --git a/imports/system/controls/NeptuneWindowItem.qml b/imports_system/system/controls/NeptuneWindowItem.qml
index 26577552..26577552 100644
--- a/imports/system/controls/NeptuneWindowItem.qml
+++ b/imports_system/system/controls/NeptuneWindowItem.qml
diff --git a/imports/system/controls/PopupItem.qml b/imports_system/system/controls/PopupItem.qml
index 2318bd25..2318bd25 100644
--- a/imports/system/controls/PopupItem.qml
+++ b/imports_system/system/controls/PopupItem.qml
diff --git a/imports/system/controls/PopupItemLoader.qml b/imports_system/system/controls/PopupItemLoader.qml
index 13654992..13654992 100644
--- a/imports/system/controls/PopupItemLoader.qml
+++ b/imports_system/system/controls/PopupItemLoader.qml
diff --git a/imports/system/controls/qmldir b/imports_system/system/controls/qmldir
index 54314f70..54314f70 100644
--- a/imports/system/controls/qmldir
+++ b/imports_system/system/controls/qmldir
diff --git a/imports/system/models/application/ApplicationInfo.qml b/imports_system/system/models/application/ApplicationInfo.qml
index 777ed8e4..777ed8e4 100644
--- a/imports/system/models/application/ApplicationInfo.qml
+++ b/imports_system/system/models/application/ApplicationInfo.qml
diff --git a/imports/system/models/application/ApplicationModel.qml b/imports_system/system/models/application/ApplicationModel.qml
index b494743b..b494743b 100644
--- a/imports/system/models/application/ApplicationModel.qml
+++ b/imports_system/system/models/application/ApplicationModel.qml
diff --git a/imports/system/models/application/qmldir b/imports_system/system/models/application/qmldir
index 0ae4defb..0ae4defb 100644
--- a/imports/system/models/application/qmldir
+++ b/imports_system/system/models/application/qmldir
diff --git a/imports/system/models/notification/NotificationModel.qml b/imports_system/system/models/notification/NotificationModel.qml
index 1aa38510..1aa38510 100644
--- a/imports/system/models/notification/NotificationModel.qml
+++ b/imports_system/system/models/notification/NotificationModel.qml
diff --git a/imports/system/models/notification/qmldir b/imports_system/system/models/notification/qmldir
index 477d61a5..477d61a5 100644
--- a/imports/system/models/notification/qmldir
+++ b/imports_system/system/models/notification/qmldir
diff --git a/imports/system/requests/ApplicationRequestHandler.qml b/imports_system/system/requests/ApplicationRequestHandler.qml
index a9d2e686..a9d2e686 100644
--- a/imports/system/requests/ApplicationRequestHandler.qml
+++ b/imports_system/system/requests/ApplicationRequestHandler.qml
diff --git a/imports/system/requests/qmldir b/imports_system/system/requests/qmldir
index 4853352e..4853352e 100644
--- a/imports/system/requests/qmldir
+++ b/imports_system/system/requests/qmldir
diff --git a/neptune3-ui.pro b/neptune3-ui.pro
index 6c254cc8..8ddcee48 100644
--- a/neptune3-ui.pro
+++ b/neptune3-ui.pro
@@ -9,7 +9,7 @@ SUBDIRS += doc
 SUBDIRS += tests
 
 # mainly a hint for Qt Creator
-QML_IMPORT_PATH += imports sysui
+QML_IMPORT_PATH += imports_shared imports_system sysui
 
 copydata.file = copydata.pro
 copydata.depends = plugins
@@ -26,7 +26,7 @@ android: INSTALL_PATH = $$INSTALL_PREFIX
 else: INSTALL_PATH = $$INSTALL_PREFIX/neptune3
 
 # Install all required files
-qml.files = apps dev/apps imports sysui styles Main.qml
+qml.files = apps dev/apps imports_shared imports_system sysui styles Main.qml
 android: qml.files += am-config-android.yaml
 else: qml.files += am-config.yaml
 qml.path = $$INSTALL_PATH
diff --git a/plugins/translation/translation.pro b/plugins/translation/translation.pro
index 22ed7671..9e97fe8b 100644
--- a/plugins/translation/translation.pro
+++ b/plugins/translation/translation.pro
@@ -21,9 +21,9 @@ defineReplace(prependAll) {
 }
 
 rootPath = $$PWD/../../
-assetsPath = $$PWD/../../imports/assets
+assetsPath = $$PWD/../../imports_shared/assets
 qmlSysUiPath = $$PWD/../../sysui
-importsPath = $$PWD/../../imports
+importsPath = $$PWD/../../imports_shared
 appsPath = $$PWD/../../apps
 # See qml files to scan while running lupdate/lrelease
 lupdate_only {
@@ -63,7 +63,7 @@ qm.CONFIG += no_link
 QMAKE_EXTRA_COMPILERS += qm
 
 qmfiles.files = $$prependAll(supportedLocales, $$shadowed($$assetsPath/translations)/, .qm)
-qmfiles.path = $$INSTALL_PREFIX/neptune3/imports/assets/translations
+qmfiles.path = $$INSTALL_PREFIX/neptune3/imports_shared/assets/translations
 qmfiles.CONFIG += no_check_exist
 
 INSTALLS += qmfiles
diff --git a/qmake-features/qmlplugin.prf b/qmake-features/qmlplugin.prf
index b40ba773..f51bfdf2 100644
--- a/qmake-features/qmlplugin.prf
+++ b/qmake-features/qmlplugin.prf
@@ -4,8 +4,8 @@
 
 CONFIG += skip_target_version_ext
 TARGET = $$qtLibraryTarget($$TARGET)
-android: DESTDIR = $$BUILD_DIR/imports/cpp/$$replace(uri, \\., /)
-else: DESTDIR = $$BUILD_DIR/imports/shared/$$replace(uri, \\., /)
+android: DESTDIR = $$BUILD_DIR/imports_shared/cpp/$$replace(uri, \\., /)
+else: DESTDIR = $$BUILD_DIR/imports_shared/shared/$$replace(uri, \\., /)
 
 OTHER_FILES = qmldir
 
@@ -20,8 +20,8 @@ OTHER_FILES = qmldir
 include(../config.pri)
 
 qmldir.files = qmldir
-android: installPath = $$INSTALL_PREFIX/imports/cpp/$$replace(uri, \\., /)
-else: installPath = $$INSTALL_PREFIX/neptune3/imports/shared/$$replace(uri, \\., /)
+android: installPath = $$INSTALL_PREFIX/imports_shared/cpp/$$replace(uri, \\., /)
+else: installPath = $$INSTALL_PREFIX/neptune3/imports_shared/shared/$$replace(uri, \\., /)
 qmldir.path = $$installPath
 target.path = $$installPath
 INSTALLS += target qmldir
diff --git a/src/neptune3-ui/neptune3-ui.pro b/src/neptune3-ui/neptune3-ui.pro
index 754cada0..8496724a 100644
--- a/src/neptune3-ui/neptune3-ui.pro
+++ b/src/neptune3-ui/neptune3-ui.pro
@@ -46,8 +46,8 @@ android: {
     QML_ROOT_PATH = $$PWD/../../
 
     QML_IMPORT_PATH += \
-                        $$OUT_PWD/../../imports/cpp \
-                        $$OUT_PWD/../../imports/system \
+                        $$OUT_PWD/../../imports_shared/cpp \
+                        $$OUT_PWD/../../imports_system/system \
 
     ANDROID_EXTRA_PLUGINS += \
                         $$OUT_PWD/../../plugins \
diff --git a/src/remotesettings/app/app.pro b/src/remotesettings/app/app.pro
index 9951622a..1e4be057 100644
--- a/src/remotesettings/app/app.pro
+++ b/src/remotesettings/app/app.pro
@@ -22,7 +22,7 @@ INSTALLS += target
 QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/)
 
 #needed for the android deployment to include additional qml plugins
-QML_IMPORT_PATH += $$BUILD_DIR/imports
+QML_IMPORT_PATH += $$BUILD_DIR/imports_shared
 
 android {
 #This is used to tell the deployment tool to include these additional
diff --git a/src/remotesettings/app/main.cpp b/src/remotesettings/app/main.cpp
index 9a4c0847..3928ae01 100644
--- a/src/remotesettings/app/main.cpp
+++ b/src/remotesettings/app/main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
     Client client;
 
     QQmlApplicationEngine engine;
-    engine.addImportPath(QDir::currentPath()+QStringLiteral("/imports/"));
+    engine.addImportPath(QDir::currentPath()+QStringLiteral("/imports_shared/"));
     engine.rootContext()->setContextProperty(QStringLiteral("client"), &client);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty())