diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json
index 642581a58e..c8ef492b93 100644
--- a/website/common/locales/en/generic.json
+++ b/website/common/locales/en/generic.json
@@ -1,4 +1,4 @@
-{
+{
   "languageName": "English",
   "stringNotFound": "String '<%= string %>' not found.",
   "titleIndex": "Habitica | Your Life The Role Playing Game",
@@ -140,10 +140,12 @@
   "audioTheme_airuTheme": "Airu's Theme",
   "audioTheme_beatscribeNesTheme": "Beatscribe's NES Theme",
   "audioTheme_arashiTheme": "Arashi's Theme",
+  "audioTheme_lunasolTheme": "Lunasol Theme",
   "audioTheme_spacePenguinTheme": "SpacePenguin's Theme",
   "audioTheme_maflTheme": "MAFL Theme",
   "audioTheme_pizildenTheme": "Pizilden's Theme",
   "audioTheme_farvoidTheme": "Farvoid Theme",
+
   "askQuestion": "Ask a Question",
   "reportBug": "Report a Bug",
   "HabiticaWiki": "The Habitica Wiki",
diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js
index af85d56088..c5b33f81f3 100644
--- a/website/common/script/content/index.js
+++ b/website/common/script/content/index.js
@@ -46,7 +46,7 @@ api.gear = gear;
 api.spells = spells;
 api.subscriptionBlocks = subscriptionBlocks;
 
-api.audioThemes = ['danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme', 'beatscribeNesTheme', 'arashiTheme', 'maflTheme', 'pizildenTheme', 'farvoidTheme', 'spacePenguinTheme'];
+api.audioThemes = ['danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme', 'beatscribeNesTheme', 'arashiTheme', 'maflTheme', 'pizildenTheme', 'farvoidTheme', 'spacePenguinTheme', 'lunasolTheme'];
 
 api.mystery = timeTravelers.mystery;
 api.timeTravelerStore = timeTravelers.timeTravelerStore;
diff --git a/website/static/audio/lunasolTheme/Achievement_Unlocked.mp3 b/website/static/audio/lunasolTheme/Achievement_Unlocked.mp3
new file mode 100644
index 0000000000..a0c2350477
Binary files /dev/null and b/website/static/audio/lunasolTheme/Achievement_Unlocked.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Achievement_Unlocked.ogg b/website/static/audio/lunasolTheme/Achievement_Unlocked.ogg
new file mode 100644
index 0000000000..e1897f20f8
Binary files /dev/null and b/website/static/audio/lunasolTheme/Achievement_Unlocked.ogg differ
diff --git a/website/static/audio/lunasolTheme/Chat.mp3 b/website/static/audio/lunasolTheme/Chat.mp3
new file mode 100644
index 0000000000..c24ad5eed9
Binary files /dev/null and b/website/static/audio/lunasolTheme/Chat.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Chat.ogg b/website/static/audio/lunasolTheme/Chat.ogg
new file mode 100644
index 0000000000..28b4fdb38f
Binary files /dev/null and b/website/static/audio/lunasolTheme/Chat.ogg differ
diff --git a/website/static/audio/lunasolTheme/Daily.mp3 b/website/static/audio/lunasolTheme/Daily.mp3
new file mode 100644
index 0000000000..bc37be06e6
Binary files /dev/null and b/website/static/audio/lunasolTheme/Daily.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Daily.ogg b/website/static/audio/lunasolTheme/Daily.ogg
new file mode 100644
index 0000000000..3976c4f95f
Binary files /dev/null and b/website/static/audio/lunasolTheme/Daily.ogg differ
diff --git a/website/static/audio/lunasolTheme/Death.mp3 b/website/static/audio/lunasolTheme/Death.mp3
new file mode 100644
index 0000000000..32fe4bb59f
Binary files /dev/null and b/website/static/audio/lunasolTheme/Death.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Death.ogg b/website/static/audio/lunasolTheme/Death.ogg
new file mode 100644
index 0000000000..149ef3c7bf
Binary files /dev/null and b/website/static/audio/lunasolTheme/Death.ogg differ
diff --git a/website/static/audio/lunasolTheme/Item_Drop.mp3 b/website/static/audio/lunasolTheme/Item_Drop.mp3
new file mode 100644
index 0000000000..b2b6b7603d
Binary files /dev/null and b/website/static/audio/lunasolTheme/Item_Drop.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Item_Drop.ogg b/website/static/audio/lunasolTheme/Item_Drop.ogg
new file mode 100644
index 0000000000..132fa8637b
Binary files /dev/null and b/website/static/audio/lunasolTheme/Item_Drop.ogg differ
diff --git a/website/static/audio/lunasolTheme/Level_Up.mp3 b/website/static/audio/lunasolTheme/Level_Up.mp3
new file mode 100644
index 0000000000..80fc19a2db
Binary files /dev/null and b/website/static/audio/lunasolTheme/Level_Up.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Level_Up.ogg b/website/static/audio/lunasolTheme/Level_Up.ogg
new file mode 100644
index 0000000000..ce86f4a886
Binary files /dev/null and b/website/static/audio/lunasolTheme/Level_Up.ogg differ
diff --git a/website/static/audio/lunasolTheme/Minus_Habit.mp3 b/website/static/audio/lunasolTheme/Minus_Habit.mp3
new file mode 100644
index 0000000000..2a8a64bb64
Binary files /dev/null and b/website/static/audio/lunasolTheme/Minus_Habit.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Minus_Habit.ogg b/website/static/audio/lunasolTheme/Minus_Habit.ogg
new file mode 100644
index 0000000000..b2294d50a1
Binary files /dev/null and b/website/static/audio/lunasolTheme/Minus_Habit.ogg differ
diff --git a/website/static/audio/lunasolTheme/Plus_Habit.mp3 b/website/static/audio/lunasolTheme/Plus_Habit.mp3
new file mode 100644
index 0000000000..0a6715ce61
Binary files /dev/null and b/website/static/audio/lunasolTheme/Plus_Habit.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Plus_Habit.ogg b/website/static/audio/lunasolTheme/Plus_Habit.ogg
new file mode 100644
index 0000000000..13e46ec6fb
Binary files /dev/null and b/website/static/audio/lunasolTheme/Plus_Habit.ogg differ
diff --git a/website/static/audio/lunasolTheme/Reward.mp3 b/website/static/audio/lunasolTheme/Reward.mp3
new file mode 100644
index 0000000000..76bc744276
Binary files /dev/null and b/website/static/audio/lunasolTheme/Reward.mp3 differ
diff --git a/website/static/audio/lunasolTheme/Reward.ogg b/website/static/audio/lunasolTheme/Reward.ogg
new file mode 100644
index 0000000000..53b481bf38
Binary files /dev/null and b/website/static/audio/lunasolTheme/Reward.ogg differ
diff --git a/website/static/audio/lunasolTheme/ToDo.mp3 b/website/static/audio/lunasolTheme/ToDo.mp3
new file mode 100644
index 0000000000..da17414c82
Binary files /dev/null and b/website/static/audio/lunasolTheme/ToDo.mp3 differ
diff --git a/website/static/audio/lunasolTheme/ToDo.ogg b/website/static/audio/lunasolTheme/ToDo.ogg
new file mode 100644
index 0000000000..5689a3d8f2
Binary files /dev/null and b/website/static/audio/lunasolTheme/ToDo.ogg differ