diff --git a/common/locales/en/messages.json b/common/locales/en/messages.json
index c5548859ea..e4a900c46a 100644
--- a/common/locales/en/messages.json
+++ b/common/locales/en/messages.json
@@ -21,7 +21,7 @@
   "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>",
   "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>",
   "messageFoundQuest": "You've found the quest \"<%= questText %>\"!",
-  "armoireEquipment": "You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
-  "armoireFood": "You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+  "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+  "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
   "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
diff --git a/common/script/index.coffee b/common/script/index.coffee
index e6ce59b15c..258a29f136 100644
--- a/common/script/index.coffee
+++ b/common/script/index.coffee
@@ -852,12 +852,12 @@ api.wrap = (user, main=true) ->
             drop = user.fns.randomVal(eligibleEquipment)
             user.items.gear.owned[drop.key] = true
             user.flags.armoireOpened = true
-            message = i18n.t('armoireEquipment', {dropText: drop.text(req.language)}, req.language)
+            message = i18n.t('armoireEquipment', {image: '<span class="shop_'+drop.key+'">', dropText: drop.text(req.language)}, req.language)
           else if (!_.isEmpty(eligibleEquipment) and armoireResult < .85) or armoireResult < .6
             drop = user.fns.randomVal _.where(content.food, {canDrop:true})
             user.items.food[drop.key] ?= 0
             user.items.food[drop.key] += 1
-            message = i18n.t('armoireFood', {dropArticle: drop.article, dropText: drop.text(req.language)}, req.language)
+            message = i18n.t('armoireFood', {image: '<span class="Pet_Food_'+drop.key+'">', dropArticle: drop.article, dropText: drop.text(req.language)}, req.language)
           else
             user.stats.exp += Math.floor(user.fns.predictableRandom(user.stats.exp) * 40 + 10)
             message = i18n.t('armoireExp', req.language)
diff --git a/migrations/20150604_ultimateGearSets.js b/migrations/20150604_ultimateGearSets.js
new file mode 100644
index 0000000000..d1290420c7
--- /dev/null
+++ b/migrations/20150604_ultimateGearSets.js
@@ -0,0 +1,97 @@
+/**
+ * Created by Sabe on 6/3/2015.
+ */
+
+var migrationName = '20150604_ultimateGearSets';
+var authorName = 'Sabe'; // in case script author needs to know when their ...
+var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
+
+/*
+ * grant the new ultimateGearSets achievement for existing users' collected equipment
+ */
+
+var dbserver = 'localhost:27017'; // CHANGE THIS FOR PRODUCTION DATABASE
+
+var mongo = require('mongoskin');
+var _ = require('lodash');
+
+var dbUsers = mongo.db(dbserver + '/habitrpg?auto_reconnect').collection('users');
+
+var query = {
+  'items.gear.owned.weapon_wizard_6':true,
+  'items.gear.owned.armor_wizard_5':true,
+  'items.gear.owned.head_wizard_5':true
+};
+
+var fields = {
+  'achievements.ultimateGearSets.wizard':true
+};
+
+/* var query = {
+  'items.gear.owned.weapon_warrior_6':true,
+  'items.gear.owned.armor_warrior_5':true,
+  'items.gear.owned.head_warrior_5':true,
+  'items.gear.owned.shield_warrior_5':true
+};
+
+var fields = {
+  'achievements.ultimateGearSets.warrior':true
+}; */
+
+/* var query = {
+ 'items.gear.owned.weapon_healer_6':true,
+ 'items.gear.owned.armor_healer_5':true,
+ 'items.gear.owned.head_healer_5':true,
+ 'items.gear.owned.shield_healer_5':true
+ };
+
+ var fields = {
+ 'achievements.ultimateGearSets.healer':true
+ }; */
+
+/* var query = {
+ 'items.gear.owned.weapon_rogue_6':true,
+ 'items.gear.owned.armor_rogue_5':true,
+ 'items.gear.owned.head_rogue_5':true,
+ 'items.gear.owned.shield_rogue_6':true
+ };
+
+ var fields = {
+ 'achievements.ultimateGearSets.rogue':true
+ }; */
+
+console.warn('Updating users...');
+var progressCount = 1000;
+var count = 0;
+dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
+  if (err) { return exiting(1, 'ERROR! ' + err); }
+  if (!user) {
+    console.warn('All appropriate users found and modified.');
+    return displayData();
+  }
+  count++;
+
+  var set = {'migration':migrationName, 'achievements.ultimateGearSets':{'wizard':true} }; // Change per class
+  dbUsers.update({_id:user._id}, {$set:set});
+
+  if (count%progressCount == 0) console.warn(count + ' ' + user._id);
+  if (user._id == authorUuid) console.warn(authorName + ' processed');
+  if (user._id == '9'       ) console.warn('lefnire'  + ' processed');
+});
+
+
+function displayData() {
+  console.warn('\n' + count + ' users processed\n');
+  return exiting(0);
+}
+
+
+function exiting(code, msg) {
+  code = code || 0; // 0 = success
+  if (code && !msg) { msg = 'ERROR!'; }
+  if (msg) {
+    if (code) { console.error(msg); }
+    else      { console.log(  msg); }
+  }
+  process.exit(code);
+}
diff --git a/website/public/js/controllers/tasksCtrl.js b/website/public/js/controllers/tasksCtrl.js
index 641c580095..cf2838adb1 100644
--- a/website/public/js/controllers/tasksCtrl.js
+++ b/website/public/js/controllers/tasksCtrl.js
@@ -193,7 +193,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
      ------------------------
      */
 
-    $scope.$watch('user.items.gear.equipped', function(){
+    $scope.$watchGroup(['user.items.gear.owned', 'user.flags.armoireEnabled'], function(){
       $scope.itemStore = Shared.updateStore(User.user);
     },true);
 
diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade
index ebc0783d2b..99009471ed 100644
--- a/website/views/options/inventory/inventory.jade
+++ b/website/views/options/inventory/inventory.jade
@@ -20,7 +20,7 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html')
           button.btn.btn-default(type="button", ng-click='dequip("costume");') {{env.t("unequipCostume")}}
           button.btn.btn-default(type="button", ng-click='dequip("petMountBackground");') {{env.t("unequipPetMountBackground")}}
         li.customize-menu(ng-if='user.preferences.costume')
-          menu.pets-menu(label='{{::label}}', ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery")}', ng-show='gear[klass]')
+          menu.pets-menu(label='{{::label}}', ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery"), armoire:env.t("enchantedArmoire")}', ng-show='gear[klass]')
             div(ng-repeat='item in gear[klass]')
               button.customize-option(popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='user.ops.equip({params:{type:"costume", key:item.key}})', class='shop_{{::item.key}}', ng-class='{selectableInventory: user.items.gear.costume[item.type] == item.key}')