diff --git a/config/cm_audio.mk b/config/cm_audio.mk
new file mode 100644
index 00000000..de68509e
--- /dev/null
+++ b/config/cm_audio.mk
@@ -0,0 +1,24 @@
+#
+# CyanogenMod Audio Files
+#
+
+ALARM_PATH := vendor/cm/prebuilt/common/media/audio/alarms
+NOTIFICATION_PATH := vendor/cm/prebuilt/common/media/audio/notifications
+RINGTONE_PATH := vendor/cm/prebuilt/common/media/audio/ringtones
+UI_PATH := vendor/cm/prebuilt/common/media/audio/ui
+
+# Alarms
+PRODUCT_COPY_FILES += \
+	$(ALARM_PATH)/CyanAlarm.ogg:system/media/audio/alarms/CyanAlarm.ogg
+
+# Notifications
+PRODUCT_COPY_FILES += \
+	$(NOTIFICATION_PATH)/CyanMail.ogg:system/media/audio/notifications/CyanMail.ogg \
+	$(NOTIFICATION_PATH)/CyanMessage.ogg:system/media/audio/notifications/CyanMessage.ogg \
+	$(NOTIFICATION_PATH)/CyanPing.ogg:system/media/audio/notifications/CyanPing.ogg \
+	$(NOTIFICATION_PATH)/Naughty.ogg:system/media/audio/notifications/Naughty.ogg \
+	$(NOTIFICATION_PATH)/Pong.ogg:system/media/audio/notifications/Pong.ogg
+
+# Ringtones
+PRODUCT_COPY_FILES += \
+	$(RINGTONE_PATH)/CyanTone.ogg:system/media/audio/ringtones/CyanTone.ogg
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index a7f758d8..9e34f98c 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -4,11 +4,14 @@ $(call inherit-product, vendor/cm/config/common.mk)
 # Bring in all audio files
 include frameworks/base/data/sounds/AllAudio.mk
 
+# Include CM audio files
+include vendor/cm/config/cm_audio.mk
+
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.ringtone=Playa.ogg \
-    ro.config.notification_sound=regulus.ogg \
-    ro.config.alarm_alert=Alarm_Beep_03.ogg
+    ro.config.ringtone=CyanTone.ogg \
+    ro.config.notification_sound=CyanMessage.ogg \
+    ro.config.alarm_alert=CyanAlarm.ogg
 
 PRODUCT_PACKAGES += \
   Mms
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index bc73d9ed..9b992603 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -4,8 +4,11 @@ $(call inherit-product, vendor/cm/config/common.mk)
 # Bring in all audio files
 include frameworks/base/data/sounds/AllAudio.mk
 
+# Include CM audio files
+include vendor/cm/config/cm_audio.mk
+
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.ringtone=Playa.ogg \
-    ro.config.notification_sound=regulus.ogg \
-    ro.config.alarm_alert=Alarm_Beep_03.ogg
+    ro.config.ringtone=CyanTone.ogg \
+    ro.config.notification_sound=CyanMessage.ogg \
+    ro.config.alarm_alert=CyanAlarm.ogg
diff --git a/prebuilt/common/media/audio/alarms/CyanAlarm.ogg b/prebuilt/common/media/audio/alarms/CyanAlarm.ogg
new file mode 100644
index 00000000..41997f78
Binary files /dev/null and b/prebuilt/common/media/audio/alarms/CyanAlarm.ogg differ
diff --git a/prebuilt/common/media/audio/notifications/CyanMail.ogg b/prebuilt/common/media/audio/notifications/CyanMail.ogg
new file mode 100644
index 00000000..3c6d9419
Binary files /dev/null and b/prebuilt/common/media/audio/notifications/CyanMail.ogg differ
diff --git a/prebuilt/common/media/audio/notifications/CyanMessage.ogg b/prebuilt/common/media/audio/notifications/CyanMessage.ogg
new file mode 100644
index 00000000..b8ab60bd
Binary files /dev/null and b/prebuilt/common/media/audio/notifications/CyanMessage.ogg differ
diff --git a/prebuilt/common/media/audio/notifications/CyanPing.ogg b/prebuilt/common/media/audio/notifications/CyanPing.ogg
new file mode 100644
index 00000000..1f15a1ce
Binary files /dev/null and b/prebuilt/common/media/audio/notifications/CyanPing.ogg differ
diff --git a/prebuilt/common/media/audio/notifications/Naughty.ogg b/prebuilt/common/media/audio/notifications/Naughty.ogg
new file mode 100644
index 00000000..588c4438
Binary files /dev/null and b/prebuilt/common/media/audio/notifications/Naughty.ogg differ
diff --git a/prebuilt/common/media/audio/notifications/Pong.ogg b/prebuilt/common/media/audio/notifications/Pong.ogg
new file mode 100644
index 00000000..8abfa9c3
Binary files /dev/null and b/prebuilt/common/media/audio/notifications/Pong.ogg differ
diff --git a/prebuilt/common/media/audio/ringtones/CyanTone.ogg b/prebuilt/common/media/audio/ringtones/CyanTone.ogg
new file mode 100644
index 00000000..62c7dfd4
Binary files /dev/null and b/prebuilt/common/media/audio/ringtones/CyanTone.ogg differ