diff --git a/src/web_resources/HangarXPLOR.DrawUI.js b/src/web_resources/HangarXPLOR.DrawUI.js
index 67a1b1d..a2db961 100644
--- a/src/web_resources/HangarXPLOR.DrawUI.js
+++ b/src/web_resources/HangarXPLOR.DrawUI.js
@@ -25,6 +25,7 @@ HangarXPLOR.DrawUI = function()
     { Value: 'IsCombo', Text: 'Combo Packs', Selected: HangarXPLOR._type == 'IsCombo' },
     { Value: 'IsExtra', Text: 'All Extras', Class: 'split', Selected: HangarXPLOR._type == 'IsExtra' },
     { Value: 'IsAddOn', Text: 'Add Ons', Selected: HangarXPLOR._type == 'IsAddOn' },
+    { Value: 'IsPaint', Text: 'Paints', Selected: HangarXPLOR._type == 'IsPaint' },
     { Value: 'IsComponent', Text: 'Components', Selected: HangarXPLOR._type == 'IsComponent' },
     { Value: 'IsUpgrade', Text: 'Upgrades', Selected: HangarXPLOR._type == 'IsUpgrade' },
     { Value: 'IsFlair', Text: 'All Flair', Class: 'split', Selected: HangarXPLOR._type == 'IsFlair' },
diff --git a/src/web_resources/HangarXPLOR.Filter.js b/src/web_resources/HangarXPLOR.Filter.js
index b1bf53a..1f77124 100644
--- a/src/web_resources/HangarXPLOR.Filter.js
+++ b/src/web_resources/HangarXPLOR.Filter.js
@@ -49,6 +49,9 @@ HangarXPLOR.Filter = function(list, filter)
     case "IsAddOn":
       list = $.grep(list, function(item) { return item.isAddOn; });
       break;
+    case "IsPaint":
+      list = $.grep(list, function(item) { return item.isPaint; });
+      break;
     case "IsExtra":
       list = $.grep(list, function(item) { return item.isAddOn || item.isUpgrade; });
       break;
diff --git a/src/web_resources/HangarXPLOR.ProcessItem.js b/src/web_resources/HangarXPLOR.ProcessItem.js
index 793e432..2e4da94 100644
--- a/src/web_resources/HangarXPLOR.ProcessItem.js
+++ b/src/web_resources/HangarXPLOR.ProcessItem.js
@@ -146,8 +146,9 @@ HangarXPLOR.ProcessItem = function()
     this.isPackage = ($('.title:contains(Squadron 42 Digital Download)', this).length + $('.title:contains(Star Citizen Digital Download)', this).length) > 0;
     this.isShip = $ship.length == 1;
     this.isCombo = $ship.length > 1;
-    this.isUpgrade = (titleParts[0] == "Ship Upgrades");
+    this.isUpgrade = (titleParts[0] == "Ship Upgrades" || titleParts[0] == "Upgrade");
     this.isAddOn = (titleParts[0] == "Add-Ons");
+    this.isPaint = (titleParts[0] == "Paints");
     this.isTrophy = (titleParts[0] == "Trophy");
     this.isPoster = (titleParts[0] == "Posters");
     this.isFishtank = (titleParts[0] == "Fishtank");
diff --git a/src/web_resources/HangarXPLOR.Ships.js b/src/web_resources/HangarXPLOR.Ships.js
index ce8b8a0..a71168d 100644
--- a/src/web_resources/HangarXPLOR.Ships.js
+++ b/src/web_resources/HangarXPLOR.Ships.js
@@ -64,6 +64,9 @@ HangarXPLOR._ships = [
   { 'name': 'Freelancer MAX', 'thumbnail': '/media/pd2zoaytunmrkr/heap_infobox/Freelancer_max_storefront_visual.jpg' },
   { 'name': 'Freelancer MIS', 'thumbnail': '/media/yie4k1qvzqqr0r/heap_infobox/Freelancer_mis_storefront_visual.jpg' },
   { 'name': 'Freelancer', 'thumbnail': '/media/ts39qbhy6x38pr/heap_infobox/Freelancer_storefront_visual.jpg' },
+  { 'name': 'G12A', 'thumbnail': 'https://media.robertsspaceindustries.com/pahu0o7jdshco/heap_infobox.jpg' },
+  { 'name': 'G12R', 'thumbnail': 'https://media.robertsspaceindustries.com/bml1upk14o5re/heap_infobox.jpg' },
+  { 'name': 'G12', 'thumbnail': 'https://media.robertsspaceindustries.com/s7f45fxzm59py/heap_infobox.jpg' },
   { 'name': 'Genesis', 'thumbnail': '/media/iqk7vt4xay0zfr/heap_infobox/Starliner_action1_runwaycompFlat.jpg' },
   { 'name': 'Gladiator', 'thumbnail': '/media/qjmsm4fedkty7r/heap_infobox/Gladiator.png' },
   { 'name': 'Gladius Pirate Edition', 'thumbnail': '/media/mpszlemby5r43r/heap_infobox/Gladius_variant_sale_img.jpg' },
@@ -91,12 +94,12 @@ HangarXPLOR._ships = [
   { 'name': 'Khartu-Al', 'thumbnail': '/media/zzycyqkpn9vu8r/heap_infobox/Image_landed.jpg' },
   { 'name': 'Lightning', 'thumbnail': '/media/vdwks9gq7ch8pr/heap_infobox/Sq42_SneakPeekF8.png' },
   { 'name': 'M50', 'thumbnail': '/media/q1jk89gqz2231r/heap_infobox/Jumppoint-Final-Crop.jpg' },
-  { 'name': 'Mantix', 'thumbnail': 'https://media.robertsspaceindustries.com/y3abkhxhriuvc/heap_infobox.jpg' },
+  { 'name': 'Mantis', 'thumbnail': 'https://media.robertsspaceindustries.com/y3abkhxhriuvc/heap_infobox.jpg' },
   { 'name': 'Merchantman', 'thumbnail': '/media/d8ktckex1ucmrr/heap_infobox/Banu3.jpg' }, // /media/63lxivb7mi3vzr/heap_infobox/Banu_merchantman_side_Version_A.jpg
   { 'name': 'Mercury', 'thumbnail': '/media/irj2hkopf9043r/heap_infobox/Crusader3-Min.jpeg' },
   { 'name': 'MPUV Cargo', 'thumbnail': '/media/czio0bw0x1v6cr/heap_infobox/BatCave_4k_v02right2.jpg' },
   { 'name': 'MPUV Personnel', 'thumbnail': '/media/fgi7cen4bdvzkr/heap_infobox/Landing_v01.jpg' },
-  { 'name': 'Mustang Alpha Vindicator', 'thumbnail': '/iohmvf24h4rsz/heap_infobox.png' },
+  { 'name': 'Mustang Alpha Vindicator', 'thumbnail': 'https://media.robertsspaceindustries.com/iohmvf24h4rsz/heap_infobox.png' },
   { 'name': 'Mustang Alpha', 'thumbnail': '/media/ssh2spko70pz6r/heap_infobox/Alpha-Front.jpg' },
   { 'name': 'Mustang Beta', 'thumbnail': '/media/ltw03c5rli6uwr/heap_infobox/Beta-Front.jpg' },
   { 'name': 'Mustang Delta', 'thumbnail': '/media/dtqy8jpl0f9cbr/heap_infobox/Delta-Front.jpg' },
@@ -109,6 +112,7 @@ HangarXPLOR._ships = [
   { 'name': 'Nox', 'thumbnail': '/media/3y2kl543u5n4qr/heap_infobox/Nox-Left.jpg' },
   { 'name': 'Orion', 'thumbnail': '/media/hfpnkupg7gr6er/heap_infobox/RSI_Orion_Situ1b_150219_GH.jpg' },
   { 'name': 'P-52 Merlin', 'thumbnail': '/media/a9231ysz5cnvor/heap_infobox/Top.jpg' },
+  { 'name': 'P-72 Archimedes Emerald', 'thumbnail': 'https://media.robertsspaceindustries.com/wonpc3ujtlg9k/heap_infobox.jpg' },
   { 'name': 'P-72 Archimedes', 'thumbnail': '/media/xqgbgw3x6o54ir/heap_infobox/Archimedes_Front_01.jpg' },
   { 'name': 'Pioneer', 'thumbnail': '/media/of1es6gu4pa4ir/heap_infobox/Alderin-Landed-Snow-Shot.jpg' },
   { 'name': 'Pisces Expedition', 'thumbnail': 'https://media.robertsspaceindustries.com/kj7oh12zn2f1l/heap_infobox.jpg' },