diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d30a19a76e..c1873d786f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,17 +39,9 @@
     <color name="tempTargetConfirmation">#77dd77</color>
 
 
-    <color name="colorPrimary">#212121</color>
-    <color name="colorPrimaryDark">#000000</color>
-    <color name="colorAccent">#40bbaa</color>
     <color name="mdtp_accent_color">#40bbaa</color>
     <color name="colorInitializingBorder">#00695c</color>
 
-    <color name="dialog_title_background">#303030</color>
-    <color name="activity_title_background">#121212</color>
-    <color name="dialog_title_color">#FFFFFF</color>
-    <color name="dialog_title_icon_tint">#FFFFFF</color>
-
     <color name="cardColorBackground">#121212</color>
     <color name="cardObjectiveText">#779ECB</color>
 
@@ -91,12 +83,6 @@
 
     <color name="splashBackground">#2E2E2E</color>
 
-    <color name="warningAlertBackground">#FFFB8C00</color>
-    <color name="warningAlertHeaderText">#FF000000</color>
-
-    <color name="errorAlertBackground">#FFFF5555</color>
-    <color name="errorAlertHeaderText">#FF000000</color>
-
     <color name="toastBorder">#666666</color>
     <color name="toastBase">#ffffff</color>
     <color name="toastOk">#77dd77</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 10a39d41ae..710ee85e4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -250,7 +250,6 @@
     <string name="openapsma_maxbasal_summary">This value is called max basal in OpenAPS context</string>
     <string name="openapsma_maxiob_title">Maximum basal IOB OpenAPS can deliver [U]</string>
     <string name="openapsma_maxiob_summary">This value is called Max IOB in OpenAPS context\nThis is maximal insulin in [U] APS can deliver at once.</string>
-    <string name="dismiss">DISMISS</string>
     <string name="language" translatable="false">Language</string>
 
     <string name="password_preferences_encrypt_prompt">You will be asked for master password, which will be used to encrypt exported preferences.</string>
@@ -1761,7 +1760,6 @@
     <string name="timeformat24h">24h</string>
     <string name="automation_event">Automation event</string>
     <string name="alreadyset">Already set</string>
-    <string name="message">Message</string>
     <string name="clearqueueconfirm">Clear queue? All data in queue will be lost!</string>
     <string name="key_xdripstatus_detailediob" translatable="false">xdripstatus_detailediob</string>
     <string name="key_xdripstatus_showbgi" translatable="false">xdripstatus_showbgi</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e68e414cf1..4914afa9fe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -70,31 +70,7 @@
         <item name="android:textColor">#ff0000</item>
     </style>
 
-    <style name="AppThemeWarningDialog" parent="AppTheme">
-        <item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
-        <item name="dialogTitleBackground">@color/warningAlertBackground</item>
-        <item name="dialogTitleColor">@color/warningAlertHeaderText</item>
-        <item name="dialogTitleIconTint">@color/warningAlertHeaderText</item>
-    </style>
-
-    <style name="AppThemeWarningDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
-        <item name="android:windowBackground">@drawable/alert_border_warning</item>
-        <item name="colorAccent">@color/warningAlertBackground</item>
-    </style>
-
-    <style name="AppThemeErrorDialog" parent="AppTheme">
-        <item name="alertDialogTheme">@style/AppThemeErrorDialogTheme</item>
-        <item name="dialogTitleBackground">@color/errorAlertBackground</item>
-        <item name="dialogTitleColor">@color/errorAlertHeaderText</item>
-        <item name="dialogTitleIconTint">@color/errorAlertHeaderText</item>
-    </style>
-
-    <style name="AppThemeErrorDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
-        <item name="android:windowBackground">@drawable/alert_border_error</item>
-        <item name="colorAccent">@color/errorAlertBackground</item>
-    </style>
-
-    <style name="WizardPagePodContent">
+     <style name="WizardPagePodContent">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginBottom">8dp</item>
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/T.java b/core/src/main/java/info/nightscout/androidaps/utils/T.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/T.java
rename to core/src/main/java/info/nightscout/androidaps/utils/T.java
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java b/core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
rename to core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
index ec165e4ba5..8074b38cc6 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
@@ -14,7 +14,7 @@ import android.widget.Toast;
 import androidx.annotation.DrawableRes;
 import androidx.appcompat.view.ContextThemeWrapper;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
index afc5491652..65e78f6543 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
@@ -1,31 +1,31 @@
-package info.nightscout.androidaps.utils.alertDialogs
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.annotation.DrawableRes
-import androidx.annotation.LayoutRes
-import androidx.annotation.StyleRes
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.view.ContextThemeWrapper
-import info.nightscout.androidaps.R
-
-object AlertDialogHelper {
-
-    @Suppress("FunctionName")
-    fun Builder(context: Context, @StyleRes themeResId: Int = R.style.AppTheme) =
-        AlertDialog.Builder(ContextThemeWrapper(context, themeResId))
-
-    fun buildCustomTitle(context: Context, title: String,
-                         @DrawableRes iconResource: Int = R.drawable.ic_check_while_48dp,
-                         @StyleRes themeResId: Int = R.style.AppTheme,
-                         @LayoutRes layoutResource: Int = R.layout.dialog_alert_custom): View? {
-        val titleLayout = LayoutInflater.from(ContextThemeWrapper(context, themeResId)).inflate(layoutResource, null)
-        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
-        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(iconResource)
-        return titleLayout
-    }
-
+package info.nightscout.androidaps.utils.alertDialogs
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.LayoutRes
+import androidx.annotation.StyleRes
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.view.ContextThemeWrapper
+import info.nightscout.androidaps.core.R
+
+object AlertDialogHelper {
+
+    @Suppress("FunctionName")
+    fun Builder(context: Context, @StyleRes themeResId: Int = R.style.AppTheme) =
+        AlertDialog.Builder(ContextThemeWrapper(context, themeResId))
+
+    fun buildCustomTitle(context: Context, title: String,
+                         @DrawableRes iconResource: Int = R.drawable.ic_check_while_48dp,
+                         @StyleRes themeResId: Int = R.style.AppTheme,
+                         @LayoutRes layoutResource: Int = R.layout.dialog_alert_custom): View? {
+        val titleLayout = LayoutInflater.from(ContextThemeWrapper(context, themeResId)).inflate(layoutResource, null)
+        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
+        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(iconResource)
+        return titleLayout
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
index 299ad2fde2..2d45d2910d 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
@@ -6,7 +6,7 @@ import android.content.Context
 import android.content.DialogInterface
 import android.os.SystemClock
 import android.text.Spanned
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.extensions.runOnUiThread
 
 object OKDialog {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
index 29ef20ce2b..847287d57a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.DialogInterface
 import android.os.SystemClock
 import androidx.annotation.StringRes
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.extensions.runOnUiThread
 
 // if you need error dialog - duplicate to ErrorDialog and make it and use: AppThemeErrorDialog & R.drawable.ic_header_error instead
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/UIUtils.kt b/core/src/main/java/info/nightscout/androidaps/utils/extensions/UIUtils.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/extensions/UIUtils.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/extensions/UIUtils.kt
diff --git a/app/src/main/res/drawable/ic_check_while_48dp.xml b/core/src/main/res/drawable/ic_check_while_48dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_check_while_48dp.xml
rename to core/src/main/res/drawable/ic_check_while_48dp.xml
diff --git a/app/src/main/res/drawable/ic_header_warning.xml b/core/src/main/res/drawable/ic_header_warning.xml
similarity index 97%
rename from app/src/main/res/drawable/ic_header_warning.xml
rename to core/src/main/res/drawable/ic_header_warning.xml
index 3d7afd8ef3..a648165511 100644
--- a/app/src/main/res/drawable/ic_header_warning.xml
+++ b/core/src/main/res/drawable/ic_header_warning.xml
@@ -1,16 +1,16 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="#000"
-            android:pathData="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" />
-    </group>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.75"
+        android:scaleY="0.75">
+        <path
+            android:fillColor="#000"
+            android:pathData="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" />
+    </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_check.xml b/core/src/main/res/drawable/ic_toast_check.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_toast_check.xml
rename to core/src/main/res/drawable/ic_toast_check.xml
diff --git a/app/src/main/res/drawable/ic_toast_delete_confirm.xml b/core/src/main/res/drawable/ic_toast_delete_confirm.xml
similarity index 98%
rename from app/src/main/res/drawable/ic_toast_delete_confirm.xml
rename to core/src/main/res/drawable/ic_toast_delete_confirm.xml
index de6371045a..13ef783df1 100644
--- a/app/src/main/res/drawable/ic_toast_delete_confirm.xml
+++ b/core/src/main/res/drawable/ic_toast_delete_confirm.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="@color/toastInfo"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8.46,11.88L9.87,10.47L12,12.59L14.12,10.47L15.53,11.88L13.41,14L15.53,16.12L14.12,17.53L12,15.41L9.88,17.53L8.47,16.12L10.59,14L8.46,11.88M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastInfo"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8.46,11.88L9.87,10.47L12,12.59L14.12,10.47L15.53,11.88L13.41,14L15.53,16.12L14.12,17.53L12,15.41L9.88,17.53L8.47,16.12L10.59,14L8.46,11.88M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_error.xml b/core/src/main/res/drawable/ic_toast_error.xml
similarity index 97%
rename from app/src/main/res/drawable/ic_toast_error.xml
rename to core/src/main/res/drawable/ic_toast_error.xml
index fb49272c0a..cdb933b3e4 100644
--- a/app/src/main/res/drawable/ic_toast_error.xml
+++ b/core/src/main/res/drawable/ic_toast_error.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="@color/toastError"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastError"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_info.xml b/core/src/main/res/drawable/ic_toast_info.xml
similarity index 97%
rename from app/src/main/res/drawable/ic_toast_info.xml
rename to core/src/main/res/drawable/ic_toast_info.xml
index 9d54be6827..9339181c9c 100644
--- a/app/src/main/res/drawable/ic_toast_info.xml
+++ b/core/src/main/res/drawable/ic_toast_info.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="@color/toastInfo"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastInfo"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_warn.xml b/core/src/main/res/drawable/ic_toast_warn.xml
similarity index 97%
rename from app/src/main/res/drawable/ic_toast_warn.xml
rename to core/src/main/res/drawable/ic_toast_warn.xml
index 8864b16500..f1b8e8ba89 100644
--- a/app/src/main/res/drawable/ic_toast_warn.xml
+++ b/core/src/main/res/drawable/ic_toast_warn.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="@color/toastWarn"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastWarn"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_alert_custom.xml b/core/src/main/res/layout/dialog_alert_custom.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_alert_custom.xml
rename to core/src/main/res/layout/dialog_alert_custom.xml
diff --git a/app/src/main/res/layout/toast.xml b/core/src/main/res/layout/toast.xml
similarity index 97%
rename from app/src/main/res/layout/toast.xml
rename to core/src/main/res/layout/toast.xml
index a58fdd1a1c..6f1f2cce39 100644
--- a/app/src/main/res/layout/toast.xml
+++ b/core/src/main/res/layout/toast.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/toast_border_ok">
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="6dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginBottom="6dp"
-        android:src="@drawable/ic_toast_check"
-        tools:ignore="RtlHardcoded" />
-
-    <TextView
-        android:id="@android:id/message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="6dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginRight="18dp"
-        android:layout_marginBottom="4dp"
-        android:text="Toast goes here..."
-        android:textColor="@color/toastBase"
-        android:textSize="18sp"
-        tools:ignore="HardcodedText,RtlHardcoded" />
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/toast_border_ok">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="6dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="6dp"
+        android:src="@drawable/ic_toast_check"
+        tools:ignore="RtlHardcoded" />
+
+    <TextView
+        android:id="@android:id/message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="6dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginRight="18dp"
+        android:layout_marginBottom="4dp"
+        android:text="Toast goes here..."
+        android:textColor="@color/toastBase"
+        android:textSize="18sp"
+        tools:ignore="HardcodedText,RtlHardcoded" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
similarity index 97%
rename from app/src/main/res/values/attrs.xml
rename to core/src/main/res/values/attrs.xml
index 51ae11cee8..fed5806fe6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -1,7 +1,7 @@
-<resources>
-
-    <attr name="dialogTitleBackground" format="reference" />
-    <attr name="dialogTitleColor" format="reference" />
-    <attr name="dialogTitleIconTint" format="reference" />
-
+<resources>
+
+    <attr name="dialogTitleBackground" format="reference" />
+    <attr name="dialogTitleColor" format="reference" />
+    <attr name="dialogTitleIconTint" format="reference" />
+
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..ab83365d64
--- /dev/null
+++ b/core/src/main/res/values/colors.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#212121</color>
+    <color name="colorPrimaryDark">#000000</color>
+    <color name="colorAccent">#40bbaa</color>
+
+    <color name="dialog_title_background">#303030</color>
+    <color name="activity_title_background">#121212</color>
+    <color name="dialog_title_color">#FFFFFF</color>
+    <color name="dialog_title_icon_tint">#FFFFFF</color>
+
+    <color name="warningAlertBackground">#FFFB8C00</color>
+    <color name="warningAlertHeaderText">#FF000000</color>
+
+    <color name="errorAlertBackground">#FFFF5555</color>
+    <color name="errorAlertHeaderText">#FF000000</color>
+
+</resources>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 38f3a9736c..b89cf096bd 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="key_enable_fabric" translatable="false">enable_fabric</string>
+    <string name="confirmation">Confirmation</string>
+    <string name="message">Message</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
+    <string name="dismiss">DISMISS</string>
+
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..aabdcd6d8d
--- /dev/null
+++ b/core/src/main/res/values/styles.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="dialogTitleBackground">@color/dialog_title_background</item>
+        <item name="dialogTitleColor">@color/dialog_title_color</item>
+        <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
+    </style>
+
+    <style name="AppThemeWarningDialog" parent="AppTheme">
+        <item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
+        <item name="dialogTitleBackground">@color/warningAlertBackground</item>
+        <item name="dialogTitleColor">@color/warningAlertHeaderText</item>
+        <item name="dialogTitleIconTint">@color/warningAlertHeaderText</item>
+    </style>
+
+    <style name="AppThemeWarningDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
+        <item name="android:windowBackground">@drawable/alert_border_warning</item>
+        <item name="colorAccent">@color/warningAlertBackground</item>
+    </style>
+
+    <style name="AppThemeErrorDialog" parent="AppTheme">
+        <item name="alertDialogTheme">@style/AppThemeErrorDialogTheme</item>
+        <item name="dialogTitleBackground">@color/errorAlertBackground</item>
+        <item name="dialogTitleColor">@color/errorAlertHeaderText</item>
+        <item name="dialogTitleIconTint">@color/errorAlertHeaderText</item>
+    </style>
+
+    <style name="AppThemeErrorDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
+        <item name="android:windowBackground">@drawable/alert_border_error</item>
+        <item name="colorAccent">@color/errorAlertBackground</item>
+    </style>
+
+
+</resources>