diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/by_int_ua/f_tourist_table.png b/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/by_int_ua/f_tourist_table.png
new file mode 100644
index 0000000000..ce7bb47bb5
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/by_int_ua/f_tourist_table.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/by_int_ua/jumper_cable_heavy.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/by_int_ua/jumper_cable_heavy.png
new file mode 100644
index 0000000000..fa3d587d89
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/by_int_ua/jumper_cable_heavy.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/rollmats/rollmats.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/rollmats/rollmats.json
index 3d8815c82a..e91646cf5c 100644
--- a/gfx/UltimateCataclysm/pngs_normal_32x32/items/rollmats/rollmats.json
+++ b/gfx/UltimateCataclysm/pngs_normal_32x32/items/rollmats/rollmats.json
@@ -1,12 +1,10 @@
 [
   {
-    "id": "fur_rollmat",
-    "fg": "fur_rollmat",
-    "bg": ""
+    "id": ["fur_rollmat", "broketent", "largebroketent"],
+    "fg": "fur_rollmat"
   },
   {
-    "id": "rollmat",
-    "fg": "rollmat",
-    "bg": ""
+    "id": ["rollmat", "tent_kit", "large_tent_kit"],
+    "fg": "rollmat"
   }
-]
\ No newline at end of file
+]
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/credits.txt b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/credits.txt
new file mode 100644
index 0000000000..dbd3666a66
--- /dev/null
+++ b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/credits.txt
@@ -0,0 +1,2 @@
+Shape by Solomonhn https://www.blendswap.com/blend/10755
+Updated materials and rendering by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.json b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.json
new file mode 100644
index 0000000000..21642837f6
--- /dev/null
+++ b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.json
@@ -0,0 +1,5 @@
+{
+  "id": "mon_firefly",
+  "fg": "mon_firefly",
+  "bg": "shadow_32x32_small"
+}
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.png b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.png
new file mode 100644
index 0000000000..69599e09b1
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/rabbit/credits.txt b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/rabbit/credits.txt
index 0c9d4a3ecd..b64e873cd0 100644
--- a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/rabbit/credits.txt
+++ b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/rabbit/credits.txt
@@ -1,2 +1,2 @@
 sr_cwya (shape)
-intua (colors)
\ No newline at end of file
+int_ua (colors)
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated.json b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated.json
new file mode 100644
index 0000000000..c52d4173ed
--- /dev/null
+++ b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated.json
@@ -0,0 +1,52 @@
+{
+  "id": "t_wall_metal_corrugated",
+  "fg": "t_wall_metal_corrugated_unconnected",
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "center",
+      "fg": "t_wall_metal_corrugated_center"
+    },
+    {
+      "id": "corner",
+      "fg": [
+        "t_wall_metal_corrugated_corner_nw",
+        "t_wall_metal_corrugated_corner_sw",
+        "t_wall_metal_corrugated_corner_se",
+        "t_wall_metal_corrugated_corner_ne"
+      ]
+    },
+    {
+      "id": "t_connection",
+      "fg": [
+        "t_wall_metal_corrugated_t_connection_n",
+        "t_wall_metal_corrugated_t_connection_w",
+        "t_wall_metal_corrugated_t_connection_s",
+        "t_wall_metal_corrugated_t_connection_e"
+      ]
+    },
+    {
+      "id": "edge",
+      "fg": [
+        "t_wall_metal_corrugated_edge_ns",
+        "t_wall_metal_corrugated_edge_ew"
+      ]
+    },
+    {
+      "id": "end_piece",
+      "fg": [
+        "t_wall_metal_corrugated_end_piece_n",
+        "t_wall_metal_corrugated_end_piece_w",
+        "t_wall_metal_corrugated_end_piece_s",
+        "t_wall_metal_corrugated_end_piece_e"
+      ]
+    },
+    {
+      "id": "unconnected",
+      "fg": [
+        "t_wall_metal_corrugated_unconnected",
+        "t_wall_metal_corrugated_unconnected"
+      ]
+    }
+  ]
+}
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_center.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_center.png
new file mode 100644
index 0000000000..65f2e084ea
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_center.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_ne.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_ne.png
new file mode 100644
index 0000000000..5f29d4f4e0
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_ne.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_nw.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_nw.png
new file mode 100644
index 0000000000..c937fe1559
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_nw.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_se.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_se.png
new file mode 100644
index 0000000000..ed2098bb89
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_se.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_sw.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_sw.png
new file mode 100644
index 0000000000..5c7f7d4680
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_sw.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ew.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ew.png
new file mode 100644
index 0000000000..9b047f93fa
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ew.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ns.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ns.png
new file mode 100644
index 0000000000..bbaf7bb3b9
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ns.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_e.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_e.png
new file mode 100644
index 0000000000..b52663772b
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_e.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_n.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_n.png
new file mode 100644
index 0000000000..e27bff7eb9
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_n.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_s.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_s.png
new file mode 100644
index 0000000000..acf8905ed6
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_s.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_w.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_w.png
new file mode 100644
index 0000000000..c3cbc4a67a
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_w.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_e.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_e.png
new file mode 100644
index 0000000000..61b3aec485
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_e.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_n.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_n.png
new file mode 100644
index 0000000000..a5678c1276
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_n.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_s.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_s.png
new file mode 100644
index 0000000000..eb2fa4979c
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_s.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_w.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_w.png
new file mode 100644
index 0000000000..9e234f427d
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_w.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_unconnected.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_unconnected.png
new file mode 100644
index 0000000000..acf8905ed6
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_unconnected.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/golf_club.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/golf_club.png
new file mode 100644
index 0000000000..2b3d0accf8
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/golf_club.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/press.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/press.png
new file mode 100644
index 0000000000..ea35871f12
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/press.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/tourist_table.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/tourist_table.png
new file mode 100644
index 0000000000..7d75db54a2
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/tourist_table.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/crucible.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/crucible.png
new file mode 100644
index 0000000000..bbfae7d9f8
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/crucible.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tire_iron.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tire_iron.png
new file mode 100644
index 0000000000..5101b9d0de
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tire_iron.png differ