diff --git a/data/mods/Aftershock/maps/mapgen/freight_transport.json b/data/mods/Aftershock/maps/mapgen/freight_transport.json
index 92b5ea1275ca8..9949a85d6531a 100644
--- a/data/mods/Aftershock/maps/mapgen/freight_transport.json
+++ b/data/mods/Aftershock/maps/mapgen/freight_transport.json
@@ -11,17 +11,17 @@
         "                                                ",
         "                                                ",
         "       ñññññññññññ                              ",
-        "       -_-_-  -__-   ññññññ      ñññññññ        ",
-        "     ---Foj----II--- -_- --!--   -__-__-        ",
-        "   ---yh...U-LL..qq---I---...-----G.H.G--       ",
-        "   #.#yh.,ss-E...,.....q-l...l-22-G.,.G----     ",
-        "   ---B.....!..f-_---..q-l...l-..---1---hc_     ",
-        "     --!--ee-,hS_3!.1,..!..,..-....5..!.,c_     ",
-        "   ---$.$----..f-_---7.q-l....!....,..--hc_     ",
+        "       -)-)-  -))-   ññññññ      ñññññññ        ",
+        "     ---Foj----II--- -)- --!--   -))-))-        ",
+        "   ---yh...U-LL..qq---I---...-----ä.â.ä--       ",
+        "   #.#yh.,ss-E...,.....q-l...l-éé-ä.,.ä----     ",
+        "   ---á.....!..f-)---..q-l...l-..---1---hc)     ",
+        "     --!--ee-,h❺)ê!.1,..!..,..-....5..!.,c)     ",
+        "   ---S.S----..f-)---7.q-l....!....,..--hc)     ",
         "   #.#.,.-OP-E...,.....q-l....-6f4....f----     ",
-        "   ---$$.!,i-LL..qq---I---...-----fL.fE--       ",
-        "     ---w-T----II--- -_- --!--   -__-__-        ",
-        "       -_-_-  -__-   ññññññ      ñññññññ        ",
+        "   ---SS.!,❸-LL..qq---I---...-----fL.fE--       ",
+        "     ---W-~----II--- -)- --!--   -))-))-        ",
+        "       -)-)-  -))-   ññññññ      ñññññññ        ",
         "       ñññññññññññ                              ",
         "                                                ",
         "                                                ",
@@ -31,39 +31,30 @@
         "                                                ",
         "                                                "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_habitat_residential_furnishing" ],
-      "terrain": {
-        "ñ": "t_afs_broken_treads",
-        "1": "t_door_metal_locked",
-        "_": "t_reinforced_glass_shutter_open",
-        "3": "t_nuclear_reactor"
-      },
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_mech_furnishing",
+        "afs_habitat_residential_furnishing",
+        "afs_habitat_life_support"
+      ],
+      "terrain": { "ñ": "t_afs_broken_treads", "1": "t_door_metal_locked", "ê": "t_nuclear_reactor" },
       "furniture": {
         "I": "f_sealed_intermodal_crate",
-        "$": "f_sleep_pod",
-        "e": "f_entertainment_center",
         "4": "f_monomolecularsaw",
         "6": "f_3dprinter",
-        "2": "f_drone_recharge_station",
-        "H": "f_exo_gantry",
-        "G": "f_rack",
-        "B": "f_bookcase",
-        "T": "f_habitat_bathroom",
-        "S": "f_atmospheric_control",
-        "i": "f_water_heater",
-        "w": "f_habitat_storage_board"
+        "é": "f_drone_recharge_station",
+        "â": "f_exo_gantry",
+        "ä": "f_rack",
+        "á": "f_bookcase"
       },
-      "liquids": { "i": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
       "place_item": [ { "item": "television", "repeat": 1, "x": 10, "y": 10 } ],
       "items": {
-        "3": { "item": "nuclear_reactor" },
-        "2": { "item": "old_industrial_bot_storage", "chance": 20 },
-        "H": { "item": "afs_exosuit_worker", "chance": 60 },
-        "G": { "item": "afs_civilian_armory", "chance": 80, "repeat": [ 1, 3 ] },
+        "ê": { "item": "nuclear_reactor" },
+        "é": { "item": "old_industrial_bot_storage", "chance": 20 },
+        "â": { "item": "afs_exosuit_worker", "chance": 60 },
+        "ä": { "item": "afs_civilian_armory", "chance": 80, "repeat": [ 1, 3 ] },
         "I": { "item": "afs_crate_civ_rand" },
-        "B": { "item": "homebooks", "repeat": [ 2, 3 ] },
-        "F": { "item": "afs_old_food_storage", "chance": 60 },
-        "w": { "item": "afs_colonist_outfit", "chance": 60 }
+        "á": { "item": "homebooks", "repeat": [ 2, 3 ] }
       },
       "place_monster": [
         { "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 7, 23 ], "y": [ 7, 13 ], "pack_size": [ 1, 4 ], "chance": 40 },
diff --git a/data/mods/Aftershock/maps/mapgen/general_store.json b/data/mods/Aftershock/maps/mapgen/general_store.json
index c5f14a4c54abc..173b9fc0cf3e0 100644
--- a/data/mods/Aftershock/maps/mapgen/general_store.json
+++ b/data/mods/Aftershock/maps/mapgen/general_store.json
@@ -9,64 +9,54 @@
         "                        ",
         "    /////               ",
         "   //nn.!               ",
-        "   /L.,.!               ",
-        "   /L.../   A           ",
+        "   /l.'.!               ",
+        "   /l.../   5           ",
         "  ///!!//=/////=/////   ",
-        "  /.......nllll.nBBB//  ",
-        "  /..,......,.....,..#  ",
-        "  =.......neeee.nttt//  ",
-        "  =.......ngggg.nppp/   ",
-        "  /ccccc....,.....,.=   ",
-        "  /..,.C./ffff//+//+/   ",
-        "  /nrrr/+//////,./,./   ",
-        "  //////..ge.i/nb/nb/   ",
-        "  /.,.+..,ge,I///////   ",
-        "  #.s./p..ge...+,.<//   ",
-        "  /$DD/p......//////    ",
-        "  /////p...Iii/         ",
-        "  ''''//111////         ",
-        "  '''''''''''''         ",
-        "  '''''''''''''         ",
-        "   '''''''''''          ",
+        "  /.......nllll.nâââ//  ",
+        "  /..'......'.....'..#  ",
+        "  =.......néééé.nííí//  ",
+        "  =.......nêêêê.näää/   ",
+        "  /jjjjj....'.....'.=   ",
+        "  /..'.J./áááá//+//+/   ",
+        "  /nííí/+//////'./'./   ",
+        "  //////..êé.3/n~/n~/   ",
+        "  /.'.+..'êé'4///////   ",
+        "  #.s./ä..êé...+'.<//   ",
+        "  /2kk/ä......//////    ",
+        "  /////ä...433/         ",
+        "  °°°°//111////         ",
+        "  °°°°°°°°°°°°°         ",
+        "  °°°°°°°°°°°°°         ",
+        "   °°°°°°°°°°°          ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure" ],
-      "terrain": { "'": "t_thconc_floor_no_roof", "1": "t_door_metal_locked", "A": "t_atm", ",": "t_metal_floor_olight_inactive" },
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing" ],
+      "terrain": { "1": "t_door_metal_locked", "5": "t_atm" },
       "//": "An Electronic safe would be prefered but the gunsafe furniture is hardcoded to say do you want to hack this gunsafe?",
       "furniture": {
+        "â": "f_bookcase",
+        "á": "f_display_fridge",
+        "ä": "f_rack",
+        "é": "f_rack",
+        "ê": "f_rack",
+        "ë": "f_rack",
+        "í": "f_rack",
         "s": "f_stool",
-        "y": "f_table",
-        "b": "f_habitat_bathroom",
-        "r": "f_rack",
-        "$": "f_safe_l",
-        "L": "f_locker",
-        "c": "f_counter",
-        "C": "f_counter_gate_c",
-        "D": "f_desk",
-        "R": "f_warehouse_shelf",
-        "B": "f_bookcase",
-        "f": "f_display_fridge",
-        "n": "f_screenmirror",
-        "I": "f_sealed_intermodal_crate",
-        "i": "f_intermodal_crate_open",
-        "p": "f_rack",
-        "e": "f_rack",
-        "g": "f_rack",
-        "l": "f_rack",
-        "t": "f_rack"
+        "2": "f_safe_l",
+        "3": "f_intermodal_crate_open",
+        "4": "f_sealed_intermodal_crate"
       },
       "items": {
-        "B": { "item": "magazines", "chance": 80, "repeat": [ 1, 5 ] },
-        "p": { "item": "softdrugs", "chance": 80, "repeat": [ 1, 4 ] },
-        "e": { "item": "consumer_electronics", "chance": 60, "repeat": [ 1, 3 ] },
-        "L": { "item": "afs_frontier_cryo_g", "chance": 50 },
-        "g": { "item": "afs_old_food_storage", "chance": 60, "repeat": [ 1, 2 ] },
-        "$": { "item": "afs_cash_safe" },
-        "f": { "item": "afs_old_beverage_storage", "chance": 60, "repeat": [ 1, 5 ] },
-        "l": { "item": "afs_frontier_cryo_g", "chance": 40 },
-        "t": { "item": "tools_common_small", "chance": 70, "repeat": [ 1, 3 ] },
-        "r": { "item": "afs_tools_structural_repair", "chance": 25, "repeat": [ 1, 2 ] }
+        "á": { "item": "afs_old_beverage_storage", "chance": 60, "repeat": [ 1, 5 ] },
+        "â": { "item": "magazines", "chance": 80, "repeat": [ 1, 5 ] },
+        "ä": { "item": "softdrugs", "chance": 80, "repeat": [ 1, 4 ] },
+        "é": { "item": "consumer_electronics", "chance": 60, "repeat": [ 1, 3 ] },
+        "ê": { "item": "afs_old_food_storage", "chance": 60, "repeat": [ 1, 2 ] },
+        "ë": { "item": "tools_common_small", "chance": 70, "repeat": [ 1, 3 ] },
+        "í": { "item": "afs_tools_structural_repair", "chance": 25, "repeat": [ 1, 2 ] },
+        "2": { "item": "afs_cash_safe" },
+        "4": { "item": "afs_crate_civ_rand" }
       },
       "place_loot": [ { "group": "afs_register_random", "x": [ 3, 6 ], "y": 10, "repeat": 1 } ],
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ],
@@ -81,51 +71,35 @@
       "fill_ter": "t_metal_floor",
       "rows": [
         "                        ",
-        "    '''''               ",
-        "   ''''''               ",
-        "   ''''''               ",
-        "   ''''''               ",
-        "  '''''''''''''''''''   ",
-        "  ''//=////==///==//''  ",
-        "  '//kk/B..h.h..vqq//'  ",
-        "  '/$.h/B..yyy.....d/'  ",
-        "  '/y,.+...yyy...,.U=   ",
-        "  '/$.W/...h.h./foUU/   ",
-        "  '/////ch..,..//////   ",
-        "  '/y.W/.rrrrr..+.b/'   ",
-        "  '/$,.+.rsssr.l/wP/'   ",
-        "  '/..h/.rrrrr.//////   ",
-        "  '//kk/..eee..+,.>//   ",
-        "  ''//=//!//////////    ",
-        "  ''''''/.,SO/'         ",
-        "      ''//#///'         ",
+        "    ££££££              ",
+        "   £££££££              ",
+        "   £££££££              ",
+        "   £££££££              ",
+        "  £££££££££££££££££££   ",
+        "  ££//=////==///==//££  ",
+        "  £//kk/á..h.h..vqq//£  ",
+        "  £/S.h/á..yyy.....2/£  ",
+        "  £/y'.+...yyy...'.U=   ",
+        "  £/S.W/...h.h./Fojj/   ",
+        "  £/////ch..'..//////   ",
+        "  £/y.W/.11111..+'~/£   ",
+        "  £/S'.+.1sss1.l/❹❸/£   ",
+        "  £/..h/.11111.//////   ",
+        "  £//kk/..eee..+'.>//   ",
+        "  ££//=//!//////////    ",
+        "  £££££/.'❺❶/£          ",
+        "      ££//#///£         ",
         "                        ",
         "                        ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_residential_furnishing" ],
-      "terrain": { " ": "t_open_air", "'": "t_flat_roof", "r": "t_carpet_red", ",": "t_metal_floor_olight_inactive" },
-      "furniture": {
-        "b": "f_habitat_bathroom",
-        "e": "f_entertainment_center",
-        "d": "f_dishwasher",
-        "$": "f_sleep_pod",
-        "B": "f_bookcase",
-        "f": "f_fridge",
-        "w": "f_water_heater",
-        "P": "f_water_purifier",
-        "O": "f_ECU",
-        "S": "f_atmospheric_control"
-      },
-      "liquids": { "w": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
+      "palettes": [ "afs_habitat_structure", "afs_habitat_residential_furnishing", "afs_habitat_life_support", "afs_habitat_exterior" ],
+      "terrain": { " ": "t_open_air", "1": "t_carpet_red" },
+      "furniture": { "2": "f_dishwasher", "á": "f_bookcase" },
       "place_item": [ { "item": "television", "repeat": 1, "x": 11, "y": 15 } ],
-      "items": {
-        "B": { "item": "homebooks", "repeat": [ 2, 3 ] },
-        "f": { "item": "afs_old_food_storage", "chance": 60 },
-        "q": { "item": "afs_old_food_storage", "chance": 60 }
-      },
+      "items": { "á": { "item": "homebooks", "repeat": [ 2, 3 ] }, "q": { "item": "afs_old_food_storage", "chance": 60 } },
       "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 } ]
     }
   },
diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json
index 254a0502ad881..f8b4b831250cf 100644
--- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json
+++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json
@@ -6,32 +6,40 @@
     "object": {
       "fill_ter": "t_metal_floor",
       "rows": [
-        " ¢¢¢¢  ¢  ¢¢¢ '' '''  '''''''  ''' '''  ''''  ' ",
-        " ¢   ¢ ¢¢¢ ¢¢ '__'///______///_/' '/_///____/// ",
-        " ¢¢ ¢¢ ¢¢   ¢¢'__'/±/======/±/__'''__/±/====/±/ ",
-        "  ¢¢£¢¢ ¢£¢ ¢¢'__'/±±±±±±±±±±////!////±±±±±±±±/ ",
-        " ¢ ¢£¢ ¢ £¢¢ ¢' ''=±±±±±±±±±±±±/.,./±±±±±±±±±±= ",
-        " ¢ ¢£  ¢¢    ¢'__'=±±±±±±±±±±±±/.../±±±±±±±±±±= ",
-        "  ¢ £¢¢ ¢£¢ ¢¢'__'/±±±±±±±±±±±±//!//±±±±±±±±±±/ ",
-        " ¢ ¢£¢  ¢ ¢¢¢ '__'/±±±±±±±±±±±±/...!±±±±±±±±±±/ ",
-        " ¢¢¢£¢¢ ¢£¢ ¢¢'  '/±±±±±/////!!/.../////////!// ",
-        " ''' ' '' '''' ' '/±±±±±!±±±/...,,./^&/^&/±±±±/ ",
-        " ''''  ' '  ' '''</±±±±±/±±±/...__./,./,./±±±±/ ",
-        " ///=/////=/////=////////////...__.//://:///:// ",
-        " /@@..:~/f.@@/@@..:~/f.@@/V.....,,......../±±±/ ",
-        " #j.,f///o,.j/j.,o///o,.j/5............5bb/±±±/ ",
-        " /yh.o/~:..hy/hy.f/~:..hy/V...b//:////://////// ",
-        " ///://///://///://///:///....b/...../../sD/sD/ ",
-        " =<....,...........,..........5/...../......../ ",
-        " =<....,...........,..........//...../5..yy.yy= ",
-        " ///://///://///://///:////////....../b,.yy,yy= ",
-        " /hy.f/~:..hy/hy..:~/o.hy/.........../b......./ ",
-        " #j.,o///o,.j/j.,f///f,.j/.........../©./sD/sD/ ",
-        " /@@..:~/f.@@/@@.o/~:..@@//////////////#/////// ",
+        " ¢¢¢¢  ¢  ¢¢¢ ©© ©©©  ©©©©©©©  ©©© ©©©  ©©©©  © ",
+        " ¢   ¢ ¢¢¢ ¢¢ ©℗℗©///℗℗℗℗℗℗///℗/© ©/℗///℗℗℗℗/// ",
+        " ¢¢ ¢¢ ¢¢   ¢¢©℗℗©/{/======/{/℗℗©©©℗℗/{/====/{/ ",
+        "  ¢¢†¢¢ ¢†¢ ¢¢©℗℗©/{{{{{{{{{{////!////{{{{{{{{/ ",
+        " ¢ ¢†¢ ¢ †¢¢ ¢© ©©={{{{{{{{{{{{/.'./{{{{{{{{{{= ",
+        " ¢ ¢†  ¢¢    ¢©℗℗©={{{{{{{{{{{{/.../{{{{{{{{{{= ",
+        "  ¢ †¢¢ ¢†¢ ¢¢©℗℗©/{{{{{{{{{{{{//!//{{{{{{{{{{/ ",
+        " ¢ ¢†¢  ¢ ¢¢¢ ©℗℗©/{{{{{{{{{{{{/...!{{{{{{{{{{/ ",
+        " ¢¢¢†¢¢ ¢†¢ ¢¢©  ©/{{{{{/////!!/.../////////!// ",
+        " ©©© © ©© ©©©© © ©/{{{{{!{{{/...''./^&/^&/{{{{/ ",
+        " ©©©©  © ©  © ©©©</{{{{{/{{{/...℗℗./'./'./{{{{/ ",
+        " ///=/////=/////=////////////...℗℗.//://:///:// ",
+        " /SS..:~/F.SS/SS..:~/F.SS/V.....''......../{{{/ ",
+        " #W.'F///o'.W/W.'o///o'.W/p............pbb/{{{/ ",
+        " /yh.o/~:..hy/hy.F/~:..hy/V...b//:////://////// ",
+        " ///://///://///://///:///....b/...../../12/12/ ",
+        " =<....'...........'..........p/...../......../ ",
+        " =<....'...........'..........//...../p..yy.yy= ",
+        " ///://///://///://///:////////....../b'.yy'yy= ",
+        " /hy.F/~:..hy/hy..:~/o.hy/.........../b......./ ",
+        " #W.'o///o'.W/W.'F///F'.W/.........../3./12/12/ ",
+        " /SS..:~/F.SS/SS.o/~:..SS//////////////#/////// ",
         " ///=/////=/////=/////=///<                     ",
         "                                                "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_block", "afs_habblock_1_paramter_palette" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_residential_furnishing",
+        "afs_habblock_1_paramter_palette"
+      ],
+      "terrain": { "3": "t_atm" },
+      "furniture": { "1": "f_washer", "2": "f_dryer" },
+      "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true } },
       "place_nested": [
         { "chunks": [ { "param": "variant", "fallback": "afs_habblock_1_slot1_cafe_a1" } ], "x": 0, "y": 0 },
         {
@@ -84,32 +92,38 @@
       "fill_ter": "t_metal_floor",
       "rows": [
         "                                                ",
-        "                  +++      +++       +++    +++ ",
-        "                  +°++++++++™+       +°++++++°+ ",
-        "                  +°™°°°°™™™°+++++++++™°°°°™™°+ ",
-        "                  +/////°°™°°°°°™™™°°°°°™°°™°°+ ",
-        "                  +/~/~/™°°°™°°™°°™°™°°™™™™°°°+ ",
-        "                  +/:/:/°°°°°™™™°°°°°™°°™°°°°°+ ",
-        "                  +/.,.:°™°°°°™™°°°°™™°°°™°°™°+ ",
-        "                  +/////™™°°°™°°™°™°°™™™™™°°°°+ ",
-        "                [[+°°°°™™™°°™°™°°°™™°°™™™°°™°°+ ",
-        " [[[[[[[[[[[[[[[[>+°°°°°™°°°°™™°°°™°°°°™°°°™°°+ ",
-        " ///=/////=/////=/////////!//°°°°°°™°°°°°°°°°°+ ",
-        " /@@..:~/f.@@/@@..:~/f.@@/,./°°°°°™™™°°™°°°™°°+ ",
-        " #j.,f///o,.j/j.,o///o,.j/!//#//™°°™™°°°°°™™°°+ ",
-        " /yh.o/~:..hy/yh.f/~:..hy/.5/ca/™°°°™°°°°™™™°°+ ",
-        " ///://///://///://///:///,./../°°°°°™°°°°°™°°+ ",
-        " =>.....,...........,......./,./°°°™™™™°°°°°°°+ ",
-        " =>....5,...........,.......†..#°™°°™°°°°°™°°°+ ",
-        " ///://///://///://///://////.c/™™™°°°°™°™™™™™+ ",
-        " /yh.f/~:..hy/hy.o/~:..hy/.,..w/°™™™°°™™°°°™°°+ ",
-        " #j.,o///o,.j/j.,f///f,.j/EA.W//°™°°°°°™°°°™°°+ ",
-        " /@@..:~/f.@@/@@..:~/o.@@///#//++++++++++++++++ ",
-        " ///=/////=/////=/////=///>[[                   ",
-        " [[[[[[[[[[[[[[[[[[[[[[[[[[[                    "
+        "                  [[[      [[[       [[[    [[[ ",
+        "                  [°[[[[[[[[™[       [°[[[[[[°[ ",
+        "                  [°™°°°°™™™°[[[[[[[[[™°°°°™™°[ ",
+        "                  [/////°°™°°°°°™™™°°°°°™°°™°°[ ",
+        "                  [/~/~/™°°°™°°™°°™°™°°™™™™°°°[ ",
+        "                  [/:/:/°°°°°™™™°°°°°™°°™°°°°°[ ",
+        "                  [/.'.:°™°°°°™™°°°°™™°°°™°°™°[ ",
+        "                  [/////™™°°°™°°™°™°°™™™™™°°°°[ ",
+        "                $$[°°°°™™™°°™°™°°°™™°°™™™°°™°°[ ",
+        " $$$$$$$$$$$$$$$$>[°°°°°™°°°°™™°°°™°°°°™°°°™°°[ ",
+        " ///=/////=/////=/////////!//°°°°°°™°°°°°°°°°°[ ",
+        " /SS..:~/F.SS/SS..:~/F.SS/'./°°°°°™™™°°™°°°™°°[ ",
+        " #W.'F///o'.W/W.'o///o'.W/!//#//™°°™™°°°°°™™°°[ ",
+        " /yh.o/~:..hy/yh.F/~:..hy/.p/❸❹/™°°°™°°°°™™™°°[ ",
+        " ///://///://///://///:///'./../°°°°°™°°°°°™°°[ ",
+        " =>.....'...........'......./'./°°°™™™™°°°°°°°[ ",
+        " =>....p'...........'.......1..#°™°°™°°°°°™°°°[ ",
+        " ///://///://///://///://////.c/™™™°°°°™°™™™™™[ ",
+        " /yh.F/~:..hy/hy.o/~:..hy/.'..❷/°™™™°°™™°°°™°°[ ",
+        " #W.'o///o'.W/W.'F///F'.W/❶❺.❻//°™°°°°°™°°°™°°[ ",
+        " /SS..:~/F.SS/SS..:~/o.SS///#//[[[[[[[[[[[[[[[[ ",
+        " ///=/////=/////=/////=///>$$                   ",
+        " $$$$$$$$$$$$$$$$$$$$$$$$$$$                    "
+      ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_residential_furnishing",
+        "afs_habitat_life_support",
+        "afs_habblock_1_paramter_palette"
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_block", "afs_habblock_1_paramter_palette" ],
-      "terrain": { " ": "t_open_air" },
+      "terrain": { " ": "t_open_air", "1": "t_afs_door_metal_elocked" },
       "place_nested": [
         {
           "chunks": [
@@ -185,12 +199,12 @@
         "                        ",
         "                    hyh ",
         "                    hyh ",
-        "                     ★  ",
+        "                     ;  ",
         "                        ",
         "                     h h",
-        "                   cCCCC",
-        "                     ★  ",
-        "                   ffoCC",
+        "                   Jjjjj",
+        "                     ;  ",
+        "                   FFojj",
         "                        ",
         "                        ",
         "                        ",
@@ -205,7 +219,8 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ]
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { ";": "t_linoleum_white_olight_inactive" }
     }
   },
   {
@@ -220,12 +235,12 @@
         "                        ",
         "                    hyh ",
         "                    hyh ",
-        "                     ★  ",
+        "                     ;  ",
         "                     hyh",
         "                     hyh",
         "                   :////",
-        "                     ★  ",
-        "                   ffooC",
+        "                     ;  ",
+        "                   FFooj",
         "                        ",
         "                        ",
         "                        ",
@@ -240,8 +255,8 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "/": "t_wall_prefab_metal", ":": "t_door_c" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "/": "t_wall_prefab_metal", ":": "t_door_c", ";": "t_linoleum_white_olight_inactive" }
     }
   },
   {
@@ -256,11 +271,11 @@
         "                        ",
         "hyh                     ",
         "hyh   h                 ",
-        "    /★c                 ",
+        "    /;c                 ",
         " hyh/                   ",
         " hyh/                   ",
         "                        ",
-        "  ★                     ",
+        "  ;                     ",
         " ááá                    ",
         "                        ",
         "                        ",
@@ -276,8 +291,10 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "/": "t_wall_prefab_metal" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "/": "t_wall_prefab_metal", ";": "t_linoleum_white_olight_inactive" },
+      "furniture": { "á": "f_rack" },
+      "items": { "á": { "item": "afs_old_food_storage", "chance": 40, "repeat": [ 1, 3 ] } }
     }
   },
   {
@@ -292,11 +309,11 @@
         "    y                   ",
         "hyh h                   ",
         "hyh   h                 ",
-        "     ★y                 ",
+        "     ;y                 ",
         "      h                 ",
         " hyh                    ",
         "                        ",
-        "  ★                     ",
+        "  ;                     ",
         " ááá                    ",
         "                        ",
         "                        ",
@@ -312,7 +329,10 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ]
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { ";": "t_linoleum_white_olight_inactive" },
+      "furniture": { "á": "f_rack" },
+      "items": { "á": { "item": "afs_old_food_storage", "chance": 40, "repeat": [ 1, 3 ] } }
     }
   },
   {
@@ -326,15 +346,15 @@
         "                        ",
         "              n      n  ",
         "                        ",
-        "            ááá á  CgC  ",
-        "              ★ á ★C n  ",
-        "            ááá n  Châ  ",
-        "                   C â  ",
+        "            ááá á  jJj  ",
+        "              ; á ;j n  ",
+        "            ááá n  châ  ",
+        "                   j â  ",
         "                        ",
-        "                  á ★á  ",
+        "                  á ;á  ",
         "                  á  á  ",
         "                        ",
-        "                    ★h  ",
+        "                    ;h  ",
         "                   $kc  ",
         "                        ",
         "                        ",
@@ -347,7 +367,14 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ]
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { ";": "t_linoleum_white_olight_inactive" },
+      "furniture": { "$": "f_safe_l", "á": "f_rack", "â": "f_rack" },
+      "items": {
+        "$": { "item": "afs_cash_safe" },
+        "á": { "item": "afs_old_food_storage", "chance": 40, "repeat": [ 1, 3 ] },
+        "â": { "item": "afs_tools_electric_repair", "chance": 60, "repeat": [ 1, 3 ] }
+      }
     }
   },
   {
@@ -361,15 +388,15 @@
         "                        ",
         "              H      H  ",
         "                        ",
-        "            üü üé ää A  ",
-        "            ü ★üé ää★y  ",
-        "            ü  üé ää A  ",
-        "                     5  ",
+        "            ää äâ áá H  ",
+        "            ä ;äâ áá;y  ",
+        "            ä  äâ áá H  ",
+        "                     p  ",
         "                        ",
         "                  ch c  ",
         "                  k  k  ",
         "                        ",
-        "                    ★h  ",
+        "                    ;h  ",
         "                   kkc  ",
         "                        ",
         "                        ",
@@ -382,7 +409,14 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ]
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { ";": "t_linoleum_white_olight_inactive" },
+      "furniture": { "á": "f_bookcase", "â": "f_bookcase", "ä": "f_bookcase" },
+      "items": {
+        "á": { "item": "manuals", "chance": 60, "repeat": [ 1, 4 ] },
+        "â": { "item": "literature", "chance": 80, "repeat": [ 5, 12 ] },
+        "ä": { "item": "novels", "chance": 80, "repeat": [ 5, 12 ] }
+      }
     }
   },
   {
@@ -395,16 +429,16 @@
         "                        ",
         "                        ",
         "              n      n  ",
-        "                ënë  ë  ",
-        "            ë★     ★ n  ",
-        "            n êêê    ë  ",
-        "            ë êêê CCcC  ",
-        "           †      g h   ",
-        "                    †   ",
-        "                  kk★ê  ",
-        "                  kh ê  ",
-        "                        ",
-        "                    ★h  ",
+        "                ânâ  â  ",
+        "            â;     ; n  ",
+        "            n ááá    â  ",
+        "            â ááá jjcj  ",
+        "           1      J h   ",
+        "                    1   ",
+        "                  kk;á  ",
+        "                  kh á  ",
+        "                        ",
+        "                    ;h  ",
         "                   $kc  ",
         "                        ",
         "                        ",
@@ -417,7 +451,14 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ]
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { ";": "t_linoleum_white_olight_inactive", "1": "t_afs_door_metal_elocked" },
+      "furniture": { "$": "f_safe_l", "á": "f_rack", "â": "f_reinforced_displaycase" },
+      "items": {
+        "$": { "item": "afs_cash_safe" },
+        "á": { "item": "afs_tools_robot_maintenance", "chance": 40, "repeat": [ 1, 2 ] },
+        "â": { "item": "domestic_bot_storage", "chance": 30 }
+      }
     }
   },
   {
@@ -430,16 +471,16 @@
         "                        ",
         "                        ",
         "              n      n  ",
-        "                ï î C   ",
-        "            ñ í★    C★  ",
-        "            ñ í ï î Cg  ",
-        "            ñ í         ",
-        "           †    śśśś n  ",
-        "                    †   ",
-        "                  ñ ★í  ",
-        "                  ñ  í  ",
-        "                        ",
-        "                   h★   ",
+        "                ä â j   ",
+        "            é á;    c;  ",
+        "            é á ä â jJ  ",
+        "            é á         ",
+        "           1    êêêê n  ",
+        "                    1   ",
+        "                  é ;á  ",
+        "                  é  á  ",
+        "                        ",
+        "                   h;   ",
         "                   ck$  ",
         "                        ",
         "                        ",
@@ -452,7 +493,24 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ]
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { ";": "t_linoleum_white_olight_inactive", "1": "t_afs_door_metal_elocked" },
+      "furniture": {
+        "á": "f_rack",
+        "â": "f_reinforced_displaycase",
+        "ä": "f_reinforced_displaycase",
+        "é": "f_rack",
+        "ê": "f_rack",
+        "$": "f_safe_l"
+      },
+      "items": {
+        "á": { "item": "afs_any_ballistic_ammo", "chance": 60, "repeat": [ 3, 6 ] },
+        "â": { "item": "afs_any_ballistic_gun", "chance": 80 },
+        "ä": { "item": "afs_civilian_energy_gun", "chance": 80 },
+        "é": { "item": "afs_civilian_energy_mag", "chance": 60, "repeat": [ 1, 4 ] },
+        "ê": { "item": "afs_armor_spaceship_crew_g", "chance": 60 },
+        "$": { "item": "afs_cash_safe" }
+      }
     }
   },
   {
@@ -465,16 +523,16 @@
         "                        ",
         "                        ",
         "              m      n  ",
-        "                mnm CC  ",
-        "            b/   ★  Ch  ",
-        "            ★: nrrr C   ",
-        "            // nrrr Cg  ",
-        "                 ★      ",
+        "                mnm jj  ",
+        "            b/   ;  ch  ",
+        "            ;: n111 j   ",
+        "            // n111 jJ  ",
+        "                 ;      ",
         "                        ",
-        "                  rr r  ",
-        "                  r★ r  ",
+        "                  11 1  ",
+        "                  1; 1  ",
         "                        ",
-        "                   h★   ",
+        "                   h;   ",
         "                   ck$  ",
         "                        ",
         "                        ",
@@ -487,8 +545,14 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "/": "t_wall_prefab_metal", ":": "t_door_c" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "/": "t_wall_prefab_metal", ":": "t_door_c", ";": "t_linoleum_white_olight_inactive" },
+      "furniture": { "1": "f_clothing_rail", "2": "f_mannequin", "$": "f_safe_l" },
+      "items": {
+        "r": { "item": "afs_colonist_outfit", "chance": 60, "repeat": [ 1, 2 ] },
+        "m": { "item": "afs_colonist_outfit" },
+        "$": { "item": "afs_cash_safe" }
+      }
     }
   },
   {
@@ -501,16 +565,16 @@
         "                        ",
         "                        ",
         "              n      n  ",
-        "                ó ó ó   ",
-        "            hC ★ó ó ó★  ",
-        "             C  ó n ó   ",
-        "            gC          ",
-        "                óóóó n  ",
+        "                á á á   ",
+        "            hc ;á á á;  ",
+        "             j  á n á   ",
+        "            Jj          ",
+        "                áááá n  ",
         "                        ",
-        "                  ó ★y  ",
-        "                  ó  y  ",
+        "                  á ;y  ",
+        "                  á  y  ",
         "                        ",
-        "                   h★   ",
+        "                   h;   ",
         "                   ck$  ",
         "                        ",
         "                        ",
@@ -523,7 +587,10 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ]
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { ";": "t_linoleum_white_olight_inactive" },
+      "furniture": { "á": "f_rack", "$": "f_safe_l" },
+      "items": { "á": { "item": "afs_tools_structural_repair", "chance": 60, "repeat": [ 1, 3 ] }, "$": { "item": "afs_cash_safe" } }
     }
   },
   {
@@ -536,16 +603,16 @@
         "                        ",
         "                        ",
         "              n      c  ",
-        "                 c yyy  ",
-        "            bb   g      ",
-        "            b  ★n/ õ★õ  ",
-        "            n    C õ õ  ",
-        "                 c õ õ  ",
-        "                    †   ",
-        "                  ö ★ö  ",
-        "                  ö  ö  ",
-        "                        ",
-        "                   h★   ",
+        "                 j yyy  ",
+        "            bb   c      ",
+        "            b  ;n/ á;á  ",
+        "            n    J á á  ",
+        "                 c á á  ",
+        "                    1   ",
+        "                  â ;â  ",
+        "                  â  â  ",
+        "                        ",
+        "                   h;   ",
         "                   ck$  ",
         "                        ",
         "                        ",
@@ -558,8 +625,14 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "/": "t_wall_prefab_metal" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "/": "t_wall_prefab_metal", ";": "t_linoleum_white_olight_inactive", "1": "t_afs_door_metal_elocked" },
+      "furniture": { "$": "f_safe_l", "á": "f_rack", "â": "f_rack" },
+      "items": {
+        "á": { "item": "softdrugs", "chance": 80, "repeat": [ 2, 6 ] },
+        "â": { "item": "drugs_rare", "chance": 80, "repeat": [ 1, 4 ] },
+        "$": { "item": "afs_cash_safe" }
+      }
     }
   },
   {
@@ -584,18 +657,20 @@
         "                        ",
         "                        ",
         "       ==  ==           ",
-        "       =p ppp           ",
-        "       =p,              ",
-        "        p pp            ",
-        "       pp pp            ",
-        "  úúú/c                 ",
-        "   , : , pppp           ",
+        "       =1 111           ",
+        "       =1'              ",
+        "        1 11            ",
+        "       11 11            ",
+        "  ááá/c                 ",
+        "   ' : ' 1111           ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c", "'": "t_metal_floor_olight_inactive" },
+      "furniture": { "á": "f_rack", "1": "f_planter" },
+      "items": { "á": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] } }
     }
   },
   {
@@ -620,19 +695,19 @@
         "                        ",
         "                        ",
         "       ==               ",
-        "       =d chR           ",
-        "       = ,C R           ",
-        "        d CgC           ",
-        "            d           ",
-        "  ^,/    ,  5           ",
-        "  & : d5d dvd           ",
+        "       =1 chq           ",
+        "       = 'j q           ",
+        "        1 jJj           ",
+        "            1           ",
+        "  ^'/    '  p           ",
+        "  & : 1p1 1v1           ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c" },
-      "furniture": { "^": "f_sink" },
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c", "'": "t_metal_floor_olight_inactive" },
+      "furniture": { "^": "f_sink", "1": "f_arcade_machine" },
       "toilets": { "&": {  } }
     }
   },
@@ -658,18 +733,20 @@
         "                        ",
         "                        ",
         "                        ",
-        "       =5 /bb           ",
-        "       =b,: ,           ",
+        "       =p /bb           ",
+        "       =b': '           ",
         "        b /bb           ",
         "     =    ///           ",
-        "  l,:  ,Cc/,l           ",
-        "  b /ûû   : b           ",
+        "  W':  'jc/'W           ",
+        "  b /áá   : b           ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c", "'": "t_metal_floor_olight_inactive" },
+      "furniture": { "á": "f_rack" },
+      "items": { "á": { "item": "sauna", "chance": 80, "repeat": [ 3, 7 ] } }
     }
   },
   {
@@ -695,17 +772,17 @@
         "                        ",
         "                        ",
         "        c c l           ",
-        "         ,, l           ",
+        "         '' l           ",
         "         yy /           ",
-        "       5 yy l           ",
-        "       ,    l           ",
+        "       p yy l           ",
+        "       '    l           ",
         "  ll/lll/lll/           ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "/": "t_wall_prefab_metal" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "/": "t_wall_prefab_metal", "'": "t_metal_floor_olight_inactive" }
     }
   },
   {
@@ -730,19 +807,19 @@
         "                        ",
         "                        ",
         "          ===           ",
-        "       =  T T           ",
-        "       =  ,             ",
-        "         P P            ",
+        "       =  1 1           ",
+        "       =  '             ",
+        "         3 3            ",
         "                        ",
-        "  ^,/RR   ,             ",
-        "  & :   e e e           ",
+        "  ^'/qq   '             ",
+        "  & :   2 2 2           ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c" },
-      "furniture": { "^": "f_sink" },
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c", "'": "t_metal_floor_olight_inactive" },
+      "furniture": { "^": "f_sink", "1": "f_treadmill", "2": "f_exercise", "3": "f_punching_bag" },
       "toilets": { "&": {  } }
     }
   },
@@ -756,7 +833,7 @@
         "                        ",
         "                        ",
         "                        ",
-        "                X X     ",
+        "                4 4     ",
         "h       hyyh            ",
         "y                       ",
         "h                       ",
@@ -767,19 +844,19 @@
         "                        ",
         "     hyh                ",
         "                        ",
-        "        A ==    &       ",
+        "        1 22    3       ",
         "                        ",
         "                        ",
-        "                &       ",
+        "                3       ",
         "                        ",
-        "        A ==            ",
+        "        1 22            ",
         "                        ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "furniture": { "A": "f_air_conditioner", "=": "f_vent_pipe", "&": "f_roof_turbine_vent", "X": "f_small_satelitte_dish" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "furniture": { "1": "f_air_conditioner", "2": "f_vent_pipe", "3": "f_roof_turbine_vent", "4": "f_small_satelitte_dish" }
     }
   },
   {
@@ -792,31 +869,31 @@
         "                        ",
         "                        ",
         "                        ",
-        "                 X      ",
-        "A ==                    ",
-        "      MMMM  MMMM  MMMM  ",
-        "A ==  MMMM  MMMM  MMMM  ",
+        "                 4      ",
+        "1 22                    ",
+        "      3333  3333  3333  ",
+        "1 22  3333  3333  3333  ",
         "                        ",
-        "      MMMM  MMMM  MMMM  ",
-        "      MMMM  MMMM  MMMM  ",
+        "      3333  3333  3333  ",
+        "      3333  3333  3333  ",
         "                        ",
         "                        ",
         "                        ",
         "       ///!///////////  ",
-        "        ''''  '  ''''/  ",
-        "           '  '  '   /  ",
-        "        '' '  '  ' ''/  ",
-        "         ' '  '  ' ' /  ",
-        "        '' '  '  ' ''/  ",
-        "           '  '  '   /  ",
-        "        ''''  '  ''''/  ",
+        "        ©©©©  ©  ©©©©/  ",
+        "           ©  ©  ©   /  ",
+        "        ©© ©  ©  © ©©/  ",
+        "         © ©  ©  © © /  ",
+        "        ©© ©  ©  © ©©/  ",
+        "           ©  ©  ©   /  ",
+        "        ©©©©  ©  ©©©©/  ",
         "       ///////////////  ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "terrain": { "/": "t_wall_prefab_metal", "!": "t_door_metal_c" },
-      "furniture": { "A": "f_air_conditioner", "=": "f_vent_pipe", "M": "f_solar_unit", "X": "f_small_satelitte_dish" }
+      "palettes": [ "afs_habitat_residential_furnishing" ],
+      "terrain": { "/": "t_wall_prefab_metal", "!": "t_door_metal_c", "©": "t_sidewalk" },
+      "furniture": { "1": "f_air_conditioner", "2": "f_vent_pipe", "3": "f_solar_unit", "4": "f_small_satelitte_dish" }
     }
   },
   {
@@ -828,30 +905,30 @@
       "rows": [
         "                        ",
         "                        ",
-        "    _         _         ",
-        "  ___         ______    ",
-        "   _____    _______     ",
-        "   ___        ___       ",
-        "  ___    bbb   _        ",
-        " _____  _____     __    ",
-        " _____  ______  _____   ",
-        "  bbb     ____ ______   ",
-        "           ___ ______   ",
-        "          b___  __ __   ",
-        "          b___   _ _    ",
-        "          b___     _    ",
-        "           ___     _    ",
-        "           ___     __   ",
-        "          ___    ____   ",
-        "          __    _____   ",
-        "         __   ______    ",
-        "            _____bbb    ",
-        "        _______         ",
+        "    ℗         ℗         ",
+        "  ℗℗℗         ℗℗℗℗℗℗    ",
+        "   ℗℗℗℗℗    ℗℗℗℗℗℗℗     ",
+        "   ℗℗℗        ℗℗℗       ",
+        "  ℗℗℗    bbb   ℗        ",
+        " ℗℗℗℗℗  ℗℗℗℗℗     ℗℗    ",
+        " ℗℗℗℗℗  ℗℗℗℗℗℗  ℗℗℗℗℗   ",
+        "  bbb     ℗℗℗℗ ℗℗℗℗℗℗   ",
+        "           ℗℗℗ ℗℗℗℗℗℗   ",
+        "          b℗℗℗  ℗℗ ℗℗   ",
+        "          b℗℗℗   ℗ ℗    ",
+        "          b℗℗℗     ℗    ",
+        "           ℗℗℗     ℗    ",
+        "           ℗℗℗     ℗℗   ",
+        "          ℗℗℗    ℗℗℗℗   ",
+        "          ℗℗    ℗℗℗℗℗   ",
+        "         ℗℗   ℗℗℗℗℗℗    ",
+        "            ℗℗℗℗℗bbb    ",
+        "        ℗℗℗℗℗℗℗         ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ]
+      "palettes": [ "afs_habitat_residential_furnishing", "afs_habitat_exterior" ]
     }
   },
   {
@@ -865,30 +942,36 @@
         "                        ",
         "                        ",
         "                        ",
-        "  ______ __ ppppppppp   ",
-        "  ______ __ pppp8pppp   ",
+        "  ℗℗℗℗℗℗ ℗℗ 222222222   ",
+        "  ℗℗℗℗℗℗ ℗℗ 222232222   ",
         "                        ",
-        "  ______ __ ppppppppp   ",
-        "  ______ __ pppp8pppp   ",
+        "  ℗℗℗℗℗℗ ℗℗ 222222222   ",
+        "  ℗℗℗℗℗℗ ℗℗ 222232222   ",
         "                        ",
         "                        ",
-        "          pp pp pp __   ",
-        "          pp pp pp __   ",
-        "        w pp pp pp __   ",
-        "        w 8p 8p 8p __   ",
-        "          pp pp pp __   ",
-        "        ú pp pp pp __   ",
-        "        ú pp pp pp __   ",
-        "        ú               ",
+        "          22 22 22 ℗℗   ",
+        "          22 22 22 ℗℗   ",
+        "        1 22 22 22 ℗℗   ",
+        "        1 32 32 32 ℗℗   ",
+        "          22 22 22 ℗℗   ",
+        "        á 22 22 22 ℗℗   ",
+        "        á 22 22 22 ℗℗   ",
+        "        á               ",
         "                        ",
         "                        ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "furniture": { "w": "f_standing_tank" },
-      "liquids": { "w": { "liquid": "water", "amount": [ 0, 100 ] } }
+      "palettes": [ "afs_habitat_exterior" ],
+      "furniture": {
+        "1": "f_standing_tank",
+        "2": "f_planter",
+        "3": [ [ "f_micro_terraforming_mill_active", 1 ], [ "f_micro_terraforming_mill_broken", 9 ] ],
+        "á": "f_rack"
+      },
+      "items": { "á": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] } },
+      "liquids": { "1": { "liquid": "water", "amount": [ 0, 100 ] } }
     }
   },
   {
@@ -900,31 +983,39 @@
       "rows": [
         "                        ",
         "                        ",
-        "              i      I  ",
+        "              5      6  ",
         "                        ",
-        "          +i      Ii    ",
-        " MM   AA  +I  i      i  ",
-        " MM       ++++++  ++++  ",
-        " MM                     ",
+        "          [5      65    ",
+        " 22   11  [5  5      6  ",
+        " 22       [[[[[[  [[[[  ",
+        " 22                     ",
         "                        ",
-        "           ++++  +++++  ",
-        "           +            ",
-        "           + ''''''''   ",
-        "         X + '      '   ",
-        "           + ' '  ' '   ",
-        "           + ' '  ' '   ",
-        "         = + ' '''' '   ",
-        "         = + ' '  ' '   ",
-        "           + ' '  ' '   ",
-        "           + '      '   ",
-        "           + ''''''''   ",
-        "           +            ",
+        "           [[[[  [[[[[  ",
+        "           [            ",
+        "           [ ©©©©©©©©   ",
+        "         4 [ ©      ©   ",
+        "           [ © ©  © ©   ",
+        "           [ © ©  © ©   ",
+        "         3 [ © ©©©© ©   ",
+        "         3 [ © ©  © ©   ",
+        "           [ © ©  © ©   ",
+        "           [ ©      ©   ",
+        "           [ ©©©©©©©©   ",
+        "           [            ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_block" ],
-      "furniture": { "A": "f_air_conditioner", "M": "f_solar_unit", "=": "f_vent_pipe", "X": "f_small_satelitte_dish" }
+      "terrain": { "[": "t_metal_railing", "©": "t_sidewalk" },
+      "furniture": {
+        "1": "f_air_conditioner",
+        "2": "f_solar_unit",
+        "3": "f_vent_pipe",
+        "4": "f_small_satelitte_dish",
+        "5": "f_intermodal_crate_open",
+        "6": "f_sealed_intermodal_crate"
+      },
+      "items": { "I": { "item": "afs_crate_civ_rand" } }
     }
   }
 ]
diff --git a/data/mods/Aftershock/maps/mapgen/shuttle_pad.json b/data/mods/Aftershock/maps/mapgen/shuttle_pad.json
index f4a012fe8c35d..61e8335f146f1 100644
--- a/data/mods/Aftershock/maps/mapgen/shuttle_pad.json
+++ b/data/mods/Aftershock/maps/mapgen/shuttle_pad.json
@@ -9,30 +9,30 @@
         "                                                ",
         " ññññññññññññññññññññññññññññññññññññ////////// ",
         " ñ                                  //E&qq/v.h/ ",
-        " ñ   $$$$$ $$$$   $$$$ $$  $$$$$$$$ #..,ö.+.kk/ ",
-        " ñ  $$''''''''''''''''''''''''''''$$//&.qq/.,./ ",
-        " ñ  $''''''   '''' '   '''''' ' '''$ //+////+// ",
-        " ñ  $'''''' '' '''   ''''  '''  '''$ =.,../..l/ ",
-        " ñ   '''$$''   ''''$$'''''  ''$$'''  =ccc./,.l/ ",
-        " ñ  $'''$''' '''''''' '''''  ''$'''  /===//!/// ",
-        " ñ  $'''   ''' ''  ''    ''' ''''''$      /./ ñ ",
-        " ñ  $'''' '''''  ''''''''''''''''''$'' '''/!/ ñ ",
-        " ñ  $''    '''  '''$$''' '''   ''''$''' '' '' ñ ",
-        " ñ  $'    '''    ''$$''   '''  ''''$''  ''''' ñ ",
-        " ñ  $'''''''''  ' ''''''''''''  '  $'''''' '  ñ ",
-        " ñ   ''''  ''''' ''''''    ''  '''      '' '  ñ ",
-        " ñ   '''$'  '  '''''''''  '''''$'''$      ''  ñ ",
-        " ñ   '''$$'''''  ''$$''''''' '$$'''$ ''' '''  ñ ",
-        " ñ  $''''' ''''' ''' ''  ''' '' '''  '' '' '  ñ ",
-        " ñ  $'''''   ''''''  ''    ''   '''$ '''''''  ñ ",
-        " ñ  $$''''' ''''' '' ''' '''' ''''$$ '''  ''  ñ ",
-        " ñ   $$$$   $$$$$   $$$$$$$ $$$$$$$       ''  ñ ",
-        " ñ                                       '''  ñ ",
-        " ññññññññññññññññññññññññññññññññññññññññ'''ñññ ",
+        " ñ   ©©©©© ©©©©   ©©©© ©©  ©©©©©©©© #..'ö.+.kk/ ",
+        " ñ  ©©°°°°°°°°°°°°°°°°°°°°°°°°°°°°©©//&.qq/.'./ ",
+        " ñ  ©°°°°°°   °°°° °   °°°°°° ° °°°© //+////+// ",
+        " ñ  ©°°°°°° °° °°°   °°°°  °°°  °°°© =.'../..l/ ",
+        " ñ   °°°©©°°   °°°°©©°°°°°  °°©©°°°  =ccc./'.l/ ",
+        " ñ  ©°°°©°°° °°°°°°°° °°°°°  °°©°°°  /===//!/// ",
+        " ñ  ©°°°   °°° °°  °°    °°° °°°°°°©      /./ ñ ",
+        " ñ  ©°°°° °°°°°  °°°°°°°°°°°°°°°°°°©°° °°°/!/ ñ ",
+        " ñ  ©°°    °°°  °°°©©°°° °°°   °°°°©°°° °° °° ñ ",
+        " ñ  ©°    °°°    °°©©°°   °°°  °°°°©°°  °°°°° ñ ",
+        " ñ  ©°°°°°°°°°  ° °°°°°°°°°°°°  °  ©°°°°°° °  ñ ",
+        " ñ   °°°°  °°°°° °°°°°°    °°  °°°      °° °  ñ ",
+        " ñ   °°°©°  °  °°°°°°°°°  °°°°°©°°°©      °°  ñ ",
+        " ñ   °°°©©°°°°°  °°©©°°°°°°° °©©°°°© °°° °°°  ñ ",
+        " ñ  ©°°°°° °°°°° °°° °°  °°° °° °°°  °° °° °  ñ ",
+        " ñ  ©°°°°°   °°°°°°  °°    °°   °°°© °°°°°°°  ñ ",
+        " ñ  ©©°°°°° °°°°° °° °°° °°°° °°°°©© °°°  °°  ñ ",
+        " ñ   ©©©©   ©©©©©   ©©©©©©© ©©©©©©©       °°  ñ ",
+        " ñ                                       °°°  ñ ",
+        " ññññññññññññññññññññññññññññññññññññññññ°°°ñññ ",
         "                                                "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing" ],
-      "terrain": { "'": "t_thconc_floor_no_roof", "$": "t_sidewalk", "ñ": "t_chainfence", ",": "t_metal_floor_olight_inactive" },
+      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_habitat_exterior" ],
+      "terrain": { "ñ": "t_chainfence" },
       "furniture": { "&": "f_sealed_intermodal_crate", "e": "f_intermodal_crate_open" },
       "items": { "&": [ { "item": "afs_crate_civ_rand" } ] },
       "monster": { "ö": { "monster": "mon_skitterbot" } },
diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_block.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_block.json
deleted file mode 100644
index 1dcb74b9ad435..0000000000000
--- a/data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_block.json
+++ /dev/null
@@ -1,105 +0,0 @@
-[
-  {
-    "type": "palette",
-    "id": "afs_habitat_block",
-    "terrain": {
-      ",": "t_metal_floor_olight_inactive",
-      "★": "t_linoleum_white_olight_inactive",
-      "'": "t_sidewalk",
-      "¢": "t_pavement",
-      "£": "t_pavement_y",
-      "_": "t_region_shrub_decorative",
-      "+": "t_metal_railing",
-      "[": "t_floor_metal_gangway",
-      "©": "t_atm",
-      "°": "t_thconc_floor_no_roof",
-      "±": "t_linoleum_white",
-      "™": "t_region_groundcover_urban",
-      "†": "t_afs_door_metal_elocked"
-    },
-    "furniture": {
-      "á": "f_rack",
-      "â": "f_rack",
-      "ä": "f_bookcase",
-      "é": "f_bookcase",
-      "ê": "f_rack",
-      "ë": "f_reinforced_displaycase",
-      "í": "f_rack",
-      "î": "f_reinforced_displaycase",
-      "ï": "f_reinforced_displaycase",
-      "ñ": "f_rack",
-      "ś": "f_rack",
-      "ó": "f_rack",
-      "õ": "f_rack",
-      "ö": "f_rack",
-      "ú": "f_rack",
-      "û": "f_rack",
-      "ü": "f_bookcase",
-      "r": "f_clothing_rail",
-      "R": "f_rack",
-      "m": "f_mannequin",
-      "5": "f_indoor_plant",
-      "g": "f_counter_gate_c",
-      "o": "f_habitat_kitchenette",
-      "p": "f_planter",
-      "P": "f_punching_bag",
-      "f": "f_fridge",
-      "C": "f_counter",
-      "c": [ [ "f_console_broken", 1 ], [ "f_console", 3 ] ],
-      "@": "f_sleep_pod",
-      "y": "f_table",
-      "h": "f_chair",
-      "H": "f_armchair",
-      "b": "f_bench",
-      "s": "f_washer",
-      "D": "f_dryer",
-      "E": "f_ECU",
-      "e": "f_exercise",
-      "A": "f_atmospheric_control",
-      "a": "f_air_filter",
-      "W": "f_water_heater",
-      "w": "f_water_purifier",
-      "j": "f_habitat_storage_board",
-      "n": "f_screenmirror",
-      "k": "f_desk",
-      "$": "f_safe_l",
-      "v": "f_trashcan",
-      "d": "f_arcade_machine",
-      "l": "f_locker",
-      "L": "f_locker",
-      "T": "f_treadmill",
-      "i": "f_intermodal_crate_open",
-      "I": "f_sealed_intermodal_crate",
-      "8": [ [ "f_micro_terraforming_mill_active", 1 ], [ "f_micro_terraforming_mill_broken", 9 ] ]
-    },
-    "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
-    "items": {
-      "á": { "item": "afs_old_food_storage", "chance": 40, "repeat": [ 1, 3 ] },
-      "â": { "item": "afs_tools_electric_repair", "chance": 60, "repeat": [ 1, 3 ] },
-      "ä": { "item": "manuals", "chance": 60, "repeat": [ 1, 4 ] },
-      "é": { "item": "literature", "chance": 80, "repeat": [ 5, 12 ] },
-      "ê": { "item": "afs_tools_robot_maintenance", "chance": 40, "repeat": [ 1, 2 ] },
-      "ë": { "item": "domestic_bot_storage", "chance": 30 },
-      "í": { "item": "afs_any_ballistic_ammo", "chance": 60, "repeat": [ 3, 6 ] },
-      "î": { "item": "afs_any_ballistic_gun", "chance": 80 },
-      "ï": { "item": "afs_civilian_energy_gun", "chance": 80 },
-      "ñ": { "item": "afs_civilian_energy_mag", "chance": 60, "repeat": [ 1, 4 ] },
-      "ś": { "item": "afs_armor_spaceship_crew_g", "chance": 60 },
-      "ó": { "item": "afs_tools_structural_repair", "chance": 60, "repeat": [ 1, 3 ] },
-      "õ": { "item": "softdrugs", "chance": 80, "repeat": [ 2, 6 ] },
-      "ö": { "item": "drugs_rare", "chance": 80, "repeat": [ 1, 4 ] },
-      "ú": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] },
-      "û": { "item": "sauna", "chance": 80, "repeat": [ 3, 7 ] },
-      "ü": { "item": "novels", "chance": 80, "repeat": [ 5, 12 ] },
-      "f": { "item": "afs_old_food_storage", "chance": 60 },
-      "o": { "item": "afs_kitchenette", "chance": 60 },
-      "$": { "item": "afs_cash_safe" },
-      "m": { "item": "afs_colonist_outfit" },
-      "l": { "item": "afs_colonist_outfit" },
-      "r": { "item": "afs_colonist_outfit", "chance": 60, "repeat": [ 1, 2 ] },
-      "j": { "item": "afs_colonist_outfit", "chance": 60 },
-      "I": { "item": "afs_crate_civ_rand" }
-    },
-    "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true } }
-  }
-]
diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_structure.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_structure.json
index 7c1495908d98a..c5d24fe6b9d78 100644
--- a/data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_structure.json
+++ b/data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_structure.json
@@ -13,6 +13,11 @@
       " ": "t_region_groundcover_urban",
       ".": "t_metal_floor",
       ",": "t_metal_floor_olight",
+      "'": "t_metal_floor_olight_inactive",
+      "$": "t_grate",
+      "{": "t_linoleum_white",
+      "}": "t_linoleum_whitefloor_olight",
+      ";": "t_linoleum_white_olight_inactive",
       "/": "t_wall_prefab_metal",
       "=": [
         [ "t_wall_prefab_glass", 2 ],
@@ -23,6 +28,7 @@
       "-": "t_wall_metal",
       "|": "t_concrete_wall",
       ")": "t_reinforced_glass",
+      "[": "t_metal_railing",
       "]": [ [ "t_door_glass_c", 5 ], "t_door_glass_o", 5 ],
       "+": [ [ "t_door_locked", 1 ], [ "t_door_c", 5 ], [ "t_door_o", 1 ] ],
       ":": [ [ "t_door_locked_interior", 1 ], [ "t_door_c", 5 ], [ "t_door_o", 5 ] ],
@@ -33,6 +39,19 @@
     },
     "furniture": { "~": "f_habitat_bathroom", "^": "f_sink", "*": "f_sink", "%": "f_fireman_cabinet" }
   },
+  {
+    "type": "palette",
+    "id": "afs_habitat_exterior",
+    "terrain": {
+      "™": "t_region_groundcover_urban",
+      "℗": "t_region_shrub_decorative",
+      "©": "t_sidewalk",
+      "¢": "t_pavement",
+      "†": "t_pavement_y",
+      "°": "t_thconc_floor_no_roof",
+      "£": "t_flat_roof"
+    }
+  },
   {
     "type": "palette",
     "id": "afs_habitat_connection_tube",
@@ -95,11 +114,17 @@
     "id": "afs_habitat_residential_furnishing",
     "furniture": {
       "@": "f_bed",
+      "S": "f_sleep_pod",
       "f": "f_workbench",
+      "F": "f_fridge",
       "y": "f_table",
       "c": "f_console_broken",
       "h": "f_chair",
+      "b": "f_bench",
+      "H": "f_armchair",
       "j": "f_counter",
+      "J": "f_counter_gate_c",
+      "k": "f_desk",
       "o": "f_habitat_kitchenette",
       "W": "f_habitat_storage_board",
       "U": "f_habitat_storage_board",
@@ -108,15 +133,31 @@
       "s": "f_sofa",
       "v": "f_trashcan",
       "l": "f_locker",
-      "k": "f_desk"
+      "p": "f_indoor_plant",
+      "e": "f_entertainment_center"
     },
     "items": {
       "o": { "item": "afs_kitchenette", "chance": 60 },
       "U": { "item": "afs_old_food_storage", "chance": 60 },
+      "F": { "item": "afs_old_food_storage", "chance": 60 },
       "W": { "item": "afs_colonist_outfit", "chance": 60 },
       "l": { "item": "afs_frontier_cryo_g", "chance": 50 },
       "@": { "item": "bed", "chance": 50 },
       "v": { "item": "trash", "chance": 30, "repeat": [ 1, 4 ] }
     }
+  },
+  {
+    "//": "Life Support furniture items for habbitats which is combinable with other palettes.",
+    "type": "palette",
+    "id": "afs_habitat_life_support",
+    "furniture": {
+      "❶": "f_ECU",
+      "❷": "f_air_filter",
+      "❸": "f_water_heater",
+      "❹": "f_water_purifier",
+      "❺": "f_atmospheric_control",
+      "❻": "f_cryofluid_pump"
+    },
+    "liquids": { "❸": { "liquid": "water_clean", "amount": [ 0, 100 ] } }
   }
 ]