diff --git a/app/build.gradle b/app/build.gradle
index 3a9b2abd7..9da5ad39b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,12 @@ android {
         throw new GradleException("Could not read version.properties!")
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+        incremental = false;
+    }
+
     //noinspection GroovyAssignabilityCheck
     buildTypes {
         release {
@@ -52,6 +58,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             lintOptions {
                 disable 'MissingTranslation'
+                checkReleaseBuilds false
+                abortOnError false
             }
         }
     }
@@ -139,7 +147,6 @@ repositories {
     }
 }
 
-
 allprojects {
     repositories {
         jcenter()
@@ -181,10 +188,9 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.4'
     implementation 'com.android.volley:volley:1.1.0'
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
-    implementation 'com.larswerkman:lobsterpicker:1.0.1'
 
-    implementation 'com.github.zurche:plain-pie:v0.2.2'
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'
+    implementation 'com.github.zurche:plain-pie:v0.2.9'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
 
     implementation 'com.github.dexafree:MaterialList:v3.2.2'
     implementation 'com.github.hotchemi:android-rate:1.0.1'
@@ -192,9 +198,10 @@ dependencies {
     implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
     implementation 'com.github.jd-alexander:LikeButton:0.2.3'
-    implementation 'jp.wasabeef:recyclerview-animators:2.2.4'
+    implementation 'jp.wasabeef:recyclerview-animators:2.3.0'
     implementation 'com.github.javiersantos:PiracyChecker:1.1'
     implementation 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
+
     implementation("com.mikepenz:materialdrawer:6.0.9@aar") {
         transitive = true
     }
@@ -205,9 +212,9 @@ dependencies {
     implementation 'com.github.k0shk0sh:PermissionHelper:1.1.0'
     implementation 'com.github.zagum:SpeechRecognitionView:1.0.2'
     implementation 'com.afollestad:digitus:0.3.0'
+    implementation "com.github.skydoves:colorpickerview:2.0.1"
 
     implementation project(':libs:MemorizingTrustManager')
-
     implementation project(path: ':materialIntro_library')
     implementation project(path: ':SeekArc_library')
     implementation project(path: ':domoticzapi')
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index d9442ea5b..8a9930b3e 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -21,8 +21,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="nl.hnogames.domoticz" >
+          xmlns:tools="http://schemas.android.com/tools"
+          package="nl.hnogames.domoticz">
 
     <supports-screens
         android:anyDensity="true"
@@ -30,41 +30,61 @@
         android:normalScreens="true"
         android:resizeable="true"
         android:smallScreens="true"
-        android:xlargeScreens="true" />
-
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
-    <uses-feature android:glEsVersion="0x00020000" android:required="false" />
-    <uses-feature android:name="android.hardware.location.network" android:required="false" />
-    <uses-feature android:name="android.hardware.location.gps" android:required="false"  />
-    <uses-feature android:name="android.hardware.location" android:required="false"  />
-    <uses-feature android:name="android.hardware.nfc" android:required="false"/>
-    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
-    <uses-feature android:name="android.hardware.fingerprint" android:required="false"/>
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+        android:xlargeScreens="true"/>
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false"/>
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.location.network"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.location"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.microphone"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.fingerprint"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false"/>
 
     <permission
         android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE"
-        android:protectionLevel="signature" />
-
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+        android:protectionLevel="signature"/>
+
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="com.android.vending.CHECK_LICENSE"/>
 
     <application
@@ -72,81 +92,85 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name_domoticz"
-        android:usesCleartextTraffic="true"
         android:theme="@style/AppThemeMain"
-        tools:replace="android:icon, android:label, android:theme, android:name" >
+        android:usesCleartextTraffic="true"
+        tools:replace="android:icon, android:label, android:theme, android:name">
 
-        <activity android:name=".Service.NFCServiceActivity" >
+        <activity android:name=".Service.NFCServiceActivity">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data
                     android:host="domoticz"
-                    android:scheme="app" />
+                    android:scheme="app"/>
             </intent-filter>
             <meta-data
                 android:name="android.nfc.action.TECH_DISCOVERED"
-                android:resource="@xml/nfc_tech_list" />
+                android:resource="@xml/nfc_tech_list"/>
         </activity>
 
-        <service android:name=".Service.RingtonePlayingService" />
+        <service android:name=".Service.RingtonePlayingService"/>
 
         <receiver
             android:name="nl.hnogames.domoticz.Service.LocationProviderChangedReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
-                <action android:name="android.location.PROVIDERS_CHANGED" />
-                <action android:name="android.location.MODE_CHANGED" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.location.PROVIDERS_CHANGED"/>
+                <action android:name="android.location.MODE_CHANGED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
 
-        <service android:name=".Service.WearMessageListenerService" >
+        <service android:name=".Service.WearMessageListenerService">
             <intent-filter>
-                <action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
-                <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
-                <action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED" />
-                <action android:name="com.google.android.gms.wearable.CHANNEL_EVENT" />
+                <action android:name="com.google.android.gms.wearable.DATA_CHANGED"/>
+                <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED"/>
+                <action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED"/>
+                <action android:name="com.google.android.gms.wearable.CHANNEL_EVENT"/>
+
                 <data
                     android:host="*"
-                    android:scheme="wear" />
+                    android:scheme="wear"/>
             </intent-filter>
         </service>
 
-        <service android:name=".Service.StopAlarmButtonListener" />
+        <service android:name=".Service.StopAlarmButtonListener"/>
 
         <service
             android:name=".Service.TaskService"
             android:exported="true"
-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE" >
+            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE">
             <intent-filter>
-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
+                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY"/>
             </intent-filter>
         </service>
 
-        <receiver android:name=".Widgets.WidgetProviderLarge" >
+        <receiver android:name=".Widgets.WidgetProviderLarge">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/appwidgetprovider" />
+                android:resource="@xml/appwidgetprovider"/>
         </receiver>
 
-        <service android:name=".Widgets.WidgetIntentService" >
+        <service android:name=".Widgets.WidgetIntentService">
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/appwidgetprovider" />
+                android:resource="@xml/appwidgetprovider"/>
         </service>
 
         <service
             android:name=".Service.FCMInstanceService"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
             </intent-filter>
         </service>
 
@@ -154,199 +178,204 @@
             android:name=".Service.FCMMessageInstanceService"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
 
         <activity
             android:name=".Widgets.WidgetConfigurationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Domoticz Widget Config" >
+            android:label="Domoticz Widget Config">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
+                android:resource="@xml/searchable"/>
         </activity>
 
-        <service android:name=".Widgets.WidgetProviderLarge$UpdateWidgetService" />
+        <service android:name=".Widgets.WidgetProviderLarge$UpdateWidgetService"/>
 
-        <receiver android:name=".Widgets.WidgetProviderSmall" >
+        <receiver android:name=".Widgets.WidgetProviderSmall">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/smallwidgetprovider" />
+                android:resource="@xml/smallwidgetprovider"/>
         </receiver>
 
         <activity
             android:name=".Widgets.SmallWidgetConfigurationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Domoticz Widget Config" >
+            android:label="Domoticz Widget Config">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
+                android:resource="@xml/searchable"/>
         </activity>
 
-        <service android:name=".Widgets.WidgetProviderSmall$UpdateWidgetService" />
+        <service android:name=".Widgets.WidgetProviderSmall$UpdateWidgetService"/>
 
         <activity
             android:name=".Widgets.SecurityWidgetConfigurationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Domoticz Security Panel Widget Config" >
+            android:label="Domoticz Security Panel Widget Config">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
         </activity>
 
-        <receiver android:name=".Widgets.SecurityWidgetProvider" >
+        <receiver android:name=".Widgets.SecurityWidgetProvider">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/securitywidgetprovider" />
+                android:resource="@xml/securitywidgetprovider"/>
         </receiver>
 
-        <service android:name=".Widgets.SecurityWidgetIntentService" >
+        <service android:name=".Widgets.SecurityWidgetIntentService">
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/securitywidgetprovider" />
+                android:resource="@xml/securitywidgetprovider"/>
         </service>
 
-        <service android:name=".Widgets.SecurityWidgetProvider$UpdateSecurityWidgetService" />
-        
-        <receiver android:name=".Service.BootUpReceiver" >
+        <service android:name=".Widgets.SecurityWidgetProvider$UpdateSecurityWidgetService"/>
+
+        <receiver android:name=".Service.BootUpReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.QUICKBOOT_POWERON"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </receiver>
 
-        <service android:name="nl.hnogames.domoticz.Service.GeofenceTransitionsIntentService" />
+        <service android:name="nl.hnogames.domoticz.Service.GeofenceTransitionsIntentService"/>
 
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name_domoticz"
-            android:launchMode="singleTop" >
+            android:launchMode="singleTop">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
 
             <intent-filter android:label="@string/app_name_domoticz">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
                 <!-- Accepts URIs that begin with "http://www.domoticz.com/open” or https -->
-                <data android:scheme="http"
+                <data
                     android:host="www.domoticz.com"
-                    android:pathPrefix="/open" />
-                <data android:scheme="https"
+                    android:pathPrefix="/open"
+                    android:scheme="http"/>
+                <data
                     android:host="www.domoticz.com"
-                    android:pathPrefix="/open" />
+                    android:pathPrefix="/open"
+                    android:scheme="https"/>
                 <!-- note that the leading "/" is required for pathPrefix-->
                 <!-- Accepts URIs that begin with "domoticz://open” -->
-                <data android:scheme="domoticz"
-                    android:host="open" />
+                <data
+                    android:host="open"
+                    android:scheme="domoticz"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
+                android:resource="@xml/searchable"/>
         </activity>
 
         <activity
             android:name=".SettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/settingsActivity_name"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".MainActivity"/>
         </activity>
 
         <activity
             android:name=".CameraActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/cameraActivity_name"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".MainActivity"/>
         </activity>
 
         <activity
             android:name=".GraphActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/wizard_graph"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".MainActivity"/>
         </activity>
 
         <activity
             android:name=".PlanActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/cameraActivity_name"
-            android:parentActivityName=".PlanActivity" >
+            android:parentActivityName=".PlanActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".MainActivity"/>
         </activity>
 
         <activity
             android:name=".ServerSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_server_settings"
-            android:parentActivityName=".SettingsActivity" >
+            android:parentActivityName=".SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="nl.hnogames.domoticz.SettingsActivity" />
+                android:value="nl.hnogames.domoticz.SettingsActivity"/>
         </activity>
 
         <activity
             android:name=".GeoSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_server_settings"
-            android:parentActivityName=".SettingsActivity" >
+            android:parentActivityName=".SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="nl.hnogames.domoticz.GeoSettingsActivity" />
+                android:value="nl.hnogames.domoticz.GeoSettingsActivity"/>
         </activity>
 
         <activity
             android:name=".NFCSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/category_nfc"
-            android:parentActivityName=".SettingsActivity" >
+            android:parentActivityName=".SettingsActivity">
             <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
@@ -354,75 +383,77 @@
             android:name=".SpeechSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/category_Speech"
-            android:parentActivityName=".SettingsActivity" />
+            android:parentActivityName=".SettingsActivity"/>
 
         <activity
             android:name=".QRCodeSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/category_QRCode"
-            android:parentActivityName=".SettingsActivity" />
+            android:parentActivityName=".SettingsActivity"/>
 
         <activity
             android:name=".QRCodeCaptureActivity"
             android:label="@string/category_QRCode"
             android:parentActivityName=".QRCodeSettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
 
         <activity
             android:name=".ServerListSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_server_settings"
-            android:parentActivityName=".SettingsActivity" >
+            android:parentActivityName=".SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="nl.hnogames.domoticz.ServerListSettingsActivity" />
+                android:value="nl.hnogames.domoticz.ServerListSettingsActivity"/>
         </activity>
 
         <activity
             android:name=".Welcome.WelcomeViewActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/welcome_title_activity_welcome"
-            android:theme="@style/Theme.Intro" />
+            android:theme="@style/AppThemeIntro"/>
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/googleapikey" />
+            android:value="@string/googleapikey"/>
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+            android:value="@integer/google_play_services_version"/>
         <meta-data
             android:name="com.google.android.gms.vision.DEPENDENCIES"
-            android:value="barcode" />
+            android:value="barcode"/>
 
         <activity
             android:name=".UpdateActivity"
             android:label="@string/title_activity_update"
             android:parentActivityName=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="nl.hnogames.domoticz.MainActivity" />
+                android:value="nl.hnogames.domoticz.MainActivity"/>
         </activity>
 
         <activity
             android:name="com.schibstedspain.leku.LocationPickerActivity"
             android:label="@string/title_add_location"
-            android:windowSoftInputMode="adjustPan"
             android:parentActivityName=".GeoSettingsActivity"
-            android:theme="@style/AppThemeMain">
+            android:theme="@style/AppThemeMain"
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
-            <meta-data android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable"/>
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".GeoSettingsActivity" />
+                android:value=".GeoSettingsActivity"/>
         </activity>
 
         <uses-library
             android:name="org.apache.http.legacy"
-            android:required="false" />
+            android:required="false"/>
 
     </application>
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b1d460e18..0cdcf3b91 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="nl.hnogames.domoticz" >
+          xmlns:tools="http://schemas.android.com/tools"
+          package="nl.hnogames.domoticz">
 
     <supports-screens
         android:anyDensity="true"
@@ -30,117 +30,141 @@
         android:normalScreens="true"
         android:resizeable="true"
         android:smallScreens="true"
-        android:xlargeScreens="true" />
-
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
-    <uses-feature android:glEsVersion="0x00020000" android:required="false" />
-    <uses-feature android:name="android.hardware.location.network" android:required="false" />
-    <uses-feature android:name="android.hardware.location.gps" android:required="false"  />
-    <uses-feature android:name="android.hardware.location" android:required="false"  />
-    <uses-feature android:name="android.hardware.nfc" android:required="false"/>
-    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
-    <uses-feature android:name="android.hardware.fingerprint" android:required="false"/>
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+        android:xlargeScreens="true"/>
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false"/>
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.location.network"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.location"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.microphone"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.fingerprint"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false"/>
 
     <permission
         android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE"
-        android:protectionLevel="signature" />
-
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+        android:protectionLevel="signature"/>
+
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="com.android.vending.CHECK_LICENSE"/>
 
     <application
         android:name=".app.AppController"
         android:allowBackup="true"
-        android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name_domoticz"
         android:theme="@style/AppThemeMain"
-        tools:replace="android:icon, android:label, android:theme, android:name" >
+        android:usesCleartextTraffic="true"
+        tools:replace="android:icon, android:label, android:theme, android:name">
 
-        <activity android:name=".Service.NFCServiceActivity" >
+        <activity android:name=".Service.NFCServiceActivity">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data
                     android:host="domoticz"
-                    android:scheme="app" />
+                    android:scheme="app"/>
             </intent-filter>
             <meta-data
                 android:name="android.nfc.action.TECH_DISCOVERED"
-                android:resource="@xml/nfc_tech_list" />
+                android:resource="@xml/nfc_tech_list"/>
         </activity>
 
-        <service android:name=".Service.RingtonePlayingService" />
+        <service android:name=".Service.RingtonePlayingService"/>
 
         <receiver
             android:name="nl.hnogames.domoticz.Service.LocationProviderChangedReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
-                <action android:name="android.location.PROVIDERS_CHANGED" />
-                <action android:name="android.location.MODE_CHANGED" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.location.PROVIDERS_CHANGED"/>
+                <action android:name="android.location.MODE_CHANGED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
 
-        <service android:name=".Service.WearMessageListenerService" >
+        <service android:name=".Service.WearMessageListenerService">
             <intent-filter>
-                <action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
-                <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
-                <action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED" />
-                <action android:name="com.google.android.gms.wearable.CHANNEL_EVENT" />
+                <action android:name="com.google.android.gms.wearable.DATA_CHANGED"/>
+                <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED"/>
+                <action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED"/>
+                <action android:name="com.google.android.gms.wearable.CHANNEL_EVENT"/>
+
                 <data
                     android:host="*"
-                    android:scheme="wear" />
+                    android:scheme="wear"/>
             </intent-filter>
         </service>
 
-        <service android:name=".Service.StopAlarmButtonListener" />
+        <service android:name=".Service.StopAlarmButtonListener"/>
 
         <service
             android:name=".Service.TaskService"
             android:exported="true"
-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE" >
+            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE">
             <intent-filter>
-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
+                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY"/>
             </intent-filter>
         </service>
 
-        <receiver android:name=".Widgets.WidgetProviderLarge" >
+        <receiver android:name=".Widgets.WidgetProviderLarge">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/appwidgetprovider" />
+                android:resource="@xml/appwidgetprovider"/>
         </receiver>
 
         <service
             android:name=".Service.FCMInstanceService"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
             </intent-filter>
         </service>
 
@@ -148,205 +172,210 @@
             android:name=".Service.FCMMessageInstanceService"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
 
-        <service android:name=".Widgets.WidgetIntentService" >
+        <service android:name=".Widgets.WidgetIntentService">
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/appwidgetprovider" />
+                android:resource="@xml/appwidgetprovider"/>
         </service>
 
         <activity
             android:name=".Widgets.WidgetConfigurationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Domoticz Widget Config" >
+            android:label="Domoticz Widget Config">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
+                android:resource="@xml/searchable"/>
         </activity>
 
-        <service android:name=".Widgets.WidgetProviderLarge$UpdateWidgetService" />
+        <service android:name=".Widgets.WidgetProviderLarge$UpdateWidgetService"/>
 
-        <receiver android:name=".Widgets.WidgetProviderSmall" >
+        <receiver android:name=".Widgets.WidgetProviderSmall">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/smallwidgetprovider" />
+                android:resource="@xml/smallwidgetprovider"/>
         </receiver>
 
         <activity
             android:name=".Widgets.SmallWidgetConfigurationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Domoticz Widget Config" >
+            android:label="Domoticz Widget Config">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
+                android:resource="@xml/searchable"/>
         </activity>
 
-        <service android:name=".Widgets.WidgetProviderSmall$UpdateWidgetService" />
+        <service android:name=".Widgets.WidgetProviderSmall$UpdateWidgetService"/>
 
         <activity
             android:name=".Widgets.SecurityWidgetConfigurationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Domoticz Security Panel Widget Config" >
+            android:label="Domoticz Security Panel Widget Config">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
         </activity>
 
-        <receiver android:name=".Widgets.SecurityWidgetProvider" >
+        <receiver android:name=".Widgets.SecurityWidgetProvider">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/securitywidgetprovider" />
+                android:resource="@xml/securitywidgetprovider"/>
         </receiver>
 
-        <service android:name=".Widgets.SecurityWidgetIntentService" >
+        <service android:name=".Widgets.SecurityWidgetIntentService">
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/securitywidgetprovider" />
+                android:resource="@xml/securitywidgetprovider"/>
         </service>
 
-        <service android:name=".Widgets.SecurityWidgetProvider$UpdateSecurityWidgetService" />
+        <service android:name=".Widgets.SecurityWidgetProvider$UpdateSecurityWidgetService"/>
 
-        <receiver android:name=".Service.BootUpReceiver" >
+        <receiver android:name=".Service.BootUpReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.QUICKBOOT_POWERON"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </receiver>
 
-        <service android:name="nl.hnogames.domoticz.Service.GeofenceTransitionsIntentService" />
+        <service android:name="nl.hnogames.domoticz.Service.GeofenceTransitionsIntentService"/>
 
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name_domoticz"
-            android:launchMode="singleTop" >
+            android:launchMode="singleTop">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
 
             <intent-filter android:label="@string/app_name_domoticz">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
                 <!-- Accepts URIs that begin with "http://www.domoticz.com/open” or https -->
-                <data android:scheme="http"
+                <data
                     android:host="www.domoticz.com"
-                    android:pathPrefix="/open" />
-                <data android:scheme="https"
+                    android:pathPrefix="/open"
+                    android:scheme="http"/>
+                <data
                     android:host="www.domoticz.com"
-                    android:pathPrefix="/open" />
+                    android:pathPrefix="/open"
+                    android:scheme="https"/>
                 <!-- note that the leading "/" is required for pathPrefix-->
                 <!-- Accepts URIs that begin with "domoticz://open” -->
-                <data android:scheme="domoticz"
-                    android:host="open" />
+                <data
+                    android:host="open"
+                    android:scheme="domoticz"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
+                android:resource="@xml/searchable"/>
         </activity>
 
         <activity
             android:name=".SettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/settingsActivity_name"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".MainActivity"/>
         </activity>
 
         <activity
             android:name=".CameraActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/cameraActivity_name"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".MainActivity"/>
         </activity>
 
         <activity
             android:name=".GraphActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/wizard_graph"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".MainActivity"/>
         </activity>
 
         <activity
             android:name=".PlanActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/cameraActivity_name"
-            android:parentActivityName=".PlanActivity" >
+            android:parentActivityName=".PlanActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".MainActivity"/>
         </activity>
 
         <activity
             android:name=".ServerSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_server_settings"
-            android:parentActivityName=".SettingsActivity" >
+            android:parentActivityName=".SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="nl.hnogames.domoticz.SettingsActivity" />
+                android:value="nl.hnogames.domoticz.SettingsActivity"/>
         </activity>
 
         <activity
             android:name=".GeoSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_server_settings"
-            android:parentActivityName=".SettingsActivity" >
+            android:parentActivityName=".SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="nl.hnogames.domoticz.GeoSettingsActivity" />
+                android:value="nl.hnogames.domoticz.GeoSettingsActivity"/>
         </activity>
 
         <activity
             android:name=".NFCSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/category_nfc"
-            android:parentActivityName=".SettingsActivity" >
+            android:parentActivityName=".SettingsActivity">
             <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
@@ -354,75 +383,77 @@
             android:name=".SpeechSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/category_Speech"
-            android:parentActivityName=".SettingsActivity" />
+            android:parentActivityName=".SettingsActivity"/>
 
         <activity
             android:name=".QRCodeSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/category_QRCode"
-            android:parentActivityName=".SettingsActivity" />
+            android:parentActivityName=".SettingsActivity"/>
 
         <activity
             android:name=".QRCodeCaptureActivity"
             android:label="@string/category_QRCode"
             android:parentActivityName=".QRCodeSettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
 
         <activity
             android:name=".ServerListSettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_server_settings"
-            android:parentActivityName=".SettingsActivity" >
+            android:parentActivityName=".SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="nl.hnogames.domoticz.ServerListSettingsActivity" />
+                android:value="nl.hnogames.domoticz.ServerListSettingsActivity"/>
         </activity>
 
         <activity
             android:name=".Welcome.WelcomeViewActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/welcome_title_activity_welcome"
-            android:theme="@style/Theme.Intro" />
+            android:theme="@style/AppThemeIntro"/>
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/googleapikey" />
+            android:value="@string/googleapikey"/>
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+            android:value="@integer/google_play_services_version"/>
         <meta-data
             android:name="com.google.android.gms.vision.DEPENDENCIES"
-            android:value="barcode" />
+            android:value="barcode"/>
 
         <activity
             android:name=".UpdateActivity"
             android:label="@string/title_activity_update"
             android:parentActivityName=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="nl.hnogames.domoticz.MainActivity" />
+                android:value="nl.hnogames.domoticz.MainActivity"/>
         </activity>
 
         <activity
             android:name="com.schibstedspain.leku.LocationPickerActivity"
             android:label="@string/title_add_location"
-            android:windowSoftInputMode="adjustPan"
             android:parentActivityName=".GeoSettingsActivity"
-            android:theme="@style/AppThemeMain">
+            android:theme="@style/AppThemeMain"
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
-            <meta-data android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable"/>
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".GeoSettingsActivity" />
+                android:value=".GeoSettingsActivity"/>
         </activity>
 
         <uses-library
             android:name="org.apache.http.legacy"
-            android:required="false" />
+            android:required="false"/>
 
     </application>
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java
index 066eb9890..cce132cfc 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java
@@ -22,8 +22,8 @@
 package nl.hnogames.domoticz.Adapters;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -73,9 +73,13 @@ public DataObjectHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewTy
             .inflate(R.layout.camera_row, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.row_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(mContext, R.color.card_background_dark));
+            if ((view.findViewById(R.id.row_wrapper)) != null)
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(mContext, R.color.card_background_dark));
+            if ((view.findViewById(R.id.row_global_wrapper)) != null)
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(mContext, R.color.card_background_dark));
         }
-
         return new DataObjectHolder(view);
     }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/DashboardAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/DashboardAdapter.java
index b0cebbd86..416017ea2 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/DashboardAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/DashboardAdapter.java
@@ -24,7 +24,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.Color;
+import android.support.design.chip.Chip;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -35,7 +35,6 @@
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.Filter;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
@@ -78,7 +77,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Data
 
     public ArrayList<DevicesInfo> data = null;
     public ArrayList<DevicesInfo> filteredData = null;
-    private boolean showAsList = false;
+    private boolean showAsList;
     private Domoticz domoticz;
     private Context context;
     private switchesClickListener listener;
@@ -98,7 +97,6 @@ public DashboardAdapter(Context context,
 
         this.context = context;
         domoticz = new Domoticz(context, AppController.getInstance().getRequestQueue());
-
         mConfigInfo = serverUtil.getActiveServer().getConfigInfo(context);
         this.listener = listener;
 
@@ -149,33 +147,19 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
                 .inflate(R.layout.dashboard_row, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) row.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((row.findViewById(R.id.card_global_wrapper)) != null)
+                row.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((row.findViewById(R.id.row_wrapper)) != null)
-                (row.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (row.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((row.findViewById(R.id.row_global_wrapper)) != null)
-                (row.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
-            if ((row.findViewById(R.id.day_button)) != null)
-                (row.findViewById(R.id.day_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.year_button)) != null)
-                (row.findViewById(R.id.year_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.month_button)) != null)
-                (row.findViewById(R.id.month_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.week_button)) != null)
-                (row.findViewById(R.id.week_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.log_button)) != null)
-                (row.findViewById(R.id.log_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.timer_button)) != null)
-                (row.findViewById(R.id.timer_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.notifications_button)) != null)
-                (row.findViewById(R.id.notifications_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
+                (row.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((row.findViewById(R.id.on_button)) != null)
-                (row.findViewById(R.id.on_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (row.findViewById(R.id.on_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             if ((row.findViewById(R.id.off_button)) != null)
-                (row.findViewById(R.id.off_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (row.findViewById(R.id.off_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             if ((row.findViewById(R.id.color_button)) != null)
-                (row.findViewById(R.id.color_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
+                (row.findViewById(R.id.color_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark_status));
         }
-
         return new DataObjectHolder(row);
     }
 
@@ -187,8 +171,9 @@ public void onBindViewHolder(DataObjectHolder holder, final int position) {
             if (!this.mSharedPrefs.darkThemeEnabled()) {
                 holder.pieView.setInnerBackgroundColor(ContextCompat.getColor(context, R.color.white));
                 holder.pieView.setTextColor(ContextCompat.getColor(context, R.color.black));
-                holder.pieView.setPercentageTextSize(17);
             }
+            holder.pieView.setPercentageTextSize(16);
+            holder.pieView.setPercentageBackgroundColor(ContextCompat.getColor(context, R.color.material_orange_600));
 
             setSwitchRowData(extendedStatusInfo, holder);
             holder.itemView.setOnClickListener(new View.OnClickListener() {
@@ -204,6 +189,12 @@ public boolean onLongClick(View v) {
                     return true;
                 }
             });
+            holder.infoIcon.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    listener.onItemLongClicked(position);
+                }
+            });
         }
     }
 
@@ -254,6 +245,7 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
                 case DomoticzValues.Device.Type.Value.ON_OFF:
                 case DomoticzValues.Device.Type.Value.MEDIAPLAYER:
                 case DomoticzValues.Device.Type.Value.DOORLOCK:
+                case DomoticzValues.Device.Type.Value.DOORLOCKINVERTED:
                 case DomoticzValues.Device.Type.Value.DOORCONTACT:
                     switch (mDeviceInfo.getSwitchType()) {
                         case DomoticzValues.Device.Type.Name.SECURITY:
@@ -308,7 +300,8 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
                 case DomoticzValues.Device.Type.Value.DIMMER:
                 case DomoticzValues.Device.Type.Value.BLINDPERCENTAGE:
                 case DomoticzValues.Device.Type.Value.BLINDPERCENTAGEINVERTED:
-                    if (mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.RGB)) {
+                    if (mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.RGB) ||
+                        mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.WW)) {
                         if (mSharedPrefs.showSwitchesAsButtons()) {
                             setButtons(holder, Buttons.DIMMER_BUTTONS);
                             setDimmerOnOffButtonRowData(mDeviceInfo, holder, true);
@@ -507,7 +500,7 @@ private void setSecurityPanelSwitchRowData(DevicesInfo mDeviceInfo, DataObjectHo
                 holder.buttonOn.setText(context.getString(R.string.button_arm));
 
             if (mSharedPrefs.darkThemeEnabled())
-                holder.buttonOn.setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                holder.buttonOn.setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             else
                 holder.buttonOn.setBackground(ContextCompat.getDrawable(context, R.drawable.button_on));
 
@@ -1692,6 +1685,14 @@ public void setButtons(DataObjectHolder holder, int button) {
             holder.signal_level.setVisibility(View.GONE);
             holder.switch_battery_level.setVisibility(View.GONE);
         }
+        if (!mSharedPrefs.showExtraData()) {
+            holder.infoIcon.setVisibility(View.GONE);
+        } else {
+            if (showAsList) {
+                ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) holder.iconRow.getLayoutParams();
+                p.leftMargin = -15;
+            }
+        }
 
         switch (button) {
             case Buttons.SWITCH:
@@ -1810,40 +1811,42 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder {
 
         TextView switch_name, signal_level, switch_status, switch_battery_level, switch_dimmer_level;
         Switch onOffSwitch, dimmerOnOffSwitch;
-        ImageButton buttonUp, buttonDown, buttonStop;
-        Button buttonOn, buttonLog, buttonTimer, buttonColor, buttonSetStatus, buttonSet, buttonOff;
+        ImageView buttonUp, buttonDown, buttonStop;
+        Button buttonOn, buttonColor, buttonSetStatus, buttonSet, buttonOff;
+        Chip buttonLog, buttonTimer;
         Boolean isProtected;
         ImageView iconRow, iconMode;
         SeekBar dimmer;
         Spinner spSelector;
         LinearLayout extraPanel;
         PieView pieView;
+        ImageView infoIcon;
 
         public DataObjectHolder(View itemView) {
             super(itemView);
 
-            extraPanel = (LinearLayout) itemView.findViewById(R.id.extra_panel);
-            pieView = (PieView) itemView.findViewById(R.id.pieView);
-            buttonOn = (Button) itemView.findViewById(R.id.on_button);
-            buttonOff = (Button) itemView.findViewById(R.id.off_button);
-            onOffSwitch = (Switch) itemView.findViewById(R.id.switch_button);
-            signal_level = (TextView) itemView.findViewById(R.id.switch_signal_level);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            switch_name = (TextView) itemView.findViewById(R.id.switch_name);
-            switch_battery_level = (TextView) itemView.findViewById(R.id.switch_battery_level);
-
-            switch_dimmer_level = (TextView) itemView.findViewById(R.id.switch_dimmer_level);
-            dimmerOnOffSwitch = (Switch) itemView.findViewById(R.id.switch_dimmer_switch);
-            dimmer = (SeekBar) itemView.findViewById(R.id.switch_dimmer);
-            spSelector = (Spinner) itemView.findViewById(R.id.spSelector);
-            buttonColor = (Button) itemView.findViewById(R.id.color_button);
-            buttonLog = (Button) itemView.findViewById(R.id.log_button);
-            buttonTimer = (Button) itemView.findViewById(R.id.timer_button);
-            buttonUp = (ImageButton) itemView.findViewById(R.id.switch_button_up);
-            buttonStop = (ImageButton) itemView.findViewById(R.id.switch_button_stop);
-            buttonDown = (ImageButton) itemView.findViewById(R.id.switch_button_down);
-            buttonSet = (Button) itemView.findViewById(R.id.set_button);
-            buttonSetStatus = (Button) itemView.findViewById(R.id.set_button);
+            extraPanel = itemView.findViewById(R.id.extra_panel);
+            pieView = itemView.findViewById(R.id.pieView);
+            buttonOn = itemView.findViewById(R.id.on_button);
+            buttonOff = itemView.findViewById(R.id.off_button);
+            onOffSwitch = itemView.findViewById(R.id.switch_button);
+            signal_level = itemView.findViewById(R.id.switch_signal_level);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            switch_name = itemView.findViewById(R.id.switch_name);
+            switch_battery_level = itemView.findViewById(R.id.switch_battery_level);
+            infoIcon = itemView.findViewById(R.id.widget_info_icon);
+            switch_dimmer_level = itemView.findViewById(R.id.switch_dimmer_level);
+            dimmerOnOffSwitch = itemView.findViewById(R.id.switch_dimmer_switch);
+            dimmer = itemView.findViewById(R.id.switch_dimmer);
+            spSelector = itemView.findViewById(R.id.spSelector);
+            buttonColor = itemView.findViewById(R.id.color_button);
+            buttonLog = itemView.findViewById(R.id.log_button);
+            buttonTimer = itemView.findViewById(R.id.timer_button);
+            buttonUp = itemView.findViewById(R.id.switch_button_up);
+            buttonStop = itemView.findViewById(R.id.switch_button_stop);
+            buttonDown = itemView.findViewById(R.id.switch_button_down);
+            buttonSet = itemView.findViewById(R.id.set_button);
+            buttonSetStatus = itemView.findViewById(R.id.set_button);
 
             if (buttonLog != null)
                 buttonLog.setVisibility(View.GONE);
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/EventsAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/EventsAdapter.java
index 683689a08..8473cc528 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/EventsAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/EventsAdapter.java
@@ -22,7 +22,6 @@
 package nl.hnogames.domoticz.Adapters;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -85,11 +84,12 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             .inflate(R.layout.event_row_default, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_wrapper)) != null)
-                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_global_wrapper)) != null)
-                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
         }
 
         return new DataObjectHolder(view);
@@ -155,11 +155,10 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder
 
         public DataObjectHolder(View itemView) {
             super(itemView);
-            name = (TextView) itemView.findViewById(R.id.logs_name);
-            message = (TextView) itemView.findViewById(R.id.logs_message);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            buttonON = (Switch) itemView.findViewById(R.id.switch_button);
-
+            name = itemView.findViewById(R.id.logs_name);
+            message = itemView.findViewById(R.id.logs_message);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            buttonON = itemView.findViewById(R.id.switch_button);
             itemView.setOnClickListener(this);
         }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/LocationAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/LocationAdapter.java
index c94ff38e1..ccd98fcb8 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/LocationAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/LocationAdapter.java
@@ -92,18 +92,22 @@ public View getView(int position, View convertView, ViewGroup parent) {
         convertView = inflater.inflate(R.layout.geo_row_location, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
-            (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+            if ((convertView.findViewById(R.id.card_global_wrapper)) != null)
+                convertView.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_wrapper)) != null)
+                (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_global_wrapper)) != null)
+                (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
 
             if ((convertView.findViewById(R.id.remove_button)) != null)
-                (convertView.findViewById(R.id.remove_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (convertView.findViewById(R.id.remove_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
         }
 
-        holder.enable = (CheckBox) convertView.findViewById(R.id.enableSwitch);
-        holder.name = (TextView) convertView.findViewById(R.id.location_name);
-        holder.radius = (TextView) convertView.findViewById(R.id.location_radius);
-        holder.connectedSwitch = (TextView) convertView.findViewById(R.id.location_connectedSwitch);
-        holder.remove = (Button) convertView.findViewById(R.id.remove_button);
+        holder.enable = convertView.findViewById(R.id.enableSwitch);
+        holder.name = convertView.findViewById(R.id.location_name);
+        holder.radius = convertView.findViewById(R.id.location_radius);
+        holder.connectedSwitch = convertView.findViewById(R.id.location_connectedSwitch);
+        holder.remove = convertView.findViewById(R.id.remove_button);
         holder.name.setText(mLocationInfo.getName());
         holder.radius.setText(context.getString(R.string.radius) + ": " + mLocationInfo.getRadius());
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/LogAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/LogAdapter.java
index 7e93809fe..877df7beb 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/LogAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/LogAdapter.java
@@ -22,7 +22,6 @@
 package nl.hnogames.domoticz.Adapters;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -79,13 +78,13 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
             .inflate(R.layout.logs_row_default, parent, false);
 
-
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_wrapper)) != null)
-                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_global_wrapper)) != null)
-                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
         }
 
         return new DataObjectHolder(view);
@@ -141,11 +140,10 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder
         public DataObjectHolder(View itemView) {
             super(itemView);
 
-            name = (TextView) itemView.findViewById(R.id.logs_name);
-            datetime = (TextView) itemView.findViewById(R.id.logs_datetime);
-            message = (TextView) itemView.findViewById(R.id.logs_message);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-
+            name = itemView.findViewById(R.id.logs_name);
+            datetime = itemView.findViewById(R.id.logs_datetime);
+            message = itemView.findViewById(R.id.logs_message);
+            iconRow = itemView.findViewById(R.id.rowIcon);
             itemView.setOnClickListener(this);
         }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/NFCAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/NFCAdapter.java
index 5e9f207ff..d56b3c97f 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/NFCAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/NFCAdapter.java
@@ -96,18 +96,22 @@ public View getView(int position, View convertView, ViewGroup parent) {
         convertView = inflater.inflate(layoutResourceId, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
-            (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+            if ((convertView.findViewById(R.id.card_global_wrapper)) != null)
+                convertView.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_wrapper)) != null)
+                (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_global_wrapper)) != null)
+                (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
 
             if ((convertView.findViewById(R.id.remove_button)) != null)
-                (convertView.findViewById(R.id.remove_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (convertView.findViewById(R.id.remove_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
         }
 
-        holder.enable = (CheckBox) convertView.findViewById(R.id.enableNFC);
-        holder.nfc_name = (TextView) convertView.findViewById(R.id.nfc_name);
-        holder.nfc_tag_id = (TextView) convertView.findViewById(R.id.nfc_tag_id);
-        holder.nfc_switch_idx = (TextView) convertView.findViewById(R.id.nfc_switchidx);
-        holder.remove = (Button) convertView.findViewById(R.id.remove_button);
+        holder.enable = convertView.findViewById(R.id.enableNFC);
+        holder.nfc_name = convertView.findViewById(R.id.nfc_name);
+        holder.nfc_tag_id = convertView.findViewById(R.id.nfc_tag_id);
+        holder.nfc_switch_idx = convertView.findViewById(R.id.nfc_switchidx);
+        holder.remove = convertView.findViewById(R.id.remove_button);
 
         holder.nfc_name.setText(mNFCInfo.getName());
         holder.nfc_tag_id.setText(mNFCInfo.getId());
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/NotificationsAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/NotificationsAdapter.java
index d2b5102c9..a68ecc605 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/NotificationsAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/NotificationsAdapter.java
@@ -81,9 +81,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 LayoutInflater inflater = ((Activity) context).getLayoutInflater();
                 convertView = inflater.inflate(layoutResourceId, parent, false);
 
-                holder.switch_name = (TextView) convertView.findViewById(R.id.switch_name);
-                holder.switch_status = (TextView) convertView.findViewById(R.id.switch_battery_level);
-                holder.signal_level = (TextView) convertView.findViewById(R.id.switch_signal_level);
+                holder.switch_name = convertView.findViewById(R.id.switch_name);
+                holder.switch_status = convertView.findViewById(R.id.switch_battery_level);
+                holder.signal_level = convertView.findViewById(R.id.switch_signal_level);
 
                 holder.switch_name.setText(mNotificationInfo.getCustomMessage());
                 String priority = "";
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/PlansAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/PlansAdapter.java
index 8b754e65a..26bb44e34 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/PlansAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/PlansAdapter.java
@@ -22,7 +22,7 @@
 package nl.hnogames.domoticz.Adapters;
 
 import android.content.Context;
-import android.graphics.Color;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -62,7 +62,12 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             .inflate(R.layout.plan_row, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.row_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(mContext, R.color.card_background_dark));
+            if ((view.findViewById(R.id.row_wrapper)) != null)
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(mContext, R.color.card_background_dark));
+            if ((view.findViewById(R.id.row_global_wrapper)) != null)
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(mContext, R.color.card_background_dark));
         }
 
         return new DataObjectHolder(view);
@@ -99,8 +104,8 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder
 
         public DataObjectHolder(View itemView) {
             super(itemView);
-            name = (TextView) itemView.findViewById(R.id.name);
-            devices = (TextView) itemView.findViewById(R.id.devices);
+            name = itemView.findViewById(R.id.name);
+            devices = itemView.findViewById(R.id.devices);
             itemView.setOnClickListener(this);
         }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/QRCodeAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/QRCodeAdapter.java
index 0f4b4e728..ab983cdb8 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/QRCodeAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/QRCodeAdapter.java
@@ -96,18 +96,21 @@ public View getView(int position, View convertView, ViewGroup parent) {
         convertView = inflater.inflate(layoutResourceId, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
-            (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
-
+            if ((convertView.findViewById(R.id.card_global_wrapper)) != null)
+                convertView.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_wrapper)) != null)
+                (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_global_wrapper)) != null)
+                (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((convertView.findViewById(R.id.remove_button)) != null)
-                (convertView.findViewById(R.id.remove_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (convertView.findViewById(R.id.remove_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
         }
 
-        holder.enable = (CheckBox) convertView.findViewById(R.id.enableNFC);
-        holder.nfc_name = (TextView) convertView.findViewById(R.id.nfc_name);
-        holder.nfc_tag_id = (TextView) convertView.findViewById(R.id.nfc_tag_id);
-        holder.nfc_switch_idx = (TextView) convertView.findViewById(R.id.nfc_switchidx);
-        holder.remove = (Button) convertView.findViewById(R.id.remove_button);
+        holder.enable = convertView.findViewById(R.id.enableNFC);
+        holder.nfc_name = convertView.findViewById(R.id.nfc_name);
+        holder.nfc_tag_id = convertView.findViewById(R.id.nfc_tag_id);
+        holder.nfc_switch_idx = convertView.findViewById(R.id.nfc_switchidx);
+        holder.remove = convertView.findViewById(R.id.remove_button);
 
         holder.nfc_name.setText(mQRCodeInfo.getName());
         holder.nfc_tag_id.setText(mQRCodeInfo.getId());
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/SceneAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/SceneAdapter.java
index bdad4798c..dd1aa8e93 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/SceneAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/SceneAdapter.java
@@ -22,7 +22,7 @@
 package nl.hnogames.domoticz.Adapters;
 
 import android.content.Context;
-import android.graphics.Color;
+import android.support.design.chip.Chip;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -101,11 +101,12 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             .inflate(R.layout.scene_row_default, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_wrapper)) != null)
-                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_global_wrapper)) != null)
-                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
         }
 
         return new DataObjectHolder(view);
@@ -113,7 +114,12 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 
     @Override
     public void onBindViewHolder(final DataObjectHolder holder, final int position) {
-
+        holder.infoIcon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onItemLongClicked(position);
+            }
+        });
         if (filteredData != null && filteredData.size() > 0) {
             final SceneInfo mSceneInfo = filteredData.get(position);
 
@@ -123,17 +129,10 @@ public void onBindViewHolder(final DataObjectHolder holder, final int position)
                 setButtons(holder, Buttons.SCENE);
                 if (mSharedPrefs.darkThemeEnabled()) {
                     if ((holder.itemView.findViewById(R.id.on_button)) != null)
-                        (holder.itemView.findViewById(R.id.on_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                        (holder.itemView.findViewById(R.id.on_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
                     if ((holder.itemView.findViewById(R.id.off_button)) != null)
-                        (holder.itemView.findViewById(R.id.off_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
-                    if ((holder.itemView.findViewById(R.id.log_button)) != null)
-                        (holder.itemView.findViewById(R.id.log_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
-                    if ((holder.itemView.findViewById(R.id.notifications_button)) != null)
-                        (holder.itemView.findViewById(R.id.notifications_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
-                    if ((holder.itemView.findViewById(R.id.timer_button)) != null)
-                        (holder.itemView.findViewById(R.id.timer_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
+                        (holder.itemView.findViewById(R.id.off_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
                 }
-
                 if (holder.buttonTimer != null)
                     holder.buttonTimer.setVisibility(View.GONE);
                 if (holder.buttonNotifications != null)
@@ -199,15 +198,9 @@ public void onClick(View v) {
                 setButtons(holder, Buttons.GROUP);
                 if (mSharedPrefs.darkThemeEnabled()) {
                     if ((holder.itemView.findViewById(R.id.on_button)) != null)
-                        (holder.itemView.findViewById(R.id.on_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                        (holder.itemView.findViewById(R.id.on_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
                     if ((holder.itemView.findViewById(R.id.off_button)) != null)
-                        (holder.itemView.findViewById(R.id.off_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
-                    if ((holder.itemView.findViewById(R.id.log_button)) != null)
-                        (holder.itemView.findViewById(R.id.log_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
-                    if ((holder.itemView.findViewById(R.id.notifications_button)) != null)
-                        (holder.itemView.findViewById(R.id.notifications_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
-                    if ((holder.itemView.findViewById(R.id.timer_button)) != null)
-                        (holder.itemView.findViewById(R.id.timer_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
+                        (holder.itemView.findViewById(R.id.off_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
                 }
 
                 if (holder.buttonTimer != null)
@@ -356,33 +349,35 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder {
         ImageView iconRow;
         LikeButton likeButton;
         LinearLayout extraPanel;
-        Button buttonOn, buttonLog, buttonTimer, buttonNotifications, buttonOff;
+        Button buttonOn, buttonOff;
+        Chip buttonLog, buttonTimer, buttonNotifications;
+        ImageView infoIcon;
 
         public DataObjectHolder(View itemView) {
             super(itemView);
 
-            buttonOn = (Button) itemView.findViewById(R.id.on_button);
-            signal_level = (TextView) itemView.findViewById(R.id.switch_signal_level);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            switch_name = (TextView) itemView.findViewById(R.id.switch_name);
-            switch_battery_level = (TextView) itemView.findViewById(R.id.switch_battery_level);
-
-            buttonLog = (Button) itemView.findViewById(R.id.log_button);
-            buttonTimer = (Button) itemView.findViewById(R.id.timer_button);
-            buttonNotifications = (Button) itemView.findViewById(R.id.notifications_button);
-            likeButton = (LikeButton) itemView.findViewById(R.id.fav_button);
+            buttonOn = itemView.findViewById(R.id.on_button);
+            signal_level = itemView.findViewById(R.id.switch_signal_level);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            switch_name = itemView.findViewById(R.id.switch_name);
+            switch_battery_level = itemView.findViewById(R.id.switch_battery_level);
+            infoIcon = itemView.findViewById(R.id.widget_info_icon);
+            buttonLog = itemView.findViewById(R.id.log_button);
+            buttonTimer = itemView.findViewById(R.id.timer_button);
+            buttonNotifications = itemView.findViewById(R.id.notifications_button);
+            likeButton = itemView.findViewById(R.id.fav_button);
 
             if (buttonTimer != null)
                 buttonTimer.setVisibility(View.GONE);
             if (buttonNotifications != null)
                 buttonNotifications.setVisibility(View.GONE);
 
-            likeButton = (LikeButton) itemView.findViewById(R.id.fav_button);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            buttonLog = (Button) itemView.findViewById(R.id.log_button);
-            buttonOff = (Button) itemView.findViewById(R.id.off_button);
+            likeButton = itemView.findViewById(R.id.fav_button);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            buttonLog = itemView.findViewById(R.id.log_button);
+            buttonOff = itemView.findViewById(R.id.off_button);
 
-            extraPanel = (LinearLayout) itemView.findViewById(R.id.extra_panel);
+            extraPanel = itemView.findViewById(R.id.extra_panel);
             if (extraPanel != null)
                 extraPanel.setVisibility(View.GONE);
         }
@@ -409,10 +404,8 @@ protected FilterResults performFiltering(CharSequence constraint) {
                     sceneInfos.add(filterableObject);
                 }
             }
-
             results.values = sceneInfos;
             results.count = sceneInfos.size();
-
             return results;
         }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/ServerAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/ServerAdapter.java
index f73aff8e7..d20ca2047 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/ServerAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/ServerAdapter.java
@@ -93,18 +93,21 @@ public View getView(int position, View convertView, ViewGroup parent) {
         convertView = inflater.inflate(layoutResourceId, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
-            (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
-
+            if ((convertView.findViewById(R.id.card_global_wrapper)) != null)
+                convertView.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_wrapper)) != null)
+                (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_global_wrapper)) != null)
+                (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((convertView.findViewById(R.id.remove_button)) != null)
-                (convertView.findViewById(R.id.remove_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (convertView.findViewById(R.id.remove_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
         }
 
-        holder.enable = (CheckBox) convertView.findViewById(R.id.enableServer);
-        holder.server_name = (TextView) convertView.findViewById(R.id.server_name);
-        holder.server_remote_url = (TextView) convertView.findViewById(R.id.server_remote_ip);
-        holder.server_local_url = (TextView) convertView.findViewById(R.id.server_local_ip);
-        holder.remove = (Button) convertView.findViewById(R.id.remove_button);
+        holder.enable = convertView.findViewById(R.id.enableServer);
+        holder.server_name = convertView.findViewById(R.id.server_name);
+        holder.server_remote_url = convertView.findViewById(R.id.server_remote_ip);
+        holder.server_local_url = convertView.findViewById(R.id.server_local_ip);
+        holder.remove = convertView.findViewById(R.id.remove_button);
 
         holder.server_local_url.setText(context.getString(R.string.local) + ": " + mServerInfo.getLocalServerUrl());
         holder.server_remote_url.setText(context.getString(R.string.remote) + ": " + mServerInfo.getRemoteServerUrl());
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/SpeechAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/SpeechAdapter.java
index 36d8f0263..0a6166db3 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/SpeechAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/SpeechAdapter.java
@@ -96,18 +96,21 @@ public View getView(int position, View convertView, ViewGroup parent) {
         convertView = inflater.inflate(layoutResourceId, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
-            (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
-
+            if ((convertView.findViewById(R.id.card_global_wrapper)) != null)
+                convertView.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_wrapper)) != null)
+                (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_global_wrapper)) != null)
+                (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((convertView.findViewById(R.id.remove_button)) != null)
-                (convertView.findViewById(R.id.remove_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (convertView.findViewById(R.id.remove_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
         }
 
-        holder.enable = (CheckBox) convertView.findViewById(R.id.enableSpeech);
-        holder.Speech_name = (TextView) convertView.findViewById(R.id.speech_name);
-        holder.Speech_tag_id = (TextView) convertView.findViewById(R.id.speech_tag_id);
-        holder.Speech_switch_idx = (TextView) convertView.findViewById(R.id.speech_switchidx);
-        holder.remove = (Button) convertView.findViewById(R.id.remove_button);
+        holder.enable = convertView.findViewById(R.id.enableSpeech);
+        holder.Speech_name = convertView.findViewById(R.id.speech_name);
+        holder.Speech_tag_id = convertView.findViewById(R.id.speech_tag_id);
+        holder.Speech_switch_idx = convertView.findViewById(R.id.speech_switchidx);
+        holder.remove = convertView.findViewById(R.id.remove_button);
 
         holder.Speech_name.setText(mSpeechInfo.getName());
         if (!UsefulBits.isEmpty(mSpeechInfo.getSwitchName())) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/SwitchesAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/SwitchesAdapter.java
index 234c5ac39..691981aa2 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/SwitchesAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/SwitchesAdapter.java
@@ -24,7 +24,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.Color;
+import android.support.design.chip.Chip;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -35,7 +35,6 @@
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.Filter;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
@@ -151,34 +150,21 @@ public Filter getFilter() {
     public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View row = null;
         row = LayoutInflater.from(parent.getContext())
-            .inflate(R.layout.dashboard_row_list, parent, false);
+            .inflate(R.layout.switch_row_list, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) row.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((row.findViewById(R.id.card_global_wrapper)) != null)
+                row.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((row.findViewById(R.id.row_wrapper)) != null)
-                (row.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (row.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((row.findViewById(R.id.row_global_wrapper)) != null)
-                (row.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
-            if ((row.findViewById(R.id.day_button)) != null)
-                (row.findViewById(R.id.day_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.year_button)) != null)
-                (row.findViewById(R.id.year_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.month_button)) != null)
-                (row.findViewById(R.id.month_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.week_button)) != null)
-                (row.findViewById(R.id.week_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.log_button)) != null)
-                (row.findViewById(R.id.log_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.timer_button)) != null)
-                (row.findViewById(R.id.timer_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            if ((row.findViewById(R.id.notifications_button)) != null)
-                (row.findViewById(R.id.notifications_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
+                (row.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((row.findViewById(R.id.on_button)) != null)
-                (row.findViewById(R.id.on_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (row.findViewById(R.id.on_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             if ((row.findViewById(R.id.off_button)) != null)
-                (row.findViewById(R.id.off_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (row.findViewById(R.id.off_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             if ((row.findViewById(R.id.color_button)) != null)
-                (row.findViewById(R.id.color_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
+                (row.findViewById(R.id.color_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark_status));
         }
 
         return new DataObjectHolder(row);
@@ -197,7 +183,12 @@ public void onClick(View v) {
                     handleLogButtonClick(v.getId());
                 }
             });
-
+            holder.infoIcon.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    listener.onItemLongClicked(position);
+                }
+            });
             if (holder.likeButton != null) {
                 holder.likeButton.setId(extendedStatusInfo.getIdx());
                 holder.likeButton.setLiked(extendedStatusInfo.getFavoriteBoolean());
@@ -292,6 +283,7 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
                 case DomoticzValues.Device.Type.Value.ON_OFF:
                 case DomoticzValues.Device.Type.Value.MEDIAPLAYER:
                 case DomoticzValues.Device.Type.Value.DOORLOCK:
+                case DomoticzValues.Device.Type.Value.DOORLOCKINVERTED:
                 case DomoticzValues.Device.Type.Value.DOORCONTACT:
                     switch (mDeviceInfo.getSwitchType()) {
                         case DomoticzValues.Device.Type.Name.SECURITY:
@@ -352,7 +344,8 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
                 case DomoticzValues.Device.Type.Value.DIMMER:
                 case DomoticzValues.Device.Type.Value.BLINDPERCENTAGE:
                 case DomoticzValues.Device.Type.Value.BLINDPERCENTAGEINVERTED:
-                    if (mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.RGB)) {
+                    if (mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.RGB) ||
+                        mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.WW)) {
                         if (mSharedPrefs.showSwitchesAsButtons()) {
                             setButtons(holder, Buttons.DIMMER_BUTTONS);
                             setDimmerOnOffButtonRowData(mDeviceInfo, holder, true);
@@ -509,7 +502,7 @@ private void setSecurityPanelSwitchRowData(DevicesInfo mDeviceInfo, DataObjectHo
                 holder.buttonOn.setText(context.getString(R.string.button_arm));
 
             if (mSharedPrefs.darkThemeEnabled())
-                holder.buttonOn.setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                holder.buttonOn.setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             else
                 holder.buttonOn.setBackground(ContextCompat.getDrawable(context, R.drawable.button_on));
 
@@ -1796,49 +1789,49 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder {
 
         TextView switch_name, signal_level, switch_status, switch_battery_level, switch_dimmer_level;
         Switch onOffSwitch, dimmerOnOffSwitch;
-        ImageButton buttonUp, buttonDown, buttonStop;
-        Button buttonOn, buttonLog, buttonTimer, buttonColor, buttonSetStatus, buttonSet, buttonOff, buttonNotifications;
+        ImageView buttonUp, buttonDown, buttonStop;
+        Button buttonOn, buttonColor, buttonSetStatus, buttonSet, buttonOff;
+        Chip buttonLog, buttonTimer, buttonNotifications;
         Boolean isProtected;
         LikeButton likeButton;
         ImageView iconRow, iconMode;
         SeekBar dimmer;
         Spinner spSelector;
         LinearLayout extraPanel;
+        ImageView infoIcon;
 
         public DataObjectHolder(View itemView) {
             super(itemView);
 
-            buttonOn = (Button) itemView.findViewById(R.id.on_button);
-            buttonOff = (Button) itemView.findViewById(R.id.off_button);
-            buttonSetStatus = (Button) itemView.findViewById(R.id.set_button);
-
-            onOffSwitch = (Switch) itemView.findViewById(R.id.switch_button);
-            signal_level = (TextView) itemView.findViewById(R.id.switch_signal_level);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            switch_name = (TextView) itemView.findViewById(R.id.switch_name);
-            switch_battery_level = (TextView) itemView.findViewById(R.id.switch_battery_level);
-
-            switch_dimmer_level = (TextView) itemView.findViewById(R.id.switch_dimmer_level);
-            dimmerOnOffSwitch = (Switch) itemView.findViewById(R.id.switch_dimmer_switch);
-            dimmer = (SeekBar) itemView.findViewById(R.id.switch_dimmer);
-            spSelector = (Spinner) itemView.findViewById(R.id.spSelector);
-            buttonColor = (Button) itemView.findViewById(R.id.color_button);
-            buttonLog = (Button) itemView.findViewById(R.id.log_button);
-            buttonTimer = (Button) itemView.findViewById(R.id.timer_button);
-            buttonUp = (ImageButton) itemView.findViewById(R.id.switch_button_up);
-            buttonNotifications = (Button) itemView.findViewById(R.id.notifications_button);
-            buttonStop = (ImageButton) itemView.findViewById(R.id.switch_button_stop);
-            buttonDown = (ImageButton) itemView.findViewById(R.id.switch_button_down);
-            buttonSet = (Button) itemView.findViewById(R.id.set_button);
-
-            likeButton = (LikeButton) itemView.findViewById(R.id.fav_button);
-
+            buttonOn = itemView.findViewById(R.id.on_button);
+            buttonOff = itemView.findViewById(R.id.off_button);
+            buttonSetStatus = itemView.findViewById(R.id.set_button);
+
+            onOffSwitch = itemView.findViewById(R.id.switch_button);
+            signal_level = itemView.findViewById(R.id.switch_signal_level);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            switch_name = itemView.findViewById(R.id.switch_name);
+            switch_battery_level = itemView.findViewById(R.id.switch_battery_level);
+
+            switch_dimmer_level = itemView.findViewById(R.id.switch_dimmer_level);
+            dimmerOnOffSwitch = itemView.findViewById(R.id.switch_dimmer_switch);
+            dimmer = itemView.findViewById(R.id.switch_dimmer);
+            spSelector = itemView.findViewById(R.id.spSelector);
+            buttonColor = itemView.findViewById(R.id.color_button);
+            buttonLog = itemView.findViewById(R.id.log_button);
+            buttonTimer = itemView.findViewById(R.id.timer_button);
+            buttonUp = itemView.findViewById(R.id.switch_button_up);
+            buttonNotifications = itemView.findViewById(R.id.notifications_button);
+            buttonStop = itemView.findViewById(R.id.switch_button_stop);
+            buttonDown = itemView.findViewById(R.id.switch_button_down);
+            buttonSet = itemView.findViewById(R.id.set_button);
+            infoIcon = itemView.findViewById(R.id.widget_info_icon);
+            likeButton = itemView.findViewById(R.id.fav_button);
             if (buttonLog != null)
                 buttonLog.setVisibility(View.GONE);
             if (buttonTimer != null)
                 buttonTimer.setVisibility(View.GONE);
-
-            extraPanel = (LinearLayout) itemView.findViewById(R.id.extra_panel);
+            extraPanel = itemView.findViewById(R.id.extra_panel);
             if (extraPanel != null)
                 extraPanel.setVisibility(View.GONE);
         }
@@ -1869,7 +1862,6 @@ protected FilterResults performFiltering(CharSequence constraint) {
             }
             results.values = devicesInfos;
             results.count = devicesInfos.size();
-
             return results;
         }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/TemperatureAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/TemperatureAdapter.java
index 56f2968a4..5d735f9bc 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/TemperatureAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/TemperatureAdapter.java
@@ -23,7 +23,7 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Color;
+import android.support.design.chip.Chip;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -107,11 +107,12 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             .inflate(R.layout.temperature_row_default, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_wrapper)) != null)
-                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_global_wrapper)) != null)
-                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
         }
 
         return new DataObjectHolder(view);
@@ -124,15 +125,15 @@ public void onBindViewHolder(final DataObjectHolder holder, final int position)
             final TemperatureInfo mTemperatureInfo = filteredData.get(position);
 
             if (mSharedPrefs.darkThemeEnabled()) {
-                holder.dayButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-                holder.monthButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-                holder.yearButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-                holder.weekButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-
                 if (holder.setButton != null)
-                    holder.setButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                    holder.setButton.setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             }
-
+            holder.infoIcon.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    listener.onItemLongClicked(position);
+                }
+            });
             holder.isProtected = mTemperatureInfo.isProtected();
             String sign = mConfigInfo != null ? mConfigInfo.getTempSign() : "C";
 
@@ -164,13 +165,12 @@ public void onBindViewHolder(final DataObjectHolder holder, final int position)
                     holder.pieView.setVisibility(View.GONE);
                 } else {
                     holder.pieView.setVisibility(View.VISIBLE);
-
                     if (!this.mSharedPrefs.darkThemeEnabled()) {
                         holder.pieView.setInnerBackgroundColor(ContextCompat.getColor(context, R.color.white));
                         holder.pieView.setTextColor(ContextCompat.getColor(context, R.color.black));
-                        holder.pieView.setPercentageTextSize(17);
                     }
-
+                    holder.pieView.setPercentageTextSize(16);
+                    holder.pieView.setPercentageBackgroundColor(ContextCompat.getColor(context, R.color.material_orange_600));
                     double temp = mTemperatureInfo.getTemperature();
                     if (!UsefulBits.isEmpty(sign) && !sign.equals("C"))
                         temp = temp / 2;
@@ -341,33 +341,34 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder {
         ImageView iconRow;
         ImageView iconMode;
         Button setButton;
-        Button dayButton;
-        Button monthButton;
-        Button weekButton;
-        Button yearButton;
+        Chip dayButton;
+        Chip monthButton;
+        Chip weekButton;
+        Chip yearButton;
         Boolean isProtected;
         LikeButton likeButton;
         LinearLayout extraPanel;
         PieView pieView;
+        ImageView infoIcon;
 
         public DataObjectHolder(View itemView) {
             super(itemView);
-
-            name = (TextView) itemView.findViewById(R.id.temperature_name);
-            data = (TextView) itemView.findViewById(R.id.temperature_data);
-            data2 = (TextView) itemView.findViewById(R.id.temperature_data2);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            iconMode = (ImageView) itemView.findViewById(R.id.mode_icon);
-            pieView = (PieView) itemView.findViewById(R.id.pieView);
-
-            dayButton = (Button) itemView.findViewById(R.id.day_button);
-            monthButton = (Button) itemView.findViewById(R.id.month_button);
-            yearButton = (Button) itemView.findViewById(R.id.year_button);
-            weekButton = (Button) itemView.findViewById(R.id.week_button);
-            setButton = (Button) itemView.findViewById(R.id.set_button);
-            likeButton = (LikeButton) itemView.findViewById(R.id.fav_button);
-
-            extraPanel = (LinearLayout) itemView.findViewById(R.id.extra_panel);
+            infoIcon = itemView.findViewById(R.id.widget_info_icon);
+            name = itemView.findViewById(R.id.temperature_name);
+            data = itemView.findViewById(R.id.temperature_data);
+            data2 = itemView.findViewById(R.id.temperature_data2);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            iconMode = itemView.findViewById(R.id.mode_icon);
+            pieView = itemView.findViewById(R.id.pieView);
+
+            dayButton = itemView.findViewById(R.id.day_button);
+            monthButton = itemView.findViewById(R.id.month_button);
+            yearButton = itemView.findViewById(R.id.year_button);
+            weekButton = itemView.findViewById(R.id.week_button);
+            setButton = itemView.findViewById(R.id.set_button);
+            likeButton = itemView.findViewById(R.id.fav_button);
+
+            extraPanel = itemView.findViewById(R.id.extra_panel);
             if (extraPanel != null)
                 extraPanel.setVisibility(View.GONE);
         }
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/TimersAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/TimersAdapter.java
index bbd83d4db..9fa2a76a6 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/TimersAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/TimersAdapter.java
@@ -85,15 +85,17 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 convertView = inflater.inflate(layoutResourceId, parent, false);
 
                 if (mSharedPrefs.darkThemeEnabled()) {
+                    if ((convertView.findViewById(R.id.card_global_wrapper)) != null)
+                        convertView.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
                     if ((convertView.findViewById(R.id.row_wrapper)) != null)
-                        (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                        (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
                     if ((convertView.findViewById(R.id.row_global_wrapper)) != null)
-                        (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+                        (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
                 }
 
-                holder.switch_name = (TextView) convertView.findViewById(R.id.switch_name);
-                holder.switch_status = (TextView) convertView.findViewById(R.id.switch_battery_level);
-                holder.signal_level = (TextView) convertView.findViewById(R.id.switch_signal_level);
+                holder.switch_name = convertView.findViewById(R.id.switch_name);
+                holder.switch_status = convertView.findViewById(R.id.switch_battery_level);
+                holder.signal_level = convertView.findViewById(R.id.switch_signal_level);
                 holder.switch_name.setText(mSwitchTimerInfo.getActive());
                 String commando = "";
                 if (mSwitchTimerInfo.getCmd() == 0)
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/UserVariablesAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/UserVariablesAdapter.java
index e2cf197f5..c399d62df 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/UserVariablesAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/UserVariablesAdapter.java
@@ -22,7 +22,6 @@
 package nl.hnogames.domoticz.Adapters;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -86,13 +85,14 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             .inflate(R.layout.vars_row_default, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_wrapper)) != null)
-                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_global_wrapper)) != null)
-                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.set_uservar)) != null)
-                (view.findViewById(R.id.set_uservar)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (view.findViewById(R.id.set_uservar)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
         }
 
         return new DataObjectHolder(view);
@@ -144,12 +144,11 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder
         public DataObjectHolder(View itemView) {
             super(itemView);
 
-            name = (TextView) itemView.findViewById(R.id.logs_name);
-            datetime = (TextView) itemView.findViewById(R.id.logs_datetime);
-            message = (TextView) itemView.findViewById(R.id.logs_message);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            set = (Button) itemView.findViewById(R.id.set_uservar);
-
+            name = itemView.findViewById(R.id.logs_name);
+            datetime = itemView.findViewById(R.id.logs_datetime);
+            message = itemView.findViewById(R.id.logs_message);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            set = itemView.findViewById(R.id.set_uservar);
             itemView.setOnClickListener(this);
         }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/UtilityAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/UtilityAdapter.java
index 01e9bc087..9cba82d7b 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/UtilityAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/UtilityAdapter.java
@@ -22,7 +22,7 @@
 package nl.hnogames.domoticz.Adapters;
 
 import android.content.Context;
-import android.graphics.Color;
+import android.support.design.chip.Chip;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -98,17 +98,18 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             .inflate(R.layout.utilities_row_default, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_wrapper)) != null)
-                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_global_wrapper)) != null)
-                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.on_button)) != null)
-                (view.findViewById(R.id.on_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (view.findViewById(R.id.on_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             if ((view.findViewById(R.id.off_button)) != null)
-                (view.findViewById(R.id.off_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (view.findViewById(R.id.off_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
             if ((view.findViewById(R.id.set_button)) != null)
-                (view.findViewById(R.id.set_button)).setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+                (view.findViewById(R.id.set_button)).setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
         }
 
         return new DataObjectHolder(view);
@@ -146,6 +147,12 @@ public void onClick(View v) {
                     listener.onItemClicked(v, position);
                 }
             });
+            holder.infoIcon.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    listener.onItemLongClicked(position);
+                }
+            });
         }
     }
 
@@ -180,9 +187,6 @@ private void CreateTextRow(DataObjectHolder holder, UtilitiesInfo mUtilitiesInfo
             holder.data.append(" " + context.getString(R.string.today) + ": " + mUtilitiesInfo.getCounterToday());
         if (mUtilitiesInfo.getCounter() != null && mUtilitiesInfo.getCounter().length() > 0 && !mUtilitiesInfo.getCounter().equals(mUtilitiesInfo.getData()))
             holder.data.append(" " + context.getString(R.string.total) + ": " + mUtilitiesInfo.getCounter());
-        if (mSharedPrefs.darkThemeEnabled()) {
-            holder.buttonLog.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-        }
 
         if (holder.likeButton != null) {
             holder.likeButton.setId(mUtilitiesInfo.getIdx());
@@ -218,13 +222,6 @@ private void handleLogButtonClick(int idx) {
     private void CreateDefaultRow(DataObjectHolder holder, UtilitiesInfo mUtilitiesInfo) {
         holder.isProtected = mUtilitiesInfo.isProtected();
 
-        if (mSharedPrefs.darkThemeEnabled()) {
-            holder.dayButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            holder.monthButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            holder.yearButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            holder.weekButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-        }
-
         holder.name.setText(mUtilitiesInfo.getName());
         holder.data.setText(context.getString(R.string.data) + ": " + mUtilitiesInfo.getData());
         holder.hardware.setText(context.getString(R.string.hardware) + ": " + mUtilitiesInfo.getHardwareName());
@@ -321,13 +318,6 @@ private void CreateThermostatRow(DataObjectHolder holder, UtilitiesInfo mUtiliti
         if (holder.isProtected)
             holder.on_button.setEnabled(false);
 
-        if (mSharedPrefs.darkThemeEnabled()) {
-            holder.dayButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            holder.monthButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            holder.yearButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            holder.weekButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-        }
-
         holder.on_button.setText(context.getString(R.string.set_temperature));
         holder.on_button.setId(mUtilitiesInfo.getIdx());
         holder.on_button.setOnClickListener(new View.OnClickListener() {
@@ -337,7 +327,7 @@ public void onClick(View v) {
             }
         });
         if (mSharedPrefs.darkThemeEnabled()) {
-            holder.on_button.setBackground(ContextCompat.getDrawable(context, R.drawable.button_status_dark));
+            holder.on_button.setBackgroundColor(ContextCompat.getColor(context, R.color.button_dark));
         }
 
         holder.dayButton.setId(mUtilitiesInfo.getIdx());
@@ -466,33 +456,34 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder {
         ImageView iconRow;
         Boolean isProtected;
 
-        Button dayButton;
-        Button monthButton;
-        Button yearButton;
-        Button weekButton;
-        Button buttonLog;
+        Chip dayButton;
+        Chip monthButton;
+        Chip yearButton;
+        Chip weekButton;
+        Chip buttonLog;
         Button on_button;
-
+        ImageView infoIcon;
         LikeButton likeButton;
         LinearLayout extraPanel;
 
         public DataObjectHolder(View itemView) {
             super(itemView);
 
-            dayButton = (Button) itemView.findViewById(R.id.day_button);
-            monthButton = (Button) itemView.findViewById(R.id.month_button);
-            yearButton = (Button) itemView.findViewById(R.id.year_button);
-            weekButton = (Button) itemView.findViewById(R.id.week_button);
-            likeButton = (LikeButton) itemView.findViewById(R.id.fav_button);
-
-            on_button = (Button) itemView.findViewById(R.id.on_button);
-            name = (TextView) itemView.findViewById(R.id.utilities_name);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            buttonLog = (Button) itemView.findViewById(R.id.log_button);
-            data = (TextView) itemView.findViewById(R.id.utilities_data);
-            hardware = (TextView) itemView.findViewById(R.id.utilities_hardware);
-
-            extraPanel = (LinearLayout) itemView.findViewById(R.id.extra_panel);
+            dayButton = itemView.findViewById(R.id.day_button);
+            monthButton = itemView.findViewById(R.id.month_button);
+            yearButton = itemView.findViewById(R.id.year_button);
+            weekButton = itemView.findViewById(R.id.week_button);
+            likeButton = itemView.findViewById(R.id.fav_button);
+
+            infoIcon = itemView.findViewById(R.id.widget_info_icon);
+            on_button = itemView.findViewById(R.id.on_button);
+            name = itemView.findViewById(R.id.utilities_name);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            buttonLog = itemView.findViewById(R.id.log_button);
+            data = itemView.findViewById(R.id.utilities_data);
+            hardware = itemView.findViewById(R.id.utilities_hardware);
+
+            extraPanel = itemView.findViewById(R.id.extra_panel);
             if (extraPanel != null)
                 extraPanel.setVisibility(View.GONE);
         }
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/WeatherAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/WeatherAdapter.java
index d34a240a3..4053cc25e 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/WeatherAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/WeatherAdapter.java
@@ -22,14 +22,13 @@
 package nl.hnogames.domoticz.Adapters;
 
 import android.content.Context;
-import android.graphics.Color;
+import android.support.design.chip.Chip;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.Filter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -109,11 +108,12 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             .inflate(R.layout.weather_row_default, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            ((android.support.v7.widget.CardView) view.findViewById(R.id.card_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
+            if ((view.findViewById(R.id.card_global_wrapper)) != null)
+                view.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_wrapper)) != null)
-                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.drawable.bordershadowdark));
+                (view.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
             if ((view.findViewById(R.id.row_global_wrapper)) != null)
-                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.background_dark));
+                (view.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
         }
 
         return new DataObjectHolder(view);
@@ -136,12 +136,12 @@ public void onBindViewHolder(final DataObjectHolder holder, final int position)
                 windSign = mConfigInfo.getWindSign();
             }
 
-            if (mSharedPrefs.darkThemeEnabled()) {
-                holder.dayButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-                holder.monthButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-                holder.yearButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-                holder.weekButton.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
-            }
+            holder.infoIcon.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    listener.onItemLongClicked(position);
+                }
+            });
 
             holder.isProtected = mWeatherInfo.isProtected();
             holder.name.setText(mWeatherInfo.getName());
@@ -181,8 +181,9 @@ public void onBindViewHolder(final DataObjectHolder holder, final int position)
                 if (!this.mSharedPrefs.darkThemeEnabled()) {
                     holder.pieView.setInnerBackgroundColor(ContextCompat.getColor(context, R.color.white));
                     holder.pieView.setTextColor(ContextCompat.getColor(context, R.color.black));
-                    holder.pieView.setPercentageTextSize(17);
                 }
+                holder.pieView.setPercentageTextSize(16);
+                holder.pieView.setPercentageBackgroundColor(ContextCompat.getColor(context, R.color.material_orange_600));
 
                 double temp = mWeatherInfo.getTemp();
                 if (!tempSign.equals("C"))
@@ -298,31 +299,30 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder {
         TextView hardware;
         ImageView iconRow;
         Boolean isProtected;
-        Button dayButton;
-        Button monthButton;
-        Button yearButton;
-        Button weekButton;
+        Chip dayButton;
+        Chip monthButton;
+        Chip yearButton;
+        Chip weekButton;
         LikeButton likeButton;
         LinearLayout extraPanel;
         PieView pieView;
+        ImageView infoIcon;
 
         public DataObjectHolder(View itemView) {
             super(itemView);
-
-            pieView = (PieView) itemView.findViewById(R.id.pieView);
+            pieView = itemView.findViewById(R.id.pieView);
+            infoIcon = itemView.findViewById(R.id.widget_info_icon);
             pieView.setVisibility(View.GONE);
-
-            dayButton = (Button) itemView.findViewById(R.id.day_button);
-            monthButton = (Button) itemView.findViewById(R.id.month_button);
-            yearButton = (Button) itemView.findViewById(R.id.year_button);
-            weekButton = (Button) itemView.findViewById(R.id.week_button);
-            likeButton = (LikeButton) itemView.findViewById(R.id.fav_button);
-            name = (TextView) itemView.findViewById(R.id.weather_name);
-            iconRow = (ImageView) itemView.findViewById(R.id.rowIcon);
-            data = (TextView) itemView.findViewById(R.id.weather_data);
-            hardware = (TextView) itemView.findViewById(R.id.weather_hardware);
-
-            extraPanel = (LinearLayout) itemView.findViewById(R.id.extra_panel);
+            dayButton = itemView.findViewById(R.id.day_button);
+            monthButton = itemView.findViewById(R.id.month_button);
+            yearButton = itemView.findViewById(R.id.year_button);
+            weekButton = itemView.findViewById(R.id.week_button);
+            likeButton = itemView.findViewById(R.id.fav_button);
+            name = itemView.findViewById(R.id.weather_name);
+            iconRow = itemView.findViewById(R.id.rowIcon);
+            data = itemView.findViewById(R.id.weather_data);
+            hardware = itemView.findViewById(R.id.weather_hardware);
+            extraPanel = itemView.findViewById(R.id.extra_panel);
             if (extraPanel != null)
                 extraPanel.setVisibility(View.GONE);
         }
@@ -331,18 +331,14 @@ public DataObjectHolder(View itemView) {
     private class ItemFilter extends Filter {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
-
             String filterString = constraint.toString().toLowerCase();
-
             FilterResults results = new FilterResults();
-
             final ArrayList<WeatherInfo> list = data;
 
             int count = list.size();
             final ArrayList<WeatherInfo> weatherInfos = new ArrayList<>(count);
 
             WeatherInfo filterableObject;
-
             for (int i = 0; i < count; i++) {
                 filterableObject = list.get(i);
                 if (filterableObject.getName().toLowerCase().contains(filterString)) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/WidgetsAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/WidgetsAdapter.java
index d74f3fb5e..10c46093f 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/WidgetsAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/WidgetsAdapter.java
@@ -23,6 +23,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -104,7 +105,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
         convertView.setTag(holder);
 
         if (mSharedPrefs.darkThemeEnabled()) {
-            (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(context.getResources().getColor(R.color.background_dark));
+            if ((convertView.findViewById(R.id.card_global_wrapper)) != null)
+                convertView.findViewById(R.id.card_global_wrapper).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_wrapper)) != null)
+                (convertView.findViewById(R.id.row_wrapper)).setBackground(ContextCompat.getDrawable(context, R.color.card_background_dark));
+            if ((convertView.findViewById(R.id.row_global_wrapper)) != null)
+                (convertView.findViewById(R.id.row_global_wrapper)).setBackgroundColor(ContextCompat.getColor(context, R.color.card_background_dark));
         }
 
         setDefaultRowData(deviceInfo, holder);
@@ -117,10 +123,10 @@ private View setDefaultRowId(ViewHolder holder) {
         LayoutInflater inflater = ((Activity) context).getLayoutInflater();
         View row = inflater.inflate(layoutResourceId, null);
 
-        holder.signal_level = (TextView) row.findViewById(R.id.switch_signal_level);
-        holder.iconRow = (ImageView) row.findViewById(R.id.rowIcon);
-        holder.switch_name = (TextView) row.findViewById(R.id.switch_name);
-        holder.switch_battery_level = (TextView) row.findViewById(R.id.switch_battery_level);
+        holder.signal_level = row.findViewById(R.id.switch_signal_level);
+        holder.iconRow = row.findViewById(R.id.rowIcon);
+        holder.switch_name = row.findViewById(R.id.switch_name);
+        holder.switch_battery_level = row.findViewById(R.id.switch_battery_level);
 
         return row;
     }
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Camera.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Camera.java
index 0702f5cc3..fd4baccae 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Camera.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Camera.java
@@ -81,6 +81,12 @@ public void onAttach(Context context) {
         mSharedPrefs = new SharedPrefUtil(context);
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+    }
+
     private void processImage() {
         // Get access to the URI for the bitmap
         File file = new File(url);
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Cameras.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Cameras.java
index 87ab18174..a6315d055 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Cameras.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Cameras.java
@@ -64,6 +64,7 @@
 import nl.hnogames.domoticz.app.DomoticzCardFragment;
 import nl.hnogames.domoticzapi.Containers.CameraInfo;
 import nl.hnogames.domoticzapi.Interfaces.CameraReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Cameras extends DomoticzCardFragment implements DomoticzFragmentListener, OnPermissionCallback {
 
@@ -97,6 +98,7 @@ public void refreshFragment() {
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
         super.onActivityCreated(savedInstanceState);
     }
 
@@ -122,6 +124,7 @@ private void processImage(Bitmap savePic, String title) {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         this.context = context;
         mSharedPrefs = new SharedPrefUtil(context);
         if (getActionBar() != null)
@@ -264,7 +267,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<CameraInfo> cacheCameras = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(context);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheCameras = (ArrayList<CameraInfo>) SerializableManager.readSerializedObject(context, "Cameras");
                 } catch (Exception ex) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Dashboard.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Dashboard.java
index 4dcf7139e..b27d6c130 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Dashboard.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Dashboard.java
@@ -22,8 +22,10 @@
 package nl.hnogames.domoticz.Fragments;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
@@ -34,6 +36,9 @@
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.skydoves.colorpickerview.ColorEnvelope;
+import com.skydoves.colorpickerview.ColorPickerDialog;
+import com.skydoves.colorpickerview.listeners.ColorEnvelopeListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,12 +50,12 @@
 import nl.hnogames.domoticz.Interfaces.switchesClickListener;
 import nl.hnogames.domoticz.MainActivity;
 import nl.hnogames.domoticz.R;
-import nl.hnogames.domoticz.UI.ColorPickerDialog;
 import nl.hnogames.domoticz.UI.DeviceInfoDialog;
 import nl.hnogames.domoticz.UI.PasswordDialog;
 import nl.hnogames.domoticz.UI.ScheduledTemperatureDialog;
 import nl.hnogames.domoticz.UI.SecurityPanelDialog;
 import nl.hnogames.domoticz.UI.TemperatureDialog;
+import nl.hnogames.domoticz.UI.WWColorPickerDialog;
 import nl.hnogames.domoticz.Utils.SerializableManager;
 import nl.hnogames.domoticz.Utils.UsefulBits;
 import nl.hnogames.domoticz.app.DomoticzDashboardFragment;
@@ -80,14 +85,20 @@ public class Dashboard extends DomoticzDashboardFragment implements DomoticzFrag
 
     private SlideInBottomAnimationAdapter alphaSlideIn;
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+        // if (getActionBar() != null)
+        //    getActionBar().setTitle(R.string.title_dashboard);
+    }
 
     @Override
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
-        if (getActionBar() != null)
-            getActionBar().setTitle(R.string.title_dashboard);
     }
 
     @Override
@@ -254,10 +265,14 @@ public void onRefresh() {
     private void showInfoDialog(final DevicesInfo mSwitch) {
         DeviceInfoDialog infoDialog = new DeviceInfoDialog(
             mContext,
+            mDomoticz,
             mSwitch,
             R.layout.dialog_switch_info);
-
         infoDialog.setIdx(String.valueOf(mSwitch.getIdx()));
+        try {
+            infoDialog.setColorLight(mSwitch.getSubType().startsWith(DomoticzValues.Device.SubType.Name.RGB) || mSwitch.getSubType().startsWith(DomoticzValues.Device.SubType.Name.WW));
+        } catch (Exception ex) {
+        }
         infoDialog.setLastUpdate(mSwitch.getLastUpdate());
         infoDialog.setSignalLevel(String.valueOf(mSwitch.getSignalLevel()));
         infoDialog.setBatteryLevel(String.valueOf(mSwitch.getBatteryLevel()));
@@ -361,7 +376,8 @@ private void toggleSwitch(final DevicesInfo clickedSwitch, final boolean checked
             int jsonAction;
             int jsonUrl = DomoticzValues.Json.Url.Set.SWITCHES;
             if (clickedSwitch.getSwitchTypeVal() == DomoticzValues.Device.Type.Value.BLINDS ||
-                clickedSwitch.getSwitchTypeVal() == DomoticzValues.Device.Type.Value.BLINDPERCENTAGE) {
+                clickedSwitch.getSwitchTypeVal() == DomoticzValues.Device.Type.Value.BLINDPERCENTAGE ||
+                clickedSwitch.getSwitchTypeVal() == DomoticzValues.Device.Type.Value.DOORLOCKINVERTED) {
                 if (checked) jsonAction = DomoticzValues.Device.Switch.Action.OFF;
                 else jsonAction = DomoticzValues.Device.Switch.Action.ON;
             } else {
@@ -508,49 +524,117 @@ public void onLikeButtonClick(int idx, boolean checked) {
     @Override
     @DebugLog
     public void onColorButtonClick(final int idx) {
-        ColorPickerDialog colorDialog = new ColorPickerDialog(
-            mContext, idx);
-        colorDialog.show();
-        colorDialog.onDismissListener(new ColorPickerDialog.DismissListener() {
-            @Override
-            @DebugLog
-            public void onDismiss(final int selectedColor) {
-                if (getDevice(idx).isProtected()) {
-                    PasswordDialog passwordDialog = new PasswordDialog(
-                        mContext, mDomoticz);
-                    passwordDialog.show();
-                    passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
-                        @Override
-                        @DebugLog
-                        public void onDismiss(String password) {
-                            setColor(selectedColor, idx, password);
-                        }
+        if (getDevice(idx).getSubType().startsWith(DomoticzValues.Device.SubType.Name.WW)) {
+            WWColorPickerDialog colorDialog = new WWColorPickerDialog(mContext,
+                getDevice(idx).getIdx());
+            colorDialog.show();
+            colorDialog.onDismissListener(new WWColorPickerDialog.DismissListener() {
+                @Override
+                public void onDismiss(final int kelvin) {
+                    if (getDevice(idx).isProtected()) {
+                        PasswordDialog passwordDialog = new PasswordDialog(
+                            mContext, mDomoticz);
+                        passwordDialog.show();
+                        passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                            @Override
+                            @DebugLog
+                            public void onDismiss(String password) {
+                                setKelvinColor(kelvin, idx, password, true);
+                            }
 
-                        @Override
-                        public void onCancel() {
-                        }
-                    });
-                } else
-                    setColor(selectedColor, idx, null);
-            }
+                            @Override
+                            public void onCancel() {
+                            }
+                        });
+                    } else
+                        setKelvinColor(kelvin, idx, null, true);
+                }
 
-            @Override
-            @DebugLog
-            public void onChangeColor(final int selectedColor) {
-                if (!getDevice(idx).isProtected()) {
-                    setColor(selectedColor, idx, null);
+                @Override
+                public void onChangeColor(int kelvin) {
+                    if (!getDevice(idx).isProtected())
+                        setKelvinColor(kelvin, idx, null, false);
                 }
-            }
-        });
+            });
+        } else {
+            ColorPickerDialog.Builder builder = new ColorPickerDialog.Builder(getContext());
+            builder.setTitle(getString(R.string.choose_color));
+            builder.setPositiveButton(getString(R.string.ok), new ColorEnvelopeListener() {
+                @Override
+                public void onColorSelected(final ColorEnvelope envelope, boolean fromUser) {
+                    if (getDevice(idx).isProtected()) {
+                        PasswordDialog passwordDialog = new PasswordDialog(
+                            mContext, mDomoticz);
+                        passwordDialog.show();
+                        passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                            @Override
+                            @DebugLog
+                            public void onDismiss(String password) {
+                                setRGBColor(envelope.getColor(), idx, password, true);
+                            }
+
+                            @Override
+                            public void onCancel() {
+                            }
+                        });
+                    } else
+                        setRGBColor(envelope.getColor(), idx, null, true);
+                }
+            });
+            builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    dialogInterface.dismiss();
+                }
+            });
+            builder.show();
+        }
     }
 
-    private void setColor(int selectedColor, final int idx, final String password) {
+    private void setKelvinColor(int kelvin, final int idx, final String password, final boolean selected) {
+        mDomoticz.setAction(idx,
+            DomoticzValues.Json.Url.Set.KELVIN,
+            DomoticzValues.Device.Dimmer.Action.KELVIN,
+            kelvin,
+            password,
+            new setCommandReceiver() {
+                @Override
+                @DebugLog
+                public void onReceiveResult(String result) {
+                    if (selected) {
+                        UsefulBits.showSnackbar(mContext, coordinatorLayout, mContext.getString(R.string.color_set) + ": " + getDevice(idx).getName(), Snackbar.LENGTH_SHORT);
+                        if (getActivity() instanceof MainActivity)
+                            ((MainActivity) getActivity()).Talk(R.string.color_set);
+                    }
+                }
+
+                @Override
+                @DebugLog
+                public void onError(Exception error) {
+                    if (selected) {
+                        if (!UsefulBits.isEmpty(password)) {
+                            UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.security_wrong_code, Snackbar.LENGTH_SHORT);
+                            if (getActivity() instanceof MainActivity)
+                                ((MainActivity) getActivity()).Talk(R.string.security_wrong_code);
+                        } else {
+                            UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.error_color, Snackbar.LENGTH_SHORT);
+                            if (getActivity() instanceof MainActivity)
+                                ((MainActivity) getActivity()).Talk(R.string.error_color);
+                        }
+                    }
+                }
+            });
+    }
+
+    private void setRGBColor(int selectedColor, final int idx, final String password, final boolean selected) {
         double[] hsv = UsefulBits.rgb2hsv(Color.red(selectedColor), Color.green(selectedColor), Color.blue(selectedColor));
         if (hsv == null || hsv.length <= 0)
             return;
 
-        Log.v(TAG, "Selected HVS Color: h:" + hsv[0] + " v:" + hsv[1] + " s:" + hsv[2] + " color: " + selectedColor);
-        addDebugText("Selected HVS Color: h:" + hsv[0] + " v:" + hsv[1] + " s:" + hsv[2] + " color: " + selectedColor);
+        if (selected) {
+            Log.v(TAG, "Selected HVS Color: h:" + hsv[0] + " v:" + hsv[1] + " s:" + hsv[2] + " color: " + selectedColor);
+            addDebugText("Selected HVS Color: h:" + hsv[0] + " v:" + hsv[1] + " s:" + hsv[2] + " color: " + selectedColor);
+        }
 
         boolean isWhite = false;
         long hue = Math.round(hsv[0]);
@@ -567,22 +651,26 @@ private void setColor(int selectedColor, final int idx, final String password) {
                 @Override
                 @DebugLog
                 public void onReceiveResult(String result) {
-                    UsefulBits.showSnackbar(mContext, coordinatorLayout, mContext.getString(R.string.color_set) + ": " + getDevice(idx).getName(), Snackbar.LENGTH_SHORT);
-                    if (getActivity() instanceof MainActivity)
-                        ((MainActivity) getActivity()).Talk(R.string.color_set);
+                    if (selected) {
+                        UsefulBits.showSnackbar(mContext, coordinatorLayout, mContext.getString(R.string.color_set) + ": " + getDevice(idx).getName(), Snackbar.LENGTH_SHORT);
+                        if (getActivity() instanceof MainActivity)
+                            ((MainActivity) getActivity()).Talk(R.string.color_set);
+                    }
                 }
 
                 @Override
                 @DebugLog
                 public void onError(Exception error) {
-                    if (!UsefulBits.isEmpty(password)) {
-                        UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.security_wrong_code, Snackbar.LENGTH_SHORT);
-                        if (getActivity() instanceof MainActivity)
-                            ((MainActivity) getActivity()).Talk(R.string.security_wrong_code);
-                    } else {
-                        UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.error_color, Snackbar.LENGTH_SHORT);
-                        if (getActivity() instanceof MainActivity)
-                            ((MainActivity) getActivity()).Talk(R.string.error_color);
+                    if (selected) {
+                        if (!UsefulBits.isEmpty(password)) {
+                            UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.security_wrong_code, Snackbar.LENGTH_SHORT);
+                            if (getActivity() instanceof MainActivity)
+                                ((MainActivity) getActivity()).Talk(R.string.security_wrong_code);
+                        } else {
+                            UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.error_color, Snackbar.LENGTH_SHORT);
+                            if (getActivity() instanceof MainActivity)
+                                ((MainActivity) getActivity()).Talk(R.string.error_color);
+                        }
                     }
                 }
             });
@@ -1046,7 +1134,6 @@ public void errorHandling(Exception error, CoordinatorLayout coordinatorLayout)
             if (isAdded()) {
                 if (mSwipeRefreshLayout != null)
                     mSwipeRefreshLayout.setRefreshing(false);
-
                 super.errorHandling(error, this.coordinatorLayout);
             }
         }
@@ -1058,10 +1145,11 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         protected Boolean doInBackground(Boolean... geto) {
             if (mPhoneConnectionUtil == null)
                 mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheSwitches = (ArrayList<DevicesInfo>) SerializableManager.readSerializedObject(mContext, "Dashboard");
-                } catch (Exception ex) { }
+                } catch (Exception ex) {
+                }
             }
             return true;
         }
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Events.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Events.java
index 6fe09e10e..a9ae1daec 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Events.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Events.java
@@ -23,6 +23,7 @@
 
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 
 import java.util.ArrayList;
@@ -39,6 +40,7 @@
 import nl.hnogames.domoticzapi.DomoticzValues;
 import nl.hnogames.domoticzapi.Interfaces.EventReceiver;
 import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Events extends DomoticzRecyclerFragment implements DomoticzFragmentListener {
 
@@ -65,11 +67,18 @@ public void onConnectionFailed() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
         if (getActionBar() != null)
             getActionBar().setTitle(R.string.title_events);
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+    }
+
     @Override
     @DebugLog
     public void Filter(String text) {
@@ -159,7 +168,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<EventInfo> cacheEventInfos = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheEventInfos = (ArrayList<EventInfo>) SerializableManager.readSerializedObject(mContext, "Events");
                 } catch (Exception ex) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Graph.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Graph.java
index c7c92a25f..205706c1c 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Graph.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Graph.java
@@ -101,11 +101,18 @@ public void onConnectionFailed() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         this.context = context;
         mDomoticz = new Domoticz(context, AppController.getInstance().getRequestQueue());
         mSharedPrefs = new SharedPrefUtil(context);
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+    }
+
     @Override
     @DebugLog
     public void onCreate(Bundle savedInstanceState) {
@@ -192,12 +199,6 @@ public String getFormattedValue(float value, AxisBase axis) {
         return root;
     }
 
-    @Override
-    @DebugLog
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-    }
-
     public void getGraphs() {
         chart.setVisibility(View.GONE);
         new Thread() {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Logs.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Logs.java
index e770de971..3e3a18368 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Logs.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Logs.java
@@ -23,6 +23,7 @@
 
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 
 import java.util.ArrayList;
@@ -36,15 +37,14 @@
 import nl.hnogames.domoticz.app.DomoticzRecyclerFragment;
 import nl.hnogames.domoticzapi.Containers.LogInfo;
 import nl.hnogames.domoticzapi.Interfaces.LogsReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Logs extends DomoticzRecyclerFragment implements DomoticzFragmentListener {
-
     private LogAdapter adapter;
     private Context mContext;
     private String filter = "";
     private SlideInBottomAnimationAdapter alphaSlideIn;
 
-
     @Override
     public void onConnectionFailed() {
         new GetCachedDataTask().execute();
@@ -62,11 +62,18 @@ public void refreshFragment() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
         if (getActionBar() != null)
             getActionBar().setTitle(R.string.title_logs);
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+    }
+
     @Override
     @DebugLog
     public void Filter(String text) {
@@ -143,7 +150,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<LogInfo> cacheLogs = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheLogs = (ArrayList<LogInfo>) SerializableManager.readSerializedObject(mContext, "Logs");
                 } catch (Exception ex) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/MainPager.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/MainPager.java
new file mode 100644
index 000000000..8893fa5ae
--- /dev/null
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/MainPager.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 2015 Domoticz - Mark Heinis
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package nl.hnogames.domoticz.Fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.design.widget.BottomNavigationView;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+
+import nl.hnogames.domoticz.Interfaces.DomoticzFragmentListener;
+import nl.hnogames.domoticz.MainActivity;
+import nl.hnogames.domoticz.R;
+import nl.hnogames.domoticz.Utils.SharedPrefUtil;
+import nl.hnogames.domoticz.app.DomoticzCardFragment;
+import nl.hnogames.domoticz.app.DomoticzDashboardFragment;
+import nl.hnogames.domoticz.app.DomoticzRecyclerFragment;
+import nl.hnogames.domoticz.app.RefreshFragment;
+
+public class MainPager extends RefreshFragment implements DomoticzFragmentListener {
+    private static final String TAG = MainPager.class.getSimpleName();
+    private Context context;
+    private FragmentStatePagerAdapter adapterViewPager;
+    private BottomNavigationView bottomNavigation;
+    private ViewPager vpPager;
+    private SharedPrefUtil mSharedPrefs;
+    private RelativeLayout root;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void RefreshFragment() {
+        Fragment f = (Fragment) vpPager
+            .getAdapter()
+            .instantiateItem(vpPager, vpPager.getCurrentItem());
+        if (f instanceof DomoticzRecyclerFragment) {
+            ((DomoticzRecyclerFragment) f).refreshFragment();
+        } else if (f instanceof DomoticzCardFragment)
+            ((DomoticzCardFragment) f).refreshFragment();
+        else if (f instanceof DomoticzDashboardFragment)
+            ((DomoticzDashboardFragment) f).refreshFragment();
+        else if (f instanceof RefreshFragment)
+            ((RefreshFragment) f).RefreshFragment();
+    }
+
+    @Override
+    public void Filter(String newText) {
+        Fragment n = (Fragment) vpPager
+            .getAdapter()
+            .instantiateItem(vpPager, vpPager.getCurrentItem());
+        if (n instanceof DomoticzDashboardFragment) {
+            ((DomoticzDashboardFragment) n).Filter(newText);
+        } else if (n instanceof DomoticzRecyclerFragment) {
+            ((DomoticzRecyclerFragment) n).Filter(newText);
+        } else if (n instanceof RefreshFragment) {
+            ((RefreshFragment) n).Filter(newText);
+        }
+    }
+
+    @Override
+    public void sortFragment(String selectedSort) {
+        Fragment f = (Fragment) vpPager
+            .getAdapter()
+            .instantiateItem(vpPager, vpPager.getCurrentItem());
+        if (f instanceof DomoticzRecyclerFragment) {
+            ((DomoticzRecyclerFragment) f).sortFragment(selectedSort);
+        } else if (f instanceof DomoticzDashboardFragment) {
+            ((DomoticzDashboardFragment) f).sortFragment(selectedSort);
+        } else if (f instanceof RefreshFragment) {
+            ((RefreshFragment) f).sortFragment(selectedSort);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater,
+                             ViewGroup container,
+                             Bundle savedInstanceState) {
+        if (mSharedPrefs == null)
+            mSharedPrefs = new SharedPrefUtil(getActivity());
+        root = (RelativeLayout) inflater.inflate(R.layout.mainpager, null);
+        initViews();
+        return root;
+    }
+
+    @NonNull
+    private void initViews() {
+        vpPager = root.findViewById(R.id.vpPager);
+        bottomNavigation = root.findViewById(R.id.BottomNavigation);
+        if (mSharedPrefs.darkThemeEnabled()) {
+            bottomNavigation.setBackgroundColor(getResources().getColor(R.color.background_dark));
+        }
+        adapterViewPager = new MainPagerAdapter(((AppCompatActivity) context), 5);
+        vpPager.setAdapter(adapterViewPager);
+        vpPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float v, int i1) {
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                bottomNavigation.getMenu().getItem(position).setChecked(true);
+                SetTitle(GetTitle(position));
+                if (getActivity() instanceof MainActivity)
+                    ((MainActivity) getActivity()).clearSearch();
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int i) {
+            }
+        });
+
+        bottomNavigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
+            @Override
+            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+                switch (item.getItemId()) {
+                    case R.id.bbn_dashboard:
+                        vpPager.setCurrentItem(0);
+                        SetTitle(GetTitle(0));
+                        break;
+                    case R.id.bbn_switches:
+                        vpPager.setCurrentItem(1);
+                        SetTitle(GetTitle(1));
+                        break;
+                    case R.id.bbn_scenes:
+                        vpPager.setCurrentItem(2);
+                        SetTitle(GetTitle(2));
+                        break;
+                    case R.id.bbn_temperature:
+                        vpPager.setCurrentItem(3);
+                        SetTitle(GetTitle(3));
+                        break;
+                    case R.id.bbn_weather:
+                        vpPager.setCurrentItem(4);
+                        SetTitle(GetTitle(4));
+                        break;
+                }
+                if (getActivity() instanceof MainActivity)
+                    ((MainActivity) getActivity()).clearSearch();
+                return false;
+            }
+        });
+    }
+
+    public int GetTitle(int position) {
+        switch (position) {
+            case 0:
+                return R.string.title_dashboard;
+            case 1:
+                return R.string.title_switches;
+            case 2:
+                return R.string.title_scenes;
+            case 3:
+                return R.string.title_temperature;
+            case 4:
+                return R.string.title_weather;
+            default:
+                return R.string.title_dashboard;
+        }
+    }
+
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        this.context = context;
+        SetTitle(R.string.title_dashboard);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    private void SetTitle(int title) {
+        if (getActionBar() != null)
+            getActionBar().setTitle(title);
+    }
+
+    public ActionBar getActionBar() {
+        return ((AppCompatActivity) context).getSupportActionBar();
+    }
+
+    @Override
+    public void onConnectionOk() {
+        Log.i(TAG, "Connection OK MainPager");
+    }
+
+    @Override
+    public void onConnectionFailed() {
+        Log.i(TAG, "Connection Failed MainPager");
+    }
+
+    public static class MainPagerAdapter extends FragmentStatePagerAdapter {
+        private final int mCount;
+
+        public MainPagerAdapter(final AppCompatActivity activity, int count) {
+            super(activity.getSupportFragmentManager());
+            this.mCount = count;
+        }
+
+        // Returns total number of pages
+        @Override
+        public int getCount() {
+            return mCount;
+        }
+
+        // Returns the fragment to display for that page
+        @Override
+        public Fragment getItem(int position) {
+            switch (position) {
+                case 0:
+                    return new Dashboard();
+                case 1:
+                    return new Switches();
+                case 2:
+                    return new Scenes();
+                case 3:
+                    return new Temperature();
+                case 4:
+                    return new Weather();
+                default:
+                    return null;
+            }
+        }
+
+        // Returns the page title for the top indicator
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return "Page " + position;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Plans.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Plans.java
index b50926783..a433717cc 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Plans.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Plans.java
@@ -51,6 +51,7 @@
 import nl.hnogames.domoticz.app.DomoticzCardFragment;
 import nl.hnogames.domoticzapi.Containers.PlanInfo;
 import nl.hnogames.domoticzapi.Interfaces.PlansReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Plans extends DomoticzCardFragment implements DomoticzFragmentListener {
 
@@ -82,11 +83,6 @@ public void refreshFragment() {
         processPlans();
     }
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-    }
-
     public void processPlans() {
         new GetCachedDataTask().execute();
     }
@@ -94,12 +90,19 @@ public void processPlans() {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
         mSharedPrefs = new SharedPrefUtil(mContext);
         if (getActionBar() != null)
             getActionBar().setTitle(R.string.title_plans);
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+    }
+
     @Override
     public void errorHandling(Exception error, CoordinatorLayout coordinatorLayout) {
         if (error != null) {
@@ -169,7 +172,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<PlanInfo> cachePlans = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cachePlans = (ArrayList<PlanInfo>) SerializableManager.readSerializedObject(mContext, "Plans");
                     Plans.this.mPlans = cachePlans;
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Scenes.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Scenes.java
index bb8acf812..3a2881e6f 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Scenes.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Scenes.java
@@ -23,6 +23,7 @@
 
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -54,6 +55,7 @@
 import nl.hnogames.domoticzapi.Interfaces.ScenesReceiver;
 import nl.hnogames.domoticzapi.Interfaces.SwitchLogReceiver;
 import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Scenes extends DomoticzRecyclerFragment implements DomoticzFragmentListener,
     ScenesClickListener {
@@ -78,12 +80,19 @@ public void onConnectionFailed() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
-        if (getActionBar() != null)
-            getActionBar().setTitle(R.string.title_scenes);
         initAnimation();
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+        //if (getActionBar() != null)
+        //    getActionBar().setTitle(R.string.title_scenes);
+    }
+
     @Override
     @DebugLog
     public void Filter(String text) {
@@ -401,7 +410,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<SceneInfo> cacheSwitches = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheSwitches = (ArrayList<SceneInfo>) SerializableManager.readSerializedObject(mContext, "Scenes");
                 } catch (Exception ex) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Switches.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Switches.java
index 06253aea8..d25411126 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Switches.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Switches.java
@@ -22,8 +22,10 @@
 package nl.hnogames.domoticz.Fragments;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -35,6 +37,9 @@
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.skydoves.colorpickerview.ColorEnvelope;
+import com.skydoves.colorpickerview.ColorPickerDialog;
+import com.skydoves.colorpickerview.listeners.ColorEnvelopeListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,13 +51,13 @@
 import nl.hnogames.domoticz.Interfaces.switchesClickListener;
 import nl.hnogames.domoticz.MainActivity;
 import nl.hnogames.domoticz.R;
-import nl.hnogames.domoticz.UI.ColorPickerDialog;
 import nl.hnogames.domoticz.UI.NotificationInfoDialog;
 import nl.hnogames.domoticz.UI.PasswordDialog;
 import nl.hnogames.domoticz.UI.SecurityPanelDialog;
 import nl.hnogames.domoticz.UI.SwitchInfoDialog;
 import nl.hnogames.domoticz.UI.SwitchLogInfoDialog;
 import nl.hnogames.domoticz.UI.SwitchTimerInfoDialog;
+import nl.hnogames.domoticz.UI.WWColorPickerDialog;
 import nl.hnogames.domoticz.Utils.SerializableManager;
 import nl.hnogames.domoticz.Utils.UsefulBits;
 import nl.hnogames.domoticz.Utils.WidgetUtils;
@@ -68,6 +73,7 @@
 import nl.hnogames.domoticzapi.Interfaces.SwitchLogReceiver;
 import nl.hnogames.domoticzapi.Interfaces.SwitchTimerReceiver;
 import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Switches extends DomoticzRecyclerFragment implements DomoticzFragmentListener,
     switchesClickListener {
@@ -101,13 +107,19 @@ public void refreshFragment() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
-
-        if (getActionBar() != null)
-            getActionBar().setTitle(R.string.title_switches);
         initAnimation();
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+        //if (getActionBar() != null)
+        //    getActionBar().setTitle(R.string.title_switches);
+    }
+
     @Override
     @DebugLog
     public void Filter(String text) {
@@ -142,13 +154,10 @@ private void getSwitchesData() {
         if (mSwipeRefreshLayout != null)
             mSwipeRefreshLayout.setRefreshing(true);
         WidgetUtils.RefreshWidgets(mContext);
-
         new GetCachedDataTask().execute();
-
     }
 
     // add dynamic list view
-    // https://github.com/nhaarman/ListViewAnimations
     private void createListView(ArrayList<DevicesInfo> switches) {
         if (getView() != null) {
             try {
@@ -225,10 +234,15 @@ public void onRefresh() {
     private void showInfoDialog(final DevicesInfo mSwitch) {
         SwitchInfoDialog infoDialog = new SwitchInfoDialog(
             mContext,
+            mDomoticz,
             mSwitch,
             R.layout.dialog_switch_info);
         infoDialog.setIdx(String.valueOf(mSwitch.getIdx()));
         infoDialog.setLastUpdate(mSwitch.getLastUpdate());
+        try {
+            infoDialog.setColorLight(mSwitch.getSubType().startsWith(DomoticzValues.Device.SubType.Name.RGB) || mSwitch.getSubType().startsWith(DomoticzValues.Device.SubType.Name.WW));
+        } catch (Exception ex) {
+        }
         infoDialog.setSignalLevel(String.valueOf(mSwitch.getSignalLevel()));
         infoDialog.setBatteryLevel(String.valueOf(mSwitch.getBatteryLevel()));
         infoDialog.setIsFavorite(mSwitch.getFavoriteBoolean());
@@ -348,55 +362,123 @@ public void onLikeButtonClick(int idx, boolean checked) {
     @Override
     @DebugLog
     public void onColorButtonClick(final int idx) {
-        ColorPickerDialog colorDialog = new ColorPickerDialog(
-            mContext, idx);
-        colorDialog.show();
+        if (getSwitch(idx).getSubType().startsWith(DomoticzValues.Device.SubType.Name.WW)) {
+            WWColorPickerDialog colorDialog = new WWColorPickerDialog(mContext,
+                getSwitch(idx).getIdx());
+            colorDialog.show();
+            colorDialog.onDismissListener(new WWColorPickerDialog.DismissListener() {
+                @Override
+                public void onDismiss(final int kelvin) {
+                    if (getSwitch(idx).isProtected()) {
+                        PasswordDialog passwordDialog = new PasswordDialog(
+                            mContext, mDomoticz);
+                        passwordDialog.show();
+                        passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                            @Override
+                            @DebugLog
+                            public void onDismiss(String password) {
+                                setKelvinColor(kelvin, idx, password, true);
+                            }
 
-        colorDialog.onDismissListener(new ColorPickerDialog.DismissListener() {
-            @Override
-            @DebugLog
-            public void onDismiss(final int selectedColor) {
-                if (getSwitch(idx).isProtected()) {
-                    PasswordDialog passwordDialog = new PasswordDialog(
-                        mContext, mDomoticz);
-                    passwordDialog.show();
-                    passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
-                        @Override
-                        @DebugLog
-                        public void onDismiss(String password) {
-                            setColor(selectedColor, idx, password);
-                        }
+                            @Override
+                            public void onCancel() {
+                            }
+                        });
+                    } else
+                        setKelvinColor(kelvin, idx, null, true);
+                }
 
-                        @Override
-                        public void onCancel() {
-                        }
-                    });
-                } else
-                    setColor(selectedColor, idx, null);
-            }
+                @Override
+                public void onChangeColor(int kelvin) {
+                    if (!getSwitch(idx).isProtected())
+                        setKelvinColor(kelvin, idx, null, false);
+                }
+            });
+        } else {
+            ColorPickerDialog.Builder builder = new ColorPickerDialog.Builder(getContext());
+            builder.setTitle(getString(R.string.choose_color));
+            builder.setPositiveButton(getString(R.string.ok), new ColorEnvelopeListener() {
+                @Override
+                public void onColorSelected(final ColorEnvelope envelope, boolean fromUser) {
+                    if (getSwitch(idx).isProtected()) {
+                        PasswordDialog passwordDialog = new PasswordDialog(
+                            mContext, mDomoticz);
+                        passwordDialog.show();
+                        passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                            @Override
+                            @DebugLog
+                            public void onDismiss(String password) {
+                                setRGBColor(envelope.getColor(), idx, password, true);
+                            }
 
-            @Override
-            @DebugLog
-            public void onChangeColor(final int selectedColor) {
-                if (!getSwitch(idx).isProtected()) {
-                    setColor(selectedColor, idx, null);
+                            @Override
+                            public void onCancel() {
+                            }
+                        });
+                    } else
+                        setRGBColor(envelope.getColor(), idx, null, true);
                 }
-            }
-        });
+            });
+            builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    dialogInterface.dismiss();
+                }
+            });
+            builder.show(); // show dialog
+        }
     }
 
-    private void setColor(int selectedColor, final int idx, final String password) {
+    private void setKelvinColor(int kelvin, final int idx, final String password, final boolean selected) {
+        mDomoticz.setAction(idx,
+            DomoticzValues.Json.Url.Set.KELVIN,
+            DomoticzValues.Device.Dimmer.Action.KELVIN,
+            kelvin,
+            password,
+            new setCommandReceiver() {
+                @Override
+                @DebugLog
+                public void onReceiveResult(String result) {
+                    if (selected) {
+                        UsefulBits.showSnackbar(mContext, coordinatorLayout, mContext.getString(R.string.color_set) + ": " + getSwitch(idx).getName(), Snackbar.LENGTH_SHORT);
+                        if (getActivity() instanceof MainActivity)
+                            ((MainActivity) getActivity()).Talk(R.string.color_set);
+                    }
+                }
+
+                @Override
+                @DebugLog
+                public void onError(Exception error) {
+                    if (selected) {
+                        if (!UsefulBits.isEmpty(password)) {
+                            UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.security_wrong_code, Snackbar.LENGTH_SHORT);
+                            if (getActivity() instanceof MainActivity)
+                                ((MainActivity) getActivity()).Talk(R.string.security_wrong_code);
+                        } else {
+                            UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.error_color, Snackbar.LENGTH_SHORT);
+                            if (getActivity() instanceof MainActivity)
+                                ((MainActivity) getActivity()).Talk(R.string.error_color);
+                        }
+                    }
+                }
+            });
+    }
+
+    private void setRGBColor(int selectedColor, final int idx, final String password, final boolean selected) {
         double[] hsv = UsefulBits.rgb2hsv(Color.red(selectedColor), Color.green(selectedColor), Color.blue(selectedColor));
-        Log.v(TAG, "Selected HVS Color: h:" + hsv[0] + " v:" + hsv[1] + " s:" + hsv[2] + " color: " + selectedColor);
-        if (hsv.length <= 0)
+        if (hsv == null || hsv.length <= 0)
             return;
 
+        if (selected) {
+            Log.v(TAG, "Selected HVS Color: h:" + hsv[0] + " v:" + hsv[1] + " s:" + hsv[2] + " color: " + selectedColor);
+            addDebugText("Selected HVS Color: h:" + hsv[0] + " v:" + hsv[1] + " s:" + hsv[2] + " color: " + selectedColor);
+        }
+
         boolean isWhite = false;
         long hue = Math.round(hsv[0]);
         if (selectedColor == -1) {
             isWhite = true;
         }
-
         mDomoticz.setRGBColorAction(idx,
             DomoticzValues.Json.Url.Set.RGBCOLOR,
             hue,
@@ -407,22 +489,26 @@ private void setColor(int selectedColor, final int idx, final String password) {
                 @Override
                 @DebugLog
                 public void onReceiveResult(String result) {
-                    UsefulBits.showSnackbar(mContext, coordinatorLayout, mContext.getString(R.string.color_set) + ": " + getSwitch(idx).getName(), Snackbar.LENGTH_SHORT);
-                    if (getActivity() instanceof MainActivity)
-                        ((MainActivity) getActivity()).Talk(R.string.color_set);
+                    if (selected) {
+                        UsefulBits.showSnackbar(mContext, coordinatorLayout, mContext.getString(R.string.color_set) + ": " + getSwitch(idx).getName(), Snackbar.LENGTH_SHORT);
+                        if (getActivity() instanceof MainActivity)
+                            ((MainActivity) getActivity()).Talk(R.string.color_set);
+                    }
                 }
 
                 @Override
                 @DebugLog
                 public void onError(Exception error) {
-                    if (!UsefulBits.isEmpty(password)) {
-                        UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.security_wrong_code, Snackbar.LENGTH_SHORT);
-                        if (getActivity() instanceof MainActivity)
-                            ((MainActivity) getActivity()).Talk(R.string.security_wrong_code);
-                    } else {
-                        UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.error_color, Snackbar.LENGTH_SHORT);
-                        if (getActivity() instanceof MainActivity)
-                            ((MainActivity) getActivity()).Talk(R.string.error_color);
+                    if (selected) {
+                        if (!UsefulBits.isEmpty(password)) {
+                            UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.security_wrong_code, Snackbar.LENGTH_SHORT);
+                            if (getActivity() instanceof MainActivity)
+                                ((MainActivity) getActivity()).Talk(R.string.security_wrong_code);
+                        } else {
+                            UsefulBits.showSnackbar(mContext, coordinatorLayout, R.string.error_color, Snackbar.LENGTH_SHORT);
+                            if (getActivity() instanceof MainActivity)
+                                ((MainActivity) getActivity()).Talk(R.string.error_color);
+                        }
                     }
                 }
             });
@@ -671,7 +757,8 @@ private void toggleSwitch(DevicesInfo clickedSwitch, boolean checked, final Stri
             int jsonAction;
             int jsonUrl = DomoticzValues.Json.Url.Set.SWITCHES;
             if (clickedSwitch.getSwitchTypeVal() == DomoticzValues.Device.Type.Value.BLINDS ||
-                clickedSwitch.getSwitchTypeVal() == DomoticzValues.Device.Type.Value.BLINDPERCENTAGE) {
+                clickedSwitch.getSwitchTypeVal() == DomoticzValues.Device.Type.Value.BLINDPERCENTAGE ||
+                clickedSwitch.getSwitchTypeVal() == DomoticzValues.Device.Type.Value.DOORLOCKINVERTED) {
                 if (checked) jsonAction = DomoticzValues.Device.Switch.Action.OFF;
                 else jsonAction = DomoticzValues.Device.Switch.Action.ON;
             } else {
@@ -935,7 +1022,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<DevicesInfo> cacheSwitches = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheSwitches = (ArrayList<DevicesInfo>) SerializableManager.readSerializedObject(mContext, "Switches");
                     extendedStatusSwitches = cacheSwitches;
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Temperature.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Temperature.java
index af39bf118..9b6322b29 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Temperature.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Temperature.java
@@ -24,6 +24,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.View;
@@ -53,6 +54,7 @@
 import nl.hnogames.domoticzapi.DomoticzValues;
 import nl.hnogames.domoticzapi.Interfaces.TemperatureReceiver;
 import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Temperature extends DomoticzRecyclerFragment implements DomoticzFragmentListener, TemperatureClickListener {
 
@@ -80,7 +82,6 @@ public void onConnectionFailed() {
     public void refreshFragment() {
         if (mSwipeRefreshLayout != null)
             mSwipeRefreshLayout.setRefreshing(true);
-
         processTemperature();
     }
 
@@ -88,12 +89,19 @@ public void refreshFragment() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
-        if (getActionBar() != null)
-            getActionBar().setTitle(R.string.title_temperature);
         initAnimation();
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+        //if (getActionBar() != null)
+        //    getActionBar().setTitle(R.string.title_temperature);
+    }
+
     @Override
     @DebugLog
     public void Filter(String text) {
@@ -355,7 +363,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<TemperatureInfo> cacheTemperatures = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheTemperatures = (ArrayList<TemperatureInfo>) SerializableManager.readSerializedObject(mContext, "Temperatures");
                 } catch (Exception ex) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/UserVariables.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/UserVariables.java
index 92c2ca1d0..18b0dd1a8 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/UserVariables.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/UserVariables.java
@@ -23,6 +23,7 @@
 
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.InputType;
@@ -44,9 +45,9 @@
 import nl.hnogames.domoticzapi.Containers.UserVariableInfo;
 import nl.hnogames.domoticzapi.Interfaces.UserVariablesReceiver;
 import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class UserVariables extends DomoticzRecyclerFragment implements DomoticzFragmentListener, UserVariablesClickListener {
-
     private ArrayList<UserVariableInfo> mUserVariableInfos;
     private UserVariablesAdapter adapter;
     private Context mContext;
@@ -70,11 +71,18 @@ public void refreshFragment() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
         if (getActionBar() != null)
             getActionBar().setTitle(R.string.title_vars);
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+    }
+
     @Override
     @DebugLog
     public void Filter(String text) {
@@ -198,7 +206,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<UserVariableInfo> cacheUserVariables = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheUserVariables = (ArrayList<UserVariableInfo>) SerializableManager.readSerializedObject(mContext, "UserVariables");
                     UserVariables.this.mUserVariableInfos = cacheUserVariables;
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java
index 640b01c82..6e5ae73ba 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java
@@ -24,6 +24,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.View;
@@ -57,6 +58,7 @@
 import nl.hnogames.domoticzapi.Interfaces.SwitchLogReceiver;
 import nl.hnogames.domoticzapi.Interfaces.UtilitiesReceiver;
 import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Utilities extends DomoticzRecyclerFragment implements DomoticzFragmentListener,
     UtilityClickListener {
@@ -87,12 +89,19 @@ public void refreshFragment() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
         if (getActionBar() != null)
             getActionBar().setTitle(R.string.title_utilities);
         initAnimation();
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+    }
+
     @Override
     @DebugLog
     public void Filter(String text) {
@@ -459,7 +468,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<UtilitiesInfo> cacheUtilities = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheUtilities = (ArrayList<UtilitiesInfo>) SerializableManager.readSerializedObject(mContext, "Utilities");
                     Utilities.this.mUtilitiesInfos = cacheUtilities;
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Weather.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Weather.java
index 155e54c3c..8e8654ad4 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Weather.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Weather.java
@@ -24,6 +24,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.View;
@@ -53,6 +54,7 @@
 import nl.hnogames.domoticzapi.DomoticzValues;
 import nl.hnogames.domoticzapi.Interfaces.WeatherReceiver;
 import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
+import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
 
 public class Weather extends DomoticzRecyclerFragment implements DomoticzFragmentListener, WeatherClickListener {
 
@@ -84,12 +86,19 @@ public void refreshFragment() {
     @DebugLog
     public void onAttach(Context context) {
         super.onAttach(context);
+        onAttachFragment(this);
         mContext = context;
-        if (getActionBar() != null)
-            getActionBar().setTitle(R.string.title_weather);
         initAnimation();
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        onAttachFragment(this);
+        super.onActivityCreated(savedInstanceState);
+        //if (getActionBar() != null)
+        //   getActionBar().setTitle(R.string.title_weather);
+    }
+
     @Override
     @DebugLog
     public void Filter(String text) {
@@ -304,7 +313,9 @@ private class GetCachedDataTask extends AsyncTask<Boolean, Boolean, Boolean> {
         ArrayList<WeatherInfo> cacheWeathers = null;
 
         protected Boolean doInBackground(Boolean... geto) {
-            if (!mPhoneConnectionUtil.isNetworkAvailable()) {
+            if (mPhoneConnectionUtil == null)
+                mPhoneConnectionUtil = new PhoneConnectionUtil(mContext);
+            if (mPhoneConnectionUtil != null && !mPhoneConnectionUtil.isNetworkAvailable()) {
                 try {
                     cacheWeathers = (ArrayList<WeatherInfo>) SerializableManager.readSerializedObject(mContext, "Weathers");
                 } catch (Exception ex) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/MainActivity.java b/app/src/main/java/nl/hnogames/domoticz/MainActivity.java
index f0c72a0f4..5acde416d 100644
--- a/app/src/main/java/nl/hnogames/domoticz/MainActivity.java
+++ b/app/src/main/java/nl/hnogames/domoticz/MainActivity.java
@@ -25,6 +25,7 @@
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.StrictMode;
 import android.speech.RecognizerIntent;
 import android.speech.SpeechRecognizer;
 import android.support.annotation.NonNull;
@@ -70,6 +71,7 @@
 import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 import com.mikepenz.materialdrawer.model.interfaces.IProfile;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -82,7 +84,7 @@
 import nl.hnogames.domoticz.Containers.QRCodeInfo;
 import nl.hnogames.domoticz.Containers.SpeechInfo;
 import nl.hnogames.domoticz.Fragments.Cameras;
-import nl.hnogames.domoticz.Fragments.Dashboard;
+import nl.hnogames.domoticz.Fragments.MainPager;
 import nl.hnogames.domoticz.Fragments.Scenes;
 import nl.hnogames.domoticz.Fragments.Switches;
 import nl.hnogames.domoticz.UI.PasswordDialog;
@@ -101,6 +103,7 @@
 import nl.hnogames.domoticz.app.DomoticzCardFragment;
 import nl.hnogames.domoticz.app.DomoticzDashboardFragment;
 import nl.hnogames.domoticz.app.DomoticzRecyclerFragment;
+import nl.hnogames.domoticz.app.RefreshFragment;
 import nl.hnogames.domoticzapi.Containers.ConfigInfo;
 import nl.hnogames.domoticzapi.Containers.DevicesInfo;
 import nl.hnogames.domoticzapi.Containers.ServerInfo;
@@ -155,6 +158,15 @@ public ServerUtil getServerUtil() {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (Build.VERSION.SDK_INT >= 24) {
+            try {
+                Method m = StrictMode.class.getMethod("disableDeathOnFileUriExposure");
+                m.invoke(null);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
         mSharedPrefs = new SharedPrefUtil(this);
         if (mSharedPrefs.darkThemeEnabled())
             setTheme(R.style.AppThemeDarkMain);
@@ -163,17 +175,14 @@ protected void onCreate(Bundle savedInstanceState) {
         permissionHelper = PermissionHelper.getInstance(this);
 
         UsefulBits.checkAPK(this, mSharedPrefs);
-        AdView mAdView;
         if (BuildConfig.LITE_VERSION || !mSharedPrefs.isAPKValidated()) {
             setContentView(R.layout.activity_newmain_free);
-            mAdView = findViewById(R.id.adView);
             MobileAds.initialize(this, this.getString(R.string.ADMOB_APP_KEY));
-            AdRequest adRequest = new AdRequest.Builder().addTestDevice("83DBECBB403C3E924CAA8B529F7E848E").build();
-            mAdView.loadAd(adRequest);
+            AdRequest adRequest = new AdRequest.Builder().addTestDevice("A18F9718FC3511DC6BCB1DC5AF076AE4").build();
+            ((AdView) findViewById(R.id.adView)).loadAd(adRequest);
         } else {
             setContentView(R.layout.activity_newmain_paid);
-            mAdView = findViewById(R.id.adView);
-            mAdView.setVisibility(View.GONE);
+            (findViewById(R.id.adView)).setVisibility(View.GONE);
         }
 
         if (savedInstanceState == null) {
@@ -185,6 +194,9 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         toolbar = findViewById(R.id.toolbar);
+        if (mSharedPrefs.darkThemeEnabled())
+            toolbar.setBackgroundColor(getResources().getColor(R.color.secondary));
+
         setSupportActionBar(toolbar);
 
         boolean resolvableError = UsefulBits.checkPlayServicesAvailable(this);
@@ -505,7 +517,6 @@ private int getSelectorValue(DevicesInfo mDevicesInfo, String value) {
         return jsonValue;
     }
 
-
     @DebugLog
     public void refreshFragment() {
         Fragment f = latestFragment;
@@ -515,6 +526,8 @@ public void refreshFragment() {
             ((DomoticzCardFragment) f).refreshFragment();
         else if (f instanceof DomoticzDashboardFragment)
             ((DomoticzDashboardFragment) f).refreshFragment();
+        else if (f instanceof RefreshFragment)
+            ((RefreshFragment) f).RefreshFragment();
     }
 
     @DebugLog
@@ -832,11 +845,19 @@ private List<IDrawerItem> getDrawerItems() {
         String ICONS[] = mSharedPrefs.getNavigationIcons();
 
         for (int i = 0; i < drawerActions.length; i++)
-            if (fragments[i].contains("Wizard") || fragments[i].contains("Dashboard"))
+            if (fragments[i].contains("Wizard") || fragments[i].contains("MainPager"))
+                drawerItems.add(createPrimaryDrawerItem(drawerActions[i], ICONS[i], fragments[i]));
+
+        drawerItems.add(new DividerDrawerItem());
+
+        for (int i = 0; i < drawerActions.length; i++)
+            if ((!fragments[i].contains("Wizard") && !fragments[i].contains("MainPager")) && fragments[i].contains("Utilities") || fragments[i].contains("Plans") || fragments[i].contains("Camera"))
                 drawerItems.add(createPrimaryDrawerItem(drawerActions[i], ICONS[i], fragments[i]));
+
         drawerItems.add(new DividerDrawerItem());
+
         for (int i = 0; i < drawerActions.length; i++)
-            if (!fragments[i].contains("Wizard") && !fragments[i].contains("Dashboard"))
+            if (!fragments[i].contains("Wizard") && !fragments[i].contains("MainPager") && !fragments[i].contains("Utilities") && !fragments[i].contains("Plans") && !fragments[i].contains("Camera"))
                 drawerItems.add(createSecondaryDrawerItem(drawerActions[i], ICONS[i], fragments[i]));
 
         return drawerItems;
@@ -851,7 +872,6 @@ private SecondaryDrawerItem createSecondaryDrawerItem(String title, String icon,
             item.withIconColorRes(R.color.white);
             item.withSelectedColorRes(R.color.material_indigo_600);
         }
-
         return item;
     }
 
@@ -864,7 +884,6 @@ private PrimaryDrawerItem createPrimaryDrawerItem(String title, String icon, Str
             item.withIconColorRes(R.color.white);
             item.withSelectedColorRes(R.color.material_indigo_600);
         }
-
         return item;
     }
 
@@ -981,8 +1000,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
                     getMenuInflater().inflate(R.menu.menu_camera_pause, menu);
                 else
                     getMenuInflater().inflate(R.menu.menu_camera, menu);
-            } else if ((f instanceof DomoticzDashboardFragment) || (f instanceof DomoticzRecyclerFragment)) {
-                if ((f instanceof Dashboard) || (f instanceof Scenes) || (f instanceof Switches))
+            } else if ((f instanceof DomoticzDashboardFragment) || (f instanceof DomoticzRecyclerFragment) || (f instanceof RefreshFragment)) {
+                if ((f instanceof MainPager) || (f instanceof Scenes) || (f instanceof Switches))
                     getMenuInflater().inflate(R.menu.menu_main_sort, menu);
                 else
                     getMenuInflater().inflate(R.menu.menu_main, menu);
@@ -1004,6 +1023,8 @@ public boolean onQueryTextChange(String newText) {
                             ((DomoticzDashboardFragment) n).Filter(newText);
                         } else if (n instanceof DomoticzRecyclerFragment) {
                             ((DomoticzRecyclerFragment) n).Filter(newText);
+                        } else if (n instanceof RefreshFragment) {
+                            ((RefreshFragment) n).Filter(newText);
                         }
                         return false;
                     }
@@ -1164,6 +1185,8 @@ public void onDismiss(String selectedSort) {
                                 ((DomoticzRecyclerFragment) f).sortFragment(selectedSort);
                             } else if (f instanceof DomoticzDashboardFragment) {
                                 ((DomoticzDashboardFragment) f).sortFragment(selectedSort);
+                            } else if (f instanceof RefreshFragment) {
+                                ((RefreshFragment) f).sortFragment(selectedSort);
                             }
                         }
                     });
@@ -1398,6 +1421,15 @@ public void onDestroy() {
         super.onDestroy();
     }
 
+    @DebugLog
+    public void clearSearch() {
+        if (searchViewAction != null) {
+            searchViewAction.setQuery("", false);
+            searchViewAction.clearFocus();
+            searchViewAction.onActionViewCollapsed();
+        }
+    }
+
     @Override
     @DebugLog
     public void onPause() {
@@ -1473,16 +1505,19 @@ public void onDigitusError(Digitus digitus, DigitusErrorType type, Exception e)
 
     @Override
     public void onFingerprintDialogAuthenticated() {
-        FingerprintDialog dialog = FingerprintDialog.getVisible(this);
-        if (dialog != null)
-            dialog.dismiss();
-        Digitus.deinit();
-        validateOnce = false;
-        if (!mSharedPrefs.isGeofencingStarted()) {
-            mSharedPrefs.setGeofencingStarted(true);
-            new GeoUtils(this, this).AddGeofences();
+        try {
+            FingerprintDialog dialog = FingerprintDialog.getVisible(this);
+            if (dialog != null)
+                dialog.dismiss();
+            Digitus.deinit();
+            validateOnce = false;
+            if (!mSharedPrefs.isGeofencingStarted()) {
+                mSharedPrefs.setGeofencingStarted(true);
+                new GeoUtils(this, this).AddGeofences();
+            }
+            buildScreen();
+        } catch (Exception ex) {
         }
-        buildScreen();
     }
 
     @Override
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/ColorPickerDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/ColorPickerDialog.java
deleted file mode 100644
index b38baf60e..000000000
--- a/app/src/main/java/nl/hnogames/domoticz/UI/ColorPickerDialog.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2015 Domoticz - Mark Heinis
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package nl.hnogames.domoticz.UI;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.view.View;
-
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.afollestad.materialdialogs.Theme;
-import com.larswerkman.lobsterpicker.LobsterPicker;
-import com.larswerkman.lobsterpicker.OnColorListener;
-import com.larswerkman.lobsterpicker.sliders.LobsterShadeSlider;
-
-import nl.hnogames.domoticz.R;
-import nl.hnogames.domoticz.Utils.SharedPrefUtil;
-
-public class ColorPickerDialog implements DialogInterface.OnDismissListener {
-
-    private final MaterialDialog.Builder mdb;
-    private DismissListener dismissListener;
-    private Context mContext;
-    private LobsterPicker lobsterPicker;
-    private LobsterShadeSlider shadeSlider;
-    private SharedPrefUtil mSharedPrefs;
-    private int idx;
-
-    public ColorPickerDialog(Context mContext, int idx) {
-        this.mContext = mContext;
-        mSharedPrefs = new SharedPrefUtil(mContext);
-        this.idx = idx;
-
-        if (mSharedPrefs.darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
-        mdb.customView(R.layout.dialog_color, true)
-            .theme(mSharedPrefs.darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
-            .positiveText(android.R.string.ok);
-
-        mdb.dismissListener(this);
-    }
-
-    public void show() {
-        mdb.title(mContext.getString(R.string.choose_color));
-        final MaterialDialog md = mdb.build();
-        View view = md.getCustomView();
-
-        if (view != null) {
-            lobsterPicker = (LobsterPicker) view.findViewById(R.id.lobsterpicker);
-            shadeSlider = (LobsterShadeSlider) view.findViewById(R.id.shadeslider);
-            lobsterPicker.addDecorator(shadeSlider);
-            lobsterPicker.setColorHistoryEnabled(true);
-            lobsterPicker.setHistory(mSharedPrefs.getPreviousColor(idx));
-            lobsterPicker.setColorPosition(mSharedPrefs.getPreviousColorPosition(idx));
-
-            shadeSlider.addOnColorListener(new OnColorListener() {
-                @Override
-                public void onColorChanged(@ColorInt int color) {
-                }
-
-                @Override
-                public void onColorSelected(@ColorInt int color) {
-                    mSharedPrefs.savePreviousColor(idx, color, lobsterPicker.getColorPosition());
-                    dismissListener.onChangeColor(color);
-                }
-            });
-
-            lobsterPicker.addOnColorListener(new OnColorListener() {
-                @Override
-                public void onColorChanged(@ColorInt int color) {
-                }
-
-                @Override
-                public void onColorSelected(@ColorInt int color) {
-                    mSharedPrefs.savePreviousColor(idx, color, lobsterPicker.getColorPosition());
-                    dismissListener.onChangeColor(color);
-                }
-            });
-        }
-
-        md.show();
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialogInterface) {
-        if (dismissListener != null)
-            dismissListener.onDismiss(shadeSlider.getColor());
-    }
-
-    public void onDismissListener(DismissListener dismissListener) {
-        this.dismissListener = dismissListener;
-    }
-
-    public interface DismissListener {
-        void onDismiss(int color);
-
-        void onChangeColor(int color);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/DeviceInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/DeviceInfoDialog.java
index 6dae1b003..618275843 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/DeviceInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/DeviceInfoDialog.java
@@ -23,24 +23,27 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
+import android.support.design.button.MaterialButton;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.CompoundButton;
+import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
 
+import hugo.weaving.DebugLog;
 import nl.hnogames.domoticz.R;
 import nl.hnogames.domoticz.Utils.SharedPrefUtil;
 import nl.hnogames.domoticzapi.Containers.DevicesInfo;
 import nl.hnogames.domoticzapi.Domoticz;
+import nl.hnogames.domoticzapi.DomoticzValues;
+import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
 
 public class DeviceInfoDialog implements DialogInterface.OnDismissListener {
-
     private final MaterialDialog.Builder mdb;
     private DismissListener dismissListener;
     private DevicesInfo mSwitch;
@@ -49,30 +52,25 @@ public class DeviceInfoDialog implements DialogInterface.OnDismissListener {
     private String signalLevel;
     private String batteryLevel;
     private boolean isFavorite;
+    private boolean isColorLight;
     private Context mContext;
     private SharedPrefUtil mSharedPrefs;
     private Switch favorite_switch;
+    private LinearLayout colorOptions;
+    private Domoticz mDomoticz;
+    private MaterialButton buttonNight, buttonFull;
+    private boolean isChanged = false;
 
     public DeviceInfoDialog(Context mContext,
+                            Domoticz domoticz,
                             DevicesInfo mSwitch,
                             int layout) {
         this.mContext = mContext;
         this.mSwitch = mSwitch;
+        this.mDomoticz = domoticz;
         this.mSharedPrefs = new SharedPrefUtil(mContext);
 
-        if (mSharedPrefs.darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         boolean wrapInScrollView = true;
         //noinspection ConstantConditions
         mdb.customView(layout, wrapInScrollView)
@@ -85,6 +83,10 @@ public void setIdx(String idx) {
         this.idx = idx;
     }
 
+    public void setColorLight(boolean iscolorLight) {
+        this.isColorLight = iscolorLight;
+    }
+
     public void setLastUpdate(String lastUpdate) {
         this.lastUpdate = lastUpdate;
     }
@@ -102,16 +104,20 @@ public void setIsFavorite(boolean isFavorite) {
     }
 
     public void show() {
-
         mdb.title(mSwitch.getName());
 
         MaterialDialog md = mdb.build();
         View view = md.getCustomView();
 
-        TextView IDX_value = (TextView) view.findViewById(R.id.IDX_value);
+        TextView IDX_value = view.findViewById(R.id.IDX_value);
         IDX_value.setText(idx);
 
-        TextView LastUpdate_value = (TextView) view.findViewById(R.id.LastUpdate_value);
+        InitButtons(view);
+
+        TextView LastUpdate_value = view.findViewById(R.id.LastUpdate_value);
+        colorOptions = view.findViewById(R.id.color_light_options);
+        if (isColorLight)
+            colorOptions.setVisibility(View.VISIBLE);
         LastUpdate_value.setText(lastUpdate);
 
         int signalLevelVal;
@@ -122,7 +128,7 @@ public void show() {
             signalLevelVal = 0;
         }
 
-        SeekBar signalLevelIndicator = (SeekBar) view.findViewById(R.id.SignalLevel_indicator);
+        SeekBar signalLevelIndicator = view.findViewById(R.id.SignalLevel_indicator);
         signalLevelIndicator.setVisibility(View.VISIBLE);
         signalLevelIndicator.setOnTouchListener(new View.OnTouchListener() {
             @Override
@@ -137,7 +143,7 @@ public boolean onTouch(View v, MotionEvent event) {
         signalLevelIndicator.startAnimation(anim);
 
 
-        TextView BatteryLevel_value = (TextView) view.findViewById(R.id.BatteryLevel_value);
+        TextView BatteryLevel_value = view.findViewById(R.id.BatteryLevel_value);
         int batteryLevelVal;
         try {
             batteryLevelVal = Integer.valueOf(batteryLevel);
@@ -150,7 +156,7 @@ public boolean onTouch(View v, MotionEvent event) {
             BatteryLevel_value.setText(batteryLevel);
         } else {
             BatteryLevel_value.setVisibility(View.GONE);
-            SeekBar batteryLevelIndicator = (SeekBar) view.findViewById(R.id.BatteryLevel_indicator);
+            SeekBar batteryLevelIndicator = view.findViewById(R.id.BatteryLevel_indicator);
             batteryLevelIndicator.setVisibility(View.VISIBLE);
             batteryLevelIndicator.setOnTouchListener(new View.OnTouchListener() {
                 @Override
@@ -164,22 +170,83 @@ public boolean onTouch(View v, MotionEvent event) {
             batteryLevelIndicator.startAnimation(anim);
         }
 
-
-        favorite_switch = (Switch) view.findViewById(R.id.favorite_switch);
+        favorite_switch = view.findViewById(R.id.favorite_switch);
         favorite_switch.setChecked(isFavorite);
-        favorite_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        md.show();
+    }
+
+    private void InitButtons(View view) {
+        buttonNight = view.findViewById(R.id.night_button);
+        buttonFull = view.findViewById(R.id.full_button);
+
+        buttonNight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mSwitch.isProtected()) {
+                    PasswordDialog passwordDialog = new PasswordDialog(
+                        mContext, mDomoticz);
+                    passwordDialog.show();
+                    passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                        @Override
+                        @DebugLog
+                        public void onDismiss(String password) {
+                            setAction(DomoticzValues.Json.Url.Set.NIGHTLIGHT, DomoticzValues.Device.Switch.Action.ON, password);
+                            Toast.makeText(mContext, mContext.getString(R.string.switch_night) + ": " + mSwitch.getName(), Toast.LENGTH_SHORT).show();
+                        }
+
+                        @Override
+                        public void onCancel() {
+                        }
+                    });
+                } else {
+                    setAction(DomoticzValues.Json.Url.Set.NIGHTLIGHT, DomoticzValues.Device.Switch.Action.ON, null);
+                    Toast.makeText(mContext, mContext.getString(R.string.switch_night) + ": " + mSwitch.getName(), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        buttonFull.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
+            public void onClick(View v) {
+                if (mSwitch.isProtected()) {
+                    PasswordDialog passwordDialog = new PasswordDialog(
+                        mContext, mDomoticz);
+                    passwordDialog.show();
+                    passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                        @Override
+                        @DebugLog
+                        public void onDismiss(String password) {
+                            setAction(DomoticzValues.Json.Url.Set.FULLLIGHT, DomoticzValues.Device.Switch.Action.ON, password);
+                            Toast.makeText(mContext, mContext.getString(R.string.switch_full) + ": " + mSwitch.getName(), Toast.LENGTH_SHORT).show();
+                        }
 
+                        @Override
+                        public void onCancel() {
+                        }
+                    });
+                } else {
+                    setAction(DomoticzValues.Json.Url.Set.FULLLIGHT, DomoticzValues.Device.Switch.Action.ON, null);
+                    Toast.makeText(mContext, mContext.getString(R.string.switch_full) + ": " + mSwitch.getName(), Toast.LENGTH_SHORT).show();
+                }
             }
         });
+    }
 
-        md.show();
+    public void setAction(int jsonUrl, int actionUrl, final String password) {
+        isChanged = true;
+        mDomoticz.setAction(mSwitch.getIdx(), jsonUrl, actionUrl, 0, password, new setCommandReceiver() {
+            @Override
+            @DebugLog
+            public void onReceiveResult(String result) {
+            }
+
+            @Override
+            public void onError(Exception error) {
+            }
+        });
     }
 
     @Override
     public void onDismiss(DialogInterface dialogInterface) {
-        boolean isChanged = false;
         boolean isChecked = favorite_switch.isChecked();
         if (isChecked != isFavorite) isChanged = true;
         if (dismissListener != null)
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/FingerprintPasswordDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/FingerprintPasswordDialog.java
index 2639b1fda..d71cf3d8e 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/FingerprintPasswordDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/FingerprintPasswordDialog.java
@@ -57,19 +57,8 @@ public FingerprintPasswordDialog(Context c, Domoticz mDomoticz) {
         this.mContext = c;
         this.domoticz = mDomoticz;
         mSharedPrefs = new SharedPrefUtil(c);
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(R.layout.dialog_password, true)
             .positiveText(android.R.string.ok)
             .negativeText(android.R.string.cancel)
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/NotificationInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/NotificationInfoDialog.java
index affbd5529..b0e3a2f7e 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/NotificationInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/NotificationInfoDialog.java
@@ -22,7 +22,6 @@
 package nl.hnogames.domoticz.UI;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.ListView;
 
@@ -47,19 +46,7 @@ public NotificationInfoDialog(Context c,
         this.info = _info;
         this.mContext = c;
 
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(R.layout.dialog_switch_timer, true)
             .theme((new SharedPrefUtil(mContext)).darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
             .positiveText(android.R.string.ok);
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/PasswordDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/PasswordDialog.java
index f0de84392..de43e861a 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/PasswordDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/PasswordDialog.java
@@ -57,19 +57,7 @@ public PasswordDialog(Context c, Domoticz mDomoticz) {
         this.mContext = c;
         this.domoticz = mDomoticz;
         mSharedPrefs = new SharedPrefUtil(c);
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(R.layout.dialog_password, true)
             .positiveText(android.R.string.ok)
             .negativeText(android.R.string.cancel)
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SceneInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SceneInfoDialog.java
index 8badb24b0..e092dcdc8 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/SceneInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/SceneInfoDialog.java
@@ -23,7 +23,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;
@@ -50,19 +49,7 @@ public SceneInfoDialog(Context mContext,
                            SceneInfo info,
                            int layout) {
         this.info = info;
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         boolean wrapInScrollView = true;
         //noinspection ConstantConditions
         mdb.customView(layout, wrapInScrollView)
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SecurityPanelDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SecurityPanelDialog.java
index 205a19731..9a34046cb 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/SecurityPanelDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/SecurityPanelDialog.java
@@ -72,20 +72,7 @@ public SecurityPanelDialog(Context c, Domoticz mDomoticz, DevicesInfo panelInfo)
         this.domoticz = mDomoticz;
         this.panelInfo = panelInfo;
         mSharedPrefs = new SharedPrefUtil(c);
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
-
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(R.layout.dialog_security, true)
             .theme(mSharedPrefs.darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
             .negativeText(android.R.string.cancel);
@@ -112,9 +99,9 @@ public void show() {
             txtCountDown = (TextView) view.findViewById(R.id.countdown);
 
             if (mSharedPrefs.darkThemeEnabled()) {
-                btnDisarm.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_status_dark));
-                btnArmHome.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_status_dark));
-                btnArmAway.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_status_dark));
+                btnDisarm.setBackground(ContextCompat.getDrawable(mContext, R.color.button_dark));
+                btnArmHome.setBackground(ContextCompat.getDrawable(mContext, R.color.button_dark));
+                btnArmAway.setBackground(ContextCompat.getDrawable(mContext, R.color.button_dark));
                 editPinCode.setTextColor(ContextCompat.getColor(mContext, R.color.white));
 
                 int[][] states = new int[][]{new int[]{android.R.attr.state_activated}, new int[]{-android.R.attr.state_activated}};
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SimpleTextDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SimpleTextDialog.java
index 6a258f114..f67e8207f 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/SimpleTextDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/SimpleTextDialog.java
@@ -22,7 +22,6 @@
 package nl.hnogames.domoticz.UI;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.TextView;
 
@@ -44,19 +43,7 @@ public SimpleTextDialog(Context mContext) {
 
         this.mContext = mContext;
 
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
 
         boolean wrapInScrollView = true;
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SortDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SortDialog.java
index 60fc36998..68fd4b999 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/SortDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/SortDialog.java
@@ -23,7 +23,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -32,7 +31,6 @@
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import nl.hnogames.domoticz.R;
-import nl.hnogames.domoticz.Utils.SharedPrefUtil;
 
 public class SortDialog implements DialogInterface.OnDismissListener {
 
@@ -46,19 +44,7 @@ public SortDialog(Context c,
         this.mContext = c;
 
         names = new String[]{mContext.getString(R.string.filterOn_on), mContext.getString(R.string.filterOn_off), mContext.getString(R.string.filterOn_static), mContext.getString(R.string.filterOn_all)};
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(layout, true)
             .negativeText(android.R.string.cancel);
         mdb.dismissListener(this);
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchDialog.java
index 8831c7223..818024100 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchDialog.java
@@ -23,7 +23,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -55,19 +54,7 @@ public SwitchDialog(Context c,
         this.mContext = c;
         this.mDomoticz = domoticz;
 
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(layout, true)
             .theme((new SharedPrefUtil(mContext)).darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
             .negativeText(android.R.string.cancel);
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchInfoDialog.java
index d508196b8..527fa5604 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchInfoDialog.java
@@ -23,21 +23,26 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
+import android.support.design.button.MaterialButton;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CompoundButton;
+import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
 
+import hugo.weaving.DebugLog;
 import nl.hnogames.domoticz.R;
 import nl.hnogames.domoticz.Utils.SharedPrefUtil;
 import nl.hnogames.domoticzapi.Containers.DevicesInfo;
 import nl.hnogames.domoticzapi.Domoticz;
+import nl.hnogames.domoticzapi.DomoticzValues;
+import nl.hnogames.domoticzapi.Interfaces.setCommandReceiver;
 
 public class SwitchInfoDialog implements DialogInterface.OnDismissListener {
 
@@ -51,28 +56,22 @@ public class SwitchInfoDialog implements DialogInterface.OnDismissListener {
     private boolean isFavorite;
     private Context mContext;
     private Switch favorite_switch;
+    private boolean isColorLight;
+    private LinearLayout colorOptions;
+    private Domoticz mDomoticz;
+    private MaterialButton buttonNight, buttonFull;
+    private boolean isChanged = false;
 
     public SwitchInfoDialog(Context mContext,
+                            Domoticz domoticz,
                             DevicesInfo mSwitch,
                             int layout) {
         this.mContext = mContext;
         this.mSwitch = mSwitch;
+        this.mDomoticz = domoticz;
 
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         boolean wrapInScrollView = true;
-        //noinspection ConstantConditions
         mdb.customView(layout, wrapInScrollView)
             .theme((new SharedPrefUtil(mContext)).darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
             .positiveText(android.R.string.ok);
@@ -83,6 +82,10 @@ public void setIdx(String idx) {
         this.idx = idx;
     }
 
+    public void setColorLight(boolean iscolorLight) {
+        this.isColorLight = iscolorLight;
+    }
+
     public void setLastUpdate(String lastUpdate) {
         this.lastUpdate = lastUpdate;
     }
@@ -106,12 +109,18 @@ public void show() {
         MaterialDialog md = mdb.build();
         View view = md.getCustomView();
 
-        TextView IDX_value = (TextView) view.findViewById(R.id.IDX_value);
+        TextView IDX_value = view.findViewById(R.id.IDX_value);
         IDX_value.setText(idx);
 
-        TextView LastUpdate_value = (TextView) view.findViewById(R.id.LastUpdate_value);
+        InitButtons(view);
+
+        TextView LastUpdate_value = view.findViewById(R.id.LastUpdate_value);
         LastUpdate_value.setText(lastUpdate);
 
+        colorOptions = view.findViewById(R.id.color_light_options);
+        if (isColorLight)
+            colorOptions.setVisibility(View.VISIBLE);
+
         int signalLevelVal;
         try {
             signalLevelVal = Integer.valueOf(signalLevel);
@@ -120,7 +129,7 @@ public void show() {
             signalLevelVal = 0;
         }
 
-        SeekBar signalLevelIndicator = (SeekBar) view.findViewById(R.id.SignalLevel_indicator);
+        SeekBar signalLevelIndicator = view.findViewById(R.id.SignalLevel_indicator);
         signalLevelIndicator.setVisibility(View.VISIBLE);
         signalLevelIndicator.setOnTouchListener(new View.OnTouchListener() {
             @Override
@@ -134,8 +143,7 @@ public boolean onTouch(View v, MotionEvent event) {
         anim.setDuration(1000);
         signalLevelIndicator.startAnimation(anim);
 
-
-        TextView BatteryLevel_value = (TextView) view.findViewById(R.id.BatteryLevel_value);
+        TextView BatteryLevel_value = view.findViewById(R.id.BatteryLevel_value);
         int batteryLevelVal;
         try {
             batteryLevelVal = Integer.valueOf(batteryLevel);
@@ -148,7 +156,7 @@ public boolean onTouch(View v, MotionEvent event) {
             BatteryLevel_value.setText(batteryLevel);
         } else {
             BatteryLevel_value.setVisibility(View.GONE);
-            SeekBar batteryLevelIndicator = (SeekBar) view.findViewById(R.id.BatteryLevel_indicator);
+            SeekBar batteryLevelIndicator = view.findViewById(R.id.BatteryLevel_indicator);
             batteryLevelIndicator.setVisibility(View.VISIBLE);
             batteryLevelIndicator.setOnTouchListener(new View.OnTouchListener() {
                 @Override
@@ -162,8 +170,7 @@ public boolean onTouch(View v, MotionEvent event) {
             batteryLevelIndicator.startAnimation(anim);
         }
 
-
-        favorite_switch = (Switch) view.findViewById(R.id.favorite_switch);
+        favorite_switch = view.findViewById(R.id.favorite_switch);
         favorite_switch.setChecked(isFavorite);
         favorite_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -171,13 +178,80 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
 
             }
         });
-
         md.show();
     }
 
+    private void InitButtons(View view) {
+        buttonNight = view.findViewById(R.id.night_button);
+        buttonFull = view.findViewById(R.id.full_button);
+        buttonNight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mSwitch.isProtected()) {
+                    PasswordDialog passwordDialog = new PasswordDialog(
+                        mContext, mDomoticz);
+                    passwordDialog.show();
+                    passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                        @Override
+                        @DebugLog
+                        public void onDismiss(String password) {
+                            setAction(DomoticzValues.Json.Url.Set.NIGHTLIGHT, DomoticzValues.Device.Switch.Action.ON, password);
+                            Toast.makeText(mContext, mContext.getString(R.string.switch_night) + ": " + mSwitch.getName(), Toast.LENGTH_SHORT);
+                        }
+
+                        @Override
+                        public void onCancel() {
+                        }
+                    });
+                } else {
+                    setAction(DomoticzValues.Json.Url.Set.NIGHTLIGHT, DomoticzValues.Device.Switch.Action.ON, null);
+                    Toast.makeText(mContext, mContext.getString(R.string.switch_night) + ": " + mSwitch.getName(), Toast.LENGTH_SHORT);
+                }
+            }
+        });
+        buttonFull.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mSwitch.isProtected()) {
+                    PasswordDialog passwordDialog = new PasswordDialog(
+                        mContext, mDomoticz);
+                    passwordDialog.show();
+                    passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                        @Override
+                        @DebugLog
+                        public void onDismiss(String password) {
+                            setAction(DomoticzValues.Json.Url.Set.FULLLIGHT, DomoticzValues.Device.Switch.Action.ON, password);
+                            Toast.makeText(mContext, mContext.getString(R.string.switch_full) + ": " + mSwitch.getName(), Toast.LENGTH_SHORT);
+                        }
+
+                        @Override
+                        public void onCancel() {
+                        }
+                    });
+                } else {
+                    setAction(DomoticzValues.Json.Url.Set.FULLLIGHT, DomoticzValues.Device.Switch.Action.ON, null);
+                    Toast.makeText(mContext, mContext.getString(R.string.switch_full) + ": " + mSwitch.getName(), Toast.LENGTH_SHORT);
+                }
+            }
+        });
+    }
+
+    public void setAction(int jsonUrl, int actionUrl, final String password) {
+        isChanged = true;
+        mDomoticz.setAction(mSwitch.getIdx(), jsonUrl, actionUrl, 0, password, new setCommandReceiver() {
+            @Override
+            @DebugLog
+            public void onReceiveResult(String result) {
+            }
+
+            @Override
+            public void onError(Exception error) {
+            }
+        });
+    }
+
     @Override
     public void onDismiss(DialogInterface dialogInterface) {
-        boolean isChanged = false;
         boolean isChecked = favorite_switch.isChecked();
         if (isChecked != isFavorite) isChanged = true;
         if (dismissListener != null)
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchLogInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchLogInfoDialog.java
index 981547519..f35c061b7 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchLogInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchLogInfoDialog.java
@@ -23,7 +23,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
@@ -48,19 +47,7 @@ public SwitchLogInfoDialog(Context c,
                                int layout) {
         this.info = _info;
         this.mContext = c;
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(layout, true)
             .theme((new SharedPrefUtil(mContext)).darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
             .positiveText(android.R.string.ok);
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchTimerInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchTimerInfoDialog.java
index 3467d2382..b16067741 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchTimerInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchTimerInfoDialog.java
@@ -22,7 +22,6 @@
 package nl.hnogames.domoticz.UI;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.ListView;
 
@@ -48,19 +47,7 @@ public SwitchTimerInfoDialog(Context c,
         this.info = _info;
         this.mContext = c;
 
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(layout, true)
             .theme((new SharedPrefUtil(mContext)).darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
             .positiveText(android.R.string.ok);
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/TemperatureDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/TemperatureDialog.java
index b550aff51..f4704a352 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/TemperatureDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/TemperatureDialog.java
@@ -22,7 +22,6 @@
 package nl.hnogames.domoticz.UI;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
@@ -61,19 +60,7 @@ public TemperatureDialog(Context mContext, double temp) {
         if (mSharedPrefUtil == null)
             mSharedPrefUtil = new SharedPrefUtil(mContext);
 
-        if (mSharedPrefUtil.darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         mdb.customView(R.layout.dialog_temperature, false)
             .negativeText(android.R.string.cancel)
             .theme(mSharedPrefUtil.darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
@@ -107,8 +94,8 @@ public void show() {
         Button btnMin = (Button) view.findViewById(R.id.min);
 
         if (mSharedPrefUtil.darkThemeEnabled()) {
-            bntPlus.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_status_dark));
-            btnMin.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_status_dark));
+            bntPlus.setBackground(ContextCompat.getDrawable(mContext, R.color.button_dark));
+            btnMin.setBackground(ContextCompat.getDrawable(mContext, R.color.button_dark));
         }
 
         final String text = String.valueOf(currentTemperature);
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/TemperatureInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/TemperatureInfoDialog.java
index 4d1dd5a41..5b7f4693d 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/TemperatureInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/TemperatureInfoDialog.java
@@ -23,7 +23,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;
@@ -50,19 +49,8 @@ public TemperatureInfoDialog(Context mContext,
                                  TemperatureInfo info,
                                  int layout) {
         this.info = info;
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+
+        mdb = new MaterialDialog.Builder(mContext);
         boolean wrapInScrollView = true;
         //noinspection ConstantConditions
         mdb.customView(layout, wrapInScrollView)
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/TextDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/TextDialog.java
index 4467b7eea..856bfb2cc 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/TextDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/TextDialog.java
@@ -23,7 +23,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.TextView;
 
@@ -53,19 +52,7 @@ public TextDialog(Context context) {
 
         this.context = context;
 
-        if ((new SharedPrefUtil(context)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(context)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(context);
+        mdb = new MaterialDialog.Builder(context);
         mdb.customView(R.layout.dialog_text, true).negativeText(android.R.string.cancel)
             .theme((new SharedPrefUtil(context)).darkThemeEnabled() ? Theme.DARK : Theme.LIGHT);
         mdb.dismissListener(this);
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/UtilitiesInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/UtilitiesInfoDialog.java
index 67ad12d03..b16602761 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/UtilitiesInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/UtilitiesInfoDialog.java
@@ -23,7 +23,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;
@@ -50,19 +49,7 @@ public UtilitiesInfoDialog(Context mContext,
                                UtilitiesInfo info,
                                int layout) {
         this.info = info;
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         boolean wrapInScrollView = true;
         //noinspection ConstantConditions
         mdb.customView(layout, wrapInScrollView)
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/WWColorPickerDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/WWColorPickerDialog.java
new file mode 100644
index 000000000..26ce23a97
--- /dev/null
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/WWColorPickerDialog.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2015 Domoticz - Mark Heinis
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package nl.hnogames.domoticz.UI;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.View;
+import android.widget.SeekBar;
+
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.afollestad.materialdialogs.Theme;
+
+import nl.hnogames.domoticz.R;
+import nl.hnogames.domoticz.Utils.SharedPrefUtil;
+
+public class WWColorPickerDialog implements DialogInterface.OnDismissListener {
+    private final MaterialDialog.Builder mdb;
+    private DismissListener dismissListener;
+    private Context mContext;
+    private SharedPrefUtil mSharedPrefs;
+    private int idx;
+    private SeekBar kelvinBar;
+
+    public WWColorPickerDialog(Context mContext, int idx) {
+        this.mContext = mContext;
+        mSharedPrefs = new SharedPrefUtil(mContext);
+        this.idx = idx;
+        mdb = new MaterialDialog.Builder(mContext);
+        mdb.customView(R.layout.dialog_wwcolor, true)
+            .theme(mSharedPrefs.darkThemeEnabled() ? Theme.DARK : Theme.LIGHT)
+            .positiveText(android.R.string.ok);
+        mdb.dismissListener(this);
+    }
+
+    public void show() {
+        mdb.title(mContext.getString(R.string.choose_color));
+        final MaterialDialog md = mdb.build();
+        View view = md.getCustomView();
+
+        if (view != null) {
+            kelvinBar = view.findViewById(R.id.kelvinBar);
+            kelvinBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+                @Override
+                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                    if (dismissListener != null)
+                        dismissListener.onChangeColor(kelvinBar.getProgress());
+                }
+
+                @Override
+                public void onStartTrackingTouch(SeekBar seekBar) {
+                }
+
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) {
+                }
+            });
+        }
+
+        md.show();
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialogInterface) {
+        if (dismissListener != null)
+            dismissListener.onDismiss(kelvinBar.getProgress());
+    }
+
+    public void onDismissListener(DismissListener dismissListener) {
+        this.dismissListener = dismissListener;
+    }
+
+    public interface DismissListener {
+        void onDismiss(int color);
+
+        void onChangeColor(int color);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/WeatherInfoDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/WeatherInfoDialog.java
index da9750704..39104a4ee 100644
--- a/app/src/main/java/nl/hnogames/domoticz/UI/WeatherInfoDialog.java
+++ b/app/src/main/java/nl/hnogames/domoticz/UI/WeatherInfoDialog.java
@@ -23,7 +23,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;
@@ -48,19 +47,7 @@ public WeatherInfoDialog(Context mContext,
                              WeatherInfo info,
                              int layout) {
         this.info = info;
-        if ((new SharedPrefUtil(mContext)).darkThemeEnabled()) {
-            mdb = new MaterialDialog.Builder(mContext)
-                .titleColorRes(R.color.white)
-                .contentColor(Color.WHITE) // notice no 'res' postfix for literal color
-                .dividerColorRes(R.color.white)
-                .backgroundColorRes(R.color.primary)
-                .positiveColorRes(R.color.white)
-                .neutralColorRes(R.color.white)
-                .negativeColorRes(R.color.white)
-                .widgetColorRes(R.color.white)
-                .buttonRippleColorRes(R.color.white);
-        } else
-            mdb = new MaterialDialog.Builder(mContext);
+        mdb = new MaterialDialog.Builder(mContext);
         boolean wrapInScrollView = true;
         //noinspection ConstantConditions
         mdb.customView(layout, wrapInScrollView)
@@ -78,31 +65,29 @@ public void show() {
         MaterialDialog md = mdb.build();
         View view = md.getCustomView();
 
-        TextView IDX_value = (TextView) view.findViewById(R.id.IDX_value);
-
-        TextView weather_forecast_title = (TextView) view.findViewById(R.id.weather_forcast);
-        TextView weather_humidity_title = (TextView) view.findViewById(R.id.weather_humidity);
-        TextView weather_barometer_title = (TextView) view.findViewById(R.id.weather_barometer);
-        TextView weather_dewpoint_title = (TextView) view.findViewById(R.id.weather_drewpoint);
-        TextView weather_temperature_title = (TextView) view.findViewById(R.id.weather_temperature);
-        TextView weather_chill_title = (TextView) view.findViewById(R.id.weather_chill);
-        TextView weather_direction_title = (TextView) view.findViewById(R.id.weather_direction);
-        TextView weather_speed_title = (TextView) view.findViewById(R.id.weather_speed);
-
-        TextView weather_forecast = (TextView) view.findViewById(R.id.weather_forcast_value);
-        TextView weather_humidity = (TextView) view.findViewById(R.id.weather_humidity_value);
-        TextView weather_barometer = (TextView) view.findViewById(R.id.weather_barometer_value);
-        TextView weather_dewpoint = (TextView) view.findViewById(R.id.weather_drewpoint_value);
-        TextView weather_temperature = (TextView) view.findViewById(R.id.weather_temperature_value);
-        TextView weather_chill = (TextView) view.findViewById(R.id.weather_chill_value);
-        TextView weather_direction = (TextView) view.findViewById(R.id.weather_direction_value);
-        TextView weather_speed = (TextView) view.findViewById(R.id.weather_speed_value);
+        TextView IDX_value = view.findViewById(R.id.IDX_value);
+        TextView weather_forecast_title = view.findViewById(R.id.weather_forcast);
+        TextView weather_humidity_title = view.findViewById(R.id.weather_humidity);
+        TextView weather_barometer_title = view.findViewById(R.id.weather_barometer);
+        TextView weather_dewpoint_title = view.findViewById(R.id.weather_drewpoint);
+        TextView weather_temperature_title = view.findViewById(R.id.weather_temperature);
+        TextView weather_chill_title = view.findViewById(R.id.weather_chill);
+        TextView weather_direction_title = view.findViewById(R.id.weather_direction);
+        TextView weather_speed_title = view.findViewById(R.id.weather_speed);
+        TextView weather_forecast = view.findViewById(R.id.weather_forcast_value);
+        TextView weather_humidity = view.findViewById(R.id.weather_humidity_value);
+        TextView weather_barometer = view.findViewById(R.id.weather_barometer_value);
+        TextView weather_dewpoint = view.findViewById(R.id.weather_drewpoint_value);
+        TextView weather_temperature = view.findViewById(R.id.weather_temperature_value);
+        TextView weather_chill = view.findViewById(R.id.weather_chill_value);
+        TextView weather_direction = view.findViewById(R.id.weather_direction_value);
+        TextView weather_speed = view.findViewById(R.id.weather_speed_value);
 
         IDX_value.setText(String.valueOf(info.getIdx()));
-        TextView LastUpdate_value = (TextView) view.findViewById(R.id.LastUpdate_value);
+        TextView LastUpdate_value = view.findViewById(R.id.LastUpdate_value);
         LastUpdate_value.setText(info.getLastUpdate());
 
-        favorite_switch = (Switch) view.findViewById(R.id.favorite_switch);
+        favorite_switch = view.findViewById(R.id.favorite_switch);
         favorite_switch.setChecked(info.getFavoriteBoolean());
         favorite_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
diff --git a/app/src/main/java/nl/hnogames/domoticz/Utils/UsefulBits.java b/app/src/main/java/nl/hnogames/domoticz/Utils/UsefulBits.java
index 3d71c0554..78cbd4faf 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Utils/UsefulBits.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Utils/UsefulBits.java
@@ -608,8 +608,7 @@ public static void checkAPK(final Context context, final SharedPrefUtil mSharedP
             //TODO: Implement correct piracychecker for this app!!
             mSharedPrefs.setAPKValidated(true);
             return;
-        }
-        else {
+        } else {
             // release build
             PiracyChecker oPiracyChecker = new PiracyChecker(context);
             oPiracyChecker
diff --git a/app/src/main/java/nl/hnogames/domoticz/Utils/WidgetUtils.java b/app/src/main/java/nl/hnogames/domoticz/Utils/WidgetUtils.java
index 0590da0d4..181c12ea5 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Utils/WidgetUtils.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Utils/WidgetUtils.java
@@ -35,42 +35,47 @@
 
 public class WidgetUtils {
     public static void RefreshWidgets(Context context) {
-        //refresh all widgets
-        AppWidgetManager widgetManager = AppWidgetManager.getInstance(context);
-        ComponentName widgetComponent = new ComponentName(context, WidgetProviderLarge.class);
-        int[] appWidgetIds = widgetManager.getAppWidgetIds(widgetComponent);
-        for (int appWidgetId : appWidgetIds) {
-            Intent updateIntent = new Intent(context, WidgetProviderLarge.UpdateWidgetService.class);
-            updateIntent.putExtra(EXTRA_APPWIDGET_ID, appWidgetId);
-            updateIntent.setAction("FROM WIDGET PROVIDER");
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                context.startForegroundService(updateIntent);
-            else
-                context.startService(updateIntent);
-        }
+        if (context == null)
+            return;
+        try {
+            //refresh all widgets
+            AppWidgetManager widgetManager = AppWidgetManager.getInstance(context);
+            ComponentName widgetComponent = new ComponentName(context, WidgetProviderLarge.class);
+            int[] appWidgetIds = widgetManager.getAppWidgetIds(widgetComponent);
+            for (int appWidgetId : appWidgetIds) {
+                Intent updateIntent = new Intent(context, WidgetProviderLarge.UpdateWidgetService.class);
+                updateIntent.putExtra(EXTRA_APPWIDGET_ID, appWidgetId);
+                updateIntent.setAction("FROM WIDGET PROVIDER");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                    context.startForegroundService(updateIntent);
+                else
+                    context.startService(updateIntent);
+            }
 
-        ComponentName widgetSecurityComponent = new ComponentName(context, SecurityWidgetProvider.class);
-        int[] appSecurityWidgetIds = widgetManager.getAppWidgetIds(widgetSecurityComponent);
-        for (int appSecurityWidgetId : appSecurityWidgetIds) {
-            Intent updateIntent = new Intent(context, SecurityWidgetProvider.UpdateSecurityWidgetService.class);
-            updateIntent.putExtra(EXTRA_APPWIDGET_ID, appSecurityWidgetId);
-            updateIntent.setAction("FROM WIDGET PROVIDER");
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                context.startForegroundService(updateIntent);
-            else
-                context.startService(updateIntent);
-        }
+            ComponentName widgetSecurityComponent = new ComponentName(context, SecurityWidgetProvider.class);
+            int[] appSecurityWidgetIds = widgetManager.getAppWidgetIds(widgetSecurityComponent);
+            for (int appSecurityWidgetId : appSecurityWidgetIds) {
+                Intent updateIntent = new Intent(context, SecurityWidgetProvider.UpdateSecurityWidgetService.class);
+                updateIntent.putExtra(EXTRA_APPWIDGET_ID, appSecurityWidgetId);
+                updateIntent.setAction("FROM WIDGET PROVIDER");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                    context.startForegroundService(updateIntent);
+                else
+                    context.startService(updateIntent);
+            }
 
-        ComponentName smallwidgetComponent = new ComponentName(context, WidgetProviderSmall.class);
-        int[] appSmallWidgetIds = widgetManager.getAppWidgetIds(smallwidgetComponent);
-        for (int appSmallWidgetId : appSmallWidgetIds) {
-            Intent updateIntent = new Intent(context, WidgetProviderSmall.UpdateWidgetService.class);
-            updateIntent.putExtra(EXTRA_APPWIDGET_ID, appSmallWidgetId);
-            updateIntent.setAction("FROM WIDGET PROVIDER");
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                context.startForegroundService(updateIntent);
-            else
-                context.startService(updateIntent);
+            ComponentName smallwidgetComponent = new ComponentName(context, WidgetProviderSmall.class);
+            int[] appSmallWidgetIds = widgetManager.getAppWidgetIds(smallwidgetComponent);
+            for (int appSmallWidgetId : appSmallWidgetIds) {
+                Intent updateIntent = new Intent(context, WidgetProviderSmall.UpdateWidgetService.class);
+                updateIntent.putExtra(EXTRA_APPWIDGET_ID, appSmallWidgetId);
+                updateIntent.setAction("FROM WIDGET PROVIDER");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                    context.startForegroundService(updateIntent);
+                else
+                    context.startService(updateIntent);
+            }
+        } catch (Exception ex) {
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/nl/hnogames/domoticz/Welcome/SetupServerSettings.java b/app/src/main/java/nl/hnogames/domoticz/Welcome/SetupServerSettings.java
index 7113e57ce..431bdc39f 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Welcome/SetupServerSettings.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Welcome/SetupServerSettings.java
@@ -26,6 +26,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.design.widget.TextInputEditText;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 import android.text.InputType;
@@ -38,7 +39,6 @@
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.Switch;
@@ -72,19 +72,18 @@ public class SetupServerSettings extends Fragment implements OnPermissionCallbac
     private SharedPrefUtil mSharedPrefs;
     private ServerUtil mServerUtil;
 
-    private EditText remote_server_input, remote_port_input,
+    private TextInputEditText remote_server_input, remote_port_input,
         remote_username_input, remote_password_input,
         remote_directory_input, local_server_input, local_password_input,
         local_username_input, local_port_input, local_directory_input, server_name_input;
 
-    private Spinner remote_protocol_spinner, local_protocol_spinner, startScreen_spinner;
+    private Spinner remote_protocol_spinner, local_protocol_spinner;
     private Switch localServer_switch;
-    private int remoteProtocolSelectedPosition, localProtocolSelectedPosition, startScreenSelectedPosition;
+    private int remoteProtocolSelectedPosition, localProtocolSelectedPosition;
     private View v;
     private boolean hasBeenVisibleToUser = false;
     private MultiSelectionSpinner local_wifi_spinner;
     private PhoneConnectionUtil mPhoneConnectionUtil;
-    private Switch advancedSettings_switch;
     private ServerInfo newServer;
     private boolean isUpdateRequest = false;
 
@@ -142,27 +141,25 @@ public void setUserVisibleHint(boolean isVisibleToUser) {
     }
 
     private void getLayoutReferences() {
-        Button saveButton = (Button) v.findViewById(R.id.save_server);
-        server_name_input = (EditText) v.findViewById(R.id.server_name_input);
-        remote_server_input = (EditText) v.findViewById(R.id.remote_server_input);
-        remote_port_input = (EditText) v.findViewById(R.id.remote_port_input);
-        remote_username_input = (EditText) v.findViewById(R.id.remote_username_input);
-        remote_password_input = (EditText) v.findViewById(R.id.remote_password_input);
-        remote_directory_input = (EditText) v.findViewById(R.id.remote_directory_input);
-        remote_protocol_spinner = (Spinner) v.findViewById(R.id.remote_protocol_spinner);
-        local_server_input = (EditText) v.findViewById(R.id.local_server_input);
-        local_port_input = (EditText) v.findViewById(R.id.local_port_input);
-        local_username_input = (EditText) v.findViewById(R.id.local_username_input);
-        local_password_input = (EditText) v.findViewById(R.id.local_password_input);
-        local_directory_input = (EditText) v.findViewById(R.id.local_directory_input);
-        local_protocol_spinner = (Spinner) v.findViewById(R.id.local_protocol_spinner);
-        local_wifi_spinner = (MultiSelectionSpinner) v.findViewById(R.id.local_wifi);
-        CheckBox cbShowPassword = (CheckBox) v.findViewById(R.id.showpassword);
-        CheckBox cbShowPasswordLocal = (CheckBox) v.findViewById(R.id.showpasswordlocal);
-
-        startScreen_spinner = (Spinner) v.findViewById(R.id.startScreen_spinner);
-
-        Button btnManualSSID = (Button) v.findViewById(R.id.set_ssid);
+        Button saveButton = v.findViewById(R.id.save_server);
+        server_name_input = v.findViewById(R.id.server_name_input);
+        remote_server_input = v.findViewById(R.id.remote_server_input);
+        remote_port_input = v.findViewById(R.id.remote_port_input);
+        remote_username_input = v.findViewById(R.id.remote_username_input);
+        remote_password_input = v.findViewById(R.id.remote_password_input);
+        remote_directory_input = v.findViewById(R.id.remote_directory_input);
+        remote_protocol_spinner = v.findViewById(R.id.remote_protocol_spinner);
+        local_server_input = v.findViewById(R.id.local_server_input);
+        local_port_input = v.findViewById(R.id.local_port_input);
+        local_username_input = v.findViewById(R.id.local_username_input);
+        local_password_input = v.findViewById(R.id.local_password_input);
+        local_directory_input = v.findViewById(R.id.local_directory_input);
+        local_protocol_spinner = v.findViewById(R.id.local_protocol_spinner);
+        local_wifi_spinner = v.findViewById(R.id.local_wifi);
+        CheckBox cbShowPassword = v.findViewById(R.id.showpassword);
+        CheckBox cbShowPasswordLocal = v.findViewById(R.id.showpasswordlocal);
+        Button btnManualSSID = v.findViewById(R.id.set_ssid);
+
         btnManualSSID.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -191,13 +188,10 @@ public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
             }
         });
 
-        startScreen_spinner.setVisibility(View.GONE);
-        v.findViewById(R.id.startScreen_title).setVisibility(View.GONE);
         v.findViewById(R.id.server_settings_title).setVisibility(View.GONE);
 
-        final LinearLayout localServerSettingsLayout = (LinearLayout)
-            v.findViewById(R.id.local_server_settings);
-        localServer_switch = (Switch) v.findViewById(R.id.localServer_switch);
+        final LinearLayout localServerSettingsLayout = v.findViewById(R.id.local_server_settings);
+        localServer_switch = v.findViewById(R.id.localServer_switch);
         localServer_switch.setChecked(false);//default setting
         localServer_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -206,29 +200,15 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 else localServerSettingsLayout.setVisibility(View.GONE);
             }
         });
-
-        final LinearLayout advancedSettings_layout = (LinearLayout)
-            v.findViewById(R.id.advancedSettings_layout);
-        advancedSettings_switch = (Switch) v.findViewById(R.id.advancedSettings_switch);
-        advancedSettings_layout.setVisibility(View.INVISIBLE);
-        advancedSettings_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                mSharedPrefs.setAdvancedSettingsEnabled(isChecked);
-
-                if (isChecked) advancedSettings_layout.setVisibility(View.VISIBLE);
-                else advancedSettings_layout.setVisibility(View.GONE);
-            }
-        });
-        advancedSettings_layout.setVisibility(View.GONE);
-        advancedSettings_switch.setChecked(false);
         cbShowPassword.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (!isChecked) {
-                    remote_password_input.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    remote_password_input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    remote_password_input.setSelection(remote_password_input.getText().length());
                 } else {
                     remote_password_input.setInputType(InputType.TYPE_CLASS_TEXT);
+                    remote_password_input.setSelection(remote_password_input.getText().length());
                 }
             }
         });
@@ -236,13 +216,14 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (!isChecked) {
-                    local_password_input.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    local_password_input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    local_password_input.setSelection(local_password_input.getText().length());
                 } else {
                     local_password_input.setInputType(InputType.TYPE_CLASS_TEXT);
+                    local_password_input.setSelection(local_password_input.getText().length());
                 }
             }
         });
-
         saveButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -302,16 +283,12 @@ private void setPreferenceValues() {
             local_server_input.setText(newServer.getLocalServerUrl());
             local_port_input.setText(newServer.getLocalServerPort());
             local_directory_input.setText(newServer.getLocalServerDirectory());
-
             localServer_switch.setChecked(newServer.getIsLocalServerAddressDifferent());
-            advancedSettings_switch.setChecked(newServer.getIsLocalServerAddressDifferent());
         } else {
             remote_username_input.setText("");
         }
 
         setProtocol_spinner();
-        setStartScreen_spinner();
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (!PermissionsUtil.canAccessLocation(getActivity())) {
                 permissionFragmentHelper.request(PermissionsUtil.INITIAL_LOCATION_PERMS);
@@ -402,32 +379,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
         });
     }
 
-    private void setStartScreen_spinner() {
-        if (mSharedPrefs == null)
-            mSharedPrefs = new SharedPrefUtil(getActivity().getApplicationContext());
-
-        String[] startScreens = getResources().getStringArray(R.array.drawer_actions);
-        ArrayAdapter<String> startScreenAdapter
-            = new ArrayAdapter<>(getActivity(), R.layout.spinner_list_item, startScreens);
-
-        startScreen_spinner.setAdapter(startScreenAdapter);
-        if (mSharedPrefs != null)
-            startScreen_spinner.setSelection(mSharedPrefs.getStartupScreenIndex());
-        startScreen_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> adapterView,
-                                       View view, int position, long id) {
-                startScreenSelectedPosition = position;
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> adapterView) {
-            }
-        });
-    }
-
     private void buildServerInfo() {
-
         newServer = new ServerInfo();
         newServer.setRemoteServerUsername(
             remote_username_input.getText().toString().trim());
diff --git a/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage2.java b/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage2.java
index 17ed2eae1..35a7378b0 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage2.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage2.java
@@ -61,7 +61,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         SettingsFile = new File(Environment.getExternalStorageDirectory(), "/Domoticz/DomoticzSettings.txt");
 
         permissionFragmentHelper = PermissionFragmentHelper.getInstance(this);
-        Button importButton = (Button) v.findViewById(R.id.import_settings);
+        Button importButton = v.findViewById(R.id.import_settings);
         importButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage3.java b/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage3.java
index c9435bef6..b1debc0b3 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage3.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage3.java
@@ -26,6 +26,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.design.widget.TextInputEditText;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 import android.text.InputType;
@@ -38,7 +39,6 @@
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.Switch;
@@ -69,14 +69,14 @@ public class WelcomePage3 extends Fragment implements OnPermissionCallback {
     private SharedPrefUtil mSharedPrefs;
     private ServerUtil mServerUtil;
 
-    private EditText remote_server_input, remote_port_input,
+    private TextInputEditText remote_server_input, remote_port_input,
         remote_username_input, remote_password_input,
         remote_directory_input, local_server_input, local_password_input,
         local_username_input, local_port_input, local_directory_input;
 
-    private Spinner remote_protocol_spinner, local_protocol_spinner, startScreen_spinner;
+    private Spinner remote_protocol_spinner, local_protocol_spinner;
     private Switch localServer_switch;
-    private int remoteProtocolSelectedPosition, localProtocolSelectedPosition, startScreenSelectedPosition;
+    private int remoteProtocolSelectedPosition, localProtocolSelectedPosition;
     private View v;
     private boolean hasBeenVisibleToUser = false;
     private MultiSelectionSpinner local_wifi_spinner;
@@ -87,11 +87,9 @@ public class WelcomePage3 extends Fragment implements OnPermissionCallback {
 
     public static WelcomePage3 newInstance(int instance) {
         WelcomePage3 f = new WelcomePage3();
-
         Bundle bdl = new Bundle(1);
         bdl.putInt(INSTANCE, instance);
         f.setArguments(bdl);
-
         return f;
     }
 
@@ -129,25 +127,23 @@ public void setUserVisibleHint(boolean isVisibleToUser) {
     }
 
     private void getLayoutReferences() {
+        remote_server_input = v.findViewById(R.id.remote_server_input);
+        remote_port_input = v.findViewById(R.id.remote_port_input);
+        remote_username_input = v.findViewById(R.id.remote_username_input);
+        remote_password_input = v.findViewById(R.id.remote_password_input);
+        remote_directory_input = v.findViewById(R.id.remote_directory_input);
+        remote_protocol_spinner = v.findViewById(R.id.remote_protocol_spinner);
+        local_server_input = v.findViewById(R.id.local_server_input);
+        local_port_input = v.findViewById(R.id.local_port_input);
+        local_username_input = v.findViewById(R.id.local_username_input);
+        local_password_input = v.findViewById(R.id.local_password_input);
+        local_directory_input = v.findViewById(R.id.local_directory_input);
+        local_protocol_spinner = v.findViewById(R.id.local_protocol_spinner);
+        local_wifi_spinner = v.findViewById(R.id.local_wifi);
+        CheckBox cbShowPassword = v.findViewById(R.id.showpassword);
+        CheckBox cbShowPasswordLocal = v.findViewById(R.id.showpasswordlocal);
+        Button btnManualSSID = v.findViewById(R.id.set_ssid);
 
-        remote_server_input = (EditText) v.findViewById(R.id.remote_server_input);
-        remote_port_input = (EditText) v.findViewById(R.id.remote_port_input);
-        remote_username_input = (EditText) v.findViewById(R.id.remote_username_input);
-        remote_password_input = (EditText) v.findViewById(R.id.remote_password_input);
-        remote_directory_input = (EditText) v.findViewById(R.id.remote_directory_input);
-        remote_protocol_spinner = (Spinner) v.findViewById(R.id.remote_protocol_spinner);
-        local_server_input = (EditText) v.findViewById(R.id.local_server_input);
-        local_port_input = (EditText) v.findViewById(R.id.local_port_input);
-        local_username_input = (EditText) v.findViewById(R.id.local_username_input);
-        local_password_input = (EditText) v.findViewById(R.id.local_password_input);
-        local_directory_input = (EditText) v.findViewById(R.id.local_directory_input);
-        local_protocol_spinner = (Spinner) v.findViewById(R.id.local_protocol_spinner);
-        local_wifi_spinner = (MultiSelectionSpinner) v.findViewById(R.id.local_wifi);
-        CheckBox cbShowPassword = (CheckBox) v.findViewById(R.id.showpassword);
-        CheckBox cbShowPasswordLocal = (CheckBox) v.findViewById(R.id.showpasswordlocal);
-
-        startScreen_spinner = (Spinner) v.findViewById(R.id.startScreen_spinner);
-        Button btnManualSSID = (Button) v.findViewById(R.id.set_ssid);
         btnManualSSID.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -177,16 +173,11 @@ public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
         });
 
         if (callingInstance == SETTINGS) {
-            // Hide these settings if being called by settings (instead of welcome wizard)
-            startScreen_spinner.setVisibility(View.GONE);
-            v.findViewById(R.id.startScreen_title).setVisibility(View.GONE);
             v.findViewById(R.id.server_settings_title).setVisibility(View.GONE);
         }
 
-        final LinearLayout localServerSettingsLayout = (LinearLayout)
-            v.findViewById(R.id.local_server_settings);
-
-        localServer_switch = (Switch) v.findViewById(R.id.localServer_switch);
+        final LinearLayout localServerSettingsLayout = v.findViewById(R.id.local_server_settings);
+        localServer_switch = v.findViewById(R.id.localServer_switch);
         localServer_switch.setChecked(mSharedPrefs.isAdvancedSettingsEnabled());
         localServer_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -196,34 +187,15 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
             }
         });
         localServerSettingsLayout.setVisibility(mServerUtil.getActiveServer().getIsLocalServerAddressDifferent() ? View.VISIBLE : View.GONE);
-
-        final LinearLayout advancedSettings_layout = (LinearLayout)
-            v.findViewById(R.id.advancedSettings_layout);
-
-        Switch advancedSettings_switch = (Switch) v.findViewById(R.id.advancedSettings_switch);
-        advancedSettings_switch.setChecked(mSharedPrefs.isAdvancedSettingsEnabled());
-        advancedSettings_layout.setVisibility(mServerUtil.getActiveServer().getIsLocalServerAddressDifferent() ? View.VISIBLE : View.GONE);
-
-        if (mSharedPrefs.isAdvancedSettingsEnabled())
-            advancedSettings_layout.setVisibility(View.VISIBLE);
-
-        advancedSettings_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                mSharedPrefs.setAdvancedSettingsEnabled(isChecked);
-
-                if (isChecked) advancedSettings_layout.setVisibility(View.VISIBLE);
-                else advancedSettings_layout.setVisibility(View.GONE);
-            }
-        });
-
         cbShowPassword.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (!isChecked) {
-                    remote_password_input.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    remote_password_input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    remote_password_input.setSelection(remote_password_input.getText().length());
                 } else {
                     remote_password_input.setInputType(InputType.TYPE_CLASS_TEXT);
+                    remote_password_input.setSelection(remote_password_input.getText().length());
                 }
             }
         });
@@ -231,9 +203,11 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (!isChecked) {
-                    local_password_input.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    local_password_input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    local_password_input.setSelection(local_password_input.getText().length());
                 } else {
                     local_password_input.setInputType(InputType.TYPE_CLASS_TEXT);
+                    local_password_input.setSelection(local_password_input.getText().length());
                 }
             }
         });
@@ -253,7 +227,6 @@ private void setPreferenceValues() {
         local_directory_input.setText(mServerUtil.getActiveServer().getLocalServerDirectory());
 
         setProtocol_spinner();
-        setStartScreen_spinner();
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (!PermissionsUtil.canAccessLocation(getActivity())) {
@@ -345,25 +318,6 @@ public void onNothingSelected(AdapterView<?> adapterView) {
         });
     }
 
-    private void setStartScreen_spinner() {
-        String[] startScreens = getResources().getStringArray(R.array.drawer_actions);
-        ArrayAdapter<String> startScreenAdapter
-            = new ArrayAdapter<>(getActivity(), R.layout.spinner_list_item, startScreens);
-        startScreen_spinner.setAdapter(startScreenAdapter);
-        startScreen_spinner.setSelection(mSharedPrefs.getStartupScreenIndex());
-        startScreen_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> adapterView,
-                                       View view, int position, long id) {
-                startScreenSelectedPosition = position;
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> adapterView) {
-            }
-        });
-    }
-
     private void writePreferenceValues() {
         mServerUtil.getActiveServer().setRemoteServerUsername(
             remote_username_input.getText().toString().trim());
@@ -377,10 +331,7 @@ private void writePreferenceValues() {
             remote_directory_input.getText().toString().trim());
         mServerUtil.getActiveServer().setRemoteServerSecure(
             getSpinnerDomoticzRemoteSecureBoolean());
-        if (callingInstance == WELCOME_WIZARD)
-            mSharedPrefs.setStartupScreenIndex(startScreenSelectedPosition);
-
-        Switch useSameAddress = (Switch) v.findViewById(R.id.localServer_switch);
+        Switch useSameAddress = v.findViewById(R.id.localServer_switch);
         if (!useSameAddress.isChecked()) {
             mServerUtil.getActiveServer().setLocalSameAddressAsRemote();
             mServerUtil.getActiveServer().setIsLocalServerAddressDifferent(false);
diff --git a/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomeViewActivity.java b/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomeViewActivity.java
index eb9061df3..66576f2d6 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomeViewActivity.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomeViewActivity.java
@@ -42,10 +42,6 @@ public class WelcomeViewActivity extends IntroActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         SharedPrefUtil mSharedPrefs = new SharedPrefUtil(this);
-        if (mSharedPrefs.darkThemeEnabled())
-            setTheme(R.style.AppThemeDark);
-        else
-            setTheme(R.style.AppTheme);
         if (!UsefulBits.isEmpty(mSharedPrefs.getDisplayLanguage()))
             UsefulBits.setDisplayLanguage(this, mSharedPrefs.getDisplayLanguage());
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/Widgets/SecurityWidgetConfigurationActivity.java b/app/src/main/java/nl/hnogames/domoticz/Widgets/SecurityWidgetConfigurationActivity.java
index a294b77d2..eb365e053 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Widgets/SecurityWidgetConfigurationActivity.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Widgets/SecurityWidgetConfigurationActivity.java
@@ -92,7 +92,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         editPin = (EditText) this.findViewById(R.id.securitypin);
         if (mSharedPrefs.darkThemeEnabled()) {
-            btnConfig.setBackground(ContextCompat.getDrawable(this, R.drawable.button_status_dark));
+            btnConfig.setBackground(ContextCompat.getDrawable(this, R.color.button_dark));
             editPin.setTextColor(ContextCompat.getColor(this, R.color.white));
             txtStatus.setTextColor(ContextCompat.getColor(this, R.color.white));
             txtTitle.setTextColor(ContextCompat.getColor(this, R.color.white));
diff --git a/app/src/main/java/nl/hnogames/domoticz/Widgets/WidgetProviderSmall.java b/app/src/main/java/nl/hnogames/domoticz/Widgets/WidgetProviderSmall.java
index 95a5b6f78..439a5a136 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Widgets/WidgetProviderSmall.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Widgets/WidgetProviderSmall.java
@@ -76,7 +76,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager,
         packageName = context.getPackageName();
         // Get all ids
         ComponentName thisWidget = new ComponentName(context,
-                WidgetProviderSmall.class);
+            WidgetProviderSmall.class);
         int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
         if (allWidgetIds != null) {
             for (int mAppWidgetId : allWidgetIds) {
@@ -110,11 +110,11 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             }
 
             AppWidgetManager appWidgetManager = AppWidgetManager
-                    .getInstance(UpdateWidgetService.this);
+                .getInstance(UpdateWidgetService.this);
 
             try {
                 int incomingAppWidgetId = intent.getIntExtra(EXTRA_APPWIDGET_ID,
-                        INVALID_APPWIDGET_ID);
+                    INVALID_APPWIDGET_ID);
                 if (incomingAppWidgetId != INVALID_APPWIDGET_ID) {
                     try {
                         updateAppWidget(appWidgetManager, incomingAppWidgetId);
@@ -151,22 +151,22 @@ public void updateAppWidget(final AppWidgetManager appWidgetManager,
                 views.setTextViewText(R.id.title, getApplicationContext().getString(R.string.action_speech));
                 views.setImageViewResource(R.id.rowIcon, R.drawable.mic);
                 views.setOnClickPendingIntent(R.id.rowIcon, buildButtonPendingIntent(
-                        UpdateWidgetService.this,
-                        appWidgetId,
-                        idx,
-                        false,
-                        true));
+                    UpdateWidgetService.this,
+                    appWidgetId,
+                    idx,
+                    false,
+                    true));
                 appWidgetManager.updateAppWidget(appWidgetId, views);
             } else if (idx == iQRCodeAction) {
                 views.setTextViewText(R.id.desc, getApplicationContext().getString(R.string.qrcode_desc));
                 views.setTextViewText(R.id.title, getApplicationContext().getString(R.string.action_qrcode_scan));
                 views.setImageViewResource(R.id.rowIcon, R.drawable.qrcode);
                 views.setOnClickPendingIntent(R.id.rowIcon, buildButtonPendingIntent(
-                        UpdateWidgetService.this,
-                        appWidgetId,
-                        idx,
-                        false,
-                        true));
+                    UpdateWidgetService.this,
+                    appWidgetId,
+                    idx,
+                    false,
+                    true));
                 appWidgetManager.updateAppWidget(appWidgetId, views);
             } else {
                 appWidgetManager.updateAppWidget(appWidgetId, views);
@@ -189,7 +189,7 @@ public void onReceiveDevice(DevicesInfo s) {
                                 if (s.getCounterToday() != null && s.getCounterToday().length() > 0)
                                     text += " Today: " + s.getCounterToday();
                                 if (s.getCounter() != null && s.getCounter().length() > 0 &&
-                                        !s.getCounter().equals(s.getData()))
+                                    !s.getCounter().equals(s.getData()))
                                     text += " Total: " + s.getCounter();
 
                                 views.setTextViewText(R.id.desc, text);
@@ -197,11 +197,11 @@ public void onReceiveDevice(DevicesInfo s) {
                                     boolean newStatus = !s.getStatusBoolean();//toggle
 
                                     views.setOnClickPendingIntent(R.id.rowIcon, buildButtonPendingIntent(
-                                            UpdateWidgetService.this,
-                                            appWidgetId,
-                                            s.getIdx(),
-                                            newStatus,
-                                            true));
+                                        UpdateWidgetService.this,
+                                        appWidgetId,
+                                        s.getIdx(),
+                                        newStatus,
+                                        true));
                                 }
 
                                 views.setImageViewResource(R.id.rowIcon, DomoticzIcons.getDrawableIcon(s.getTypeImg(), s.getType(), s.getSwitchType(), true, s.getUseCustomImage(), s.getImage()));
@@ -236,11 +236,11 @@ public void onReceiveScene(SceneInfo s) {
                                     views.setTextViewText(R.id.title, s.getName());
                                     views.setTextViewText(R.id.desc, s.getStatusInString());
                                     views.setOnClickPendingIntent(R.id.rowIcon, buildButtonPendingIntent(
-                                            UpdateWidgetService.this,
-                                            appWidgetId,
-                                            idx,
-                                            !s.getStatusInBoolean(),
-                                            true));
+                                        UpdateWidgetService.this,
+                                        appWidgetId,
+                                        idx,
+                                        !s.getStatusInBoolean(),
+                                        true));
                                 }
 
                                 views.setImageViewResource(R.id.rowIcon, DomoticzIcons.getDrawableIcon(s.getType(), null, null, false, false, null));
@@ -291,7 +291,7 @@ private int withButtons(DevicesInfo s) {
             int withButton = 0;
             if (s != null) {
                 if (s.getSwitchTypeVal() == 0 &&
-                        (UsefulBits.isEmpty(s.getSwitchType()))) {
+                    (UsefulBits.isEmpty(s.getSwitchType()))) {
                     switch (s.getType()) {
                         case DomoticzValues.Scene.Type.SCENE:
                             withButton = WITHBUTTON;
diff --git a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzCardFragment.java b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzCardFragment.java
index 9d78f72e4..48f569f60 100644
--- a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzCardFragment.java
+++ b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzCardFragment.java
@@ -136,8 +136,10 @@ public void onAttachFragment(Fragment fragment) {
      * Checks for a active connection
      */
     public void checkConnection() {
-        List<Fragment> fragments = getFragmentManager().getFragments();
-        onAttachFragment(fragments.get(0) != null ? fragments.get(0) : fragments.get(1));
+        if (listener == null) {
+            List<Fragment> fragments = getFragmentManager().getFragments();
+            onAttachFragment(fragments.get(0) != null ? fragments.get(0) : fragments.get(1));
+        }
 
         mPhoneConnectionUtil = new PhoneConnectionUtil(getContext());
         if (mPhoneConnectionUtil.isNetworkAvailable()) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzDashboardFragment.java b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzDashboardFragment.java
index 504dfaf3f..a1fe045ed 100644
--- a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzDashboardFragment.java
+++ b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzDashboardFragment.java
@@ -215,7 +215,6 @@ public void onActivityCreated(Bundle savedInstanceState) {
      * @param fragment fragment to cast the DomoticzFragmentListener to
      */
     public void onAttachFragment(Fragment fragment) {
-
         fragmentName = fragment.toString();
 
         try {
@@ -240,9 +239,10 @@ public void showSpinner(boolean show) {
      * Checks for a active connection
      */
     public void checkConnection() {
-        List<Fragment> fragments = getFragmentManager().getFragments();
-        onAttachFragment(fragments.get(0) != null ? fragments.get(0) : fragments.get(1));
-
+        if (listener == null) {
+            List<Fragment> fragments = getFragmentManager().getFragments();
+            onAttachFragment(fragments.get(0) != null ? fragments.get(0) : fragments.get(1));
+        }
         mPhoneConnectionUtil = new PhoneConnectionUtil(getContext());
         if (mPhoneConnectionUtil.isNetworkAvailable()) {
             addDebugText("Connection OK");
@@ -251,7 +251,6 @@ public void checkConnection() {
             listener.onConnectionFailed();
             setErrorMessage(getString(R.string.error_notConnected));
         }
-        ;
     }
 
     /**
diff --git a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzRecyclerFragment.java b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzRecyclerFragment.java
index 031534ce0..6ab28486c 100644
--- a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzRecyclerFragment.java
+++ b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzRecyclerFragment.java
@@ -61,7 +61,6 @@
 public class DomoticzRecyclerFragment extends Fragment {
 
     public RecyclerView gridView;
-
     public SwipeRefreshLayout mSwipeRefreshLayout;
     public CoordinatorLayout coordinatorLayout;
     public Domoticz mDomoticz;
@@ -117,20 +116,17 @@ public void sortFragment(String sort) {
     }
 
     public void initViews(View root) {
-
-        gridView = (RecyclerView) root.findViewById(R.id.my_recycler_view);
+        gridView = root.findViewById(R.id.my_recycler_view);
         if (mSharedPrefs == null)
             mSharedPrefs = new SharedPrefUtil(getContext());
-
         setGridViewLayout();
-        coordinatorLayout = (CoordinatorLayout) root.findViewById(R.id.coordinatorLayout);
-        mSwipeRefreshLayout = (SwipeRefreshLayout) root.findViewById(R.id.swipe_refresh_layout);
+        coordinatorLayout = root.findViewById(R.id.coordinatorLayout);
+        mSwipeRefreshLayout = root.findViewById(R.id.swipe_refresh_layout);
     }
 
     public void setGridViewLayout() {
         try {
             boolean isTablet = false;
-            float screenWidth = 0;
             boolean isPortrait = false;
 
             if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
@@ -139,7 +135,6 @@ public void setGridViewLayout() {
                 isTablet = !
                     ((MainActivity) getActivity()).onPhone;
             }
-
             gridView.setHasFixedSize(true);
 
             if (isTablet) {
@@ -192,7 +187,6 @@ public void onActivityCreated(Bundle savedInstanceState) {
      * @param fragment fragment to cast the DomoticzFragmentListener to
      */
     public void onAttachFragment(Fragment fragment) {
-
         fragmentName = fragment.toString();
 
         try {
@@ -217,9 +211,11 @@ public void showSpinner(boolean show) {
      * Checks for a active connection
      */
     public void checkConnection() {
-        List<Fragment> fragments = getFragmentManager().getFragments();
-        onAttachFragment(fragments.get(0) != null ? fragments.get(0) : fragments.get(1));
-
+        if (listener == null) {
+            //Get listener
+            List<Fragment> fragments = getFragmentManager().getFragments();
+            onAttachFragment(fragments.get(0) != null ? fragments.get(0) : fragments.get(1));
+        }
         mPhoneConnectionUtil = new PhoneConnectionUtil(getContext());
         if (mPhoneConnectionUtil.isNetworkAvailable()) {
             addDebugText("Connection OK");
@@ -311,29 +307,29 @@ public void addDebugText(String text) {
     private void setErrorLayoutMessage(String message) {
         hideListView();
 
-        RelativeLayout errorLayout = (RelativeLayout) root.findViewById(R.id.errorLayout);
+        RelativeLayout errorLayout = root.findViewById(R.id.errorLayout);
         if (errorLayout != null) {
             errorLayout.setVisibility(View.VISIBLE);
-            TextView errorTextMessage = (TextView) root.findViewById(R.id.errorTextMessage);
+            TextView errorTextMessage = root.findViewById(R.id.errorTextMessage);
             errorTextMessage.setText(message);
         } else throw new RuntimeException(
             "Layout should have a RelativeLayout defined with the ID of errorLayout");
     }
 
     public void setMessage(String message) {
-        RelativeLayout errorLayout = (RelativeLayout) root.findViewById(R.id.errorLayout);
+        RelativeLayout errorLayout = root.findViewById(R.id.errorLayout);
         if (errorLayout != null) {
             errorLayout.setVisibility(View.VISIBLE);
 
-            ImageView errorImage = (ImageView) root.findViewById(R.id.errorImage);
+            ImageView errorImage = root.findViewById(R.id.errorImage);
             errorImage.setImageResource(R.drawable.empty);
             errorImage.setAlpha(0.5f);
             errorImage.setVisibility(View.VISIBLE);
 
-            TextView errorTextWrong = (TextView) root.findViewById(R.id.errorTextWrong);
+            TextView errorTextWrong = root.findViewById(R.id.errorTextWrong);
             errorTextWrong.setVisibility(View.GONE);
 
-            TextView errorTextMessage = (TextView) root.findViewById(R.id.errorTextMessage);
+            TextView errorTextMessage = root.findViewById(R.id.errorTextMessage);
             errorTextMessage.setText(message);
         } else throw new RuntimeException(
             "Layout should have a RelativeLayout defined with the ID of errorLayout");
@@ -349,11 +345,11 @@ private void hideListView() {
     private void showDebugLayout() {
         try {
             if (root != null) {
-                LinearLayout debugLayout = (LinearLayout) root.findViewById(R.id.debugLayout);
+                LinearLayout debugLayout = root.findViewById(R.id.debugLayout);
                 if (debugLayout != null) {
                     debugLayout.setVisibility(View.VISIBLE);
 
-                    debugText = (TextView) root.findViewById(R.id.debugText);
+                    debugText = root.findViewById(R.id.debugText);
                     if (debugText != null) {
                         debugText.setMovementMethod(new ScrollingMovementMethod());
                     }
diff --git a/app/src/main/java/nl/hnogames/domoticz/app/RefreshFragment.java b/app/src/main/java/nl/hnogames/domoticz/app/RefreshFragment.java
new file mode 100644
index 000000000..724e5e41b
--- /dev/null
+++ b/app/src/main/java/nl/hnogames/domoticz/app/RefreshFragment.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2015 Domoticz - Mark Heinis
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package nl.hnogames.domoticz.app;
+
+import android.support.v4.app.Fragment;
+
+public class RefreshFragment extends Fragment {
+    public void RefreshFragment() {
+    }
+
+    public void Filter(String newText) {
+    }
+
+    public void sortFragment(String selectedSort) {
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/anim/enter_from_above.xml b/app/src/main/res/anim/enter_from_above.xml
index 427c17731..f3c91c605 100644
--- a/app/src/main/res/anim/enter_from_above.xml
+++ b/app/src/main/res/anim/enter_from_above.xml
@@ -21,11 +21,11 @@
   -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
+     android:shareInterpolator="false">
     <translate
         android:duration="80"
         android:fromXDelta="0%"
         android:fromYDelta="-100%"
         android:toXDelta="0%"
-        android:toYDelta="0%" />
+        android:toYDelta="0%"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/enter_from_left.xml b/app/src/main/res/anim/enter_from_left.xml
index 25c2b9de7..09db2c3ca 100644
--- a/app/src/main/res/anim/enter_from_left.xml
+++ b/app/src/main/res/anim/enter_from_left.xml
@@ -21,11 +21,11 @@
   -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
+     android:shareInterpolator="false">
     <translate
         android:duration="300"
         android:fromXDelta="-100%"
         android:fromYDelta="0%"
         android:toXDelta="0%"
-        android:toYDelta="0%" />
+        android:toYDelta="0%"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/enter_from_right.xml b/app/src/main/res/anim/enter_from_right.xml
index 9095a7d20..3fa3032be 100644
--- a/app/src/main/res/anim/enter_from_right.xml
+++ b/app/src/main/res/anim/enter_from_right.xml
@@ -21,11 +21,11 @@
   -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
+     android:shareInterpolator="false">
     <translate
         android:duration="300"
         android:fromXDelta="100%"
         android:fromYDelta="0%"
         android:toXDelta="0%"
-        android:toYDelta="0%" />
+        android:toYDelta="0%"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/exit_to_above.xml b/app/src/main/res/anim/exit_to_above.xml
index efd13ab6c..1aee37852 100644
--- a/app/src/main/res/anim/exit_to_above.xml
+++ b/app/src/main/res/anim/exit_to_above.xml
@@ -21,11 +21,11 @@
   -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
+     android:shareInterpolator="false">
     <translate
         android:duration="80"
         android:fromXDelta="0%"
         android:fromYDelta="0%"
         android:toXDelta="0%"
-        android:toYDelta="-100%" />
+        android:toYDelta="-100%"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/exit_to_left.xml b/app/src/main/res/anim/exit_to_left.xml
index 1a69a5d7a..fc3175b35 100644
--- a/app/src/main/res/anim/exit_to_left.xml
+++ b/app/src/main/res/anim/exit_to_left.xml
@@ -21,11 +21,11 @@
   -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
+     android:shareInterpolator="false">
     <translate
         android:duration="300"
         android:fromXDelta="0%"
         android:fromYDelta="0%"
         android:toXDelta="-100%"
-        android:toYDelta="0%" />
+        android:toYDelta="0%"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/exit_to_right.xml b/app/src/main/res/anim/exit_to_right.xml
index 528c1146b..ad802facb 100644
--- a/app/src/main/res/anim/exit_to_right.xml
+++ b/app/src/main/res/anim/exit_to_right.xml
@@ -21,11 +21,11 @@
   -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
+     android:shareInterpolator="false">
     <translate
         android:duration="300"
         android:fromXDelta="0%"
         android:fromYDelta="0%"
         android:toXDelta="100%"
-        android:toYDelta="0%" />
+        android:toYDelta="0%"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
index 589d2b322..8de2b5bb5 100644
--- a/app/src/main/res/anim/fade_in.xml
+++ b/app/src/main/res/anim/fade_in.xml
@@ -20,6 +20,8 @@
   -->
 
 <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:interpolator="@android:interpolator/accelerate_quad" android:propertyName="alpha"
-    android:valueFrom="0" android:valueTo="1" />
\ No newline at end of file
+                android:duration="@android:integer/config_mediumAnimTime"
+                android:interpolator="@android:interpolator/accelerate_quad"
+                android:propertyName="alpha"
+                android:valueFrom="0"
+                android:valueTo="1"/>
\ No newline at end of file
diff --git a/app/src/main/res/animator/fade_in.xml b/app/src/main/res/animator/fade_in.xml
index 3413353ae..8de2b5bb5 100644
--- a/app/src/main/res/animator/fade_in.xml
+++ b/app/src/main/res/animator/fade_in.xml
@@ -20,8 +20,8 @@
   -->
 
 <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:interpolator="@android:interpolator/accelerate_quad"
-    android:propertyName="alpha"
-    android:valueFrom="0"
-    android:valueTo="1" />
\ No newline at end of file
+                android:duration="@android:integer/config_mediumAnimTime"
+                android:interpolator="@android:interpolator/accelerate_quad"
+                android:propertyName="alpha"
+                android:valueFrom="0"
+                android:valueTo="1"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/baseline_dashboard_black_18.png b/app/src/main/res/drawable-hdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..82619cccd
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_dashboard_black_24.png b/app/src/main/res/drawable-hdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..a1476f6d9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_dashboard_black_36.png b/app/src/main/res/drawable-hdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..ceda41aac
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_dashboard_black_48.png b/app/src/main/res/drawable-hdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..ad14dfeb9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_dvr_black_18.png b/app/src/main/res/drawable-hdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..dfda3dcd8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_dvr_black_24.png b/app/src/main/res/drawable-hdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..e636c40b1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_dvr_black_36.png b/app/src/main/res/drawable-hdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..5dd9ce4e9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_dvr_black_48.png b/app/src/main/res/drawable-hdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..e90df3db5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_highlight_black_18.png b/app/src/main/res/drawable-hdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..a4b91b120
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_highlight_black_24.png b/app/src/main/res/drawable-hdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..bd256390d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_highlight_black_36.png b/app/src/main/res/drawable-hdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..792947410
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_highlight_black_48.png b/app/src/main/res/drawable-hdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..881d6b0dd
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..c89bcc71a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..a8f262f7b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..647420c7b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..2b86cf6b8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..bc2e6593e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..5355a3a65
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..ab8dda5e4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..c9d5f2613
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_opacity_black_18.png b/app/src/main/res/drawable-hdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..9a7ba5624
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_opacity_black_24.png b/app/src/main/res/drawable-hdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..61e1486ab
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_opacity_black_36.png b/app/src/main/res/drawable-hdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..99c86b049
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_opacity_black_48.png b/app/src/main/res/drawable-hdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..47a505688
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_stop_black_18.png b/app/src/main/res/drawable-hdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..455434f40
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_stop_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_stop_black_24.png b/app/src/main/res/drawable-hdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..75a09bb83
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_stop_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_stop_black_36.png b/app/src/main/res/drawable-hdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..9f1bb3ac0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_stop_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_stop_black_48.png b/app/src/main/res/drawable-hdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..9d6b65da7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_stop_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_18.png b/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..9bc4a45ed
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_24.png b/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..9f88ea5ae
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_36.png b/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..1d0056c0c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_48.png b/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..b0375366d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_18.png b/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..76fb86fce
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_24.png b/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..0945adf69
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_36.png b/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..763153790
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_48.png b/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..36c685021
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/outline_info_black_18.png b/app/src/main/res/drawable-hdpi/outline_info_black_18.png
new file mode 100644
index 000000000..2d678b039
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/outline_info_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/outline_info_black_24.png b/app/src/main/res/drawable-hdpi/outline_info_black_24.png
new file mode 100644
index 000000000..6677f00f1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/outline_info_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/outline_info_black_36.png b/app/src/main/res/drawable-hdpi/outline_info_black_36.png
new file mode 100644
index 000000000..12947cfcb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/outline_info_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/outline_info_black_48.png b/app/src/main/res/drawable-hdpi/outline_info_black_48.png
new file mode 100644
index 000000000..975b1ba2e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/outline_info_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_dashboard_black_18.png b/app/src/main/res/drawable-mdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..6b88f6f3f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_dashboard_black_24.png b/app/src/main/res/drawable-mdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..70feae6d0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_dashboard_black_36.png b/app/src/main/res/drawable-mdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..a1476f6d9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_dashboard_black_48.png b/app/src/main/res/drawable-mdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..c8e420f6e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_dvr_black_18.png b/app/src/main/res/drawable-mdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..1c49f02a9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_dvr_black_24.png b/app/src/main/res/drawable-mdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..3aa79d52a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_dvr_black_36.png b/app/src/main/res/drawable-mdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..e636c40b1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_dvr_black_48.png b/app/src/main/res/drawable-mdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..7bd6c78db
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_highlight_black_18.png b/app/src/main/res/drawable-mdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..9ba7e5621
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_highlight_black_24.png b/app/src/main/res/drawable-mdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..e50ea7593
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_highlight_black_36.png b/app/src/main/res/drawable-mdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..bd256390d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_highlight_black_48.png b/app/src/main/res/drawable-mdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..e6dca4876
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..9f3b0e27c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..2a6f560d9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..a8f262f7b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..f984862cd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..fdf7f2c24
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..fd82b1732
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..5355a3a65
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..540d3e15c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_opacity_black_18.png b/app/src/main/res/drawable-mdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..da6e462ce
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_opacity_black_24.png b/app/src/main/res/drawable-mdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..33b981dd4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_opacity_black_36.png b/app/src/main/res/drawable-mdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..61e1486ab
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_opacity_black_48.png b/app/src/main/res/drawable-mdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..f63a7047c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_stop_black_18.png b/app/src/main/res/drawable-mdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..a21765cf3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_stop_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_stop_black_24.png b/app/src/main/res/drawable-mdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..39c6117d0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_stop_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_stop_black_36.png b/app/src/main/res/drawable-mdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..75a09bb83
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_stop_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_stop_black_48.png b/app/src/main/res/drawable-mdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..dde84945f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_stop_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_18.png b/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..fb321448c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_24.png b/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..3f8280542
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_36.png b/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..9f88ea5ae
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_48.png b/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..86e54e0c6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_18.png b/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..9a96baff8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_24.png b/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..747cb7da8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_36.png b/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..0945adf69
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_48.png b/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..5da77de52
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/outline_info_black_18.png b/app/src/main/res/drawable-mdpi/outline_info_black_18.png
new file mode 100644
index 000000000..5c8c88d79
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/outline_info_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/outline_info_black_24.png b/app/src/main/res/drawable-mdpi/outline_info_black_24.png
new file mode 100644
index 000000000..73a33ab01
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/outline_info_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/outline_info_black_36.png b/app/src/main/res/drawable-mdpi/outline_info_black_36.png
new file mode 100644
index 000000000..6677f00f1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/outline_info_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/outline_info_black_48.png b/app/src/main/res/drawable-mdpi/outline_info_black_48.png
new file mode 100644
index 000000000..398e6ce0b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/outline_info_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..a1476f6d9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..c8e420f6e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..ad14dfeb9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..8fad114fe
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_dvr_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..e636c40b1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_dvr_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..7bd6c78db
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_dvr_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..e90df3db5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_dvr_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..361593e9c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_highlight_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..bd256390d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_highlight_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..e6dca4876
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_highlight_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..881d6b0dd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_highlight_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..481482599
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..a8f262f7b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..f984862cd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..2b86cf6b8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..ed15d783d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..5355a3a65
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..540d3e15c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..c9d5f2613
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..06b7adb66
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_opacity_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..61e1486ab
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_opacity_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..f63a7047c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_opacity_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..47a505688
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_opacity_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..3c85bbb12
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_stop_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..75a09bb83
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_stop_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_stop_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..dde84945f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_stop_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_stop_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..9d6b65da7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_stop_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_stop_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..5bc5a6cd1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_stop_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..9f88ea5ae
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..86e54e0c6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..b0375366d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..dbac973f5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..0945adf69
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..5da77de52
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..36c685021
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..61a82f999
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/outline_info_black_18.png b/app/src/main/res/drawable-xhdpi/outline_info_black_18.png
new file mode 100644
index 000000000..6677f00f1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/outline_info_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/outline_info_black_24.png b/app/src/main/res/drawable-xhdpi/outline_info_black_24.png
new file mode 100644
index 000000000..398e6ce0b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/outline_info_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/outline_info_black_36.png b/app/src/main/res/drawable-xhdpi/outline_info_black_36.png
new file mode 100644
index 000000000..975b1ba2e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/outline_info_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/outline_info_black_48.png b/app/src/main/res/drawable-xhdpi/outline_info_black_48.png
new file mode 100644
index 000000000..3fc566206
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/outline_info_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..ceda41aac
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..ad14dfeb9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..55110fd04
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..bb705f3bc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..5dd9ce4e9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..e90df3db5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..d72ad13a7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..32b7bef98
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..792947410
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..881d6b0dd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..9a9c5e803
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..9f251dc35
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..647420c7b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..2b86cf6b8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..5bd8945d6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..9fd353899
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..ab8dda5e4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..c9d5f2613
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..a4afd4b34
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..3ad77acb4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..99c86b049
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..47a505688
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..2f9270c7c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..237e3644a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_stop_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..9f1bb3ac0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_stop_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_stop_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..9d6b65da7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_stop_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_stop_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..75f47c1bf
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_stop_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_stop_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..eac183db7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_stop_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..1d0056c0c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..b0375366d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..12b0613e0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..b4391354c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..763153790
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..36c685021
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..a536d885a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..269901932
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/outline_info_black_18.png b/app/src/main/res/drawable-xxhdpi/outline_info_black_18.png
new file mode 100644
index 000000000..12947cfcb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/outline_info_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/outline_info_black_24.png b/app/src/main/res/drawable-xxhdpi/outline_info_black_24.png
new file mode 100644
index 000000000..975b1ba2e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/outline_info_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/outline_info_black_36.png b/app/src/main/res/drawable-xxhdpi/outline_info_black_36.png
new file mode 100644
index 000000000..c304dd747
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/outline_info_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/outline_info_black_48.png b/app/src/main/res/drawable-xxhdpi/outline_info_black_48.png
new file mode 100644
index 000000000..de39c6a24
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/outline_info_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..ad14dfeb9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..8fad114fe
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..bb705f3bc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..e2fc973b4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..e90df3db5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..361593e9c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..32b7bef98
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..9b03086bc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..881d6b0dd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..481482599
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..9f251dc35
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..31bf7cc0a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..2b86cf6b8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..ed15d783d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..9fd353899
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..f6248cde5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..c9d5f2613
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..06b7adb66
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..3ad77acb4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..339b456dc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..47a505688
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..3c85bbb12
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..237e3644a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..7dcc2836e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..9d6b65da7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..5bc5a6cd1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..eac183db7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..685a83e1f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_stop_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..b0375366d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..dbac973f5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..b4391354c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..d833bc83b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..36c685021
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..61a82f999
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..269901932
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..614beb3b7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/outline_info_black_18.png b/app/src/main/res/drawable-xxxhdpi/outline_info_black_18.png
new file mode 100644
index 000000000..975b1ba2e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/outline_info_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/outline_info_black_24.png b/app/src/main/res/drawable-xxxhdpi/outline_info_black_24.png
new file mode 100644
index 000000000..3fc566206
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/outline_info_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/outline_info_black_36.png b/app/src/main/res/drawable-xxxhdpi/outline_info_black_36.png
new file mode 100644
index 000000000..de39c6a24
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/outline_info_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/outline_info_black_48.png b/app/src/main/res/drawable-xxxhdpi/outline_info_black_48.png
new file mode 100644
index 000000000..33022becd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/outline_info_black_48.png differ
diff --git a/app/src/main/res/drawable/appwidget_bg_clickable.xml b/app/src/main/res/drawable/appwidget_bg_clickable.xml
index 468ae56d4..c90358191 100644
--- a/app/src/main/res/drawable/appwidget_bg_clickable.xml
+++ b/app/src/main/res/drawable/appwidget_bg_clickable.xml
@@ -20,7 +20,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/appwidget_bg_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/appwidget_bg_focused" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true" />
-    <item android:drawable="@drawable/appwidget_bg" />
+    <item android:drawable="@drawable/appwidget_bg_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/appwidget_bg_focused" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true"/>
+    <item android:drawable="@drawable/appwidget_bg"/>
 </selector>
diff --git a/app/src/main/res/drawable/appwidget_button_center.xml b/app/src/main/res/drawable/appwidget_button_center.xml
index d462bcdac..5ba14c958 100644
--- a/app/src/main/res/drawable/appwidget_button_center.xml
+++ b/app/src/main/res/drawable/appwidget_button_center.xml
@@ -20,7 +20,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/appwidget_inner_pressed_c" android:state_pressed="true" />
-    <item android:drawable="@drawable/appwidget_inner_focused_c" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true" />
-    <item android:drawable="@android:color/transparent" />
+    <item android:drawable="@drawable/appwidget_inner_pressed_c" android:state_pressed="true"/>
+    <item android:drawable="@drawable/appwidget_inner_focused_c" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true"/>
+    <item android:drawable="@android:color/transparent"/>
 </selector>
diff --git a/app/src/main/res/drawable/appwidget_button_left.xml b/app/src/main/res/drawable/appwidget_button_left.xml
index 901bce8a2..4690bc24f 100644
--- a/app/src/main/res/drawable/appwidget_button_left.xml
+++ b/app/src/main/res/drawable/appwidget_button_left.xml
@@ -20,7 +20,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/appwidget_inner_pressed_l" android:state_pressed="true" />
-    <item android:drawable="@drawable/appwidget_inner_focused_l" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true" />
-    <item android:drawable="@android:color/transparent" />
+    <item android:drawable="@drawable/appwidget_inner_pressed_l" android:state_pressed="true"/>
+    <item android:drawable="@drawable/appwidget_inner_focused_l" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true"/>
+    <item android:drawable="@android:color/transparent"/>
 </selector>
diff --git a/app/src/main/res/drawable/appwidget_button_right.xml b/app/src/main/res/drawable/appwidget_button_right.xml
index 788b17434..5625ac07b 100644
--- a/app/src/main/res/drawable/appwidget_button_right.xml
+++ b/app/src/main/res/drawable/appwidget_button_right.xml
@@ -20,7 +20,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/appwidget_inner_pressed_r" android:state_pressed="true" />
-    <item android:drawable="@drawable/appwidget_inner_focused_r" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true" />
-    <item android:drawable="@android:color/transparent" />
+    <item android:drawable="@drawable/appwidget_inner_pressed_r" android:state_pressed="true"/>
+    <item android:drawable="@drawable/appwidget_inner_focused_r" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true"/>
+    <item android:drawable="@android:color/transparent"/>
 </selector>
diff --git a/app/src/main/res/drawable/appwidget_dark_bg_clickable.xml b/app/src/main/res/drawable/appwidget_dark_bg_clickable.xml
index e797d0e52..a965f2770 100644
--- a/app/src/main/res/drawable/appwidget_dark_bg_clickable.xml
+++ b/app/src/main/res/drawable/appwidget_dark_bg_clickable.xml
@@ -20,7 +20,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/appwidget_bg_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/appwidget_dark_bg_focused" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true" />
-    <item android:drawable="@drawable/appwidget_dark_bg" />
+    <item android:drawable="@drawable/appwidget_bg_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/appwidget_dark_bg_focused" android:state_enabled="true" android:state_focused="true" android:state_window_focused="true"/>
+    <item android:drawable="@drawable/appwidget_dark_bg"/>
 </selector>
diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml
index 32a98b22a..ac1a5cf9b 100644
--- a/app/src/main/res/drawable/border.xml
+++ b/app/src/main/res/drawable/border.xml
@@ -21,8 +21,8 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+       android:shape="rectangle">
     <stroke
         android:width="5dip"
-        android:color="@color/material_grey_300" />
+        android:color="@color/material_grey_300"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bordershadow.xml b/app/src/main/res/drawable/bordershadow.xml
index fe6350bdf..b6e2a67f1 100644
--- a/app/src/main/res/drawable/bordershadow.xml
+++ b/app/src/main/res/drawable/bordershadow.xml
@@ -25,14 +25,14 @@
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="#50BDBDBD" />
-                    <corners android:radius="0dp" />
+                    <solid android:color="#50BDBDBD"/>
+                    <corners android:radius="0dp"/>
                 </shape>
             </item>
             <item android:bottom="2dp" android:left="0dp" android:right="1dp" android:top="0dp">
                 <shape android:shape="rectangle">
-                    <solid android:color="@color/white" />
-                    <corners android:radius="0dp" />
+                    <solid android:color="@color/white"/>
+                    <corners android:radius="0dp"/>
                 </shape>
             </item>
         </layer-list>
diff --git a/app/src/main/res/drawable/button_dark_status.xml b/app/src/main/res/drawable/button_dark_status.xml
index 61518d5f7..8b7a4ffea 100644
--- a/app/src/main/res/drawable/button_dark_status.xml
+++ b/app/src/main/res/drawable/button_dark_status.xml
@@ -21,6 +21,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/button_dark_status_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/button_dark_status_normal" android:state_focused="false" />
+    <item android:drawable="@drawable/button_dark_status_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/button_dark_status_normal" android:state_focused="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dark_status_normal.xml b/app/src/main/res/drawable/button_dark_status_normal.xml
index dbd7b7299..89d5fead1 100644
--- a/app/src/main/res/drawable/button_dark_status_normal.xml
+++ b/app/src/main/res/drawable/button_dark_status_normal.xml
@@ -21,16 +21,16 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#3F3F3F" />
+       android:shape="rectangle">
+    <solid android:color="#3F3F3F"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dark_status_pressed.xml b/app/src/main/res/drawable/button_dark_status_pressed.xml
index fc2586948..cd246f7bc 100644
--- a/app/src/main/res/drawable/button_dark_status_pressed.xml
+++ b/app/src/main/res/drawable/button_dark_status_pressed.xml
@@ -21,16 +21,16 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#3F3F3F" />
+       android:shape="rectangle">
+    <solid android:color="#3F3F3F"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/button_normal.xml b/app/src/main/res/drawable/button_normal.xml
index 22605b2ae..d83b31627 100644
--- a/app/src/main/res/drawable/button_normal.xml
+++ b/app/src/main/res/drawable/button_normal.xml
@@ -21,19 +21,19 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/material_grey_300" />
+       android:shape="rectangle">
+    <solid android:color="@color/material_grey_300"/>
     <stroke
         android:width="3dp"
-        android:color="@color/material_grey_300" />
+        android:color="@color/material_grey_300"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_on.xml b/app/src/main/res/drawable/button_on.xml
index de336194e..e58e85824 100644
--- a/app/src/main/res/drawable/button_on.xml
+++ b/app/src/main/res/drawable/button_on.xml
@@ -21,6 +21,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/button_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/button_normal" android:state_focused="false" />
+    <item android:drawable="@drawable/button_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/button_normal" android:state_focused="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_pressed.xml b/app/src/main/res/drawable/button_pressed.xml
index 556f175be..35ae2b7de 100644
--- a/app/src/main/res/drawable/button_pressed.xml
+++ b/app/src/main/res/drawable/button_pressed.xml
@@ -21,19 +21,19 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/material_grey_500_" />
+       android:shape="rectangle">
+    <solid android:color="@color/material_grey_500_"/>
     <stroke
         android:width="3dp"
-        android:color="@color/material_grey_500_" />
+        android:color="@color/material_grey_500_"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/button_status.xml b/app/src/main/res/drawable/button_status.xml
index 68f57f23a..0b95881a8 100644
--- a/app/src/main/res/drawable/button_status.xml
+++ b/app/src/main/res/drawable/button_status.xml
@@ -21,6 +21,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/button_status_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/button_status_normal" android:state_focused="false" />
+    <item android:drawable="@drawable/button_status_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/button_status_normal" android:state_focused="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_status_dark.xml b/app/src/main/res/drawable/button_status_dark.xml
index f7730561a..5b66521f0 100644
--- a/app/src/main/res/drawable/button_status_dark.xml
+++ b/app/src/main/res/drawable/button_status_dark.xml
@@ -21,6 +21,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/button_status_dark_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/button_status_dark_normal" android:state_focused="false" />
+    <item android:drawable="@drawable/button_status_dark_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/button_status_dark_normal" android:state_focused="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_status_dark_normal.xml b/app/src/main/res/drawable/button_status_dark_normal.xml
index db0e7dc6c..9b11f645a 100644
--- a/app/src/main/res/drawable/button_status_dark_normal.xml
+++ b/app/src/main/res/drawable/button_status_dark_normal.xml
@@ -21,16 +21,16 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/button_dark" />
+       android:shape="rectangle">
+    <solid android:color="@color/button_dark"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_status_dark_pressed.xml b/app/src/main/res/drawable/button_status_dark_pressed.xml
index a6c1d0c25..21125bda8 100644
--- a/app/src/main/res/drawable/button_status_dark_pressed.xml
+++ b/app/src/main/res/drawable/button_status_dark_pressed.xml
@@ -21,16 +21,16 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/button_dark" />
+       android:shape="rectangle">
+    <solid android:color="@color/button_dark"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/button_status_normal.xml b/app/src/main/res/drawable/button_status_normal.xml
index 88a1356d0..82e9c9114 100644
--- a/app/src/main/res/drawable/button_status_normal.xml
+++ b/app/src/main/res/drawable/button_status_normal.xml
@@ -21,16 +21,16 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/material_grey_300_" />
+       android:shape="rectangle">
+    <solid android:color="@color/material_grey_300_"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_status_pressed.xml b/app/src/main/res/drawable/button_status_pressed.xml
index 94376ba4e..7e0fdda4b 100644
--- a/app/src/main/res/drawable/button_status_pressed.xml
+++ b/app/src/main/res/drawable/button_status_pressed.xml
@@ -21,16 +21,16 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/material_grey_500_" />
+       android:shape="rectangle">
+    <solid android:color="@color/material_grey_500_"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/button_white_status.xml b/app/src/main/res/drawable/button_white_status.xml
index 747f9edd3..cfb971d61 100644
--- a/app/src/main/res/drawable/button_white_status.xml
+++ b/app/src/main/res/drawable/button_white_status.xml
@@ -21,6 +21,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/button_white_status_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/button_white_status_normal" android:state_focused="false" />
+    <item android:drawable="@drawable/button_white_status_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/button_white_status_normal" android:state_focused="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_status_normal.xml b/app/src/main/res/drawable/button_white_status_normal.xml
index d9ca64adc..4b8c7b860 100644
--- a/app/src/main/res/drawable/button_white_status_normal.xml
+++ b/app/src/main/res/drawable/button_white_status_normal.xml
@@ -21,16 +21,16 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
+       android:shape="rectangle">
+    <solid android:color="@color/white"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_status_pressed.xml b/app/src/main/res/drawable/button_white_status_pressed.xml
index 7c57c2c6c..5e18cfacb 100644
--- a/app/src/main/res/drawable/button_white_status_pressed.xml
+++ b/app/src/main/res/drawable/button_white_status_pressed.xml
@@ -21,16 +21,16 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
+       android:shape="rectangle">
+    <solid android:color="@color/white"/>
     <padding
         android:bottom="2dp"
         android:left="2dp"
         android:right="2dp"
-        android:top="2dp" />
+        android:top="2dp"/>
     <corners
         android:bottomLeftRadius="3dp"
         android:bottomRightRadius="3dp"
         android:topLeftRadius="3dp"
-        android:topRightRadius="3dp" />
+        android:topRightRadius="3dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index e499363b7..65a0300ac 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -3,112 +3,112 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="108.0"
-    android:viewportWidth="108.0">
+    android:viewportWidth="108.0"
+    android:viewportHeight="108.0">
     <path
         android:fillColor="#26A69A"
         android:pathData="M0,0h108v108h-108z"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M9,0L9,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M39,0L39,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M29,0L29,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M59,0L59,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M49,0L49,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M79,0L79,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M69,0L69,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M99,0L99,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,99L108,99"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,69L108,69"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,79L108,79"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,49L108,49"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,59L108,59"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,29L108,29"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,39L108,39"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF"/>
     <path
         android:fillColor="#00000000"
         android:pathData="M0,9L108,9"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8"/>
+        android:strokeWidth="0.8"
+        android:strokeColor="#66FFFFFF"/>
 </vector>
 
diff --git a/app/src/main/res/drawable/palette.png b/app/src/main/res/drawable/palette.png
new file mode 100644
index 000000000..54f6006f2
Binary files /dev/null and b/app/src/main/res/drawable/palette.png differ
diff --git a/app/src/main/res/drawable/wheel.png b/app/src/main/res/drawable/wheel.png
new file mode 100644
index 000000000..40be615ab
Binary files /dev/null and b/app/src/main/res/drawable/wheel.png differ
diff --git a/app/src/main/res/drawable/wheel_dark.png b/app/src/main/res/drawable/wheel_dark.png
new file mode 100644
index 000000000..ae1fff13c
Binary files /dev/null and b/app/src/main/res/drawable/wheel_dark.png differ
diff --git a/app/src/main/res/drawable/wwpalette.png b/app/src/main/res/drawable/wwpalette.png
new file mode 100644
index 000000000..48fd234ba
Binary files /dev/null and b/app/src/main/res/drawable/wwpalette.png differ
diff --git a/app/src/main/res/drawable/wwslider.png b/app/src/main/res/drawable/wwslider.png
new file mode 100644
index 000000000..2505e273f
Binary files /dev/null and b/app/src/main/res/drawable/wwslider.png differ
diff --git a/app/src/main/res/layout-land/dialog_notifications.xml b/app/src/main/res/layout-land/dialog_notifications.xml
index 4b180c0a9..62d3d0722 100644
--- a/app/src/main/res/layout-land/dialog_notifications.xml
+++ b/app/src/main/res/layout-land/dialog_notifications.xml
@@ -21,13 +21,13 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <ListView
         android:id="@+id/list"
         android:layout_width="match_parent"
-        android:layout_height="300dp" />
+        android:layout_height="300dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_welcome1.xml b/app/src/main/res/layout-land/fragment_welcome1.xml
index 6b36e0d8e..a0ae9b96b 100644
--- a/app/src/main/res/layout-land/fragment_welcome1.xml
+++ b/app/src/main/res/layout-land/fragment_welcome1.xml
@@ -21,13 +21,13 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root1"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/welcome_top_margin">
+                android:id="@+id/root1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/welcome_top_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin">
 
     <ImageView
         android:id="@+id/logo_domoticz"
@@ -35,7 +35,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_gravity="center_horizontal"
-        android:src="@drawable/ic_domoticz_logo" />
+        android:src="@drawable/ic_domoticz_logo"/>
 
     <TextView
         android:id="@+id/info_text"
@@ -45,7 +45,7 @@
         android:layout_marginTop="15dp"
         android:text="@string/welcome_info_domoticz"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_size_welcomePage1_domoticzInfo" />
+        android:textSize="@dimen/text_size_welcomePage1_domoticzInfo"/>
 
     <TextView
         android:id="@+id/info_swipe"
@@ -54,6 +54,6 @@
         android:layout_alignParentBottom="true"
         android:text="@string/welcome_info_swipe"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_size_welcomePage1_swipeInfo" />
+        android:textSize="@dimen/text_size_welcomePage1_swipeInfo"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/notification_row.xml b/app/src/main/res/layout-land/notification_row.xml
index 61d429369..92c0af129 100644
--- a/app/src/main/res/layout-land/notification_row.xml
+++ b/app/src/main/res/layout-land/notification_row.xml
@@ -21,10 +21,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <TextView
         android:id="@+id/switch_name"
@@ -32,22 +32,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        tools:text="Switch name" />
+        tools:text="Switch name"/>
 
     <TextView
         android:id="@+id/switch_battery_level"
         style="@style/row_body1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:text="@string/battery_level" />
+        android:layout_alignParentLeft="true"
+        android:text="@string/battery_level"/>
 
     <TextView
         android:id="@+id/switch_signal_level"
         style="@style/row_body2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/signal_level" />
+        android:text="@string/signal_level"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw720dp/activity_newmain_free.xml b/app/src/main/res/layout-sw720dp/activity_newmain_free.xml
index 84ee2d1c7..e827a26db 100644
--- a/app/src/main/res/layout-sw720dp/activity_newmain_free.xml
+++ b/app/src/main/res/layout-sw720dp/activity_newmain_free.xml
@@ -18,7 +18,8 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:ads="http://schemas.android.com/apk/res-auto"
               xmlns:app="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               style="@style/background_recyclerview"
@@ -29,6 +30,7 @@
 
     <LinearLayout android:id="@+id/phoneLayoutWrapper"
                   android:layout_width="match_parent"
+                  android:layout_weight="7"
                   android:layout_height="match_parent"
                   android:orientation="vertical">
 
@@ -52,7 +54,6 @@
     <FrameLayout
         android:id="@+id/main"
         android:layout_width="match_parent"
-        android:layout_marginBottom="50dp"
         android:layout_height="match_parent" />
 
         <!-- TextView used to detect if this tablet layout is used -->
@@ -63,13 +64,18 @@
             android:visibility="gone" />
     </LinearLayout>
 
-    <com.google.android.gms.ads.AdView
-        xmlns:ads="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/adView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        ads:adSize="SMART_BANNER"
-        ads:adUnitId="@string/ADMOB_ADS_KEY" />
-</RelativeLayout>
\ No newline at end of file
+        android:layout_weight="1"
+        android:gravity="bottom"
+        android:orientation="vertical" >
+        <com.google.android.gms.ads.AdView
+            android:id="@+id/adView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            ads:adSize="SMART_BANNER"
+            ads:adUnitId="@string/ADMOB_ADS_KEY" >
+        </com.google.android.gms.ads.AdView>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_geo_settings.xml b/app/src/main/res/layout/activity_geo_settings.xml
index 1652867a6..95ba52d15 100644
--- a/app/src/main/res/layout/activity_geo_settings.xml
+++ b/app/src/main/res/layout/activity_geo_settings.xml
@@ -20,10 +20,10 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinatorLayout"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                                                 android:id="@+id/coordinatorLayout"
+                                                 style="@style/background_listview"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,31 +41,31 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:paddingTop="@dimen/activity_vertical_margin">
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/geofence_onoff"
                     style="@style/row_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
                     android:layout_alignParentTop="true"
                     android:layout_toLeftOf="@+id/switch_button"
-                    android:text="@string/title_geofence" />
+                    android:text="@string/title_geofence"/>
 
                 <TextView
                     android:id="@+id/geofence_description"
                     style="@style/row_body1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_below="@+id/geofence_onoff"
                     android:layout_alignEnd="@+id/geofence_onoff"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
                     android:layout_alignRight="@+id/geofence_onoff"
-                    android:layout_below="@+id/geofence_onoff"
-                    android:text="@string/description_geofence" />
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:text="@string/description_geofence"/>
 
                 <Switch
                     android:id="@+id/switch_button"
@@ -73,7 +73,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp" />
+                    android:paddingLeft="10dp"/>
 
             </RelativeLayout>
 
@@ -81,31 +81,31 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:paddingTop="@dimen/activity_vertical_margin">
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/geofence_notifications_onoff"
                     style="@style/row_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
                     android:layout_alignParentTop="true"
                     android:layout_toLeftOf="@+id/switch_notifications_button"
-                    android:text="@string/title_notification_geofence" />
+                    android:text="@string/title_notification_geofence"/>
 
                 <TextView
                     android:id="@+id/geofence_notifications_description"
                     style="@style/row_body1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_below="@+id/geofence_notifications_onoff"
                     android:layout_alignEnd="@+id/geofence_notifications_onoff"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
                     android:layout_alignRight="@+id/geofence_notifications_onoff"
-                    android:layout_below="@+id/geofence_notifications_onoff"
-                    android:text="@string/description_notification_geofence" />
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:text="@string/description_notification_geofence"/>
 
                 <Switch
                     android:id="@+id/switch_notifications_button"
@@ -113,7 +113,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp" />
+                    android:paddingLeft="10dp"/>
 
             </RelativeLayout>
         </LinearLayout>
@@ -129,10 +129,10 @@
             android:dividerHeight="@dimen/row_space"
             android:focusable="false"
             android:focusableInTouchMode="false"
-            android:paddingBottom="@dimen/row_space"
             android:paddingTop="@dimen/row_space"
+            android:paddingBottom="@dimen/row_space"
             android:scrollingCache="false"
-            android:smoothScrollbar="true" />
+            android:smoothScrollbar="true"/>
     </LinearLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 44c40fd8e..0103fc124 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -20,11 +20,11 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent"
+                                                 tools:context=".MainActivity">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
@@ -33,7 +33,7 @@
         android:background="?attr/colorPrimary"
         android:elevation="4dp"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
     <android.support.v4.widget.DrawerLayout
         android:id="@+id/drawer_layout"
@@ -45,13 +45,13 @@
             android:id="@+id/main"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:context=".MainActivity" />
+            tools:context=".MainActivity"/>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/RecyclerView"
             android:layout_width="320dp"
             android:layout_height="match_parent"
-            android:layout_gravity="start" />
+            android:layout_gravity="start"/>
 
     </android.support.v4.widget.DrawerLayout>
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_newmain_free.xml b/app/src/main/res/layout/activity_newmain_free.xml
index 9e777f628..f7c595850 100644
--- a/app/src/main/res/layout/activity_newmain_free.xml
+++ b/app/src/main/res/layout/activity_newmain_free.xml
@@ -18,51 +18,58 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".MainActivity">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:ads="http://schemas.android.com/apk/res-auto"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                tools:context=".MainActivity">
 
-    <LinearLayout android:id="@+id/phoneLayoutWrapper"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  style="@style/background_recyclerview"
-                  android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
+    <LinearLayout
+        android:id="@+id/phoneLayoutWrapper"
+        style="@style/background_recyclerview"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/primary_dark"
-        android:elevation="4dp"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        android:layout_weight="5"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <com.github.zagum.speechrecognitionview.RecognitionProgressView
-        android:id="@+id/recognition_view"
-        style="@style/background_recyclerview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/primary_dark"
+            android:elevation="4dp"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <FrameLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_marginBottom="50dp"
-        android:layout_height="match_parent" />
+        <com.github.zagum.speechrecognitionview.RecognitionProgressView
+            android:id="@+id/recognition_view"
+            style="@style/background_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone"/>
+
+        <FrameLayout
+            android:id="@+id/main"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
     </LinearLayout>
 
-    <com.google.android.gms.ads.AdView
-        xmlns:ads="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/adView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        ads:adSize="SMART_BANNER"
-        ads:adUnitId="@string/ADMOB_ADS_KEY" />
-</RelativeLayout>
\ No newline at end of file
+        android:layout_weight="1"
+        android:gravity="bottom"
+        android:orientation="vertical" >
+        <com.google.android.gms.ads.AdView
+            android:id="@+id/adView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            ads:adSize="SMART_BANNER"
+            ads:adUnitId="@string/ADMOB_ADS_KEY" >
+        </com.google.android.gms.ads.AdView>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_newmain_paid.xml b/app/src/main/res/layout/activity_newmain_paid.xml
index 11c641a7e..877c8150d 100644
--- a/app/src/main/res/layout/activity_newmain_paid.xml
+++ b/app/src/main/res/layout/activity_newmain_paid.xml
@@ -19,40 +19,41 @@
   ~  under the License.
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".MainActivity">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                tools:context=".MainActivity">
 
-    <LinearLayout android:id="@+id/phoneLayoutWrapper"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  style="@style/background_recyclerview"
-                  android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
+    <LinearLayout
+        android:id="@+id/phoneLayoutWrapper"
+        style="@style/background_recyclerview"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/primary_dark"
-        android:elevation="4dp"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <com.github.zagum.speechrecognitionview.RecognitionProgressView
-        android:id="@+id/recognition_view"
-        style="@style/background_recyclerview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/primary_dark"
+            android:elevation="4dp"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <FrameLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <com.github.zagum.speechrecognitionview.RecognitionProgressView
+            android:id="@+id/recognition_view"
+            style="@style/background_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone"/>
+
+        <FrameLayout
+            android:id="@+id/main"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
     </LinearLayout>
 
     <com.google.android.gms.ads.AdView
@@ -60,8 +61,8 @@
         android:id="@+id/adView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
         ads:adSize="SMART_BANNER"
-        ads:adUnitId="@string/ADMOB_ADS_KEY" />
+        ads:adUnitId="@string/ADMOB_ADS_KEY"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_nfc_settings.xml b/app/src/main/res/layout/activity_nfc_settings.xml
index 4c4b49ce0..59a2f3e29 100644
--- a/app/src/main/res/layout/activity_nfc_settings.xml
+++ b/app/src/main/res/layout/activity_nfc_settings.xml
@@ -20,10 +20,10 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinatorLayout"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                                                 android:id="@+id/coordinatorLayout"
+                                                 style="@style/background_listview"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,10 +48,10 @@
             android:dividerHeight="@dimen/row_space"
             android:focusable="false"
             android:focusableInTouchMode="false"
-            android:paddingBottom="@dimen/row_space"
             android:paddingTop="@dimen/row_space"
+            android:paddingBottom="@dimen/row_space"
             android:scrollingCache="false"
-            android:smoothScrollbar="true" />
+            android:smoothScrollbar="true"/>
     </LinearLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_qrcode_settings.xml b/app/src/main/res/layout/activity_qrcode_settings.xml
index 94aad8d7e..3e5e6be5d 100644
--- a/app/src/main/res/layout/activity_qrcode_settings.xml
+++ b/app/src/main/res/layout/activity_qrcode_settings.xml
@@ -20,10 +20,10 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinatorLayout"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                                                 android:id="@+id/coordinatorLayout"
+                                                 style="@style/background_listview"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,10 +41,10 @@
             android:dividerHeight="@dimen/row_space"
             android:focusable="false"
             android:focusableInTouchMode="false"
-            android:paddingBottom="@dimen/row_space"
             android:paddingTop="@dimen/row_space"
+            android:paddingBottom="@dimen/row_space"
             android:scrollingCache="false"
-            android:smoothScrollbar="true" />
+            android:smoothScrollbar="true"/>
     </LinearLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_server_settings.xml b/app/src/main/res/layout/activity_server_settings.xml
index c3e4ddf51..8d1010bf1 100644
--- a/app/src/main/res/layout/activity_server_settings.xml
+++ b/app/src/main/res/layout/activity_server_settings.xml
@@ -20,10 +20,10 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinatorLayout"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                                                 android:id="@+id/coordinatorLayout"
+                                                 style="@style/background_listview"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,10 +41,10 @@
             android:dividerHeight="@dimen/row_space"
             android:focusable="false"
             android:focusableInTouchMode="false"
-            android:paddingBottom="@dimen/row_space"
             android:paddingTop="@dimen/row_space"
+            android:paddingBottom="@dimen/row_space"
             android:scrollingCache="false"
-            android:smoothScrollbar="true" />
+            android:smoothScrollbar="true"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_speech_settings.xml b/app/src/main/res/layout/activity_speech_settings.xml
index 810c2c8dd..f2484dd8d 100644
--- a/app/src/main/res/layout/activity_speech_settings.xml
+++ b/app/src/main/res/layout/activity_speech_settings.xml
@@ -20,17 +20,17 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinatorLayout"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                                                 android:id="@+id/coordinatorLayout"
+                                                 style="@style/background_listview"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent">
 
     <com.github.zagum.speechrecognitionview.RecognitionProgressView
         android:id="@+id/recognition_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <LinearLayout
         android:id="@+id/main"
@@ -49,10 +49,10 @@
             android:dividerHeight="@dimen/row_space"
             android:focusable="false"
             android:focusableInTouchMode="false"
-            android:paddingBottom="@dimen/row_space"
             android:paddingTop="@dimen/row_space"
+            android:paddingBottom="@dimen/row_space"
             android:scrollingCache="false"
-            android:smoothScrollbar="true" />
+            android:smoothScrollbar="true"/>
     </LinearLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_update.xml b/app/src/main/res/layout/activity_update.xml
index c0956fec3..e49eb715b 100644
--- a/app/src/main/res/layout/activity_update.xml
+++ b/app/src/main/res/layout/activity_update.xml
@@ -21,10 +21,10 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent"
+                                                 tools:context=".MainActivity">
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout"
@@ -35,20 +35,20 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:paddingBottom="@dimen/activity_vertical_margin"
             android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
             android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin">
+            android:paddingBottom="@dimen/activity_vertical_margin">
 
             <ImageView
                 android:id="@+id/logo_domoticz"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="25dp"
                 android:layout_marginTop="25dp"
+                android:layout_marginBottom="25dp"
                 android:contentDescription="@string/domoticz_logo"
-                android:src="@drawable/ic_domoticz_logo_white" />
+                android:src="@drawable/ic_domoticz_logo_white"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -61,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="75"
                     android:text="@string/server_version"
-                    android:textSize="@dimen/text_size_large" />
+                    android:textSize="@dimen/text_size_large"/>
 
                 <TextView
                     android:id="@+id/currentServerVersion_value"
@@ -69,7 +69,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="25"
                     android:textSize="@dimen/text_size_large"
-                    tools:text="2.4321" />
+                    tools:text="2.4321"/>
 
             </LinearLayout>
 
@@ -84,7 +84,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="75"
                     android:text="@string/server_update_revision"
-                    android:textSize="@dimen/text_size_large" />
+                    android:textSize="@dimen/text_size_large"/>
 
                 <TextView
                     android:id="@+id/updateServerVersion_value"
@@ -92,7 +92,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="25"
                     android:textSize="@dimen/text_size_large"
-                    tools:text="2.5432" />
+                    tools:text="2.5432"/>
 
             </LinearLayout>
 
@@ -103,16 +103,16 @@
                 android:layout_marginTop="35dp"
                 android:gravity="center_horizontal"
                 android:text="@string/server_update_available"
-                android:textSize="@dimen/text_size_large" />
+                android:textSize="@dimen/text_size_large"/>
 
-            <Button
+            <android.support.design.button.MaterialButton
                 android:id="@+id/buttonUpdateServer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="15dp"
-                android:layout_marginRight="15dp"
                 android:layout_marginTop="35dp"
-                android:text="@string/update_server" />
+                android:layout_marginRight="15dp"
+                android:text="@string/update_server"/>
         </LinearLayout>
     </android.support.v4.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index e89fd35cf..480b9aba7 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -20,16 +20,16 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
 
     <android.support.v4.view.ViewPager
 
         android:id="@+id/viewpager"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:layout_weight="1"/>
 
     <RelativeLayout
         android:id="@+id/navigation"
@@ -40,7 +40,7 @@
             android:id="@+id/btn_prev"
             style="@style/welcome_navButtons"
             android:layout_alignParentLeft="true"
-            android:visibility="invisible" />
+            android:visibility="invisible"/>
 
         <com.viewpagerindicator.CirclePageIndicator
             android:id="@+id/indicator"
@@ -48,12 +48,12 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
-            android:padding="10dip" />
+            android:padding="10dip"/>
 
         <TextView
             android:id="@+id/btn_next"
             style="@style/welcome_navButtons"
-            android:layout_alignParentRight="true" />
+            android:layout_alignParentRight="true"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/barcode_capture.xml b/app/src/main/res/layout/barcode_capture.xml
index 5a7c974ff..91bd40e21 100644
--- a/app/src/main/res/layout/barcode_capture.xml
+++ b/app/src/main/res/layout/barcode_capture.xml
@@ -21,11 +21,11 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:keepScreenOn="true"
-    android:orientation="vertical">
+              android:id="@+id/topLayout"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:keepScreenOn="true"
+              android:orientation="vertical">
 
     <nl.hnogames.domoticz.UI.camera.CameraSourcePreview
         android:id="@+id/preview"
@@ -35,7 +35,7 @@
         <nl.hnogames.domoticz.UI.camera.GraphicOverlay
             android:id="@+id/graphicOverlay"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"/>
     </nl.hnogames.domoticz.UI.camera.CameraSourcePreview>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/camera_default.xml b/app/src/main/res/layout/camera_default.xml
index 5f38e631d..80c327e05 100644
--- a/app/src/main/res/layout/camera_default.xml
+++ b/app/src/main/res/layout/camera_default.xml
@@ -34,17 +34,17 @@
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:adjustViewBounds="true"
-               android:scaleType="centerCrop" />
+               android:scaleType="centerCrop"/>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
         android:layout_gravity="end|bottom"
-        android:layout_marginBottom="20dp"
         android:layout_marginRight="20dp"
-        android:src="@android:drawable/ic_menu_share" />
+        android:layout_marginBottom="20dp"
+        android:src="@android:drawable/ic_menu_share"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/camera_row.xml b/app/src/main/res/layout/camera_row.xml
index c284dde10..30cd77e7c 100644
--- a/app/src/main/res/layout/camera_row.xml
+++ b/app/src/main/res/layout/camera_row.xml
@@ -20,17 +20,21 @@
   ~  under the License.
   -->
 
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-                                    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-                                    xmlns:tools="http://schemas.android.com/tools"
-                                    android:id="@+id/row_global_wrapper"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:clickable="true"
-                                    android:foreground="?android:attr/selectableItemBackground"
-                                    android:orientation="vertical"
-                                    card_view:cardCornerRadius="0dp"
-                                    card_view:cardUseCompatPadding="true">
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/card_global_wrapper"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -43,17 +47,17 @@
             android:id="@+id/image"
             android:layout_width="wrap_content"
             android:layout_height="200dp"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"/>
 
         <TextView
             android:id="@+id/name"
             style="@style/row_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="8dp"
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
-            tools:text="12 devices" />
+            android:paddingBottom="8dp"
+            tools:text="12 devices"/>
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/changelog_fragment.xml b/app/src/main/res/layout/changelog_fragment.xml
index 1cfca62c0..472ec4bbb 100644
--- a/app/src/main/res/layout/changelog_fragment.xml
+++ b/app/src/main/res/layout/changelog_fragment.xml
@@ -21,7 +21,7 @@
   -->
 
 <it.gmariotti.changelibs.library.view.ChangeLogRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center" />
\ No newline at end of file
+                                                            android:id="@+id/view"
+                                                            android:layout_width="match_parent"
+                                                            android:layout_height="match_parent"
+                                                            android:layout_gravity="center"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dashboard_row.xml b/app/src/main/res/layout/dashboard_row.xml
index 1f23b83e0..57fb5d269 100644
--- a/app/src/main/res/layout/dashboard_row.xml
+++ b/app/src/main/res/layout/dashboard_row.xml
@@ -19,23 +19,20 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/material_grey_300_"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginBottom="8dp"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -67,45 +64,57 @@
                         android:gravity="center_horizontal"
                         android:orientation="vertical">
 
+                        <ImageView
+                            android:id="@+id/widget_info_icon"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="top|start"
+                            android:layout_marginStart="5dp"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginTop="5dp"
+                            android:src="@drawable/outline_info_black_18"
+                            android:tint="@color/md_grey_300"/>
+
                         <ImageView
                             android:id="@+id/rowIcon"
                             android:layout_width="40dp"
                             android:layout_height="40dp"
                             android:layout_gravity="center_horizontal"
-                            android:paddingTop="10dp"
-                            android:src="@drawable/clock48" />
+                            android:contentDescription="@string/error_image_description"
+                            android:paddingTop="-10dp"
+                            android:src="@drawable/clock48"/>
 
                         <TextView
                             android:id="@+id/switch_name"
-                            style="@style/row_dash_name"
+                            style="@style/row_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="left"
                             android:gravity="left"
-                            android:paddingBottom="7dp"
-                            android:paddingLeft="10dp"
                             android:maxLines="2"
-                            android:text="Switch" />
+                            android:paddingLeft="10dp"
+                            android:paddingBottom="7dp"
+                            android:text="Switch"/>
 
                         <TextView
                             android:id="@+id/switch_battery_level"
-                            style="@style/row_dash_body1"
+                            style="@style/row_body1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="left"
                             android:gravity="left"
                             android:paddingLeft="10dp"
-                            android:text="@string/battery_level" />
+                            android:text="@string/battery_level"/>
 
                         <TextView
                             android:id="@+id/switch_signal_level"
-                            style="@style/row_dash_body2"
+                            style="@style/row_body2"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="left"
                             android:gravity="left"
                             android:paddingLeft="10dp"
-                            android:text="@string/signal_level" />
+                            android:text="@string/signal_level"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -124,69 +133,74 @@
                             android:layout_width="72dp"
                             android:layout_height="73dp"
                             plainpie:inner_pie_padding="10"
+                            plainpie:inner_text_visibility="true"
                             plainpie:percentage="75"
-                            plainpie:percentage_size="15"
-                            plainpie:inner_text_visibility="true"/>
+                            plainpie:percentage_size="15"/>
 
                         <Switch
                             android:id="@+id/switch_button"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true" />
+                            android:layout_centerVertical="true"/>
 
-                        <Button
+                        <android.support.design.button.MaterialButton
                             android:id="@+id/on_button"
+                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                             android:layout_width="60dp"
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
-                            android:background="@drawable/button_status"
                             android:text="@string/button_state_on"
-                            android:textSize="10dp" />
+                            android:textSize="10dp"/>
 
-                        <Button
+                        <android.support.design.button.MaterialButton
                             android:id="@+id/off_button"
+                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                             android:layout_width="60dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="7dp"
                             android:layout_weight="1"
-                            android:background="@drawable/button_status"
                             android:text="@string/button_state_off"
-                            android:textSize="10dp" />
+                            android:textSize="10dp"/>
 
-                        <Button
+                        <android.support.design.button.MaterialButton
                             android:id="@+id/set_button"
+                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                             android:layout_width="56dp"
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
                             android:layout_gravity="right"
-                            android:background="@drawable/button_status"
                             android:text="@string/set_temperature"
-                            android:textSize="10dp" />
+                            android:textSize="10dp"/>
 
-                        <ImageButton
+                        <ImageView
                             android:id="@+id/switch_button_up"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@drawable/ic_arrow_up"
-                            android:textSize="10dp" />
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_margin="7dp"
+                            android:layout_marginTop="10dp"
+                            android:src="@drawable/baseline_keyboard_arrow_up_black_24"
+                            android:tint="@color/primary"/>
 
-                        <ImageButton
+                        <ImageView
                             android:id="@+id/switch_button_stop"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@drawable/ic_stop"
-                            android:textSize="10dp" />
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_margin="7dp"
+                            android:layout_marginTop="10dp"
+                            android:src="@drawable/baseline_stop_black_24"
+                            android:tint="@color/primary"/>
 
-                        <ImageButton
+                        <ImageView
                             android:id="@+id/switch_button_down"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@drawable/ic_arrow_down"
-                            android:textSize="10dp" />
-
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_margin="7dp"
+                            android:layout_marginTop="10dp"
+                            android:src="@drawable/baseline_keyboard_arrow_down_black_24"
+                            android:tint="@color/primary"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -205,45 +219,45 @@
                             android:layout_height="22dp"
                             android:layout_gravity="right"
                             android:layout_marginRight="6dp"
-                            android:text="55%" />
+                            android:text="55%"/>
 
                         <SeekBar
                             android:id="@+id/switch_dimmer"
                             android:layout_width="129dp"
                             android:layout_height="wrap_content"
                             android:layout_gravity="bottom"
-                            android:minWidth="150dp" />
+                            android:minWidth="150dp"/>
 
                         <Spinner
                             android:id="@+id/spSelector"
                             android:layout_width="129dp"
                             android:layout_height="wrap_content"
                             android:layout_gravity="bottom"
-                            android:minWidth="150dp" />
+                            android:minWidth="150dp"/>
 
                         <Switch
                             android:id="@+id/switch_dimmer_switch"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="right" />
+                            android:layout_gravity="right"/>
 
-                        <Button
+                        <android.support.design.button.MaterialButton
                             android:id="@+id/color_button"
+                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                             android:layout_width="wrap_content"
-                            android:layout_height="25dp"
+                            android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
                             android:layout_gravity="right"
-                            android:layout_marginBottom="5dp"
                             android:layout_marginTop="5dp"
-                            android:background="@drawable/button_status"
+                            android:layout_marginBottom="5dp"
                             android:text="@string/button_color"
-                            android:textSize="10dp" />
+                            android:textSize="10dp"/>
                     </LinearLayout>
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>
 
-        <include layout="@layout/log_timer_button_row_default" />
+        <include layout="@layout/log_timer_button_row_default"/>
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dashboard_row_default.xml b/app/src/main/res/layout/dashboard_row_default.xml
index 1cd2765c8..54f579a83 100644
--- a/app/src/main/res/layout/dashboard_row_default.xml
+++ b/app/src/main/res/layout/dashboard_row_default.xml
@@ -21,11 +21,11 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/row_global_wrapper"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@+id/row_global_wrapper"
+              style="@style/background_listview"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/row_wrapper"
@@ -35,10 +35,18 @@
         android:longClickable="true"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:orientation="horizontal"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight">
+
+        <ImageView
+            android:id="@+id/widget_info_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|start"
+            android:src="@drawable/outline_info_black_18"
+            android:tint="@color/md_grey_300"/>
 
         <ImageView
             android:id="@+id/rowIcon"
@@ -47,7 +55,7 @@
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/error_image_description"
             android:paddingRight="5dp"
-            android:src="@drawable/clock48" />
+            android:src="@drawable/clock48"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -59,17 +67,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
-                tools:text="Switch name" />
+                tools:text="Switch name"/>
 
             <TextView
                 android:id="@+id/switch_battery_level"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/switch_name"
-                android:text="@string/battery_level" />
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:text="@string/battery_level"/>
 
             <TextView
                 android:id="@+id/switch_signal_level"
@@ -77,7 +85,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/switch_battery_level"
-                android:text="@string/signal_level" />
+                android:text="@string/signal_level"/>
 
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/dashboard_row_list.xml b/app/src/main/res/layout/dashboard_row_list.xml
index 963251e30..17f8fac55 100644
--- a/app/src/main/res/layout/dashboard_row_list.xml
+++ b/app/src/main/res/layout/dashboard_row_list.xml
@@ -19,31 +19,27 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/material_grey_300_"
-    android:clickable="true"
-    android:descendantFocusability="blocksDescendants"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/row_global_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/material_grey_300_"
-        android:orientation="vertical">
+                  android:id="@+id/row_global_wrapper"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:background="@color/material_grey_300_"
+                  android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/row_wrapper"
@@ -53,14 +49,22 @@
             android:orientation="horizontal"
             android:padding="10dp">
 
+            <ImageView
+                android:id="@+id/widget_info_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|start"
+                android:src="@drawable/outline_info_black_18"
+                android:tint="@color/md_grey_300"/>
+
             <ImageView
                 android:id="@+id/rowIcon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:contentDescription="Icon"
+                android:contentDescription="@string/error_image_description"
                 android:paddingRight="5dp"
-                android:src="@drawable/clock48" />
+                android:src="@drawable/clock48"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -71,219 +75,224 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                <RelativeLayout
-                    android:id="@+id/RelativeLayoutContentWrapper"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <LinearLayout
+                    <RelativeLayout
+                        android:id="@+id/RelativeLayoutContentWrapper"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_toLeftOf="@+id/linearLayout7864"
-                        android:layout_toStartOf="@+id/linearLayout7864"
-                        android:gravity="center_vertical"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/switch_name"
-                            style="@style/row_name"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentTop="true"
-                            android:layout_marginRight="35dp"
-                            android:text="Switch" />
+                        android:layout_height="wrap_content">
 
-                        <TextView
-                            android:id="@+id/switch_battery_level"
-                            style="@style/row_body1"
-                            android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentLeft="true"
-                            android:layout_alignParentStart="true"
-                            android:layout_below="@+id/switch_name"
-                            android:layout_toLeftOf="@+id/linearLayout4"
-                            android:layout_toStartOf="@+id/linearLayout4"
+                            android:layout_centerVertical="true"
+                            android:layout_toStartOf="@+id/linearLayout7864"
+                            android:layout_toLeftOf="@+id/linearLayout7864"
                             android:gravity="center_vertical"
-                            android:text="@string/battery_level" />
-
-                        <TextView
-                            android:id="@+id/switch_signal_level"
-                            style="@style/row_body2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@id/switch_battery_level"
-                            android:text="@string/signal_level" />
-                    </LinearLayout>
+                            android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/linearLayout4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:gravity="center_vertical"
-                        android:orientation="vertical">
-
-                        <Switch
-                            android:id="@+id/switch_button"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true" />
+                            <TextView
+                                android:id="@+id/switch_name"
+                                style="@style/row_name"
+                                android:layout_width="fill_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentTop="true"
+                                android:layout_marginRight="35dp"
+                                android:text="Switch"/>
 
-                        <Button
-                            android:id="@+id/set_button"
-                            android:layout_width="56dp"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_gravity="right"
-                            android:background="@drawable/button_status"
-                            android:text="@string/set_temperature"
-                            android:textSize="10dp" />
-                    </LinearLayout>
+                            <TextView
+                                android:id="@+id/switch_battery_level"
+                                style="@style/row_body1"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@+id/switch_name"
+                                android:layout_alignParentStart="true"
+                                android:layout_alignParentLeft="true"
+                                android:layout_toStartOf="@+id/linearLayout4"
+                                android:layout_toLeftOf="@+id/linearLayout4"
+                                android:gravity="center_vertical"
+                                android:text="@string/battery_level"/>
 
-                    <LinearLayout
-                        android:id="@+id/linearLayout7864"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:gravity="center_vertical"
-                        android:orientation="vertical">
+                            <TextView
+                                android:id="@+id/switch_signal_level"
+                                style="@style/row_body2"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@id/switch_battery_level"
+                                android:text="@string/signal_level"/>
+                        </LinearLayout>
 
                         <LinearLayout
-                            android:id="@+id/linearLayoutt"
+                            android:id="@+id/linearLayout4"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
                             android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <ImageButton
-                                android:id="@+id/switch_button_up"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@drawable/ic_arrow_up"
-                                android:textSize="10dp" />
+                            android:orientation="vertical">
 
-                            <ImageButton
-                                android:id="@+id/switch_button_stop"
+                            <Switch
+                                android:id="@+id/switch_button"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:src="@drawable/ic_stop"
-                                android:textSize="10dp" />
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"/>
 
-                            <ImageButton
-                                android:id="@+id/switch_button_down"
-                                android:layout_width="wrap_content"
+                            <android.support.design.button.MaterialButton
+                                android:id="@+id/set_button"
+                                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                android:layout_width="56dp"
                                 android:layout_height="wrap_content"
-                                android:src="@drawable/ic_arrow_down"
-                                android:textSize="10dp" />
-
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_gravity="right"
+                                android:text="@string/set_temperature"
+                                android:textSize="10dp"/>
                         </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/switch_dimmer_level"
-                            android:layout_width="wrap_content"
-                            android:layout_height="22dp"
-                            android:layout_gravity="right"
-                            android:layout_marginRight="6dp"
-                            android:text="55%" />
-
-                        <Spinner
-                            android:id="@+id/spSelector"
-                            android:layout_width="129dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="bottom"
-                            android:minWidth="150dp" />
-
                         <LinearLayout
-                            android:id="@+id/linearLayout44"
+                            android:id="@+id/linearLayout7864"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginTop="10dp"
                             android:gravity="center_vertical"
-                            android:orientation="horizontal">
+                            android:orientation="vertical">
 
-                            <az.plainpie.PieView
-                                xmlns:plainpie="http://schemas.android.com/apk/res-auto"
-                                android:id="@+id/pieView"
-                                android:layout_width="72dp"
-                                android:layout_height="73dp"
-                                plainpie:inner_pie_padding="10"
-                                android:visibility="gone"
-                                plainpie:percentage="75"
-                                plainpie:percentage_size="15"
-                                plainpie:inner_text_visibility="true"/>
-
-                            <Button
-                                android:id="@+id/on_button"
-                                android:layout_width="60dp"
+                            <LinearLayout
+                                android:id="@+id/linearLayoutt"
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
                                 android:layout_alignParentRight="true"
                                 android:layout_centerVertical="true"
-                                android:background="@drawable/button_status"
-                                android:text="@string/button_state_on"
-                                android:textSize="10dp" />
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <ImageView
+                                    android:id="@+id/switch_button_up"
+                                    android:layout_width="25dp"
+                                    android:layout_height="25dp"
+                                    android:layout_margin="7dp"
+                                    android:layout_marginTop="10dp"
+                                    android:src="@drawable/baseline_keyboard_arrow_up_black_24"
+                                    android:tint="@color/primary"/>
+
+                                <ImageView
+                                    android:id="@+id/switch_button_stop"
+                                    android:layout_width="25dp"
+                                    android:layout_height="25dp"
+                                    android:layout_margin="7dp"
+                                    android:layout_marginTop="10dp"
+                                    android:src="@drawable/baseline_stop_black_24"
+                                    android:tint="@color/primary"/>
+
+                                <ImageView
+                                    android:id="@+id/switch_button_down"
+                                    android:layout_width="25dp"
+                                    android:layout_height="25dp"
+                                    android:layout_margin="7dp"
+                                    android:layout_marginTop="10dp"
+                                    android:src="@drawable/baseline_keyboard_arrow_down_black_24"
+                                    android:tint="@color/primary"/>
+                            </LinearLayout>
 
-                            <Button
-                                android:id="@+id/off_button"
-                                android:layout_width="60dp"
+                            <TextView
+                                android:id="@+id/switch_dimmer_level"
+                                android:layout_width="wrap_content"
+                                android:layout_height="22dp"
+                                android:layout_gravity="right"
+                                android:layout_marginRight="6dp"
+                                android:text="55%"/>
+
+                            <Spinner
+                                android:id="@+id/spSelector"
+                                android:layout_width="129dp"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="7dp"
-                                android:layout_weight="1"
-                                android:background="@drawable/button_status"
-                                android:text="@string/button_state_off"
-                                android:textSize="10dp" />
+                                android:layout_gravity="bottom"
+                                android:minWidth="150dp"/>
 
-                            <Switch
-                                android:id="@+id/switch_dimmer_switch"
+                            <LinearLayout
+                                android:id="@+id/linearLayout44"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_gravity="right" />
-                        </LinearLayout>
+                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginBottom="10dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
 
-                        <Button
-                            android:id="@+id/color_button"
-                            android:layout_width="wrap_content"
-                            android:layout_height="25dp"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_gravity="right"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="5dp"
-                            android:background="@drawable/button_status"
-                            android:text="@string/button_color"
-                            android:textSize="10dp" />
-                    </LinearLayout>
-                </RelativeLayout>
+                                <az.plainpie.PieView
+                                    xmlns:plainpie="http://schemas.android.com/apk/res-auto"
+                                    android:id="@+id/pieView"
+                                    android:layout_width="72dp"
+                                    android:layout_height="73dp"
+                                    android:visibility="gone"
+                                    plainpie:inner_pie_padding="10"
+                                    plainpie:inner_text_visibility="true"
+                                    plainpie:percentage="75"
+                                    plainpie:percentage_size="15"/>
+
+                                <android.support.design.button.MaterialButton
+                                    android:id="@+id/on_button"
+                                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                    android:layout_width="60dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:text="@string/button_state_on"
+                                    android:textSize="10dp"/>
+
+                                <android.support.design.button.MaterialButton
+                                    android:id="@+id/off_button"
+                                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                    android:layout_width="60dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="7dp"
+                                    android:layout_weight="1"
+                                    android:text="@string/button_state_off"
+                                    android:textSize="10dp"/>
+
+                                <Switch
+                                    android:id="@+id/switch_dimmer_switch"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="right"/>
+                            </LinearLayout>
+
+                            <android.support.design.button.MaterialButton
+                                android:id="@+id/color_button"
+                                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_gravity="right"
+                                android:layout_marginTop="5dp"
+                                android:layout_marginBottom="5dp"
+                                android:text="@string/button_color"
+                                android:textSize="10dp"/>
+                        </LinearLayout>
+                    </RelativeLayout>
 
                     <SeekBar
                         android:id="@+id/switch_dimmer"
                         android:layout_width="129dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
                         android:layout_below="@+id/RelativeLayoutContentWrapper"
-                        android:paddingTop="15dp"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true" />
+                        android:layout_gravity="bottom"
+                        android:paddingTop="15dp"/>
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>
 
-        <include layout="@layout/log_timer_button_row_default" />
+        <include layout="@layout/log_timer_button_row_default"/>
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/default_layout.xml b/app/src/main/res/layout/default_layout.xml
index 9cd5d5564..7b37212ab 100644
--- a/app/src/main/res/layout/default_layout.xml
+++ b/app/src/main/res/layout/default_layout.xml
@@ -20,13 +20,12 @@
   ~  under the License.
   -->
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinatorLayout"
-    style="@style/background_recyclerview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:id="@+id/coordinatorLayout"
+                                                 style="@style/background_recyclerview"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent"
+                                                 tools:context=".MainActivity">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -44,13 +43,13 @@
                 style="@style/debug_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/debug_textview_title" />
+                android:text="@string/debug_textview_title"/>
 
             <TextView
                 android:id="@+id/debugText"
                 style="@style/debug_text"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"/>
         </LinearLayout>
 
         <android.support.v4.widget.SwipeRefreshLayout
@@ -67,10 +66,10 @@
                 android:animationCache="false"
                 android:divider="@android:color/transparent"
                 android:dividerHeight="@dimen/row_space"
-                android:paddingBottom="@dimen/row_space"
                 android:paddingTop="@dimen/row_space"
+                android:paddingBottom="@dimen/row_space"
                 android:scrollingCache="false"
-                android:smoothScrollbar="true" />
+                android:smoothScrollbar="true"/>
 
         </android.support.v4.widget.SwipeRefreshLayout>
 
@@ -87,7 +86,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:contentDescription="@string/error_image_description"
-                android:src="@drawable/sad_smiley" />
+                android:src="@drawable/sad_smiley"/>
 
             <TextView
                 android:id="@+id/errorTextOops"
@@ -97,7 +96,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="50dp"
                 android:text="@string/oops"
-                android:textSize="@dimen/text_size_large" />
+                android:textSize="@dimen/text_size_large"/>
 
             <TextView
                 android:id="@+id/errorTextWrong"
@@ -107,7 +106,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="25dp"
                 android:text="@string/something_went_wrong"
-                android:textSize="@dimen/text_size_medium" />
+                android:textSize="@dimen/text_size_medium"/>
 
             <TextView
                 android:id="@+id/errorTextMessage"
@@ -118,7 +117,7 @@
                 android:layout_marginTop="5dp"
                 android:text="@string/no_network_available"
                 android:textColor="@color/light_gray"
-                android:textSize="@dimen/text_size_small" />
+                android:textSize="@dimen/text_size_small"/>
         </RelativeLayout>
     </LinearLayout>
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_fingerprint_password.xml b/app/src/main/res/layout/dialog_fingerprint_password.xml
index 0fc36ccf3..7fa76d452 100644
--- a/app/src/main/res/layout/dialog_fingerprint_password.xml
+++ b/app/src/main/res/layout/dialog_fingerprint_password.xml
@@ -21,21 +21,21 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <EditText
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:hint="@string/welcome_remote_server_password"
             android:inputType="textNoSuggestions"
-            android:textColor="@color/default_text_color_light"
-            android:hint="@string/welcome_remote_server_password" />
+            android:textColor="@color/default_text_color_light"/>
     </android.support.design.widget.TextInputLayout>
 
     <CheckBox
@@ -45,5 +45,5 @@
         android:layout_marginTop="10dp"
         android:text="@string/show_password"
         android:textColor="@color/default_text_color_light"
-        android:textSize="@dimen/text_size_small" />
+        android:textSize="@dimen/text_size_small"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_graph.xml b/app/src/main/res/layout/dialog_graph.xml
index 7de41f3ea..8e10d15f4 100644
--- a/app/src/main/res/layout/dialog_graph.xml
+++ b/app/src/main/res/layout/dialog_graph.xml
@@ -21,23 +21,23 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
     <com.github.mikephil.charting.charts.LineChart
         android:id="@+id/chart"
-        android:padding="10dp"
-        android:layout_margin="10dp"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_margin="10dp"
+        android:padding="10dp"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
         android:gravity="end"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/temperature"
                 android:textColor="@color/md_material_blue_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_set_point"
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/set_point"
                 android:textColor="@color/material_pink_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_humidity"
@@ -67,7 +67,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/humidity"
                 android:textColor="@color/material_orange_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_barometer"
@@ -75,7 +75,7 @@
                 android:layout_height="wrap_content"
                 android:text="Barometer"
                 android:textColor="@color/material_green_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_counter"
@@ -83,7 +83,7 @@
                 android:layout_height="wrap_content"
                 android:text="Counter"
                 android:textColor="@color/material_indigo_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_powerusage"
@@ -91,7 +91,7 @@
                 android:layout_height="wrap_content"
                 android:text="Power Usage"
                 android:textColor="@color/material_yellow_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_powerdeliv"
@@ -99,7 +99,7 @@
                 android:layout_height="wrap_content"
                 android:text="Power Delivery"
                 android:textColor="@color/material_deep_purple_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_percentage"
@@ -107,7 +107,7 @@
                 android:layout_height="wrap_content"
                 android:text="Value"
                 android:textColor="@color/material_yellow_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_percentage2"
@@ -115,7 +115,7 @@
                 android:layout_height="wrap_content"
                 android:text="Value 2"
                 android:textColor="@color/material_orange_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_direction"
@@ -123,7 +123,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/direction"
                 android:textColor="@color/material_deep_teal_500"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_sunpower"
@@ -131,7 +131,7 @@
                 android:layout_height="wrap_content"
                 android:text="Sunpower"
                 android:textColor="@color/material_deep_purple_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_speed"
@@ -139,7 +139,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/speed"
                 android:textColor="@color/material_amber_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_usage"
@@ -147,7 +147,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/usage"
                 android:textColor="@color/material_orange_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/legend_rain"
@@ -155,56 +155,63 @@
                 android:layout_height="wrap_content"
                 android:text="@string/rain"
                 android:textColor="@color/material_light_green_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
+
             <TextView
                 android:id="@+id/legend_co2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/co2"
                 android:textColor="@color/material_blue_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
+
             <TextView
                 android:id="@+id/legend_co2min"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/co2min"
                 android:textColor="@color/material_light_green_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
+
             <TextView
                 android:id="@+id/legend_co2max"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/co2max"
                 android:textColor="@color/md_red_400"
-                android:visibility="gone" />
+                android:visibility="gone"/>
+
             <TextView
                 android:id="@+id/legend_Lux"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Lux"
                 android:textColor="@color/material_blue_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
+
             <TextView
                 android:id="@+id/legend_Luxmin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Luxmin"
                 android:textColor="@color/material_light_green_600"
-                android:visibility="gone" />
+                android:visibility="gone"/>
+
             <TextView
                 android:id="@+id/legend_Luxmax"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Luxmax"
                 android:textColor="@color/md_red_400"
-                android:visibility="gone" />
+                android:visibility="gone"/>
+
             <TextView
                 android:id="@+id/legend_LuxAvg"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/LuxAvg"
                 android:textColor="@color/md_yellow_400"
-                android:visibility="gone" />
+                android:visibility="gone"/>
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_location.xml b/app/src/main/res/layout/dialog_location.xml
index 448a5aba1..5f423ff91 100644
--- a/app/src/main/res/layout/dialog_location.xml
+++ b/app/src/main/res/layout/dialog_location.xml
@@ -21,35 +21,36 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <EditText
             android:id="@+id/name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:hint="@string/Location_name"
             android:inputType="textNoSuggestions"
-            android:textColor="@color/default_text_color_light"
-            android:hint="@string/Location_name" />
+            android:textColor="@color/default_text_color_light"/>
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <EditText
             android:id="@+id/address"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
+            android:hint="@string/locationAddress"
             android:inputType="textNoSuggestions"
-            android:textColor="@color/default_text_color_light"
-            android:hint="@string/locationAddress" />
+            android:textColor="@color/default_text_color_light"/>
     </android.support.design.widget.TextInputLayout>
 
     <LinearLayout
@@ -62,26 +63,29 @@
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
+
             <EditText
                 android:id="@+id/latitude"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
+                android:hint="@string/latitude"
                 android:inputType="textNoSuggestions|number"
-                android:textColor="@color/default_text_color_light"
-                android:hint="@string/latitude" />
+                android:textColor="@color/default_text_color_light"/>
         </android.support.design.widget.TextInputLayout>
+
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
+
             <EditText
                 android:id="@+id/longitude"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
+                android:hint="@string/longitude"
                 android:inputType="textNoSuggestions|number"
-                android:textColor="@color/default_text_color_light"
-                android:hint="@string/longitude" />
+                android:textColor="@color/default_text_color_light"/>
         </android.support.design.widget.TextInputLayout>
 
     </LinearLayout>
@@ -89,11 +93,11 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="30dp"
         android:layout_marginTop="10dp"
+        android:layout_marginBottom="30dp"
         android:orientation="horizontal">
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/get_address"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -101,17 +105,17 @@
             android:layout_marginRight="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status"
-            android:text="@string/getLocation" />
+            android:text="@string/getLocation"/>
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/edit_mode_button"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status"
-            android:text="@string/manual" />
+            android:text="@string/manual"/>
     </LinearLayout>
 
     <LinearLayout
@@ -132,18 +136,19 @@
                 android:labelFor="@+id/radius"
                 android:paddingBottom="20dp"
                 android:text="@string/radius"
-                android:textSize="@dimen/text_size_large" />
+                android:textSize="@dimen/text_size_large"/>
 
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
+
                 <EditText
                     android:id="@+id/radius"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/radius"
                     android:inputType="number"
-                    android:textColor="@color/default_text_color_light"
-                    android:hint="@string/radius" />
+                    android:textColor="@color/default_text_color_light"/>
             </android.support.design.widget.TextInputLayout>
 
         </LinearLayout>
@@ -151,8 +156,8 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -161,7 +166,7 @@
                 android:layout_height="wrap_content"
                 android:paddingBottom="20dp"
                 android:text="@string/locationAddress"
-                android:textSize="@dimen/text_size_large" />
+                android:textSize="@dimen/text_size_large"/>
 
             <TextView
                 android:id="@+id/resolvedAddress"
@@ -170,7 +175,7 @@
                 android:layout_height="wrap_content"
                 android:padding="2dp"
                 android:singleLine="false"
-                tools:text="Address 1, Ohio" />
+                tools:text="Address 1, Ohio"/>
 
             <TextView
                 android:id="@+id/resolvedCountry"
@@ -178,7 +183,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="2dp"
-                tools:text="America" />
+                tools:text="America"/>
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index 1d4475719..0efbd4f49 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -21,21 +21,21 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <EditText
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:hint="@string/welcome_remote_server_password"
             android:inputType="textPassword"
-            android:textColor="@color/default_text_color_light"
-            android:hint="@string/welcome_remote_server_password" />
+            android:textColor="@color/default_text_color_light"/>
     </android.support.design.widget.TextInputLayout>
 
     <CheckBox
@@ -45,5 +45,5 @@
         android:layout_marginTop="10dp"
         android:text="@string/show_password"
         android:textColor="@color/default_text_color_light"
-        android:textSize="@dimen/text_size_small" />
+        android:textSize="@dimen/text_size_small"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_scene_info.xml b/app/src/main/res/layout/dialog_scene_info.xml
index 63d98bfa2..4c5b6140e 100644
--- a/app/src/main/res/layout/dialog_scene_info.xml
+++ b/app/src/main/res/layout/dialog_scene_info.xml
@@ -21,10 +21,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -41,14 +41,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/idx" />
+                android:text="@string/idx"/>
 
             <TextView
                 android:id="@+id/LastSeen_title"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/last_update" />
+                android:text="@string/last_update"/>
         </LinearLayout>
 
         <LinearLayout
@@ -60,20 +60,20 @@
                 android:id="@+id/IDX_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
+                android:paddingTop="2dp"
                 android:paddingRight="2dp"
-                android:paddingTop="2dp" />
+                android:paddingBottom="2dp"/>
 
             <TextView
                 android:id="@+id/LastUpdate_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                tools:text="2015-05-01 01:01:01" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                tools:text="2015-05-01 01:01:01"/>
         </LinearLayout>
     </LinearLayout>
 
@@ -87,12 +87,12 @@
             android:layout_width="126dp"
             android:layout_height="wrap_content"
             android:padding="2dp"
-            android:text="@string/favorite" />
+            android:text="@string/favorite"/>
 
         <Switch
             android:id="@+id/favorite_switch"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"/>
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_security.xml b/app/src/main/res/layout/dialog_security.xml
index c6c36ce3a..cbf8acae9 100644
--- a/app/src/main/res/layout/dialog_security.xml
+++ b/app/src/main/res/layout/dialog_security.xml
@@ -21,10 +21,9 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -32,17 +31,18 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/input_securitypin"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toLeftOf="@+id/linearLayout5"
-                android:layout_toStartOf="@+id/linearLayout5">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@+id/linearLayout5"
+            android:layout_toLeftOf="@+id/linearLayout5">
+
             <EditText
                 android:id="@+id/securitypin"
-                android:inputType="number"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/default_text_color_light"
-                android:hint="@string/security_pin" />
+                android:hint="@string/security_pin"
+                android:inputType="number"
+                android:textColor="@color/default_text_color_light"/>
         </android.support.design.widget.TextInputLayout>
 
         <LinearLayout
@@ -50,45 +50,39 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"
             android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
             android:orientation="vertical">
 
-            <Button
+            <android.support.design.button.MaterialButton
                 android:id="@+id/armhome"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:layout_marginTop="10dp"
                 android:layout_weight="1"
-                android:background="@drawable/button_status"
-                android:text="@string/security_arm_home"
-                android:textSize="12dp" />
+                android:text="@string/security_arm_home"/>
 
-            <Button
+            <android.support.design.button.MaterialButton
                 android:id="@+id/armaway"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:layout_marginTop="10dp"
                 android:layout_weight="1"
-                android:background="@drawable/button_status"
-                android:text="@string/security_arm_away"
-                android:textSize="12dp" />
+                android:text="@string/security_arm_away"/>
 
-            <Button
+            <android.support.design.button.MaterialButton
                 android:id="@+id/disarm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:layout_marginTop="10dp"
                 android:layout_weight="1"
-                android:background="@drawable/button_status"
-                android:text="@string/security_disarm"
-                android:textSize="12dp" />
+                android:text="@string/security_disarm"/>
         </LinearLayout>
 
         <LinearLayout
@@ -108,7 +102,7 @@
                 android:paddingBottom="20dp"
                 android:text=""
                 android:textColor="@color/material_red_400"
-                android:textSize="@dimen/text_size_medium" />
+                android:textSize="@dimen/text_size_medium"/>
         </LinearLayout>
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_switch_info.xml b/app/src/main/res/layout/dialog_switch_info.xml
index e27cf3b11..2899384d6 100644
--- a/app/src/main/res/layout/dialog_switch_info.xml
+++ b/app/src/main/res/layout/dialog_switch_info.xml
@@ -21,10 +21,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -41,28 +41,28 @@
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/idx" />
+                android:text="@string/idx"/>
 
             <TextView
                 android:id="@+id/LastUpdate_title"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/last_update" />
+                android:text="@string/last_update"/>
 
             <TextView
                 android:id="@+id/SignalLevel_title"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/signal_level" />
+                android:text="@string/signal_level"/>
 
             <TextView
                 android:id="@+id/BatteryLevel_title"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/battery_level" />
+                android:text="@string/battery_level"/>
         </LinearLayout>
 
         <LinearLayout
@@ -74,42 +74,42 @@
                 android:id="@+id/IDX_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
+                android:paddingTop="2dp"
                 android:paddingRight="2dp"
-                android:paddingTop="2dp" />
+                android:paddingBottom="2dp"/>
 
             <TextView
                 android:id="@+id/LastUpdate_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                tools:text="2015-05-01 01:01:01" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                tools:text="2015-05-01 01:01:01"/>
 
             <SeekBar
                 android:id="@+id/SignalLevel_indicator"
                 android:layout_width="160dp"
-                android:layout_height="32dp" />
+                android:layout_height="32dp"/>
 
             <TextView
                 android:id="@+id/BatteryLevel_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
                 android:text="@string/placeholder_value"
-                android:visibility="visible" />
+                android:visibility="visible"/>
 
             <SeekBar
                 android:id="@+id/BatteryLevel_indicator"
                 android:layout_width="160dp"
                 android:layout_height="32dp"
-                android:visibility="gone" />
+                android:visibility="gone"/>
         </LinearLayout>
     </LinearLayout>
 
@@ -123,12 +123,43 @@
             android:layout_width="126dp"
             android:layout_height="wrap_content"
             android:padding="2dp"
-            android:text="@string/favorite" />
+            android:text="@string/favorite"/>
 
         <Switch
             android:id="@+id/favorite_switch"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
+            android:layout_height="wrap_content"/>
     </LinearLayout>
+
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:id="@+id/color_light_options"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone">
+            <android.support.design.button.MaterialButton
+                android:id="@+id/full_button"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:text="@string/button_state_full_light"
+                android:textSize="10dp"/>
+
+            <android.support.design.button.MaterialButton
+                android:id="@+id/night_button"
+                android:layout_marginLeft="10dp"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:text="@string/button_state_night"
+                android:textSize="10dp"/>
+        </LinearLayout>
+    </HorizontalScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_switch_logs.xml b/app/src/main/res/layout/dialog_switch_logs.xml
index 4b180c0a9..62d3d0722 100644
--- a/app/src/main/res/layout/dialog_switch_logs.xml
+++ b/app/src/main/res/layout/dialog_switch_logs.xml
@@ -21,13 +21,13 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <ListView
         android:id="@+id/list"
         android:layout_width="match_parent"
-        android:layout_height="300dp" />
+        android:layout_height="300dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_switch_timer.xml b/app/src/main/res/layout/dialog_switch_timer.xml
index 4b180c0a9..62d3d0722 100644
--- a/app/src/main/res/layout/dialog_switch_timer.xml
+++ b/app/src/main/res/layout/dialog_switch_timer.xml
@@ -21,13 +21,13 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <ListView
         android:id="@+id/list"
         android:layout_width="match_parent"
-        android:layout_height="300dp" />
+        android:layout_height="300dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_temperature.xml b/app/src/main/res/layout/dialog_temperature.xml
index d5a722791..1525ab0f9 100644
--- a/app/src/main/res/layout/dialog_temperature.xml
+++ b/app/src/main/res/layout/dialog_temperature.xml
@@ -20,15 +20,15 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:seekarc="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin">
+              xmlns:seekarc="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingBottom="@dimen/activity_vertical_margin">
 
     <FrameLayout
         android:id="@+id/seekArcContainer"
@@ -45,13 +45,13 @@
             android:paddingRight="30dp"
             seekarc:arcColor="@color/material_red_400"
             seekarc:clockwise="true"
-            seekarc:progressMax="20"
-            seekarc:showClockface="false"
             seekarc:progressColor="@color/material_orange_600"
+            seekarc:progressMax="20"
             seekarc:rotation="180"
+            seekarc:showClockface="false"
             seekarc:startAngle="30"
             seekarc:sweepAngle="300"
-            seekarc:touchInside="true" />
+            seekarc:touchInside="true"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -66,7 +66,7 @@
                 android:layout_gravity="center"
                 android:layout_marginRight="5dp"
                 android:textSize="40sp"
-                tools:text="20,5" />
+                tools:text="20,5"/>
 
             <TextView
                 android:id="@+id/seekTempSign"
@@ -75,7 +75,7 @@
                 android:layout_gravity="center"
                 android:layout_marginLeft="5dp"
                 android:textSize="40sp"
-                tools:text="C" />
+                tools:text="C"/>
         </LinearLayout>
 
 
@@ -86,7 +86,7 @@
             android:layout_marginTop="70dp"
             android:orientation="horizontal">
 
-            <Button
+            <android.support.design.button.MaterialButton
                 android:id="@+id/min"
                 android:layout_width="60dp"
                 android:layout_height="wrap_content"
@@ -95,18 +95,18 @@
                 android:layout_weight="1"
                 android:background="@drawable/button_status"
                 android:text="-"
-                android:textSize="12sp" />
+                android:textSize="12sp"/>
 
-            <Button
+            <android.support.design.button.MaterialButton
                 android:id="@+id/plus"
                 android:layout_width="60dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:background="@drawable/button_status"
                 android:text="+"
-                android:textSize="12sp" />
+                android:textSize="12sp"/>
 
         </LinearLayout>
     </FrameLayout>
diff --git a/app/src/main/res/layout/dialog_text.xml b/app/src/main/res/layout/dialog_text.xml
index 17b33d319..8bf479d46 100644
--- a/app/src/main/res/layout/dialog_text.xml
+++ b/app/src/main/res/layout/dialog_text.xml
@@ -21,10 +21,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <TextView
         android:id="@+id/textDialog_text"
@@ -32,5 +32,5 @@
         android:layout_height="wrap_content"
         android:autoLink="all"
         android:padding="2dp"
-        tools:text="@string/welcome_info_domoticz" />
+        tools:text="@string/welcome_info_domoticz"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_utilities_info.xml b/app/src/main/res/layout/dialog_utilities_info.xml
index 2089d7eb7..0c5721154 100644
--- a/app/src/main/res/layout/dialog_utilities_info.xml
+++ b/app/src/main/res/layout/dialog_utilities_info.xml
@@ -21,10 +21,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -41,14 +41,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/idx" />
+                android:text="@string/idx"/>
 
             <TextView
                 android:id="@+id/LastUpdate_title"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/last_update" />
+                android:text="@string/last_update"/>
 
         </LinearLayout>
 
@@ -61,20 +61,20 @@
                 android:id="@+id/IDX_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
+                android:paddingTop="2dp"
                 android:paddingRight="2dp"
-                android:paddingTop="2dp" />
+                android:paddingBottom="2dp"/>
 
             <TextView
                 android:id="@+id/LastUpdate_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                tools:text="2015-05-01 01:01:01" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                tools:text="2015-05-01 01:01:01"/>
 
         </LinearLayout>
     </LinearLayout>
@@ -89,12 +89,12 @@
             android:layout_width="126dp"
             android:layout_height="wrap_content"
             android:padding="2dp"
-            android:text="@string/favorite" />
+            android:text="@string/favorite"/>
 
         <Switch
             android:id="@+id/favorite_switch"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"/>
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_weather.xml b/app/src/main/res/layout/dialog_weather.xml
index 199bc8c1a..d678347b8 100644
--- a/app/src/main/res/layout/dialog_weather.xml
+++ b/app/src/main/res/layout/dialog_weather.xml
@@ -21,10 +21,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -41,70 +41,70 @@
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/idx" />
+                android:text="@string/idx"/>
 
             <TextView
                 android:id="@+id/LastUpdate_title"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/last_update" />
+                android:text="@string/last_update"/>
 
             <TextView
                 android:id="@+id/weather_forcast"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/forecast" />
+                android:text="@string/forecast"/>
 
             <TextView
                 android:id="@+id/weather_humidity"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/humidity" />
+                android:text="@string/humidity"/>
 
             <TextView
                 android:id="@+id/weather_drewpoint"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/dewPoint" />
+                android:text="@string/dewPoint"/>
 
             <TextView
                 android:id="@+id/weather_temperature"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/temp" />
+                android:text="@string/temp"/>
 
             <TextView
                 android:id="@+id/weather_barometer"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/pressure" />
+                android:text="@string/pressure"/>
 
             <TextView
                 android:id="@+id/weather_chill"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/chill" />
+                android:text="@string/chill"/>
 
             <TextView
                 android:id="@+id/weather_direction"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/direction" />
+                android:text="@string/direction"/>
 
             <TextView
                 android:id="@+id/weather_speed"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
                 android:padding="2dp"
-                android:text="@string/speed" />
+                android:text="@string/speed"/>
 
         </LinearLayout>
 
@@ -117,100 +117,100 @@
                 android:id="@+id/IDX_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
+                android:paddingTop="2dp"
                 android:paddingRight="2dp"
-                android:paddingTop="2dp" />
+                android:paddingBottom="2dp"/>
 
             <TextView
                 android:id="@+id/LastUpdate_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                tools:text="2015-05-01 01:01:01" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                tools:text="2015-05-01 01:01:01"/>
 
             <TextView
                 android:id="@+id/weather_forcast_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                android:text="@string/forecast" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                android:text="@string/forecast"/>
 
             <TextView
                 android:id="@+id/weather_humidity_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                android:text="@string/humidity" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                android:text="@string/humidity"/>
 
             <TextView
                 android:id="@+id/weather_drewpoint_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                android:text="@string/dewPoint" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                android:text="@string/dewPoint"/>
 
             <TextView
                 android:id="@+id/weather_temperature_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                android:text="@string/temp" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                android:text="@string/temp"/>
 
             <TextView
                 android:id="@+id/weather_barometer_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                android:text="@string/pressure" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                android:text="@string/pressure"/>
 
             <TextView
                 android:id="@+id/weather_chill_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                android:text="@string/chill" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                android:text="@string/chill"/>
 
             <TextView
                 android:id="@+id/weather_direction_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                android:text="@string/direction" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                android:text="@string/direction"/>
 
             <TextView
                 android:id="@+id/weather_speed_value"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
-                android:paddingBottom="2dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="2dp"
                 android:paddingTop="2dp"
-                android:text="@string/speed" />
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp"
+                android:text="@string/speed"/>
 
         </LinearLayout>
     </LinearLayout>
@@ -225,12 +225,12 @@
             android:layout_width="126dp"
             android:layout_height="wrap_content"
             android:padding="2dp"
-            android:text="@string/favorite" />
+            android:text="@string/favorite"/>
 
         <Switch
             android:id="@+id/favorite_switch"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"/>
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_color.xml b/app/src/main/res/layout/dialog_wwcolor.xml
similarity index 57%
rename from app/src/main/res/layout/dialog_color.xml
rename to app/src/main/res/layout/dialog_wwcolor.xml
index 2863225f6..2796648ce 100644
--- a/app/src/main/res/layout/dialog_color.xml
+++ b/app/src/main/res/layout/dialog_wwcolor.xml
@@ -19,20 +19,25 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
-    <com.larswerkman.lobsterpicker.LobsterPicker
-        android:id="@+id/lobsterpicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:background="@drawable/wwslider">
 
-    <com.larswerkman.lobsterpicker.sliders.LobsterShadeSlider
-        android:id="@+id/shadeslider"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        <SeekBar
+            android:id="@+id/kelvinBar"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="center_vertical"
+            android:max="100"
+            android:min="0"
+            android:padding="16dp"
+            android:progress="50"/>
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/event_row_default.xml b/app/src/main/res/layout/event_row_default.xml
index ad42602ba..36fe772d4 100644
--- a/app/src/main/res/layout/event_row_default.xml
+++ b/app/src/main/res/layout/event_row_default.xml
@@ -19,72 +19,77 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/material_grey_300_"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:padding="10dp"
-    android:paddingLeft="20dp"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/row_global_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/material_grey_300_">
 
-        <RelativeLayout
+        <LinearLayout
             android:id="@+id/row_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
             android:minHeight="50dp"
             android:orientation="horizontal"
-            android:padding="10dp">
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
 
             <ImageView
                 android:id="@+id/rowIcon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
                 android:layout_gravity="center_vertical"
                 android:paddingRight="5dp"
-                android:src="@drawable/clock48" />
+                android:src="@drawable/clock48"/>
 
-            <TextView
-                android:id="@+id/logs_name"
-                style="@style/row_name_small"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_toRightOf="@id/rowIcon"
-                tools:text="Event name" />
+                android:layout_weight="0.45">
 
-            <TextView
-                android:id="@+id/logs_message"
-                style="@style/row_body1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/logs_name"
-                android:layout_toRightOf="@id/rowIcon"
-                tools:text="Value: " />
+                <TextView
+                    android:id="@+id/logs_name"
+                    style="@style/row_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    tools:text="Utility name"/>
+
+                <TextView
+                    android:id="@+id/logs_message"
+                    style="@style/row_body1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/logs_name"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"/>
+            </RelativeLayout>
 
             <Switch
                 android:id="@+id/switch_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true" />
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"/>
 
-        </RelativeLayout>
-    </RelativeLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+        </LinearLayout>
+    </LinearLayout>
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add_server.xml b/app/src/main/res/layout/fragment_add_server.xml
index 0cea94812..e9febb608 100644
--- a/app/src/main/res/layout/fragment_add_server.xml
+++ b/app/src/main/res/layout/fragment_add_server.xml
@@ -18,16 +18,14 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/welcome_top_margin"
-    android:windowSoftInputMode="adjustPan">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/welcome_top_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:windowSoftInputMode="adjustPan">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -36,15 +34,18 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/input_server_name_input"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <EditText
+
+            <android.support.design.widget.TextInputEditText
                 android:id="@+id/server_name_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:hint="@string/servername"
                 android:inputType="text|textEmailAddress"
-                android:textColor="@color/default_text_color_light"
-                android:hint="@string/servername" />
+                android:textColor="@color/default_text_color_light"/>
         </android.support.design.widget.TextInputLayout>
 
         <TextView
@@ -55,19 +56,22 @@
             android:text="@string/welcome_server_settings_title"
             android:textColor="@color/default_text_color_light"
             android:textSize="@dimen/text_size_welcomePage3_serverSettings_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
-            android:layout_marginTop="15dp"
-            android:layout_height="wrap_content">
-            <EditText
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp">
+
+            <android.support.design.widget.TextInputEditText
                 android:id="@+id/remote_server_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:hint="@string/welcome_remote_server_address"
                 android:inputType="textNoSuggestions"
-                android:textColor="@color/default_text_color_light"
-                android:hint="@string/welcome_remote_server_address" />
+                android:textColor="@color/default_text_color_light"/>
         </android.support.design.widget.TextInputLayout>
 
         <TableLayout
@@ -75,28 +79,34 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
             android:stretchColumns="1">
+
             <TableRow
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content">
-                    <Spinner
-                        android:id="@+id/remote_protocol_spinner"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:paddingTop="3dp"
-                        android:spinnerMode="dropdown" />
+
+                <Spinner
+                    android:id="@+id/remote_protocol_spinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:paddingTop="3dp"
+                    android:spinnerMode="dropdown"/>
+
                 <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="15dp"
-                    android:layout_weight="0"
-                    android:layout_height="wrap_content">
-                    <EditText
+                    android:layout_weight="0">
+
+                    <android.support.design.widget.TextInputEditText
                         android:id="@+id/remote_port_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:hint="@string/welcome_remote_server_port"
                         android:inputType="numberSigned"
-                        android:textColor="@color/default_text_color_light"
-                        android:hint="@string/welcome_remote_server_port" />
+                        android:textColor="@color/default_text_color_light"/>
                 </android.support.design.widget.TextInputLayout>
             </TableRow>
         </TableLayout>
@@ -106,33 +116,41 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
             android:orientation="horizontal">
+
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:minWidth="@dimen/width_min_welcomePage3_username_input">
-                <EditText
+
+                <android.support.design.widget.TextInputEditText
                     android:id="@+id/remote_username_input"
-                    android:inputType="textNoSuggestions"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/welcome_remote_server_username"
+                    android:inputType="textNoSuggestions"
                     android:paddingRight="15dp"
-                    android:textColor="@color/default_text_color_light"
-                    android:hint="@string/welcome_remote_server_username" />
+                    android:textColor="@color/default_text_color_light"/>
             </android.support.design.widget.TextInputLayout>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
                 android:layout_weight="1">
-                <EditText
+
+                <android.support.design.widget.TextInputEditText
                     android:id="@+id/remote_password_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/welcome_remote_server_password"
                     android:inputType="textPassword"
                     android:paddingRight="15dp"
-                    android:textColor="@color/default_text_color_light"
-                    android:hint="@string/welcome_remote_server_password" />
+                    android:textColor="@color/default_text_color_light"/>
             </android.support.design.widget.TextInputLayout>
         </LinearLayout>
 
@@ -144,237 +162,210 @@
             android:layout_marginTop="10dp"
             android:text="@string/show_password"
             android:textColor="@color/default_text_color_light"
-            android:textSize="@dimen/text_size_small" />
+            android:textSize="@dimen/text_size_small"/>
+
+        <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/remote_directory_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/welcome_remote_server_directory"
+                android:inputType="textNoSuggestions"
+                android:textColor="@color/default_text_color_light"/>
+        </android.support.design.widget.TextInputLayout>
 
         <TextView
-            android:id="@+id/advancedSettings_label"
+            android:id="@+id/local_server_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
-            android:text="@string/welcome_advancedSettings"
+            android:text="@string/welcome_local_server_used_switch_title"
             android:textColor="@color/default_text_color_light"
-            android:textSize="@dimen/text_size_large" />
+            android:textSize="@dimen/text_size_large"/>
 
         <TextView
-            android:id="@+id/advancedSettings_summary"
+            android:id="@+id/local_server_summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
-            android:text="@string/welcome_advancedSettings_summary"
-            android:textColor="@color/default_text_color_light" />
+            android:text="@string/welcome_local_server_used_switch_summary"
+            android:textColor="@color/default_text_color_light"/>
 
         <Switch
-            android:id="@+id/advancedSettings_switch"
+            android:id="@+id/localServer_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:checked="false" />
+            android:layout_marginTop="2dp"
+            android:checked="false"/>
 
         <LinearLayout
-            android:id="@+id/advancedSettings_layout"
+            android:id="@+id/local_server_settings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="15dp"
             android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/local_ssid_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp"
+                android:text="@string/welcome_local_server_ssid"
+                android:textColor="@color/default_text_color_light"
+                android:textSize="@dimen/text_size_large"/>
+
+            <nl.hnogames.domoticz.UI.MultiSelectionSpinner
+                android:id="@+id/local_wifi"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/welcome_ssid_spinner_prompt"/>
+
+            <android.support.design.button.MaterialButton
+                android:id="@+id/set_ssid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="right"
+                android:layout_marginTop="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/button_status_dark"
+                android:text="@string/add"
+                android:textSize="10dp"/>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <EditText
-                    android:id="@+id/remote_directory_input"
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/local_server_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:hint="@string/welcome_local_server_address"
                     android:inputType="textNoSuggestions"
-                    android:textColor="@color/default_text_color_light"
-                    android:hint="@string/welcome_remote_server_directory" />
+                    android:textColor="@color/default_text_color_light"/>
             </android.support.design.widget.TextInputLayout>
 
-            <TextView
-                android:id="@+id/startScreen_title"
-                android:layout_width="wrap_content"
+            <TableLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:text="@string/welcome_server_startScreen"
-                android:textColor="@color/default_text_color_light"
-                android:textSize="@dimen/text_size_large" />
+                android:stretchColumns="1">
 
-            <Spinner
-                android:id="@+id/startScreen_spinner"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:spinnerMode="dropdown" />
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/local_server_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:text="@string/welcome_local_server_used_switch_title"
-                android:textColor="@color/default_text_color_light"
-                android:textSize="@dimen/text_size_large" />
+                    <Spinner
+                        android:id="@+id/local_protocol_spinner"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        android:paddingTop="3dp"
+                        android:spinnerMode="dropdown"/>
 
-            <TextView
-                android:id="@+id/local_server_summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="@string/welcome_local_server_used_switch_summary"
-                android:textColor="@color/default_text_color_light" />
+                    <android.support.design.widget.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="15dp"
+                        android:layout_weight="0">
 
-            <Switch
-                android:id="@+id/localServer_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:checked="false" />
+                        <android.support.design.widget.TextInputEditText
+                            android:id="@+id/local_port_input"
+                            style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/welcome_local_server_port"
+                            android:inputType="numberSigned"
+                            android:textColor="@color/default_text_color_light"/>
+                    </android.support.design.widget.TextInputLayout>
+                </TableRow>
+            </TableLayout>
 
             <LinearLayout
-                android:id="@+id/local_server_settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/local_ssid_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="5dp"
-                    android:text="@string/welcome_local_server_ssid"
-                    android:textColor="@color/default_text_color_light"
-                    android:textSize="@dimen/text_size_large" />
+                android:orientation="horizontal">
 
-                <nl.hnogames.domoticz.UI.MultiSelectionSpinner
-                    android:id="@+id/local_wifi"
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:prompt="@string/welcome_ssid_spinner_prompt" />
-
-                <Button
-                    android:id="@+id/set_ssid"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="right"
                     android:layout_marginTop="15dp"
                     android:layout_weight="1"
-                    android:background="@drawable/button_status_dark"
-                    android:text="@string/add"
-                    android:textSize="10dp" />
+                    android:minWidth="@dimen/width_min_welcomePage3_username_input">
 
-                <android.support.design.widget.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <EditText
-                        android:id="@+id/local_server_input"
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/local_username_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:hint="@string/welcome_local_server_username"
                         android:inputType="textNoSuggestions"
-                        android:layout_marginTop="15dp"
-                        android:textColor="@color/default_text_color_light"
-                        android:hint="@string/welcome_local_server_address" />
+                        android:minWidth="@dimen/width_min_welcomePage3_username_input"
+                        android:textColor="@color/default_text_color_light"/>
                 </android.support.design.widget.TextInputLayout>
 
-                <TableLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:stretchColumns="1">
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content">
-
-                            <Spinner
-                                android:id="@+id/local_protocol_spinner"
-                                android:layout_width="wrap_content"
-                                android:layout_gravity="bottom"
-                                android:layout_height="wrap_content"
-                                android:paddingTop="3dp"
-                                android:spinnerMode="dropdown" />
-                        <android.support.design.widget.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_marginTop="15dp"
-                            android:layout_weight="0"
-                            android:layout_height="wrap_content">
-                            <EditText
-                                android:id="@+id/local_port_input"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:inputType="numberSigned"
-                                android:textColor="@color/default_text_color_light"
-                                android:hint="@string/welcome_local_server_port" />
-                        </android.support.design.widget.TextInputLayout>
-                    </TableRow>
-                </TableLayout>
-
-                <LinearLayout
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-                    <android.support.design.widget.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_marginTop="15dp"
-                        android:layout_height="wrap_content"
-                        android:minWidth="@dimen/width_min_welcomePage3_username_input"
-                        android:layout_weight="1">
-                        <EditText
-                            android:id="@+id/local_username_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textNoSuggestions"
-                            android:minWidth="@dimen/width_min_welcomePage3_username_input"
-                            android:textColor="@color/default_text_color_light"
-                            android:hint="@string/welcome_local_server_username" />
-                    </android.support.design.widget.TextInputLayout>
+                    android:layout_weight="1">
 
-                    <android.support.design.widget.TextInputLayout
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/local_password_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
-                        android:layout_marginTop="15dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <EditText
-                            android:id="@+id/local_password_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textPassword"
-                            android:textColor="@color/default_text_color_light"
-                            android:hint="@string/welcome_local_server_password" />
-                    </android.support.design.widget.TextInputLayout>
-                </LinearLayout>
+                        android:hint="@string/welcome_local_server_password"
+                        android:inputType="textPassword"
+                        android:textColor="@color/default_text_color_light"/>
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
 
-                <CheckBox
-                    android:id="@+id/showpasswordlocal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/show_password"
-                    android:textColor="@color/default_text_color_light"
-                    android:textSize="@dimen/text_size_small" />
+            <CheckBox
+                android:id="@+id/showpasswordlocal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginTop="10dp"
+                android:text="@string/show_password"
+                android:textColor="@color/default_text_color_light"
+                android:textSize="@dimen/text_size_small"/>
 
-                <android.support.design.widget.TextInputLayout
+            <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/local_directory_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <EditText
-                        android:id="@+id/local_directory_input"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
-                        android:inputType="textNoSuggestions"
-                        android:textColor="@color/default_text_color_light"
-                        android:hint="@string/welcome_local_server_directory" />
-                </android.support.design.widget.TextInputLayout>
-            </LinearLayout>
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:hint="@string/welcome_local_server_directory"
+                    android:inputType="textNoSuggestions"
+                    android:textColor="@color/default_text_color_light"/>
+            </android.support.design.widget.TextInputLayout>
         </LinearLayout>
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/save_server"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
@@ -382,8 +373,6 @@
             android:layout_gravity="center"
             android:layout_marginTop="15dp"
             android:layout_weight="1"
-            android:background="@drawable/button_status_dark"
-            android:text="Save"
-            android:textSize="10dp" />
+            android:text="Save"/>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add_server_dark.xml b/app/src/main/res/layout/fragment_add_server_dark.xml
index 98e2b0995..2278553d8 100644
--- a/app/src/main/res/layout/fragment_add_server_dark.xml
+++ b/app/src/main/res/layout/fragment_add_server_dark.xml
@@ -18,17 +18,14 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/welcome_top_margin"
-    android:windowSoftInputMode="adjustPan">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/welcome_top_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:windowSoftInputMode="adjustPan">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -37,15 +34,18 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/input_server_name_input"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <EditText
+
+            <android.support.design.widget.TextInputEditText
                 android:id="@+id/server_name_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:hint="@string/servername"
                 android:inputType="text|textEmailAddress"
-                android:textColor="@color/white"
-                android:hint="@string/servername" />
+                android:textColor="@color/white"/>
         </android.support.design.widget.TextInputLayout>
 
         <TextView
@@ -56,19 +56,22 @@
             android:text="@string/welcome_server_settings_title"
             android:textColor="@color/white"
             android:textSize="@dimen/text_size_welcomePage3_serverSettings_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
-            android:layout_marginTop="15dp"
-            android:layout_height="wrap_content">
-            <EditText
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp">
+
+            <android.support.design.widget.TextInputEditText
                 android:id="@+id/remote_server_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:hint="@string/welcome_remote_server_address"
                 android:inputType="textNoSuggestions"
-                android:textColor="@color/white"
-                android:hint="@string/welcome_remote_server_address" />
+                android:textColor="@color/white"/>
         </android.support.design.widget.TextInputLayout>
 
         <TableLayout
@@ -81,26 +84,29 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content">
 
-                    <Spinner
-                        android:id="@+id/remote_protocol_spinner"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:paddingTop="3dp"
-                        android:spinnerMode="dropdown" />
+                <Spinner
+                    android:id="@+id/remote_protocol_spinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:paddingTop="3dp"
+                    android:spinnerMode="dropdown"/>
 
                 <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="15dp"
-                    android:layout_weight="0"
-                    android:layout_height="wrap_content">
-                    <EditText
+                    android:layout_weight="0">
+
+                    <android.support.design.widget.TextInputEditText
                         android:id="@+id/remote_port_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:hint="@string/welcome_remote_server_port"
                         android:inputType="numberSigned"
-                        android:textColor="@color/white"
-                        android:hint="@string/welcome_remote_server_port" />
+                        android:textColor="@color/white"/>
                 </android.support.design.widget.TextInputLayout>
             </TableRow>
         </TableLayout>
@@ -112,32 +118,38 @@
             android:orientation="horizontal">
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:minWidth="@dimen/width_min_welcomePage3_username_input">
-                <EditText
+
+                <android.support.design.widget.TextInputEditText
                     android:id="@+id/remote_username_input"
-                    android:inputType="textNoSuggestions"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/welcome_remote_server_username"
+                    android:inputType="textNoSuggestions"
                     android:paddingRight="15dp"
-                    android:textColor="@color/white"
-                    android:hint="@string/welcome_remote_server_username" />
+                    android:textColor="@color/white"/>
             </android.support.design.widget.TextInputLayout>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1">
-                <EditText
+
+                <android.support.design.widget.TextInputEditText
                     android:id="@+id/remote_password_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/welcome_remote_server_password"
                     android:inputType="textPassword"
                     android:paddingRight="15dp"
-                    android:textColor="@color/white"
-                    android:hint="@string/welcome_remote_server_password" />
+                    android:textColor="@color/white"/>
             </android.support.design.widget.TextInputLayout>
         </LinearLayout>
 
@@ -149,236 +161,209 @@
             android:layout_marginTop="10dp"
             android:text="@string/show_password"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_small" />
+            android:textSize="@dimen/text_size_small"/>
+
+        <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/remote_directory_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/welcome_remote_server_directory"
+                android:inputType="textNoSuggestions"
+                android:textColor="@color/white"/>
+        </android.support.design.widget.TextInputLayout>
 
         <TextView
-            android:id="@+id/advancedSettings_label"
+            android:id="@+id/local_server_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
-            android:text="@string/welcome_advancedSettings"
+            android:text="@string/welcome_local_server_used_switch_title"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_large" />
+            android:textSize="@dimen/text_size_large"/>
 
         <TextView
-            android:id="@+id/advancedSettings_summary"
+            android:id="@+id/local_server_summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
-            android:text="@string/welcome_advancedSettings_summary"
-            android:textColor="@color/white" />
+            android:text="@string/welcome_local_server_used_switch_summary"
+            android:textColor="@color/white"/>
 
         <Switch
-            android:id="@+id/advancedSettings_switch"
+            android:id="@+id/localServer_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:checked="false" />
+            android:layout_marginTop="2dp"
+            android:checked="false"/>
 
         <LinearLayout
-            android:id="@+id/advancedSettings_layout"
+            android:id="@+id/local_server_settings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="15dp"
             android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/local_ssid_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp"
+                android:text="@string/welcome_local_server_ssid"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_large"/>
+
+            <nl.hnogames.domoticz.UI.MultiSelectionSpinner
+                android:id="@+id/local_wifi"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/welcome_ssid_spinner_prompt"/>
+
+            <android.support.design.button.MaterialButton
+                android:id="@+id/set_ssid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="right"
+                android:layout_marginTop="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/button_status_dark"
+                android:text="@string/add"
+                android:textSize="10dp"/>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <EditText
-                    android:id="@+id/remote_directory_input"
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/local_server_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:hint="@string/welcome_local_server_address"
                     android:inputType="textNoSuggestions"
-                    android:textColor="@color/white"
-                    android:hint="@string/welcome_remote_server_directory" />
+                    android:textColor="@color/white"/>
             </android.support.design.widget.TextInputLayout>
 
-            <TextView
-                android:id="@+id/startScreen_title"
-                android:layout_width="wrap_content"
+            <TableLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:text="@string/welcome_server_startScreen"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_large" />
+                android:stretchColumns="1">
 
-            <Spinner
-                android:id="@+id/startScreen_spinner"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:spinnerMode="dropdown" />
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/local_server_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:text="@string/welcome_local_server_used_switch_title"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_large" />
+                    <Spinner
+                        android:id="@+id/local_protocol_spinner"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        android:paddingTop="3dp"
+                        android:spinnerMode="dropdown"/>
 
-            <TextView
-                android:id="@+id/local_server_summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="@string/welcome_local_server_used_switch_summary"
-                android:textColor="@color/white" />
+                    <android.support.design.widget.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="15dp"
+                        android:layout_weight="0">
 
-            <Switch
-                android:id="@+id/localServer_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:checked="false" />
+                        <android.support.design.widget.TextInputEditText
+                            android:id="@+id/local_port_input"
+                            style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/welcome_local_server_port"
+                            android:inputType="numberSigned"
+                            android:textColor="@color/white"/>
+                    </android.support.design.widget.TextInputLayout>
+                </TableRow>
+            </TableLayout>
 
             <LinearLayout
-                android:id="@+id/local_server_settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:orientation="vertical"
-                android:visibility="gone">
+                android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/local_ssid_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="5dp"
-                    android:text="@string/welcome_local_server_ssid"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_large" />
-
-                <nl.hnogames.domoticz.UI.MultiSelectionSpinner
-                    android:id="@+id/local_wifi"
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:prompt="@string/welcome_ssid_spinner_prompt" />
-
-                <Button
-                    android:id="@+id/set_ssid"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="right"
                     android:layout_marginTop="15dp"
                     android:layout_weight="1"
-                    android:background="@drawable/button_status_dark"
-                    android:text="@string/add"
-                    android:textSize="10dp" />
+                    android:minWidth="@dimen/width_min_welcomePage3_username_input">
 
-                <android.support.design.widget.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <EditText
-                        android:id="@+id/local_server_input"
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/local_username_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:hint="@string/welcome_local_server_username"
                         android:inputType="textNoSuggestions"
-                        android:layout_marginTop="15dp"
-                        android:textColor="@color/white"
-                        android:hint="@string/welcome_local_server_address" />
+                        android:minWidth="@dimen/width_min_welcomePage3_username_input"
+                        android:textColor="@color/white"/>
                 </android.support.design.widget.TextInputLayout>
 
-                <TableLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:stretchColumns="1">
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content">
-                            <Spinner
-                                android:id="@+id/local_protocol_spinner"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="bottom"
-                                android:paddingTop="3dp"
-                                android:spinnerMode="dropdown" />
-                        <android.support.design.widget.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_marginTop="15dp"
-                            android:layout_weight="0"
-                            android:layout_height="wrap_content">
-                            <EditText
-                                android:id="@+id/local_port_input"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:inputType="numberSigned"
-                                android:textColor="@color/white"
-                                android:hint="@string/welcome_local_server_port" />
-                        </android.support.design.widget.TextInputLayout>
-                    </TableRow>
-                </TableLayout>
-
-                <LinearLayout
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-                    <android.support.design.widget.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_marginTop="15dp"
-                        android:layout_height="wrap_content"
-                        android:minWidth="@dimen/width_min_welcomePage3_username_input"
-                        android:layout_weight="1">
-                        <EditText
-                            android:id="@+id/local_username_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textNoSuggestions"
-                            android:minWidth="@dimen/width_min_welcomePage3_username_input"
-                            android:textColor="@color/white"
-                            android:hint="@string/welcome_local_server_username" />
-                    </android.support.design.widget.TextInputLayout>
+                    android:layout_weight="1">
 
-                    <android.support.design.widget.TextInputLayout
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/local_password_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
-                        android:layout_marginTop="15dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <EditText
-                            android:id="@+id/local_password_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textPassword"
-                            android:textColor="@color/white"
-                            android:hint="@string/welcome_local_server_password" />
-                    </android.support.design.widget.TextInputLayout>
-                </LinearLayout>
+                        android:hint="@string/welcome_local_server_password"
+                        android:inputType="textPassword"
+                        android:textColor="@color/white"/>
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
 
-                <CheckBox
-                    android:id="@+id/showpasswordlocal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/show_password"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_small" />
+            <CheckBox
+                android:id="@+id/showpasswordlocal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginTop="10dp"
+                android:text="@string/show_password"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_small"/>
 
-                <android.support.design.widget.TextInputLayout
+            <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/local_directory_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <EditText
-                        android:id="@+id/local_directory_input"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
-                        android:inputType="textNoSuggestions"
-                        android:textColor="@color/white"
-                        android:hint="@string/welcome_local_server_directory" />
-                </android.support.design.widget.TextInputLayout>
-            </LinearLayout>
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:hint="@string/welcome_local_server_directory"
+                    android:inputType="textNoSuggestions"
+                    android:textColor="@color/white"/>
+            </android.support.design.widget.TextInputLayout>
         </LinearLayout>
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/save_server"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
@@ -386,8 +371,6 @@
             android:layout_gravity="center"
             android:layout_marginTop="15dp"
             android:layout_weight="1"
-            android:background="@drawable/button_status_dark"
-            android:text="Save"
-            android:textSize="10dp" />
+            android:text="Save"/>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_cameras.xml b/app/src/main/res/layout/fragment_cameras.xml
index 11f3d6aed..6250adb04 100644
--- a/app/src/main/res/layout/fragment_cameras.xml
+++ b/app/src/main/res/layout/fragment_cameras.xml
@@ -21,10 +21,10 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinatorLayout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:id="@+id/coordinatorLayout"
+                                                 android:layout_width="fill_parent"
+                                                 android:layout_height="fill_parent">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -42,35 +42,15 @@
                 style="@style/debug_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/debug_textview_title" />
+                android:text="@string/debug_textview_title"/>
 
             <TextView
                 android:id="@+id/debugText"
                 style="@style/debug_text"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"/>
         </LinearLayout>
 
-
-        <android.support.v4.widget.SwipeRefreshLayout
-            android:id="@+id/swipe_refresh_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/my_recycler_view"
-                style="@style/background_recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:paddingBottom="@dimen/row_space"
-                android:paddingLeft="@dimen/row_space"
-                android:paddingRight="@dimen/row_space"
-                android:paddingTop="@dimen/row_space"
-                android:scrollbars="vertical" />
-
-        </android.support.v4.widget.SwipeRefreshLayout>
-
         <RelativeLayout
             android:id="@+id/errorLayout"
             android:layout_width="match_parent"
@@ -84,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:contentDescription="@string/error_image_description"
-                android:src="@drawable/sad_smiley" />
+                android:src="@drawable/sad_smiley"/>
 
             <TextView
                 android:id="@+id/errorTextOops"
@@ -94,7 +74,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="50dp"
                 android:text="@string/oops"
-                android:textSize="@dimen/text_size_large" />
+                android:textSize="@dimen/text_size_large"/>
 
             <TextView
                 android:id="@+id/errorTextWrong"
@@ -104,7 +84,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="25dp"
                 android:text="@string/something_went_wrong"
-                android:textSize="@dimen/text_size_medium" />
+                android:textSize="@dimen/text_size_medium"/>
 
             <TextView
                 android:id="@+id/errorTextMessage"
@@ -115,10 +95,27 @@
                 android:layout_marginTop="5dp"
                 android:textColor="@color/light_gray"
                 android:textSize="@dimen/text_size_small"
-                tools:text="Error: No network connection available" />
+                tools:text="Error: No network connection available"/>
 
         </RelativeLayout>
 
+
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/my_recycler_view"
+                style="@style/background_recyclerview"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:scrollbars="vertical"/>
+
+        </android.support.v4.widget.SwipeRefreshLayout>
+
+
     </LinearLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_welcome1.xml b/app/src/main/res/layout/fragment_welcome1.xml
index e2429e74b..a1df768ae 100644
--- a/app/src/main/res/layout/fragment_welcome1.xml
+++ b/app/src/main/res/layout/fragment_welcome1.xml
@@ -21,13 +21,13 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root1"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/welcome_top_margin">
+                android:id="@+id/root1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/welcome_top_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin">
 
     <ImageView
         android:id="@+id/logo_domoticz"
@@ -36,7 +36,7 @@
         android:layout_alignParentTop="true"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="50dp"
-        android:src="@drawable/ic_domoticz_logo" />
+        android:src="@drawable/ic_domoticz_logo"/>
 
     <TextView
         android:id="@+id/info_text"
@@ -45,7 +45,7 @@
         android:layout_below="@id/logo_domoticz"
         android:text="@string/welcome_info_domoticz"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_size_welcomePage1_domoticzInfo" />
+        android:textSize="@dimen/text_size_welcomePage1_domoticzInfo"/>
 
     <TextView
         android:id="@+id/info_swipe"
@@ -54,6 +54,6 @@
         android:layout_alignParentBottom="true"
         android:text="@string/welcome_info_swipe"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_size_welcomePage1_swipeInfo" />
+        android:textSize="@dimen/text_size_welcomePage1_swipeInfo"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_welcome2.xml b/app/src/main/res/layout/fragment_welcome2.xml
index f392b55a5..12a79f13e 100644
--- a/app/src/main/res/layout/fragment_welcome2.xml
+++ b/app/src/main/res/layout/fragment_welcome2.xml
@@ -21,12 +21,12 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/welcome_top_margin">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/welcome_top_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -40,7 +40,7 @@
             android:paddingBottom="10dp"
             android:text="@string/welcome_info_settings1"
             android:textColor="@color/default_text_color_light"
-            android:textSize="@dimen/text_size_welcomePage2_settingsInfo" />
+            android:textSize="@dimen/text_size_welcomePage2_settingsInfo"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -48,18 +48,15 @@
             android:paddingTop="10dp"
             android:text="@string/welcome_info_settings2"
             android:textColor="@color/default_text_color_light"
-            android:textSize="@dimen/text_size_welcomePage2_settingsInfo" />
+            android:textSize="@dimen/text_size_welcomePage2_settingsInfo"/>
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/import_settings"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:background="@drawable/button_status"
-            android:text="@string/import_settings"
-            android:textColor="@color/default_text_color_light"
-            android:textSize="@dimen/text_size_welcomePage2_settingsInfo" />
-
+            android:text="@string/import_settings"/>
     </LinearLayout>
 
     <TextView
@@ -69,6 +66,5 @@
         android:text="@string/welcome_info_swipe"
         android:textColor="@color/default_text_color_light"
         android:textSize="@dimen/text_size_welcomePage2_swipeInfo"
-        android:visibility="gone" />
-
+        android:visibility="gone"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_welcome3.xml b/app/src/main/res/layout/fragment_welcome3.xml
index 3c87927ac..128b2f864 100644
--- a/app/src/main/res/layout/fragment_welcome3.xml
+++ b/app/src/main/res/layout/fragment_welcome3.xml
@@ -20,15 +20,13 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/welcome_top_margin"
-    android:windowSoftInputMode="adjustPan">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/welcome_top_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:windowSoftInputMode="adjustPan">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -43,19 +41,22 @@
             android:text="@string/welcome_server_settings_title"
             android:textColor="@color/default_text_color_light"
             android:textSize="@dimen/text_size_welcomePage3_serverSettings_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
-            android:layout_marginTop="15dp"
-            android:layout_height="wrap_content">
-            <EditText
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp">
+
+            <android.support.design.widget.TextInputEditText
                 android:id="@+id/remote_server_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:hint="@string/welcome_remote_server_address"
                 android:inputType="textNoSuggestions"
-                android:textColor="@color/default_text_color_light"
-                android:hint="@string/welcome_remote_server_address" />
+                android:textColor="@color/default_text_color_light"/>
         </android.support.design.widget.TextInputLayout>
 
         <TableLayout
@@ -68,26 +69,29 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content">
 
-                    <Spinner
-                        android:id="@+id/remote_protocol_spinner"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="3dp"
-                        android:spinnerMode="dropdown" />
+                <Spinner
+                    android:id="@+id/remote_protocol_spinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:paddingTop="3dp"
+                    android:spinnerMode="dropdown"/>
 
                 <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="15dp"
-                    android:layout_weight="0"
-                    android:layout_height="wrap_content">
-                    <EditText
+                    android:layout_weight="0">
+
+                    <android.support.design.widget.TextInputEditText
                         android:id="@+id/remote_port_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:hint="@string/welcome_remote_server_port"
                         android:inputType="numberSigned"
-                        android:textColor="@color/default_text_color_light"
-                        android:hint="@string/welcome_remote_server_port" />
+                        android:textColor="@color/default_text_color_light"/>
                 </android.support.design.widget.TextInputLayout>
             </TableRow>
         </TableLayout>
@@ -99,32 +103,39 @@
             android:orientation="horizontal">
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:minWidth="@dimen/width_min_welcomePage3_username_input">
-                <EditText
+
+                <android.support.design.widget.TextInputEditText
                     android:id="@+id/remote_username_input"
-                    android:inputType="textNoSuggestions"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/welcome_remote_server_username"
+                    android:inputType="textNoSuggestions"
                     android:paddingRight="15dp"
-                    android:textColor="@color/default_text_color_light"
-                    android:hint="@string/welcome_remote_server_username" />
+                    android:textColor="@color/default_text_color_light"/>
             </android.support.design.widget.TextInputLayout>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
                 android:layout_weight="1">
-                <EditText
+
+                <android.support.design.widget.TextInputEditText
                     android:id="@+id/remote_password_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/welcome_remote_server_password"
                     android:inputType="textPassword"
                     android:paddingRight="15dp"
-                    android:textColor="@color/default_text_color_light"
-                    android:hint="@string/welcome_remote_server_password" />
+                    android:textColor="@color/default_text_color_light"/>
             </android.support.design.widget.TextInputLayout>
         </LinearLayout>
 
@@ -136,233 +147,205 @@
             android:layout_marginTop="10dp"
             android:text="@string/show_password"
             android:textColor="@color/default_text_color_light"
-            android:textSize="@dimen/text_size_small" />
+            android:textSize="@dimen/text_size_small"/>
+
+        <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/remote_directory_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/welcome_remote_server_directory"
+                android:inputType="textNoSuggestions"
+                android:textColor="@color/default_text_color_light"/>
+        </android.support.design.widget.TextInputLayout>
 
         <TextView
-            android:id="@+id/advancedSettings_label"
+            android:id="@+id/local_server_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
-            android:text="@string/welcome_advancedSettings"
+            android:text="@string/welcome_local_server_used_switch_title"
             android:textColor="@color/default_text_color_light"
-            android:textSize="@dimen/text_size_large" />
+            android:textSize="@dimen/text_size_large"/>
 
         <TextView
-            android:id="@+id/advancedSettings_summary"
+            android:id="@+id/local_server_summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
-            android:text="@string/welcome_advancedSettings_summary"
-            android:textColor="@color/default_text_color_light" />
+            android:text="@string/welcome_local_server_used_switch_summary"
+            android:textColor="@color/default_text_color_light"/>
 
         <Switch
-            android:id="@+id/advancedSettings_switch"
+            android:id="@+id/localServer_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:checked="false" />
+            android:layout_marginTop="2dp"
+            android:checked="false"/>
 
         <LinearLayout
-            android:id="@+id/advancedSettings_layout"
+            android:id="@+id/local_server_settings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="15dp"
             android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/local_ssid_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp"
+                android:text="@string/welcome_local_server_ssid"
+                android:textColor="@color/default_text_color_light"
+                android:textSize="@dimen/text_size_large"/>
+
+            <nl.hnogames.domoticz.UI.MultiSelectionSpinner
+                android:id="@+id/local_wifi"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/welcome_ssid_spinner_prompt"/>
+
+            <android.support.design.button.MaterialButton
+                android:id="@+id/set_ssid"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="right"
+                android:layout_marginTop="15dp"
+                android:layout_weight="1"
+                android:text="@string/add"/>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <EditText
-                    android:id="@+id/remote_directory_input"
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/local_server_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:hint="@string/welcome_local_server_address"
                     android:inputType="textNoSuggestions"
-                    android:textColor="@color/default_text_color_light"
-                    android:hint="@string/welcome_remote_server_directory" />
+                    android:textColor="@color/default_text_color_light"/>
             </android.support.design.widget.TextInputLayout>
 
-            <TextView
-                android:id="@+id/startScreen_title"
-                android:layout_width="wrap_content"
+            <TableLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:text="@string/welcome_server_startScreen"
-                android:textColor="@color/default_text_color_light"
-                android:textSize="@dimen/text_size_large" />
+                android:stretchColumns="1">
 
-            <Spinner
-                android:id="@+id/startScreen_spinner"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:spinnerMode="dropdown" />
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/local_server_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:text="@string/welcome_local_server_used_switch_title"
-                android:textColor="@color/default_text_color_light"
-                android:textSize="@dimen/text_size_large" />
+                    <Spinner
+                        android:id="@+id/local_protocol_spinner"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        android:paddingTop="3dp"
+                        android:spinnerMode="dropdown"/>
 
-            <TextView
-                android:id="@+id/local_server_summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="@string/welcome_local_server_used_switch_summary"
-                android:textColor="@color/default_text_color_light" />
+                    <android.support.design.widget.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="15dp"
+                        android:layout_weight="0">
 
-            <Switch
-                android:id="@+id/localServer_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:checked="false" />
+                        <android.support.design.widget.TextInputEditText
+                            android:id="@+id/local_port_input"
+                            style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/welcome_local_server_port"
+                            android:inputType="numberSigned"
+                            android:textColor="@color/default_text_color_light"/>
+                    </android.support.design.widget.TextInputLayout>
+                </TableRow>
+            </TableLayout>
 
             <LinearLayout
-                android:id="@+id/local_server_settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/local_ssid_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="5dp"
-                    android:text="@string/welcome_local_server_ssid"
-                    android:textColor="@color/default_text_color_light"
-                    android:textSize="@dimen/text_size_large" />
+                android:orientation="horizontal">
 
-                <nl.hnogames.domoticz.UI.MultiSelectionSpinner
-                    android:id="@+id/local_wifi"
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:prompt="@string/welcome_ssid_spinner_prompt" />
-
-                <Button
-                    android:id="@+id/set_ssid"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="right"
                     android:layout_marginTop="15dp"
                     android:layout_weight="1"
-                    android:background="@drawable/button_status_dark"
-                    android:text="@string/add"
-                    android:textSize="10dp" />
+                    android:minWidth="@dimen/width_min_welcomePage3_username_input">
 
-                <android.support.design.widget.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <EditText
-                        android:id="@+id/local_server_input"
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/local_username_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:hint="@string/welcome_local_server_username"
                         android:inputType="textNoSuggestions"
-                        android:layout_marginTop="15dp"
-                        android:textColor="@color/default_text_color_light"
-                        android:hint="@string/welcome_local_server_address" />
+                        android:minWidth="@dimen/width_min_welcomePage3_username_input"
+                        android:textColor="@color/default_text_color_light"/>
                 </android.support.design.widget.TextInputLayout>
 
-                <TableLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:stretchColumns="1">
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content">
-
-                            <Spinner
-                                android:id="@+id/local_protocol_spinner"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="bottom"
-                                android:paddingTop="3dp"
-                                android:spinnerMode="dropdown" />
-                        <android.support.design.widget.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_marginTop="15dp"
-                            android:layout_weight="0"
-                            android:layout_height="wrap_content">
-                            <EditText
-                                android:id="@+id/local_port_input"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:inputType="numberSigned"
-                                android:textColor="@color/default_text_color_light"
-                                android:hint="@string/welcome_local_server_port" />
-                        </android.support.design.widget.TextInputLayout>
-                    </TableRow>
-                </TableLayout>
-
-                <LinearLayout
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-                    <android.support.design.widget.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_marginTop="15dp"
-                        android:layout_height="wrap_content"
-                        android:minWidth="@dimen/width_min_welcomePage3_username_input"
-                        android:layout_weight="1">
-                        <EditText
-                            android:id="@+id/local_username_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textNoSuggestions"
-                            android:minWidth="@dimen/width_min_welcomePage3_username_input"
-                            android:textColor="@color/default_text_color_light"
-                            android:hint="@string/welcome_local_server_username" />
-                    </android.support.design.widget.TextInputLayout>
+                    android:layout_weight="1">
 
-                    <android.support.design.widget.TextInputLayout
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/local_password_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
-                        android:layout_marginTop="15dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <EditText
-                            android:id="@+id/local_password_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textPassword"
-                            android:textColor="@color/default_text_color_light"
-                            android:hint="@string/welcome_local_server_password" />
-                    </android.support.design.widget.TextInputLayout>
-                </LinearLayout>
+                        android:hint="@string/welcome_local_server_password"
+                        android:inputType="textPassword"
+                        android:textColor="@color/default_text_color_light"/>
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
 
-                <CheckBox
-                    android:id="@+id/showpasswordlocal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/show_password"
-                    android:textColor="@color/default_text_color_light"
-                    android:textSize="@dimen/text_size_small" />
+            <CheckBox
+                android:id="@+id/showpasswordlocal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginTop="10dp"
+                android:text="@string/show_password"
+                android:textColor="@color/default_text_color_light"
+                android:textSize="@dimen/text_size_small"/>
 
-                <android.support.design.widget.TextInputLayout
+            <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/local_directory_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <EditText
-                        android:id="@+id/local_directory_input"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
-                        android:inputType="textNoSuggestions"
-                        android:textColor="@color/default_text_color_light"
-                        android:hint="@string/welcome_local_server_directory" />
-                </android.support.design.widget.TextInputLayout>
-            </LinearLayout>
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:hint="@string/welcome_local_server_directory"
+                    android:inputType="textNoSuggestions"
+                    android:textColor="@color/default_text_color_light"/>
+            </android.support.design.widget.TextInputLayout>
         </LinearLayout>
+
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_welcome3_dark.xml b/app/src/main/res/layout/fragment_welcome3_dark.xml
index bea406d97..3c28dea32 100644
--- a/app/src/main/res/layout/fragment_welcome3_dark.xml
+++ b/app/src/main/res/layout/fragment_welcome3_dark.xml
@@ -20,14 +20,12 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            xmlns:tools="http://schemas.android.com/tools"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingBottom="@dimen/activity_vertical_margin"
             android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
             android:paddingTop="@dimen/welcome_top_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
             android:windowSoftInputMode="adjustPan">
 
     <LinearLayout
@@ -43,19 +41,22 @@
             android:text="@string/welcome_server_settings_title"
             android:textColor="@color/white"
             android:textSize="@dimen/text_size_welcomePage3_serverSettings_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
-            android:layout_marginTop="15dp"
-            android:layout_height="wrap_content">
-            <EditText
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp">
+
+            <android.support.design.widget.TextInputEditText
                 android:id="@+id/remote_server_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:hint="@string/welcome_remote_server_address"
                 android:inputType="textNoSuggestions"
-                android:textColor="@color/white"
-                android:hint="@string/welcome_remote_server_address" />
+                android:textColor="@color/white"/>
         </android.support.design.widget.TextInputLayout>
 
         <TableLayout
@@ -68,26 +69,29 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content">
 
-                    <Spinner
-                        android:id="@+id/remote_protocol_spinner"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:paddingTop="3dp"
-                        android:spinnerMode="dropdown" />
+                <Spinner
+                    android:id="@+id/remote_protocol_spinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:paddingTop="3dp"
+                    android:spinnerMode="dropdown"/>
 
                 <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="15dp"
-                    android:layout_weight="0"
-                    android:layout_height="wrap_content">
-                    <EditText
+                    android:layout_weight="0">
+
+                    <android.support.design.widget.TextInputEditText
                         android:id="@+id/remote_port_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:hint="@string/welcome_remote_server_port"
                         android:inputType="numberSigned"
-                        android:textColor="@color/white"
-                        android:hint="@string/welcome_remote_server_port" />
+                        android:textColor="@color/white"/>
                 </android.support.design.widget.TextInputLayout>
             </TableRow>
         </TableLayout>
@@ -99,32 +103,39 @@
             android:orientation="horizontal">
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:minWidth="@dimen/width_min_welcomePage3_username_input">
-                <EditText
+
+                <android.support.design.widget.TextInputEditText
                     android:id="@+id/remote_username_input"
-                    android:inputType="textNoSuggestions"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/welcome_remote_server_username"
+                    android:inputType="textNoSuggestions"
                     android:paddingRight="15dp"
-                    android:textColor="@color/white"
-                    android:hint="@string/welcome_remote_server_username" />
+                    android:textColor="@color/white"/>
             </android.support.design.widget.TextInputLayout>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
                 android:layout_weight="1">
-                <EditText
+
+                <android.support.design.widget.TextInputEditText
                     android:id="@+id/remote_password_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/welcome_remote_server_password"
                     android:inputType="textPassword"
                     android:paddingRight="15dp"
-                    android:textColor="@color/white"
-                    android:hint="@string/welcome_remote_server_password" />
+                    android:textColor="@color/white"/>
             </android.support.design.widget.TextInputLayout>
         </LinearLayout>
 
@@ -136,233 +147,205 @@
             android:layout_marginTop="10dp"
             android:text="@string/show_password"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_small" />
+            android:textSize="@dimen/text_size_small"/>
+
+        <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/remote_directory_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/welcome_remote_server_directory"
+                android:inputType="textNoSuggestions"
+                android:textColor="@color/white"/>
+        </android.support.design.widget.TextInputLayout>
 
         <TextView
-            android:id="@+id/advancedSettings_label"
+            android:id="@+id/local_server_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
-            android:text="@string/welcome_advancedSettings"
+            android:text="@string/welcome_local_server_used_switch_title"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_large" />
+            android:textSize="@dimen/text_size_large"/>
 
         <TextView
-            android:id="@+id/advancedSettings_summary"
+            android:id="@+id/local_server_summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
-            android:text="@string/welcome_advancedSettings_summary"
-            android:textColor="@color/white" />
+            android:text="@string/welcome_local_server_used_switch_summary"
+            android:textColor="@color/white"/>
 
         <Switch
-            android:id="@+id/advancedSettings_switch"
+            android:id="@+id/localServer_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:checked="false" />
+            android:layout_marginTop="2dp"
+            android:checked="false"/>
 
         <LinearLayout
-            android:id="@+id/advancedSettings_layout"
+            android:id="@+id/local_server_settings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="15dp"
             android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/local_ssid_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp"
+                android:text="@string/welcome_local_server_ssid"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_large"/>
+
+            <nl.hnogames.domoticz.UI.MultiSelectionSpinner
+                android:id="@+id/local_wifi"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/welcome_ssid_spinner_prompt"/>
+
+            <android.support.design.button.MaterialButton
+                android:id="@+id/set_ssid"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="right"
+                android:layout_marginTop="15dp"
+                android:layout_weight="1"
+                android:text="@string/add"/>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <EditText
-                    android:id="@+id/remote_directory_input"
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/local_server_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:hint="@string/welcome_local_server_address"
                     android:inputType="textNoSuggestions"
-                    android:textColor="@color/white"
-                    android:hint="@string/welcome_remote_server_directory" />
+                    android:textColor="@color/white"/>
             </android.support.design.widget.TextInputLayout>
 
-            <TextView
-                android:id="@+id/startScreen_title"
-                android:layout_width="wrap_content"
+            <TableLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:text="@string/welcome_server_startScreen"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_large" />
+                android:stretchColumns="1">
 
-            <Spinner
-                android:id="@+id/startScreen_spinner"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:spinnerMode="dropdown" />
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/local_server_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:text="@string/welcome_local_server_used_switch_title"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_large" />
+                    <Spinner
+                        android:id="@+id/local_protocol_spinner"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        android:paddingTop="3dp"
+                        android:spinnerMode="dropdown"/>
 
-            <TextView
-                android:id="@+id/local_server_summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="@string/welcome_local_server_used_switch_summary"
-                android:textColor="@color/white" />
+                    <android.support.design.widget.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="15dp"
+                        android:layout_weight="0">
 
-            <Switch
-                android:id="@+id/localServer_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:checked="false" />
+                        <android.support.design.widget.TextInputEditText
+                            android:id="@+id/local_port_input"
+                            style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/welcome_local_server_port"
+                            android:inputType="numberSigned"
+                            android:textColor="@color/white"/>
+                    </android.support.design.widget.TextInputLayout>
+                </TableRow>
+            </TableLayout>
 
             <LinearLayout
-                android:id="@+id/local_server_settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/local_ssid_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="5dp"
-                    android:text="@string/welcome_local_server_ssid"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_large" />
+                android:orientation="horizontal">
 
-                <nl.hnogames.domoticz.UI.MultiSelectionSpinner
-                    android:id="@+id/local_wifi"
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:prompt="@string/welcome_ssid_spinner_prompt" />
-
-                <Button
-                    android:id="@+id/set_ssid"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="right"
                     android:layout_marginTop="15dp"
                     android:layout_weight="1"
-                    android:background="@drawable/button_status_dark"
-                    android:text="@string/add"
-                    android:textSize="10dp" />
+                    android:minWidth="@dimen/width_min_welcomePage3_username_input">
 
-                <android.support.design.widget.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <EditText
-                        android:id="@+id/local_server_input"
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/local_username_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:hint="@string/welcome_local_server_username"
                         android:inputType="textNoSuggestions"
-                        android:layout_marginTop="15dp"
-                        android:textColor="@color/white"
-                        android:hint="@string/welcome_local_server_address" />
+                        android:minWidth="@dimen/width_min_welcomePage3_username_input"
+                        android:textColor="@color/white"/>
                 </android.support.design.widget.TextInputLayout>
 
-                <TableLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:stretchColumns="1">
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content">
-
-                            <Spinner
-                                android:id="@+id/local_protocol_spinner"
-                                android:layout_width="wrap_content"
-                                android:layout_gravity="bottom"
-                                android:layout_height="wrap_content"
-                                android:paddingTop="3dp"
-                                android:spinnerMode="dropdown" />
-                        <android.support.design.widget.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_marginTop="15dp"
-                            android:layout_weight="0"
-                            android:layout_height="wrap_content">
-                            <EditText
-                                android:id="@+id/local_port_input"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:inputType="numberSigned"
-                                android:textColor="@color/white"
-                                android:hint="@string/welcome_local_server_port" />
-                        </android.support.design.widget.TextInputLayout>
-                    </TableRow>
-                </TableLayout>
-
-                <LinearLayout
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-                    <android.support.design.widget.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_marginTop="15dp"
-                        android:layout_height="wrap_content"
-                        android:minWidth="@dimen/width_min_welcomePage3_username_input"
-                        android:layout_weight="1">
-                        <EditText
-                            android:id="@+id/local_username_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textNoSuggestions"
-                            android:minWidth="@dimen/width_min_welcomePage3_username_input"
-                            android:textColor="@color/white"
-                            android:hint="@string/welcome_local_server_username" />
-                    </android.support.design.widget.TextInputLayout>
+                    android:layout_weight="1">
 
-                    <android.support.design.widget.TextInputLayout
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/local_password_input"
+                        style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                         android:layout_width="match_parent"
-                        android:layout_marginTop="15dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <EditText
-                            android:id="@+id/local_password_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textPassword"
-                            android:textColor="@color/white"
-                            android:hint="@string/welcome_local_server_password" />
-                    </android.support.design.widget.TextInputLayout>
-                </LinearLayout>
+                        android:hint="@string/welcome_local_server_password"
+                        android:inputType="textPassword"
+                        android:textColor="@color/white"/>
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
 
-                <CheckBox
-                    android:id="@+id/showpasswordlocal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/show_password"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_small" />
+            <CheckBox
+                android:id="@+id/showpasswordlocal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginTop="10dp"
+                android:text="@string/show_password"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_small"/>
 
-                <android.support.design.widget.TextInputLayout
+            <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/local_directory_input"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <EditText
-                        android:id="@+id/local_directory_input"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
-                        android:inputType="textNoSuggestions"
-                        android:textColor="@color/white"
-                        android:hint="@string/welcome_local_server_directory" />
-                </android.support.design.widget.TextInputLayout>
-            </LinearLayout>
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:hint="@string/welcome_local_server_directory"
+                    android:inputType="textNoSuggestions"
+                    android:textColor="@color/white"/>
+            </android.support.design.widget.TextInputLayout>
         </LinearLayout>
+
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_welcome4.xml b/app/src/main/res/layout/fragment_welcome4.xml
index c20f90be2..2303983a6 100644
--- a/app/src/main/res/layout/fragment_welcome4.xml
+++ b/app/src/main/res/layout/fragment_welcome4.xml
@@ -21,13 +21,13 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root4"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_marginTop="50dp"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin">
+                android:id="@+id/root4"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_marginTop="50dp"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin">
 
     <LinearLayout
         android:id="@+id/layout_please_wait"
@@ -40,7 +40,7 @@
             android:id="@+id/progressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal" />
+            android:layout_gravity="center_horizontal"/>
 
         <TextView
             android:id="@+id/please_wait"
@@ -49,7 +49,7 @@
             android:layout_gravity="center_horizontal"
             android:padding="15dp"
             android:text="@string/welcome_info_checkingConnection"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" />
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"/>
 
     </LinearLayout>
 
@@ -66,7 +66,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" />
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_wizard.xml b/app/src/main/res/layout/fragment_wizard.xml
index 4dda861d0..94309b534 100644
--- a/app/src/main/res/layout/fragment_wizard.xml
+++ b/app/src/main/res/layout/fragment_wizard.xml
@@ -21,16 +21,16 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/wizard_relativeLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/wizard_relativeLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
     <com.dexafree.materialList.view.MaterialListView
         android:id="@+id/wizard_listview"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         app:column_count_landscape="2"
-        app:column_count_portrait="1" />
+        app:column_count_portrait="1"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/geo_row_location.xml b/app/src/main/res/layout/geo_row_location.xml
index b0fc22b80..68063ad6a 100644
--- a/app/src/main/res/layout/geo_row_location.xml
+++ b/app/src/main/res/layout/geo_row_location.xml
@@ -35,18 +35,18 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:orientation="horizontal"
-        android:paddingBottom="10dp"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+        android:paddingBottom="10dp">
 
         <CheckBox
             android:id="@+id/enableSwitch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:gravity="center_vertical" />
+            android:gravity="center_vertical"/>
 
         <RelativeLayout
             android:layout_width="253dp"
@@ -58,26 +58,26 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
-                tools:text="Location name" />
+                tools:text="Location name"/>
 
             <TextView
                 android:id="@+id/location_radius"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/location_name"
-                tools:text="Radius (meter): 120" />
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                tools:text="Radius (meter): 120"/>
 
             <TextView
                 android:id="@+id/location_connectedSwitch"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
+                android:layout_below="@+id/location_radius"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/location_radius" />
+                android:layout_alignParentLeft="true"/>
         </RelativeLayout>
     </LinearLayout>
 
@@ -93,14 +93,15 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/remove_button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|right"
             android:background="@drawable/button_status"
             android:text="@string/delete_short"
-            android:textSize="10dp" />
+            android:textSize="10dp"/>
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/log_all_buttons.xml b/app/src/main/res/layout/log_all_buttons.xml
index ef59341ad..1fc780199 100644
--- a/app/src/main/res/layout/log_all_buttons.xml
+++ b/app/src/main/res/layout/log_all_buttons.xml
@@ -21,112 +21,103 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/extra_panel"
-    android:layout_width="wrap_content"
-    android:layout_height="25dp"
-    android:layout_marginBottom="10dp"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
-    android:layout_marginTop="10dp"
-    android:animateLayoutChanges="true"
-    android:orientation="horizontal"
-    android:visibility="gone"
-    tools:visibility="visible">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@+id/extra_panel"
+              android:layout_width="wrap_content"
+              android:layout_height="25dp"
+              android:layout_marginLeft="10dp"
+              android:layout_marginTop="10dp"
+              android:layout_marginRight="10dp"
+              android:layout_marginBottom="10dp"
+              android:animateLayoutChanges="true"
+              android:orientation="horizontal"
+              android:visibility="gone"
+              tools:visibility="visible">
 
-    <com.like.LikeButton
-        android:id="@+id/fav_button"
-        android:layout_width="0dp"
+    <HorizontalScrollView
+        android:id="@+id/hsv"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/rowIcon"
-        android:layout_weight=".20"
-        android:paddingBottom="-25dp"
-        android:paddingTop="-17dp"
-        app:icon_size="20dp"
-        app:icon_type="star" />
+        android:fillViewport="true"
+        android:measureAllChildren="false"
+        android:scrollbars="none">
 
-    <Button
-        android:id="@+id/day_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_day"
-        android:textSize="10dp"
-        android:visibility="gone" />
+        <LinearLayout
+            android:id="@+id/innerLay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-    <Button
-        android:id="@+id/week_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:elevation="0dp"
-        android:text="@string/button_status_week"
-        android:textSize="10dp"
-        android:visibility="gone" />
+            <com.like.LikeButton
+                android:id="@+id/fav_button"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/rowIcon"
+                android:layout_weight=".20"
+                android:paddingTop="-17dp"
+                android:paddingBottom="-25dp"
+                app:icon_size="20dp"
+                app:icon_type="star"/>
 
-    <Button
-        android:id="@+id/month_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:elevation="0dp"
-        android:text="@string/button_status_month"
-        android:textSize="10dp"
-        android:visibility="gone" />
+            <android.support.design.chip.Chip
+                android:id="@+id/day_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_day"
+                android:visibility="gone"/>
 
-    <Button
-        android:id="@+id/year_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:elevation="0dp"
-        android:text="@string/button_status_year"
-        android:textSize="10dp"
-        android:visibility="gone" />
+            <android.support.design.chip.Chip
+                android:id="@+id/week_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_week"
+                android:visibility="gone"/>
 
-    <Button
-        android:id="@+id/log_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_weight=".20"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_log"
-        android:textSize="12sp"
-        android:visibility="gone" />
+            <android.support.design.chip.Chip
+                android:id="@+id/month_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_month"
+                android:visibility="gone"/>
 
-    <Button
-        android:id="@+id/timer_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_weight=".20"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_timer"
-        android:textSize="12sp"
-        android:visibility="gone" />
+            <android.support.design.chip.Chip
+                android:id="@+id/year_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_year"
+                android:visibility="gone"/>
 
-    <Button
-        android:id="@+id/notifications_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_weight=".20"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_notifications"
-        android:textSize="12sp"
-        android:visibility="gone" />
+            <android.support.design.chip.Chip
+                android:id="@+id/log_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_log"
+                android:visibility="gone"/>
 
+            <android.support.design.chip.Chip
+                android:id="@+id/timer_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_timer"
+                android:visibility="gone"/>
 
+            <android.support.design.chip.Chip
+                android:id="@+id/notifications_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_notifications"
+                android:visibility="gone"/>
+        </LinearLayout>
+    </HorizontalScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/log_graph_buttons_row_default.xml b/app/src/main/res/layout/log_graph_buttons_row_default.xml
index 6b219d571..a7cebf421 100644
--- a/app/src/main/res/layout/log_graph_buttons_row_default.xml
+++ b/app/src/main/res/layout/log_graph_buttons_row_default.xml
@@ -21,70 +21,72 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/extra_panel"
-    android:layout_width="wrap_content"
-    android:layout_height="25dp"
-    android:layout_marginBottom="10dp"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
-    android:layout_marginTop="10dp"
-    android:animateLayoutChanges="true"
-    android:orientation="horizontal"
-    android:visibility="gone"
-    tools:visibility="visible">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@+id/extra_panel"
+              android:layout_width="wrap_content"
+              android:layout_height="25dp"
+              android:layout_marginLeft="10dp"
+              android:layout_marginTop="10dp"
+              android:layout_marginRight="10dp"
+              android:layout_marginBottom="10dp"
+              android:animateLayoutChanges="true"
+              android:orientation="horizontal"
+              android:visibility="gone"
+              tools:visibility="visible">
 
-    <com.like.LikeButton
-        android:id="@+id/fav_button"
-        android:layout_width="0dp"
+    <HorizontalScrollView
+        android:id="@+id/hsv"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/rowIcon"
-        android:layout_weight=".20"
-        android:paddingBottom="-25dp"
-        android:paddingTop="-17dp"
-        app:icon_size="20dp"
-        app:icon_type="star" />
+        android:fillViewport="true"
+        android:measureAllChildren="false"
+        android:scrollbars="none">
 
-    <Button
-        android:id="@+id/day_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_day"
-        android:textSize="10dp" />
+        <LinearLayout
+            android:id="@+id/innerLay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-    <Button
-        android:id="@+id/week_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:elevation="0dp"
-        android:text="@string/button_status_week"
-        android:textSize="10dp" />
+            <com.like.LikeButton
+                android:id="@+id/fav_button"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/rowIcon"
+                android:layout_weight=".20"
+                android:paddingTop="-17dp"
+                android:paddingBottom="-25dp"
+                app:icon_size="20dp"
+                app:icon_type="star"/>
 
-    <Button
-        android:id="@+id/month_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:elevation="0dp"
-        android:text="@string/button_status_month"
-        android:textSize="10dp" />
+            <android.support.design.chip.Chip
+                android:id="@+id/day_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_day"/>
 
-    <Button
-        android:id="@+id/year_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:elevation="0dp"
-        android:text="@string/button_status_year"
-        android:textSize="10dp" />
+            <android.support.design.chip.Chip
+                android:id="@+id/week_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_week"/>
+
+            <android.support.design.chip.Chip
+                android:id="@+id/month_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_month"/>
+
+            <android.support.design.chip.Chip
+                android:id="@+id/year_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_year"/>
+        </LinearLayout>
+    </HorizontalScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/log_text_button_row_default.xml b/app/src/main/res/layout/log_text_button_row_default.xml
index 5d7488ef3..8a6b8c459 100644
--- a/app/src/main/res/layout/log_text_button_row_default.xml
+++ b/app/src/main/res/layout/log_text_button_row_default.xml
@@ -19,41 +19,53 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/extra_panel"
-    android:layout_width="wrap_content"
-    android:layout_height="25dp"
-    android:layout_marginBottom="10dp"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
-    android:layout_marginTop="10dp"
-    android:animateLayoutChanges="true"
-    android:orientation="horizontal"
-    android:visibility="gone"
-    tools:visibility="visible">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@+id/extra_panel"
+              android:layout_width="wrap_content"
+              android:layout_height="25dp"
+              android:layout_marginLeft="10dp"
+              android:layout_marginTop="10dp"
+              android:layout_marginRight="10dp"
+              android:layout_marginBottom="10dp"
+              android:animateLayoutChanges="true"
+              android:orientation="horizontal"
+              android:visibility="gone"
+              tools:visibility="visible">
 
-    <com.like.LikeButton
-        android:id="@+id/fav_button"
-        android:layout_width="0dp"
+    <HorizontalScrollView
+        android:id="@+id/hsv"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/rowIcon"
-        android:layout_weight=".20"
-        android:paddingBottom="-25dp"
-        android:paddingTop="-17dp"
-        app:icon_size="20dp"
-        app:icon_type="star" />
+        android:fillViewport="true"
+        android:measureAllChildren="false"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:id="@+id/innerLay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <com.like.LikeButton
+                android:id="@+id/fav_button"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/rowIcon"
+                android:layout_weight=".20"
+                android:paddingTop="-17dp"
+                android:paddingBottom="-25dp"
+                app:icon_size="20dp"
+                app:icon_type="star"/>
 
-    <Button
-        android:id="@+id/log_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_weight=".25"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_log"
-        android:textSize="10dp" />
+            <android.support.design.chip.Chip
+                android:id="@+id/log_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_log"/>
+        </LinearLayout>
+    </HorizontalScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/log_timer_button_row_default.xml b/app/src/main/res/layout/log_timer_button_row_default.xml
index fd3235f65..701f2b373 100644
--- a/app/src/main/res/layout/log_timer_button_row_default.xml
+++ b/app/src/main/res/layout/log_timer_button_row_default.xml
@@ -21,62 +21,68 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/extra_panel"
-    android:layout_width="wrap_content"
-    android:layout_height="25dp"
-    android:layout_marginBottom="10dp"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
-    android:layout_marginTop="10dp"
-    android:animateLayoutChanges="true"
-    android:orientation="horizontal"
-    android:visibility="gone"
-    tools:visibility="visible">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@+id/extra_panel"
+              android:layout_width="wrap_content"
+              android:layout_height="25dp"
+              android:layout_marginLeft="10dp"
+              android:layout_marginTop="10dp"
+              android:layout_marginRight="10dp"
+              android:layout_marginBottom="10dp"
+              android:animateLayoutChanges="true"
+              android:orientation="horizontal"
+              android:visibility="gone"
+              tools:visibility="visible">
 
-    <com.like.LikeButton
-        android:id="@+id/fav_button"
-        android:layout_width="0dp"
+    <HorizontalScrollView
+        android:id="@+id/hsv"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/rowIcon"
-        android:layout_weight=".20"
-        android:paddingBottom="-25dp"
-        android:paddingTop="-17dp"
-        app:icon_size="20dp"
-        app:icon_type="star" />
+        android:fillViewport="true"
+        android:measureAllChildren="false"
+        android:scrollbars="none">
 
-    <Button
-        android:id="@+id/log_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_weight=".20"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_log"
-        android:textSize="12sp" />
+        <LinearLayout
+            android:id="@+id/innerLay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-    <Button
-        android:id="@+id/timer_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_weight=".20"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_timer"
-        android:textSize="12sp" />
+            <com.like.LikeButton
+                android:id="@+id/fav_button"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/rowIcon"
+                android:layout_weight=".20"
+                android:paddingTop="-17dp"
+                android:paddingBottom="-25dp"
+                app:icon_size="20dp"
+                app:icon_type="star"/>
 
-    <Button
-        android:id="@+id/notifications_button"
-        android:layout_width="0dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_weight=".20"
-        android:background="@drawable/button_white_status"
-        android:text="@string/button_status_notifications"
-        android:textSize="12sp" />
+            <android.support.design.chip.Chip
+                android:id="@+id/log_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_log"/>
+
+            <android.support.design.chip.Chip
+                android:id="@+id/timer_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_timer"/>
+
+            <android.support.design.chip.Chip
+                android:id="@+id/notifications_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/button_status_notifications"/>
+
+        </LinearLayout>
+
+    </HorizontalScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/logs_row_default.xml b/app/src/main/res/layout/logs_row_default.xml
index 1ee083d78..9fe29e4f3 100644
--- a/app/src/main/res/layout/logs_row_default.xml
+++ b/app/src/main/res/layout/logs_row_default.xml
@@ -19,21 +19,21 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:padding="10dp"
-    android:paddingLeft="20dp"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:id="@+id/row_global_wrapper"
@@ -54,7 +54,7 @@
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
                 android:paddingRight="5dp"
-                android:src="@drawable/clock48" />
+                android:src="@drawable/clock48"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -66,28 +66,26 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentTop="true"
-                    tools:text="Utility name" />
+                    tools:text="Utility name"/>
 
                 <TextView
                     android:id="@+id/logs_message"
                     style="@style/row_body1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
+                    android:layout_below="@+id/logs_name"
                     android:layout_alignParentStart="true"
-                    android:layout_below="@+id/logs_name" />
+                    android:layout_alignParentLeft="true"/>
 
                 <TextView
                     android:id="@+id/logs_datetime"
                     style="@style/row_body2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
+                    android:layout_below="@+id/logs_message"
                     android:layout_alignParentStart="true"
-                    android:layout_below="@+id/logs_message" />
-
+                    android:layout_alignParentLeft="true"/>
             </RelativeLayout>
         </LinearLayout>
-
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mainpager.xml b/app/src/main/res/layout/mainpager.xml
new file mode 100644
index 000000000..1ad9e6fe3
--- /dev/null
+++ b/app/src/main/res/layout/mainpager.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/activity_main"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <android.support.design.widget.BottomNavigationView
+        android:id="@+id/BottomNavigation"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_alignParentBottom="true"
+        app:menu="@menu/menu_bottom"/>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/vpPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/BottomNavigation"
+        android:layout_alignParentTop="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_item_header.xml b/app/src/main/res/layout/nav_item_header.xml
index f8b567e8c..a829a38ea 100644
--- a/app/src/main/res/layout/nav_item_header.xml
+++ b/app/src/main/res/layout/nav_item_header.xml
@@ -21,18 +21,18 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="178dp"
-    android:background="@drawable/darkheader"
-    android:orientation="vertical"
-    android:weightSum="1">
+                android:layout_width="match_parent"
+                android:layout_height="178dp"
+                android:background="@drawable/darkheader"
+                android:orientation="vertical"
+                android:weightSum="1">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
         android:orientation="vertical">
 
         <TextView
@@ -42,7 +42,7 @@
             android:layout_marginLeft="16dp"
             android:textColor="#ffffff"
             android:textSize="14sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <TextView
             android:id="@+id/email"
@@ -63,5 +63,5 @@
         android:layout_height="70dp"
         android:layout_marginLeft="16dp"
         android:layout_marginTop="38dp"
-        android:src="@drawable/ic_launcher" />
+        android:src="@drawable/ic_launcher"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_item_row.xml b/app/src/main/res/layout/nav_item_row.xml
index 001ec2f19..4a8e14ff6 100644
--- a/app/src/main/res/layout/nav_item_row.xml
+++ b/app/src/main/res/layout/nav_item_row.xml
@@ -21,21 +21,21 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/white"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:orientation="horizontal"
-    android:paddingBottom="13dp"
-    android:paddingTop="13dp">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:background="@color/white"
+              android:foreground="?android:attr/selectableItemBackground"
+              android:orientation="horizontal"
+              android:paddingTop="13dp"
+              android:paddingBottom="13dp">
 
     <ImageView
         android:id="@+id/rowIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="16dp"
-        android:src="@drawable/clock48" />
+        android:src="@drawable/clock48"/>
 
     <TextView
         android:id="@+id/rowText"
@@ -44,6 +44,6 @@
         android:layout_height="wrap_content"
         android:paddingLeft="12dp"
         android:paddingTop="4dp"
-        android:text="Medium Text" />
+        android:text="Medium Text"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nfc_row.xml b/app/src/main/res/layout/nfc_row.xml
index 00f74e1cb..574c869f3 100644
--- a/app/src/main/res/layout/nfc_row.xml
+++ b/app/src/main/res/layout/nfc_row.xml
@@ -21,12 +21,12 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/row_global_wrapper"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:descendantFocusability="blocksDescendants">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@+id/row_global_wrapper"
+                style="@style/background_listview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
         android:id="@+id/row_wrapper"
@@ -35,18 +35,18 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:orientation="horizontal"
-        android:paddingBottom="10dp"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+        android:paddingBottom="10dp">
 
         <CheckBox
             android:id="@+id/enableNFC"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:gravity="center_vertical" />
+            android:gravity="center_vertical"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -59,7 +59,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
-                tools:text="NFC name" />
+                tools:text="NFC name"/>
 
             <TextView
                 android:id="@+id/nfc_tag_id"
@@ -67,19 +67,19 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/nfc_name"
-                tools:text="16a54e3f" />
+                tools:text="16a54e3f"/>
 
             <TextView
                 android:id="@+id/nfc_switchidx"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_below="@+id/nfc_tag_id"
                 android:layout_alignEnd="@+id/nfc_tag_id"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_alignRight="@+id/nfc_tag_id"
-                android:layout_below="@+id/nfc_tag_id"
-                tools:text="Switch IDX: 65484" />
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                tools:text="Switch IDX: 65484"/>
         </RelativeLayout>
     </LinearLayout>
 
@@ -95,14 +95,15 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/remove_button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|right"
             android:background="@drawable/button_status"
             android:text="@string/delete_short"
-            android:textSize="10dp" />
+            android:textSize="10dp"/>
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/plan_row.xml b/app/src/main/res/layout/plan_row.xml
index 1d46d17f9..bcca6eb51 100644
--- a/app/src/main/res/layout/plan_row.xml
+++ b/app/src/main/res/layout/plan_row.xml
@@ -19,23 +19,21 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/row_global_wrapper"
+    android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -49,13 +47,13 @@
             style="@style/row_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:text="Name" />
+            tools:text="Name"/>
 
         <TextView
             android:id="@+id/devices"
             style="@style/row_body1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:text="12 devices" />
+            tools:text="12 devices"/>
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
diff --git a/app/src/main/res/layout/scene_row_default.xml b/app/src/main/res/layout/scene_row_default.xml
index 9a343514b..616443b5d 100644
--- a/app/src/main/res/layout/scene_row_default.xml
+++ b/app/src/main/res/layout/scene_row_default.xml
@@ -19,20 +19,20 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/material_grey_300_"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:padding="10dp"
-    android:paddingLeft="20dp"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:id="@+id/row_global_wrapper"
@@ -51,13 +51,23 @@
             android:orientation="horizontal"
             android:padding="10dp">
 
+            <ImageView
+                android:id="@+id/widget_info_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|start"
+                android:src="@drawable/outline_info_black_18"
+                android:tint="@color/md_grey_300"/>
+
             <ImageView
                 android:id="@+id/rowIcon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
+                android:layout_marginLeft="-15dp"
+                android:contentDescription="@string/error_image_description"
                 android:paddingRight="5dp"
-                android:src="@drawable/clock48" />
+                android:src="@drawable/clock48"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -71,8 +81,8 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_toLeftOf="@+id/linearLayout4"
                         android:layout_toStartOf="@+id/linearLayout4"
+                        android:layout_toLeftOf="@+id/linearLayout4"
                         android:orientation="vertical">
 
                         <TextView
@@ -82,20 +92,20 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentTop="true"
                             android:layout_marginRight="35dp"
-                            android:text="Switch" />
+                            android:text="Switch"/>
 
                         <TextView
                             android:id="@+id/switch_battery_level"
                             style="@style/row_body1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentLeft="true"
-                            android:layout_alignParentStart="true"
                             android:layout_below="@+id/switch_name"
-                            android:layout_toLeftOf="@+id/linearLayout4"
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
                             android:layout_toStartOf="@+id/linearLayout4"
+                            android:layout_toLeftOf="@+id/linearLayout4"
                             android:gravity="center_vertical"
-                            android:text="@string/battery_level" />
+                            android:text="@string/battery_level"/>
 
                         <TextView
                             android:id="@+id/switch_signal_level"
@@ -103,7 +113,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_below="@id/switch_battery_level"
-                            android:text="@string/signal_level" />
+                            android:text="@string/signal_level"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -116,31 +126,33 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
-                        <Button
+                        <android.support.design.button.MaterialButton
                             android:id="@+id/on_button"
+                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                             android:layout_width="60dp"
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
                             android:background="@drawable/button_status"
                             android:text="@string/button_state_on"
-                            android:textSize="10dp" />
+                            android:textSize="10dp"/>
 
-                        <Button
+                        <android.support.design.button.MaterialButton
                             android:id="@+id/off_button"
+                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                             android:layout_width="60dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="7dp"
                             android:layout_weight="1"
                             android:background="@drawable/button_status"
                             android:text="@string/button_state_off"
-                            android:textSize="10dp" />
+                            android:textSize="10dp"/>
                     </LinearLayout>
                 </RelativeLayout>
 
             </LinearLayout>
         </LinearLayout>
 
-        <include layout="@layout/log_timer_button_row_default" />
+        <include layout="@layout/log_timer_button_row_default"/>
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
diff --git a/app/src/main/res/layout/server_row.xml b/app/src/main/res/layout/server_row.xml
index 2bb7b2f0f..78a0a1741 100644
--- a/app/src/main/res/layout/server_row.xml
+++ b/app/src/main/res/layout/server_row.xml
@@ -21,12 +21,12 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/row_global_wrapper"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:descendantFocusability="blocksDescendants">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@+id/row_global_wrapper"
+                style="@style/background_listview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
         android:id="@+id/row_wrapper"
@@ -35,18 +35,18 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:orientation="horizontal"
-        android:paddingBottom="10dp"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+        android:paddingBottom="10dp">
 
         <CheckBox
             android:id="@+id/enableServer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:gravity="center_vertical" />
+            android:gravity="center_vertical"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -58,7 +58,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
-                tools:text="Server name" />
+                tools:text="Server name"/>
 
             <TextView
                 android:id="@+id/server_remote_ip"
@@ -66,17 +66,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/server_name"
-                tools:text="Remote Address" />
+                tools:text="Remote Address"/>
 
             <TextView
                 android:id="@+id/server_local_ip"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_below="@+id/server_remote_ip"
                 android:layout_alignEnd="@+id/server_remote_ip"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/server_remote_ip"
-                tools:text="Local Address" />
+                tools:text="Local Address"/>
 
         </RelativeLayout>
     </LinearLayout>
@@ -93,14 +93,15 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/remove_button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|right"
             android:background="@drawable/button_status"
             android:text="@string/delete_short"
-            android:textSize="10dp" />
+            android:textSize="10dp"/>
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/speech_row.xml b/app/src/main/res/layout/speech_row.xml
index acbf40ea4..8cd647c29 100644
--- a/app/src/main/res/layout/speech_row.xml
+++ b/app/src/main/res/layout/speech_row.xml
@@ -21,12 +21,12 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/row_global_wrapper"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:descendantFocusability="blocksDescendants">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@+id/row_global_wrapper"
+                style="@style/background_listview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
         android:id="@+id/row_wrapper"
@@ -35,18 +35,18 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:orientation="horizontal"
-        android:paddingBottom="10dp"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+        android:paddingBottom="10dp">
 
         <CheckBox
             android:id="@+id/enableSpeech"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:gravity="center_vertical" />
+            android:gravity="center_vertical"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -59,7 +59,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
-                tools:text="Speech name" />
+                tools:text="Speech name"/>
 
             <TextView
                 android:id="@+id/speech_tag_id"
@@ -67,19 +67,19 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/speech_name"
-                tools:text="16a54e3f" />
+                tools:text="16a54e3f"/>
 
             <TextView
                 android:id="@+id/speech_switchidx"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_below="@+id/speech_tag_id"
                 android:layout_alignEnd="@+id/speech_tag_id"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_alignRight="@+id/speech_tag_id"
-                android:layout_below="@+id/speech_tag_id"
-                tools:text="Switch IDX: 65484" />
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                tools:text="Switch IDX: 65484"/>
         </RelativeLayout>
     </LinearLayout>
 
@@ -95,14 +95,15 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <Button
+        <android.support.design.button.MaterialButton
             android:id="@+id/remove_button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|right"
             android:background="@drawable/button_status"
             android:text="@string/delete_short"
-            android:textSize="10dp" />
+            android:textSize="10dp"/>
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_list_item.xml b/app/src/main/res/layout/spinner_list_item.xml
index c5caeb5c8..c9bc575ed 100644
--- a/app/src/main/res/layout/spinner_list_item.xml
+++ b/app/src/main/res/layout/spinner_list_item.xml
@@ -22,13 +22,13 @@
   -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:paddingBottom="5dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:paddingTop="5dp"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
-    android:textColor="@color/default_text_color_light" />
\ No newline at end of file
+          android:id="@android:id/text1"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center_vertical"
+          android:paddingLeft="10dp"
+          android:paddingTop="5dp"
+          android:paddingRight="10dp"
+          android:paddingBottom="5dp"
+          android:textAppearance="?android:attr/textAppearanceListItemSmall"
+          android:textColor="@color/default_text_color_light"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/switch_row_list.xml b/app/src/main/res/layout/switch_row_list.xml
new file mode 100644
index 000000000..d5ae4992b
--- /dev/null
+++ b/app/src/main/res/layout/switch_row_list.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/card_global_wrapper"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:id="@+id/row_global_wrapper"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:background="@color/material_grey_300_"
+                  android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/row_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="horizontal"
+            android:padding="10dp">
+
+
+            <ImageView
+                android:id="@+id/widget_info_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|start"
+                android:src="@drawable/outline_info_black_18"
+                android:tint="@color/md_grey_300"/>
+
+            <ImageView
+                android:id="@+id/rowIcon"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="-15dp"
+                android:contentDescription="@string/error_image_description"
+                android:paddingRight="5dp"
+                android:src="@drawable/clock48"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <RelativeLayout
+                        android:id="@+id/RelativeLayoutContentWrapper"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_toStartOf="@+id/linearLayout7864"
+                            android:layout_toLeftOf="@+id/linearLayout7864"
+                            android:gravity="center_vertical"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/switch_name"
+                                style="@style/row_name"
+                                android:layout_width="fill_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentTop="true"
+                                android:layout_marginRight="35dp"
+                                android:text="Switch"/>
+
+                            <TextView
+                                android:id="@+id/switch_battery_level"
+                                style="@style/row_body1"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@+id/switch_name"
+                                android:layout_alignParentStart="true"
+                                android:layout_alignParentLeft="true"
+                                android:layout_toStartOf="@+id/linearLayout4"
+                                android:layout_toLeftOf="@+id/linearLayout4"
+                                android:gravity="center_vertical"
+                                android:text="@string/battery_level"/>
+
+                            <TextView
+                                android:id="@+id/switch_signal_level"
+                                style="@style/row_body2"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@id/switch_battery_level"
+                                android:text="@string/signal_level"/>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/linearLayout4"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:gravity="center_vertical"
+                            android:orientation="vertical">
+
+                            <Switch
+                                android:id="@+id/switch_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"/>
+
+                            <android.support.design.button.MaterialButton
+                                android:id="@+id/set_button"
+                                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                android:layout_width="56dp"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_gravity="right"
+                                android:text="@string/set_temperature"
+                                android:textSize="10dp"/>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/linearLayout7864"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:gravity="center_vertical"
+                            android:orientation="vertical">
+
+                            <LinearLayout
+                                android:id="@+id/linearLayoutt"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <ImageView
+                                    android:id="@+id/switch_button_up"
+                                    android:layout_width="25dp"
+                                    android:layout_height="25dp"
+                                    android:layout_margin="7dp"
+                                    android:layout_marginTop="10dp"
+                                    android:src="@drawable/baseline_keyboard_arrow_up_black_24"
+                                    android:tint="@color/primary"/>
+
+                                <ImageView
+                                    android:id="@+id/switch_button_stop"
+                                    android:layout_width="25dp"
+                                    android:layout_height="25dp"
+                                    android:layout_margin="7dp"
+                                    android:layout_marginTop="10dp"
+                                    android:src="@drawable/baseline_stop_black_24"
+                                    android:tint="@color/primary"/>
+
+                                <ImageView
+                                    android:id="@+id/switch_button_down"
+                                    android:layout_width="25dp"
+                                    android:layout_height="25dp"
+                                    android:layout_margin="7dp"
+                                    android:layout_marginTop="10dp"
+                                    android:src="@drawable/baseline_keyboard_arrow_down_black_24"
+                                    android:tint="@color/primary"/>
+
+                            </LinearLayout>
+
+                            <TextView
+                                android:id="@+id/switch_dimmer_level"
+                                android:layout_width="wrap_content"
+                                android:layout_height="22dp"
+                                android:layout_gravity="right"
+                                android:layout_marginRight="6dp"
+                                android:text="55%"/>
+
+                            <Spinner
+                                android:id="@+id/spSelector"
+                                android:layout_width="129dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="bottom"
+                                android:minWidth="150dp"/>
+
+                            <LinearLayout
+                                android:id="@+id/linearLayout44"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginBottom="10dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <az.plainpie.PieView
+                                    xmlns:plainpie="http://schemas.android.com/apk/res-auto"
+                                    android:id="@+id/pieView"
+                                    android:layout_width="72dp"
+                                    android:layout_height="73dp"
+                                    android:visibility="gone"
+                                    plainpie:inner_pie_padding="10"
+                                    plainpie:inner_text_visibility="true"
+                                    plainpie:percentage="75"
+                                    plainpie:percentage_size="15"/>
+
+                                <android.support.design.button.MaterialButton
+                                    android:id="@+id/on_button"
+                                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                    android:layout_width="60dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:text="@string/button_state_on"
+                                    android:textSize="10dp"/>
+
+                                <android.support.design.button.MaterialButton
+                                    android:id="@+id/off_button"
+                                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                    android:layout_width="60dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="7dp"
+                                    android:layout_weight="1"
+                                    android:text="@string/button_state_off"
+                                    android:textSize="10dp"/>
+
+                                <Switch
+                                    android:id="@+id/switch_dimmer_switch"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="right"/>
+                            </LinearLayout>
+
+                            <android.support.design.button.MaterialButton
+                                android:id="@+id/color_button"
+                                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_gravity="right"
+                                android:layout_marginTop="5dp"
+                                android:layout_marginBottom="5dp"
+                                android:text="@string/button_color"
+                                android:textSize="10dp"/>
+                        </LinearLayout>
+                    </RelativeLayout>
+
+                    <SeekBar
+                        android:id="@+id/switch_dimmer"
+                        android:layout_width="129dp"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/RelativeLayoutContentWrapper"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:layout_gravity="bottom"
+                        android:paddingTop="15dp"/>
+                </RelativeLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <include layout="@layout/log_timer_button_row_default"/>
+    </LinearLayout>
+
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/temperature_row_default.xml b/app/src/main/res/layout/temperature_row_default.xml
index e599082c6..81cebcc79 100644
--- a/app/src/main/res/layout/temperature_row_default.xml
+++ b/app/src/main/res/layout/temperature_row_default.xml
@@ -19,22 +19,22 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:plainpie="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/material_grey_300_"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:padding="10dp"
-    android:paddingLeft="20dp"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:id="@+id/row_global_wrapper"
@@ -53,19 +53,30 @@
             android:orientation="horizontal"
             android:padding="10dp">
 
+
+            <ImageView
+                android:id="@+id/widget_info_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|start"
+                android:src="@drawable/outline_info_black_18"
+                android:tint="@color/md_grey_300"/>
+
             <ImageView
                 android:id="@+id/rowIcon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:contentDescription="@string/row_icon_description"
-                tools:src="@drawable/clock48" />
+                android:layout_marginLeft="-15dp"
+                android:contentDescription="@string/error_image_description"
+                android:paddingRight="5dp"
+                android:src="@drawable/clock48"/>
 
             <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:orientation="vertical">
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginBottom="10dp"
+                          android:orientation="vertical">
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
@@ -74,8 +85,8 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_toLeftOf="@+id/linearLayout4"
                         android:layout_toStartOf="@+id/linearLayout4"
+                        android:layout_toLeftOf="@+id/linearLayout4"
                         android:orientation="vertical">
 
                         <TextView
@@ -84,17 +95,17 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentTop="true"
-                            tools:text="Utility name" />
+                            tools:text="Utility name"/>
 
                         <TextView
                             android:id="@+id/temperature_data"
                             style="@style/row_body1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentLeft="true"
-                            android:layout_alignParentStart="true"
                             android:layout_below="@+id/temperature_name"
-                            android:text="@string/temperature" />
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            android:text="@string/temperature"/>
 
                         <LinearLayout
                             android:layout_width="175dp"
@@ -106,17 +117,17 @@
                                 style="@style/row_body2"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_below="@+id/temperature_data"
                                 android:layout_alignParentStart="true"
                                 android:layout_alignParentLeft="true"
-                                android:layout_below="@+id/temperature_data"
-                                android:text="@string/temperature" />
+                                android:text="@string/temperature"/>
 
                             <ImageView
                                 android:id="@+id/mode_icon"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:paddingLeft="5dp"
-                                android:src="@drawable/ic_schedule_black_18dp" />
+                                android:src="@drawable/ic_schedule_black_18dp"/>
                         </LinearLayout>
                     </LinearLayout>
 
@@ -128,21 +139,22 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical">
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
                         <az.plainpie.PieView
                             android:id="@+id/pieView"
                             android:layout_width="72dp"
                             android:layout_height="73dp"
+                            android:visibility="gone"
                             plainpie:inner_pie_padding="10"
+                            plainpie:inner_text_visibility="true"
                             plainpie:percentage="75"
-                            android:visibility="gone"
-                            plainpie:percentage_size="15"
-                            plainpie:inner_text_visibility="true"/>
+                            plainpie:percentage_size="15"/>
 
-                        <Button
+                        <android.support.design.button.MaterialButton
                             android:id="@+id/set_button"
+                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                             android:layout_width="56dp"
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
@@ -150,14 +162,14 @@
                             android:layout_gravity="right"
                             android:background="@drawable/button_status"
                             android:text="@string/set_temperature"
-                            android:textSize="10dp" />
+                            android:textSize="10dp"/>
 
                     </LinearLayout>
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>
 
-        <include layout="@layout/log_graph_buttons_row_default" />
+        <include layout="@layout/log_graph_buttons_row_default"/>
 
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timer_row.xml b/app/src/main/res/layout/timer_row.xml
index 61d429369..92c0af129 100644
--- a/app/src/main/res/layout/timer_row.xml
+++ b/app/src/main/res/layout/timer_row.xml
@@ -21,10 +21,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <TextView
         android:id="@+id/switch_name"
@@ -32,22 +32,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        tools:text="Switch name" />
+        tools:text="Switch name"/>
 
     <TextView
         android:id="@+id/switch_battery_level"
         style="@style/row_body1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:text="@string/battery_level" />
+        android:layout_alignParentLeft="true"
+        android:text="@string/battery_level"/>
 
     <TextView
         android:id="@+id/switch_signal_level"
         style="@style/row_body2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/signal_level" />
+        android:text="@string/signal_level"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/utilities_row_default.xml b/app/src/main/res/layout/utilities_row_default.xml
index d04b5b670..2f28d35ee 100644
--- a/app/src/main/res/layout/utilities_row_default.xml
+++ b/app/src/main/res/layout/utilities_row_default.xml
@@ -19,21 +19,21 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/material_grey_300_"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:padding="10dp"
-    android:paddingLeft="20dp"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:id="@+id/row_global_wrapper"
@@ -52,13 +52,23 @@
             android:orientation="horizontal"
             android:padding="10dp">
 
+            <ImageView
+                android:id="@+id/widget_info_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|start"
+                android:src="@drawable/outline_info_black_18"
+                android:tint="@color/md_grey_300"/>
+
             <ImageView
                 android:id="@+id/rowIcon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
+                android:layout_marginLeft="-15dp"
+                android:contentDescription="@string/error_image_description"
                 android:paddingRight="5dp"
-                android:src="@drawable/clock48" />
+                android:src="@drawable/clock48"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -72,27 +82,27 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentTop="true"
-                    tools:text="Utility name" />
+                    tools:text="Utility name"/>
 
                 <TextView
                     android:id="@+id/utilities_hardware"
                     style="@style/row_body1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
                     android:layout_below="@+id/utilities_name"
-                    android:text="@string/hardware" />
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:text="@string/hardware"/>
 
                 <TextView
                     android:id="@+id/utilities_data"
                     style="@style/row_body2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
                     android:layout_below="@+id/utilities_hardware"
-                    android:text="@string/data" />
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:text="@string/data"/>
 
             </LinearLayout>
 
@@ -102,21 +112,22 @@
                 android:layout_gravity="center"
                 android:orientation="horizontal">
 
-                <Button
+                <android.support.design.button.MaterialButton
                     android:id="@+id/on_button"
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="60dp"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/button_status"
                     android:text="@string/button_state_on"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
             </LinearLayout>
 
         </LinearLayout>
 
-        <include layout="@layout/log_all_buttons" />
+        <include layout="@layout/log_all_buttons"/>
 
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
diff --git a/app/src/main/res/layout/vars_row_default.xml b/app/src/main/res/layout/vars_row_default.xml
index 17c656736..f775d4001 100644
--- a/app/src/main/res/layout/vars_row_default.xml
+++ b/app/src/main/res/layout/vars_row_default.xml
@@ -19,22 +19,21 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/material_grey_300_"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:padding="10dp"
-    android:paddingLeft="20dp"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:id="@+id/row_global_wrapper"
@@ -58,7 +57,7 @@
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
                 android:paddingRight="5dp"
-                android:src="@drawable/clock48" />
+                android:src="@drawable/clock48"/>
 
             <RelativeLayout
                 android:layout_width="wrap_content"
@@ -71,39 +70,39 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentTop="true"
-                    tools:text="Utility name" />
+                    tools:text="Utility name"/>
 
                 <TextView
                     android:id="@+id/logs_message"
                     style="@style/row_body1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
+                    android:layout_below="@+id/logs_name"
                     android:layout_alignParentStart="true"
-                    android:layout_below="@+id/logs_name" />
+                    android:layout_alignParentLeft="true"/>
 
                 <TextView
                     android:id="@+id/logs_datetime"
                     style="@style/row_body2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
+                    android:layout_below="@+id/logs_message"
                     android:layout_alignParentStart="true"
-                    android:layout_below="@+id/logs_message" />
+                    android:layout_alignParentLeft="true"/>
             </RelativeLayout>
 
-            <Button
+            <android.support.design.button.MaterialButton
                 android:id="@+id/set_uservar"
-                android:layout_width="60dp"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_gravity="center"
-                android:layout_weight="0.04"
-                android:background="@drawable/button_status"
                 android:text="@string/set_temperature"
-                android:textSize="10dp" />
+                app:cornerRadius="5dp"
+                app:rippleColor="@color/primary"/>
         </LinearLayout>
-
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/weather_row_default.xml b/app/src/main/res/layout/weather_row_default.xml
index c3ff71866..fd43af5db 100644
--- a/app/src/main/res/layout/weather_row_default.xml
+++ b/app/src/main/res/layout/weather_row_default.xml
@@ -19,22 +19,22 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:plainpie="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_global_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/material_grey_300_"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:padding="10dp"
-    android:paddingLeft="20dp"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardUseCompatPadding="true">
+    android:padding="8dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp">
 
     <LinearLayout
         android:id="@+id/row_global_wrapper"
@@ -53,19 +53,29 @@
             android:orientation="horizontal"
             android:padding="10dp">
 
+            <ImageView
+                android:id="@+id/widget_info_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|start"
+                android:src="@drawable/outline_info_black_18"
+                android:tint="@color/md_grey_300"/>
+
             <ImageView
                 android:id="@+id/rowIcon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:contentDescription="@string/row_icon_description"
-                tools:src="@drawable/clock48" />
+                android:layout_marginLeft="-15dp"
+                android:contentDescription="@string/error_image_description"
+                android:paddingRight="5dp"
+                android:src="@drawable/clock48"/>
 
             <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:orientation="vertical">
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginBottom="10dp"
+                          android:orientation="vertical">
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
@@ -74,8 +84,8 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_toLeftOf="@+id/linearLayout4"
                         android:layout_toStartOf="@+id/linearLayout4"
+                        android:layout_toLeftOf="@+id/linearLayout4"
                         android:orientation="vertical">
 
                         <TextView
@@ -83,21 +93,21 @@
                             style="@style/row_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            tools:text="Utility name" />
+                            tools:text="Utility name"/>
 
                         <TextView
                             android:id="@+id/weather_hardware"
                             style="@style/row_body1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            tools:text="Hardware" />
+                            tools:text="Hardware"/>
 
                         <TextView
                             android:id="@+id/weather_data"
                             style="@style/row_body2"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            tools:text="189.00 S, Speed: 3.1m/s, Temp: 10 C, Chill: 10,5 C" />
+                            tools:text="189.00 S, Speed: 3.1m/s, Temp: 10 C, Chill: 10,5 C"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -108,25 +118,25 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical">
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
                         <az.plainpie.PieView
                             android:id="@+id/pieView"
                             android:layout_width="72dp"
                             android:layout_height="73dp"
+                            android:visibility="gone"
                             plainpie:inner_pie_padding="10"
+                            plainpie:inner_text_visibility="true"
                             plainpie:percentage="75"
-                            plainpie:percentage_size="15"
-                            android:visibility="gone"
-                            plainpie:inner_text_visibility="true"/>
+                            plainpie:percentage_size="15"/>
 
                     </LinearLayout>
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>
 
-        <include layout="@layout/log_graph_buttons_row_default" />
+        <include layout="@layout/log_graph_buttons_row_default"/>
 
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_configuration.xml b/app/src/main/res/layout/widget_configuration.xml
index dafb10d2c..9c7867ee6 100644
--- a/app/src/main/res/layout/widget_configuration.xml
+++ b/app/src/main/res/layout/widget_configuration.xml
@@ -21,16 +21,16 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
 
-    android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical">
+              android:foreground="?android:attr/selectableItemBackground"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:orientation="vertical">
 
     <ListView
         android:id="@+id/list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_configuration_row.xml b/app/src/main/res/layout/widget_configuration_row.xml
index 688dca76b..6378c4892 100644
--- a/app/src/main/res/layout/widget_configuration_row.xml
+++ b/app/src/main/res/layout/widget_configuration_row.xml
@@ -21,17 +21,17 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/row_global_wrapper"
-    style="@style/background_listview"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@+id/row_global_wrapper"
+                style="@style/background_listview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:orientation="horizontal"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:paddingRight="?android:attr/listPreferredItemPaddingRight">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -40,7 +40,7 @@
         android:layout_centerVertical="true"
         android:layout_gravity="center_vertical"
         android:paddingRight="5dp"
-        android:src="@drawable/clock48" />
+        android:src="@drawable/clock48"/>
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -56,14 +56,14 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_centerVertical="true"
-            tools:text="Switch name" />
+            tools:text="Switch name"/>
 
         <TextView
             android:id="@+id/switch_battery_level"
             style="@style/row_body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/battery_level" />
+            android:text="@string/battery_level"/>
     </LinearLayout>
 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/widget_layout.xml b/app/src/main/res/layout/widget_layout.xml
index 6d767358b..85102c63c 100644
--- a/app/src/main/res/layout/widget_layout.xml
+++ b/app/src/main/res/layout/widget_layout.xml
@@ -21,12 +21,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_bg_clickable"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_bg_clickable"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -35,13 +35,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -49,6 +49,7 @@
 
             <TextView
                 android:id="@+id/title"
+                style="@style/row_name_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
@@ -56,20 +57,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                style="@style/row_name_small"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -91,7 +91,7 @@
                     android:background="@drawable/button_status"
                     android:text="@string/button_state_on"
                     android:textColor="@color/black"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_layout_blinds.xml b/app/src/main/res/layout/widget_layout_blinds.xml
index 6e279cb4c..e49c7d20c 100644
--- a/app/src/main/res/layout/widget_layout_blinds.xml
+++ b/app/src/main/res/layout/widget_layout_blinds.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_bg_clickable"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_bg_clickable"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -14,13 +14,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -36,19 +36,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -64,27 +64,27 @@
                     android:id="@+id/switch_button_up"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_arrow_up"
                     android:layout_margin="5dp"
                     android:background="@drawable/button_status"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_arrow_up"
+                    android:textSize="10dp"/>
 
                 <ImageButton
                     android:id="@+id/switch_button_stop"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_stop"
                     android:background="@drawable/button_status"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_stop"
+                    android:textSize="10dp"/>
 
                 <ImageButton
                     android:id="@+id/switch_button_down"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_arrow_down"
                     android:layout_margin="5dp"
                     android:background="@drawable/button_status"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_arrow_down"
+                    android:textSize="10dp"/>
             </LinearLayout>
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_layout_blinds_dark.xml b/app/src/main/res/layout/widget_layout_blinds_dark.xml
index 45ea22e0a..ed8689c81 100644
--- a/app/src/main/res/layout/widget_layout_blinds_dark.xml
+++ b/app/src/main/res/layout/widget_layout_blinds_dark.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_dark_bg_clickable"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_dark_bg_clickable"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -14,13 +14,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -36,19 +36,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -64,27 +64,27 @@
                     android:id="@+id/switch_button_up"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_arrow_up"
                     android:layout_margin="5dp"
                     android:background="@drawable/button_status_dark"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_arrow_up"
+                    android:textSize="10dp"/>
 
                 <ImageButton
                     android:id="@+id/switch_button_stop"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_stop"
                     android:background="@drawable/button_status_dark"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_stop"
+                    android:textSize="10dp"/>
 
                 <ImageButton
                     android:id="@+id/switch_button_down"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_arrow_down"
                     android:layout_margin="5dp"
                     android:background="@drawable/button_status_dark"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_arrow_down"
+                    android:textSize="10dp"/>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_layout_blinds_transparent.xml b/app/src/main/res/layout/widget_layout_blinds_transparent.xml
index df36099b2..13c3fedbc 100644
--- a/app/src/main/res/layout/widget_layout_blinds_transparent.xml
+++ b/app/src/main/res/layout/widget_layout_blinds_transparent.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -13,13 +13,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -35,19 +35,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -63,27 +63,27 @@
                     android:id="@+id/switch_button_up"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_arrow_up"
                     android:layout_margin="5dp"
                     android:background="@drawable/button_status"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_arrow_up"
+                    android:textSize="10dp"/>
 
                 <ImageButton
                     android:id="@+id/switch_button_stop"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_stop"
                     android:background="@drawable/button_status"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_stop"
+                    android:textSize="10dp"/>
 
                 <ImageButton
                     android:id="@+id/switch_button_down"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_arrow_down"
                     android:layout_margin="5dp"
                     android:background="@drawable/button_status"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_arrow_down"
+                    android:textSize="10dp"/>
             </LinearLayout>
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_layout_blinds_transparent_dark.xml b/app/src/main/res/layout/widget_layout_blinds_transparent_dark.xml
index c1a0fecbb..caf888cfc 100644
--- a/app/src/main/res/layout/widget_layout_blinds_transparent_dark.xml
+++ b/app/src/main/res/layout/widget_layout_blinds_transparent_dark.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -13,13 +13,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -42,12 +42,12 @@
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -63,30 +63,30 @@
                     android:id="@+id/switch_button_up"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/white"
-                    android:src="@drawable/ic_arrow_up"
                     android:layout_margin="5dp"
                     android:background="@drawable/button_status_dark"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_arrow_up"
+                    android:textColor="@color/white"
+                    android:textSize="10dp"/>
 
                 <ImageButton
                     android:id="@+id/switch_button_stop"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/white"
-                    android:src="@drawable/ic_stop"
                     android:background="@drawable/button_status_dark"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_stop"
+                    android:textColor="@color/white"
+                    android:textSize="10dp"/>
 
                 <ImageButton
                     android:id="@+id/switch_button_down"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_arrow_down"
                     android:layout_margin="5dp"
-                    android:textColor="@color/white"
                     android:background="@drawable/button_status_dark"
-                    android:textSize="10dp" />
+                    android:src="@drawable/ic_arrow_down"
+                    android:textColor="@color/white"
+                    android:textSize="10dp"/>
             </LinearLayout>
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_layout_buttons.xml b/app/src/main/res/layout/widget_layout_buttons.xml
index 49a742397..2653d0f83 100644
--- a/app/src/main/res/layout/widget_layout_buttons.xml
+++ b/app/src/main/res/layout/widget_layout_buttons.xml
@@ -21,12 +21,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_bg_clickable"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_bg_clickable"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -35,13 +35,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -57,19 +57,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -91,7 +91,7 @@
                     android:background="@drawable/button_status"
                     android:text="@string/button_state_on"
                     android:textColor="@color/black"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
                 <Button
                     android:id="@+id/off_button"
@@ -103,7 +103,7 @@
                     android:background="@drawable/button_status"
                     android:text="@string/button_state_off"
                     android:textColor="@color/black"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_layout_buttons_dark.xml b/app/src/main/res/layout/widget_layout_buttons_dark.xml
index 333050b2f..1d301ffaf 100644
--- a/app/src/main/res/layout/widget_layout_buttons_dark.xml
+++ b/app/src/main/res/layout/widget_layout_buttons_dark.xml
@@ -21,12 +21,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_dark_bg_clickable"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_dark_bg_clickable"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -35,13 +35,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -57,19 +57,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -91,7 +91,7 @@
                     android:background="@drawable/button_status_dark"
                     android:text="@string/button_state_on"
                     android:textColor="@color/white"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
                 <Button
                     android:id="@+id/off_button"
@@ -103,7 +103,7 @@
                     android:background="@drawable/button_status_dark"
                     android:text="@string/button_state_off"
                     android:textColor="@color/white"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_layout_buttons_transparent.xml b/app/src/main/res/layout/widget_layout_buttons_transparent.xml
index c234dfbe6..d4316616d 100644
--- a/app/src/main/res/layout/widget_layout_buttons_transparent.xml
+++ b/app/src/main/res/layout/widget_layout_buttons_transparent.xml
@@ -21,11 +21,11 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -34,13 +34,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -56,19 +56,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -90,7 +90,7 @@
                     android:background="@drawable/button_status"
                     android:text="@string/button_state_on"
                     android:textColor="@color/black"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
                 <Button
                     android:id="@+id/off_button"
@@ -102,7 +102,7 @@
                     android:background="@drawable/button_status"
                     android:text="@string/button_state_off"
                     android:textColor="@color/black"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_layout_buttons_transparent_dark.xml b/app/src/main/res/layout/widget_layout_buttons_transparent_dark.xml
index 9f0733c59..d751e7e08 100644
--- a/app/src/main/res/layout/widget_layout_buttons_transparent_dark.xml
+++ b/app/src/main/res/layout/widget_layout_buttons_transparent_dark.xml
@@ -21,11 +21,11 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -34,13 +34,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -56,19 +56,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -90,7 +90,7 @@
                     android:background="@drawable/button_status_dark"
                     android:text="@string/button_state_on"
                     android:textColor="@color/white"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
                 <Button
                     android:id="@+id/off_button"
@@ -98,11 +98,11 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:textColor="@color/white"
                     android:layout_marginRight="10dp"
                     android:background="@drawable/button_status_dark"
                     android:text="@string/button_state_off"
-                    android:textSize="10dp" />
+                    android:textColor="@color/white"
+                    android:textSize="10dp"/>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_layout_dark.xml b/app/src/main/res/layout/widget_layout_dark.xml
index 5bd9fde74..6d921bf4f 100644
--- a/app/src/main/res/layout/widget_layout_dark.xml
+++ b/app/src/main/res/layout/widget_layout_dark.xml
@@ -21,12 +21,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_dark_bg_clickable"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_dark_bg_clickable"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -35,13 +35,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -57,19 +57,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -91,7 +91,7 @@
                     android:background="@drawable/button_status_dark"
                     android:text="@string/button_state_on"
                     android:textColor="@color/black"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_layout_default.xml b/app/src/main/res/layout/widget_layout_default.xml
index 5f4675bb0..d932176a8 100644
--- a/app/src/main/res/layout/widget_layout_default.xml
+++ b/app/src/main/res/layout/widget_layout_default.xml
@@ -21,12 +21,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_bg_clickable"
-    android:orientation="horizontal">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_bg_clickable"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -35,13 +35,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/clock48" />
+        android:src="@drawable/clock48"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -56,19 +56,19 @@
                 android:layout_marginBottom="0dp"
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
-                android:textColor="@color/primary_dark"
-                tools:text="Switch name" />
+                android:textColor="@color/secondary_dark"
+                tools:text="Switch name"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:text="@string/battery_level"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_layout_default_dark.xml b/app/src/main/res/layout/widget_layout_default_dark.xml
index df7e63a1b..5dffa5096 100644
--- a/app/src/main/res/layout/widget_layout_default_dark.xml
+++ b/app/src/main/res/layout/widget_layout_default_dark.xml
@@ -21,12 +21,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_dark_bg_clickable"
-    android:orientation="horizontal">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_dark_bg_clickable"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -35,13 +35,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/clock48" />
+        android:src="@drawable/clock48"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -57,18 +57,18 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:textColor="@color/white"
-                tools:text="Switch name" />
+                tools:text="Switch name"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:text="@string/battery_level"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_layout_transparent.xml b/app/src/main/res/layout/widget_layout_transparent.xml
index 4a8073912..07745a67f 100644
--- a/app/src/main/res/layout/widget_layout_transparent.xml
+++ b/app/src/main/res/layout/widget_layout_transparent.xml
@@ -21,11 +21,11 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -34,13 +34,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -56,19 +56,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -90,7 +90,7 @@
                     android:background="@drawable/button_status"
                     android:text="@string/button_state_on"
                     android:textColor="@color/black"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_layout_transparent_dark.xml b/app/src/main/res/layout/widget_layout_transparent_dark.xml
index 9ee829386..036596763 100644
--- a/app/src/main/res/layout/widget_layout_transparent_dark.xml
+++ b/app/src/main/res/layout/widget_layout_transparent_dark.xml
@@ -21,11 +21,11 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:orientation="horizontal">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_margin="5sp"
+              android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/rowIcon"
@@ -34,13 +34,13 @@
         android:layout_gravity="center_vertical"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        android:src="@drawable/defaultimage"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -56,19 +56,19 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -90,7 +90,7 @@
                     android:background="@drawable/button_status_dark"
                     android:text="@string/button_state_on"
                     android:textColor="@color/white"
-                    android:textSize="10dp" />
+                    android:textSize="10dp"/>
             </LinearLayout>
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_security_configuration.xml b/app/src/main/res/layout/widget_security_configuration.xml
index 1e47a5764..47b229be1 100644
--- a/app/src/main/res/layout/widget_security_configuration.xml
+++ b/app/src/main/res/layout/widget_security_configuration.xml
@@ -21,23 +21,22 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:foreground="?android:attr/selectableItemBackground"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:foreground="?android:attr/selectableItemBackground"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:orientation="vertical">
 
     <TextView
         android:id="@+id/title"
+        style="@style/row_name_small"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:paddingBottom="10dp"
         android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:text="@string/title_security_panel"
-        style="@style/row_name_small"
-        android:textColor="@color/primary_dark" />
+        android:textColor="@color/secondary_dark"/>
 
     <TextView
         android:id="@+id/status"
@@ -46,37 +45,38 @@
         android:gravity="center_horizontal"
         android:paddingBottom="20dp"
         android:text="Status: Armed"
-        android:textSize="@dimen/text_size_small" />
+        android:textSize="@dimen/text_size_small"/>
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/input_securitypin"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <EditText
             android:id="@+id/securitypin"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toLeftOf="@+id/linearLayout5"
-            android:layout_toStartOf="@+id/linearLayout5"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_toStartOf="@+id/linearLayout5"
+            android:layout_toLeftOf="@+id/linearLayout5"
+            android:hint="@string/security_pin"
             android:inputType="number"
-            android:textColor="@color/white"
-            android:hint="@string/security_pin" />
+            android:textColor="@color/white"/>
     </android.support.design.widget.TextInputLayout>
 
     <Button
         android:id="@+id/checkpin"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
+        android:layout_marginRight="10dp"
         android:background="@drawable/button_status"
         android:text="@string/ok"
-        android:textSize="12dp" />
+        android:textSize="12dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_security_layout.xml b/app/src/main/res/layout/widget_security_layout.xml
index 6428ce103..569453789 100644
--- a/app/src/main/res/layout/widget_security_layout.xml
+++ b/app/src/main/res/layout/widget_security_layout.xml
@@ -1,113 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <!--
-      ~ Copyright (C) 2015 Domoticz - Mark Heinis
-      ~
-      ~  Licensed to the Apache Software Foundation (ASF) under one
-      ~  or more contributor license agreements.  See the NOTICE file
-      ~  distributed with this work for additional information
-      ~  regarding copyright ownership.  The ASF licenses this file
-      ~  to you under the Apache License, Version 2.0 (the
-      ~  "License"); you may not use this file except in compliance
-      ~  with the License.  You may obtain a copy of the License at
-      ~
-      ~  http://www.apache.org/licenses/LICENSE-2.0
-      ~
-      ~  Unless required by applicable law or agreed to in writing,
-      ~  software distributed under the License is distributed on an
-      ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-      ~  KIND, either express or implied.  See the License for the
-      ~  specific language governing permissions and limitations
-      ~  under the License.
-      -->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-    android:background="@drawable/appwidget_bg_clickable"
-android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@drawable/appwidget_bg_clickable"
+              android:orientation="vertical">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-    <ImageView
-        android:id="@+id/rowIcon"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_gravity="center_vertical"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
 
-<TextView
-    android:id="@+id/title"
-    android:layout_width="290dp"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
-    android:paddingBottom="10dp"
-    android:paddingTop="10dp"
-    android:text="Security Panel"
-    style="@style/row_name_small"
-    android:textColor="@color/primary_dark" />
+        <ImageView
+            android:id="@+id/rowIcon"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_vertical"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:src="@drawable/defaultimage"/>
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/row_name_small"
+            android:layout_width="290dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:text="Security Panel"
+            android:textColor="@color/secondary_dark"/>
     </LinearLayout>
 
-<TextView
-    android:id="@+id/status"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
-    android:paddingBottom="10dp"
-    android:textColor="@color/primary_dark"
-    android:text="Status: Armed"
-    android:textSize="@dimen/text_size_small" />
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingBottom="10dp"
+        android:text="Status: Armed"
+        android:textColor="@color/secondary_dark"
+        android:textSize="@dimen/text_size_small"/>
 
     <LinearLayout
         android:id="@+id/linearLayout5"
         android:layout_width="match_parent"
         android:layout_height="73dp"
-        android:orientation="horizontal"
         android:layout_alignTop="@+id/securitypin"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/armhome"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status"
             android:text="@string/security_arm_home"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
 
         <Button
             android:id="@+id/armaway"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status"
             android:text="@string/security_arm_away"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
 
         <Button
             android:id="@+id/disarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status"
             android:text="@string/security_disarm"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/widget_security_layout_dark.xml b/app/src/main/res/layout/widget_security_layout_dark.xml
index 827f26d23..6f545d5fb 100644
--- a/app/src/main/res/layout/widget_security_layout_dark.xml
+++ b/app/src/main/res/layout/widget_security_layout_dark.xml
@@ -21,15 +21,16 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/appwidget_dark_bg_clickable"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@drawable/appwidget_dark_bg_clickable"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
         <ImageView
             android:id="@+id/rowIcon"
             android:layout_width="50dp"
@@ -37,18 +38,18 @@
             android:layout_gravity="center_vertical"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:src="@drawable/defaultimage" />
+            android:src="@drawable/defaultimage"/>
 
         <TextView
             android:id="@+id/title"
+            style="@style/row_name_small"
             android:layout_width="290dp"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:paddingBottom="10dp"
             android:paddingTop="10dp"
+            android:paddingBottom="10dp"
             android:text="Security Panel"
-            style="@style/row_name_small"
-            android:textColor="@color/white" />
+            android:textColor="@color/white"/>
     </LinearLayout>
 
     <TextView
@@ -57,58 +58,58 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:paddingBottom="10dp"
-        android:textColor="@color/white"
         android:text="Status: Armed"
-        android:textSize="@dimen/text_size_small" />
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_size_small"/>
 
     <LinearLayout
         android:id="@+id/linearLayout5"
         android:layout_width="match_parent"
         android:layout_height="73dp"
-        android:orientation="horizontal"
         android:layout_alignTop="@+id/securitypin"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/armhome"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status_dark"
             android:text="@string/security_arm_home"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
 
         <Button
             android:id="@+id/armaway"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status_dark"
             android:text="@string/security_arm_away"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
 
         <Button
             android:id="@+id/disarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status_dark"
             android:text="@string/security_disarm"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/widget_security_layout_transparent.xml b/app/src/main/res/layout/widget_security_layout_transparent.xml
index e6e52abd1..dabae567f 100644
--- a/app/src/main/res/layout/widget_security_layout_transparent.xml
+++ b/app/src/main/res/layout/widget_security_layout_transparent.xml
@@ -21,13 +21,15 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
         <ImageView
             android:id="@+id/rowIcon"
             android:layout_width="50dp"
@@ -35,18 +37,18 @@
             android:layout_gravity="center_vertical"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:src="@drawable/defaultimage" />
+            android:src="@drawable/defaultimage"/>
 
         <TextView
             android:id="@+id/title"
+            style="@style/row_name_small"
             android:layout_width="290dp"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:paddingBottom="10dp"
             android:paddingTop="10dp"
+            android:paddingBottom="10dp"
             android:text="Security Panel"
-            style="@style/row_name_small"
-            android:textColor="@color/primary_dark" />
+            android:textColor="@color/secondary_dark"/>
     </LinearLayout>
 
     <TextView
@@ -55,58 +57,58 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:paddingBottom="10dp"
-        android:textColor="@color/primary_dark"
         android:text="Status: Armed"
-        android:textSize="@dimen/text_size_small" />
+        android:textColor="@color/secondary_dark"
+        android:textSize="@dimen/text_size_small"/>
 
     <LinearLayout
         android:id="@+id/linearLayout5"
         android:layout_width="match_parent"
         android:layout_height="73dp"
-        android:orientation="horizontal"
         android:layout_alignTop="@+id/securitypin"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/armhome"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status"
             android:text="@string/security_arm_home"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
 
         <Button
             android:id="@+id/armaway"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status"
             android:text="@string/security_arm_away"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
 
         <Button
             android:id="@+id/disarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
             android:layout_weight="1"
             android:background="@drawable/button_status"
             android:text="@string/security_disarm"
-            android:textSize="12dp" />
+            android:textSize="12dp"/>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/widget_security_layout_transparent_dark.xml b/app/src/main/res/layout/widget_security_layout_transparent_dark.xml
index 599753e95..7104d8fbb 100644
--- a/app/src/main/res/layout/widget_security_layout_transparent_dark.xml
+++ b/app/src/main/res/layout/widget_security_layout_transparent_dark.xml
@@ -21,14 +21,15 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
         <ImageView
             android:id="@+id/rowIcon"
             android:layout_width="50dp"
@@ -36,18 +37,18 @@
             android:layout_gravity="center_vertical"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:src="@drawable/defaultimage" />
+            android:src="@drawable/defaultimage"/>
 
         <TextView
             android:id="@+id/title"
+            style="@style/row_name_small"
             android:layout_width="290dp"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:paddingBottom="10dp"
             android:paddingTop="10dp"
+            android:paddingBottom="10dp"
             android:text="Security Panel"
-            style="@style/row_name_small"
-            android:textColor="@color/white" />
+            android:textColor="@color/white"/>
     </LinearLayout>
 
     <TextView
@@ -56,61 +57,61 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:paddingBottom="10dp"
-        android:textColor="@color/white"
         android:text="Status: Armed"
-        android:textSize="@dimen/text_size_small" />
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_size_small"/>
 
     <LinearLayout
         android:id="@+id/linearLayout5"
         android:layout_width="match_parent"
         android:layout_height="73dp"
-        android:orientation="horizontal"
         android:layout_alignTop="@+id/securitypin"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/armhome"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
-            android:textColor="@color/white"
             android:layout_weight="1"
             android:background="@drawable/button_status_dark"
             android:text="@string/security_arm_home"
-            android:textSize="12dp" />
+            android:textColor="@color/white"
+            android:textSize="12dp"/>
 
         <Button
             android:id="@+id/armaway"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
-            android:textColor="@color/white"
             android:layout_weight="1"
             android:background="@drawable/button_status_dark"
             android:text="@string/security_arm_away"
-            android:textSize="12dp" />
+            android:textColor="@color/white"
+            android:textSize="12dp"/>
 
         <Button
             android:id="@+id/disarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
             android:layout_weight="1"
-            android:textColor="@color/white"
             android:background="@drawable/button_status_dark"
             android:text="@string/security_disarm"
-            android:textSize="12dp" />
+            android:textColor="@color/white"
+            android:textSize="12dp"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_small_layout.xml b/app/src/main/res/layout/widget_small_layout.xml
index 161ff466d..6ab4c75e2 100644
--- a/app/src/main/res/layout/widget_small_layout.xml
+++ b/app/src/main/res/layout/widget_small_layout.xml
@@ -21,13 +21,13 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_bg_clickable"
-    android:layout_gravity="center"
-    android:orientation="vertical">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_gravity="center"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_bg_clickable"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -35,18 +35,18 @@
         android:gravity="center"
         android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/rowIcon"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:src="@drawable/defaultimage" />
+        <ImageView
+            android:id="@+id/rowIcon"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:src="@drawable/defaultimage"/>
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/title"
@@ -56,21 +56,21 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginBottom="0dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:visibility="gone"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"
+                android:visibility="gone"/>
 
         </LinearLayout>
-        </LinearLayout>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_small_layout_dark.xml b/app/src/main/res/layout/widget_small_layout_dark.xml
index fcda5f461..93ea351a3 100644
--- a/app/src/main/res/layout/widget_small_layout_dark.xml
+++ b/app/src/main/res/layout/widget_small_layout_dark.xml
@@ -21,13 +21,13 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:background="@drawable/appwidget_dark_bg_clickable"
-    android:layout_gravity="center"
-    android:orientation="vertical">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_gravity="center"
+              android:layout_margin="5sp"
+              android:background="@drawable/appwidget_dark_bg_clickable"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,7 +41,7 @@
             android:layout_height="50dp"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:src="@drawable/defaultimage" />
+            android:src="@drawable/defaultimage"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -56,20 +56,20 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginBottom="0dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:visibility="gone"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"
+                android:visibility="gone"/>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_small_layout_transparent.xml b/app/src/main/res/layout/widget_small_layout_transparent.xml
index 1c9630b5b..a14b455c4 100644
--- a/app/src/main/res/layout/widget_small_layout_transparent.xml
+++ b/app/src/main/res/layout/widget_small_layout_transparent.xml
@@ -21,12 +21,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:layout_gravity="center"
-    android:orientation="vertical">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_gravity="center"
+              android:layout_margin="5sp"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -40,7 +40,7 @@
             android:layout_height="50dp"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:src="@drawable/defaultimage" />
+            android:src="@drawable/defaultimage"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -55,20 +55,20 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginBottom="0dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:visibility="gone"
-                android:textColor="@color/primary_dark" />
+                android:textColor="@color/secondary_dark"
+                android:visibility="gone"/>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_small_layout_transparent_dark.xml b/app/src/main/res/layout/widget_small_layout_transparent_dark.xml
index 48917c2e4..0ff54dad4 100644
--- a/app/src/main/res/layout/widget_small_layout_transparent_dark.xml
+++ b/app/src/main/res/layout/widget_small_layout_transparent_dark.xml
@@ -21,12 +21,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_global_wrapper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="5sp"
-    android:layout_gravity="center"
-    android:orientation="vertical">
+              android:id="@+id/row_global_wrapper"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_gravity="center"
+              android:layout_margin="5sp"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -40,7 +40,7 @@
             android:layout_height="50dp"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:src="@drawable/defaultimage" />
+            android:src="@drawable/defaultimage"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -55,20 +55,20 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginBottom="0dp"
                 android:text="@string/text_loading"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"/>
 
             <TextView
                 android:id="@+id/desc"
                 style="@style/row_body1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:paddingLeft="5dp"
                 android:text="@string/text_loading"
-                android:visibility="gone"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"
+                android:visibility="gone"/>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/menu/menu_bottom.xml b/app/src/main/res/menu/menu_bottom.xml
new file mode 100644
index 000000000..fb5bd3ff0
--- /dev/null
+++ b/app/src/main/res/menu/menu_bottom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      android:background="@android:color/white">
+
+    <item
+        android:id="@+id/bbn_dashboard"
+        android:icon="@drawable/baseline_dashboard_black_24"
+        android:title="@string/title_dashboard"/>
+
+    <item
+        android:id="@+id/bbn_switches"
+        android:icon="@drawable/baseline_highlight_black_24"
+        android:title="@string/title_switches"/>
+
+    <item
+        android:id="@+id/bbn_scenes"
+        android:icon="@drawable/baseline_view_carousel_black_24"
+        android:title="@string/title_scenes"/>
+
+    <item
+        android:id="@+id/bbn_temperature"
+        android:icon="@drawable/baseline_opacity_black_24"
+        android:title="@string/title_temperature"/>
+
+    <item
+        android:id="@+id/bbn_weather"
+        android:icon="@drawable/baseline_wb_sunny_black_24"
+        android:title="@string/title_weather"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_camera.xml b/app/src/main/res/menu/menu_camera.xml
index e18707f60..ad12b2e61 100644
--- a/app/src/main/res/menu/menu_camera.xml
+++ b/app/src/main/res/menu/menu_camera.xml
@@ -24,24 +24,24 @@
       xmlns:tools="http://schemas.android.com/tools"
       tools:context=".MainActivity">
 
-  <item
-      android:id="@+id/action_camera_play"
-      android:icon="@drawable/ic_play"
-      android:orderInCategory="100"
-      android:title="@string/action_camera_play"
-      app:showAsAction="always" />
+    <item
+        android:id="@+id/action_camera_play"
+        android:icon="@drawable/ic_play"
+        android:orderInCategory="100"
+        android:title="@string/action_camera_play"
+        app:showAsAction="always"/>
 
-  <item
-      android:id="@+id/action_speech"
-      android:icon="@drawable/ic_microphone"
-      android:orderInCategory="99"
-      android:title="@string/action_speech"
-      android:visible="false"
-      app:showAsAction="ifRoom" />
-  <item
-      android:id="@+id/action_scan_qrcode"
-      android:orderInCategory="500"
-      android:title="@string/action_qrcode_scan"
-      android:visible="false"
-      app:showAsAction="never" />
+    <item
+        android:id="@+id/action_speech"
+        android:icon="@drawable/ic_microphone"
+        android:orderInCategory="99"
+        android:title="@string/action_speech"
+        android:visible="false"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/action_scan_qrcode"
+        android:orderInCategory="500"
+        android:title="@string/action_qrcode_scan"
+        android:visible="false"
+        app:showAsAction="never"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_camera_pause.xml b/app/src/main/res/menu/menu_camera_pause.xml
index 6cdad68ff..10d850ed3 100644
--- a/app/src/main/res/menu/menu_camera_pause.xml
+++ b/app/src/main/res/menu/menu_camera_pause.xml
@@ -24,24 +24,24 @@
       xmlns:tools="http://schemas.android.com/tools"
       tools:context=".MainActivity">
 
-  <item
-      android:id="@+id/action_speech"
-      android:icon="@drawable/ic_microphone"
-      android:orderInCategory="99"
-      android:title="@string/action_speech"
-      android:visible="false"
-      app:showAsAction="ifRoom" />
-  <item
-      android:id="@+id/action_camera_pause"
-      android:icon="@drawable/ic_pause"
-      android:orderInCategory="100"
-      android:title="@string/action_camera_pause"
-      app:showAsAction="always" />
+    <item
+        android:id="@+id/action_speech"
+        android:icon="@drawable/ic_microphone"
+        android:orderInCategory="99"
+        android:title="@string/action_speech"
+        android:visible="false"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/action_camera_pause"
+        android:icon="@drawable/ic_pause"
+        android:orderInCategory="100"
+        android:title="@string/action_camera_pause"
+        app:showAsAction="always"/>
 
-  <item
-      android:id="@+id/action_scan_qrcode"
-      android:orderInCategory="500"
-      android:title="@string/action_qrcode_scan"
-      android:visible="false"
-      app:showAsAction="never" />
+    <item
+        android:id="@+id/action_scan_qrcode"
+        android:orderInCategory="500"
+        android:title="@string/action_qrcode_scan"
+        android:visible="false"
+        app:showAsAction="never"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_geo.xml b/app/src/main/res/menu/menu_geo.xml
index 61dac989b..0391da4bf 100644
--- a/app/src/main/res/menu/menu_geo.xml
+++ b/app/src/main/res/menu/menu_geo.xml
@@ -20,14 +20,14 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".GeoSettingsActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".GeoSettingsActivity">
 
     <item
         android:id="@+id/action_add"
         android:orderInCategory="100"
         android:title="@string/add"
-        app:showAsAction="always" />
+        app:showAsAction="always"/>
 
 </menu>
diff --git a/app/src/main/res/menu/menu_graph_sort.xml b/app/src/main/res/menu/menu_graph_sort.xml
index b95156394..dfa55e6f4 100644
--- a/app/src/main/res/menu/menu_graph_sort.xml
+++ b/app/src/main/res/menu/menu_graph_sort.xml
@@ -20,15 +20,15 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".GraphActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".GraphActivity">
 
     <item
         android:id="@+id/action_sort"
         android:icon="@drawable/ic_sort"
         android:orderInCategory="100"
         android:title="@string/action_filter"
-        app:showAsAction="always" />
+        app:showAsAction="always"/>
 
 </menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index fa30d86c9..29349aee1 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -20,15 +20,15 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".MainActivity">
 
     <item
         android:id="@+id/search"
         android:title="@string/filter"
         app:actionViewClass="android.support.v7.widget.SearchView"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_speech"
@@ -36,21 +36,21 @@
         android:orderInCategory="99"
         android:title="@string/action_speech"
         android:visible="false"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_switch_server"
         android:orderInCategory="400"
         android:title="@string/action_switch_server"
         android:visible="false"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
 
     <item
         android:id="@+id/action_scan_qrcode"
         android:orderInCategory="500"
         android:title="@string/action_qrcode_scan"
         android:visible="false"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
 
 
 </menu>
diff --git a/app/src/main/res/menu/menu_main_sort.xml b/app/src/main/res/menu/menu_main_sort.xml
index 16c9c9072..49e51e941 100644
--- a/app/src/main/res/menu/menu_main_sort.xml
+++ b/app/src/main/res/menu/menu_main_sort.xml
@@ -20,15 +20,15 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".MainActivity">
 
     <item
         android:id="@+id/search"
         android:title="@string/filter"
         app:actionViewClass="android.support.v7.widget.SearchView"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_speech"
@@ -36,28 +36,28 @@
         android:orderInCategory="99"
         android:title="@string/action_speech"
         android:visible="false"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_sort"
         android:icon="@drawable/ic_sort"
         android:orderInCategory="100"
         android:title="@string/action_filter"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_switch_server"
         android:orderInCategory="400"
         android:title="@string/action_switch_server"
         android:visible="false"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
 
     <item
         android:id="@+id/action_scan_qrcode"
         android:orderInCategory="500"
         android:title="@string/action_qrcode_scan"
         android:visible="false"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
 
 
 </menu>
diff --git a/app/src/main/res/menu/menu_qrcode.xml b/app/src/main/res/menu/menu_qrcode.xml
index 064b03c0e..1c210f753 100644
--- a/app/src/main/res/menu/menu_qrcode.xml
+++ b/app/src/main/res/menu/menu_qrcode.xml
@@ -20,14 +20,14 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".QRCodeSettingsActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".QRCodeSettingsActivity">
 
     <item
         android:id="@+id/action_scan_qrcode"
         android:orderInCategory="100"
         android:title="@string/action_qrcode_scan"
-        app:showAsAction="always" />
+        app:showAsAction="always"/>
 
 </menu>
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index b369dbf70..2a7910a27 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -20,14 +20,14 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".Widgets.WidgetConfigurationActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".Widgets.WidgetConfigurationActivity">
 
     <item
         android:id="@+id/search"
         android:title="@string/filter"
         app:actionViewClass="android.support.v7.widget.SearchView"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_server.xml b/app/src/main/res/menu/menu_server.xml
index 61dac989b..0391da4bf 100644
--- a/app/src/main/res/menu/menu_server.xml
+++ b/app/src/main/res/menu/menu_server.xml
@@ -20,14 +20,14 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".GeoSettingsActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".GeoSettingsActivity">
 
     <item
         android:id="@+id/action_add"
         android:orderInCategory="100"
         android:title="@string/add"
-        app:showAsAction="always" />
+        app:showAsAction="always"/>
 
 </menu>
diff --git a/app/src/main/res/menu/menu_simple.xml b/app/src/main/res/menu/menu_simple.xml
index 61fe8f94f..d8cbe6a06 100644
--- a/app/src/main/res/menu/menu_simple.xml
+++ b/app/src/main/res/menu/menu_simple.xml
@@ -20,9 +20,9 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".MainActivity">
 
     <item
         android:id="@+id/action_speech"
@@ -30,20 +30,20 @@
         android:orderInCategory="99"
         android:title="@string/action_speech"
         android:visible="false"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_switch_server"
         android:orderInCategory="400"
         android:title="@string/action_switch_server"
         android:visible="false"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
 
     <item
         android:id="@+id/action_scan_qrcode"
         android:orderInCategory="500"
         android:title="@string/action_qrcode_scan"
         android:visible="false"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
 
 </menu>
diff --git a/app/src/main/res/menu/menu_speech.xml b/app/src/main/res/menu/menu_speech.xml
index 203f4af50..23801ae7a 100644
--- a/app/src/main/res/menu/menu_speech.xml
+++ b/app/src/main/res/menu/menu_speech.xml
@@ -20,16 +20,16 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".SpeechSettingsActivity">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".SpeechSettingsActivity">
 
     <item
         android:id="@+id/action_speech"
         android:icon="@drawable/ic_microphone"
         android:orderInCategory="100"
         android:title="@string/action_speech"
-        app:showAsAction="always" />
+        app:showAsAction="always"/>
 
 
 </menu>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index b89324384..82da2dfb0 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Изкл.</string>
   <string name="button_state_closed">Затворено</string>
   <string name="button_state_open">Отвори</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Регистър</string>
   <string name="button_status_day">Ден</string>
   <string name="button_status_week">Седмица</string>
diff --git a/app/src/main/res/values-bg/strings_switches.xml b/app/src/main/res/values-bg/strings_switches.xml
index 385ddd38e..dabaf2153 100644
--- a/app/src/main/res/values-bg/strings_switches.xml
+++ b/app/src/main/res/values-bg/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 5aa73a38e..663ba64a1 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Isključi</string>
   <string name="button_state_closed">Zatvoreno</string>
   <string name="button_state_open">Otvori</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Dan</string>
   <string name="button_status_week">Sedmica</string>
diff --git a/app/src/main/res/values-bs/strings_switches.xml b/app/src/main/res/values-bs/strings_switches.xml
index c8a0ef3e8..d9384763f 100644
--- a/app/src/main/res/values-bs/strings_switches.xml
+++ b/app/src/main/res/values-bs/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Prekidači</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0785f7748..0c5718669 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Apaga</string>
   <string name="button_state_closed">Tancat</string>
   <string name="button_state_open">Obert</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Registre</string>
   <string name="button_status_day">Dia</string>
   <string name="button_status_week">Setmana</string>
diff --git a/app/src/main/res/values-ca/strings_switches.xml b/app/src/main/res/values-ca/strings_switches.xml
index 4e3fa9c30..a7185963e 100644
--- a/app/src/main/res/values-ca/strings_switches.xml
+++ b/app/src/main/res/values-ca/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Interruptors</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 7fd264411..ccbd6d974 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Vypnuto</string>
   <string name="button_state_closed">Zavřít</string>
   <string name="button_state_open">Otevřít</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Záznam</string>
   <string name="button_status_day">Den</string>
   <string name="button_status_week">Týden</string>
diff --git a/app/src/main/res/values-cs/strings_switches.xml b/app/src/main/res/values-cs/strings_switches.xml
index 0ba708852..774c35530 100644
--- a/app/src/main/res/values-cs/strings_switches.xml
+++ b/app/src/main/res/values-cs/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Přepínače</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index bbe61dec3..967c2e9c5 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Slukket</string>
   <string name="button_state_closed">Lukket</string>
   <string name="button_state_open">Åben</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Dag</string>
   <string name="button_status_week">Uge</string>
diff --git a/app/src/main/res/values-da/strings_switches.xml b/app/src/main/res/values-da/strings_switches.xml
index c5a4ed08b..8132086ea 100644
--- a/app/src/main/res/values-da/strings_switches.xml
+++ b/app/src/main/res/values-da/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switche</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9df5cc59a..0b015aa5a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Aus</string>
   <string name="button_state_closed">Geschlossen</string>
   <string name="button_state_open">Offen</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Protokoll</string>
   <string name="button_status_day">Tag</string>
   <string name="button_status_week">Woche</string>
diff --git a/app/src/main/res/values-de/strings_switches.xml b/app/src/main/res/values-de/strings_switches.xml
index 2c1471e33..e102bd687 100644
--- a/app/src/main/res/values-de/strings_switches.xml
+++ b/app/src/main/res/values-de/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Schalter</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index a83c1ed15..51fab2245 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Off</string>
   <string name="button_state_closed">Closed</string>
   <string name="button_state_open">Open</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Day</string>
   <string name="button_status_week">Week</string>
diff --git a/app/src/main/res/values-el/strings_switches.xml b/app/src/main/res/values-el/strings_switches.xml
index 3f14f0138..50958886f 100644
--- a/app/src/main/res/values-el/strings_switches.xml
+++ b/app/src/main/res/values-el/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2b37681bc..e6d764ad4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Apagado</string>
   <string name="button_state_closed">Cerrado</string>
   <string name="button_state_open">Abierto</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Registro</string>
   <string name="button_status_day">Día</string>
   <string name="button_status_week">Semana</string>
diff --git a/app/src/main/res/values-es/strings_settings.xml b/app/src/main/res/values-es/strings_settings.xml
index 1cb3d2bf5..815a2649b 100644
--- a/app/src/main/res/values-es/strings_settings.xml
+++ b/app/src/main/res/values-es/strings_settings.xml
@@ -56,9 +56,9 @@
   <string name="always_on_title">Mantener activo</string>
   <string name="always_on_on">Bloquear la pantalla siempre Encendido</string>
   <string name="always_on_off">No bloquear la pantalla siempre Encendido</string>
-  <string name="always_auto_refresh">Auto Refresh</string>
-  <string name="always_auto_refresh_on">Refresh the device state every 5 seconds</string>
-  <string name="always_auto_refresh_off">Don\'t refresh the device state every 5 seconds</string>
+  <string name="always_auto_refresh">Actualización automática</string>
+  <string name="always_auto_refresh_on">Actualizar el estado del dispositivo cada 5 segundos</string>
+  <string name="always_auto_refresh_off">No actualizar el estado del dispositivo cada 5 segundos</string>
   <string name="switch_buttons_title">Interruptores</string>
   <string name="switch_buttons_on">Mostrar los interruptores con interruptor encendido/apagado</string>
   <string name="switch_buttons_off">Mostrar los interruptores con botones de encendido/apagado</string>
diff --git a/app/src/main/res/values-es/strings_switches.xml b/app/src/main/res/values-es/strings_switches.xml
index 568edbe93..4b8733254 100644
--- a/app/src/main/res/values-es/strings_switches.xml
+++ b/app/src/main/res/values-es/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Interruptores</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index cf1631515..06e011d6c 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Off</string>
   <string name="button_state_closed">Closed</string>
   <string name="button_state_open">Open</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Day</string>
   <string name="button_status_week">Week</string>
diff --git a/app/src/main/res/values-fa/strings_switches.xml b/app/src/main/res/values-fa/strings_switches.xml
index 3f14f0138..50958886f 100644
--- a/app/src/main/res/values-fa/strings_switches.xml
+++ b/app/src/main/res/values-fa/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index bd3d9733f..0a027b80c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Pois</string>
   <string name="button_state_closed">Kiinni</string>
   <string name="button_state_open">Auki</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Loki</string>
   <string name="button_status_day">Päivä</string>
   <string name="button_status_week">Viikko</string>
diff --git a/app/src/main/res/values-fi/strings_switches.xml b/app/src/main/res/values-fi/strings_switches.xml
index d13df5353..2f5832d29 100644
--- a/app/src/main/res/values-fi/strings_switches.xml
+++ b/app/src/main/res/values-fi/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Kytkimet</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 219b214fe..8c2f384b7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Off</string>
   <string name="button_state_closed">Fermé</string>
   <string name="button_state_open">Ouvert</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Jour</string>
   <string name="button_status_week">Semaine</string>
diff --git a/app/src/main/res/values-fr/strings_switches.xml b/app/src/main/res/values-fr/strings_switches.xml
index 7f35974c6..582859721 100644
--- a/app/src/main/res/values-fr/strings_switches.xml
+++ b/app/src/main/res/values-fr/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Interrupteurs</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index f5307f386..a0ac40388 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">כבוי</string>
   <string name="button_state_closed">סגור</string>
   <string name="button_state_open">פתוח</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">יומן</string>
   <string name="button_status_day">יום</string>
   <string name="button_status_week">שבוע</string>
diff --git a/app/src/main/res/values-he/strings_switches.xml b/app/src/main/res/values-he/strings_switches.xml
index 3f14f0138..50958886f 100644
--- a/app/src/main/res/values-he/strings_switches.xml
+++ b/app/src/main/res/values-he/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a83c1ed15..51fab2245 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Off</string>
   <string name="button_state_closed">Closed</string>
   <string name="button_state_open">Open</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Day</string>
   <string name="button_status_week">Week</string>
diff --git a/app/src/main/res/values-hr/strings_switches.xml b/app/src/main/res/values-hr/strings_switches.xml
index 3f14f0138..50958886f 100644
--- a/app/src/main/res/values-hr/strings_switches.xml
+++ b/app/src/main/res/values-hr/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 056a4a6cf..bf5f96556 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Ki</string>
   <string name="button_state_closed">Zárva</string>
   <string name="button_state_open">Megnyitás</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Napló</string>
   <string name="button_status_day">Nap</string>
   <string name="button_status_week">Hét</string>
diff --git a/app/src/main/res/values-hu/strings_switches.xml b/app/src/main/res/values-hu/strings_switches.xml
index 49b1dd2ee..de3468323 100644
--- a/app/src/main/res/values-hu/strings_switches.xml
+++ b/app/src/main/res/values-hu/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Kapcsolók</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3325dbe4f..1302c64df 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Off</string>
   <string name="button_state_closed">Chiuso</string>
   <string name="button_state_open">Aperto</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Giorno</string>
   <string name="button_status_week">Settimana</string>
diff --git a/app/src/main/res/values-it/strings_switches.xml b/app/src/main/res/values-it/strings_switches.xml
index 2b344abfc..c44d3a0c0 100644
--- a/app/src/main/res/values-it/strings_switches.xml
+++ b/app/src/main/res/values-it/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Interruttori</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index fe58f28ac..cc62c491a 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Insa</string>
   <string name="button_state_closed">Imdel</string>
   <string name="button_state_open">Ldi</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Aɣmis</string>
   <string name="button_status_day">Ass</string>
   <string name="button_status_week">Amalas</string>
diff --git a/app/src/main/res/values-kab/strings_switches.xml b/app/src/main/res/values-kab/strings_switches.xml
index 204255eec..7add1f70f 100644
--- a/app/src/main/res/values-kab/strings_switches.xml
+++ b/app/src/main/res/values-kab/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Isenfalen</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0be62939d..bfb045c3f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Uit</string>
   <string name="button_state_closed">Gesloten</string>
   <string name="button_state_open">Open</string>
+  <string name="button_state_lock">Vergrendel</string>
+  <string name="button_state_unlock">Ontgrendel</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Dag</string>
   <string name="button_status_week">Week</string>
diff --git a/app/src/main/res/values-nl/strings_switches.xml b/app/src/main/res/values-nl/strings_switches.xml
index bc685bd98..0875f8d90 100644
--- a/app/src/main/res/values-nl/strings_switches.xml
+++ b/app/src/main/res/values-nl/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Schakelaars</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 9d3e0d242..3681acaa2 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Av</string>
   <string name="button_state_closed">Lukket</string>
   <string name="button_state_open">Åpen</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Logg</string>
   <string name="button_status_day">Dag</string>
   <string name="button_status_week">Uke</string>
diff --git a/app/src/main/res/values-no/strings_switches.xml b/app/src/main/res/values-no/strings_switches.xml
index 58941b1cc..277301657 100644
--- a/app/src/main/res/values-no/strings_switches.xml
+++ b/app/src/main/res/values-no/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Brytere</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index fbfd8f4a0..b990faa61 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Wył.</string>
   <string name="button_state_closed">Zamknięte</string>
   <string name="button_state_open">Otwarte</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Dzień</string>
   <string name="button_status_week">Tydzień</string>
diff --git a/app/src/main/res/values-pl/strings_speech.xml b/app/src/main/res/values-pl/strings_speech.xml
index 9571019c4..19d03aace 100644
--- a/app/src/main/res/values-pl/strings_speech.xml
+++ b/app/src/main/res/values-pl/strings_speech.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="Speech_not_supported">Polecenia głosowe nie są obsługiwane na tym urządzeniu</string>
-  <string name="Speech_register">Zarejestruj polecenie głosowe</string>
+  <string name="Speech_register">Rejestruj polecenie głosowe</string>
   <string name="Speech_found">Nowe polecenie głosowe odnalezione</string>
   <string name="Speech_edit">Edytuj polecenie głosowe</string>
   <string name="Speech_name">Nadaj temu poleceniu głosowemu właściwą nazwę.</string>
diff --git a/app/src/main/res/values-pl/strings_switches.xml b/app/src/main/res/values-pl/strings_switches.xml
index fb907b70c..1a8c0a8c8 100644
--- a/app/src/main/res/values-pl/strings_switches.xml
+++ b/app/src/main/res/values-pl/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Przełączniki</string>
diff --git a/app/src/main/res/values-pl/strings_wizard.xml b/app/src/main/res/values-pl/strings_wizard.xml
index 15048ec46..99798f00d 100644
--- a/app/src/main/res/values-pl/strings_wizard.xml
+++ b/app/src/main/res/values-pl/strings_wizard.xml
@@ -51,8 +51,8 @@
   <string name="wizard_nfc_description">Przerzuć przełączniki za pomocą NFC</string>
   <string name="wizard_qrcode">Kod QR</string>
   <string name="wizard_qrcode_description">Przerzuć przełączniki, przez zeskanowanie kodu QR (lub kodu kreskowego)!</string>
-  <string name="wizard_speech">Komendy mowy</string>
-  <string name="wizard_speech_description">Przełączniki przerzutowe z Twoim głosem! Skonfiguruj polecenia mowy za pomocą ekranów ustawień i połącz przełączniki.</string>
+  <string name="wizard_speech">Polecenia głosowe</string>
+  <string name="wizard_speech_description">Przełączaj przełączniki głosem! Skonfiguruj polecenia głosowe za pomocą ekranu ustawień i podłącz przełączniki.</string>
   <string name="wizard_button_nice">Dobrze</string>
   <string name="wizard_button_switches">Przełączniki</string>
   <string name="wizard_button_settings">Ustawienia</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 4f09d7fd7..24896cf38 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Desligar</string>
   <string name="button_state_closed">Fechado</string>
   <string name="button_state_open">Aberto</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Dia</string>
   <string name="button_status_week">Semana</string>
diff --git a/app/src/main/res/values-pt/strings_switches.xml b/app/src/main/res/values-pt/strings_switches.xml
index 69cdcd6d9..0859b0d9d 100644
--- a/app/src/main/res/values-pt/strings_switches.xml
+++ b/app/src/main/res/values-pt/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Interruptores</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index a83c1ed15..51fab2245 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Off</string>
   <string name="button_state_closed">Closed</string>
   <string name="button_state_open">Open</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Day</string>
   <string name="button_status_week">Week</string>
diff --git a/app/src/main/res/values-ro/strings_switches.xml b/app/src/main/res/values-ro/strings_switches.xml
index 3f14f0138..50958886f 100644
--- a/app/src/main/res/values-ro/strings_switches.xml
+++ b/app/src/main/res/values-ro/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e440e5545..f30602a3e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Выключен</string>
   <string name="button_state_closed">Закрыто</string>
   <string name="button_state_open">Открыто</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Журнал</string>
   <string name="button_status_day">День</string>
   <string name="button_status_week">Неделя</string>
diff --git a/app/src/main/res/values-ru/strings_switches.xml b/app/src/main/res/values-ru/strings_switches.xml
index 146700d01..5c9a4d38d 100644
--- a/app/src/main/res/values-ru/strings_switches.xml
+++ b/app/src/main/res/values-ru/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Переключатели</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 199bb3d20..66759ebeb 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Vyp</string>
   <string name="button_state_closed">Zatvorené</string>
   <string name="button_state_open">Otvorené</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Záznam</string>
   <string name="button_status_day">Deň</string>
   <string name="button_status_week">týždeň</string>
diff --git a/app/src/main/res/values-sk/strings_switches.xml b/app/src/main/res/values-sk/strings_switches.xml
index d6e7f3f5e..d73b646a2 100644
--- a/app/src/main/res/values-sk/strings_switches.xml
+++ b/app/src/main/res/values-sk/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Prepínače</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 3cad7aca5..a20673cb4 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Izklopljeno</string>
   <string name="button_state_closed">Zaprto</string>
   <string name="button_state_open">Odprto</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Dnevnik</string>
   <string name="button_status_day">Dan</string>
   <string name="button_status_week">Teden</string>
diff --git a/app/src/main/res/values-sl/strings_switches.xml b/app/src/main/res/values-sl/strings_switches.xml
index cdb2b9cf7..f50d8dfee 100644
--- a/app/src/main/res/values-sl/strings_switches.xml
+++ b/app/src/main/res/values-sl/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Stikala</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index a83c1ed15..51fab2245 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Off</string>
   <string name="button_state_closed">Closed</string>
   <string name="button_state_open">Open</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Log</string>
   <string name="button_status_day">Day</string>
   <string name="button_status_week">Week</string>
diff --git a/app/src/main/res/values-sr/strings_switches.xml b/app/src/main/res/values-sr/strings_switches.xml
index 3f14f0138..50958886f 100644
--- a/app/src/main/res/values-sr/strings_switches.xml
+++ b/app/src/main/res/values-sr/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a2aacf9eb..85243d0a1 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Av</string>
   <string name="button_state_closed">Stängd</string>
   <string name="button_state_open">Öppen</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Logg</string>
   <string name="button_status_day">Dag</string>
   <string name="button_status_week">Vecka</string>
diff --git a/app/src/main/res/values-sv/strings_switches.xml b/app/src/main/res/values-sv/strings_switches.xml
index f0ab4da37..92a497faa 100644
--- a/app/src/main/res/values-sv/strings_switches.xml
+++ b/app/src/main/res/values-sv/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Brytare</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a2e662a6b..a31b74973 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Kapalı</string>
   <string name="button_state_closed">Kapalı</string>
   <string name="button_state_open">Açık</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Kayıtlar</string>
   <string name="button_status_day">Gün</string>
   <string name="button_status_week">Hafta</string>
diff --git a/app/src/main/res/values-tr/strings_switches.xml b/app/src/main/res/values-tr/strings_switches.xml
index 3f14f0138..50958886f 100644
--- a/app/src/main/res/values-tr/strings_switches.xml
+++ b/app/src/main/res/values-tr/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6a2c3f703..6302a8348 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">Вимк.</string>
   <string name="button_state_closed">Закрито</string>
   <string name="button_state_open">Відчинити</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">Журнал</string>
   <string name="button_status_day">День</string>
   <string name="button_status_week">Тиждень</string>
diff --git a/app/src/main/res/values-uk/strings_switches.xml b/app/src/main/res/values-uk/strings_switches.xml
index 9ebc99f61..aaca2fbdc 100644
--- a/app/src/main/res/values-uk/strings_switches.xml
+++ b/app/src/main/res/values-uk/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Перемикачі</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index dc6d86ce2..7570c1bdd 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">关</string>
   <string name="button_state_closed">已关闭</string>
   <string name="button_state_open">已开启</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">日志</string>
   <string name="button_status_day">日</string>
   <string name="button_status_week">周</string>
diff --git a/app/src/main/res/values-zh-rCN/strings_switches.xml b/app/src/main/res/values-zh-rCN/strings_switches.xml
index 4bf4943af..cc24e5de4 100644
--- a/app/src/main/res/values-zh-rCN/strings_switches.xml
+++ b/app/src/main/res/values-zh-rCN/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">开关</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 19207de72..e01cdfd76 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -33,6 +33,8 @@
   <string name="button_state_off">關</string>
   <string name="button_state_closed">已關閉</string>
   <string name="button_state_open">開啟</string>
+  <string name="button_state_lock">Lock</string>
+  <string name="button_state_unlock">Unlock</string>
   <string name="button_status_log">記錄</string>
   <string name="button_status_day">日</string>
   <string name="button_status_week">周</string>
diff --git a/app/src/main/res/values-zh/strings_switches.xml b/app/src/main/res/values-zh/strings_switches.xml
index 3f14f0138..50958886f 100644
--- a/app/src/main/res/values-zh/strings_switches.xml
+++ b/app/src/main/res/values-zh/strings_switches.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2015 Domoticz - Mark Heinis
+  ~
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <!-- only temporarily to suppress the missing translations errors for now!! -->
   <string name="title_switches">Switches</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c9dd0bff4..34edaa719 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -21,18 +21,18 @@
   -->
 
 <resources>
-    <attr name="lockedValues" format="reference" />
-    <attr name="lockedValuesDependencyKeys" format="reference" />
-    <attr name="dynamicEntriesProvider" format="string" />
-    <attr name="dynamicEntryValuesProvider" format="string" />
-    <attr name="selectAllValuesByDefault" format="boolean" />
+    <attr name="lockedValues" format="reference"/>
+    <attr name="lockedValuesDependencyKeys" format="reference"/>
+    <attr name="dynamicEntriesProvider" format="string"/>
+    <attr name="dynamicEntryValuesProvider" format="string"/>
+    <attr name="selectAllValuesByDefault" format="boolean"/>
 
     <declare-styleable name="CustomListPreference">
-        <attr name="lockedValues" />
-        <attr name="lockedValuesDependencyKeys" />
-        <attr name="selectAllValuesByDefault" />
-        <attr name="dynamicEntriesProvider" />
-        <attr name="dynamicEntryValuesProvider" />
+        <attr name="lockedValues"/>
+        <attr name="lockedValuesDependencyKeys"/>
+        <attr name="selectAllValuesByDefault"/>
+        <attr name="dynamicEntriesProvider"/>
+        <attr name="dynamicEntryValuesProvider"/>
     </declare-styleable>
 
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1b19af1d7..6644da54e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,20 +19,20 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
 <resources>
+    <color name="primary">#2196F3</color>
+    <color name="primary_dark">#2196F3</color>
 
-    <!-- Material design colors -->
-    <color name="primary">#263238</color>
-    <color name="primary_dark">#22272B</color>
-
-    <color name="secondary">#1E88E5</color>
-    <color name="secondary_dark">#1D7DD1</color>
+    <color name="secondary">#1B324D</color>
+    <color name="secondary_dark">#142A3B</color>
 
-    <color name="accent">#22272B</color>
+    <color name="background_grey">#EDEDED</color>
+    <color name="accent">@color/button_dark_status</color>
 
-    <color name="background_dark">#303030</color>
-    <color name="button_dark">#50BDBDBD</color>
+    <color name="background_dark">#2A292F</color>
+    <color name="card_background_dark">#2A292F</color>
+    <color name="button_dark">#284B6B</color>
+    <color name="button_dark_status">#284B6B</color>
 
     <color name="welcome1_background">@color/black</color>
     <color name="welcome2_background">@color/default_background_color_light</color>
diff --git a/app/src/main/res/values/drawer_actions.xml b/app/src/main/res/values/drawer_actions.xml
index 7028b2240..f0e455999 100644
--- a/app/src/main/res/values/drawer_actions.xml
+++ b/app/src/main/res/values/drawer_actions.xml
@@ -21,17 +21,12 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"><!-- only temporarily to suppress the missing translations errors for now!! -->
-
     <string-array name="drawer_actions" translatable="false">
         <item>@string/title_wizard</item>
-        <item>@string/title_dashboard</item>
-        <item>@string/title_scenes</item>
         <item>@string/title_switches</item>
+        <item>@string/title_plans</item>
         <item>@string/title_utilities</item>
-        <item>@string/title_temperature</item>
-        <item>@string/title_weather</item>
         <item>@string/title_cameras</item>
-        <item>@string/title_plans</item>
         <item>@string/title_logs</item>
         <item>@string/title_events</item>
         <item>@string/title_vars</item>
@@ -42,14 +37,10 @@
 
     <string-array name="drawer_fragments" translatable="false">
         <item>nl.hnogames.domoticz.Fragments.Wizard</item>
-        <item>nl.hnogames.domoticz.Fragments.Dashboard</item>
-        <item>nl.hnogames.domoticz.Fragments.Scenes</item>
-        <item>nl.hnogames.domoticz.Fragments.Switches</item>
+        <item>nl.hnogames.domoticz.Fragments.MainPager</item>
+        <item>nl.hnogames.domoticz.Fragments.Plans</item>
         <item>nl.hnogames.domoticz.Fragments.Utilities</item>
-        <item>nl.hnogames.domoticz.Fragments.Temperature</item>
-        <item>nl.hnogames.domoticz.Fragments.Weather</item>
         <item>nl.hnogames.domoticz.Fragments.Cameras</item>
-        <item>nl.hnogames.domoticz.Fragments.Plans</item>
         <item>nl.hnogames.domoticz.Fragments.Logs</item>
         <item>nl.hnogames.domoticz.Fragments.Events</item>
         <item>nl.hnogames.domoticz.Fragments.UserVariables</item>
@@ -58,13 +49,9 @@
     <array name="drawer_icons" translatable="false">
         <item>gmd_build</item>
         <item>gmd_dashboard</item>
-        <item>gmd_view_carousel</item>
-        <item>gmd_lightbulb_outline</item>
+        <item>gmd_location_city</item>
         <item>gmd_dvr</item>
-        <item>gmd_opacity</item>
-        <item>gmd_wb_sunny</item>
         <item>gmd_camera</item>
-        <item>gmd_location_city</item>
         <item>gmd_bug_report</item>
         <item>gmd_event</item>
         <item>gmd_assignment</item>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index ea4dbe20e..085b64e71 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="ic_launcher_background">#0078C1</color>
+    <color name="ic_launcher_background">#0078C1</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dcfb479c2..ed1db7e80 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,6 +37,8 @@
     <string name="button_state_off">Off</string>
     <string name="button_state_closed">Closed</string>
     <string name="button_state_open">Open</string>
+    <string name="button_state_lock">Lock</string>
+    <string name="button_state_unlock">Unlock</string>
     <string name="button_status_log">Log</string>
     <string name="button_status_day">Day</string>
     <string name="button_status_week">Week</string>
@@ -47,6 +49,8 @@
     <string name="button_color">Color</string>
     <string name="button_arm">Arm</string>
     <string name="button_disarm">Disarm</string>
+    <string name="button_state_full_light">Full light</string>
+    <string name="button_state_night">Night light</string>
 
     <string name="last_update">Last seen</string>
     <string name="signal_level">Signal level</string>
@@ -98,6 +102,8 @@
 
     <string name="switch_on">Turning switch on</string>
     <string name="switch_off">Turning switch off</string>
+    <string name="switch_night">Turning switch to night light</string>
+    <string name="switch_full">Turning switch to full light</string>
 
     <string name="blind_up">Turning blind up</string>
     <string name="blind_down">Turning blind down</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2f3775e00..018f1816c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,55 +18,70 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
 <resources>
     <!-- Base application theme. -->
-    <style name="AppThemeMain" parent="MaterialDrawerTheme.Light.DarkToolbar">
+    <style name="AppThemeIntro" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <!-- Base application theme. -->
+    <style name="AppThemeMain" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="android:dialogTheme">@style/MyDialogTheme</item>
-        <item name="android:alertDialogTheme">@style/MyDialogTheme</item>
-        <item name="dialogTheme">@style/MyDialogTheme</item>
-        <item name="alertDialogTheme">@style/MyDialogTheme</item>
+        <item name="colorAccent">@color/primary</item>
+
+        <!-- MaterialDrawer specific values -->
+        <item name="material_drawer_background">@color/material_drawer_background</item>
+        <item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
+        <item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
+        <item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>
+        <item name="material_drawer_hint_text">@color/material_drawer_hint_text</item>
+        <item name="material_drawer_divider">@color/material_drawer_divider</item>
+        <item name="material_drawer_selected">@color/material_drawer_selected</item>
+        <item name="material_drawer_selected_text">@color/material_drawer_selected_text</item>
+        <item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
     </style>
 
-    <style name="AppThemeDarkMain" parent="MaterialDrawerTheme">
+    <style name="AppThemeDarkMain" parent="Theme.MaterialComponents.NoActionBar">
         <item name="colorPrimary">@color/secondary</item>
         <item name="colorPrimaryDark">@color/secondary_dark</item>
-        <item name="android:dialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="android:alertDialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="dialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="alertDialogTheme">@style/MyDarkDialogTheme</item>
+        <item name="colorAccent">@color/primary</item>
+
+        <!-- MaterialDrawer specific values -->
+        <item name="material_drawer_background">@color/card_background_dark</item>
+        <item name="material_drawer_primary_text">@color/material_drawer_dark_primary_text</item>
+        <item name="material_drawer_primary_icon">@color/material_drawer_dark_primary_icon</item>
+        <item name="material_drawer_secondary_text">@color/material_drawer_dark_secondary_text</item>
+        <item name="material_drawer_hint_text">@color/material_drawer_dark_hint_text</item>
+        <item name="material_drawer_divider">@color/material_drawer_dark_divider</item>
+        <item name="material_drawer_selected">@color/button_dark</item>
+        <item name="material_drawer_selected_text">@color/material_drawer_dark_selected_text</item>
+        <item name="material_drawer_header_selection_text">@color/material_drawer_dark_header_selection_text</item>
     </style>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="android:dialogTheme">@style/MyDialogTheme</item>
-        <item name="android:alertDialogTheme">@style/MyDialogTheme</item>
-        <item name="dialogTheme">@style/MyDialogTheme</item>
-        <item name="alertDialogTheme">@style/MyDialogTheme</item>
+        <item name="colorAccent">@color/primary</item>
     </style>
 
-    <style name="AppThemeDark" parent="Theme.AppCompat">
+    <style name="AppThemeDark" parent="Theme.MaterialComponents.Bridge">
         <item name="colorPrimary">@color/secondary</item>
         <item name="colorPrimaryDark">@color/secondary_dark</item>
-        <item name="android:dialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="android:alertDialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="dialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="alertDialogTheme">@style/MyDarkDialogTheme</item>
+        <item name="colorAccent">@color/primary</item>
     </style>
 
     <!--        Styles Light     -->
     <style name="background_listview">
         <item name="android:paddingLeft">@dimen/row_space</item>
         <item name="android:paddingRight">@dimen/row_space</item>
-        <item name="android:background">@color/material_grey_300_</item>
+        <item name="android:background">@color/background_grey</item>
     </style>
 
     <style name="background_recyclerview">
-        <item name="android:background">@color/material_grey_300_</item>
+        <item name="android:background">@color/background_grey</item>
     </style>
 
     <style name="listview_row">
@@ -93,7 +108,7 @@
     <style name="nav_name" parent="@style/TextAppearance.AppCompat.Body1">
         <item name="android:paddingTop">10dp</item>
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginBottom">5dp</item>
     </style>
@@ -101,33 +116,33 @@
     <style name="row_name" parent="@style/TextAppearance.AppCompat.Title">
         <item name="android:paddingTop">10dp</item>
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginBottom">5dp</item>
     </style>
 
-    <style name="row_dash_name" parent="@style/TextAppearance.AppCompat.Title">
+    <style name="row_dash_name" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:paddingTop">10dp</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginBottom">5dp</item>
     </style>
 
-    <style name="row_name_micro" parent="@style/TextAppearance.AppCompat.Title">
+    <style name="row_name_micro" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">11sp</item>
+        <item name="android:textSize">10sp</item>
         <item name="android:textStyle">normal</item>
     </style>
 
-    <style name="row_name_small" parent="@style/TextAppearance.AppCompat.Title">
+    <style name="row_name_small" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
     </style>
 
     <style name="row_body1" parent="@style/TextAppearance.AppCompat.Body1">
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">12sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginBottom">2dp</item>
     </style>
@@ -146,9 +161,9 @@
         <item name="android:layout_marginBottom">2dp</item>
     </style>
 
-    <style name="row_dash_body2" parent="@style/TextAppearance.AppCompat.Body2">
+    <style name="row_dash_body2" parent="@style/TextAppearance.AppCompat.Body1">
         <item name="android:paddingBottom">10dp</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">8sp</item>
         <item name="android:textStyle">italic</item>
         <item name="android:layout_marginBottom">2dp</item>
     </style>
@@ -158,7 +173,6 @@
         <item name="android:scrollbarStyle">outsideOverlay</item>
     </style>
 
-
     <!--        Debugging        -->
     <style name="debug_layout">
         <item name="android:layout_width">match_parent</item>
@@ -180,31 +194,12 @@
         <item name="android:scrollbars">vertical</item>
     </style>
 
-    <style name="MyDialogTheme" parent="Theme.AppCompat.Light.Dialog">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-    </style>
-
-    <style name="MyDarkDialogTheme" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-        <item name="colorAccent">#FFFFFF</item>
-        <item name="android:textColorPrimary">#FFFFFF</item>
-        <item name="android:textColor">#FFFFFF</item>
-        <item name="android:background">@color/primary_dark</item>
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-    </style>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar"/>
 
+    <style name="AppTheme.PopupOverlay" parent="Theme.MaterialComponents.Light.Bridge"/>
 </resources>
diff --git a/app/src/main/res/xml-v17/appwidgetprovider.xml b/app/src/main/res/xml-v17/appwidgetprovider.xml
index 347dfe67d..b23308ef6 100644
--- a/app/src/main/res/xml-v17/appwidgetprovider.xml
+++ b/app/src/main/res/xml-v17/appwidgetprovider.xml
@@ -21,11 +21,11 @@
   -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="nl.hnogames.domoticz.Widgets.WidgetConfigurationActivity"
-    android:initialLayout="@layout/widget_layout"
-    android:minHeight="40dp"
-    android:minWidth="220dp"
-    android:previewImage="@drawable/widgetpreview"
-    android:widgetCategory="keyguard|home_screen"
-    android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="1000000" />
\ No newline at end of file
+                    android:configure="nl.hnogames.domoticz.Widgets.WidgetConfigurationActivity"
+                    android:initialLayout="@layout/widget_layout"
+                    android:minWidth="220dp"
+                    android:minHeight="40dp"
+                    android:previewImage="@drawable/widgetpreview"
+                    android:resizeMode="horizontal|vertical"
+                    android:updatePeriodMillis="1000000"
+                    android:widgetCategory="keyguard|home_screen"/>
\ No newline at end of file
diff --git a/app/src/main/res/xml-v17/securitywidgetprovider.xml b/app/src/main/res/xml-v17/securitywidgetprovider.xml
index 78e133d03..082cca617 100644
--- a/app/src/main/res/xml-v17/securitywidgetprovider.xml
+++ b/app/src/main/res/xml-v17/securitywidgetprovider.xml
@@ -21,11 +21,11 @@
   -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="nl.hnogames.domoticz.Widgets.SecurityWidgetConfigurationActivity"
-    android:initialLayout="@layout/widget_security_layout"
-    android:minHeight="120dp"
-    android:minWidth="300dp"
-    android:previewImage="@drawable/security_widget_preview"
-                    android:widgetCategory="keyguard|home_screen"
-    android:resizeMode="horizontal"
-    android:updatePeriodMillis="1000000" />
\ No newline at end of file
+                    android:configure="nl.hnogames.domoticz.Widgets.SecurityWidgetConfigurationActivity"
+                    android:initialLayout="@layout/widget_security_layout"
+                    android:minWidth="300dp"
+                    android:minHeight="120dp"
+                    android:previewImage="@drawable/security_widget_preview"
+                    android:resizeMode="horizontal"
+                    android:updatePeriodMillis="1000000"
+                    android:widgetCategory="keyguard|home_screen"/>
\ No newline at end of file
diff --git a/app/src/main/res/xml-v17/smallwidgetprovider.xml b/app/src/main/res/xml-v17/smallwidgetprovider.xml
index 7ec6c9dd3..b97c025a2 100644
--- a/app/src/main/res/xml-v17/smallwidgetprovider.xml
+++ b/app/src/main/res/xml-v17/smallwidgetprovider.xml
@@ -21,11 +21,11 @@
   -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="nl.hnogames.domoticz.Widgets.SmallWidgetConfigurationActivity"
-    android:initialLayout="@layout/widget_small_layout"
-    android:previewImage="@drawable/lights"
-    android:minHeight="40dp"
-    android:minWidth="40dp"
-    android:resizeMode="horizontal|vertical"
-                    android:widgetCategory="keyguard|home_screen"
-    android:updatePeriodMillis="1000000" />
\ No newline at end of file
+                    android:configure="nl.hnogames.domoticz.Widgets.SmallWidgetConfigurationActivity"
+                    android:initialLayout="@layout/widget_small_layout"
+                    android:minWidth="40dp"
+                    android:minHeight="40dp"
+                    android:previewImage="@drawable/lights"
+                    android:resizeMode="horizontal|vertical"
+                    android:updatePeriodMillis="1000000"
+                    android:widgetCategory="keyguard|home_screen"/>
\ No newline at end of file
diff --git a/app/src/main/res/xml/appwidgetprovider.xml b/app/src/main/res/xml/appwidgetprovider.xml
index f2aca5789..1e238d9fc 100644
--- a/app/src/main/res/xml/appwidgetprovider.xml
+++ b/app/src/main/res/xml/appwidgetprovider.xml
@@ -21,10 +21,10 @@
   -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="nl.hnogames.domoticz.Widgets.WidgetConfigurationActivity"
-    android:initialLayout="@layout/widget_layout"
-    android:minHeight="40dp"
-    android:minWidth="220dp"
-    android:previewImage="@drawable/widgetpreview"
-    android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="1000000" />
\ No newline at end of file
+                    android:configure="nl.hnogames.domoticz.Widgets.WidgetConfigurationActivity"
+                    android:initialLayout="@layout/widget_layout"
+                    android:minWidth="220dp"
+                    android:minHeight="40dp"
+                    android:previewImage="@drawable/widgetpreview"
+                    android:resizeMode="horizontal|vertical"
+                    android:updatePeriodMillis="1000000"/>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 92051e6c8..fb1a622c0 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -21,15 +21,15 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:customPreference="http://schemas.android.com/apk/res-auto"
-    android:key="settingsscreen">
+                  xmlns:customPreference="http://schemas.android.com/apk/res-auto"
+                  android:key="settingsscreen">
 
     <PreferenceCategory
         android:key="premium_category"
         android:title="@string/premium_category">
         <Preference
             android:key="premium_settings"
-            android:title="@string/premium_title" />
+            android:title="@string/premium_title"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_generic">
@@ -37,62 +37,63 @@
             android:entries="@array/drawer_actions"
             android:entryValues="@array/drawer_actions"
             android:key="startup_screen"
-            android:title="@string/startup_screen" />
+            android:title="@string/startup_screen"/>
         <MultiSelectListPreference
             android:defaultValue="@array/drawer_actions"
             android:entries="@array/drawer_actions"
             android:entryValues="@array/drawer_actions"
             android:key="enable_menu_items"
-            android:title="@string/enable_items" />
+            android:title="@string/enable_items"/>
         <SwitchPreference
             android:defaultValue="true"
             android:key="sort_dashboardLikeServer"
             android:summaryOff="@string/sort_dashboardLikeServer_off"
             android:summaryOn="@string/sort_dashboardLikeServer_on"
-            android:title="@string/sort_dashboardLikeServer_title" />
+            android:title="@string/sort_dashboardLikeServer_title"/>
         <SwitchPreference
             android:defaultValue="true"
             android:key="extradata"
             android:summaryOff="@string/show_extra_data_off"
             android:summaryOn="@string/show_extra_data_on"
-            android:title="@string/extra_data_title" />
+            android:title="@string/extra_data_title"/>
         <SwitchPreference
             android:defaultValue="false"
             android:key="switchButtons"
             android:summaryOff="@string/switch_buttons_off"
             android:summaryOn="@string/switch_buttons_on"
-            android:title="@string/switch_buttons_title" />
+            android:title="@string/switch_buttons_title"/>
         <SwitchPreference
             android:defaultValue="false"
             android:key="dashboardAsList"
             android:summaryOff="@string/show_dashboard_list_on"
             android:summaryOn="@string/show_dashboard_list_off"
-            android:title="@string/dashboard_list_title" />
+            android:title="@string/dashboard_list_title"/>
         <SwitchPreference
             android:defaultValue="false"
             android:key="alwayson"
             android:summaryOff="@string/always_on_off"
             android:summaryOn="@string/always_on_on"
-            android:title="@string/always_on_title" />
+            android:title="@string/always_on_title"/>
         <SwitchPreference
             android:defaultValue="false"
             android:key="autorefresh"
             android:summaryOff="@string/always_auto_refresh_off"
             android:summaryOn="@string/always_auto_refresh_on"
-            android:title="@string/always_auto_refresh" />
+            android:title="@string/always_auto_refresh"/>
     </PreferenceCategory>
 
-    <PreferenceScreen android:title="@string/default_values"
-        android:key="defaultValues">
+    <PreferenceScreen
+        android:key="defaultValues"
+        android:title="@string/default_values">
         <PreferenceCategory android:title="@string/temperature">
             <nl.hnogames.domoticz.Preference.EditTextIntegerPreference
+                android:key="tempMinValue"
                 android:summary="@string/set_point_min_description"
-                android:title="@string/set_point_min"
-                android:key="tempMinValue" />
+                android:title="@string/set_point_min"/>
             <nl.hnogames.domoticz.Preference.EditTextIntegerPreference
+                android:key="tempMaxValue"
                 android:summary="@string/set_point_max_description"
-                android:title="@string/set_point_max"
-                android:key="tempMaxValue"/>
+                android:title="@string/set_point_max"/>
         </PreferenceCategory>
     </PreferenceScreen>
 
@@ -102,7 +103,7 @@
             android:key="enableWearItems"
             android:summaryOff="@string/wear_custom_off"
             android:summaryOn="@string/wear_custom_on"
-            android:title="@string/enable_wear_select" />
+            android:title="@string/enable_wear_select"/>
         <nl.hnogames.domoticz.Preference.WearMultiSelectListPreference
             android:defaultValue="@array/empty_array"
             android:dependency="enableWearItems"
@@ -112,7 +113,7 @@
             android:key="wearItems"
             android:summary="@string/custom_wear_select_desc"
             android:title="@string/custom_wear_select"
-            customPreference:selectAllValuesByDefault="true" />
+            customPreference:selectAllValuesByDefault="true"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_server">
@@ -121,19 +122,19 @@
             android:key="enableMultiServers"
             android:summaryOff="@string/multi_server_settings"
             android:summaryOn="@string/multi_server_settings"
-            android:title="@string/multi_server" />
+            android:title="@string/multi_server"/>
         <Preference
             android:key="server_settings"
-            android:title="@string/server_settings" />
+            android:title="@string/server_settings"/>
         <Preference
             android:key="server_force_fetch_config"
-            android:title="@string/server_force_fetch_config" />
+            android:title="@string/server_force_fetch_config"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_geofencing">
         <Preference
             android:key="geo_settings"
-            android:title="@string/geofencing_configure" />
+            android:title="@string/geofencing_configure"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/wizard_widgets">
@@ -142,7 +143,7 @@
             android:key="enableWidgets"
             android:summaryOff="@string/widget_description"
             android:summaryOn="@string/widget_description"
-            android:title="@string/category_widgets" />
+            android:title="@string/category_widgets"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_nfc">
@@ -151,11 +152,11 @@
             android:key="enableNFC"
             android:summaryOff="@string/nfc_enable_settings"
             android:summaryOn="@string/nfc_enable_settings"
-            android:title="@string/enable_nfc" />
+            android:title="@string/enable_nfc"/>
         <Preference
             android:dependency="enableNFC"
             android:key="nfc_settings"
-            android:title="@string/nfc_settings" />
+            android:title="@string/nfc_settings"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_Speech">
@@ -164,11 +165,11 @@
             android:key="enableSpeech"
             android:summaryOff="@string/speech_enable_settings"
             android:summaryOn="@string/speech_enable_settings"
-            android:title="@string/enable_speech" />
+            android:title="@string/enable_speech"/>
         <Preference
             android:dependency="enableSpeech"
             android:key="speech_settings"
-            android:title="@string/speech_settings" />
+            android:title="@string/speech_settings"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_QRCode">
@@ -177,11 +178,11 @@
             android:key="enableQRCode"
             android:summaryOff="@string/qrcode_enable_settings"
             android:summaryOn="@string/qrcode_enable_settings"
-            android:title="@string/enable_qrcode" />
+            android:title="@string/enable_qrcode"/>
         <Preference
             android:dependency="enableQRCode"
             android:key="qrcode_settings"
-            android:title="@string/qrcode_settings" />
+            android:title="@string/qrcode_settings"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_startup_security">
@@ -190,11 +191,11 @@
             android:key="enableSecurity"
             android:summaryOff="@string/enable_security"
             android:summaryOn="@string/disable_security"
-            android:title="@string/security_settings" />
+            android:title="@string/security_settings"/>
         <Preference
             android:dependency="enableSecurity"
             android:key="SecuritySettings"
-            android:title="@string/setup_fingerprints" />
+            android:title="@string/setup_fingerprints"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_language">
@@ -202,13 +203,13 @@
             android:entries="@array/domoticz_language_entries"
             android:entryValues="@array/domoticz_language_entryValues"
             android:key="displayLanguage"
-            android:title="@string/category_language" />
+            android:title="@string/category_language"/>
         <SwitchPreference
             android:defaultValue="false"
             android:key="talkBack"
             android:summaryOff="@string/set_talk_back_on"
             android:summaryOn="@string/set_talk_back_off"
-            android:title="@string/category_talk_back" />
+            android:title="@string/category_talk_back"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_theme">
@@ -217,22 +218,23 @@
             android:key="darkTheme"
             android:summaryOff="@string/set_dark_theme"
             android:summaryOn="@string/set_light_theme"
-            android:title="@string/config_theme" />
+            android:title="@string/config_theme"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_notification">
-        <PreferenceScreen android:title="@string/notification_screen_title"
-            android:key="notificationscreen">
+        <PreferenceScreen
+            android:key="notificationscreen"
+            android:title="@string/notification_screen_title">
             <SwitchPreference
                 android:defaultValue="true"
                 android:key="enableNotifications"
                 android:summaryOff="@string/enable_notifications"
                 android:summaryOn="@string/enable_notifications"
-                android:title="@string/enable_notifications_title" />
+                android:title="@string/enable_notifications_title"/>
 
             <Preference
                 android:key="noticiationSettings"
-                android:title="@string/action_settings" />
+                android:title="@string/action_settings"/>
 
             <nl.hnogames.domoticz.Preference.NotificationsMultiSelectListPreference
                 android:defaultValue="@array/empty_array"
@@ -243,7 +245,7 @@
                 android:key="suppressNotifications"
                 android:summary="@string/suppress_notifications"
                 android:title="@string/suppress_notifications_title"
-                customPreference:selectAllValuesByDefault="false" />
+                customPreference:selectAllValuesByDefault="false"/>
 
             <SwitchPreference
                 android:defaultValue="false"
@@ -251,16 +253,18 @@
                 android:key="overwriteNotifications"
                 android:summaryOff="@string/overwrite_notifications"
                 android:summaryOn="@string/overwrite_notifications"
-                android:title="@string/overwrite_notifications_title" />
+                android:title="@string/overwrite_notifications_title"/>
 
-            <PreferenceCategory android:title="@string/notification_sound_title" android:key="notificationSound">
+            <PreferenceCategory
+                android:key="notificationSound"
+                android:title="@string/notification_sound_title">
                 <SwitchPreference
                     android:defaultValue="true"
                     android:dependency="enableNotifications"
                     android:key="notification_vibrate"
                     android:summaryOff="@string/notification_vibrate_off"
                     android:summaryOn="@string/notification_vibrate_on"
-                    android:title="@string/notification_vibrate_title" />
+                    android:title="@string/notification_vibrate_title"/>
                 <RingtonePreference
                     android:dependency="enableNotifications"
                     android:key="notification_sound"
@@ -268,7 +272,7 @@
                     android:showDefault="true"
                     android:showSilent="true"
                     android:summary="@string/notification_sound_summary"
-                    android:title="@string/notification_sound_title" />
+                    android:title="@string/notification_sound_title"/>
             </PreferenceCategory>
 
             <PreferenceCategory android:title="@string/alarm">
@@ -281,14 +285,14 @@
                     android:key="alarmNotifications"
                     android:summary="@string/alarm_notifications"
                     android:title="@string/alarm_notifications_title"
-                    customPreference:selectAllValuesByDefault="false" />
+                    customPreference:selectAllValuesByDefault="false"/>
 
                 <nl.hnogames.domoticz.Preference.EditTextIntegerPreference
-                    android:summary="@string/alarmtimer_title"
-                    android:title="@string/alarmtimer"
-                    android:key="alarmNotificationTimer"
+                    android:defaultValue="5"
                     android:dependency="enableNotifications"
-                    android:defaultValue="5" />
+                    android:key="alarmNotificationTimer"
+                    android:summary="@string/alarmtimer_title"
+                    android:title="@string/alarmtimer"/>
             </PreferenceCategory>
 
             <PreferenceCategory android:title="@string/category_advanced">
@@ -296,16 +300,16 @@
                     android:dependency="enableNotifications"
                     android:key="notification_show_logs"
                     android:summary="@string/notification_show"
-                    android:title="@string/notification_show_title" />
+                    android:title="@string/notification_show_title"/>
                 <Preference
                     android:dependency="enableNotifications"
                     android:key="notification_registration_id"
                     android:summary="@string/notification_settings_push"
-                    android:title="@string/notification_settings_id" />
+                    android:title="@string/notification_settings_id"/>
                 <Preference
                     android:dependency="enableNotifications"
                     android:key="clear_notifications"
-                    android:title="@string/clear_notifications" />
+                    android:title="@string/clear_notifications"/>
             </PreferenceCategory>
 
         </PreferenceScreen>
@@ -317,39 +321,39 @@
                 <Preference
                     android:key="version"
                     android:summary="Version 1.0.2"
-                    android:title="@string/info_version" />
+                    android:title="@string/info_version"/>
                 <SwitchPreference
                     android:defaultValue="false"
                     android:key="checkForSystemUpdates"
                     android:summaryOff="@string/check_for_update"
                     android:summaryOn="@string/check_for_update"
-                    android:title="@string/check_for_update_title" />
+                    android:title="@string/check_for_update_title"/>
                 <Preference
                     android:dependency="checkForSystemUpdates"
                     android:key="version_domoticz"
                     android:summary="Version 1.0.2"
-                    android:title="@string/info_domoticz_version" />
+                    android:title="@string/info_domoticz_version"/>
             </PreferenceCategory>
 
             <PreferenceCategory android:title="@string/category_export">
                 <Preference
                     android:key="export_settings"
-                    android:title="@string/export_settings" />
+                    android:title="@string/export_settings"/>
                 <Preference
                     android:key="import_settings"
-                    android:title="@string/import_settings" />
+                    android:title="@string/import_settings"/>
             </PreferenceCategory>
 
             <PreferenceCategory android:title="@string/permission_prefs_title">
                 <Preference
                     android:key="permissionssettings"
-                    android:title="@string/permission_config" />
+                    android:title="@string/permission_config"/>
             </PreferenceCategory>
 
             <PreferenceCategory android:title="@string/category_Reset">
                 <Preference
                     android:key="reset_settings"
-                    android:title="@string/reset_settings" />
+                    android:title="@string/reset_settings"/>
             </PreferenceCategory>
 
             <SwitchPreference
@@ -357,17 +361,17 @@
                 android:key="debugging"
                 android:summaryOff="@string/debug_switch_summary_off"
                 android:summaryOn="@string/debug_switch_summary_on"
-                android:title="@string/debug_switch_title" />
+                android:title="@string/debug_switch_title"/>
         </PreferenceScreen>
         <PreferenceScreen android:title="@string/category_info">
-        <PreferenceCategory android:title="@string/category_info">
-            <Preference
-                android:key="info_about"
-                android:title="@string/info_about" />
-            <Preference
-                android:key="info_credits"
-                android:title="@string/info_credits" />
-        </PreferenceCategory>
+            <PreferenceCategory android:title="@string/category_info">
+                <Preference
+                    android:key="info_about"
+                    android:title="@string/info_about"/>
+                <Preference
+                    android:key="info_credits"
+                    android:title="@string/info_credits"/>
+            </PreferenceCategory>
         </PreferenceScreen>
     </PreferenceCategory>
 
diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
index e9684117e..cba41cb00 100644
--- a/app/src/main/res/xml/searchable.xml
+++ b/app/src/main/res/xml/searchable.xml
@@ -21,5 +21,5 @@
   -->
 
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:hint="@string/pick_device_title"
-    android:label="@string/filter_devices" />
\ No newline at end of file
+            android:hint="@string/pick_device_title"
+            android:label="@string/filter_devices"/>
\ No newline at end of file
diff --git a/app/src/main/res/xml/securitywidgetprovider.xml b/app/src/main/res/xml/securitywidgetprovider.xml
index 6567428ba..0c0ba76ef 100644
--- a/app/src/main/res/xml/securitywidgetprovider.xml
+++ b/app/src/main/res/xml/securitywidgetprovider.xml
@@ -21,10 +21,10 @@
   -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="nl.hnogames.domoticz.Widgets.SecurityWidgetConfigurationActivity"
-    android:initialLayout="@layout/widget_security_layout"
-    android:minHeight="120dp"
-    android:minWidth="300dp"
-    android:previewImage="@drawable/security_widget_preview"
-    android:resizeMode="horizontal"
-    android:updatePeriodMillis="1000000" />
\ No newline at end of file
+                    android:configure="nl.hnogames.domoticz.Widgets.SecurityWidgetConfigurationActivity"
+                    android:initialLayout="@layout/widget_security_layout"
+                    android:minWidth="300dp"
+                    android:minHeight="120dp"
+                    android:previewImage="@drawable/security_widget_preview"
+                    android:resizeMode="horizontal"
+                    android:updatePeriodMillis="1000000"/>
\ No newline at end of file
diff --git a/app/src/main/res/xml/smallwidgetprovider.xml b/app/src/main/res/xml/smallwidgetprovider.xml
index f4307e7db..d42472241 100644
--- a/app/src/main/res/xml/smallwidgetprovider.xml
+++ b/app/src/main/res/xml/smallwidgetprovider.xml
@@ -21,10 +21,10 @@
   -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="nl.hnogames.domoticz.Widgets.SmallWidgetConfigurationActivity"
-    android:initialLayout="@layout/widget_small_layout"
-    android:previewImage="@drawable/lights"
-    android:minHeight="40dp"
-    android:minWidth="40dp"
-    android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="1000000" />
\ No newline at end of file
+                    android:configure="nl.hnogames.domoticz.Widgets.SmallWidgetConfigurationActivity"
+                    android:initialLayout="@layout/widget_small_layout"
+                    android:minWidth="40dp"
+                    android:minHeight="40dp"
+                    android:previewImage="@drawable/lights"
+                    android:resizeMode="horizontal|vertical"
+                    android:updatePeriodMillis="1000000"/>
\ No newline at end of file
diff --git a/app/src/oott/res/drawable-hdpi-v11/domoticz_white.png b/app/src/oott/res/drawable-hdpi-v11/domoticz_white.png
new file mode 100644
index 000000000..30561e4f4
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi-v11/domoticz_white.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..82619cccd
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..a1476f6d9
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..ceda41aac
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..ad14dfeb9
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_dvr_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..dfda3dcd8
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_dvr_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..e636c40b1
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_dvr_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..5dd9ce4e9
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_dvr_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..e90df3db5
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_highlight_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..a4b91b120
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_highlight_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..bd256390d
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_highlight_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..792947410
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_highlight_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..881d6b0dd
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..c89bcc71a
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..a8f262f7b
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..647420c7b
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..2b86cf6b8
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..bc2e6593e
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..5355a3a65
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..ab8dda5e4
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..c9d5f2613
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_opacity_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..9a7ba5624
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_opacity_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..61e1486ab
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_opacity_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..99c86b049
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_opacity_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..47a505688
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_stop_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..455434f40
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_stop_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_stop_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..75a09bb83
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_stop_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_stop_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..9f1bb3ac0
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_stop_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_stop_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..9d6b65da7
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_stop_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..9bc4a45ed
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..9f88ea5ae
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..1d0056c0c
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..b0375366d
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_18.png b/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..76fb86fce
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_24.png b/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..0945adf69
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_36.png b/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..763153790
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_48.png b/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..36c685021
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/oott/res/drawable-hdpi/ic_domoticz_logo.png b/app/src/oott/res/drawable-hdpi/ic_domoticz_logo.png
new file mode 100644
index 000000000..5ff3f68e1
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/ic_domoticz_logo.png differ
diff --git a/app/src/oott/res/drawable-hdpi/ic_domoticz_logo_white.png b/app/src/oott/res/drawable-hdpi/ic_domoticz_logo_white.png
new file mode 100644
index 000000000..3ace3da08
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/ic_domoticz_logo_white.png differ
diff --git a/app/src/oott/res/drawable-hdpi/outline_info_black_18.png b/app/src/oott/res/drawable-hdpi/outline_info_black_18.png
new file mode 100644
index 000000000..2d678b039
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/outline_info_black_18.png differ
diff --git a/app/src/oott/res/drawable-hdpi/outline_info_black_24.png b/app/src/oott/res/drawable-hdpi/outline_info_black_24.png
new file mode 100644
index 000000000..6677f00f1
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/outline_info_black_24.png differ
diff --git a/app/src/oott/res/drawable-hdpi/outline_info_black_36.png b/app/src/oott/res/drawable-hdpi/outline_info_black_36.png
new file mode 100644
index 000000000..12947cfcb
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/outline_info_black_36.png differ
diff --git a/app/src/oott/res/drawable-hdpi/outline_info_black_48.png b/app/src/oott/res/drawable-hdpi/outline_info_black_48.png
new file mode 100644
index 000000000..975b1ba2e
Binary files /dev/null and b/app/src/oott/res/drawable-hdpi/outline_info_black_48.png differ
diff --git a/app/src/oott/res/drawable-ldpi/ic_domoticz_logo.png b/app/src/oott/res/drawable-ldpi/ic_domoticz_logo.png
new file mode 100644
index 000000000..45367b05a
Binary files /dev/null and b/app/src/oott/res/drawable-ldpi/ic_domoticz_logo.png differ
diff --git a/app/src/oott/res/drawable-ldpi/ic_domoticz_logo_white.png b/app/src/oott/res/drawable-ldpi/ic_domoticz_logo_white.png
new file mode 100644
index 000000000..90b4fade8
Binary files /dev/null and b/app/src/oott/res/drawable-ldpi/ic_domoticz_logo_white.png differ
diff --git a/app/src/oott/res/drawable-mdpi-v11/domoticz_white.png b/app/src/oott/res/drawable-mdpi-v11/domoticz_white.png
new file mode 100644
index 000000000..cbe4ceeee
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi-v11/domoticz_white.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..6b88f6f3f
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..70feae6d0
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..a1476f6d9
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..c8e420f6e
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_dvr_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..1c49f02a9
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_dvr_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..3aa79d52a
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_dvr_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..e636c40b1
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_dvr_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..7bd6c78db
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_highlight_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..9ba7e5621
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_highlight_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..e50ea7593
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_highlight_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..bd256390d
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_highlight_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..e6dca4876
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..9f3b0e27c
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..2a6f560d9
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..a8f262f7b
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..f984862cd
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..fdf7f2c24
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..fd82b1732
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..5355a3a65
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..540d3e15c
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_opacity_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..da6e462ce
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_opacity_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..33b981dd4
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_opacity_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..61e1486ab
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_opacity_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..f63a7047c
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_stop_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..a21765cf3
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_stop_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_stop_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..39c6117d0
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_stop_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_stop_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..75a09bb83
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_stop_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_stop_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..dde84945f
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_stop_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..fb321448c
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..3f8280542
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..9f88ea5ae
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..86e54e0c6
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_18.png b/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..9a96baff8
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_24.png b/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..747cb7da8
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_36.png b/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..0945adf69
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_48.png b/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..5da77de52
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/oott/res/drawable-mdpi/ic_domoticz_logo.png b/app/src/oott/res/drawable-mdpi/ic_domoticz_logo.png
new file mode 100644
index 000000000..138825aee
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/ic_domoticz_logo.png differ
diff --git a/app/src/oott/res/drawable-mdpi/ic_domoticz_logo_white.png b/app/src/oott/res/drawable-mdpi/ic_domoticz_logo_white.png
new file mode 100644
index 000000000..11ff9af49
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/ic_domoticz_logo_white.png differ
diff --git a/app/src/oott/res/drawable-mdpi/outline_info_black_18.png b/app/src/oott/res/drawable-mdpi/outline_info_black_18.png
new file mode 100644
index 000000000..5c8c88d79
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/outline_info_black_18.png differ
diff --git a/app/src/oott/res/drawable-mdpi/outline_info_black_24.png b/app/src/oott/res/drawable-mdpi/outline_info_black_24.png
new file mode 100644
index 000000000..73a33ab01
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/outline_info_black_24.png differ
diff --git a/app/src/oott/res/drawable-mdpi/outline_info_black_36.png b/app/src/oott/res/drawable-mdpi/outline_info_black_36.png
new file mode 100644
index 000000000..6677f00f1
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/outline_info_black_36.png differ
diff --git a/app/src/oott/res/drawable-mdpi/outline_info_black_48.png b/app/src/oott/res/drawable-mdpi/outline_info_black_48.png
new file mode 100644
index 000000000..398e6ce0b
Binary files /dev/null and b/app/src/oott/res/drawable-mdpi/outline_info_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi-v11/domoticz_white.png b/app/src/oott/res/drawable-xhdpi-v11/domoticz_white.png
new file mode 100644
index 000000000..e3424e3c2
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi-v11/domoticz_white.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..a1476f6d9
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..c8e420f6e
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..ad14dfeb9
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..8fad114fe
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..e636c40b1
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..7bd6c78db
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..e90df3db5
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..361593e9c
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..bd256390d
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..e6dca4876
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..881d6b0dd
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..481482599
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..a8f262f7b
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..f984862cd
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..2b86cf6b8
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..ed15d783d
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..5355a3a65
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..540d3e15c
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..c9d5f2613
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..06b7adb66
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..61e1486ab
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..f63a7047c
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..47a505688
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..3c85bbb12
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_stop_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..75a09bb83
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_stop_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_stop_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..dde84945f
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_stop_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_stop_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..9d6b65da7
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_stop_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_stop_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..5bc5a6cd1
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_stop_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..9f88ea5ae
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..86e54e0c6
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..b0375366d
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..dbac973f5
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_18.png b/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..0945adf69
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_24.png b/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..5da77de52
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_36.png b/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..36c685021
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_48.png b/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..61a82f999
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/ic_domoticz_logo.png b/app/src/oott/res/drawable-xhdpi/ic_domoticz_logo.png
new file mode 100644
index 000000000..b61a1dc1f
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/ic_domoticz_logo.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/ic_domoticz_logo_white.png b/app/src/oott/res/drawable-xhdpi/ic_domoticz_logo_white.png
new file mode 100644
index 000000000..3bfaaf5a1
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/ic_domoticz_logo_white.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/outline_info_black_18.png b/app/src/oott/res/drawable-xhdpi/outline_info_black_18.png
new file mode 100644
index 000000000..6677f00f1
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/outline_info_black_18.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/outline_info_black_24.png b/app/src/oott/res/drawable-xhdpi/outline_info_black_24.png
new file mode 100644
index 000000000..398e6ce0b
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/outline_info_black_24.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/outline_info_black_36.png b/app/src/oott/res/drawable-xhdpi/outline_info_black_36.png
new file mode 100644
index 000000000..975b1ba2e
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/outline_info_black_36.png differ
diff --git a/app/src/oott/res/drawable-xhdpi/outline_info_black_48.png b/app/src/oott/res/drawable-xhdpi/outline_info_black_48.png
new file mode 100644
index 000000000..3fc566206
Binary files /dev/null and b/app/src/oott/res/drawable-xhdpi/outline_info_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi-v11/domoticz_white.png b/app/src/oott/res/drawable-xxhdpi-v11/domoticz_white.png
new file mode 100644
index 000000000..9d574880e
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi-v11/domoticz_white.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..ceda41aac
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..ad14dfeb9
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..55110fd04
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..bb705f3bc
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..5dd9ce4e9
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..e90df3db5
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..d72ad13a7
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..32b7bef98
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..792947410
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..881d6b0dd
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..9a9c5e803
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..9f251dc35
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..647420c7b
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..2b86cf6b8
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..5bd8945d6
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..9fd353899
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..ab8dda5e4
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..c9d5f2613
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..a4afd4b34
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..3ad77acb4
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..99c86b049
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..47a505688
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..2f9270c7c
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..237e3644a
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..9f1bb3ac0
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..9d6b65da7
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..75f47c1bf
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..eac183db7
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_stop_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..1d0056c0c
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..b0375366d
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..12b0613e0
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..b4391354c
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_18.png b/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..763153790
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_24.png b/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..36c685021
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_36.png b/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..a536d885a
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_48.png b/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..269901932
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/ic_domoticz_logo.png b/app/src/oott/res/drawable-xxhdpi/ic_domoticz_logo.png
new file mode 100644
index 000000000..4e3a935a6
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/ic_domoticz_logo.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/ic_domoticz_logo_white.png b/app/src/oott/res/drawable-xxhdpi/ic_domoticz_logo_white.png
new file mode 100644
index 000000000..34c4c1eb5
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/ic_domoticz_logo_white.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/outline_info_black_18.png b/app/src/oott/res/drawable-xxhdpi/outline_info_black_18.png
new file mode 100644
index 000000000..12947cfcb
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/outline_info_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/outline_info_black_24.png b/app/src/oott/res/drawable-xxhdpi/outline_info_black_24.png
new file mode 100644
index 000000000..975b1ba2e
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/outline_info_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/outline_info_black_36.png b/app/src/oott/res/drawable-xxhdpi/outline_info_black_36.png
new file mode 100644
index 000000000..c304dd747
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/outline_info_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxhdpi/outline_info_black_48.png b/app/src/oott/res/drawable-xxhdpi/outline_info_black_48.png
new file mode 100644
index 000000000..de39c6a24
Binary files /dev/null and b/app/src/oott/res/drawable-xxhdpi/outline_info_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_18.png
new file mode 100644
index 000000000..ad14dfeb9
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_24.png
new file mode 100644
index 000000000..8fad114fe
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_36.png
new file mode 100644
index 000000000..bb705f3bc
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_48.png
new file mode 100644
index 000000000..e2fc973b4
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_dashboard_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_18.png
new file mode 100644
index 000000000..e90df3db5
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_24.png
new file mode 100644
index 000000000..361593e9c
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_36.png
new file mode 100644
index 000000000..32b7bef98
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_48.png
new file mode 100644
index 000000000..9b03086bc
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_dvr_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_18.png
new file mode 100644
index 000000000..881d6b0dd
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_24.png
new file mode 100644
index 000000000..481482599
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_36.png
new file mode 100644
index 000000000..9f251dc35
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_48.png
new file mode 100644
index 000000000..31bf7cc0a
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_highlight_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_18.png
new file mode 100644
index 000000000..2b86cf6b8
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_24.png
new file mode 100644
index 000000000..ed15d783d
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_36.png
new file mode 100644
index 000000000..9fd353899
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_48.png
new file mode 100644
index 000000000..f6248cde5
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_down_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_18.png
new file mode 100644
index 000000000..c9d5f2613
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_24.png
new file mode 100644
index 000000000..06b7adb66
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_36.png
new file mode 100644
index 000000000..3ad77acb4
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_48.png
new file mode 100644
index 000000000..339b456dc
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_keyboard_arrow_up_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_18.png
new file mode 100644
index 000000000..47a505688
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_24.png
new file mode 100644
index 000000000..3c85bbb12
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_36.png
new file mode 100644
index 000000000..237e3644a
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_48.png
new file mode 100644
index 000000000..7dcc2836e
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_opacity_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_18.png
new file mode 100644
index 000000000..9d6b65da7
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_24.png
new file mode 100644
index 000000000..5bc5a6cd1
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_36.png
new file mode 100644
index 000000000..eac183db7
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_48.png
new file mode 100644
index 000000000..685a83e1f
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_stop_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_18.png
new file mode 100644
index 000000000..b0375366d
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_24.png
new file mode 100644
index 000000000..dbac973f5
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_36.png
new file mode 100644
index 000000000..b4391354c
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_48.png
new file mode 100644
index 000000000..d833bc83b
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_view_carousel_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_18.png b/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_18.png
new file mode 100644
index 000000000..36c685021
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_24.png b/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_24.png
new file mode 100644
index 000000000..61a82f999
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_36.png b/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_36.png
new file mode 100644
index 000000000..269901932
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_48.png b/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_48.png
new file mode 100644
index 000000000..614beb3b7
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/baseline_wb_sunny_black_48.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/ic_domoticz_logo.png b/app/src/oott/res/drawable-xxxhdpi/ic_domoticz_logo.png
new file mode 100644
index 000000000..d3f4d780c
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/ic_domoticz_logo.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/ic_domoticz_logo_white.png b/app/src/oott/res/drawable-xxxhdpi/ic_domoticz_logo_white.png
new file mode 100644
index 000000000..184ef7eb6
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/ic_domoticz_logo_white.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/outline_info_black_18.png b/app/src/oott/res/drawable-xxxhdpi/outline_info_black_18.png
new file mode 100644
index 000000000..975b1ba2e
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/outline_info_black_18.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/outline_info_black_24.png b/app/src/oott/res/drawable-xxxhdpi/outline_info_black_24.png
new file mode 100644
index 000000000..3fc566206
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/outline_info_black_24.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/outline_info_black_36.png b/app/src/oott/res/drawable-xxxhdpi/outline_info_black_36.png
new file mode 100644
index 000000000..de39c6a24
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/outline_info_black_36.png differ
diff --git a/app/src/oott/res/drawable-xxxhdpi/outline_info_black_48.png b/app/src/oott/res/drawable-xxxhdpi/outline_info_black_48.png
new file mode 100644
index 000000000..33022becd
Binary files /dev/null and b/app/src/oott/res/drawable-xxxhdpi/outline_info_black_48.png differ
diff --git a/app/src/oott/res/drawable/palette.png b/app/src/oott/res/drawable/palette.png
new file mode 100644
index 000000000..54f6006f2
Binary files /dev/null and b/app/src/oott/res/drawable/palette.png differ
diff --git a/app/src/oott/res/drawable/wheel.png b/app/src/oott/res/drawable/wheel.png
new file mode 100644
index 000000000..40be615ab
Binary files /dev/null and b/app/src/oott/res/drawable/wheel.png differ
diff --git a/app/src/oott/res/drawable/wheel_dark.png b/app/src/oott/res/drawable/wheel_dark.png
new file mode 100644
index 000000000..ae1fff13c
Binary files /dev/null and b/app/src/oott/res/drawable/wheel_dark.png differ
diff --git a/app/src/oott/res/drawable/wwpalette.png b/app/src/oott/res/drawable/wwpalette.png
new file mode 100644
index 000000000..48fd234ba
Binary files /dev/null and b/app/src/oott/res/drawable/wwpalette.png differ
diff --git a/app/src/oott/res/drawable/wwslider.png b/app/src/oott/res/drawable/wwslider.png
new file mode 100644
index 000000000..2505e273f
Binary files /dev/null and b/app/src/oott/res/drawable/wwslider.png differ
diff --git a/app/src/oott/res/values/colors.xml b/app/src/oott/res/values/colors.xml
index 1b19af1d7..6644da54e 100644
--- a/app/src/oott/res/values/colors.xml
+++ b/app/src/oott/res/values/colors.xml
@@ -19,20 +19,20 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
 <resources>
+    <color name="primary">#2196F3</color>
+    <color name="primary_dark">#2196F3</color>
 
-    <!-- Material design colors -->
-    <color name="primary">#263238</color>
-    <color name="primary_dark">#22272B</color>
-
-    <color name="secondary">#1E88E5</color>
-    <color name="secondary_dark">#1D7DD1</color>
+    <color name="secondary">#1B324D</color>
+    <color name="secondary_dark">#142A3B</color>
 
-    <color name="accent">#22272B</color>
+    <color name="background_grey">#EDEDED</color>
+    <color name="accent">@color/button_dark_status</color>
 
-    <color name="background_dark">#303030</color>
-    <color name="button_dark">#50BDBDBD</color>
+    <color name="background_dark">#2A292F</color>
+    <color name="card_background_dark">#2A292F</color>
+    <color name="button_dark">#284B6B</color>
+    <color name="button_dark_status">#284B6B</color>
 
     <color name="welcome1_background">@color/black</color>
     <color name="welcome2_background">@color/default_background_color_light</color>
diff --git a/app/src/oott/res/values/strings.xml b/app/src/oott/res/values/strings.xml
index af16724c9..4afa4885f 100644
--- a/app/src/oott/res/values/strings.xml
+++ b/app/src/oott/res/values/strings.xml
@@ -37,6 +37,8 @@
     <string name="button_state_off">Off</string>
     <string name="button_state_closed">Closed</string>
     <string name="button_state_open">Open</string>
+    <string name="button_state_lock">Lock</string>
+    <string name="button_state_unlock">Unlock</string>
     <string name="button_status_log">Log</string>
     <string name="button_status_day">Day</string>
     <string name="button_status_week">Week</string>
@@ -47,6 +49,8 @@
     <string name="button_color">Color</string>
     <string name="button_arm">Arm</string>
     <string name="button_disarm">Disarm</string>
+    <string name="button_state_full_light">Full light</string>
+    <string name="button_state_night">Night light</string>
 
     <string name="last_update">Last seen</string>
     <string name="signal_level">Signal level</string>
@@ -98,6 +102,8 @@
 
     <string name="switch_on">Turning switch on</string>
     <string name="switch_off">Turning switch off</string>
+    <string name="switch_night">Turning switch to night light</string>
+    <string name="switch_full">Turning switch to full light</string>
 
     <string name="blind_up">Turning blind up</string>
     <string name="blind_down">Turning blind down</string>
diff --git a/app/src/oott/res/values/styles.xml b/app/src/oott/res/values/styles.xml
index 2f3775e00..018f1816c 100644
--- a/app/src/oott/res/values/styles.xml
+++ b/app/src/oott/res/values/styles.xml
@@ -18,55 +18,70 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-
 <resources>
     <!-- Base application theme. -->
-    <style name="AppThemeMain" parent="MaterialDrawerTheme.Light.DarkToolbar">
+    <style name="AppThemeIntro" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <!-- Base application theme. -->
+    <style name="AppThemeMain" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="android:dialogTheme">@style/MyDialogTheme</item>
-        <item name="android:alertDialogTheme">@style/MyDialogTheme</item>
-        <item name="dialogTheme">@style/MyDialogTheme</item>
-        <item name="alertDialogTheme">@style/MyDialogTheme</item>
+        <item name="colorAccent">@color/primary</item>
+
+        <!-- MaterialDrawer specific values -->
+        <item name="material_drawer_background">@color/material_drawer_background</item>
+        <item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
+        <item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
+        <item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>
+        <item name="material_drawer_hint_text">@color/material_drawer_hint_text</item>
+        <item name="material_drawer_divider">@color/material_drawer_divider</item>
+        <item name="material_drawer_selected">@color/material_drawer_selected</item>
+        <item name="material_drawer_selected_text">@color/material_drawer_selected_text</item>
+        <item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
     </style>
 
-    <style name="AppThemeDarkMain" parent="MaterialDrawerTheme">
+    <style name="AppThemeDarkMain" parent="Theme.MaterialComponents.NoActionBar">
         <item name="colorPrimary">@color/secondary</item>
         <item name="colorPrimaryDark">@color/secondary_dark</item>
-        <item name="android:dialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="android:alertDialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="dialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="alertDialogTheme">@style/MyDarkDialogTheme</item>
+        <item name="colorAccent">@color/primary</item>
+
+        <!-- MaterialDrawer specific values -->
+        <item name="material_drawer_background">@color/card_background_dark</item>
+        <item name="material_drawer_primary_text">@color/material_drawer_dark_primary_text</item>
+        <item name="material_drawer_primary_icon">@color/material_drawer_dark_primary_icon</item>
+        <item name="material_drawer_secondary_text">@color/material_drawer_dark_secondary_text</item>
+        <item name="material_drawer_hint_text">@color/material_drawer_dark_hint_text</item>
+        <item name="material_drawer_divider">@color/material_drawer_dark_divider</item>
+        <item name="material_drawer_selected">@color/button_dark</item>
+        <item name="material_drawer_selected_text">@color/material_drawer_dark_selected_text</item>
+        <item name="material_drawer_header_selection_text">@color/material_drawer_dark_header_selection_text</item>
     </style>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="android:dialogTheme">@style/MyDialogTheme</item>
-        <item name="android:alertDialogTheme">@style/MyDialogTheme</item>
-        <item name="dialogTheme">@style/MyDialogTheme</item>
-        <item name="alertDialogTheme">@style/MyDialogTheme</item>
+        <item name="colorAccent">@color/primary</item>
     </style>
 
-    <style name="AppThemeDark" parent="Theme.AppCompat">
+    <style name="AppThemeDark" parent="Theme.MaterialComponents.Bridge">
         <item name="colorPrimary">@color/secondary</item>
         <item name="colorPrimaryDark">@color/secondary_dark</item>
-        <item name="android:dialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="android:alertDialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="dialogTheme">@style/MyDarkDialogTheme</item>
-        <item name="alertDialogTheme">@style/MyDarkDialogTheme</item>
+        <item name="colorAccent">@color/primary</item>
     </style>
 
     <!--        Styles Light     -->
     <style name="background_listview">
         <item name="android:paddingLeft">@dimen/row_space</item>
         <item name="android:paddingRight">@dimen/row_space</item>
-        <item name="android:background">@color/material_grey_300_</item>
+        <item name="android:background">@color/background_grey</item>
     </style>
 
     <style name="background_recyclerview">
-        <item name="android:background">@color/material_grey_300_</item>
+        <item name="android:background">@color/background_grey</item>
     </style>
 
     <style name="listview_row">
@@ -93,7 +108,7 @@
     <style name="nav_name" parent="@style/TextAppearance.AppCompat.Body1">
         <item name="android:paddingTop">10dp</item>
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginBottom">5dp</item>
     </style>
@@ -101,33 +116,33 @@
     <style name="row_name" parent="@style/TextAppearance.AppCompat.Title">
         <item name="android:paddingTop">10dp</item>
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginBottom">5dp</item>
     </style>
 
-    <style name="row_dash_name" parent="@style/TextAppearance.AppCompat.Title">
+    <style name="row_dash_name" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:paddingTop">10dp</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginBottom">5dp</item>
     </style>
 
-    <style name="row_name_micro" parent="@style/TextAppearance.AppCompat.Title">
+    <style name="row_name_micro" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">11sp</item>
+        <item name="android:textSize">10sp</item>
         <item name="android:textStyle">normal</item>
     </style>
 
-    <style name="row_name_small" parent="@style/TextAppearance.AppCompat.Title">
+    <style name="row_name_small" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
     </style>
 
     <style name="row_body1" parent="@style/TextAppearance.AppCompat.Body1">
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">12sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginBottom">2dp</item>
     </style>
@@ -146,9 +161,9 @@
         <item name="android:layout_marginBottom">2dp</item>
     </style>
 
-    <style name="row_dash_body2" parent="@style/TextAppearance.AppCompat.Body2">
+    <style name="row_dash_body2" parent="@style/TextAppearance.AppCompat.Body1">
         <item name="android:paddingBottom">10dp</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">8sp</item>
         <item name="android:textStyle">italic</item>
         <item name="android:layout_marginBottom">2dp</item>
     </style>
@@ -158,7 +173,6 @@
         <item name="android:scrollbarStyle">outsideOverlay</item>
     </style>
 
-
     <!--        Debugging        -->
     <style name="debug_layout">
         <item name="android:layout_width">match_parent</item>
@@ -180,31 +194,12 @@
         <item name="android:scrollbars">vertical</item>
     </style>
 
-    <style name="MyDialogTheme" parent="Theme.AppCompat.Light.Dialog">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-    </style>
-
-    <style name="MyDarkDialogTheme" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-        <item name="colorAccent">#FFFFFF</item>
-        <item name="android:textColorPrimary">#FFFFFF</item>
-        <item name="android:textColor">#FFFFFF</item>
-        <item name="android:background">@color/primary_dark</item>
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-    </style>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar"/>
 
+    <style name="AppTheme.PopupOverlay" parent="Theme.MaterialComponents.Light.Bridge"/>
 </resources>
diff --git a/app/src/oott/res/values/translationArrays.xml b/app/src/oott/res/values/translationArrays.xml
index 484762f1d..864956d34 100644
--- a/app/src/oott/res/values/translationArrays.xml
+++ b/app/src/oott/res/values/translationArrays.xml
@@ -23,6 +23,7 @@
 <resources>
     <string-array name="domoticz_language_entryValues" translatable="false">
         <item>EN</item>
+        <item>BS</item>
         <item>CA</item>
         <item>CS</item>
         <item>DA</item>
@@ -40,11 +41,14 @@
         <item>RU</item>
         <item>SK</item>
         <item>SV</item>
+        <item>TR</item>
+        <item>UK</item>
         <item>zh_CN</item>
     </string-array>
 
     <string-array name="domoticz_language_entries">
         <item>English</item>
+        <item>Bosnian</item>
         <item>Catalan</item>
         <item>Czech</item>
         <item>Danish</item>
@@ -62,7 +66,8 @@
         <item>Russian</item>
         <item>Slovak</item>
         <item>Swedish</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
         <item>Chinese Simplified</item>
     </string-array>
-
 </resources>
\ No newline at end of file
diff --git a/app/version.properties b/app/version.properties
index 79607cde2..7867f9ec3 100644
--- a/app/version.properties
+++ b/app/version.properties
@@ -1,4 +1,4 @@
-#Wed Oct 03 09:17:21 CEST 2018
-VERSION_BUILD=4336
-VERSION_PATCH=476
-VERSION_CODE=300
+#Fri Oct 19 16:27:16 CEST 2018
+VERSION_BUILD=4812
+VERSION_PATCH=491
+VERSION_CODE=315
diff --git a/build.gradle b/build.gradle
index 537de36dc..42d04d5ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     repositories {
         maven { url "https://jitpack.io" };
         mavenCentral();
+        maven { url "https://dl.bintray.com/drummer-aidan/maven/" }
         jcenter()
         maven {
             url 'https://maven.google.com/'
@@ -16,7 +17,7 @@ buildscript {
     }
     //noinspection GroovyAssignabilityCheck
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:3.2.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.0'
         classpath 'io.fabric.tools:gradle:1.+'
diff --git a/domoticzapi/build.gradle b/domoticzapi/build.gradle
index 15061c98a..f455b2b19 100644
--- a/domoticzapi/build.gradle
+++ b/domoticzapi/build.gradle
@@ -28,8 +28,7 @@ android {
     def versionPropsFile = file('version.properties')
 
     if (versionPropsFile.canRead()) {
-        def Properties versionProps = new Properties()
-
+        Properties versionProps = new Properties()
         versionProps.load(new FileInputStream(versionPropsFile))
         def value = 0
         def runTasks = gradle.startParameter.taskNames
@@ -45,18 +44,16 @@ android {
         def versionMajor = 0
         def versionMinor = 1
         def versionPatch = versionProps['VERSION_PATCH'].toInteger() + value
-        def versionBuild = versionProps['VERSION_BUILD'].toInteger() + 1
         def version_Code = versionProps['VERSION_CODE'].toInteger() + value
 
         versionProps['VERSION_PATCH'] = versionPatch.toString()
-        versionProps['VERSION_BUILD'] = versionBuild.toString()
         versionProps['VERSION_CODE'] = version_Code.toString()
 
         versionProps.store(versionPropsFile.newWriter(), null)
 
         defaultConfig {
             versionCode version_Code
-            versionName "${versionMajor}.${versionMinor}.${versionPatch} (${versionBuild})"
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}"
             minSdkVersion 15
             targetSdkVersion 28
         }
diff --git a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/DevicesInfo.java b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/DevicesInfo.java
index 0ac7850f7..19557ae6c 100644
--- a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/DevicesInfo.java
+++ b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/DevicesInfo.java
@@ -116,6 +116,7 @@ public DevicesInfo(JSONObject row) throws JSONException {
         if (row.has("DewPoint")) DewPoint = row.getLong("DewPoint");
         if (row.has("Temp")) Temp = row.getLong("Temp");
         if (row.has("Barometer")) Barometer = row.getInt("Barometer");
+        if (row.has("Description")) Description = row.getString("Description");
 
         try {
             if (row.has("MaxDimLevel"))
@@ -332,10 +333,10 @@ public ArrayList<String> getLevelNames() {
     public boolean getStatusBoolean() {
         try {
             boolean statusBoolean = true;
-
             if (status.equalsIgnoreCase(DomoticzValues.Device.Blind.State.OFF) || status.equalsIgnoreCase(DomoticzValues.Device.Blind.State.CLOSED))
                 statusBoolean = false;
-
+            else if (status.equalsIgnoreCase(DomoticzValues.Device.Door.State.UNLOCKED) || status.equalsIgnoreCase(DomoticzValues.Device.Door.State.OPEN))
+                statusBoolean = false;
             this.statusBoolean = statusBoolean;
             return statusBoolean;
         } catch (Exception ex) {
diff --git a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/SceneInfo.java b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/SceneInfo.java
index 5ab7c27f1..2e7f82450 100644
--- a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/SceneInfo.java
+++ b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/SceneInfo.java
@@ -36,6 +36,7 @@ public class SceneInfo implements Comparable, Serializable {
     private String jsonObject;
 
     private int favorite;
+    private String Description;
     private int hardwareID;
     private String lastUpdate;
     private String name;
@@ -50,6 +51,7 @@ public SceneInfo(JSONObject row) throws JSONException {
         this.jsonObject = row.toString();
         if (row.has("Favorite"))
             favorite = row.getInt("Favorite");
+        if (row.has("Description")) Description = row.getString("Description");
 
         isProtected = row.getBoolean("Protected");
         if (row.has("HardwareID"))
@@ -72,6 +74,13 @@ public SceneInfo(JSONObject row) throws JSONException {
         idx = row.getInt("idx");
     }
 
+    public String getDescription() {
+        return Description;
+    }
+    public void setDescription(String description) {
+        Description = description;
+    }
+
     @Override
     public String toString() {
         return "SceneInfo{" +
diff --git a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Domoticz.java b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Domoticz.java
index 2f90e2caf..e94580183 100644
--- a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Domoticz.java
+++ b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Domoticz.java
@@ -287,6 +287,7 @@ public List<Integer> getSupportedSwitchesValues() {
         switchesSupported.add(DomoticzValues.Device.Type.Value.DUSKSENSOR);
         switchesSupported.add(DomoticzValues.Device.Type.Value.DOORCONTACT);
         switchesSupported.add(DomoticzValues.Device.Type.Value.DOORLOCK);
+        switchesSupported.add(DomoticzValues.Device.Type.Value.DOORLOCKINVERTED);
         switchesSupported.add(DomoticzValues.Device.Type.Value.DOORBELL);
         switchesSupported.add(DomoticzValues.Device.Type.Value.SECURITY);
         switchesSupported.add(DomoticzValues.Device.Type.Value.SELECTOR);
@@ -312,6 +313,7 @@ public List<String> getSupportedSwitchesNames() {
         switchesSupported.add(DomoticzValues.Device.Type.Name.X10SIREN);
         switchesSupported.add(DomoticzValues.Device.Type.Name.DUSKSENSOR);
         switchesSupported.add(DomoticzValues.Device.Type.Name.DOORLOCK);
+        switchesSupported.add(DomoticzValues.Device.Type.Name.DOORLOCKINVERTED);
         switchesSupported.add(DomoticzValues.Device.Type.Name.DOORCONTACT);
         switchesSupported.add(DomoticzValues.Device.Type.Name.DOORBELL);
         switchesSupported.add(DomoticzValues.Device.Type.Name.SECURITY);
@@ -659,9 +661,33 @@ public void setRGBColorAction(int idx,
         }
         Log.v(TAG, "Action: " + url);
         RequestUtil.makeJsonGetRequest(parser,
-                getUserCredentials(Authentication.USERNAME),
-                getUserCredentials(Authentication.PASSWORD),
-                url, mSessionUtil, true, 3, queue);
+            getUserCredentials(Authentication.USERNAME),
+            getUserCredentials(Authentication.PASSWORD),
+            url, mSessionUtil, true, 3, queue);
+    }
+
+    @SuppressWarnings("SpellCheckingInspection")
+    public void setWWColorAction(int idx,
+                                 int cw,
+                                 int ww,
+                                  int brightness,
+                                  String password,
+                                  setCommandReceiver receiver) {
+        setCommandParser parser = new setCommandParser(receiver);
+
+        String url = mDomoticzUrls.constructSetUrl(DomoticzValues.Json.Url.Set.WWCOLOR, idx, DomoticzValues.Device.Dimmer.Action.WWCOLOR, 0);
+        url = url.replace("%ww%", String.valueOf(ww))
+            .replace("%cw%", String.valueOf(cw))
+            .replace("%bright%", String.valueOf(brightness));
+
+        if (!UsefulBits.isEmpty(password)) {
+            url += "&passcode=" + password;
+        }
+        Log.v(TAG, "Action: " + url);
+        RequestUtil.makeJsonGetRequest(parser,
+            getUserCredentials(Authentication.USERNAME),
+            getUserCredentials(Authentication.PASSWORD),
+            url, mSessionUtil, true, 3, queue);
     }
 
     @SuppressWarnings("SpellCheckingInspection")
diff --git a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzUrls.java b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzUrls.java
index 527ce8e58..fcf53937f 100644
--- a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzUrls.java
+++ b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzUrls.java
@@ -116,6 +116,14 @@ public String constructSetUrl(int jsonSetUrl, int idx, int action, double value)
                 actionUrl = DomoticzValues.Url.Switch.COLOR;
                 break;
 
+            case DomoticzValues.Device.Dimmer.Action.KELVIN:
+                actionUrl = DomoticzValues.Url.Switch.KELVIN + String.valueOf(value);
+                break;
+
+            case DomoticzValues.Device.Dimmer.Action.WWCOLOR:
+                actionUrl = DomoticzValues.Url.Switch.WWCOLOR;
+                break;
+
             case DomoticzValues.Device.ModalSwitch.Action.AUTO:
                 actionUrl = DomoticzValues.Url.ModalAction.AUTO;
                 break;
@@ -202,13 +210,38 @@ public String constructSetUrl(int jsonSetUrl, int idx, int action, double value)
                         + actionUrl;
                 break;
 
+            case DomoticzValues.Json.Url.Set.KELVIN:
+                url = DomoticzValues.Url.System.KELVIN;
+                jsonUrl = url
+                        + String.valueOf(idx)
+                        + actionUrl;
+                break;
+
+            case DomoticzValues.Json.Url.Set.WWCOLOR:
+                url = DomoticzValues.Url.System.RGBCOLOR;
+                jsonUrl = url
+                    + String.valueOf(idx)
+                    + actionUrl;
+                break;
+
+            case DomoticzValues.Json.Url.Set.NIGHTLIGHT:
+                url = DomoticzValues.Url.System.NIGHTLIGHT;
+                jsonUrl = url
+                    + String.valueOf(idx);
+                break;
+
+            case DomoticzValues.Json.Url.Set.FULLLIGHT:
+                url = DomoticzValues.Url.System.FULLLIGHT;
+                jsonUrl = url
+                    + String.valueOf(idx);
+                break;
+
             case DomoticzValues.Json.Url.Set.EVENTS_UPDATE_STATUS:
                 url = DomoticzValues.Url.System.EVENTS_UPDATE_STATUS;
                 jsonUrl = url
                         + String.valueOf(idx)
                         + actionUrl;
                 break;
-
         }
 
         String fullString = buildUrl.append(protocol)
diff --git a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzValues.java b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzValues.java
index ca887c4bb..bbd1fd9f7 100644
--- a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzValues.java
+++ b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzValues.java
@@ -87,6 +87,8 @@ interface Dimmer {
             interface Action {
                 int DIM_LEVEL = 20;
                 int COLOR = 21;
+                int WWCOLOR = 22;
+                int KELVIN = 23;
             }
         }
 
@@ -111,6 +113,15 @@ interface SubType {
             }
         }
 
+        interface Door {
+            interface State {
+                String UNLOCKED = "Unlocked";
+                String LOCKED = "Locked";
+                String OPEN = "Open";
+                String CLOSED = "Closed";
+            }
+        }
+
         interface Blind {
             interface State {
                 String CLOSED = "Closed";
@@ -171,6 +182,7 @@ interface Value {
                 int BLINDPERCENTAGEINVERTED = 16;
                 int SELECTOR = 18;
                 int DOORLOCK = 19;
+                int DOORLOCKINVERTED = 20;
             }
 
             @SuppressWarnings({"unused", "SpellCheckingInspection"})
@@ -189,6 +201,7 @@ interface Name {
                 String MEDIAPLAYER = "Media Player";
                 String DUSKSENSOR = "Dusk Sensor";
                 String DOORLOCK = "Door Lock";
+                String DOORLOCKINVERTED = "Door Lock Inverted";
                 String DOORCONTACT = "Door Contact";
                 String BLINDPERCENTAGE = "Blinds Percentage";
                 String BLINDVENETIAN = "Venetian Blinds EU";
@@ -213,6 +226,7 @@ interface Value {
             @SuppressWarnings({"unused", "SpellCheckingInspection"})
             interface Name {
                 String RGB = "RGB";
+                String WW = "WW";
                 String SECURITYPANEL = "Security Panel";
                 String EVOHOME = "Evohome";
             }
@@ -287,6 +301,10 @@ interface Set {
                 int RGBCOLOR = 107;
                 int MODAL_SWITCHES = 108;
                 int EVENTS_UPDATE_STATUS = 109;
+                int FULLLIGHT = 110;
+                int NIGHTLIGHT = 111;
+                int WWCOLOR = 112;
+                int KELVIN = 113;
             }
         }
 
@@ -391,6 +409,8 @@ interface Category {
         interface Switch {
             String DIM_LEVEL = "Set%20Level&level=";
             String COLOR = "&hue=%hue%&brightness=%bright%&iswhite=false";
+            String KELVIN = "&kelvin=";
+            String WWCOLOR = "&brightness=%bright%&color={\"m\":2,\"t\":%ww%,\"r\":0,\"g\":0,\"b\":0,\"cw\":%cw%,\"ww\":%ww%}";
             String GET = "/json.htm?type=command&param=switchlight&idx=";
             String CMD = "&switchcmd=";
             String LEVEL = "&level=";
@@ -474,6 +494,9 @@ interface System {
             String EVENTS = "/json.htm?type=events&param=list";
             String EVENTS_UPDATE_STATUS = "/json.htm?type=events&param=updatestatus&eventid=";
             String RGBCOLOR = "/json.htm?type=command&param=setcolbrightnessvalue&idx=";
+            String KELVIN = "/json.htm?type=command&param=setkelvinlevel&idx=";
+            String FULLLIGHT = "/json.htm?param=fulllight&type=command&idx=";
+            String NIGHTLIGHT = "/json.htm?param=nightlight&type=command&idx=";
             String SETTINGS = "/json.htm?type=settings";
             String CONFIG = "/json.htm?type=command&param=getconfig";
             String SETSECURITY = "/json.htm?type=command&param=setsecstatus";
diff --git a/domoticzapi/version.properties b/domoticzapi/version.properties
index 2c795099e..35b011887 100644
--- a/domoticzapi/version.properties
+++ b/domoticzapi/version.properties
@@ -1,4 +1,4 @@
-#Wed Oct 03 09:17:21 CEST 2018
-VERSION_BUILD=3481
-VERSION_PATCH=132
-VERSION_CODE=132
+#Fri Oct 19 16:27:17 CEST 2018
+VERSION_BUILD=3675
+VERSION_PATCH=143
+VERSION_CODE=143
diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle
index abb707b87..0460b05e9 100644
--- a/libs/MemorizingTrustManager/build.gradle
+++ b/libs/MemorizingTrustManager/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 	//noinspection GroovyAssignabilityCheck
 	dependencies {
-		classpath 'com.android.tools.build:gradle:3.2.0'
+		classpath 'com.android.tools.build:gradle:3.2.1'
 	}
 }
 
@@ -18,7 +18,7 @@ dependencies {
 
 android {
 	compileSdkVersion 25
-	buildToolsVersion '28.0.2'
+	buildToolsVersion '28.0.3'
 	//noinspection GroovyAssignabilityCheck
 	defaultConfig {
         minSdkVersion 9
diff --git a/wear/build.gradle b/wear/build.gradle
index 805c1ffae..c10c53ea1 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -24,7 +24,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.2'
+    buildToolsVersion '28.0.3'
     publishNonDefault true
 
     defaultConfig {