diff --git a/common/audio/gSalvadi/Minus_Habit.mp3 b/common/audio/gSalvadi/Minus_Habit.mp3
deleted file mode 100755
index 58e332901d..0000000000
Binary files a/common/audio/gSalvadi/Minus_Habit.mp3 and /dev/null differ
diff --git a/common/audio/gSalvadi/Minus_Habit.ogg b/common/audio/gSalvadi/Minus_Habit.ogg
deleted file mode 100755
index a6fb8cf9bb..0000000000
Binary files a/common/audio/gSalvadi/Minus_Habit.ogg and /dev/null differ
diff --git a/common/audio/gSalvadi/ToDo.mp3 b/common/audio/gSalvadi/ToDo.mp3
deleted file mode 100755
index cdffdf42b1..0000000000
Binary files a/common/audio/gSalvadi/ToDo.mp3 and /dev/null differ
diff --git a/common/audio/gSalvadi/ToDo.ogg b/common/audio/gSalvadi/ToDo.ogg
deleted file mode 100755
index e37db88547..0000000000
Binary files a/common/audio/gSalvadi/ToDo.ogg and /dev/null differ
diff --git a/common/audio/gSalvadi/Achievement_Unlocked.mp3 b/common/audio/gokulTheme/Achievement_Unlocked.mp3
similarity index 100%
rename from common/audio/gSalvadi/Achievement_Unlocked.mp3
rename to common/audio/gokulTheme/Achievement_Unlocked.mp3
diff --git a/common/audio/gSalvadi/Achievement_Unlocked.ogg b/common/audio/gokulTheme/Achievement_Unlocked.ogg
similarity index 100%
rename from common/audio/gSalvadi/Achievement_Unlocked.ogg
rename to common/audio/gokulTheme/Achievement_Unlocked.ogg
diff --git a/common/audio/gSalvadi/Chat.mp3 b/common/audio/gokulTheme/Chat.mp3
similarity index 100%
rename from common/audio/gSalvadi/Chat.mp3
rename to common/audio/gokulTheme/Chat.mp3
diff --git a/common/audio/gSalvadi/Chat.ogg b/common/audio/gokulTheme/Chat.ogg
similarity index 100%
rename from common/audio/gSalvadi/Chat.ogg
rename to common/audio/gokulTheme/Chat.ogg
diff --git a/common/audio/gSalvadi/Daily.mp3 b/common/audio/gokulTheme/Daily.mp3
similarity index 100%
rename from common/audio/gSalvadi/Daily.mp3
rename to common/audio/gokulTheme/Daily.mp3
diff --git a/common/audio/gSalvadi/Daily.ogg b/common/audio/gokulTheme/Daily.ogg
similarity index 100%
rename from common/audio/gSalvadi/Daily.ogg
rename to common/audio/gokulTheme/Daily.ogg
diff --git a/common/audio/gSalvadi/Death.mp3 b/common/audio/gokulTheme/Death.mp3
similarity index 100%
rename from common/audio/gSalvadi/Death.mp3
rename to common/audio/gokulTheme/Death.mp3
diff --git a/common/audio/gSalvadi/Death.ogg b/common/audio/gokulTheme/Death.ogg
similarity index 100%
rename from common/audio/gSalvadi/Death.ogg
rename to common/audio/gokulTheme/Death.ogg
diff --git a/common/audio/gSalvadi/Item_Drop.mp3 b/common/audio/gokulTheme/Item_Drop.mp3
similarity index 100%
rename from common/audio/gSalvadi/Item_Drop.mp3
rename to common/audio/gokulTheme/Item_Drop.mp3
diff --git a/common/audio/gSalvadi/Item_Drop.ogg b/common/audio/gokulTheme/Item_Drop.ogg
similarity index 100%
rename from common/audio/gSalvadi/Item_Drop.ogg
rename to common/audio/gokulTheme/Item_Drop.ogg
diff --git a/common/audio/gSalvadi/Level_Up.mp3 b/common/audio/gokulTheme/Level_Up.mp3
similarity index 100%
rename from common/audio/gSalvadi/Level_Up.mp3
rename to common/audio/gokulTheme/Level_Up.mp3
diff --git a/common/audio/gSalvadi/Level_Up.ogg b/common/audio/gokulTheme/Level_Up.ogg
similarity index 100%
rename from common/audio/gSalvadi/Level_Up.ogg
rename to common/audio/gokulTheme/Level_Up.ogg
diff --git a/common/audio/gokulTheme/Minus_Habit.mp3 b/common/audio/gokulTheme/Minus_Habit.mp3
new file mode 100755
index 0000000000..38aa4ec050
Binary files /dev/null and b/common/audio/gokulTheme/Minus_Habit.mp3 differ
diff --git a/common/audio/gokulTheme/Minus_Habit.ogg b/common/audio/gokulTheme/Minus_Habit.ogg
new file mode 100755
index 0000000000..ac235dd43b
Binary files /dev/null and b/common/audio/gokulTheme/Minus_Habit.ogg differ
diff --git a/common/audio/gSalvadi/Plus_Habit.mp3 b/common/audio/gokulTheme/Plus_Habit.mp3
similarity index 100%
rename from common/audio/gSalvadi/Plus_Habit.mp3
rename to common/audio/gokulTheme/Plus_Habit.mp3
diff --git a/common/audio/gSalvadi/Plus_Habit.ogg b/common/audio/gokulTheme/Plus_Habit.ogg
similarity index 100%
rename from common/audio/gSalvadi/Plus_Habit.ogg
rename to common/audio/gokulTheme/Plus_Habit.ogg
diff --git a/common/audio/gSalvadi/Reward.mp3 b/common/audio/gokulTheme/Reward.mp3
similarity index 100%
rename from common/audio/gSalvadi/Reward.mp3
rename to common/audio/gokulTheme/Reward.mp3
diff --git a/common/audio/gSalvadi/Reward.ogg b/common/audio/gokulTheme/Reward.ogg
similarity index 100%
rename from common/audio/gSalvadi/Reward.ogg
rename to common/audio/gokulTheme/Reward.ogg
diff --git a/common/audio/gokulTheme/ToDo.mp3 b/common/audio/gokulTheme/ToDo.mp3
new file mode 100755
index 0000000000..65b6ad70e4
Binary files /dev/null and b/common/audio/gokulTheme/ToDo.mp3 differ
diff --git a/common/audio/gokulTheme/ToDo.ogg b/common/audio/gokulTheme/ToDo.ogg
new file mode 100755
index 0000000000..162e7a4f50
Binary files /dev/null and b/common/audio/gokulTheme/ToDo.ogg differ
diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json
index 8a590802c3..9ca0db6eb7 100644
--- a/common/locales/en/generic.json
+++ b/common/locales/en/generic.json
@@ -85,7 +85,7 @@
     "audioTheme_off": "Off",
     "audioTheme_danielTheBard": "Daniel The Bard",
     "audioTheme_wattsTheme": "Watts' Theme",
-    "audioTheme_gSalvadi": "GSalvadi",
+    "audioTheme_gokulTheme": "Gokul Theme",
     "askQuestion": "Ask a Question",
     "reportBug": "Report a Bug",
     "contributeToHRPG": "Contribute to HabitRPG",
diff --git a/website/src/models/user.js b/website/src/models/user.js
index 2d7ccc44f0..9ec7b8d294 100644
--- a/website/src/models/user.js
+++ b/website/src/models/user.js
@@ -310,7 +310,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', 'gSalvadi']},
+    sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme', 'gokulTheme']},
     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 11de461e7e..182227762f 100644
--- a/website/views/shared/header/menu.jade
+++ b/website/views/shared/header/menu.jade
@@ -220,7 +220,7 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
           div
             ul.toolbar-submenu(ng-click='expandMenu(null)')
               // Using [{k,v}] instead of {k:v,k:v} to maintain order ('off' at top)
-              for theme in ['off','danielTheBard', 'wattsTheme', 'gSalvadi']
+              for theme in ['off','danielTheBard', 'wattsTheme', 'gokulTheme']
                 li
                   a(ng-class="{'bg-primary':user.preferences.sound=='#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme)