diff --git a/common/script/content/index.js b/common/script/content/index.js
index 76a8cc5d62..c1125897cf 100644
--- a/common/script/content/index.js
+++ b/common/script/content/index.js
@@ -14,6 +14,7 @@ import {
   GEAR_TYPES,
 } from './constants';
 
+import mysterySets from './mystery-sets';
 
 /*
   ---------------------------------------------------------------
@@ -22,131 +23,7 @@ import {
   ---------------------------------------------------------------
  */
 
-api.mystery = {
-  201402: {
-    start: '2014-02-22',
-    end: '2014-02-28',
-    text: 'Winged Messenger Set'
-  },
-  201403: {
-    start: '2014-03-24',
-    end: '2014-04-02',
-    text: 'Forest Walker Set'
-  },
-  201404: {
-    start: '2014-04-24',
-    end: '2014-05-02',
-    text: 'Twilight Butterfly Set'
-  },
-  201405: {
-    start: '2014-05-21',
-    end: '2014-06-02',
-    text: 'Flame Wielder Set'
-  },
-  201406: {
-    start: '2014-06-23',
-    end: '2014-07-02',
-    text: 'Octomage Set'
-  },
-  201407: {
-    start: '2014-07-23',
-    end: '2014-08-02',
-    text: 'Undersea Explorer Set'
-  },
-  201408: {
-    start: '2014-08-23',
-    end: '2014-09-02',
-    text: 'Sun Sorcerer Set'
-  },
-  201409: {
-    start: '2014-09-24',
-    end: '2014-10-02',
-    text: 'Autumn Strider Set'
-  },
-  201410: {
-    start: '2014-10-24',
-    end: '2014-11-02',
-    text: 'Winged Goblin Set'
-  },
-  201411: {
-    start: '2014-11-24',
-    end: '2014-12-02',
-    text: 'Feast and Fun Set'
-  },
-  201412: {
-    start: '2014-12-25',
-    end: '2015-01-02',
-    text: 'Penguin Set'
-  },
-  201501: {
-    start: '2015-01-26',
-    end: '2015-02-02',
-    text: 'Starry Knight Set'
-  },
-  201502: {
-    start: '2015-02-24',
-    end: '2015-03-02',
-    text: 'Winged Enchanter Set'
-  },
-  201503: {
-    start: '2015-03-25',
-    end: '2015-04-02',
-    text: 'Aquamarine Set'
-  },
-  201504: {
-    start: '2015-04-24',
-    end: '2015-05-02',
-    text: 'Busy Bee Set'
-  },
-  201505: {
-    start: '2015-05-25',
-    end: '2015-06-02',
-    text: 'Green Knight Set'
-  },
-  201506: {
-    start: '2015-06-25',
-    end: '2015-07-02',
-    text: 'Neon Snorkeler Set'
-  },
-  201507: {
-    start: '2015-07-24',
-    end: '2015-08-02',
-    text: 'Rad Surfer Set'
-  },
-  201508: {
-    start: '2015-08-23',
-    end: '2015-09-02',
-    text: 'Cheetah Costume Set'
-  },
-  201509: {
-    start: '2015-09-24',
-    end: '2015-10-02',
-    text: 'Werewolf Set'
-  },
-  201510: {
-    start: '2015-10-26',
-    end: '2015-11-02',
-    text: 'Horned Goblin Set'
-  },
-  301404: {
-    start: '3014-03-24',
-    end: '3014-04-02',
-    text: 'Steampunk Standard Set'
-  },
-  301405: {
-    start: '3014-04-24',
-    end: '3014-05-02',
-    text: 'Steampunk Accessories Set'
-  },
-  wondercon: {
-    start: '2014-03-24',
-    end: '2014-04-01'
-  }
-};
-
-_.each(api.mystery, function(v, k) {
-  return v.key = k;
-});
+api.mystery = mysterySets;
 
 api.itemList = {
   'weapon': {
diff --git a/common/script/src/content/mystery-sets.js b/common/script/content/mystery-sets.js
similarity index 57%
rename from common/script/src/content/mystery-sets.js
rename to common/script/content/mystery-sets.js
index e57505815a..afdca2dbd1 100644
--- a/common/script/src/content/mystery-sets.js
+++ b/common/script/content/mystery-sets.js
@@ -1,133 +1,129 @@
-import {each, where} from 'lodash';
-import {flat as flattenedGear} from './gear/index';
+import { each } from 'lodash';
 
 let mysterySets = {
   201402: {
     start: '2014-02-22',
     end: '2014-02-28',
-    text: 'Winged Messenger Set'
+    text: 'Winged Messenger Set',
   },
   201403: {
     start: '2014-03-24',
     end: '2014-04-02',
-    text: 'Forest Walker Set'
+    text: 'Forest Walker Set',
   },
   201404: {
     start: '2014-04-24',
     end: '2014-05-02',
-    text: 'Twilight Butterfly Set'
+    text: 'Twilight Butterfly Set',
   },
   201405: {
     start: '2014-05-21',
     end: '2014-06-02',
-    text: 'Flame Wielder Set'
+    text: 'Flame Wielder Set',
   },
   201406: {
     start: '2014-06-23',
     end: '2014-07-02',
-    text: 'Octomage Set'
+    text: 'Octomage Set',
   },
   201407: {
     start: '2014-07-23',
     end: '2014-08-02',
-    text: 'Undersea Explorer Set'
+    text: 'Undersea Explorer Set',
   },
   201408: {
     start: '2014-08-23',
     end: '2014-09-02',
-    text: 'Sun Sorcerer Set'
+    text: 'Sun Sorcerer Set',
   },
   201409: {
     start: '2014-09-24',
     end: '2014-10-02',
-    text: 'Autumn Strider Set'
+    text: 'Autumn Strider Set',
   },
   201410: {
     start: '2014-10-24',
     end: '2014-11-02',
-    text: 'Winged Goblin Set'
+    text: 'Winged Goblin Set',
   },
   201411: {
     start: '2014-11-24',
     end: '2014-12-02',
-    text: 'Feast and Fun Set'
+    text: 'Feast and Fun Set',
   },
   201412: {
     start: '2014-12-25',
     end: '2015-01-02',
-    text: 'Penguin Set'
+    text: 'Penguin Set',
   },
   201501: {
     start: '2015-01-26',
     end: '2015-02-02',
-    text: 'Starry Knight Set'
+    text: 'Starry Knight Set',
   },
   201502: {
     start: '2015-02-24',
     end: '2015-03-02',
-    text: 'Winged Enchanter Set'
+    text: 'Winged Enchanter Set',
   },
   201503: {
     start: '2015-03-25',
     end: '2015-04-02',
-    text: 'Aquamarine Set'
+    text: 'Aquamarine Set',
   },
   201504: {
     start: '2015-04-24',
     end: '2015-05-02',
-    text: 'Busy Bee Set'
+    text: 'Busy Bee Set',
   },
   201505: {
     start: '2015-05-25',
     end: '2015-06-02',
-    text: 'Green Knight Set'
+    text: 'Green Knight Set',
   },
   201506: {
     start: '2015-06-25',
     end: '2015-07-02',
-    text: 'Neon Snorkeler Set'
+    text: 'Neon Snorkeler Set',
   },
   201507: {
     start: '2015-07-24',
     end: '2015-08-02',
-    text: 'Rad Surfer Set'
+    text: 'Rad Surfer Set',
   },
   201508: {
     start: '2015-08-23',
     end: '2015-09-02',
-    text: 'Cheetah Costume Set'
+    text: 'Cheetah Costume Set',
   },
   201509: {
-    start:'2015-09-24',
-    end:'2015-10-02',
-    text:'Werewolf Set'
+    start: '2015-09-24',
+    end: '2015-10-02',
+    text: 'Werewolf Set',
   },
   201510: {
-    start:'2015-10-26',
-    end:'2015-11-02',
-    text:'Horned Goblin Set'
+    start: '2015-10-26',
+    end: '2015-11-02',
+    text: 'Horned Goblin Set',
   },
   301404: {
     start: '3014-03-24',
     end: '3014-04-02',
-    text: 'Steampunk Standard Set'
+    text: 'Steampunk Standard Set',
   },
   301405: {
     start: '3014-04-24',
     end: '3014-05-02',
-    text: 'Steampunk Accessories Set'
+    text: 'Steampunk Accessories Set',
   },
-  wondercon: { // @TODO: extract this out of mystery items
+  wondercon: {
     start: '2014-03-24',
-    end: '2014-04-01'
-  }
+    end: '2014-04-01',
+  },
 };
 
-each(mysterySets, (objectSet, name) => {
-  objectSet.key = name;
-  objectSet.items = where(flattenedGear, {
-    mystery: name
-  });
+each(mysterySets, (value, key) => {
+  return value.key = key;
 });
 
 export default mysterySets;