diff --git a/common/audio/luneFoxTheme/Achievement_Unlocked.mp3 b/common/audio/luneFoxTheme/Achievement_Unlocked.mp3
new file mode 100644
index 0000000000..f45ac96f75
Binary files /dev/null and b/common/audio/luneFoxTheme/Achievement_Unlocked.mp3 differ
diff --git a/common/audio/luneFoxTheme/Achievement_Unlocked.ogg b/common/audio/luneFoxTheme/Achievement_Unlocked.ogg
new file mode 100644
index 0000000000..9a81307512
Binary files /dev/null and b/common/audio/luneFoxTheme/Achievement_Unlocked.ogg differ
diff --git a/common/audio/luneFoxTheme/Chat.mp3 b/common/audio/luneFoxTheme/Chat.mp3
new file mode 100644
index 0000000000..9fe637ff00
Binary files /dev/null and b/common/audio/luneFoxTheme/Chat.mp3 differ
diff --git a/common/audio/luneFoxTheme/Chat.ogg b/common/audio/luneFoxTheme/Chat.ogg
new file mode 100644
index 0000000000..3caadb1909
Binary files /dev/null and b/common/audio/luneFoxTheme/Chat.ogg differ
diff --git a/common/audio/luneFoxTheme/Daily.mp3 b/common/audio/luneFoxTheme/Daily.mp3
new file mode 100644
index 0000000000..aa8561590a
Binary files /dev/null and b/common/audio/luneFoxTheme/Daily.mp3 differ
diff --git a/common/audio/luneFoxTheme/Daily.ogg b/common/audio/luneFoxTheme/Daily.ogg
new file mode 100644
index 0000000000..05287d2b4c
Binary files /dev/null and b/common/audio/luneFoxTheme/Daily.ogg differ
diff --git a/common/audio/luneFoxTheme/Death.mp3 b/common/audio/luneFoxTheme/Death.mp3
new file mode 100644
index 0000000000..917f6f4ac4
Binary files /dev/null and b/common/audio/luneFoxTheme/Death.mp3 differ
diff --git a/common/audio/luneFoxTheme/Death.ogg b/common/audio/luneFoxTheme/Death.ogg
new file mode 100644
index 0000000000..25efd1f888
Binary files /dev/null and b/common/audio/luneFoxTheme/Death.ogg differ
diff --git a/common/audio/luneFoxTheme/Item_Drop.mp3 b/common/audio/luneFoxTheme/Item_Drop.mp3
new file mode 100644
index 0000000000..26b6e8e331
Binary files /dev/null and b/common/audio/luneFoxTheme/Item_Drop.mp3 differ
diff --git a/common/audio/luneFoxTheme/Item_Drop.ogg b/common/audio/luneFoxTheme/Item_Drop.ogg
new file mode 100644
index 0000000000..b08764a709
Binary files /dev/null and b/common/audio/luneFoxTheme/Item_Drop.ogg differ
diff --git a/common/audio/luneFoxTheme/Level_Up.mp3 b/common/audio/luneFoxTheme/Level_Up.mp3
new file mode 100644
index 0000000000..979678479f
Binary files /dev/null and b/common/audio/luneFoxTheme/Level_Up.mp3 differ
diff --git a/common/audio/luneFoxTheme/Level_Up.ogg b/common/audio/luneFoxTheme/Level_Up.ogg
new file mode 100644
index 0000000000..f99dede828
Binary files /dev/null and b/common/audio/luneFoxTheme/Level_Up.ogg differ
diff --git a/common/audio/luneFoxTheme/Minus_Habit.mp3 b/common/audio/luneFoxTheme/Minus_Habit.mp3
new file mode 100644
index 0000000000..159ffa8afa
Binary files /dev/null and b/common/audio/luneFoxTheme/Minus_Habit.mp3 differ
diff --git a/common/audio/luneFoxTheme/Minus_Habit.ogg b/common/audio/luneFoxTheme/Minus_Habit.ogg
new file mode 100644
index 0000000000..acc69e64b2
Binary files /dev/null and b/common/audio/luneFoxTheme/Minus_Habit.ogg differ
diff --git a/common/audio/luneFoxTheme/Plus_Habit.mp3 b/common/audio/luneFoxTheme/Plus_Habit.mp3
new file mode 100644
index 0000000000..985c912883
Binary files /dev/null and b/common/audio/luneFoxTheme/Plus_Habit.mp3 differ
diff --git a/common/audio/luneFoxTheme/Plus_Habit.ogg b/common/audio/luneFoxTheme/Plus_Habit.ogg
new file mode 100644
index 0000000000..db29eef496
Binary files /dev/null and b/common/audio/luneFoxTheme/Plus_Habit.ogg differ
diff --git a/common/audio/luneFoxTheme/Reward.mp3 b/common/audio/luneFoxTheme/Reward.mp3
new file mode 100644
index 0000000000..f6e18a4157
Binary files /dev/null and b/common/audio/luneFoxTheme/Reward.mp3 differ
diff --git a/common/audio/luneFoxTheme/Reward.ogg b/common/audio/luneFoxTheme/Reward.ogg
new file mode 100644
index 0000000000..e149a004f0
Binary files /dev/null and b/common/audio/luneFoxTheme/Reward.ogg differ
diff --git a/common/audio/luneFoxTheme/ToDo.mp3 b/common/audio/luneFoxTheme/ToDo.mp3
new file mode 100644
index 0000000000..188d023fb5
Binary files /dev/null and b/common/audio/luneFoxTheme/ToDo.mp3 differ
diff --git a/common/audio/luneFoxTheme/ToDo.ogg b/common/audio/luneFoxTheme/ToDo.ogg
new file mode 100644
index 0000000000..38abefc5f3
Binary files /dev/null and b/common/audio/luneFoxTheme/ToDo.ogg differ
diff --git a/common/audio/wattsTheme/Achievement_Unlocked.mp3 b/common/audio/wattsTheme/Achievement_Unlocked.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Achievement_Unlocked.ogg b/common/audio/wattsTheme/Achievement_Unlocked.ogg
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Daily.mp3 b/common/audio/wattsTheme/Daily.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Daily.ogg b/common/audio/wattsTheme/Daily.ogg
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Death.mp3 b/common/audio/wattsTheme/Death.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Death.ogg b/common/audio/wattsTheme/Death.ogg
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Item_Drop.mp3 b/common/audio/wattsTheme/Item_Drop.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Item_Drop.ogg b/common/audio/wattsTheme/Item_Drop.ogg
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Level_Up.mp3 b/common/audio/wattsTheme/Level_Up.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Level_Up.ogg b/common/audio/wattsTheme/Level_Up.ogg
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Minus_Habit.mp3 b/common/audio/wattsTheme/Minus_Habit.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Minus_Habit.ogg b/common/audio/wattsTheme/Minus_Habit.ogg
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Plus_Habit.mp3 b/common/audio/wattsTheme/Plus_Habit.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Plus_Habit.ogg b/common/audio/wattsTheme/Plus_Habit.ogg
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Reward.mp3 b/common/audio/wattsTheme/Reward.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/Reward.ogg b/common/audio/wattsTheme/Reward.ogg
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/ToDo.mp3 b/common/audio/wattsTheme/ToDo.mp3
old mode 100755
new mode 100644
diff --git a/common/audio/wattsTheme/ToDo.ogg b/common/audio/wattsTheme/ToDo.ogg
old mode 100755
new mode 100644
diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json
index 8f1f6f9adb..bb836454e3 100644
--- a/common/locales/en/generic.json
+++ b/common/locales/en/generic.json
@@ -91,6 +91,7 @@
     "audioTheme_danielTheBard": "Daniel The Bard",
     "audioTheme_wattsTheme": "Watts' Theme",
     "audioTheme_gokulTheme": "Gokul Theme",
+    "audioTheme_luneFoxTheme": "LuneFox's Theme",
     "askQuestion": "Ask a Question",
     "reportBug": "Report a Bug",
     "contributeToHRPG": "Contribute to Habitica",
diff --git a/website/src/models/user.js b/website/src/models/user.js
index a8638dcc45..cf124db584 100644
--- a/website/src/models/user.js
+++ b/website/src/models/user.js
@@ -319,7 +319,7 @@ var UserSchema = new Schema({
     skin: {type:String, 'default':'915533'},
     shirt: {type: String, 'default': 'blue'},
     timezoneOffset: Number,
-    sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme', 'gokulTheme']},
+    sound: {type:String, 'default':'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']},
     language: String,
     automaticAllocation: Boolean,
     allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},
diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade
index d6cd094da1..d2c60dda01 100644
--- a/website/views/shared/header/menu.jade
+++ b/website/views/shared/header/menu.jade
@@ -218,7 +218,7 @@ nav.toolbar(ng-controller='MenuCtrl')
           div
             ul.toolbar-submenu
               // Using [{k,v}] instead of {k:v,k:v} to maintain order ('off' at top)
-              for theme in ['off','danielTheBard', 'wattsTheme', 'gokulTheme']
+              for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']
                 li
                   a(ng-class="{'bg-primary':user.preferences.sound === '# {theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme)
           ul.toolbar-controls