diff --git a/config/packages.mk b/config/packages.mk
index 96dcd00..e9a3261 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -11,7 +11,9 @@
     MatLog \
     OmniStoreInstallerPrebuilt \
     OmniOta \
-    OmniWallpaper
+    OmniWallpaper \
+    OmniRemote \
+    OmniControl
 
 # Additional tools
 PRODUCT_PACKAGES += \
@@ -31,47 +33,9 @@
     vim \
     vncflinger \
     vncpasswd \
-    OmniRemote \
     SystemWebView \
-    OmniControl \
     omni-overlays
 
-#PRODUCT_PACKAGES += \
-    ThemePicker \
-    OmniOverlayStub \
-
-ifeq ($(BOARD_INCLUDE_CMDLINE_TOOLS),true)
-PRODUCT_PACKAGES += \
-    htop \
-    zip
-
-# Openssh
-PRODUCT_PACKAGES += \
-    scp \
-    sftp \
-    ssh \
-    sshd \
-    sshd_config \
-    ssh-keygen \
-    start-ssh
-endif
-
-# Config
-#PRODUCT_PACKAGES += \
-    SimpleDeviceConfig
-
-#ifeq ($(ROM_BUILDTYPE),MICROG)
-#PRODUCT_PACKAGES += \
-#    MicrogUIOverlay
-#endif
-
-# Telephony extension
-#PRODUCT_PACKAGES += telephony-ext
-#PRODUCT_BOOT_JARS += telephony-ext
-
-# for fun
-#PRODUCT_PACKAGES += \
-    EggGame
 
 $(call inherit-product-if-exists, external/google-fonts/lato/fonts.mk)
 $(call inherit-product-if-exists, vendor/omni/prebuilt/fonts/fonts.mk)
diff --git a/themes/overlays/Android.mk b/themes/overlays/Android.mk
index 210eea7..5feface 100644
--- a/themes/overlays/Android.mk
+++ b/themes/overlays/Android.mk
@@ -37,6 +37,9 @@
 	PrimaryColorDarkBlueOverlay \
 	PrimaryColorDarkGrayOverlay
 
+LOCAL_REQUIRED_MODULES += \
+	NotificationUIOverlay
+
 include $(BUILD_PHONY_PACKAGE)
 include $(CLEAR_VARS)
 
diff --git a/themes/overlays/NotificationUIOverlay/Android.bp b/themes/overlays/NotificationUIOverlay/Android.bp
new file mode 100644
index 0000000..b2ec16d
--- /dev/null
+++ b/themes/overlays/NotificationUIOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "NotificationUIOverlay",
+    theme: "NotificationUIOverlay",
+    product_specific: true,
+}
diff --git a/themes/overlays/NotificationUIOverlay/AndroidManifest.xml b/themes/overlays/NotificationUIOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..08f4408
--- /dev/null
+++ b/themes/overlays/NotificationUIOverlay/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.overlay.notification">
+
+    <application android:hasCode="false" />
+
+    <overlay
+        android:priority="1"
+        android:targetPackage="android" />
+</manifest>
+
diff --git a/themes/overlays/NotificationUIOverlay/res/drawable/notification_material_action_background.xml b/themes/overlays/NotificationUIOverlay/res/drawable/notification_material_action_background.xml
new file mode 100644
index 0000000..2686b95
--- /dev/null
+++ b/themes/overlays/NotificationUIOverlay/res/drawable/notification_material_action_background.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed 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
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:attr/colorControlHighlight">
+    <item>
+        <inset
+            android:insetLeft="@*android:dimen/button_inset_horizontal_material"
+            android:insetTop="@*android:dimen/button_inset_vertical_material"
+            android:insetRight="@*android:dimen/button_inset_horizontal_material"
+            android:insetBottom="@*android:dimen/button_inset_vertical_material">
+            <shape android:shape="rectangle">
+                <corners android:radius="@*android:dimen/notification_action_button_radius" />
+                <padding android:left="16dp"
+                         android:top="@*android:dimen/button_padding_vertical_material"
+                         android:right="16dp"
+                         android:bottom="@*android:dimen/button_padding_vertical_material" />
+                <stroke android:color="@*android:color/notification_action_button_text_color"
+                        android:width="1dp" />
+            </shape>
+        </inset>
+    </item>
+</ripple>