diff --git a/build/process-population.js b/build/process-population.js
index 3fe26e1f..2c29a6fa 100644
--- a/build/process-population.js
+++ b/build/process-population.js
@@ -23,6 +23,7 @@
     "data/pop-csv/iceberg.csv",
     "data/pop-csv/jungle-of-dread.csv",
     "data/pop-csv/laboratory.csv",
+    "data/pop-csv/labyrinth.csv",
     "data/pop-csv/living-garden.csv",
     "data/pop-csv/lost-city.csv",
     "data/pop-csv/mountain.csv",
@@ -38,6 +39,7 @@
     "data/pop-csv/town-of-gnawnia.csv",
     "data/pop-csv/toxic-spill.csv",
     "data/pop-csv/valour-rift.csv",
+    "data/pop-csv/zokor.csv",
     "data/pop-csv/windmill.csv"
   ];
 
diff --git a/data/pop-csv/labyrinth.csv b/data/pop-csv/labyrinth.csv
new file mode 100644
index 00000000..cc14fc6e
--- /dev/null
+++ b/data/pop-csv/labyrinth.csv
@@ -0,0 +1,204 @@
+"Location","Phase","Cheese","Charm","Attraction Rate","Mouse","Sample Size"
+"Labyrinth","Plain Fealty","Glowing Gruyere","-","26.73%","Drudge",162539
+"Labyrinth","Plain Fealty","Glowing Gruyere","-","22.73%","Masked Pikeman",162539
+"Labyrinth","Plain Fealty","Glowing Gruyere","-","17.88%","Corridor Bruiser",162539
+"Labyrinth","Plain Fealty","Glowing Gruyere","-","15.84%","Lost Legionnaire",162539
+"Labyrinth","Plain Fealty","Glowing Gruyere","-","14.90%","Lost",162539
+"Labyrinth","Plain Fealty","Glowing Gruyere","-","1.92%","Reanimated Carver",162539
+"Labyrinth","Plain Fealty","SB+/Gouda/Brie","-","21.60%","Drudge",56865
+"Labyrinth","Plain Fealty","SB+/Gouda/Brie","-","19.58%","Shadow Stalker",56865
+"Labyrinth","Plain Fealty","SB+/Gouda/Brie","-","18.35%","Masked Pikeman",56865
+"Labyrinth","Plain Fealty","SB+/Gouda/Brie","-","14.36%","Corridor Bruiser",56865
+"Labyrinth","Plain Fealty","SB+/Gouda/Brie","-","12.78%","Lost Legionnaire",56865
+"Labyrinth","Plain Fealty","SB+/Gouda/Brie","-","11.74%","Lost",56865
+"Labyrinth","Plain Fealty","SB+/Gouda/Brie","-","1.60%","Reanimated Carver",56865
+"Labyrinth","Plain Tech","Glowing Gruyere","-","26.79%","RR-8",159179
+"Labyrinth","Plain Tech","Glowing Gruyere","-","22.68%","Ash Golem",159179
+"Labyrinth","Plain Tech","Glowing Gruyere","-","17.85%","Corridor Bruiser",159179
+"Labyrinth","Plain Tech","Glowing Gruyere","-","15.79%","Lost Legionnaire",159179
+"Labyrinth","Plain Tech","Glowing Gruyere","-","14.88%","Lost",159179
+"Labyrinth","Plain Tech","Glowing Gruyere","-","2.00%","Reanimated Carver",159179
+"Labyrinth","Plain Tech","SB+/Gouda/Brie","-","21.62%","RR-8",56176
+"Labyrinth","Plain Tech","SB+/Gouda/Brie","-","19.58%","Shadow Stalker",56176
+"Labyrinth","Plain Tech","SB+/Gouda/Brie","-","17.86%","Ash Golem",56176
+"Labyrinth","Plain Tech","SB+/Gouda/Brie","-","14.39%","Corridor Bruiser",56176
+"Labyrinth","Plain Tech","SB+/Gouda/Brie","-","12.79%","Lost Legionnaire",56176
+"Labyrinth","Plain Tech","SB+/Gouda/Brie","-","12.10%","Lost",56176
+"Labyrinth","Plain Tech","SB+/Gouda/Brie","-","1.65%","Reanimated Carver",56176
+"Labyrinth","Plain Scholar","Glowing Gruyere","-","26.81%","Summoning Scholar",157567
+"Labyrinth","Plain Scholar","Glowing Gruyere","-","22.68%","Sanguinarian",157567
+"Labyrinth","Plain Scholar","Glowing Gruyere","-","18.00%","Corridor Bruiser",157567
+"Labyrinth","Plain Scholar","Glowing Gruyere","-","15.85%","Lost Legionnaire",157567
+"Labyrinth","Plain Scholar","Glowing Gruyere","-","14.68%","Lost",157567
+"Labyrinth","Plain Scholar","Glowing Gruyere","-","1.97%","Reanimated Carver",157567
+"Labyrinth","Plain Scholar","SB+/Gouda/Brie","-","21.38%","Summoning Scholar",54077
+"Labyrinth","Plain Scholar","SB+/Gouda/Brie","-","19.33%","Shadow Stalker",54077
+"Labyrinth","Plain Scholar","SB+/Gouda/Brie","-","18.53%","Sanguinarian",54077
+"Labyrinth","Plain Scholar","SB+/Gouda/Brie","-","13.94%","Corridor Bruiser",54077
+"Labyrinth","Plain Scholar","SB+/Gouda/Brie","-","12.89%","Lost Legionnaire",54077
+"Labyrinth","Plain Scholar","SB+/Gouda/Brie","-","12.31%","Lost",54077
+"Labyrinth","Plain Scholar","SB+/Gouda/Brie","-","1.62%","Reanimated Carver",54077
+"Labyrinth","Superior Fealty","Glowing Gruyere","-","26.88%","Drudge",88713
+"Labyrinth","Superior Fealty","Glowing Gruyere","-","22.75%","Masked Pikeman",88713
+"Labyrinth","Superior Fealty","Glowing Gruyere","-","12.12%","Solemn Soldier",88713
+"Labyrinth","Superior Fealty","Glowing Gruyere","-","9.74%","Corridor Bruiser",88713
+"Labyrinth","Superior Fealty","Glowing Gruyere","-","9.72%","Lost Legionnaire",88713
+"Labyrinth","Superior Fealty","Glowing Gruyere","-","8.05%","Lost",88713
+"Labyrinth","Superior Fealty","Glowing Gruyere","-","7.82%","Mind Tearer",88713
+"Labyrinth","Superior Fealty","Glowing Gruyere","-","2.92%","Reanimated Carver",88713
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","21.61%","Drudge",16610
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","18.71%","Masked Pikeman",16610
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","16.41%","Shadow Stalker",16610
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","10.43%","Solemn Soldier",16610
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","8.86%","Lost Legionnaire",16610
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","8.02%","Corridor Bruiser",16610
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","7.01%","Lost",16610
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","6.63%","Mind Tearer",16610
+"Labyrinth","Superior Fealty","SB+/Gouda/Brie","-","2.32%","Reanimated Carver",16610
+"Labyrinth","Superior Tech","Glowing Gruyere","-","26.79%","RR-8",85552
+"Labyrinth","Superior Tech","Glowing Gruyere","-","22.64%","Ash Golem",85552
+"Labyrinth","Superior Tech","Glowing Gruyere","-","11.80%","Tech Golem",85552
+"Labyrinth","Superior Tech","Glowing Gruyere","-","9.94%","Lost Legionnaire",85552
+"Labyrinth","Superior Tech","Glowing Gruyere","-","9.92%","Corridor Bruiser",85552
+"Labyrinth","Superior Tech","Glowing Gruyere","-","8.03%","Lost",85552
+"Labyrinth","Superior Tech","Glowing Gruyere","-","7.85%","Automated Stone Sentry",85552
+"Labyrinth","Superior Tech","Glowing Gruyere","-","3.02%","Reanimated Carver",85552
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","21.68%","RR-8",14826
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","19.11%","Ash Golem",14826
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","16.55%","Shadow Stalker",14826
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","9.79%","Tech Golem",14826
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","8.82%","Corridor Bruiser",14826
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","8.17%","Lost Legionnaire",14826
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","6.91%","Lost",14826
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","6.72%","Automated Stone Sentry",14826
+"Labyrinth","Superior Tech","SB+/Gouda/Brie","-","2.24%","Reanimated Carver",14826
+"Labyrinth","Superior Scholar","Glowing Gruyere","-","27.06%","Summoning Scholar",85673
+"Labyrinth","Superior Scholar","Glowing Gruyere","-","22.82%","Sanguinarian",85673
+"Labyrinth","Superior Scholar","Glowing Gruyere","-","11.73%","Mystic Guardian",85673
+"Labyrinth","Superior Scholar","Glowing Gruyere","-","10.03%","Lost Legionnaire",85673
+"Labyrinth","Superior Scholar","Glowing Gruyere","-","9.69%","Corridor Bruiser",85673
+"Labyrinth","Superior Scholar","Glowing Gruyere","-","7.89%","Lost",85673
+"Labyrinth","Superior Scholar","Glowing Gruyere","-","7.87%","Mystic Herald",85673
+"Labyrinth","Superior Scholar","Glowing Gruyere","-","2.92%","Reanimated Carver",85673
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","22.29%","Summoning Scholar",14630
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","18.53%","Sanguinarian",14630
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","16.24%","Shadow Stalker",14630
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","10.16%","Mystic Guardian",14630
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","8.56%","Corridor Bruiser",14630
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","8.28%","Lost Legionnaire",14630
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","6.80%","Lost",14630
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","6.76%","Mystic Herald",14630
+"Labyrinth","Superior Scholar","SB+/Gouda/Brie","-","2.38%","Reanimated Carver",14630
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","26.75%","Drudge",22938
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","24.50%","Masked Pikeman",22938
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","17.19%","Dark Templar",22938
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","13.63%","Mind Tearer",22938
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","6.97%","Solemn Soldier",22938
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","4.14%","Corridor Bruiser",22938
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","3.91%","Reanimated Carver",22938
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","1.90%","Lost Legionnaire",22938
+"Labyrinth","Epic Fealty","Glowing Gruyere","-","1.02%","Lost",22938
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","23.15%","Drudge",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","22.31%","Masked Pikeman",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","15.32%","Dark Templar",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","13.20%","Mind Tearer",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","9.31%","Shadow Stalker",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","5.80%","Solemn Soldier",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","4.05%","Reanimated Carver",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","3.61%","Corridor Bruiser",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","1.96%","Lost Legionnaire",2963
+"Labyrinth","Epic Fealty","SB+/Gouda/Brie","-","1.28%","Lost",2963
+"Labyrinth","Epic Tech","Glowing Gruyere","-","26.97%","RR-8",24400
+"Labyrinth","Epic Tech","Glowing Gruyere","-","24.80%","Ash Golem",24400
+"Labyrinth","Epic Tech","Glowing Gruyere","-","16.87%","Fungal Technomorph",24400
+"Labyrinth","Epic Tech","Glowing Gruyere","-","13.66%","Automated Stone Sentry",24400
+"Labyrinth","Epic Tech","Glowing Gruyere","-","6.95%","Tech Golem",24400
+"Labyrinth","Epic Tech","Glowing Gruyere","-","4.05%","Reanimated Carver",24400
+"Labyrinth","Epic Tech","Glowing Gruyere","-","3.74%","Corridor Bruiser",24400
+"Labyrinth","Epic Tech","Glowing Gruyere","-","1.95%","Lost Legionnaire",24400
+"Labyrinth","Epic Tech","Glowing Gruyere","-","1.01%","Lost",24400
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","25.91%","RR-8",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","21.56%","Ash Golem",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","15.36%","Fungal Technomorph",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","12.83%","Automated Stone Sentry",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","9.12%","Shadow Stalker",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","5.43%","Tech Golem",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","3.61%","Reanimated Carver",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","3.40%","Corridor Bruiser",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","1.75%","Lost Legionnaire",2852
+"Labyrinth","Epic Tech","SB+/Gouda/Brie","-","1.02%","Lost",2852
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","26.77%","Summoning Scholar",23643
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","24.68%","Sanguinarian",23643
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","17.03%","Mystic Scholar",23643
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","13.74%","Mystic Herald",23643
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","6.87%","Mystic Guardian",23643
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","4.12%","Corridor Bruiser",23643
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","3.90%","Reanimated Carver",23643
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","1.92%","Lost Legionnaire",23643
+"Labyrinth","Epic Scholar","Glowing Gruyere","-","0.97%","Lost",23643
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","23.75%","Summoning Scholar",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","22.33%","Sanguinarian",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","15.17%","Mystic Scholar",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","13.19%","Mystic Herald",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","10.12%","Shadow Stalker",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","5.55%","Mystic Guardian",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","3.82%","Reanimated Carver",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","3.41%","Corridor Bruiser",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","1.65%","Lost Legionnaire",2669
+"Labyrinth","Epic Scholar","SB+/Gouda/Brie","-","1.01%","Lost",2669
+"Labyrinth","Plain Farming","Glowing Gruyere","-","31.72%","Mush Monster",37781
+"Labyrinth","Plain Farming","Glowing Gruyere","-","21.02%","Lost Legionnaire",37781
+"Labyrinth","Plain Farming","Glowing Gruyere","-","19.93%","Lost",37781
+"Labyrinth","Plain Farming","Glowing Gruyere","-","17.69%","Mushroom Harvester",37781
+"Labyrinth","Plain Farming","Glowing Gruyere","-","4.89%","Corridor Bruiser",37781
+"Labyrinth","Plain Farming","Glowing Gruyere","-","4.76%","Reanimated Carver",37781
+"Labyrinth","Plain Farming","SB+/Gouda/Brie","-","28.46%","Mush Monster",44098
+"Labyrinth","Plain Farming","SB+/Gouda/Brie","-","19.62%","Mushroom Harvester",44098
+"Labyrinth","Plain Farming","SB+/Gouda/Brie","-","16.63%","Lost Legionnaire",44098
+"Labyrinth","Plain Farming","SB+/Gouda/Brie","-","16.21%","Lost",44098
+"Labyrinth","Plain Farming","SB+/Gouda/Brie","-","9.98%","Shadow Stalker",44098
+"Labyrinth","Plain Farming","SB+/Gouda/Brie","-","4.76%","Corridor Bruiser",44098
+"Labyrinth","Plain Farming","SB+/Gouda/Brie","-","4.34%","Reanimated Carver",44098
+"Labyrinth","Plain Treasury","Glowing Gruyere","-","27.74%","Hired Eidolon",37312
+"Labyrinth","Plain Treasury","Glowing Gruyere","-","21.81%","Mimic",37312
+"Labyrinth","Plain Treasury","Glowing Gruyere","-","20.88%","Lost Legionnaire",37312
+"Labyrinth","Plain Treasury","Glowing Gruyere","-","14.98%","Lost",37312
+"Labyrinth","Plain Treasury","Glowing Gruyere","-","12.59%","Corridor Bruiser",37312
+"Labyrinth","Plain Treasury","Glowing Gruyere","-","2.00%","Reanimated Carver",37312
+"Labyrinth","Plain Treasury","SB+/Gouda/Brie","-","22.70%","Hired Eidolon",17306
+"Labyrinth","Plain Treasury","SB+/Gouda/Brie","-","18.17%","Mimic",17306
+"Labyrinth","Plain Treasury","SB+/Gouda/Brie","-","17.81%","Lost Legionnaire",17306
+"Labyrinth","Plain Treasury","SB+/Gouda/Brie","-","15.45%","Shadow Stalker",17306
+"Labyrinth","Plain Treasury","SB+/Gouda/Brie","-","12.96%","Lost",17306
+"Labyrinth","Plain Treasury","SB+/Gouda/Brie","-","10.99%","Corridor Bruiser",17306
+"Labyrinth","Plain Treasury","SB+/Gouda/Brie","-","1.92%","Reanimated Carver",17306
+"Labyrinth","Superior Farming","Glowing Gruyere","-","28.24%","Mushroom Harvester",21423
+"Labyrinth","Superior Farming","Glowing Gruyere","-","25.86%","Nightshade Nanny",21423
+"Labyrinth","Superior Farming","Glowing Gruyere","-","19.87%","Mush Monster",21423
+"Labyrinth","Superior Farming","Glowing Gruyere","-","9.97%","Lost Legionnaire",21423
+"Labyrinth","Superior Farming","Glowing Gruyere","-","8.21%","Lost",21423
+"Labyrinth","Superior Farming","Glowing Gruyere","-","4.75%","Reanimated Carver",21423
+"Labyrinth","Superior Farming","Glowing Gruyere","-","3.10%","Corridor Bruiser",21423
+"Labyrinth","Superior Farming","SB+/Gouda/Brie","-","28.14%","Mushroom Harvester",10643
+"Labyrinth","Superior Farming","SB+/Gouda/Brie","-","23.93%","Nightshade Nanny",10643
+"Labyrinth","Superior Farming","SB+/Gouda/Brie","-","18.68%","Mush Monster",10643
+"Labyrinth","Superior Farming","SB+/Gouda/Brie","-","9.26%","Lost Legionnaire",10643
+"Labyrinth","Superior Farming","SB+/Gouda/Brie","-","7.93%","Lost",10643
+"Labyrinth","Superior Farming","SB+/Gouda/Brie","-","4.60%","Shadow Stalker",10643
+"Labyrinth","Superior Farming","SB+/Gouda/Brie","-","4.55%","Reanimated Carver",10643
+"Labyrinth","Superior Farming","SB+/Gouda/Brie","-","2.90%","Corridor Bruiser",10643
+"Labyrinth","Superior Treasury","Glowing Gruyere","-","29.70%","Mimic",36547
+"Labyrinth","Superior Treasury","Glowing Gruyere","-","20.03%","Hired Eidolon",36547
+"Labyrinth","Superior Treasury","Glowing Gruyere","-","15.03%","Treasure Brawler",36547
+"Labyrinth","Superior Treasury","Glowing Gruyere","-","12.60%","Lost Legionnaire",36547
+"Labyrinth","Superior Treasury","Glowing Gruyere","-","12.00%","Lost",36547
+"Labyrinth","Superior Treasury","Glowing Gruyere","-","7.83%","Corridor Bruiser",36547
+"Labyrinth","Superior Treasury","Glowing Gruyere","-","2.82%","Reanimated Carver",36547
+"Labyrinth","Superior Treasury","SB+/Gouda/Brie","-","26.19%","Mimic",3383
+"Labyrinth","Superior Treasury","SB+/Gouda/Brie","-","17.23%","Hired Eidolon",3383
+"Labyrinth","Superior Treasury","SB+/Gouda/Brie","-","13.42%","Treasure Brawler",3383
+"Labyrinth","Superior Treasury","SB+/Gouda/Brie","-","12.03%","Shadow Stalker",3383
+"Labyrinth","Superior Treasury","SB+/Gouda/Brie","-","11.65%","Lost Legionnaire",3383
+"Labyrinth","Superior Treasury","SB+/Gouda/Brie","-","10.17%","Lost",3383
+"Labyrinth","Superior Treasury","SB+/Gouda/Brie","-","6.68%","Corridor Bruiser",3383
+"Labyrinth","Superior Treasury","SB+/Gouda/Brie","-","2.63%","Reanimated Carver",3383
diff --git a/data/pop-csv/zokor.csv b/data/pop-csv/zokor.csv
new file mode 100644
index 00000000..fff9b985
--- /dev/null
+++ b/data/pop-csv/zokor.csv
@@ -0,0 +1,181 @@
+"Location","Phase","Cheese","Charm","Attraction Rate","Mouse","Sample Size"
+"Zokor","Fealty 15+","Glowing Gruyere","-","36.89%","Masked Pikeman",2109
+"Zokor","Fealty 15+","Glowing Gruyere","-","33.10%","Drudge",2109
+"Zokor","Fealty 15+","Glowing Gruyere","-","20.39%","Reanimated Carver",2109
+"Zokor","Fealty 15+","Glowing Gruyere","-","9.63%","Battle Cleric",2109
+"Zokor","Fealty 15+","SB+/Gouda/Brie","-","30.30%","Masked Pikeman",2436
+"Zokor","Fealty 15+","SB+/Gouda/Brie","-","27.34%","Drudge",2436
+"Zokor","Fealty 15+","SB+/Gouda/Brie","-","20.44%","Shadow Stalker",2436
+"Zokor","Fealty 15+","SB+/Gouda/Brie","-","15.39%","Reanimated Carver",2436
+"Zokor","Fealty 15+","SB+/Gouda/Brie","-","6.53%","Battle Cleric",2436
+"Zokor","Fealty 50+","Glowing Gruyere","-","34.30%","Battle Cleric",3927
+"Zokor","Fealty 50+","Glowing Gruyere","-","30.30%","Sir Fleekio",3927
+"Zokor","Fealty 50+","Glowing Gruyere","-","16.65%","Reanimated Carver",3927
+"Zokor","Fealty 50+","Glowing Gruyere","-","10.06%","Mind Tearer",3927
+"Zokor","Fealty 50+","Glowing Gruyere","-","6.01%","Solemn Soldier",3927
+"Zokor","Fealty 50+","Glowing Gruyere","-","1.35%","Masked Pikeman",3927
+"Zokor","Fealty 50+","Glowing Gruyere","-","1.32%","Drudge",3927
+"Zokor","Fealty 50+","SB+/Gouda/Brie","-","28.33%","Battle Cleric",2457
+"Zokor","Fealty 50+","SB+/Gouda/Brie","-","23.36%","Sir Fleekio",2457
+"Zokor","Fealty 50+","SB+/Gouda/Brie","-","21.65%","Shadow Stalker",2457
+"Zokor","Fealty 50+","SB+/Gouda/Brie","-","12.94%","Reanimated Carver",2457
+"Zokor","Fealty 50+","SB+/Gouda/Brie","-","7.12%","Mind Tearer",2457
+"Zokor","Fealty 50+","SB+/Gouda/Brie","-","5.33%","Solemn Soldier",2457
+"Zokor","Fealty 50+","SB+/Gouda/Brie","-","0.69%","Drudge",2457
+"Zokor","Fealty 50+","SB+/Gouda/Brie","-","0.57%","Masked Pikeman",2457
+"Zokor","Fealty 80+","Glowing Gruyere","-","32.24%","Battle Cleric",104680
+"Zokor","Fealty 80+","Glowing Gruyere","-","28.99%","Sir Fleekio",104680
+"Zokor","Fealty 80+","Glowing Gruyere","-","12.63%","Reanimated Carver",104680
+"Zokor","Fealty 80+","Glowing Gruyere","-","8.77%","Mind Tearer",104680
+"Zokor","Fealty 80+","Glowing Gruyere","-","7.77%","Dark Templar",104680
+"Zokor","Fealty 80+","Glowing Gruyere","-","5.78%","Solemn Soldier",104680
+"Zokor","Fealty 80+","Glowing Gruyere","-","1.85%","Paladin Weapon Master",104680
+"Zokor","Fealty 80+","Glowing Gruyere","-","1.00%","Drudge",104680
+"Zokor","Fealty 80+","Glowing Gruyere","-","0.96%","Masked Pikeman",104680
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","26.29%","Battle Cleric",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","24.33%","Sir Fleekio",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","19.42%","Shadow Stalker",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","9.34%","Reanimated Carver",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","7.23%","Mind Tearer",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","5.90%","Dark Templar",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","4.89%","Solemn Soldier",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","0.95%","Drudge",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","0.85%","Paladin Weapon Master",10696
+"Zokor","Fealty 80+","SB+/Gouda/Brie","-","0.80%","Masked Pikeman",10696
+"Zokor","Scholar 15+","Glowing Gruyere","-","35.91%","Sanguinarian",1760
+"Zokor","Scholar 15+","Glowing Gruyere","-","35.06%","Summoning Scholar",1760
+"Zokor","Scholar 15+","Glowing Gruyere","-","19.72%","Reanimated Carver",1760
+"Zokor","Scholar 15+","Glowing Gruyere","-","9.32%","Ethereal Guardian",1760
+"Zokor","Scholar 15+","SB+/Gouda/Brie","-","27.51%","Sanguinarian",2243
+"Zokor","Scholar 15+","SB+/Gouda/Brie","-","27.33%","Summoning Scholar",2243
+"Zokor","Scholar 15+","SB+/Gouda/Brie","-","20.29%","Shadow Stalker",2243
+"Zokor","Scholar 15+","SB+/Gouda/Brie","-","17.74%","Reanimated Carver",2243
+"Zokor","Scholar 15+","SB+/Gouda/Brie","-","7.13%","Ethereal Guardian",2243
+"Zokor","Scholar 50+","Glowing Gruyere","-","33.59%","Ethereal Guardian",3507
+"Zokor","Scholar 50+","Glowing Gruyere","-","31.00%","Ancient Scribe",3507
+"Zokor","Scholar 50+","Glowing Gruyere","-","17.56%","Reanimated Carver",3507
+"Zokor","Scholar 50+","Glowing Gruyere","-","9.32%","Mystic Herald",3507
+"Zokor","Scholar 50+","Glowing Gruyere","-","6.39%","Mystic Guardian",3507
+"Zokor","Scholar 50+","Glowing Gruyere","-","1.11%","Summoning Scholar",3507
+"Zokor","Scholar 50+","Glowing Gruyere","-","1.03%","Sanguinarian",3507
+"Zokor","Scholar 50+","SB+/Gouda/Brie","-","26.21%","Ethereal Guardian",2266
+"Zokor","Scholar 50+","SB+/Gouda/Brie","-","26.04%","Ancient Scribe",2266
+"Zokor","Scholar 50+","SB+/Gouda/Brie","-","21.40%","Shadow Stalker",2266
+"Zokor","Scholar 50+","SB+/Gouda/Brie","-","12.05%","Reanimated Carver",2266
+"Zokor","Scholar 50+","SB+/Gouda/Brie","-","7.11%","Mystic Herald",2266
+"Zokor","Scholar 50+","SB+/Gouda/Brie","-","5.83%","Mystic Guardian",2266
+"Zokor","Scholar 50+","SB+/Gouda/Brie","-","0.71%","Sanguinarian",2266
+"Zokor","Scholar 50+","SB+/Gouda/Brie","-","0.66%","Summoning Scholar",2266
+"Zokor","Scholar 80+","Glowing Gruyere","-","32.17%","Ethereal Guardian",106744
+"Zokor","Scholar 80+","Glowing Gruyere","-","29.19%","Ancient Scribe",106744
+"Zokor","Scholar 80+","Glowing Gruyere","-","12.50%","Reanimated Carver",106744
+"Zokor","Scholar 80+","Glowing Gruyere","-","8.83%","Mystic Herald",106744
+"Zokor","Scholar 80+","Glowing Gruyere","-","7.72%","Mystic Scholar",106744
+"Zokor","Scholar 80+","Glowing Gruyere","-","5.79%","Mystic Guardian",106744
+"Zokor","Scholar 80+","Glowing Gruyere","-","1.78%","Soul Binder",106744
+"Zokor","Scholar 80+","Glowing Gruyere","-","1.02%","Summoning Scholar",106744
+"Zokor","Scholar 80+","Glowing Gruyere","-","1.01%","Sanguinarian",106744
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","25.97%","Ethereal Guardian",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","23.18%","Ancient Scribe",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","20.15%","Shadow Stalker",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","9.67%","Reanimated Carver",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","7.31%","Mystic Herald",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","6.50%","Mystic Scholar",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","4.91%","Mystic Guardian",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","0.95%","Soul Binder",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","0.69%","Sanguinarian",11005
+"Zokor","Scholar 80+","SB+/Gouda/Brie","-","0.68%","Summoning Scholar",11005
+"Zokor","Tech 15+","Glowing Gruyere","-","34.60%","Ash Golem",1685
+"Zokor","Tech 15+","Glowing Gruyere","-","34.48%","RR-8",1685
+"Zokor","Tech 15+","Glowing Gruyere","-","21.01%","Reanimated Carver",1685
+"Zokor","Tech 15+","Glowing Gruyere","-","9.91%","Exo-Tech",1685
+"Zokor","Tech 15+","SB+/Gouda/Brie","-","30.25%","Ash Golem",2030
+"Zokor","Tech 15+","SB+/Gouda/Brie","-","26.70%","RR-8",2030
+"Zokor","Tech 15+","SB+/Gouda/Brie","-","19.36%","Shadow Stalker",2030
+"Zokor","Tech 15+","SB+/Gouda/Brie","-","16.26%","Reanimated Carver",2030
+"Zokor","Tech 15+","SB+/Gouda/Brie","-","7.44%","Exo-Tech",2030
+"Zokor","Tech 50+","Glowing Gruyere","-","31.75%","Exo-Tech",3468
+"Zokor","Tech 50+","Glowing Gruyere","-","29.30%","Matron of Machinery",3468
+"Zokor","Tech 50+","Glowing Gruyere","-","16.64%","Reanimated Carver",3468
+"Zokor","Tech 50+","Glowing Gruyere","-","13.09%","Automated Stone Sentry",3468
+"Zokor","Tech 50+","Glowing Gruyere","-","5.39%","Tech Golem",3468
+"Zokor","Tech 50+","Glowing Gruyere","-","1.96%","Ash Golem",3468
+"Zokor","Tech 50+","Glowing Gruyere","-","1.87%","RR-8",3468
+"Zokor","Tech 50+","SB+/Gouda/Brie","-","26.02%","Exo-Tech",2294
+"Zokor","Tech 50+","SB+/Gouda/Brie","-","24.28%","Matron of Machinery",2294
+"Zokor","Tech 50+","SB+/Gouda/Brie","-","21.19%","Shadow Stalker",2294
+"Zokor","Tech 50+","SB+/Gouda/Brie","-","11.73%","Reanimated Carver",2294
+"Zokor","Tech 50+","SB+/Gouda/Brie","-","9.63%","Automated Stone Sentry",2294
+"Zokor","Tech 50+","SB+/Gouda/Brie","-","3.79%","Tech Golem",2294
+"Zokor","Tech 50+","SB+/Gouda/Brie","-","1.92%","Ash Golem",2294
+"Zokor","Tech 50+","SB+/Gouda/Brie","-","1.44%","RR-8",2294
+"Zokor","Tech 80+","Glowing Gruyere","-","32.34%","Exo-Tech",106437
+"Zokor","Tech 80+","Glowing Gruyere","-","29.04%","Matron of Machinery",106437
+"Zokor","Tech 80+","Glowing Gruyere","-","12.60%","Reanimated Carver",106437
+"Zokor","Tech 80+","Glowing Gruyere","-","8.67%","Automated Stone Sentry",106437
+"Zokor","Tech 80+","Glowing Gruyere","-","7.77%","Fungal Technomorph",106437
+"Zokor","Tech 80+","Glowing Gruyere","-","5.81%","Tech Golem",106437
+"Zokor","Tech 80+","Glowing Gruyere","-","1.82%","Manaforge Smith",106437
+"Zokor","Tech 80+","Glowing Gruyere","-","1.01%","Ash Golem",106437
+"Zokor","Tech 80+","Glowing Gruyere","-","0.94%","RR-8",106437
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","26.16%","Exo-Tech",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","23.40%","Matron of Machinery",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","20.00%","Shadow Stalker",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","9.29%","Reanimated Carver",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","7.25%","Automated Stone Sentry",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","6.57%","Fungal Technomorph",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","4.69%","Tech Golem",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","1.08%","Manaforge Smith",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","0.81%","RR-8",11063
+"Zokor","Tech 80+","SB+/Gouda/Brie","-","0.74%","Ash Golem",11063
+"Zokor","Farming 0+","Glowing Gruyere","-","34.09%","Mush Monster",2194
+"Zokor","Farming 0+","Glowing Gruyere","-","31.18%","Nightshade Nanny",2194
+"Zokor","Farming 0+","Glowing Gruyere","-","20.01%","Reanimated Carver",2194
+"Zokor","Farming 0+","Glowing Gruyere","-","14.72%","Mushroom Harvester",2194
+"Zokor","Farming 0+","SB+/Gouda/Brie","-","26.15%","Mushroom Harvester",1499
+"Zokor","Farming 0+","SB+/Gouda/Brie","-","22.88%","Nightshade Nanny",1499
+"Zokor","Farming 0+","SB+/Gouda/Brie","-","18.75%","Shadow Stalker",1499
+"Zokor","Farming 0+","SB+/Gouda/Brie","-","16.48%","Mush Monster",1499
+"Zokor","Farming 0+","SB+/Gouda/Brie","-","15.74%","Reanimated Carver",1499
+"Zokor","Farming 50+","Glowing Gruyere","-","38.11%","Mush Monster",39508
+"Zokor","Farming 50+","Glowing Gruyere","-","29.50%","Nightshade Fungalmancer",39508
+"Zokor","Farming 50+","Glowing Gruyere","-","15.79%","Nightshade Nanny",39508
+"Zokor","Farming 50+","Glowing Gruyere","-","15.58%","Reanimated Carver",39508
+"Zokor","Farming 50+","Glowing Gruyere","-","1.02%","Mushroom Harvester",39508
+"Zokor","Farming 50+","SB+/Gouda/Brie","-","31.72%","Mush Monster",6066
+"Zokor","Farming 50+","SB+/Gouda/Brie","-","20.54%","Shadow Stalker",6066
+"Zokor","Farming 50+","SB+/Gouda/Brie","-","17.31%","Nightshade Nanny",6066
+"Zokor","Farming 50+","SB+/Gouda/Brie","-","16.63%","Nightshade Fungalmancer",6066
+"Zokor","Farming 50+","SB+/Gouda/Brie","-","11.64%","Reanimated Carver",6066
+"Zokor","Farming 50+","SB+/Gouda/Brie","-","2.16%","Mushroom Harvester",6066
+"Zokor","Treasure 15+","Glowing Gruyere","-","33.54%","Mimic",7937
+"Zokor","Treasure 15+","Glowing Gruyere","-","25.27%","Hired Eidolon",7937
+"Zokor","Treasure 15+","Glowing Gruyere","-","20.84%","Reanimated Carver",7937
+"Zokor","Treasure 15+","Glowing Gruyere","-","20.35%","Matron of Wealth",7937
+"Zokor","Treasure 15+","SB+/Gouda/Brie","-","26.16%","Mimic",1162
+"Zokor","Treasure 15+","SB+/Gouda/Brie","-","22.55%","Shadow Stalker",1162
+"Zokor","Treasure 15+","SB+/Gouda/Brie","-","18.93%","Hired Eidolon",1162
+"Zokor","Treasure 15+","SB+/Gouda/Brie","-","16.70%","Reanimated Carver",1162
+"Zokor","Treasure 15+","SB+/Gouda/Brie","-","15.66%","Matron of Wealth",1162
+"Zokor","Treasure 50+","Glowing Gruyere","-","49.68%","Molten Midas",50878
+"Zokor","Treasure 50+","Glowing Gruyere","-","15.90%","Reanimated Carver",50878
+"Zokor","Treasure 50+","Glowing Gruyere","-","12.93%","Hired Eidolon",50878
+"Zokor","Treasure 50+","Glowing Gruyere","-","9.50%","Treasure Brawler",50878
+"Zokor","Treasure 50+","Glowing Gruyere","-","7.05%","Matron of Wealth",50878
+"Zokor","Treasure 50+","Glowing Gruyere","-","4.94%","Mimic",50878
+"Zokor","Treasure 50+","SB+/Gouda/Brie","-","40.67%","Molten Midas",2321
+"Zokor","Treasure 50+","SB+/Gouda/Brie","-","19.69%","Shadow Stalker",2321
+"Zokor","Treasure 50+","SB+/Gouda/Brie","-","11.46%","Reanimated Carver",2321
+"Zokor","Treasure 50+","SB+/Gouda/Brie","-","10.60%","Hired Eidolon",2321
+"Zokor","Treasure 50+","SB+/Gouda/Brie","-","8.79%","Treasure Brawler",2321
+"Zokor","Treasure 50+","SB+/Gouda/Brie","-","4.78%","Matron of Wealth",2321
+"Zokor","Treasure 50+","SB+/Gouda/Brie","-","4.01%","Mimic",2321
+"Zokor","Lair - Each 30+","Glowing Gruyere","-","54.52%","Decrepit Tentacle Terror",23007
+"Zokor","Lair - Each 30+","Glowing Gruyere","-","22.88%","Reanimated Carver",23007
+"Zokor","Lair - Each 30+","Glowing Gruyere","-","17.05%","Retired Minotaur",23007
+"Zokor","Lair - Each 30+","Glowing Gruyere","-","5.55%","Corridor Bruiser",23007
+"Zokor","Lair - Each 30+","SB+/Gouda/Brie","-","43.82%","Decrepit Tentacle Terror",5577
+"Zokor","Lair - Each 30+","SB+/Gouda/Brie","-","22.09%","Shadow Stalker",5577
+"Zokor","Lair - Each 30+","SB+/Gouda/Brie","-","16.39%","Reanimated Carver",5577
+"Zokor","Lair - Each 30+","SB+/Gouda/Brie","-","13.43%","Retired Minotaur",5577
+"Zokor","Lair - Each 30+","SB+/Gouda/Brie","-","4.27%","Corridor Bruiser",5577
diff --git a/data/pop-js/labyrinth.js b/data/pop-js/labyrinth.js
new file mode 100644
index 00000000..bd57649e
--- /dev/null
+++ b/data/pop-js/labyrinth.js
@@ -0,0 +1,116 @@
+const utils = require("../_utils");
+
+const allHallsMice = [
+  "Corridor Bruiser",
+  "Lost",
+  "Lost Legionnaire",
+  "Shadow Stalker",
+  "Reanimated Carver"
+]
+
+const districtMice = {
+  Farming: [
+    "Mush Monster",
+    "Mushroom Harvester",
+    "Nightshade Nanny",
+  ],
+  Fealty: [
+    "Dark Templar",
+    "Drudge",
+    "Masked Pikeman",
+    "Mind Tearer",
+    "Solemn Soldier",
+  ],
+  Scholar: [
+    "Mystic Guardian",
+    "Mystic Herald",
+    "Mystic Scholar",
+    "Sanguinarian",
+    "Summoning Scholar",
+  ],
+  Tech: [
+    "Ash Golem",
+    "Automated Stone Sentry",
+    "Fungal Technomorph",
+    "RR-8",
+    "Tech Golem",
+  ],
+  Treasury: [
+    "Hired Eidolon",
+    "Mimic",
+    "Treasure Brawler",
+  ]
+}
+
+function genSeriesObject(qual, hall) {
+  // Returns an array of two series [{}, {}]
+  // First is standard GG query. Seconds is a multi-cheese OR query.
+  return [
+    {
+      cheese: utils.genVarField("cheese", "Glowing Gruyere"),
+      stage: utils.genVarField("stage", `${qual} ${hall}`),
+      config: [
+        {
+          opts: {
+            include: [
+              ...allHallsMice,
+              ...districtMice[hall]
+            ]
+          }
+        }
+      ]
+    },
+    {
+      stage: utils.genVarField("stage", `${qual} ${hall}`),
+      config: [
+        {
+          opts: {
+            include: [
+              ...allHallsMice,
+              ...districtMice[hall]
+            ]
+          },
+          vars: {
+            cheese: {
+              "SB+": true,
+              "Gouda": true,
+              "Brie": true
+            }
+          },
+          fields: {
+            cheese: "SB+/Gouda/Brie"
+          }
+        }
+      ],
+    }
+  ]
+}
+
+function genHallways() {
+
+  // flat(2) because we have two levels of nested arrays due to map
+  const districtsWithEpic = ["Plain", "Superior", "Epic"].map((quality) => {
+    return ["Fealty", "Tech", "Scholar"].map((hallway) => {
+      return genSeriesObject(quality, hallway);
+    })
+  }).flat(2);
+
+  // These don't have an Epic hallway and will cause a query error b/c stage doesn't exist.
+  const nonEpic = ["Plain", "Superior"].map((quality) => {
+    return ["Farming", "Treasury"].map((hallway) => {
+      return genSeriesObject(quality, hallway);
+    })
+  }).flat(2);
+
+  return [
+    ...districtsWithEpic,
+    ...nonEpic
+  ]
+}
+
+module.exports = {
+  default: {
+    location: utils.genVarField("location", "Labyrinth"),
+  },
+  series: genHallways()
+}
diff --git a/data/pop-js/zokor.js b/data/pop-js/zokor.js
new file mode 100644
index 00000000..cd590545
--- /dev/null
+++ b/data/pop-js/zokor.js
@@ -0,0 +1,145 @@
+const utils = require("../_utils");
+
+const allDistrictMice = [
+  "Shadow Stalker",
+  "Reanimated Carver"
+]
+
+const mice = {
+  Farming: [
+    "Mush Monster",
+    "Mushroom Harvester",
+    "Nightshade Fungalmancer",
+    "Nightshade Nanny",
+    "Reanimated Carver",
+    "Shadow Stalker",
+  ],
+  Treasure: [
+    "Hired Eidolon",
+    "Matron of Wealth",
+    "Mimic",
+    "Molten Midas",
+    "Reanimated Carver",
+    "Shadow Stalker",
+    "Treasure Brawler",
+  ],
+  Fealty: [
+    "Battle Cleric",
+    "Dark Templar",
+    "Drudge",
+    "Masked Pikeman",
+    "Mind Tearer",
+    "Paladin Weapon Master",
+    "Reanimated Carver",
+    "Shadow Stalker",
+    "Sir Fleekio",
+    "Solemn Soldier",
+  ],
+  Scholar: [
+    "Ancient Scribe",
+    "Ethereal Guardian",
+    "Mystic Guardian",
+    "Mystic Herald",
+    "Mystic Scholar",
+    "Reanimated Carver",
+    "Sanguinarian",
+    "Shadow Stalker",
+    "Soul Binder",
+    "Summoning Scholar",
+  ],
+  Tech: [
+    "Ash Golem",
+    "Automated Stone Sentry",
+    "Exo-Tech",
+    "Fungal Technomorph",
+    "Manaforge Smith",
+    "Matron of Machinery",
+    "Reanimated Carver",
+    "RR-8",
+    "Shadow Stalker",
+    "Tech Golem",
+  ],
+  Lair: [
+    "Corridor Bruiser",
+    "Decrepit Tentacle Terror",
+    "Retired Minotaur",
+  ]
+}
+
+function genSeriesObject(quality, district) {
+  // Returns an array of two series [{}, {}]
+  // First is standard GG query. Seconds is a multi-cheese OR query.
+  return [
+    {
+      cheese: utils.genVarField("cheese", "Glowing Gruyere"),
+      stage: utils.genVarField("stage", `${district} ${quality}`),
+      config: [
+        {
+          opts: {
+            include: [
+              ...allDistrictMice,
+              ...mice[district]
+            ]
+          }
+        }
+      ]
+    },
+    {
+      stage: utils.genVarField("stage", `${district} ${quality}`),
+      config: [
+        {
+          opts: {
+            include: [
+              ...allDistrictMice,
+              ...mice[district]
+            ]
+          },
+          vars: {
+            cheese: {
+              "SB+": true,
+              "Gouda": true,
+              "Brie": true
+            }
+          },
+          fields: {
+            cheese: "SB+/Gouda/Brie"
+          }
+        }
+      ],
+    }
+  ]
+}
+
+function genDistricts() {
+
+  // flat(2) because we have two levels of nested arrays due to map
+  const levelThreeDistricts = ["Fealty", "Scholar", "Tech"].map(district => {
+    return ["15+", "50+", "80+"].map(quality => {
+      return genSeriesObject(quality, district);
+    })
+  }).flat(2);
+
+  const farmDistrict = ["0+", "50+"].map(q => {
+      return genSeriesObject(q, "Farming");
+  }).flat()
+
+  const treasureDistrict = ["15+", "50+"].map(q => {
+      return genSeriesObject(q, "Treasure");
+  }).flat();
+
+  const minotaur = genSeriesObject("- Each 30+", "Lair");
+
+  return [
+    ...levelThreeDistricts,
+    ...farmDistrict,
+    ...treasureDistrict,
+    ...minotaur
+  ];
+}
+
+module.exports = {
+  default: {
+    location: utils.genVarField("location", "Zokor"),
+  },
+  series: genDistricts()
+}
diff --git a/data/populations.csv b/data/populations.csv
index 20d780f7..01a13c5f 100644
--- a/data/populations.csv
+++ b/data/populations.csv
@@ -1927,209 +1927,6 @@ Labyrinth,Intersection,SB+/Gouda/Brie,-,39.67%,Lost Legionnaire,7450
 Labyrinth,Intersection,SB+/Gouda/Brie,-,35.41%,Lost,
 Labyrinth,Intersection,SB+/Gouda/Brie,-,13.84%,Corridor Bruiser,
 Labyrinth,Intersection,SB+/Gouda/Brie,-,11.09%,Shadow Stalker,
-Labyrinth,Plain Fealty,Glowing Gruyere,-,26.16%,Drudge,34050
-Labyrinth,Plain Fealty,Glowing Gruyere,-,22.68%,Masked Pikeman,
-Labyrinth,Plain Fealty,Glowing Gruyere,-,17.89%,Corridor Bruiser,
-Labyrinth,Plain Fealty,Glowing Gruyere,-,15.78%,Lost Legionnaire,
-Labyrinth,Plain Fealty,Glowing Gruyere,-,15.58%,Lost,
-Labyrinth,Plain Fealty,Glowing Gruyere,-,1.92%,Reanimated Carver,
-Labyrinth,Plain Fealty,SB+/Gouda/Brie,-,21.07%,Drudge,33550
-Labyrinth,Plain Fealty,SB+/Gouda/Brie,-,18.96%,Shadow Stalker,
-Labyrinth,Plain Fealty,SB+/Gouda/Brie,-,18.47%,Masked Pikeman,
-Labyrinth,Plain Fealty,SB+/Gouda/Brie,-,14.78%,Corridor Bruiser,
-Labyrinth,Plain Fealty,SB+/Gouda/Brie,-,12.63%,Lost Legionnaire,
-Labyrinth,Plain Fealty,SB+/Gouda/Brie,-,12.37%,Lost,
-Labyrinth,Plain Fealty,SB+/Gouda/Brie,-,1.71%,Reanimated Carver,
-Labyrinth,Plain Tech,Glowing Gruyere,-,26.94%,RR-8,32850
-Labyrinth,Plain Tech,Glowing Gruyere,-,22.53%,Ash Golem,
-Labyrinth,Plain Tech,Glowing Gruyere,-,17.99%,Corridor Bruiser,
-Labyrinth,Plain Tech,Glowing Gruyere,-,15.49%,Lost Legionnaire,
-Labyrinth,Plain Tech,Glowing Gruyere,-,15.13%,Lost,
-Labyrinth,Plain Tech,Glowing Gruyere,-,1.91%,Reanimated Carver,
-Labyrinth,Plain Tech,SB+/Gouda/Brie,-,21.59%,RR-8,31050
-Labyrinth,Plain Tech,SB+/Gouda/Brie,-,18.73%,Shadow Stalker,
-Labyrinth,Plain Tech,SB+/Gouda/Brie,-,17.99%,Ash Golem,
-Labyrinth,Plain Tech,SB+/Gouda/Brie,-,14.80%,Corridor Bruiser,
-Labyrinth,Plain Tech,SB+/Gouda/Brie,-,12.81%,Lost,
-Labyrinth,Plain Tech,SB+/Gouda/Brie,-,12.53%,Lost Legionnaire,
-Labyrinth,Plain Tech,SB+/Gouda/Brie,-,1.55%,Reanimated Carver,
-Labyrinth,Plain Scholar,Glowing Gruyere,-,26.55%,Summoning Scholar,30750
-Labyrinth,Plain Scholar,Glowing Gruyere,-,22.39%,Sanguinarian,
-Labyrinth,Plain Scholar,Glowing Gruyere,-,18.29%,Corridor Bruiser,
-Labyrinth,Plain Scholar,Glowing Gruyere,-,15.69%,Lost Legionnaire,
-Labyrinth,Plain Scholar,Glowing Gruyere,-,14.97%,Lost,
-Labyrinth,Plain Scholar,Glowing Gruyere,-,2.12%,Reanimated Carver,
-Labyrinth,Plain Scholar,SB+/Gouda/Brie,-,21.34%,Summoning Scholar,30200
-Labyrinth,Plain Scholar,SB+/Gouda/Brie,-,19.04%,Shadow Stalker,
-Labyrinth,Plain Scholar,SB+/Gouda/Brie,-,18.26%,Sanguinarian,
-Labyrinth,Plain Scholar,SB+/Gouda/Brie,-,14.73%,Corridor Bruiser,
-Labyrinth,Plain Scholar,SB+/Gouda/Brie,-,12.55%,Lost,
-Labyrinth,Plain Scholar,SB+/Gouda/Brie,-,12.46%,Lost Legionnaire,
-Labyrinth,Plain Scholar,SB+/Gouda/Brie,-,1.63%,Reanimated Carver,
-Labyrinth,Plain Treasury,Glowing Gruyere,-,27.62%,Hired Eidolon,12900
-Labyrinth,Plain Treasury,Glowing Gruyere,-,21.81%,Mimic,
-Labyrinth,Plain Treasury,Glowing Gruyere,-,20.55%,Lost Legionnaire,
-Labyrinth,Plain Treasury,Glowing Gruyere,-,14.93%,Lost,
-Labyrinth,Plain Treasury,Glowing Gruyere,-,13.27%,Corridor Bruiser,
-Labyrinth,Plain Treasury,Glowing Gruyere,-,1.83%,Reanimated Carver,
-Labyrinth,Plain Treasury,SB+/Gouda/Brie,-,23.29%,Hired Eidolon,11550
-Labyrinth,Plain Treasury,SB+/Gouda/Brie,-,18.55%,Mimic,
-Labyrinth,Plain Treasury,SB+/Gouda/Brie,-,17.90%,Lost Legionnaire,
-Labyrinth,Plain Treasury,SB+/Gouda/Brie,-,14.73%,Shadow Stalker,
-Labyrinth,Plain Treasury,SB+/Gouda/Brie,-,13.03%,Lost,
-Labyrinth,Plain Treasury,SB+/Gouda/Brie,-,11.05%,Corridor Bruiser,
-Labyrinth,Plain Treasury,SB+/Gouda/Brie,-,1.45%,Reanimated Carver,
-Labyrinth,Plain Farming,Glowing Gruyere,-,31.36%,Mush Monster,14400
-Labyrinth,Plain Farming,Glowing Gruyere,-,20.52%,Lost Legionnaire,
-Labyrinth,Plain Farming,Glowing Gruyere,-,20.03%,Lost,
-Labyrinth,Plain Farming,Glowing Gruyere,-,17.75%,Mushroom Harvester,
-Labyrinth,Plain Farming,Glowing Gruyere,-,5.17%,Corridor Bruiser,
-Labyrinth,Plain Farming,Glowing Gruyere,-,5.17%,Reanimated Carver,
-Labyrinth,Plain Farming,SB+/Gouda/Brie,-,27.91%,Mush Monster,30300
-Labyrinth,Plain Farming,SB+/Gouda/Brie,-,18.29%,Lost,
-Labyrinth,Plain Farming,SB+/Gouda/Brie,-,17.69%,Lost Legionnaire,
-Labyrinth,Plain Farming,SB+/Gouda/Brie,-,16.94%,Mushroom Harvester,
-Labyrinth,Plain Farming,SB+/Gouda/Brie,-,10.09%,Shadow Stalker,
-Labyrinth,Plain Farming,SB+/Gouda/Brie,-,4.57%,Corridor Bruiser,
-Labyrinth,Plain Farming,SB+/Gouda/Brie,-,4.51%,Reanimated Carver,
-Labyrinth,Superior Fealty,Glowing Gruyere,-,26.42%,Drudge,14700
-Labyrinth,Superior Fealty,Glowing Gruyere,-,22.74%,Masked Pikeman,
-Labyrinth,Superior Fealty,Glowing Gruyere,-,12.23%,Solemn Soldier,
-Labyrinth,Superior Fealty,Glowing Gruyere,-,10.27%,Corridor Bruiser,
-Labyrinth,Superior Fealty,Glowing Gruyere,-,9.16%,Lost Legionnaire,
-Labyrinth,Superior Fealty,Glowing Gruyere,-,8.53%,Lost,
-Labyrinth,Superior Fealty,Glowing Gruyere,-,7.77%,Mind Tearer,
-Labyrinth,Superior Fealty,Glowing Gruyere,-,2.88%,Reanimated Carver,
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,22.31%,Drudge,6150
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,18.99%,Masked Pikeman,
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,16.09%,Shadow Stalker,
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,9.97%,Solemn Soldier,
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,8.33%,Corridor Bruiser,
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,8.22%,Lost Legionnaire,
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,7.24%,Lost,
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,6.35%,Mind Tearer,
-Labyrinth,Superior Fealty,SB+/Gouda/Brie,-,2.49%,Reanimated Carver,
-Labyrinth,Superior Tech,Glowing Gruyere,-,26.65%,RR-8,14500
-Labyrinth,Superior Tech,Glowing Gruyere,-,22.59%,Ash Golem,
-Labyrinth,Superior Tech,Glowing Gruyere,-,12.10%,Tech Golem,
-Labyrinth,Superior Tech,Glowing Gruyere,-,9.74%,Lost Legionnaire,
-Labyrinth,Superior Tech,Glowing Gruyere,-,9.69%,Corridor Bruiser,
-Labyrinth,Superior Tech,Glowing Gruyere,-,8.70%,Lost,
-Labyrinth,Superior Tech,Glowing Gruyere,-,7.55%,Automated Stone Sentry,
-Labyrinth,Superior Tech,Glowing Gruyere,-,2.98%,Reanimated Carver,
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,22.71%,RR-8,5250
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,19.58%,Ash Golem,
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,15.79%,Shadow Stalker,
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,9.32%,Tech Golem,
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,8.36%,Corridor Bruiser,
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,7.86%,Lost Legionnaire,
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,6.97%,Lost,
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,6.95%,Automated Stone Sentry,
-Labyrinth,Superior Tech,SB+/Gouda/Brie,-,2.46%,Reanimated Carver,
-Labyrinth,Superior Scholar,Glowing Gruyere,-,26.86%,Summoning Scholar,14350
-Labyrinth,Superior Scholar,Glowing Gruyere,-,22.41%,Sanguinarian,
-Labyrinth,Superior Scholar,Glowing Gruyere,-,12.41%,Mystic Guardian,
-Labyrinth,Superior Scholar,Glowing Gruyere,-,10.40%,Corridor Bruiser,
-Labyrinth,Superior Scholar,Glowing Gruyere,-,9.03%,Lost Legionnaire,
-Labyrinth,Superior Scholar,Glowing Gruyere,-,8.16%,Lost,
-Labyrinth,Superior Scholar,Glowing Gruyere,-,7.68%,Mystic Herald,
-Labyrinth,Superior Scholar,Glowing Gruyere,-,3.05%,Reanimated Carver,
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,22.45%,Summoning Scholar,5000
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,19.15%,Sanguinarian,
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,15.94%,Shadow Stalker,
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,9.42%,Mystic Guardian,
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,8.60%,Corridor Bruiser,
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,7.81%,Lost Legionnaire,
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,7.02%,Mystic Herald,
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,7.02%,Lost,
-Labyrinth,Superior Scholar,SB+/Gouda/Brie,-,2.57%,Reanimated Carver,
-Labyrinth,Superior Treasury,Glowing Gruyere,-,29.92%,Mimic,3600
-Labyrinth,Superior Treasury,Glowing Gruyere,-,19.60%,Hired Eidolon,
-Labyrinth,Superior Treasury,Glowing Gruyere,-,15.81%,Treasure Brawler,
-Labyrinth,Superior Treasury,Glowing Gruyere,-,12.13%,Lost Legionnaire,
-Labyrinth,Superior Treasury,Glowing Gruyere,-,11.91%,Lost,
-Labyrinth,Superior Treasury,Glowing Gruyere,-,7.64%,Corridor Bruiser,
-Labyrinth,Superior Treasury,Glowing Gruyere,-,2.98%,Reanimated Carver,
-Labyrinth,Superior Treasury,SB+/Gouda/Brie,-,26.19%,Mimic,8363
-Labyrinth,Superior Treasury,SB+/Gouda/Brie,-,17.59%,Hired Eidolon,
-Labyrinth,Superior Treasury,SB+/Gouda/Brie,-,12.71%,Treasure Brawler,
-Labyrinth,Superior Treasury,SB+/Gouda/Brie,-,12.20%,Shadow Stalker,
-Labyrinth,Superior Treasury,SB+/Gouda/Brie,-,10.75%,Lost Legionnaire,
-Labyrinth,Superior Treasury,SB+/Gouda/Brie,-,10.55%,Lost,
-Labyrinth,Superior Treasury,SB+/Gouda/Brie,-,7.00%,Corridor Bruiser,
-Labyrinth,Superior Treasury,SB+/Gouda/Brie,-,3.03%,Reanimated Carver,
-Labyrinth,Superior Farming,Glowing Gruyere,-,27.62%,Mushroom Harvester,4700
-Labyrinth,Superior Farming,Glowing Gruyere,-,25.55%,Nightshade Nanny,
-Labyrinth,Superior Farming,Glowing Gruyere,-,19.61%,Mush Monster,
-Labyrinth,Superior Farming,Glowing Gruyere,-,10.13%,Lost Legionnaire,
-Labyrinth,Superior Farming,Glowing Gruyere,-,8.51%,Lost,
-Labyrinth,Superior Farming,Glowing Gruyere,-,5.37%,Reanimated Carver,
-Labyrinth,Superior Farming,Glowing Gruyere,-,3.21%,Corridor Bruiser,
-Labyrinth,Superior Farming,SB+/Gouda/Brie,-,26.16%,Mushroom Harvester,3900
-Labyrinth,Superior Farming,SB+/Gouda/Brie,-,24.58%,Nightshade Nanny,
-Labyrinth,Superior Farming,SB+/Gouda/Brie,-,18.88%,Mush Monster,
-Labyrinth,Superior Farming,SB+/Gouda/Brie,-,9.92%,Lost Legionnaire,
-Labyrinth,Superior Farming,SB+/Gouda/Brie,-,7.76%,Lost,
-Labyrinth,Superior Farming,SB+/Gouda/Brie,-,4.92%,Reanimated Carver,
-Labyrinth,Superior Farming,SB+/Gouda/Brie,-,4.51%,Shadow Stalker,
-Labyrinth,Superior Farming,SB+/Gouda/Brie,-,3.28%,Corridor Bruiser,
-Labyrinth,Epic Fealty,Glowing Gruyere,-,27.15%,Drudge,25981
-Labyrinth,Epic Fealty,Glowing Gruyere,-,24.61%,Masked Pikeman,
-Labyrinth,Epic Fealty,Glowing Gruyere,-,16.41%,Dark Templar,
-Labyrinth,Epic Fealty,Glowing Gruyere,-,13.90%,Mind Tearer,
-Labyrinth,Epic Fealty,Glowing Gruyere,-,6.93%,Solemn Soldier,
-Labyrinth,Epic Fealty,Glowing Gruyere,-,4.25%,Corridor Bruiser,
-Labyrinth,Epic Fealty,Glowing Gruyere,-,3.98%,Reanimated Carver,
-Labyrinth,Epic Fealty,Glowing Gruyere,-,1.50%,Lost,
-Labyrinth,Epic Fealty,Glowing Gruyere,-,1.27%,Lost Legionnaire,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,23.99%,Drudge,6085
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,22.50%,Masked Pikeman,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,14.68%,Dark Templar,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,13.39%,Mind Tearer,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,10.16%,Shadow Stalker,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,5.49%,Solemn Soldier,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,3.58%,Corridor Bruiser,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,3.50%,Reanimated Carver,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,1.46%,Lost,
-Labyrinth,Epic Fealty,SB+/Gouda/Brie,-,1.25%,Lost Legionnaire,
-Labyrinth,Epic Tech,Glowing Gruyere,-,26.44%,RR-8,27858
-Labyrinth,Epic Tech,Glowing Gruyere,-,25.54%,Ash Golem,
-Labyrinth,Epic Tech,Glowing Gruyere,-,16.77%,Fungal Technomorph,
-Labyrinth,Epic Tech,Glowing Gruyere,-,13.77%,Automated Stone Sentry,
-Labyrinth,Epic Tech,Glowing Gruyere,-,6.93%,Tech Golem,
-Labyrinth,Epic Tech,Glowing Gruyere,-,4.02%,Reanimated Carver,
-Labyrinth,Epic Tech,Glowing Gruyere,-,3.91%,Corridor Bruiser,
-Labyrinth,Epic Tech,Glowing Gruyere,-,1.36%,Lost Legionnaire,
-Labyrinth,Epic Tech,Glowing Gruyere,-,1.25%,Lost,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,24.20%,RR-8,6305
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,21.71%,Ash Golem,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,14.80%,Fungal Technomorph,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,12.97%,Automated Stone Sentry,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,9.94%,Shadow Stalker,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,6.01%,Tech Golem,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,3.90%,Corridor Bruiser,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,3.43%,Reanimated Carver,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,1.68%,Lost Legionnaire,
-Labyrinth,Epic Tech,SB+/Gouda/Brie,-,1.35%,Lost,
-Labyrinth,Epic Scholar,Glowing Gruyere,-,26.46%,Summoning Scholar,25523
-Labyrinth,Epic Scholar,Glowing Gruyere,-,24.87%,Sanguinarian,
-Labyrinth,Epic Scholar,Glowing Gruyere,-,16.91%,Mystic Scholar,
-Labyrinth,Epic Scholar,Glowing Gruyere,-,13.99%,Mystic Herald,
-Labyrinth,Epic Scholar,Glowing Gruyere,-,6.92%,Mystic Guardian,
-Labyrinth,Epic Scholar,Glowing Gruyere,-,4.08%,Corridor Bruiser,
-Labyrinth,Epic Scholar,Glowing Gruyere,-,4.03%,Reanimated Carver,
-Labyrinth,Epic Scholar,Glowing Gruyere,-,1.39%,Lost,
-Labyrinth,Epic Scholar,Glowing Gruyere,-,1.34%,Lost Legionnaire,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,24.50%,Summoning Scholar,5846
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,22.39%,Sanguinarian,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,14.81%,Mystic Scholar,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,12.01%,Mystic Herald,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,9.15%,Shadow Stalker,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,6.36%,Mystic Guardian,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,4.53%,Corridor Bruiser,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,3.68%,Reanimated Carver,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,1.44%,Lost Legionnaire,
-Labyrinth,Epic Scholar,SB+/Gouda/Brie,-,1.13%,Lost,
 Lagoon,-,Wicked Gnarly,-,26.89%,Water Nymph,135644
 Lagoon,-,Wicked Gnarly,-,13.39%,Hydra,
 Lagoon,-,Wicked Gnarly,-,11.72%,Centaur,
@@ -3531,239 +3328,6 @@ Whisker Woods Rift,Monstrous Black Widow,Lactrodectus Lancashire,-,0.31%,Fungal
 Whisker Woods Rift,Monstrous Black Widow,Lactrodectus Lancashire,-,0.29%,Cranky Caterpillar,
 Whisker Woods Rift,Monstrous Black Widow,Lactrodectus Lancashire,-,0.29%,Centaur Ranger,
 Whisker Woods Rift,Monstrous Black Widow,Lactrodectus Lancashire,-,0.27%,Cyclops Barbarian,
-Zokor,Tech Foundry Outskirts,Glowing Gruyere,-,37.18%,Ash Golem,5723
-Zokor,Tech Foundry Outskirts,Glowing Gruyere,-,33.23%,RR-8,
-Zokor,Tech Foundry Outskirts,Glowing Gruyere,-,20.71%,Reanimated Carver,
-Zokor,Tech Foundry Outskirts,Glowing Gruyere,-,8.88%,Exo-Tech,
-Zokor,Tech Foundry Outskirts,SB+/Gouda,-,29.94%,Ash Golem,10093
-Zokor,Tech Foundry Outskirts,SB+/Gouda,-,27.66%,RR-8,
-Zokor,Tech Foundry Outskirts,SB+/Gouda,-,19.00%,Shadow Stalker,
-Zokor,Tech Foundry Outskirts,SB+/Gouda,-,16.59%,Reanimated Carver,
-Zokor,Tech Foundry Outskirts,SB+/Gouda,-,6.81%,Exo-Tech,
-Zokor,Tech Research Center,Glowing Gruyere,-,33.48%,Exo-Tech,13849
-Zokor,Tech Research Center,Glowing Gruyere,-,30.13%,Matron of Machinery,
-Zokor,Tech Research Center,Glowing Gruyere,-,14.74%,Reanimated Carver,
-Zokor,Tech Research Center,Glowing Gruyere,-,12.37%,Automated Stone Sentry,
-Zokor,Tech Research Center,Glowing Gruyere,-,4.85%,Tech Golem,
-Zokor,Tech Research Center,Glowing Gruyere,-,2.25%,RR-8,
-Zokor,Tech Research Center,Glowing Gruyere,-,2.19%,Ash Golem,
-Zokor,Tech Research Center,SB+/Gouda,-,25.71%,Exo-Tech,10720
-Zokor,Tech Research Center,SB+/Gouda,-,24.51%,Matron of Machinery,
-Zokor,Tech Research Center,SB+/Gouda,-,20.66%,Shadow Stalker,
-Zokor,Tech Research Center,SB+/Gouda,-,11.90%,Reanimated Carver,
-Zokor,Tech Research Center,SB+/Gouda,-,10.12%,Automated Stone Sentry,
-Zokor,Tech Research Center,SB+/Gouda,-,3.82%,Tech Golem,
-Zokor,Tech Research Center,SB+/Gouda,-,1.78%,RR-8,
-Zokor,Tech Research Center,SB+/Gouda,-,1.50%,Ash Golem,
-Zokor,Manaforge,Glowing Gruyere,-,32.55%,Exo-Tech,116089
-Zokor,Manaforge,Glowing Gruyere,-,29.50%,Matron of Machinery,
-Zokor,Manaforge,Glowing Gruyere,-,11.89%,Reanimated Carver,
-Zokor,Manaforge,Glowing Gruyere,-,8.81%,Automated Stone Sentry,
-Zokor,Manaforge,Glowing Gruyere,-,7.78%,Fungal Technomorph,
-Zokor,Manaforge,Glowing Gruyere,-,5.83%,Tech Golem,
-Zokor,Manaforge,Glowing Gruyere,-,1.66%,Manaforge Smith,
-Zokor,Manaforge,Glowing Gruyere,-,0.99%,Ash Golem,
-Zokor,Manaforge,Glowing Gruyere,-,0.99%,RR-8,
-Zokor,Manaforge,SB+,-,26.20%,Exo-Tech,11475
-Zokor,Manaforge,SB+,-,23.94%,Matron of Machinery,
-Zokor,Manaforge,SB+,-,19.49%,Shadow Stalker,
-Zokor,Manaforge,SB+,-,9.67%,Reanimated Carver,
-Zokor,Manaforge,SB+,-,7.27%,Automated Stone Sentry,
-Zokor,Manaforge,SB+,-,6.01%,Fungal Technomorph,
-Zokor,Manaforge,SB+,-,4.77%,Tech Golem,
-Zokor,Manaforge,SB+,-,1.12%,Manaforge Smith,
-Zokor,Manaforge,SB+,-,0.78%,Ash Golem,
-Zokor,Manaforge,SB+,-,0.75%,RR-8,
-Zokor,Manaforge,Gouda,-,26.16%,Exo-Tech,16406
-Zokor,Manaforge,Gouda,-,23.40%,Matron of Machinery,
-Zokor,Manaforge,Gouda,-,20.20%,Shadow Stalker,
-Zokor,Manaforge,Gouda,-,9.42%,Reanimated Carver,
-Zokor,Manaforge,Gouda,-,7.09%,Automated Stone Sentry,
-Zokor,Manaforge,Gouda,-,6.21%,Fungal Technomorph,
-Zokor,Manaforge,Gouda,-,4.74%,Tech Golem,
-Zokor,Manaforge,Gouda,-,1.08%,Manaforge Smith,
-Zokor,Manaforge,Gouda,-,0.85%,Ash Golem,
-Zokor,Manaforge,Gouda,-,0.85%,RR-8,
-Zokor,Neophyte Scholar Study,Glowing Gruyere,-,36.19%,Sanguinarian,6206
-Zokor,Neophyte Scholar Study,Glowing Gruyere,-,34.74%,Summoning Scholar,
-Zokor,Neophyte Scholar Study,Glowing Gruyere,-,20.14%,Reanimated Carver,
-Zokor,Neophyte Scholar Study,Glowing Gruyere,-,8.93%,Ethereal Guardian,
-Zokor,Neophyte Scholar Study,SB+/Gouda,-,28.43%,Summoning Scholar,9661
-Zokor,Neophyte Scholar Study,SB+/Gouda,-,28.15%,Sanguinarian,
-Zokor,Neophyte Scholar Study,SB+/Gouda,-,19.94%,Shadow Stalker,
-Zokor,Neophyte Scholar Study,SB+/Gouda,-,16.40%,Reanimated Carver,
-Zokor,Neophyte Scholar Study,SB+/Gouda,-,7.08%,Ethereal Guardian,
-Zokor,Master Scholar Auditorium,Glowing Gruyere,-,35.04%,Ethereal Guardian,13883
-Zokor,Master Scholar Auditorium,Glowing Gruyere,-,31.78%,Ancient Scribe,
-Zokor,Master Scholar Auditorium,Glowing Gruyere,-,15.30%,Reanimated Carver,
-Zokor,Master Scholar Auditorium,Glowing Gruyere,-,9.41%,Mystic Herald,
-Zokor,Master Scholar Auditorium,Glowing Gruyere,-,6.26%,Mystic Guardian,
-Zokor,Master Scholar Auditorium,Glowing Gruyere,-,1.17%,Summoning Scholar,
-Zokor,Master Scholar Auditorium,Glowing Gruyere,-,1.04%,Sanguinarian,
-Zokor,Master Scholar Auditorium,SB+/Gouda,-,27.11%,Ethereal Guardian,10645
-Zokor,Master Scholar Auditorium,SB+/Gouda,-,25.38%,Ancient Scribe,
-Zokor,Master Scholar Auditorium,SB+/Gouda,-,21.38%,Shadow Stalker,
-Zokor,Master Scholar Auditorium,SB+/Gouda,-,12.45%,Reanimated Carver,
-Zokor,Master Scholar Auditorium,SB+/Gouda,-,7.12%,Mystic Herald,
-Zokor,Master Scholar Auditorium,SB+/Gouda,-,4.91%,Mystic Guardian,
-Zokor,Master Scholar Auditorium,SB+/Gouda,-,0.85%,Sanguinarian,
-Zokor,Master Scholar Auditorium,SB+/Gouda,-,0.80%,Summoning Scholar,
-Zokor,Dark Library,Glowing Gruyere,-,32.49%,Ethereal Guardian,109581
-Zokor,Dark Library,Glowing Gruyere,-,29.63%,Ancient Scribe,
-Zokor,Dark Library,Glowing Gruyere,-,11.75%,Reanimated Carver,
-Zokor,Dark Library,Glowing Gruyere,-,9.00%,Mystic Herald,
-Zokor,Dark Library,Glowing Gruyere,-,7.73%,Mystic Scholar,
-Zokor,Dark Library,Glowing Gruyere,-,5.80%,Mystic Guardian,
-Zokor,Dark Library,Glowing Gruyere,-,1.67%,Soul Binder,
-Zokor,Dark Library,Glowing Gruyere,-,0.99%,Summoning Scholar,
-Zokor,Dark Library,Glowing Gruyere,-,0.94%,Sanguinarian,
-Zokor,Dark Library,SB+,-,25.71%,Ethereal Guardian,10722
-Zokor,Dark Library,SB+,-,23.91%,Ancient Scribe,
-Zokor,Dark Library,SB+,-,19.97%,Shadow Stalker,
-Zokor,Dark Library,SB+,-,9.49%,Reanimated Carver,
-Zokor,Dark Library,SB+,-,7.36%,Mystic Herald,
-Zokor,Dark Library,SB+,-,6.21%,Mystic Scholar,
-Zokor,Dark Library,SB+,-,4.67%,Mystic Guardian,
-Zokor,Dark Library,SB+,-,1.06%,Soul Binder,
-Zokor,Dark Library,SB+,-,0.86%,Summoning Scholar,
-Zokor,Dark Library,SB+,-,0.76%,Sanguinarian,
-Zokor,Dark Library,Gouda,-,25.79%,Ethereal Guardian,16126
-Zokor,Dark Library,Gouda,-,23.81%,Ancient Scribe,
-Zokor,Dark Library,Gouda,-,20.03%,Shadow Stalker,
-Zokor,Dark Library,Gouda,-,9.43%,Reanimated Carver,
-Zokor,Dark Library,Gouda,-,6.85%,Mystic Herald,
-Zokor,Dark Library,Gouda,-,6.51%,Mystic Scholar,
-Zokor,Dark Library,Gouda,-,4.90%,Mystic Guardian,
-Zokor,Dark Library,Gouda,-,1.07%,Soul Binder,
-Zokor,Dark Library,Gouda,-,0.82%,Sanguinarian,
-Zokor,Dark Library,Gouda,-,0.79%,Summoning Scholar,
-Zokor,Outer Fealty Shrine,Glowing Gruyere,-,36.52%,Masked Pikeman,6834
-Zokor,Outer Fealty Shrine,Glowing Gruyere,-,34.08%,Drudge,
-Zokor,Outer Fealty Shrine,Glowing Gruyere,-,20.40%,Reanimated Carver,
-Zokor,Outer Fealty Shrine,Glowing Gruyere,-,9.00%,Battle Cleric,
-Zokor,Outer Fealty Shrine,SB+/Gouda,-,29.80%,Masked Pikeman,9913
-Zokor,Outer Fealty Shrine,SB+/Gouda,-,26.70%,Drudge,
-Zokor,Outer Fealty Shrine,SB+/Gouda,-,20.64%,Shadow Stalker,
-Zokor,Outer Fealty Shrine,SB+/Gouda,-,15.44%,Reanimated Carver,
-Zokor,Outer Fealty Shrine,SB+/Gouda,-,7.41%,Battle Cleric,
-Zokor,Inner Fealty Temple,Glowing Gruyere,-,34.88%,Battle Cleric,13425
-Zokor,Inner Fealty Temple,Glowing Gruyere,-,31.46%,Sir Fleekio,
-Zokor,Inner Fealty Temple,Glowing Gruyere,-,15.59%,Reanimated Carver,
-Zokor,Inner Fealty Temple,Glowing Gruyere,-,9.65%,Mind Tearer,
-Zokor,Inner Fealty Temple,Glowing Gruyere,-,6.44%,Solemn Soldier,
-Zokor,Inner Fealty Temple,Glowing Gruyere,-,1.02%,Drudge,
-Zokor,Inner Fealty Temple,Glowing Gruyere,-,0.96%,Masked Pikeman,
-Zokor,Inner Fealty Temple,SB+/Gouda,-,27.86%,Battle Cleric,11096
-Zokor,Inner Fealty Temple,SB+/Gouda,-,25.36%,Sir Fleekio,
-Zokor,Inner Fealty Temple,SB+/Gouda,-,20.49%,Shadow Stalker,
-Zokor,Inner Fealty Temple,SB+/Gouda,-,12.43%,Reanimated Carver,
-Zokor,Inner Fealty Temple,SB+/Gouda,-,7.52%,Mind Tearer,
-Zokor,Inner Fealty Temple,SB+/Gouda,-,4.73%,Solemn Soldier,
-Zokor,Inner Fealty Temple,SB+/Gouda,-,0.82%,Drudge,
-Zokor,Inner Fealty Temple,SB+/Gouda,-,0.79%,Masked Pikeman,
-Zokor,Templar's Sanctum,Glowing Gruyere,-,32.47%,Battle Cleric,109582
-Zokor,Templar's Sanctum,Glowing Gruyere,-,29.48%,Sir Fleekio,
-Zokor,Templar's Sanctum,Glowing Gruyere,-,11.60%,Reanimated Carver,
-Zokor,Templar's Sanctum,Glowing Gruyere,-,8.87%,Mind Tearer,
-Zokor,Templar's Sanctum,Glowing Gruyere,-,7.96%,Dark Templar,
-Zokor,Templar's Sanctum,Glowing Gruyere,-,5.97%,Solemn Soldier,
-Zokor,Templar's Sanctum,Glowing Gruyere,-,1.69%,Paladin Weapon Master,
-Zokor,Templar's Sanctum,Glowing Gruyere,-,0.99%,Masked Pikeman,
-Zokor,Templar's Sanctum,Glowing Gruyere,-,0.96%,Drudge,
-Zokor,Templar's Sanctum,SB+,-,26.46%,Battle Cleric,11273
-Zokor,Templar's Sanctum,SB+,-,23.20%,Sir Fleekio,
-Zokor,Templar's Sanctum,SB+,-,19.42%,Shadow Stalker,
-Zokor,Templar's Sanctum,SB+,-,9.50%,Reanimated Carver,
-Zokor,Templar's Sanctum,SB+,-,6.93%,Mind Tearer,
-Zokor,Templar's Sanctum,SB+,-,6.64%,Dark Templar,
-Zokor,Templar's Sanctum,SB+,-,4.85%,Solemn Soldier,
-Zokor,Templar's Sanctum,SB+,-,1.24%,Paladin Weapon Master,
-Zokor,Templar's Sanctum,SB+,-,0.90%,Drudge,
-Zokor,Templar's Sanctum,SB+,-,0.86%,Masked Pikeman,
-Zokor,Templar's Sanctum,Gouda,-,25.94%,Battle Cleric,16642
-Zokor,Templar's Sanctum,Gouda,-,24.31%,Sir Fleekio,
-Zokor,Templar's Sanctum,Gouda,-,19.66%,Shadow Stalker,
-Zokor,Templar's Sanctum,Gouda,-,9.34%,Reanimated Carver,
-Zokor,Templar's Sanctum,Gouda,-,7.14%,Mind Tearer,
-Zokor,Templar's Sanctum,Gouda,-,6.45%,Dark Templar,
-Zokor,Templar's Sanctum,Gouda,-,4.49%,Solemn Soldier,
-Zokor,Templar's Sanctum,Gouda,-,1.14%,Paladin Weapon Master,
-Zokor,Templar's Sanctum,Gouda,-,0.78%,Masked Pikeman,
-Zokor,Templar's Sanctum,Gouda,-,0.75%,Drudge,
-Zokor,Treasure Room,Glowing Gruyere,-,35.54%,Mimic,12442
-Zokor,Treasure Room,Glowing Gruyere,-,25.19%,Hired Eidolon,
-Zokor,Treasure Room,Glowing Gruyere,-,20.05%,Matron of Wealth,
-Zokor,Treasure Room,Glowing Gruyere,-,19.22%,Reanimated Carver,
-Zokor,Treasure Room,SB+/Gouda,-,27.89%,Mimic,5074
-Zokor,Treasure Room,SB+/Gouda,-,20.46%,Shadow Stalker,
-Zokor,Treasure Room,SB+/Gouda,-,19.89%,Hired Eidolon,
-Zokor,Treasure Room,SB+/Gouda,-,16.00%,Reanimated Carver,
-Zokor,Treasure Room,SB+/Gouda,-,15.77%,Matron of Wealth,
-Zokor,Treasure Vault,Glowing Gruyere,-,49.98%,Molten Midas,39686
-Zokor,Treasure Vault,Glowing Gruyere,-,14.92%,Reanimated Carver,
-Zokor,Treasure Vault,Glowing Gruyere,-,13.09%,Hired Eidolon,
-Zokor,Treasure Vault,Glowing Gruyere,-,10.19%,Treasure Brawler,
-Zokor,Treasure Vault,Glowing Gruyere,-,6.96%,Matron of Wealth,
-Zokor,Treasure Vault,Glowing Gruyere,-,4.85%,Mimic,
-Zokor,Treasure Vault,SB+,-,39.94%,Molten Midas,2792
-Zokor,Treasure Vault,SB+,-,20.67%,Shadow Stalker,
-Zokor,Treasure Vault,SB+,-,11.68%,Reanimated Carver,
-Zokor,Treasure Vault,SB+,-,10.03%,Hired Eidolon,
-Zokor,Treasure Vault,SB+,-,8.49%,Treasure Brawler,
-Zokor,Treasure Vault,SB+,-,5.12%,Matron of Wealth,
-Zokor,Treasure Vault,SB+,-,4.08%,Mimic,
-Zokor,Treasure Vault,Gouda,-,41.52%,Molten Midas,2953
-Zokor,Treasure Vault,Gouda,-,18.96%,Shadow Stalker,
-Zokor,Treasure Vault,Gouda,-,11.95%,Reanimated Carver,
-Zokor,Treasure Vault,Gouda,-,10.26%,Hired Eidolon,
-Zokor,Treasure Vault,Gouda,-,7.82%,Treasure Brawler,
-Zokor,Treasure Vault,Gouda,-,5.22%,Matron of Wealth,
-Zokor,Treasure Vault,Gouda,-,4.27%,Mimic,
-Zokor,Farming Garden,Glowing Gruyere,-,34.96%,Mush Monster,6513
-Zokor,Farming Garden,Glowing Gruyere,-,31.41%,Nightshade Nanny,
-Zokor,Farming Garden,Glowing Gruyere,-,19.10%,Reanimated Carver,
-Zokor,Farming Garden,Glowing Gruyere,-,14.52%,Mushroom Harvester,
-Zokor,Farming Garden,SB+,-,24.16%,Nightshade Nanny,1250
-Zokor,Farming Garden,SB+,-,23.92%,Mushroom Harvester,
-Zokor,Farming Garden,SB+,-,17.52%,Shadow Stalker,
-Zokor,Farming Garden,SB+,-,17.20%,Reanimated Carver,
-Zokor,Farming Garden,SB+,-,17.20%,Mush Monster,
-Zokor,Farming Garden,Gouda,-,26.21%,Mushroom Harvester,6029
-Zokor,Farming Garden,Gouda,-,20.57%,Shadow Stalker,
-Zokor,Farming Garden,Gouda,-,20.35%,Nightshade Nanny,
-Zokor,Farming Garden,Gouda,-,17.00%,Mush Monster,
-Zokor,Farming Garden,Gouda,-,15.87%,Reanimated Carver,
-Zokor,Overgrown Farmhouse,Glowing Gruyere,-,37.97%,Mush Monster,95259
-Zokor,Overgrown Farmhouse,Glowing Gruyere,-,30.02%,Nightshade Fungalmancer,
-Zokor,Overgrown Farmhouse,Glowing Gruyere,-,16.00%,Nightshade Nanny,
-Zokor,Overgrown Farmhouse,Glowing Gruyere,-,15.01%,Reanimated Carver,
-Zokor,Overgrown Farmhouse,Glowing Gruyere,-,0.99%,Mushroom Harvester,
-Zokor,Overgrown Farmhouse,SB+,-,30.88%,Mush Monster,6470
-Zokor,Overgrown Farmhouse,SB+,-,19.80%,Shadow Stalker,
-Zokor,Overgrown Farmhouse,SB+,-,18.13%,Nightshade Nanny,
-Zokor,Overgrown Farmhouse,SB+,-,16.72%,Nightshade Fungalmancer,
-Zokor,Overgrown Farmhouse,SB+,-,11.98%,Reanimated Carver,
-Zokor,Overgrown Farmhouse,SB+,-,2.49%,Mushroom Harvester,
-Zokor,Overgrown Farmhouse,Gouda,-,31.12%,Mush Monster,16335
-Zokor,Overgrown Farmhouse,Gouda,-,20.35%,Shadow Stalker,
-Zokor,Overgrown Farmhouse,Gouda,-,17.73%,Nightshade Nanny,
-Zokor,Overgrown Farmhouse,Gouda,-,16.65%,Nightshade Fungalmancer,
-Zokor,Overgrown Farmhouse,Gouda,-,11.64%,Reanimated Carver,
-Zokor,Overgrown Farmhouse,Gouda,-,2.50%,Mushroom Harvester,
-Zokor,Lair of the Minotaur,Glowing Gruyere,-,54.31%,Decrepit Tentacle Terror,14184
-Zokor,Lair of the Minotaur,Glowing Gruyere,-,21.24%,Reanimated Carver,
-Zokor,Lair of the Minotaur,Glowing Gruyere,-,18.89%,Retired Minotaur,
-Zokor,Lair of the Minotaur,Glowing Gruyere,-,5.56%,Corridor Bruiser,
-Zokor,Lair of the Minotaur,SB+,-,42.28%,Decrepit Tentacle Terror,2900
-Zokor,Lair of the Minotaur,SB+,-,21.14%,Shadow Stalker,
-Zokor,Lair of the Minotaur,SB+,-,17.48%,Reanimated Carver,
-Zokor,Lair of the Minotaur,SB+,-,15.59%,Retired Minotaur,
-Zokor,Lair of the Minotaur,SB+,-,3.52%,Corridor Bruiser,
-Zokor,Lair of the Minotaur,Gouda,-,42.60%,Decrepit Tentacle Terror,8542
-Zokor,Lair of the Minotaur,Gouda,-,21.01%,Shadow Stalker,
-Zokor,Lair of the Minotaur,Gouda,-,17.50%,Reanimated Carver,
-Zokor,Lair of the Minotaur,Gouda,-,15.17%,Retired Minotaur,
-Zokor,Lair of the Minotaur,Gouda,-,3.71%,Corridor Bruiser,
 Zugzwang's Tower,Technic Pawn Pincher,SB+,-,87.88%,Technic Pawn,23213
 Zugzwang's Tower,Technic Pawn Pincher,SB+,-,12.12%,Mystic Pawn,
 Zugzwang's Tower,Technic Pawn Pincher,Gouda,-,87.52%,Technic Pawn,49560
diff --git a/package.json b/package.json
index 411bda1d..e0df4214 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "pop:harbour": "node data/pop harbour > data/pop-csv/harbour.csv",
     "pop:jod": "node data/pop jungle-of-dread > data/pop-csv/jungle-of-dread.csv",
     "pop:lab": "node data/pop laboratory > data/pop-csv/laboratory.csv",
-    "!pop:laby": "node data/pop labyrinth > data/pop-csv/labyrinth.csv",
+    "pop:laby": "node data/pop labyrinth > data/pop-csv/labyrinth.csv",
     "pop:living": "node data/pop living-garden > data/pop-csv/living-garden.csv",
     "pop:lost": "node data/pop lost-city > data/pop-csv/lost-city.csv",
     "pop:mopi": "node data/pop moussu-picchu > data/pop-csv/moussu-picchu.csv",
@@ -42,6 +42,7 @@
     "pop:toxic": "node data/pop toxic-spill > data/pop-csv/toxic-spill.csv",
     "pop:vrift": "node data/pop valour-rift > data/pop-csv/valour-rift.csv",
     "pop:warpath": "node data/pop warpath > data/pop-csv/fiery-warpath.csv",
+    "pop:zokor": "node data/pop zokor > data/pop-csv/zokor.csv",
     "pop:windmill": "node data/pop windmill > data/pop-csv/windmill.csv",
     "pop": "npm-run-all --parallel pop:*",
     "\n-- MINIFICATION --": "",
diff --git a/src/bookmarklet/bm-cre.js b/src/bookmarklet/bm-cre.js
index 83f78516..8c6b18ab 100644
--- a/src/bookmarklet/bm-cre.js
+++ b/src/bookmarklet/bm-cre.js
@@ -275,25 +275,16 @@
       var district_tier = quest.district_tier;
 
       if (contains(districtname, "Minotaur")) {
-        return "Lair of the Minotaur";
+        return "Lair - Each 30+";
+      } else if (district_type == "Treasury") {
+        var tiers = ["15+", "50+"]
+        return `Treasure ${tiers[district_tier - 1]}`
+      } else if (district_type == "Farming") {
+        var tiers = ["0", "50+"]
+        return `Farming ${tiers[district_tier - 1]}`
       } else {
-        var districts = {
-          Tech: ["Tech Foundry Outskirts", "Tech Research Center", "Manaforge"],
-          Scholar: [
-            "Neophyte Scholar Study",
-            "Master Scholar Auditorium",
-            "Dark Library"
-          ],
-          Fealty: [
-            "Outer Fealty Shrine",
-            "Inner Fealty Temple",
-            "Templar's Sanctum"
-          ],
-          Treasury: ["Treasure Room", "Treasure Vault"],
-          Farming: ["Farming Garden", "Overgrown Farmhouse"]
-        };
-
-        return districts[district_type][district_tier - 1];
+        var tiers = ["15+", "50+", "80+"]
+        return `${district_type} ${tiers[district_tier - 1]}`
       }
     } else if (userLocation === "Furoma Rift") {
       if (userQuests["QuestRiftFuroma"]["droid"]["charge_level"]) {
diff --git a/src/bookmarklet/bm-setup-fields.js b/src/bookmarklet/bm-setup-fields.js
index 2865b88f..ca2a56f8 100644
--- a/src/bookmarklet/bm-setup-fields.js
+++ b/src/bookmarklet/bm-setup-fields.js
@@ -264,25 +264,16 @@
       var district_tier = quest.district_tier;
 
       if (contains(districtname, "Minotaur")) {
-        return "Lair of the Minotaur";
+        return "Lair - Each 30+";
+      } else if (district_type == "Treasury") {
+        var tiers = ["15+", "50+"]
+        return `Treasure ${tiers[district_tier - 1]}`
+      } else if (district_type == "Farming") {
+        var tiers = ["0", "50+"]
+        return `Farming ${tiers[district_tier - 1]}`
       } else {
-        var districts = {
-          Tech: ["Tech Foundry Outskirts", "Tech Research Center", "Manaforge"],
-          Scholar: [
-            "Neophyte Scholar Study",
-            "Master Scholar Auditorium",
-            "Dark Library"
-          ],
-          Fealty: [
-            "Outer Fealty Shrine",
-            "Inner Fealty Temple",
-            "Templar's Sanctum"
-          ],
-          Treasury: ["Treasure Room", "Treasure Vault"],
-          Farming: ["Farming Garden", "Overgrown Farmhouse"]
-        };
-
-        return districts[district_type][district_tier - 1];
+        var tiers = ["15+", "50+", "80+"]
+        return `${district_type} ${tiers[district_tier - 1]}`
       }
     } else if (userLocation === "Furoma Rift") {
       if (userQuests["QuestRiftFuroma"]["droid"]["charge_level"]) {