diff --git a/config/common.mk b/config/common.mk
index c9b36a1..bf01c8c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -14,6 +14,12 @@
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.build.selinux=1
 
+# Default sounds
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    ro.config.notification_sound=Popcorn.ogg \
+    ro.config.alarm_alert=Bright_morning.ogg \
+    ro.config.ringtone=The_big_adventure.ogg
+
 # Thank you, please drive thru!
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.sys.dun.override=0
 
diff --git a/prebuilt/common/sounds/GoogleAudio.mk b/prebuilt/common/sounds/GoogleAudio.mk
index da30883..46e9fb4 100644
--- a/prebuilt/common/sounds/GoogleAudio.mk
+++ b/prebuilt/common/sounds/GoogleAudio.mk
@@ -80,8 +80,3 @@
     $(LOCAL_PATH)/ringtones/Schools_out.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Schools_out.ogg \
     $(LOCAL_PATH)/ringtones/The_big_adventure.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/The_big_adventure.ogg \
     $(LOCAL_PATH)/ringtones/Zen_too.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Zen_too.ogg
-
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-   ro.config.ringtone=The_big_adventure.ogg \
-   ro.config.notification_sound=Duet.ogg \
-   ro.config.alarm_alert=Sunshower.ogg