diff --git a/common/script/src/content/gear/back.js b/common/script/src/content/gear/back.js
index b8f5a47047..45d2371099 100644
--- a/common/script/src/content/gear/back.js
+++ b/common/script/src/content/gear/back.js
@@ -1,6 +1,8 @@
 import {translator as t} from '../helpers';
 import events from '../events';
 
+import {back as mysteryBack} from './sets/mystery';
+
 let back = {
   base: {
     0: {
@@ -9,38 +11,7 @@ let back = {
       value: 0
     }
   },
-  mystery: {
-    201402: {
-      text: t('backMystery201402Text'),
-      notes: t('backMystery201402Notes'),
-      mystery: '201402',
-      value: 0
-    },
-    201404: {
-      text: t('backMystery201404Text'),
-      notes: t('backMystery201404Notes'),
-      mystery: '201404',
-      value: 0
-    },
-    201410: {
-      text: t('backMystery201410Text'),
-      notes: t('backMystery201410Notes'),
-      mystery: '201410',
-      value: 0
-    },
-    201504: {
-      text: t('backMystery201504Text'),
-      notes: t('backMystery201504Notes'),
-      mystery: '201504',
-      value: 0
-    },
-    201507: {
-      text: t('backMystery201507Text'),
-      notes: t('backMystery201507Notes'),
-      mystery: '201507',
-      value: 0
-    }
-  },
+  mystery: mysteryBack,
   special: {
     wondercon_red: {
       text: t('backSpecialWonderconRedText'),
diff --git a/common/script/src/content/gear/eyewear.js b/common/script/src/content/gear/eyewear.js
index 8f00033505..8098ab0620 100644
--- a/common/script/src/content/gear/eyewear.js
+++ b/common/script/src/content/gear/eyewear.js
@@ -1,6 +1,8 @@
 import {translator as t} from '../helpers';
 import events from '../events';
 
+import {eyewear as mysteryEyewear} from './sets/mystery';
+
 let eyewear = {
   base: {
     0: {
@@ -38,38 +40,7 @@ let eyewear = {
       value: 20
     }
   },
-  mystery: {
-    201503: {
-      text: t('eyewearMystery201503Text'),
-      notes: t('eyewearMystery201503Notes'),
-      mystery: '201503',
-      value: 0
-    },
-    201506: {
-      text: t('eyewearMystery201506Text'),
-      notes: t('eyewearMystery201506Notes'),
-      mystery: '201506',
-      value: 0
-    },
-    201507: {
-      text: t('eyewearMystery201507Text'),
-      notes: t('eyewearMystery201507Notes'),
-      mystery: '201507',
-      value: 0
-    },
-    301404: {
-      text: t('eyewearMystery301404Text'),
-      notes: t('eyewearMystery301404Notes'),
-      mystery: '301404',
-      value: 0
-    },
-    301405: {
-      text: t('eyewearMystery301405Text'),
-      notes: t('eyewearMystery301405Notes'),
-      mystery: '301405',
-      value: 0
-    }
-  },
+  mystery: mysteryEyewear,
   armoire: {
     plagueDoctorMask: {
       text: t('eyewearArmoirePlagueDoctorMaskText'),
diff --git a/common/script/src/content/gear/head.js b/common/script/src/content/gear/head.js
index 400c44a2fd..beb2fa5409 100644
--- a/common/script/src/content/gear/head.js
+++ b/common/script/src/content/gear/head.js
@@ -8,6 +8,8 @@ import {head as rogueHead} from './sets/rogue';
 import {head as warriorHead} from './sets/warrior';
 import {head as wizardHead} from './sets/wizard';
 
+import {head as mysteryHead} from './sets/mystery';
+
 let head = {
   base: baseHead,
 
@@ -409,86 +411,7 @@ let head = {
       value: 0
     }
   },
-  mystery: {
-    201402: {
-      text: t('headMystery201402Text'),
-      notes: t('headMystery201402Notes'),
-      mystery: '201402',
-      value: 0
-    },
-    201405: {
-      text: t('headMystery201405Text'),
-      notes: t('headMystery201405Notes'),
-      mystery: '201405',
-      value: 0
-    },
-    201406: {
-      text: t('headMystery201406Text'),
-      notes: t('headMystery201406Notes'),
-      mystery: '201406',
-      value: 0
-    },
-    201407: {
-      text: t('headMystery201407Text'),
-      notes: t('headMystery201407Notes'),
-      mystery: '201407',
-      value: 0
-    },
-    201408: {
-      text: t('headMystery201408Text'),
-      notes: t('headMystery201408Notes'),
-      mystery: '201408',
-      value: 0
-    },
-    201411: {
-      text: t('headMystery201411Text'),
-      notes: t('headMystery201411Notes'),
-      mystery: '201411',
-      value: 0
-    },
-    201412: {
-      text: t('headMystery201412Text'),
-      notes: t('headMystery201412Notes'),
-      mystery: '201412',
-      value: 0
-    },
-    201501: {
-      text: t('headMystery201501Text'),
-      notes: t('headMystery201501Notes'),
-      mystery: '201501',
-      value: 0
-    },
-    201505: {
-      text: t('headMystery201505Text'),
-      notes: t('headMystery201505Notes'),
-      mystery: '201505',
-      value: 0
-    },
-    201508: {
-      text: t('headMystery201508Text'),
-      notes: t('headMystery201508Notes'),
-      mystery: '201508',
-      value: 0
-    },
-    201509: {
-      text: t('headMystery201509Text'),
-      notes: t('headMystery201509Notes'),
-      mystery:'201509',
-      value: 0
-    },
-    301404: {
-      text: t('headMystery301404Text'),
-      notes: t('headMystery301404Notes'),
-      mystery: '301404',
-      value: 0
-    },
-    301405: {
-      text: t('headMystery301405Text'),
-      notes: t('headMystery301405Notes'),
-      mystery: '301405',
-      value: 0
-    }
-  },
+  mystery: mysteryHead,
   armoire: {
     lunarCrown: {
       text: t('headArmoireLunarCrownText'),
diff --git a/common/script/src/content/gear/sets/mystery.js b/common/script/src/content/gear/sets/mystery.js
index 1e9e982056..251e973360 100644
--- a/common/script/src/content/gear/sets/mystery.js
+++ b/common/script/src/content/gear/sets/mystery.js
@@ -1,101 +1,84 @@
-import {translator as t} from '../../helpers';
-import events from '../../events';
+import {setGearSetDefaults} from '../../helpers';
 
-export var armor = {
-  201402: {
-    text: t('armorMystery201402Text'),
-    notes: t('armorMystery201402Notes'),
-    mystery: '201402',
-    value: 0
-  },
-  201403: {
-    text: t('armorMystery201403Text'),
-    notes: t('armorMystery201403Notes'),
-    mystery: '201403',
-    value: 0
-  },
-  201405: {
-    text: t('armorMystery201405Text'),
-    notes: t('armorMystery201405Notes'),
-    mystery: '201405',
-    value: 0
-  },
-  201406: {
-    text: t('armorMystery201406Text'),
-    notes: t('armorMystery201406Notes'),
-    mystery: '201406',
-    value: 0
-  },
-  201407: {
-    text: t('armorMystery201407Text'),
-    notes: t('armorMystery201407Notes'),
-    mystery: '201407',
-    value: 0
-  },
-  201408: {
-    text: t('armorMystery201408Text'),
-    notes: t('armorMystery201408Notes'),
-    mystery: '201408',
-    value: 0
-  },
-  201409: {
-    text: t('armorMystery201409Text'),
-    notes: t('armorMystery201409Notes'),
-    mystery: '201409',
-    value: 0
-  },
-  201410: {
-    text: t('armorMystery201410Text'),
-    notes: t('armorMystery201410Notes'),
-    mystery: '201410',
-    value: 0
-  },
-  201412: {
-    text: t('armorMystery201412Text'),
-    notes: t('armorMystery201412Notes'),
-    mystery: '201412',
-    value: 0
-  },
-  201501: {
-    text: t('armorMystery201501Text'),
-    notes: t('armorMystery201501Notes'),
-    mystery: '201501',
-    value: 0
-  },
-  201503: {
-    text: t('armorMystery201503Text'),
-    notes: t('armorMystery201503Notes'),
-    mystery: '201503',
-    value: 0
-  },
-  201504: {
-    text: t('armorMystery201504Text'),
-    notes: t('armorMystery201504Notes'),
-    mystery: '201504',
-    value: 0
-  },
-  201506: {
-    text: t('armorMystery201506Text'),
-    notes: t('armorMystery201506Notes'),
-    mystery: '201506',
-    value: 0
-  },
-  201508: {
-    text: t('armorMystery201508Text'),
-    notes: t('armorMystery201508Notes'),
-    mystery: '201508',
-    value: 0
-  },
-  201509: {
-    text: t('armorMystery201509Text'),
-    notes: t('armorMystery201509Notes'),
-    mystery: '201509',
-    value: 0
-  },
-  301404: {
-    text: t('armorMystery301404Text'),
-    notes: t('armorMystery301404Notes'),
-    mystery: '301404',
-    value: 0
-  }
+let armor = {
+  201402: { mystery: '201402', value: 0 },
+  201403: { mystery: '201403', value: 0 },
+  201405: { mystery: '201405', value: 0 },
+  201406: { mystery: '201406', value: 0 },
+  201407: { mystery: '201407', value: 0 },
+  201408: { mystery: '201408', value: 0 },
+  201409: { mystery: '201409', value: 0 },
+  201410: { mystery: '201410', value: 0 },
+  201412: { mystery: '201412', value: 0 },
+  201501: { mystery: '201501', value: 0 },
+  201503: { mystery: '201503', value: 0 },
+  201504: { mystery: '201504', value: 0 },
+  201506: { mystery: '201506', value: 0 },
+  201508: { mystery: '201508', value: 0 },
+  201509: { mystery: '201509', value: 0 },
+  301404: { mystery: '301404', value: 0 },
 };
+
+let back = {
+  201402: { mystery: '201402', value: 0 },
+  201404: { mystery: '201404', value: 0 },
+  201410: { mystery: '201410', value: 0 },
+  201504: { mystery: '201504', value: 0 },
+  201507: { mystery: '201507', value: 0 },
+};
+
+let eyewear = {
+  201503: { mystery: '201503', value: 0 },
+  201506: { mystery: '201506', value: 0 },
+  201507: { mystery: '201507', value: 0 },
+  301404: { mystery: '301404', value: 0 },
+  301405: { mystery: '301405', value: 0 },
+};
+
+let head = {
+  201402: { mystery: '201402', value: 0 },
+  201405: { mystery: '201405', value: 0 },
+  201406: { mystery: '201406', value: 0 },
+  201407: { mystery: '201407', value: 0 },
+  201408: { mystery: '201408', value: 0 },
+  201411: { mystery: '201411', value: 0 },
+  201412: { mystery: '201412', value: 0 },
+  201501: { mystery: '201501', value: 0 },
+  201505: { mystery: '201505', value: 0 },
+  201508: { mystery: '201508', value: 0 },
+  201509: { mystery:'201509', value: 0 },
+  301404: { mystery: '301404', value: 0 },
+  301405: { mystery: '301405', value: 0 },
+};
+
+let headAccessory = {
+  201403: { mystery: '201403', value: 0 },
+  201404: { mystery: '201404', value: 0 },
+  201409: { mystery: '201409', value: 0 },
+  201502: { mystery: '201502', value: 0 },
+  301405: { mystery: '301405', value: 0 },
+};
+
+let shield = {
+  301405: { mystery: '301405', value: 0 },
+};
+
+let weapon = {
+  201411: { mystery: '201411', value: 0 },
+  201502: { mystery: '201502', value: 0 },
+  201505: { mystery: '201505', value: 0 },
+  301404: { mystery: '301404', value: 0 },
+};
+
+let mysterySet = {
+  armor: armor,
+  eyewear: eyewear,
+  head: head,
+  headAccessory: headAccessory,
+  shield: shield,
+  weapon: weapon,
+};
+
+setGearSetDefaults(mysterySet, {setName: 'mystery'});
+
+export default mysterySet;
diff --git a/common/script/src/content/gear/shield.js b/common/script/src/content/gear/shield.js
index f7a9281ce6..0c368c4f53 100644
--- a/common/script/src/content/gear/shield.js
+++ b/common/script/src/content/gear/shield.js
@@ -9,6 +9,8 @@ import {weapon as rogueWeapon} from './sets/rogue';
 import {shield as warriorShield} from './sets/warrior';
 import {shield as wizardShield} from './sets/wizard';
 
+import {shield as mysteryShield} from './sets/mystery';
+
 let rogueShield = cloneDeep(rogueWeapon);
 
 let shield = {
@@ -311,14 +313,7 @@ let shield = {
       con: 9
     }
   },
-  mystery: {
-    301405: {
-      text: t('shieldMystery301405Text'),
-      notes: t('shieldMystery301405Notes'),
-      mystery: '301405',
-      value: 0
-    }
-  },
+  mystery: mysteryShield,
   armoire: {
     gladiatorShield: {
       text: t('shieldArmoireGladiatorShieldText'),
diff --git a/common/script/src/content/gear/weapon.js b/common/script/src/content/gear/weapon.js
index ac3026addd..0a1c7dce79 100644
--- a/common/script/src/content/gear/weapon.js
+++ b/common/script/src/content/gear/weapon.js
@@ -8,6 +8,8 @@ import {weapon as rogueWeapon} from './sets/rogue';
 import {weapon as warriorWeapon} from './sets/warrior';
 import {weapon as wizardWeapon} from './sets/wizard';
 
+import {weapon as mysteryWeapon} from './sets/mystery';
+
 let weapon = {
   base: baseWeapon,
 
@@ -440,32 +442,7 @@ let weapon = {
       int: 9
     }
   },
-  mystery: {
-    201411: {
-      text: t('weaponMystery201411Text'),
-      notes: t('weaponMystery201411Notes'),
-      mystery: '201411',
-      value: 0
-    },
-    201502: {
-      text: t('weaponMystery201502Text'),
-      notes: t('weaponMystery201502Notes'),
-      mystery: '201502',
-      value: 0
-    },
-    201505: {
-      text: t('weaponMystery201505Text'),
-      notes: t('weaponMystery201505Notes'),
-      mystery: '201505',
-      value: 0
-    },
-    301404: {
-      text: t('weaponMystery301404Text'),
-      notes: t('weaponMystery301404Notes'),
-      mystery: '301404',
-      value: 0
-    }
-  },
+  mystery: mysteryWeapon,
   armoire: {
     basicCrossbow: {
       text: t('weaponArmoireBasicCrossbowText'),