diff --git a/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement.json b/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement_normal.json
similarity index 92%
rename from data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement.json
rename to data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement_normal.json
index 74303c15bbdf3..729dd11190ffe 100644
--- a/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement.json
+++ b/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement_normal.json
@@ -3,9 +3,8 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [
-      [ "phavian_hospital_main_floor_z3_nw", "phavian_hospital_main_floor_z3_n", "phavian_hospital_main_floor_z3_ne" ],
-      [ "phavian_hospital_main_floor_z3_w", "phavian_hospital_main_floor_z3", "phavian_hospital_main_floor_z3_e" ],
-      [ "phavian_hospital_main_floor_z3_sw", "phavian_hospital_main_floor_z3_s", "phavian_hospital_main_floor_z3_se" ]
+      [ "phavian_hospital_basement_nw", "phavian_hospital_basement_ne" ],
+      [ "phavian_hospital_basement_sw", "phavian_hospital_basement_se" ]
     ],
     "weight": 250,
     "object": {
@@ -60,17 +59,14 @@
         "............................................###.",
         "................................................"
       ],
-      "palettes": [ "hospital_2" ],
+      "palettes": [ "phavian_hospital_lab" ],
       "terrain": {
-        "¢": "f_counter",
-        "Ŧ": "t_linoleum_white",
-        "£": "t_linoleum_whitefloor_olight",
         ".": "t_soil",
         "°": "t_wall_metal",
         ";": [ "t_door_metal_locked", "t_door_metal_elocked" ],
-        "˽": "t_card_science",
+        "˽": "t_card_reader_broken",
         "-": "t_metal_floor",
-        "/": "t_secretdoor_strconcrete_c"
+        "£": "t_linoleum_whitefloor_olight"
       },
       "furniture": { "`": "f_dishwasher", "³": "f_rack" },
       "items": {
diff --git a/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement_top_floor.json b/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement_top_floor.json
new file mode 100644
index 0000000000000..9a2adffc5a5d6
--- /dev/null
+++ b/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_basement_top_floor.json
@@ -0,0 +1,145 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [
+      [
+        "phavian_hospital_main_floor_z3_nw_upper",
+        "phavian_hospital_main_floor_z3_ncw_upper",
+        "phavian_hospital_main_floor_z3_nce_upper",
+        "phavian_hospital_main_floor_z3_ne_upper"
+      ],
+      [
+        "phavian_hospital_main_floor_z3_sw_upper",
+        "phavian_hospital_main_floor_z3_scw_upper",
+        "phavian_hospital_main_floor_z3_sce_upper",
+        "phavian_hospital_main_floor_z3_se_upper"
+      ]
+    ],
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_linoleum_white",
+      "rows": [
+        "................................................................................................",
+        "........................#################################.......................................",
+        "........................#zɱIIII  |T|³³³³³³³|pppp pppp qq#.......................................",
+        "........................#G    ɱ  + |³      +            #.......................................",
+        "........................#G Att  I|||||³³³³³|  JLJJJJJ  M#.......................................",
+        "........................#G  tt  I|---|||||||        J  M#.......................................",
+        "........................#G  ttA I|---|TL|hv|³       L  M#.......................................",
+        "........................#G  tt  I|&$$|  | v|³       J  L#.......................................",
+        "........................#G  tt  I|   ||+|+||³       J  M#.......................................",
+        "........................#G   ɱ   $   $              L  M#.......................................",
+        "........................#G ɱ     $   $              J  M#.......................................",
+        "........................#G  tt  I|   |||||||            #.......................................",
+        "........................#G  tt  I|ɱ  |FFFFF||||     ||||#.......................................",
+        "........................#G Attɱ I|ɱ  +    F|J        A J#.......................................",
+        "........................#z      I|   |FFFFF|J```    ```J#.......................................",
+        "........................#|||||||||   |||||||||||||||||||#############...........................",
+        "........................# ONNNO1 |   |QQQQQQQQQ|---|L |T|°°°°°°°°°°°#...........................",
+        "........................#    A   o   $         |---|z   |°d°d°d°d°d°#...........................",
+        "........................#N    N  o   |||||||||||&**||+|||° ° ° ° ° °#...........................",
+        "........................#N    N  o                      |°*°*°*°*°*°#...........................",
+        "........................#7    8  |                      |       A   #...........................",
+        "........................#        ||  °°°°°°°°°°°°  ||o*||  d  d  d  #...........................",
+        "........................#P      hC|  )XXXXuuDDDD)  |H  H|    A      #...........................",
+        "........................#P     vv |  (          (  |H  H|     u|||||#...........................",
+        "........................#         +  °XXXXXXXXXX°  |    |     u|KKvv#...........................",
+        "........................#jj       |  °°°°°°°°°°°°  |vv  +      +   E#...........................",
+        "........................#3k 2uu2uu|                | h  |  Я   |C   #...........................",
+        "........................#||||||||||                |||||||||||||||||#...........................",
+        "........................#  N AN  z|||  ||$|||||||  |BBB|z 2NN21NNz  #...........................",
+        "........................# AN  N     |  |S R|FFFF|  +   +            #...........................",
+        "........................#           +  ||$||F   +  |iii|    8A  aA  #...........................",
+        "........................#  N  N   vv||||  <|FFFF|  |||||    NN  NN  #...........................",
+        "........................# AN AN   h  nz|||||||||||||W|W|q           ###.........................",
+        "........................#               +   RzS   z|+|+|    NN  NN  / #.........................",
+        "........................#||o*o||ooo||ooo|          +   +    9A  aA  # #.........................",
+        "........................#               |+|+|+|    |+|+|            #£#.........................",
+        "........................#ON65NNOO265NN65|T|T|T|LuuL|W|W|NN0NN0 nOOnz# #.........................",
+        "........................############################################# #.........................",
+        "....................................................................# #.........................",
+        "....................................................................# #.........................",
+        "....................................................................# #.........................",
+        "....................................................................# #.........................",
+        "....................................................................#£#.........................",
+        "....................................................................# #.........................",
+        "....................................................................#;˽.........................",
+        "....................................................................# #.........................",
+        "....................................................................#<#.........................",
+        "....................................................................###........................."
+      ],
+      "palettes": [ "phavian_hospital_lab" ],
+      "terrain": {
+        "Ŧ": "t_linoleum_white",
+        "£": "t_linoleum_whitefloor_olight",
+        ".": "t_soil",
+        "°": "t_wall_metal",
+        ";": [ "t_door_metal_locked", "t_door_metal_elocked" ],
+        "˽": "t_card_science",
+        "-": "t_metal_floor"
+      },
+      "furniture": { "¢": "f_counter", "`": "f_dishwasher", "³": "f_rack" },
+      "items": {
+        "¢": { "item": "office_paper", "chance": 60, "repeat": [ 1, 2 ] },
+        "p": [
+          { "item": "restaur_fridge", "chance": 70, "repeat": [ 1, 2 ] },
+          { "item": "baked_goods", "chance": 40 },
+          { "item": "fridge", "chance": 90, "repeat": [ 1, 2 ] }
+        ],
+        "³": [
+          { "item": "restaur_kitchen", "chance": 20, "repeat": [ 1, 2 ] },
+          { "item": "groce_bread", "chance": 30, "repeat": [ 1, 2 ] },
+          { "item": "pantry", "chance": 60, "repeat": [ 1, 2 ] },
+          { "item": "cannedfood", "chance": 60, "repeat": [ 1, 2 ] },
+          { "item": "groce_condiment", "chance": 20, "repeat": [ 1, 2 ] }
+        ],
+        "t": { "item": "laundry", "chance": 20, "repeat": [ 1, 2 ] },
+        "J": { "item": "kitchen_appliances", "chance": 20, "repeat": [ 1, 2 ] },
+        "u": { "item": "dissection", "chance": 40 },
+        "N": { "item": "hospital_lab", "chance": 40 },
+        "d": { "item": "dissection", "chance": 30 },
+        "M": { "item": "oven", "chance": 90, "repeat": [ 1, 2 ] },
+        "z": { "item": "trash", "chance": 80, "repeat": [ 1, 2 ] },
+        "C": { "item": "office_paper", "chance": 60, "repeat": [ 1, 2 ] },
+        "V": { "item": "waitingroom", "chance": 40, "repeat": [ 1, 2 ] },
+        "v": { "item": "office", "chance": 40, "repeat": [ 1, 2 ] },
+        "X": [
+          { "item": "harddrugs", "chance": 70, "repeat": [ 1, 2 ] },
+          { "item": "drugs_rare", "chance": 70, "repeat": [ 1, 2 ] }
+        ],
+        "D": { "item": "softdrugs", "chance": 90, "repeat": [ 1, 2 ] },
+        "O": { "item": "virology_lab_fridge", "chance": 80, "repeat": [ 1, 2 ] },
+        "Q": { "item": "hospital_medical_items", "chance": 80, "repeat": [ 1, 2 ] },
+        "B": [ { "item": "jackets", "chance": 30 }, { "item": "bags", "chance": 40 } ],
+        "P": { "item": "hospital_medical_items", "chance": 80, "repeat": [ 1, 2 ] },
+        "F": [ { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "cleaning", "chance": 60, "repeat": [ 1, 2 ] } ],
+        "q": [
+          { "item": "vending_drink", "chance": 40, "repeat": [ 1, 2 ] },
+          { "item": "prepared_teas", "chance": 30, "repeat": [ 1, 2 ] }
+        ]
+      },
+      "computers": {
+        "6": {
+          "name": "Centrifuge",
+          "options": [ { "name": "Analyze blood", "action": "blood_anal" } ],
+          "failures": [ { "action": "destroy_blood" } ]
+        }
+      },
+      "monster": {
+        "^": { "monster": "mon_civilian_icu", "chance": 10 },
+        "ւ": { "monster": "mon_civilian_icu", "chance": 10 },
+        "Г": { "monster": "mon_civilian_icu", "chance": 10 },
+        "Я": { "monster": "mon_civilian_icu", "chance": 10 },
+        "Ŧ": { "monster": "mon_turret_rifle", "spawn_data": { "ammo": [ { "ammo_id": "556", "qty": [ 30, 90 ] } ] } }
+      },
+      "place_monsters": [
+        { "monster": "GROUP_HOSPITAL", "x": [ 1, 22 ], "y": [ 5, 22 ], "density": 0.6 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 25, 31 ], "y": [ 5, 22 ], "density": 0.6 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 32, 42 ], "y": [ 17, 22 ], "density": 0.8 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 1, 22 ], "y": [ 25, 31 ], "density": 0.5 },
+        { "monster": "GROUP_HOSPITAL", "x": [ 25, 41 ], "y": [ 25, 30 ], "density": 0.6 }
+      ]
+    }
+  }
+]
diff --git a/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_main_floor_z3.json b/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_main_floor_z3.json
deleted file mode 100644
index 0ec930652dd12..0000000000000
--- a/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_main_floor_z3.json
+++ /dev/null
@@ -1,65 +0,0 @@
-[
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [
-      [ "phavian_hospital_basement_nw", "phavian_hospital_basement_ne" ],
-      [ "phavian_hospital_basement_sw", "phavian_hospital_basement_se" ]
-    ],
-    "weight": 250,
-    "object": {
-      "fill_ter": "t_linoleum_white",
-      "rows": [
-        "................................................",
-        "#################################...............",
-        "#zɱIIII  |T|³³³³³³³|pppp pppp qq#...............",
-        "#G    ɱ  + |³      +            #...............",
-        "#G Att  I|||||³³³³³|  JLJJJJJ  M#...............",
-        "#G  tt  I|---|||||||        J  M#...............",
-        "#G  ttA I|---|TL|hv|³       L  M#...............",
-        "#G  tt  I|&$$|  | v|³       J  L#...............",
-        "#G  tt  I|   ||+|+||³       J  M#...............",
-        "#G   ɱ   $   $              L  M#...............",
-        "#G ɱ     $   $              J  M#...............",
-        "#G  tt  I|   |||||||            #...............",
-        "#G  tt  I|ɱ  |FFFFF||||     ||||#...............",
-        "#G Attɱ I|ɱ  +    F|J        A J#...............",
-        "#z      I|   |FFFFF|J```    ```J#...............",
-        "#|||||||||   |||||||||||||||||||#############...",
-        "# ONNNO1 |   |QQQQQQQQQ|---|L |T|°°°°°°°°°°°#...",
-        "#    A   o   $         |---|z   |°d°d°d°d°d°#...",
-        "#N    N  o   |||||||||||&**||+|||° ° ° ° ° °#...",
-        "#N    N  o                      |°*°*°*°*°*°#...",
-        "#7    8  |                      |       A   #...",
-        "#        ||  °°°°°°°°°°°°  ||o*||  d  d  d  #...",
-        "#P      hC|  )XXXXuuDDDD)  |H  H|    A      #...",
-        "#P     vv |  (          (  |H  H|     u|||||#...",
-        "#         +  °XXXXXXXXXX°  |    |     u|KKvv#...",
-        "#jj       |  °°°°°°°°°°°°  |vv  +      +   E#...",
-        "#3k 2uu2uu|                | h  |  Я   |C   #...",
-        "#||||||||||                |||||||||||||||||#...",
-        "#  N AN  z|||  ||$|||||||  |BBB|z 2NN21NNz  #...",
-        "# AN  N     |  |S R|FFFF|  +   +            #...",
-        "#           +  ||$||F   +  |iii|    8A  aA  #...",
-        "#  N  N   vv||||  <|FFFF|  |||||    NN  NN  #...",
-        "# AN AN   h  nz|||||||||||||W|W|q           ###.",
-        "#               +   RzS   z|+|+|    NN  NN  / #.",
-        "#||o*o||ooo||ooo|          +   +    9A  aA  # #.",
-        "#               |+|+|+|    |+|+|            #£#.",
-        "#ON65NNOO265NN65|T|T|T|LuuL|W|W|NN0NN0 nOOnz# #.",
-        "############################################# #.",
-        "............................................# #.",
-        "............................................# #.",
-        "............................................# #.",
-        "............................................# #.",
-        "............................................#£#.",
-        "............................................# #.",
-        "............................................#;˽.",
-        "............................................#>#.",
-        "............................................###.",
-        "................................................"
-      ],
-      "palettes": [ "phavian_hospital_lab" ]
-    }
-  }
-]
diff --git a/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_transition_tunnel.json b/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_transition_tunnel.json
index 5f20e05dcf47d..52cacf5dd5c84 100644
--- a/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_transition_tunnel.json
+++ b/data/mods/MindOverMatter/mapgen/hospital_lab/hospital_lab_transition_tunnel.json
@@ -27,11 +27,11 @@
         "........................",
         "........................",
         "....................###.",
-        "................... #<#.",
+        "....................#<#.",
         "....................#>#.",
         "....................###."
       ],
-      "palettes": [ "hospital_2" ],
+      "palettes": [ "phavian_hospital_lab" ],
       "terrain": { ".": "t_rock" }
     }
   }
diff --git a/data/mods/MindOverMatter/mapgen_palettes/hospital_lab_palette.json b/data/mods/MindOverMatter/mapgen_palettes/hospital_lab_palette.json
new file mode 100644
index 0000000000000..f70050a8b3723
--- /dev/null
+++ b/data/mods/MindOverMatter/mapgen_palettes/hospital_lab_palette.json
@@ -0,0 +1,103 @@
+[
+  {
+    "type": "palette",
+    "id": "phavian_hospital_lab",
+    "terrain": {
+      "_": "t_pavement",
+      "˽": "t_pavement_y",
+      ";": "t_sidewalk",
+      "#": "t_strconc_wall",
+      "+": "t_door_c",
+      "|": "t_wall_w",
+      "o": "t_laminated_glass",
+      "°": "t_flat_roof",
+      "*": "t_laminated_door_glass_c",
+      "$": "t_door_metal_c",
+      "&": "t_elevator_control_off",
+      "~": "t_elevator",
+      ">": "t_stairs_down",
+      "<": "t_stairs_up",
+      " ": "t_linoleum_white",
+      "`": "t_thconc_floor",
+      "ɔ": "t_sidewalk",
+      "(": "t_door_metal_locked",
+      ")": "t_card_reader_broken",
+      ".": "t_open_air",
+      "-": "t_open_air_rooved",
+      "/": "t_secretdoor_strconcrete_c"
+    },
+    "vendingmachines": { "R": { "item_group": "vending_drink" }, "S": { "item_group": "vending_food" } },
+    "furniture": {
+      "A": "f_stool",
+      "B": "f_locker",
+      "C": "f_filing_cabinet",
+      "D": "f_glass_cabinet",
+      "E": "f_armchair",
+      "F": "f_utility_shelf",
+      "G": "f_washer",
+      "H": "f_sofa",
+      "I": "f_dryer",
+      "J": "f_cupboard",
+      "K": "f_bookcase",
+      "L": "f_sink",
+      "M": "f_oven",
+      "N": "f_lab_bench",
+      "O": "f_sample_freezer",
+      "P": "f_rack",
+      "Q": "f_rack",
+      "U": "f_console_broken",
+      "V": "f_coffee_table",
+      "W": "f_shower",
+      "X": "f_glass_cabinet",
+      "Y": "f_counter_gate_c",
+      "Z": "f_null",
+      "1": "f_fume_hood",
+      "2": "f_shaker",
+      "3": "f_eyewash",
+      "4": "f_IV_pole",
+      "5": "f_centrifuge",
+      "6": "f_console",
+      "7": "f_HPLC",
+      "8": "f_GC",
+      "9": "f_MS",
+      "0": "f_NMR",
+      "a": "f_electron_microscope",
+      "b": "f_CTscan",
+      "c": "f_MRI",
+      "d": "f_scan_bed",
+      "e": "f_anesthetic",
+      "f": "f_dialysis",
+      "g": "f_ventilator",
+      "h": "f_chair",
+      "i": "f_bench",
+      "j": "f_curtain",
+      "k": "f_curtain_open",
+      "l": "f_autodoc",
+      "m": "f_autodoc_couch",
+      "n": "f_autoclave",
+      "p": [ "f_heavy_duty_fridge", "f_heavy_duty_freezer" ],
+      "q": "f_glass_fridge",
+      "r": "f_table",
+      "s": "f_table",
+      "t": "f_counter",
+      "u": "f_counter",
+      "v": "f_desk",
+      "w": "f_desk",
+      "x": "f_table",
+      "y": [ "f_indoor_plant_y", "f_indoor_plant" ],
+      "z": "f_trashcan"
+    },
+    "toilets": { "T": {  } },
+    "items": { "4": [ { "item": "saline_bottle_random", "chance": 100 } ] },
+    "vehicles": {
+      "ɱ": { "vehicle": "laundry_cart", "chance": 100, "rotation": 90 },
+      "ƃ": { "vehicle": "wheelchair", "chance": 100, "rotation": 90 },
+      "ɔ": { "vehicle": "wheelchair", "chance": 100, "rotation": 90 },
+      "Ƨ": { "vehicle": "swivel_chair", "chance": 100, "rotation": 0 },
+      "^": { "vehicle": "hospital_bed", "chance": 100, "rotation": 0 },
+      "Я": { "vehicle": "hospital_bed", "chance": 100, "rotation": 90 },
+      "Г": { "vehicle": "hospital_bed", "chance": 100, "rotation": 180 },
+      "ւ": { "vehicle": "hospital_bed", "chance": 100, "rotation": 270 }
+    }
+  }
+]
diff --git a/data/mods/MindOverMatter/overmap/multitile_city_buildings.json b/data/mods/MindOverMatter/overmap/multitile_city_buildings.json
index 5d5bcf20f486f..8531a0472b889 100644
--- a/data/mods/MindOverMatter/overmap/multitile_city_buildings.json
+++ b/data/mods/MindOverMatter/overmap/multitile_city_buildings.json
@@ -68,6 +68,14 @@
     "type": "city_building",
     "locations": [ "land" ],
     "overmaps": [
+      { "point": [ 2, 1, -3 ], "overmap": "phavian_hospital_main_floor_z3_nw_upper_south" },
+      { "point": [ 2, 0, -3 ], "overmap": "phavian_hospital_main_floor_z3_sw_upper_south" },
+      { "point": [ 1, 1, -3 ], "overmap": "phavian_hospital_main_floor_z3_ncw_upper_south" },
+      { "point": [ 1, 0, -3 ], "overmap": "phavian_hospital_main_floor_z3_scw_upper_south" },
+      { "point": [ 0, 1, -3 ], "overmap": "phavian_hospital_main_floor_z3_nce_upper_south" },
+      { "point": [ 0, 0, -3 ], "overmap": "phavian_hospital_main_floor_z3_sce_upper_south" },
+      { "point": [ -1, 1, -3 ], "overmap": "phavian_hospital_main_floor_z3_ne_upper_south" },
+      { "point": [ -1, 0, -3 ], "overmap": "phavian_hospital_main_floor_z3_se_upper_south" },
       { "point": [ 0, 0, -2 ], "overmap": "phavian_hospital_transition_tunnel_south" },
       { "point": [ 1, 1, -1 ], "overmap": "phavian_hospital_basement_nw_south" },
       { "point": [ 0, 1, -1 ], "overmap": "phavian_hospital_basement_ne_south" },
diff --git a/data/mods/MindOverMatter/overmap/overmap_terrain.json b/data/mods/MindOverMatter/overmap/overmap_terrain.json
index ae8cf575b4ad7..ebb1e2d1d5034 100644
--- a/data/mods/MindOverMatter/overmap/overmap_terrain.json
+++ b/data/mods/MindOverMatter/overmap/overmap_terrain.json
@@ -293,5 +293,23 @@
     "sym": "L",
     "see_cost": 5,
     "color": "light_red"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": [
+      "phavian_hospital_main_floor_z3_nw_upper",
+      "phavian_hospital_main_floor_z3_ncw_upper",
+      "phavian_hospital_main_floor_z3_nce_upper",
+      "phavian_hospital_main_floor_z3_ne_upper",
+      "phavian_hospital_main_floor_z3_sw_upper",
+      "phavian_hospital_main_floor_z3_scw_upper",
+      "phavian_hospital_main_floor_z3_sce_upper",
+      "phavian_hospital_main_floor_z3_se_upper"
+    ],
+    "name": "PHAVIAN lab",
+    "looks_like": "microlab_generic",
+    "sym": "L",
+    "see_cost": 5,
+    "color": "light_red"
   }
 ]