diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index ea9b7b5..0f20d14 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -83,14 +83,14 @@
 PRODUCT_PACKAGES += \
     NotificationsDark \
     NotificationsLight \
-    NotificationsPrimary
+    NotificationsPrimary \
+    NotificationsBlack
 
 PRODUCT_PACKAGES += \
     AccentSluttyPink \
     AccentPixel \
     AccentGoldenShower \
     AccentDeepOrange \
-    AccentOmni \
     AccentWhite \
     AccentTeal \
     AccentFromHell \
@@ -98,12 +98,13 @@
     AccentSmokingGreen \
     AccentDeadRed \
     AccentRottenOrange \
-    AccentDeepPurple
+    AccentDeepPurple \
+    AccentBliss
 
 PRODUCT_PACKAGES += \
     PrimaryAlmostBlack \
     PrimaryBlack \
-    PrimaryOmni \
+    PrimaryBliss \
     PrimaryWhite \
     PrimaryColdWhite \
     PrimaryWarmWhite \
diff --git a/google/themes/AccentOmni/Android.mk b/google/themes/AccentBliss/Android.mk
similarity index 79%
copy from google/themes/AccentOmni/Android.mk
copy to google/themes/AccentBliss/Android.mk
index 6be3e94..47f67c2 100644
--- a/google/themes/AccentOmni/Android.mk
+++ b/google/themes/AccentBliss/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PACKAGE_NAME := AccentOmni
-LOCAL_RRO_THEME := AccentOmni
+LOCAL_PACKAGE_NAME := AccentBliss
+LOCAL_RRO_THEME := AccentBliss
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := current
diff --git a/google/themes/AccentOmni/AndroidManifest.xml b/google/themes/AccentBliss/AndroidManifest.xml
similarity index 78%
copy from google/themes/AccentOmni/AndroidManifest.xml
copy to google/themes/AccentBliss/AndroidManifest.xml
index a0912ce..91d4982 100644
--- a/google/themes/AccentOmni/AndroidManifest.xml
+++ b/google/themes/AccentBliss/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.omni"
+    package="org.omnirom.theme.accent.bliss"
     platformBuildVersionCode="26"
     platformBuildVersionName="8.0.0">
 
@@ -8,5 +8,5 @@
 
 
     <application android:hasCode="false"
-                 android:label="Omni" />
+                 android:label="Bliss" />
 </manifest>
diff --git a/google/themes/AccentOmni/res/values/colors.xml b/google/themes/AccentBliss/res/values/colors.xml
similarity index 60%
rename from google/themes/AccentOmni/res/values/colors.xml
rename to google/themes/AccentBliss/res/values/colors.xml
index 9534a46..0509087 100644
--- a/google/themes/AccentOmni/res/values/colors.xml
+++ b/google/themes/AccentBliss/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="omni_color3">#ffaacc3e</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff90b324</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffa1c729</color> <!-- ACCENT -->
+    <color name="omni_color3">#33a9f7</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#49a7f4</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#73bcfc</color> <!-- ACCENT -->
 
     <!-- accents -->
     <color name="accent_device_default_light">@*android:color/omni_color3</color>
diff --git a/google/themes/AccentOmni/Android.mk b/google/themes/BlackBliss/Android.mk
similarity index 77%
copy from google/themes/AccentOmni/Android.mk
copy to google/themes/BlackBliss/Android.mk
index 6be3e94..70ef42e 100644
--- a/google/themes/AccentOmni/Android.mk
+++ b/google/themes/BlackBliss/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PACKAGE_NAME := AccentOmni
-LOCAL_RRO_THEME := AccentOmni
+LOCAL_PACKAGE_NAME := BlackBlissTheme
+LOCAL_RRO_THEME := BlackBlissTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := current
diff --git a/google/themes/AccentOmni/AndroidManifest.xml b/google/themes/BlackBliss/AndroidManifest.xml
similarity index 77%
copy from google/themes/AccentOmni/AndroidManifest.xml
copy to google/themes/BlackBliss/AndroidManifest.xml
index a0912ce..b27cd22 100644
--- a/google/themes/AccentOmni/AndroidManifest.xml
+++ b/google/themes/BlackBliss/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.omni"
+    package="org.omnirom.theme.blackbliss"
     platformBuildVersionCode="26"
     platformBuildVersionName="8.0.0">
 
@@ -8,5 +8,5 @@
 
 
     <application android:hasCode="false"
-                 android:label="Omni" />
+                 android:label="Black Bliss" />
 </manifest>
diff --git a/google/themes/BlackBliss/assets/thumbnail.png b/google/themes/BlackBliss/assets/thumbnail.png
new file mode 100644
index 0000000..a1f9519
--- /dev/null
+++ b/google/themes/BlackBliss/assets/thumbnail.png
Binary files differ
diff --git a/google/themes/PrimaryOmni/res/color/ripple_material_light.xml b/google/themes/BlackBliss/res/color/ripple_material_light.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/color/ripple_material_light.xml
copy to google/themes/BlackBliss/res/color/ripple_material_light.xml
diff --git a/google/themes/PrimaryOmni/res/drawable/toast_frame.xml b/google/themes/BlackBliss/res/drawable/toast_frame.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/drawable/toast_frame.xml
copy to google/themes/BlackBliss/res/drawable/toast_frame.xml
diff --git a/google/themes/BlackBliss/res/values/colors.xml b/google/themes/BlackBliss/res/values/colors.xml
new file mode 100644
index 0000000..c53f5c6
--- /dev/null
+++ b/google/themes/BlackBliss/res/values/colors.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="user_icon_1">#ffeeeeee</color>
+    <color name="user_icon_2">#ffdddddd</color>
+    <color name="user_icon_3">#ffcccccc</color>
+    <color name="user_icon_4">#ffbbbbbb</color>
+    <color name="system_error">#ffaaaaaa</color>
+
+    <color name="omni_text1">#FFE8EAF6</color> <!-- text primary -->
+    <color name="omni_text2">#B3E8EAF6</color>  <!-- text secondary -->
+    <color name="omni_text3">#A0E8EAF6</color>  <!-- text tertiary -->
+    <color name="omni_text4">#deE8EAF6</color>  <!-- text with "de" alpha -->
+    <color name="omni_color1">#0a0a0a</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#131313</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color3">#61b5fa</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#0096ff</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#62b0ff</color> <!-- ACCENT -->
+    <color name="omni_color6">#56b3ff</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#2b2b2b</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#2e2e2e</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e62b2b2b</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+    <color name="omni_color900">#ff05050A</color> <!-- PRIMARY DARK -->
+
+
+    <!-- PRIMARY LIGHT -->
+    <color name="primary_dark_device_default_settings">@*android:color/omni_color2</color> <!-- Main BG settings -->
+    <color name="background_material_dark">@*android:color/omni_color2</color> <!-- some kind of overlay of the main bg -->
+    <color name="primary_dark_device_default_light">@*android:color/omni_color2</color>
+    <color name="secondary_device_default_settings">@*android:color/omni_color2</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+
+    <!-- qs -->
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+    <!-- Notifications -->
+    <color name="notification_legacy_background_color">@*android:color/omni_color7</color>
+    <color name="notification_material_background_dimmed_color">@*android:color/omni_color1</color>
+    <color name="notification_material_background_low_priority_color">@*android:color/omni_color2</color>
+    <color name="notification_divider_color">@*android:color/omni_color4</color>
+    <color name="notification_shade_background_color">@*android:color/omni_color1</color>
+    <color name="notification_ripple_untinted_color">@*android:color/omni_color4</color>
+    <color name="notification_ripple_color_low_priority">@*android:color/omni_color3</color>
+    <color name="notification_ripple_tinted_color">@*android:color/omni_color5</color>
+    <color name="notification_gear_color">@*android:color/omni_color6</color>
+    <color name="notification_guts_bg_color">@*android:color/omni_color7</color>
+
+    <color name="notification_material_background_color">@*android:color/omni_color7</color>
+    <color name="notification_default_color">@*android:color/omni_text1</color> <!-- Gray 600 -->
+    <color name="notification_action_list">@*android:color/omni_color1</color>
+    <color name="notification_action_list_dark">@*android:color/omni_color2</color>
+    <color name="notification_primary_text_color_light">@*android:color/omni_text1</color>
+    <color name="notification_secondary_text_color_light">@*android:color/omni_text2</color>
+    <color name="notification_progress_background_color">@*android:color/omni_text2</color>
+    <color name="notification_snooze_text">@*android:color/omni_text1</color>
+    <color name="notification_text_color1">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/google/themes/PrimaryOmni/res/values/config.xml b/google/themes/BlackBliss/res/values/config.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/config.xml
copy to google/themes/BlackBliss/res/values/config.xml
diff --git a/google/themes/BlackBliss/res/values/settings.xml b/google/themes/BlackBliss/res/values/settings.xml
new file mode 100644
index 0000000..2b9e570
--- /dev/null
+++ b/google/themes/BlackBliss/res/values/settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
+        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
+        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
+        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
+        <item name="android:navigationBarDividerColor">#00000000</item>
+        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
+
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+ 
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
+        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
+
+    </style>
+</resources>
diff --git a/google/themes/PrimaryOmni/res/values/styles.xml b/google/themes/BlackBliss/res/values/styles.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/styles.xml
copy to google/themes/BlackBliss/res/values/styles.xml
diff --git a/google/themes/PrimaryOmni/res/values/themes.xml b/google/themes/BlackBliss/res/values/themes.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/themes.xml
copy to google/themes/BlackBliss/res/values/themes.xml
diff --git a/google/themes/AccentOmni/Android.mk b/google/themes/BlissTheme/Android.mk
similarity index 80%
rename from google/themes/AccentOmni/Android.mk
rename to google/themes/BlissTheme/Android.mk
index 6be3e94..35de6ee 100644
--- a/google/themes/AccentOmni/Android.mk
+++ b/google/themes/BlissTheme/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PACKAGE_NAME := AccentOmni
-LOCAL_RRO_THEME := AccentOmni
+LOCAL_PACKAGE_NAME := BlissTheme
+LOCAL_RRO_THEME := BlissTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := current
diff --git a/google/themes/AccentOmni/AndroidManifest.xml b/google/themes/BlissTheme/AndroidManifest.xml
similarity index 78%
copy from google/themes/AccentOmni/AndroidManifest.xml
copy to google/themes/BlissTheme/AndroidManifest.xml
index a0912ce..fbf1989 100644
--- a/google/themes/AccentOmni/AndroidManifest.xml
+++ b/google/themes/BlissTheme/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.omni"
+    package="org.omnirom.theme.bliss"
     platformBuildVersionCode="26"
     platformBuildVersionName="8.0.0">
 
@@ -8,5 +8,5 @@
 
 
     <application android:hasCode="false"
-                 android:label="Omni" />
+                 android:label="Bliss" />
 </manifest>
diff --git a/google/themes/BlissTheme/assets/thumbnail.png b/google/themes/BlissTheme/assets/thumbnail.png
new file mode 100644
index 0000000..03e66f2
--- /dev/null
+++ b/google/themes/BlissTheme/assets/thumbnail.png
Binary files differ
diff --git a/google/themes/PrimaryOmni/res/color/ripple_material_light.xml b/google/themes/BlissTheme/res/color/ripple_material_light.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/color/ripple_material_light.xml
copy to google/themes/BlissTheme/res/color/ripple_material_light.xml
diff --git a/google/themes/PrimaryOmni/res/drawable/toast_frame.xml b/google/themes/BlissTheme/res/drawable/toast_frame.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/drawable/toast_frame.xml
copy to google/themes/BlissTheme/res/drawable/toast_frame.xml
diff --git a/google/themes/BlissTheme/res/values/colors.xml b/google/themes/BlissTheme/res/values/colors.xml
new file mode 100644
index 0000000..e376f4f
--- /dev/null
+++ b/google/themes/BlissTheme/res/values/colors.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="user_icon_1">#36ddff</color>
+    <color name="user_icon_2">#4cd5ff</color>
+    <color name="user_icon_3">#62d8ff</color>
+    <color name="user_icon_4">#62d5ff</color>
+    <color name="system_error">#ffff4120</color>
+
+    <color name="omni_text1">#fffefefe</color> <!-- text primary -->
+    <color name="omni_text2">#b3fefefe</color>  <!-- text secondary -->
+    <color name="omni_text3">#a0fefefe</color>  <!-- text tertiary -->
+    <color name="omni_text4">#defefefe</color>  <!-- text with "de" alpha -->
+    <color name="omni_color1">#ff191919</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#ff2d2d2d</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color3">#3e93cc</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#247ab3</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#2980c7</color> <!-- ACCENT -->
+    <color name="omni_color6">#b3fefefe</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#ff393939</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#2983c7</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e6393939</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+    <color name="omni_color900">#ff191919</color> <!-- PRIMARY DARK -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="primary_dark_device_default_settings">@*android:color/omni_color2</color> <!-- Main BG settings -->
+    <color name="background_material_dark">@*android:color/omni_color2</color> <!-- some kind of overlay of the main bg -->
+    <color name="primary_dark_device_default_light">@*android:color/omni_color2</color>
+    <color name="secondary_device_default_settings">@*android:color/omni_color2</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+
+    <!-- qs -->
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+    <!-- Notifications -->
+    <color name="notification_legacy_background_color">@*android:color/omni_color7</color>
+    <color name="notification_material_background_dimmed_color">@*android:color/omni_color1</color>
+    <color name="notification_material_background_low_priority_color">@*android:color/omni_color2</color>
+    <color name="notification_divider_color">@*android:color/omni_color4</color>
+    <color name="notification_shade_background_color">@*android:color/omni_color1</color>
+    <color name="notification_ripple_untinted_color">@*android:color/omni_color4</color>
+    <color name="notification_ripple_color_low_priority">@*android:color/omni_color3</color>
+    <color name="notification_ripple_tinted_color">@*android:color/omni_color5</color>
+    <color name="notification_gear_color">@*android:color/omni_color6</color>
+    <color name="notification_guts_bg_color">@*android:color/omni_color7</color>
+
+    <color name="notification_material_background_color">@*android:color/omni_color7</color>
+    <color name="notification_default_color">@*android:color/omni_text1</color> <!-- Gray 600 -->
+    <color name="notification_action_list">@*android:color/omni_color1</color>
+    <color name="notification_action_list_dark">@*android:color/omni_color2</color>
+    <color name="notification_primary_text_color_light">@*android:color/omni_text1</color>
+    <color name="notification_secondary_text_color_light">@*android:color/omni_text2</color>
+    <color name="notification_progress_background_color">@*android:color/omni_text2</color>
+    <color name="notification_snooze_text">@*android:color/omni_text1</color>
+    <color name="notification_text_color1">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/google/themes/PrimaryOmni/res/values/config.xml b/google/themes/BlissTheme/res/values/config.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/config.xml
copy to google/themes/BlissTheme/res/values/config.xml
diff --git a/google/themes/PrimaryOmni/res/values/settings.xml b/google/themes/BlissTheme/res/values/settings.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/settings.xml
copy to google/themes/BlissTheme/res/values/settings.xml
diff --git a/google/themes/PrimaryOmni/res/values/strings.xml b/google/themes/BlissTheme/res/values/strings.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/strings.xml
copy to google/themes/BlissTheme/res/values/strings.xml
diff --git a/google/themes/PrimaryOmni/res/values/styles.xml b/google/themes/BlissTheme/res/values/styles.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/styles.xml
copy to google/themes/BlissTheme/res/values/styles.xml
diff --git a/google/themes/PrimaryOmni/res/values/themes.xml b/google/themes/BlissTheme/res/values/themes.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/themes.xml
copy to google/themes/BlissTheme/res/values/themes.xml
diff --git a/google/themes/AccentOmni/Android.mk b/google/themes/DarkBliss/Android.mk
similarity index 78%
copy from google/themes/AccentOmni/Android.mk
copy to google/themes/DarkBliss/Android.mk
index 6be3e94..46c7b5f 100644
--- a/google/themes/AccentOmni/Android.mk
+++ b/google/themes/DarkBliss/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PACKAGE_NAME := AccentOmni
-LOCAL_RRO_THEME := AccentOmni
+LOCAL_PACKAGE_NAME := DarkBlissTheme
+LOCAL_RRO_THEME := DarkBlissTheme
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := current
diff --git a/google/themes/AccentOmni/AndroidManifest.xml b/google/themes/DarkBliss/AndroidManifest.xml
similarity index 78%
rename from google/themes/AccentOmni/AndroidManifest.xml
rename to google/themes/DarkBliss/AndroidManifest.xml
index a0912ce..0a1f289 100644
--- a/google/themes/AccentOmni/AndroidManifest.xml
+++ b/google/themes/DarkBliss/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.omni"
+    package="org.omnirom.theme.darkbliss"
     platformBuildVersionCode="26"
     platformBuildVersionName="8.0.0">
 
@@ -8,5 +8,5 @@
 
 
     <application android:hasCode="false"
-                 android:label="Omni" />
+                 android:label="Dark Bliss" />
 </manifest>
diff --git a/google/themes/DarkBliss/assets/thumbnail.png b/google/themes/DarkBliss/assets/thumbnail.png
new file mode 100644
index 0000000..2170a69
--- /dev/null
+++ b/google/themes/DarkBliss/assets/thumbnail.png
Binary files differ
diff --git a/google/themes/PrimaryOmni/res/color/ripple_material_light.xml b/google/themes/DarkBliss/res/color/ripple_material_light.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/color/ripple_material_light.xml
copy to google/themes/DarkBliss/res/color/ripple_material_light.xml
diff --git a/google/themes/PrimaryOmni/res/drawable/toast_frame.xml b/google/themes/DarkBliss/res/drawable/toast_frame.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/drawable/toast_frame.xml
copy to google/themes/DarkBliss/res/drawable/toast_frame.xml
diff --git a/google/themes/DarkBliss/res/values/colors.xml b/google/themes/DarkBliss/res/values/colors.xml
new file mode 100644
index 0000000..ad45812
--- /dev/null
+++ b/google/themes/DarkBliss/res/values/colors.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="user_icon_1">#ffeeeeee</color>
+    <color name="user_icon_2">#ffdddddd</color>
+    <color name="user_icon_3">#ffcccccc</color>
+    <color name="user_icon_4">#ffbbbbbb</color>
+    <color name="system_error">#ffaaaaaa</color>
+
+    <color name="omni_text1">#FFE8EAF6</color> <!-- text primary -->
+    <color name="omni_text2">#B3E8EAF6</color>  <!-- text secondary -->
+    <color name="omni_text3">#A0E8EAF6</color>  <!-- text tertiary -->
+    <color name="omni_text4">#deE8EAF6</color>  <!-- text with "de" alpha -->
+    <color name="omni_color1">#181818</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#2d2d2d</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color3">#33a9f7</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#49a7f4</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#73bcfc</color> <!-- ACCENT -->
+    <color name="omni_color6">#b3e8eaf6</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#2d2d2d</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#81abff</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e6262626</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+    <color name="omni_color900">#151515</color> <!-- PRIMARY DARK -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="primary_dark_device_default_settings">@*android:color/omni_color2</color> <!-- Main BG settings -->
+    <color name="background_material_dark">@*android:color/omni_color2</color> <!-- some kind of overlay of the main bg -->
+    <color name="primary_dark_device_default_light">@*android:color/omni_color2</color>
+    <color name="secondary_device_default_settings">@*android:color/omni_color2</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+
+    <!-- qs -->
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+    <!-- Notifications -->
+    <color name="notification_legacy_background_color">@*android:color/omni_color7</color>
+    <color name="notification_material_background_dimmed_color">@*android:color/omni_color1</color>
+    <color name="notification_material_background_low_priority_color">@*android:color/omni_color2</color>
+    <color name="notification_divider_color">@*android:color/omni_color4</color>
+    <color name="notification_shade_background_color">@*android:color/omni_color1</color>
+    <color name="notification_ripple_untinted_color">@*android:color/omni_color4</color>
+    <color name="notification_ripple_color_low_priority">@*android:color/omni_color3</color>
+    <color name="notification_ripple_tinted_color">@*android:color/omni_color5</color>
+    <color name="notification_gear_color">@*android:color/omni_color6</color>
+    <color name="notification_guts_bg_color">@*android:color/omni_color7</color>
+
+    <color name="notification_material_background_color">@*android:color/omni_color7</color>
+    <color name="notification_default_color">@*android:color/omni_text1</color> <!-- Gray 600 -->
+    <color name="notification_action_list">@*android:color/omni_color1</color>
+    <color name="notification_action_list_dark">@*android:color/omni_color2</color>
+    <color name="notification_primary_text_color_light">@*android:color/omni_text1</color>
+    <color name="notification_secondary_text_color_light">@*android:color/omni_text2</color>
+    <color name="notification_progress_background_color">@*android:color/omni_text2</color>
+    <color name="notification_snooze_text">@*android:color/omni_text1</color>
+    <color name="notification_text_color1">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/google/themes/PrimaryOmni/res/values/config.xml b/google/themes/DarkBliss/res/values/config.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/config.xml
copy to google/themes/DarkBliss/res/values/config.xml
diff --git a/google/themes/PrimaryOmni/res/values/settings.xml b/google/themes/DarkBliss/res/values/settings.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/settings.xml
copy to google/themes/DarkBliss/res/values/settings.xml
diff --git a/google/themes/PrimaryOmni/res/values/strings.xml b/google/themes/DarkBliss/res/values/strings.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/strings.xml
copy to google/themes/DarkBliss/res/values/strings.xml
diff --git a/google/themes/PrimaryOmni/res/values/styles.xml b/google/themes/DarkBliss/res/values/styles.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/styles.xml
copy to google/themes/DarkBliss/res/values/styles.xml
diff --git a/google/themes/PrimaryOmni/res/values/themes.xml b/google/themes/DarkBliss/res/values/themes.xml
similarity index 100%
copy from google/themes/PrimaryOmni/res/values/themes.xml
copy to google/themes/DarkBliss/res/values/themes.xml
diff --git a/google/themes/AccentOmni/Android.mk b/google/themes/NotificationsBlack/Android.mk
similarity index 76%
copy from google/themes/AccentOmni/Android.mk
copy to google/themes/NotificationsBlack/Android.mk
index 6be3e94..0b48d1b 100644
--- a/google/themes/AccentOmni/Android.mk
+++ b/google/themes/NotificationsBlack/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PACKAGE_NAME := AccentOmni
-LOCAL_RRO_THEME := AccentOmni
+LOCAL_PACKAGE_NAME := NotificationsBlack
+LOCAL_RRO_THEME := NotificationsBlack
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := current
diff --git a/google/themes/AccentOmni/AndroidManifest.xml b/google/themes/NotificationsBlack/AndroidManifest.xml
similarity index 62%
copy from google/themes/AccentOmni/AndroidManifest.xml
copy to google/themes/NotificationsBlack/AndroidManifest.xml
index a0912ce..7efbb80 100644
--- a/google/themes/AccentOmni/AndroidManifest.xml
+++ b/google/themes/NotificationsBlack/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.omni"
+    package="org.omnirom.theme.notification.black"
     platformBuildVersionCode="26"
     platformBuildVersionName="8.0.0">
 
-    <overlay android:priority="1" android:targetPackage="android" />
+    <overlay android:priority="3" android:targetPackage="android" />
 
 
     <application android:hasCode="false"
-                 android:label="Omni" />
+                 android:label="Black" />
 </manifest>
diff --git a/google/themes/NotificationsBlack/res/values/colors.xml b/google/themes/NotificationsBlack/res/values/colors.xml
new file mode 100644
index 0000000..0c7b1a1
--- /dev/null
+++ b/google/themes/NotificationsBlack/res/values/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Notifications -->
+    <color name="notification_legacy_background_color">#151515</color>
+    <color name="notification_material_background_dimmed_color">#0a0a0a</color>
+    <color name="notification_material_background_low_priority_color">#0d0d0d</color>
+    <color name="notification_divider_color">#ffe0e0e0</color>
+    <color name="notification_shade_background_color">#0a0a0a</color>
+    <color name="notification_ripple_untinted_color">#ffe0e0e0</color>
+    <color name="notification_ripple_color_low_priority">#fff9f9f9</color>
+    <color name="notification_ripple_tinted_color">#fffefefe</color>
+    <color name="notification_gear_color">#ffFFFFFF</color>
+    <color name="notification_guts_bg_color">#0a0a0a</color>
+
+    <color name="notification_material_background_color">#131313</color>
+    <color name="notification_default_color">#FFFFFDE7</color> <!-- Gray 600 -->
+    <color name="notification_action_list">#080808</color>
+    <color name="notification_action_list_dark">#121212</color>
+    <color name="notification_primary_text_color_light">#FFFFFDE7</color>
+    <color name="notification_secondary_text_color_light">#B3FFFDE7</color>
+    <color name="notification_progress_background_color">#B3FFFDE7</color>
+    <color name="notification_snooze_text">#FFFFFDE7</color>
+    <color name="notification_text_color1">#FFFFFDE7</color>
+
+    <color name="omni_theme_color">#101010</color>
+</resources>
diff --git a/google/themes/NotificationsBlack/res/values/config.xml b/google/themes/NotificationsBlack/res/values/config.xml
new file mode 100644
index 0000000..210f6cf
--- /dev/null
+++ b/google/themes/NotificationsBlack/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationTinting_override">true</bool>
+    <bool name="config_notificationTinting_override">true</bool>
+</resources>
diff --git a/google/themes/PrimaryBliss/.idea/PrimaryOmni.iml b/google/themes/PrimaryBliss/.idea/PrimaryOmni.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/google/themes/PrimaryBliss/.idea/PrimaryOmni.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/google/themes/PrimaryBliss/.idea/codeStyles/Project.xml b/google/themes/PrimaryBliss/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/google/themes/PrimaryBliss/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/google/themes/PrimaryBliss/.idea/misc.xml b/google/themes/PrimaryBliss/.idea/misc.xml
new file mode 100644
index 0000000..3268472
--- /dev/null
+++ b/google/themes/PrimaryBliss/.idea/misc.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="5">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/google/themes/PrimaryBliss/.idea/modules.xml b/google/themes/PrimaryBliss/.idea/modules.xml
new file mode 100644
index 0000000..a7c7eb9
--- /dev/null
+++ b/google/themes/PrimaryBliss/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/PrimaryOmni.iml" filepath="$PROJECT_DIR$/.idea/PrimaryOmni.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/google/themes/PrimaryBliss/.idea/workspace.xml b/google/themes/PrimaryBliss/.idea/workspace.xml
new file mode 100644
index 0000000..923a02b
--- /dev/null
+++ b/google/themes/PrimaryBliss/.idea/workspace.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="8ef9f104-485b-486a-86bf-8f9ad3be5e9a" name="Default" comment="" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="Android.mk" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Android.mk">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="GradleLocalSettings">
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/res/values/colors.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="1930" />
+    <option name="y" value="76" />
+    <option name="width" value="1260" />
+    <option name="height" value="953" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <expand>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="PrimaryOmni" type="cbb8eebc:String" user="PrimaryOmni" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="PrimaryOmni" type="cbb8eebc:String" user="PrimaryOmni" />
+              <item name=".idea" type="cbb8eebc:String" user=".idea" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="PrimaryOmni" type="cbb8eebc:String" user="PrimaryOmni" />
+              <item name="res" type="cbb8eebc:String" user="res" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="PrimaryOmni" type="cbb8eebc:String" user="PrimaryOmni" />
+              <item name="res" type="cbb8eebc:String" user="res" />
+              <item name="values" type="cbb8eebc:String" user="values" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="External Dependencies" type="cbb8eebc:String" user="External Dependencies" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="AndroidView" />
+      <pane id="Scratches" />
+      <pane id="ProjectPane" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../../../packages/apps/OmniGears" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="JUnit" default="true" selected="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="8ef9f104-485b-486a-86bf-8f9ad3be5e9a" name="Default" comment="" />
+      <created>1536516860559</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1536516860559</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="1930" y="76" width="1260" height="953" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24979724" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/res/values/colors.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="10" column="68" lean-forward="false" selection-start-line="10" selection-start-column="68" selection-end-line="10" selection-end-column="68" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Android.mk">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/google/themes/AccentOmni/Android.mk b/google/themes/PrimaryBliss/Android.mk
similarity index 79%
copy from google/themes/AccentOmni/Android.mk
copy to google/themes/PrimaryBliss/Android.mk
index 6be3e94..ed271e4 100644
--- a/google/themes/AccentOmni/Android.mk
+++ b/google/themes/PrimaryBliss/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_PACKAGE_NAME := AccentOmni
-LOCAL_RRO_THEME := AccentOmni
+LOCAL_PACKAGE_NAME := PrimaryBliss
+LOCAL_RRO_THEME := PrimaryBliss
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := current
diff --git a/google/themes/PrimaryOmni/AndroidManifest.xml b/google/themes/PrimaryBliss/AndroidManifest.xml
similarity index 78%
rename from google/themes/PrimaryOmni/AndroidManifest.xml
rename to google/themes/PrimaryBliss/AndroidManifest.xml
index 3ff77d4..1d8f4ec 100644
--- a/google/themes/PrimaryOmni/AndroidManifest.xml
+++ b/google/themes/PrimaryBliss/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.primary.omni"
+    package="org.omnirom.theme.primary.bliss"
     platformBuildVersionCode="26"
     platformBuildVersionName="8.0.0">
 
@@ -8,5 +8,5 @@
 
 
     <application android:hasCode="false"
-                 android:label="Omni" />
+                 android:label="Bliss" />
 </manifest>
diff --git a/google/themes/PrimaryOmni/res/color/ripple_material_light.xml b/google/themes/PrimaryBliss/res/color/ripple_material_light.xml
similarity index 100%
rename from google/themes/PrimaryOmni/res/color/ripple_material_light.xml
rename to google/themes/PrimaryBliss/res/color/ripple_material_light.xml
diff --git a/google/themes/PrimaryOmni/res/drawable/toast_frame.xml b/google/themes/PrimaryBliss/res/drawable/toast_frame.xml
similarity index 100%
rename from google/themes/PrimaryOmni/res/drawable/toast_frame.xml
rename to google/themes/PrimaryBliss/res/drawable/toast_frame.xml
diff --git a/google/themes/PrimaryOmni/res/values/colors.xml b/google/themes/PrimaryBliss/res/values/colors.xml
similarity index 95%
rename from google/themes/PrimaryOmni/res/values/colors.xml
rename to google/themes/PrimaryBliss/res/values/colors.xml
index 3306de7..dcdcb5b 100644
--- a/google/themes/PrimaryOmni/res/values/colors.xml
+++ b/google/themes/PrimaryBliss/res/values/colors.xml
@@ -7,8 +7,8 @@
     <color name="omni_text2">#b3fefefe</color>  <!-- text secondary -->
     <color name="omni_text3">#a0fefefe</color>  <!-- text tertiary -->
     <color name="omni_text4">#defefefe</color>  <!-- text toast -->
-    <color name="omni_color1">#ff191919</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff2d2d2d</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color1">#181818</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#2d2d2d</color> <!-- PRIMARY LIGHT -->
     <color name="omni_color6">#b3fefefe</color> <!-- WIFI ICON IN DETAILS -->
     <color name="omni_color7">#ff393939</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
     <color name="omni_color9">#e6393939</color> <!-- TOAST (NEEDS SOME ALPHA) -->
diff --git a/google/themes/PrimaryOmni/res/values/config.xml b/google/themes/PrimaryBliss/res/values/config.xml
similarity index 100%
rename from google/themes/PrimaryOmni/res/values/config.xml
rename to google/themes/PrimaryBliss/res/values/config.xml
diff --git a/google/themes/PrimaryOmni/res/values/settings.xml b/google/themes/PrimaryBliss/res/values/settings.xml
similarity index 100%
rename from google/themes/PrimaryOmni/res/values/settings.xml
rename to google/themes/PrimaryBliss/res/values/settings.xml
diff --git a/google/themes/PrimaryOmni/res/values/strings.xml b/google/themes/PrimaryBliss/res/values/strings.xml
similarity index 100%
rename from google/themes/PrimaryOmni/res/values/strings.xml
rename to google/themes/PrimaryBliss/res/values/strings.xml
diff --git a/google/themes/PrimaryOmni/res/values/styles.xml b/google/themes/PrimaryBliss/res/values/styles.xml
similarity index 100%
rename from google/themes/PrimaryOmni/res/values/styles.xml
rename to google/themes/PrimaryBliss/res/values/styles.xml
diff --git a/google/themes/PrimaryOmni/res/values/themes.xml b/google/themes/PrimaryBliss/res/values/themes.xml
similarity index 100%
rename from google/themes/PrimaryOmni/res/values/themes.xml
rename to google/themes/PrimaryBliss/res/values/themes.xml
diff --git a/google/themes/PrimaryOmni/Android.mk b/google/themes/PrimaryOmni/Android.mk
deleted file mode 100644
index 342f75b..0000000
--- a/google/themes/PrimaryOmni/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryOmni
-LOCAL_RRO_THEME := PrimaryOmni
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)