From e6147349add752a141ae7cc665d3e191248d1cbd Mon Sep 17 00:00:00 2001
From: RandumKiwi <RandumKiwi@users.noreply.github.com>
Date: Thu, 17 Jan 2013 20:52:06 +0000
Subject: [PATCH] ch-ch-changes

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7109 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/convert_mapconfig.sh                   |  22 +++++
 packages/maps/official/ac_aqueous.cfg         |  22 ++---
 packages/maps/official/ac_arabian.cfg         |  12 +--
 packages/maps/official/ac_arctic.cfg          |  10 +--
 packages/maps/official/ac_arid.cfg            |  12 +--
 packages/maps/official/ac_avenue.cfg          |  16 ++--
 packages/maps/official/ac_complex.cfg         |   6 +-
 packages/maps/official/ac_depot.cfg           |  14 +--
 packages/maps/official/ac_depot_classic.cfg   |  12 +--
 packages/maps/official/ac_desert.cfg          |  12 +--
 packages/maps/official/ac_desert2.cfg         |  14 +--
 packages/maps/official/ac_desert3.cfg         |  12 +--
 packages/maps/official/ac_douze.cfg           |  12 +--
 packages/maps/official/ac_edifice.cfg         |  12 +--
 packages/maps/official/ac_elevation.cfg       |  10 +--
 packages/maps/official/ac_gothic.cfg          |  10 +--
 packages/maps/official/ac_iceroad.cfg         |  12 +--
 packages/maps/official/ac_industrial.cfg      |  12 +--
 packages/maps/official/ac_ingress.cfg         |  12 +--
 packages/maps/official/ac_keller.cfg          |  12 +--
 packages/maps/official/ac_mines.cfg           |  12 +--
 packages/maps/official/ac_outpost.cfg         |  12 +--
 packages/maps/official/ac_power.cfg           |  20 ++---
 packages/maps/official/ac_rattrap.cfg         |  34 ++++----
 packages/maps/official/ac_scaffold.cfg        |  10 +--
 packages/maps/official/ac_shine.cfg           |  10 +--
 packages/maps/official/ac_snow.cfg            |   6 +-
 packages/maps/official/ac_stellar.cfg         |  16 ++--
 packages/maps/official/ac_sunset.cfg          |  10 +--
 packages/maps/official/ac_toxic.cfg           |  14 +--
 packages/maps/official/ac_urban.cfg           |  16 ++--
 packages/maps/official/ac_werk.cfg            |  12 +--
 packages/textures/makke/license.txt           |   4 +
 packages/textures/makke/rattrap/license.txt   |   5 +-
 .../makke/rattrap/rb_planks02_trim.jpg        | Bin 3693 -> 0 bytes
 packages/textures/mayang/license.txt          |   6 ++
 .../rattrap => mayang}/rb_bricks_01.jpg       | Bin
 .../rattrap => mayang}/rb_bricks_02.jpg       | Bin
 .../rattrap => mayang}/rb_bricks_03.jpg       | Bin
 packages/textures/nieb/license.txt            |  81 ++++++++++++++++++
 packages/textures/nieb/readme.txt             |   9 --
 41 files changed, 317 insertions(+), 216 deletions(-)
 delete mode 100644 packages/textures/makke/rattrap/rb_planks02_trim.jpg
 rename packages/textures/{makke/rattrap => mayang}/rb_bricks_01.jpg (100%)
 rename packages/textures/{makke/rattrap => mayang}/rb_bricks_02.jpg (100%)
 rename packages/textures/{makke/rattrap => mayang}/rb_bricks_03.jpg (100%)
 create mode 100644 packages/textures/nieb/license.txt
 delete mode 100644 packages/textures/nieb/readme.txt

diff --git a/config/convert_mapconfig.sh b/config/convert_mapconfig.sh
index e27355a2..62266235 100644
--- a/config/convert_mapconfig.sh
+++ b/config/convert_mapconfig.sh
@@ -185,6 +185,28 @@ for file in $*; do
     sed -i '/^texture/s/\<makke\/door.jpg\>/golgotha\/door.jpg/g' $file
     sed -i '/^texture/s/\<makke\/smallsteelbox.jpg\>/golgotha\/smallsteelbox.jpg/g' $file
     sed -i '/^texture/s/\<makke\/klappe3.jpg\>/golgotha\/klappe.jpg/g' $file
+    sed -i '/^texture/s/\<makke\/bricks2.jpg\>/mayang\/bricks2.jpg/g' $file
+    sed -i '/^texture/s/\<wotwot\/urban\/manhole1.jpg\>/mayang\/manhole1.jpg/g' $file
+    sed -i '/^texture/s/\<wotwot\/urban\/hatch1.jpg\>/mayang\/hatch1.jpg/g' $file
+    sed -i '/^texture/s/\<wotwot\/urban\/grill2_s.jpg\>/mayang\/grill2_s.jpg/g' $file
+    sed -i '/^texture/s/\<wotwot\/urban\/door3.jpg\>/mayang\/door3.jpg/g' $file
+    sed -i '/^texture/s/\<wotwot\/urban\/airvent1.jpg\>/mayang\/airvent1.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_trim_03.jpg\>/golgotha\/rb_trim_03.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_window.jpg\>/makke\/rb_window.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_window2.jpg\>/makke\/rb_window2.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_trim_01.jpg\>/noctua\/ground\/rb_trim_01.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_trim_02.jpg\>/makke\/rb_trim_02.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_box_01.jpg\>/makke\/rattrap\/rb_box_01.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_box_02.jpg\>/makke\/rattrap\/rb_box_02.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_box_03.jpg\>/makke\/rattrap\/rb_box_03.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_box_04.jpg\>/makke\/rattrap\/rb_box_04.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_box_05.jpg\>/makke\/rattrap\/rb_box_05.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_box_06.jpg\>/makke\/rattrap\/rb_box_06.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_concrete.jpg\>/makke\/rattrap\/rb_concrete.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_bricks_01.jpg\>/mayang\/rb_bricks_01.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_bricks_02.jpg\>/mayang\/rb_bricks_02.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_bricks_03.jpg\>/mayang\/rb_bricks_03.jpg/g' $file
+    sed -i '/^texture/s/\<rattrap\/rb_planks02_trim.jpg\>/noctua\/wood\/planks02_trim_vert.jpg/g' $file
 
     echo -e "Successfully finished converting: "$file"\n"
   else
diff --git a/packages/maps/official/ac_aqueous.cfg b/packages/maps/official/ac_aqueous.cfg
index c3b3f1cd..171eefb2 100644
--- a/packages/maps/official/ac_aqueous.cfg
+++ b/packages/maps/official/ac_aqueous.cfg
@@ -335,12 +335,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -358,8 +358,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -390,7 +390,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./misterfloppy/keller/light2.jpg"
 texture 0 "./misterfloppy/keller/light.jpg"
 texture 0 "./wotwot/urban/cableshelf1_s_ver.jpg"
@@ -405,14 +405,14 @@ texture 0 "./wotwot/urban/electric2_bla.jpg"
 texture 0 "./wotwot/urban/asphalt1_l.jpg"
 texture 0 "./wotwot/urban/metaltrim1_ver.jpg"
 texture 0 "./wotwot/urban/metaltrim1_hor.jpg"
-texture 0 "./wotwot/urban/door3.jpg"
-texture 0 "./wotwot/urban/airvent1.jpg"
+texture 0 "./mayang/door3.jpg"
+texture 0 "./mayang/airvent1.jpg"
 texture 0 "./wotwot/urban/ventilation1.jpg"
-texture 0 "./wotwot/urban/grill2_s.jpg"
+texture 0 "./mayang/grill2_s.jpg"
 texture 0 "./wotwot/urban/cableshelf1_s_hor.jpg"
 texture 0 "./wotwot/urban/cableshelf1_m_hor.jpg"
-texture 0 "./wotwot/urban/hatch1.jpg"
-texture 0 "./wotwot/urban/manhole1.jpg"
+texture 0 "./mayang/hatch1.jpg"
+texture 0 "./mayang/manhole1.jpg"
 texture 0 "./makke/door_metal.jpg"
 texture 0 "./makke/door_rust.jpg"
 mapsoundreset
diff --git a/packages/maps/official/ac_arabian.cfg b/packages/maps/official/ac_arabian.cfg
index 775468a0..22db3ef4 100644
--- a/packages/maps/official/ac_arabian.cfg
+++ b/packages/maps/official/ac_arabian.cfg
@@ -330,12 +330,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -353,8 +353,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -385,7 +385,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"
 mapsoundreset
 mapsound "./ambience/cavedrip.ogg" -1
diff --git a/packages/maps/official/ac_arctic.cfg b/packages/maps/official/ac_arctic.cfg
index 9c81ef5a..bf545678 100644
--- a/packages/maps/official/ac_arctic.cfg
+++ b/packages/maps/official/ac_arctic.cfg
@@ -324,12 +324,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -347,8 +347,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
diff --git a/packages/maps/official/ac_arid.cfg b/packages/maps/official/ac_arid.cfg
index 535b3962..35d7f206 100644
--- a/packages/maps/official/ac_arid.cfg
+++ b/packages/maps/official/ac_arid.cfg
@@ -349,12 +349,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -372,8 +372,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -404,7 +404,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/special_stone15.jpg"
diff --git a/packages/maps/official/ac_avenue.cfg b/packages/maps/official/ac_avenue.cfg
index 9b6b2e59..cca56c1f 100644
--- a/packages/maps/official/ac_avenue.cfg
+++ b/packages/maps/official/ac_avenue.cfg
@@ -359,12 +359,12 @@ texture 0 "boeck/gully.jpg"
 texture 0 "boeck/aircon2.jpg"
 texture 0 "makke/aircon.jpg"
 texture 0 "makke/aircon_sm.jpg"
-texture 0 "makke/door.jpg"
+texture 0 "golgotha/door.jpg"
 texture 0 "makke/klappe.jpg"
 texture 0 "makke/klappe2.jpg"
-texture 0 "makke/klappe3.jpg"
+texture 0 "golgotha/klappe.jpg"
 texture 0 "makke/neuklappe.jpg"
-texture 0 "makke/panel.jpg"
+texture 0 "golgotha/panel.jpg"
 texture 0 "3dcafe/objects09_a.jpg"
 texture 0 "golgotha/elecpanelstwo.jpg"
 texture 0 "mitaman/various/metal_trim_4_v.jpg"
@@ -382,8 +382,8 @@ texture 0 "makke/stairtrim.jpg"
 texture 0 "makke/metalstair1.jpg"
 texture 0 "makke/metalstair2.jpg"
 texture 0 "zastrow/metal_siding_kinksb.jpg"
-texture 0 "makke/window.jpg"
-texture 0 "makke/windows.jpg"
+texture 0 "golgotha/window.jpg"
+texture 0 "golgotha/windows.jpg"
 texture 0 "zastrow/sub_window31.jpg"
 texture 0 "zastrow/sub_window33.jpg"
 texture 0 "zastrow/sub_window23.jpg"
@@ -414,10 +414,10 @@ texture 0 "zastrow/wood_crate_12.jpg"
 texture 0 "makke/box_2.jpg"
 texture 0 "makke/box_4.jpg"
 texture 0 "makke/box_3.jpg"
-texture 0 "makke/smallsteelbox.jpg"
+texture 0 "golgotha/smallsteelbox.jpg"
 texture 0 "drunkenM/rock_wall1.jpg"
-texture 0 "./wotwot/urban/grill2_s.jpg"
-texture 0 "./wotwot/urban/manhole1.jpg"
+texture 0 "./mayang/grill2_s.jpg"
+texture 0 "./mayang/manhole1.jpg"
 mapsoundreset
 mapsound "ambience/cavedrip.ogg" -1
 mapsound "ambience/distant_cars.ogg" -1
diff --git a/packages/maps/official/ac_complex.cfg b/packages/maps/official/ac_complex.cfg
index 1898633a..6c899429 100644
--- a/packages/maps/official/ac_complex.cfg
+++ b/packages/maps/official/ac_complex.cfg
@@ -283,9 +283,9 @@ texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/panel.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/panel.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./makke/lampe.jpg"
diff --git a/packages/maps/official/ac_depot.cfg b/packages/maps/official/ac_depot.cfg
index a091f2e2..ec32a363 100644
--- a/packages/maps/official/ac_depot.cfg
+++ b/packages/maps/official/ac_depot.cfg
@@ -225,15 +225,15 @@ texture 0 "./noctua/stone/stone18.jpg"
 texture 0 "./noctua/stone/stone19.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/black.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/stein.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./boeck/rolltor.jpg"
 texture 0 "./makke/rock.jpg"
 texture 0 "./makke/rock.jpg"
@@ -242,9 +242,9 @@ texture 0 "./makke/rock.jpg"
 texture 0 "./makke/rock.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./boeck/rolltor.jpg"
 texture 0 "./makke/rock.jpg"
 texture 0 "./makke/rock.jpg"
@@ -304,8 +304,8 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./zastrow/2wood_crate_10.jpg"
 texture 0 "./zastrow/3wood_crate_10.jpg"
 texture 0 "./zastrow/wood_crate_10.jpg"
-texture 0 "./makke/klappe3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/klappe.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 
 mapsoundreset
 mapsound "./ambience/cavedrip.ogg" -1		//0
diff --git a/packages/maps/official/ac_depot_classic.cfg b/packages/maps/official/ac_depot_classic.cfg
index 69a51929..f7156960 100644
--- a/packages/maps/official/ac_depot_classic.cfg
+++ b/packages/maps/official/ac_depot_classic.cfg
@@ -225,15 +225,15 @@ texture 0 "./noctua/stone/stone18.jpg"
 texture 0 "./noctua/stone/stone19.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/black.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/stein.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./boeck/rolltor.jpg"
 texture 0 "./makke/rock.jpg"
 texture 0 "./makke/rock.jpg"
@@ -242,9 +242,9 @@ texture 0 "./makke/rock.jpg"
 texture 0 "./makke/rock.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./boeck/rolltor.jpg"
 texture 0 "./makke/rock.jpg"
 texture 0 "./makke/rock.jpg"
@@ -304,4 +304,4 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./zastrow/2wood_crate_10.jpg"
 texture 0 "./zastrow/3wood_crate_10.jpg"
 texture 0 "./zastrow/wood_crate_10.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
diff --git a/packages/maps/official/ac_desert.cfg b/packages/maps/official/ac_desert.cfg
index 36c29f4f..8cf75d2a 100644
--- a/packages/maps/official/ac_desert.cfg
+++ b/packages/maps/official/ac_desert.cfg
@@ -250,12 +250,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -270,13 +270,13 @@ texture 0 "./makke/lampe_tile_a.jpg"
 texture 0 "./makke/lampe_tile2.jpg"
 texture 0 "./makke/lampe_tile2_a.jpg"
 texture 0 "./kurt/klite1.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
diff --git a/packages/maps/official/ac_desert2.cfg b/packages/maps/official/ac_desert2.cfg
index 72bc8d3b..8e7c339d 100644
--- a/packages/maps/official/ac_desert2.cfg
+++ b/packages/maps/official/ac_desert2.cfg
@@ -255,12 +255,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -275,13 +275,13 @@ texture 0 "./makke/lampe_tile_a.jpg"
 texture 0 "./makke/lampe_tile2.jpg"
 texture 0 "./makke/lampe_tile2_a.jpg"
 texture 0 "./kurt/klite1.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -312,7 +312,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 mapsoundreset
 mapsound "./ambience/cavedrip.ogg" -1
 mapsound "./ambience/distant_cars.ogg" -1
diff --git a/packages/maps/official/ac_desert3.cfg b/packages/maps/official/ac_desert3.cfg
index 9bb568b6..e46f2128 100644
--- a/packages/maps/official/ac_desert3.cfg
+++ b/packages/maps/official/ac_desert3.cfg
@@ -255,12 +255,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -275,13 +275,13 @@ texture 0 "./makke/lampe_tile_a.jpg"
 texture 0 "./makke/lampe_tile2.jpg"
 texture 0 "./makke/lampe_tile2_a.jpg"
 texture 0 "./kurt/klite1.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
diff --git a/packages/maps/official/ac_douze.cfg b/packages/maps/official/ac_douze.cfg
index 94965f37..620730c5 100644
--- a/packages/maps/official/ac_douze.cfg
+++ b/packages/maps/official/ac_douze.cfg
@@ -333,12 +333,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -356,8 +356,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -388,7 +388,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"
 texture 0 "./makke/douze.jpg"
 texture 0 "./makke/clayceiling.jpg"
diff --git a/packages/maps/official/ac_edifice.cfg b/packages/maps/official/ac_edifice.cfg
index 6dd4e566..5fefa654 100644
--- a/packages/maps/official/ac_edifice.cfg
+++ b/packages/maps/official/ac_edifice.cfg
@@ -349,12 +349,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -372,8 +372,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -404,7 +404,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"
 texture 0 "./wotwot/urban/cableshelf1_s_hor.jpg"
 texture 0 "./wotwot/urban/cableshelf1_m_hor.jpg"
diff --git a/packages/maps/official/ac_elevation.cfg b/packages/maps/official/ac_elevation.cfg
index 8d0c9bbb..71e7af88 100644
--- a/packages/maps/official/ac_elevation.cfg
+++ b/packages/maps/official/ac_elevation.cfg
@@ -253,12 +253,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -276,8 +276,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
diff --git a/packages/maps/official/ac_gothic.cfg b/packages/maps/official/ac_gothic.cfg
index fdb14401..ca81aedb 100644
--- a/packages/maps/official/ac_gothic.cfg
+++ b/packages/maps/official/ac_gothic.cfg
@@ -303,12 +303,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -326,8 +326,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
diff --git a/packages/maps/official/ac_iceroad.cfg b/packages/maps/official/ac_iceroad.cfg
index e03da579..670105d3 100644
--- a/packages/maps/official/ac_iceroad.cfg
+++ b/packages/maps/official/ac_iceroad.cfg
@@ -349,12 +349,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -372,8 +372,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -404,7 +404,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"
 texture 0 "./wotwot/urban/cableshelf1_m_ver.jpg"
 texture 0 "./wotwot/urban/cableshelf1_m_hor.jpg"
diff --git a/packages/maps/official/ac_industrial.cfg b/packages/maps/official/ac_industrial.cfg
index a5001685..9eb96131 100644
--- a/packages/maps/official/ac_industrial.cfg
+++ b/packages/maps/official/ac_industrial.cfg
@@ -358,12 +358,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -381,8 +381,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -413,7 +413,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"
 texture 0 "./wotwot/urban/ventilation1.jpg"
  texture 0 "./wotwot/urban/grill2_s.jpg"
diff --git a/packages/maps/official/ac_ingress.cfg b/packages/maps/official/ac_ingress.cfg
index d6873939..486af93a 100644
--- a/packages/maps/official/ac_ingress.cfg
+++ b/packages/maps/official/ac_ingress.cfg
@@ -362,12 +362,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -385,8 +385,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -417,7 +417,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"
 mapsoundreset
diff --git a/packages/maps/official/ac_keller.cfg b/packages/maps/official/ac_keller.cfg
index e21d5397..6191eafa 100644
--- a/packages/maps/official/ac_keller.cfg
+++ b/packages/maps/official/ac_keller.cfg
@@ -276,12 +276,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -299,8 +299,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -333,7 +333,7 @@ texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
 texture 0 "./wotwot/urban/electric4.jpg"
 texture 0 "./wotwot/urban/electric4_plain.jpg"
-texture 0 "./wotwot/urban/door3.jpg"
+texture 0 "./mayang/door3.jpg"
 texture 0 "./wotwot/urban/electric3.jpg"
 texture 0 "./wotwot/urban/electric3_plain.jpg"
 texture 0 "./wotwot/urban/electric1.jpg"
diff --git a/packages/maps/official/ac_mines.cfg b/packages/maps/official/ac_mines.cfg
index bcb16153..69f15e32 100644
--- a/packages/maps/official/ac_mines.cfg
+++ b/packages/maps/official/ac_mines.cfg
@@ -222,15 +222,15 @@ texture 0 "./noctua/stone/stone18.jpg"
 texture 0 "./noctua/stone/stone19.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/black.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/black.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/bricky.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/lampe_tile_a.jpg"
 texture 0 "./makke/lampe_tile2_a.jpg"
 texture 0 "./noctua/textile/carpet03.jpg"
@@ -239,9 +239,9 @@ texture 0 "./noctua/textile/carpet05.jpg"
 texture 0 "./makke/bricky.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./noctua/textile/burlap01.jpg"
 texture 0 "./makke/box_3.jpg"
 texture 0 "./makke/box_2.jpg"
@@ -301,7 +301,7 @@ texture 0 "./makke/rock.jpg"
 texture 0 "./zastrow/2wood_crate_10.jpg"
 texture 0 "./zastrow/3wood_crate_10.jpg"
 texture 0 "./zastrow/wood_crate_10.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./makke/lampe.jpg"
diff --git a/packages/maps/official/ac_outpost.cfg b/packages/maps/official/ac_outpost.cfg
index b95ae4a9..0e8958f7 100644
--- a/packages/maps/official/ac_outpost.cfg
+++ b/packages/maps/official/ac_outpost.cfg
@@ -361,12 +361,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -384,8 +384,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -416,7 +416,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"
 texture 0 "./jamz/double_door_r.jpg"
 texture 0 "./jamz/old_door3.jpg"
diff --git a/packages/maps/official/ac_power.cfg b/packages/maps/official/ac_power.cfg
index 9cf7dcad..642fad50 100644
--- a/packages/maps/official/ac_power.cfg
+++ b/packages/maps/official/ac_power.cfg
@@ -221,12 +221,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -244,8 +244,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -269,14 +269,14 @@ texture 0 "./wotwot/urban/electric2_bla.jpg"
 texture 0 "./wotwot/urban/asphalt1_l.jpg"
 texture 0 "./wotwot/urban/metaltrim1_ver.jpg"
 texture 0 "./wotwot/urban/metaltrim1_hor.jpg"
-texture 0 "./wotwot/urban/door3.jpg"
-texture 0 "./wotwot/urban/airvent1.jpg"
+texture 0 "./mayang/door3.jpg"
+texture 0 "./mayang/airvent1.jpg"
 texture 0 "./wotwot/urban/ventilation1.jpg"
-texture 0 "./wotwot/urban/grill2_s.jpg"
+texture 0 "./mayang/grill2_s.jpg"
 texture 0 "./wotwot/urban/cableshelf1_s_hor.jpg"
 texture 0 "./wotwot/urban/cableshelf1_m_hor.jpg"
-texture 0 "./wotwot/urban/hatch1.jpg"
-texture 0 "./wotwot/urban/manhole1.jpg"
+texture 0 "./mayang/hatch1.jpg"
+texture 0 "./mayang/manhole1.jpg"
 texture 0 "./makke/door_metal.jpg"
 texture 0 "./makke/door_metal.jpg"
 texture 0 "./wotwot/urban/cableshelf1_l_hor.jpg"
diff --git a/packages/maps/official/ac_rattrap.cfg b/packages/maps/official/ac_rattrap.cfg
index 34007544..5f38ebe1 100644
--- a/packages/maps/official/ac_rattrap.cfg
+++ b/packages/maps/official/ac_rattrap.cfg
@@ -43,14 +43,14 @@ loadsky "textures/skymaps/kothic/atsea"
 texturereset
 texture 0 "./kurt/klite1.jpg"
 texture 0 "./makke/black.jpg"
-texture 0 "./rattrap/rb_box_01.jpg"
-texture 0 "./rattrap/rb_box_02.jpg"
-texture 0 "./rattrap/rb_box_03.jpg"
-texture 0 "./rattrap/rb_box_04.jpg"
-texture 0 "./rattrap/rb_box_05.jpg"
-texture 0 "./rattrap/rb_box_06.jpg"
+texture 0 "./makke/rattrap/rb_box_01.jpg"
+texture 0 "./makke/rattrap/rb_box_02.jpg"
+texture 0 "./makke/rattrap/rb_box_03.jpg"
+texture 0 "./makke/rattrap/rb_box_04.jpg"
+texture 0 "./makke/rattrap/rb_box_05.jpg"
+texture 0 "./makke/rattrap/rb_box_06.jpg"
 texture 0 "./zastrow/rb_box_07.jpg"
-texture 0 "./rattrap/rb_concrete.jpg"
+texture 0 "./makke/rattrap/rb_concrete.jpg"
 texture 0 "./arcitool/Cotta1-grau.jpg"
 texture 0 "./arcitool/Cotta2-grau.jpg"
 texture 0 "./arcitool/rohbaubims.jpg"
@@ -75,12 +75,12 @@ texture 0 "./makke/metalstair2.jpg"
 texture 0 "./makke/rock.jpg"
 texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/stein.jpg"
-texture 0 "./makke/window.jpg"
+texture 0 "./golgotha/window.jpg"
 texture 0 "./3dcafe/door10.jpg"
 texture 0 "./golgotha/hhroofgray.jpg"
 texture 0 "./golgotha/tunnel_ceiling.jpg"
 texture 0 "./golgotha/tunnel_ceiling_b.jpg"
-texture 0 "./rattrap/rb_trim_03.jpg"
+texture 0 "./golgotha/rb_trim_03.jpg"
 texture 0 "./grsites/metal026.jpg"
 texture 0 "./zastrow/metal_overlaps.jpg"
 texture 0 "./zastrow/metal_plate_fill.jpg"
@@ -101,7 +101,7 @@ texture 0 "./noctua/wood/planks01_b.jpg"
 texture 0 "./noctua/wood/planks02.jpg"
 texture 0 "./noctua/wood/planks02_hor.jpg"
 texture 0 "./noctua/wood/planks02_trim.jpg"
-texture 0 "./wotwot/urban/door3.jpg"
+texture 0 "./mayang/door3.jpg"
 texture 0 "./wotwot/urban/metaltrim1_hor.jpg"
 texture 0 "./wotwot/urban/metaltrim1_ver.jpg"
 texture 0 "./zastrow/2wood_crate_02.jpg"
@@ -116,14 +116,14 @@ texture 0 "./zastrow/wood_crate_02.jpg"
 texture 0 "./zastrow/wood_crate_03.jpg"
 texture 0 "./zastrow/wood_crate_10.jpg"
 texture 0 "./zastrow/wood_crate_12.jpg"
-texture 0 "./rattrap/rb_bricks_01.jpg"
-texture 0 "./rattrap/rb_bricks_02.jpg"
-texture 0 "./rattrap/rb_bricks_03.jpg"
+texture 0 "./mayang/rb_bricks_01.jpg"
+texture 0 "./mayang/rb_bricks_02.jpg"
+texture 0 "./mayang/rb_bricks_03.jpg"
 texture 0 "./noctua/wood/planks02_trim_vert.jpg"
-texture 0 "./rattrap/rb_trim_01.jpg"
-texture 0 "./rattrap/rb_trim_02.jpg"
-texture 0 "./rattrap/rb_window.jpg"
-texture 0 "./rattrap/rb_window2.jpg"
+texture 0 "./noctua/ground/rb_trim_01.jpg"
+texture 0 "./makke/rb_trim_02.jpg"
+texture 0 "./makke/rb_window.jpg"
+texture 0 "./makke/rb_window2.jpg"
 texture 0 "../models/mapmodels/ratboy/jcdpc_cardboardbox_reskin/skin.jpg"
 mapmodelreset
 mapmodel 1 3 0 0 "makke/barrel"
diff --git a/packages/maps/official/ac_scaffold.cfg b/packages/maps/official/ac_scaffold.cfg
index f5094cf0..ac803af8 100644
--- a/packages/maps/official/ac_scaffold.cfg
+++ b/packages/maps/official/ac_scaffold.cfg
@@ -309,12 +309,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -332,8 +332,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
diff --git a/packages/maps/official/ac_shine.cfg b/packages/maps/official/ac_shine.cfg
index 93ed8594..b5acf71b 100644
--- a/packages/maps/official/ac_shine.cfg
+++ b/packages/maps/official/ac_shine.cfg
@@ -312,12 +312,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -335,8 +335,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
diff --git a/packages/maps/official/ac_snow.cfg b/packages/maps/official/ac_snow.cfg
index eb02c6cd..bc99a6f1 100644
--- a/packages/maps/official/ac_snow.cfg
+++ b/packages/maps/official/ac_snow.cfg
@@ -130,10 +130,10 @@ texture 0 "./noctua/stone/stone19.jpg"
 texture 0 "./boeck/gully.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/rgrates0006.jpg"
@@ -141,7 +141,7 @@ texture 0 "./makke/lampe.jpg"
 texture 0 "./makke/lampe_tile.jpg"
 texture 0 "./makke/lampe_tile2.jpg"
 texture 0 "./makke/metalstair1.jpg"
-texture 0 "./makke/window.jpg"
+texture 0 "./golgotha/window.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window38.jpg"
diff --git a/packages/maps/official/ac_stellar.cfg b/packages/maps/official/ac_stellar.cfg
index 0f53871b..c7f81398 100644
--- a/packages/maps/official/ac_stellar.cfg
+++ b/packages/maps/official/ac_stellar.cfg
@@ -361,12 +361,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -384,8 +384,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -416,11 +416,11 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./wotwot/urban/ventilation1.jpg"
-texture 0 "./wotwot/urban/airvent1.jpg"
+texture 0 "./mayang/airvent1.jpg"
 texture 0 "./misterfloppy/keller/exit_sign.jpg"
-texture 0 "./wotwot/urban/manhole1.jpg"
+texture 0 "./mayang/manhole1.jpg"
 texture 0 "./wotwot/urban/cableshelf1_s_ver.jpg"
 texture 0 "./3dcafe/door10_a.jpg"
 texture 0 "./3dcafe/door07_a.jpg"
diff --git a/packages/maps/official/ac_sunset.cfg b/packages/maps/official/ac_sunset.cfg
index f3fd3659..6fa03800 100644
--- a/packages/maps/official/ac_sunset.cfg
+++ b/packages/maps/official/ac_sunset.cfg
@@ -257,12 +257,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -280,8 +280,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
diff --git a/packages/maps/official/ac_toxic.cfg b/packages/maps/official/ac_toxic.cfg
index 79d9b28c..de055097 100644
--- a/packages/maps/official/ac_toxic.cfg
+++ b/packages/maps/official/ac_toxic.cfg
@@ -180,7 +180,7 @@ texture 0 "./noctua/wall/plast01.jpg"
 texture 0 "./noctua/wall/plast03.jpg"
 texture 0 "./noctua/wall/plast04.jpg"
 texture 0 "./golgotha/5sqtunnelroad.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./boeck/metal_019.jpg"
 texture 0 "./boeck/metal_019_b.jpg"
 texture 0 "./lemog/036metal.jpg"
@@ -290,12 +290,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -313,8 +313,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -345,7 +345,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./wotwot/urban/manhole1.jpg"
+texture 0 "./mayang/manhole1.jpg"
 mapsoundreset
 mapsound "./ambience/cavedrip.ogg" -1
 mapsound "./ambience/distant_cars.ogg" -1
diff --git a/packages/maps/official/ac_urban.cfg b/packages/maps/official/ac_urban.cfg
index 4b924b6c..11aeaf3a 100644
--- a/packages/maps/official/ac_urban.cfg
+++ b/packages/maps/official/ac_urban.cfg
@@ -265,12 +265,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -288,8 +288,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -320,6 +320,6 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg
-texture 0 "./wotwot/urban/manhole1.jpg"
-texture 0 "./wotwot/urban/grill2_s.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg
+texture 0 "./mayang/manhole1.jpg"
+texture 0 "./mayang/grill2_s.jpg"
diff --git a/packages/maps/official/ac_werk.cfg b/packages/maps/official/ac_werk.cfg
index f264fd60..53e61a94 100644
--- a/packages/maps/official/ac_werk.cfg
+++ b/packages/maps/official/ac_werk.cfg
@@ -356,12 +356,12 @@ texture 0 "./boeck/gully.jpg"
 texture 0 "./boeck/aircon2.jpg"
 texture 0 "./makke/aircon.jpg"
 texture 0 "./makke/aircon_sm.jpg"
-texture 0 "./makke/door.jpg"
+texture 0 "./golgotha/door.jpg"
 texture 0 "./makke/klappe.jpg"
 texture 0 "./makke/klappe2.jpg"
-texture 0 "./makke/klappe3.jpg"
+texture 0 "./golgotha/klappe.jpg"
 texture 0 "./makke/neuklappe.jpg"
-texture 0 "./makke/panel.jpg"
+texture 0 "./golgotha/panel.jpg"
 texture 0 "./3dcafe/objects09_a.jpg"
 texture 0 "./golgotha/elecpanelstwo.jpg"
 texture 0 "./mitaman/various/metal_trim_4_v.jpg"
@@ -379,8 +379,8 @@ texture 0 "./makke/stairtrim.jpg"
 texture 0 "./makke/metalstair1.jpg"
 texture 0 "./makke/metalstair2.jpg"
 texture 0 "./zastrow/metal_siding_kinksb.jpg"
-texture 0 "./makke/window.jpg"
-texture 0 "./makke/windows.jpg"
+texture 0 "./golgotha/window.jpg"
+texture 0 "./golgotha/windows.jpg"
 texture 0 "./zastrow/sub_window31.jpg"
 texture 0 "./zastrow/sub_window33.jpg"
 texture 0 "./zastrow/sub_window23.jpg"
@@ -411,7 +411,7 @@ texture 0 "./zastrow/wood_crate_12.jpg"
 texture 0 "./makke/box_2.jpg"
 texture 0 "./makke/box_4.jpg"
 texture 0 "./makke/box_3.jpg"
-texture 0 "./makke/smallsteelbox.jpg"
+texture 0 "./golgotha/smallsteelbox.jpg"
 texture 0 "./drunkenM/rock_wall1.jpg"	
 texture 0 "./misterfloppy/keller/door_01.jpg"
 texture 0 "./misterfloppy/keller/door_02.jpg"
diff --git a/packages/textures/makke/license.txt b/packages/textures/makke/license.txt
index 0389f908..15c27f55 100644
--- a/packages/textures/makke/license.txt
+++ b/packages/textures/makke/license.txt
@@ -5,6 +5,9 @@ These five textures files:
   * platten.jpg
   * tiles.jpg
   * black.jpg
+  * rb_window.jpg
+  * rb_window2.jpg
+  * douze.jpg
 
 ...are copyright (all rights reserved) by:
 	 Markus "makkE" Bekel
@@ -18,6 +21,7 @@ find the original source and adhere to their license, you MUST assume that the
 data is COPYRIGHT and you are NOT allowed to redistribute that data outside
 of an UNMODIFIED AssaultCube package(s).
 
+
 Some of the sources would have included:
 ================================================================================
 http://www.mayang.com/textures
diff --git a/packages/textures/makke/rattrap/license.txt b/packages/textures/makke/rattrap/license.txt
index 007c0f11..b7edbdf5 100644
--- a/packages/textures/makke/rattrap/license.txt
+++ b/packages/textures/makke/rattrap/license.txt
@@ -3,10 +3,7 @@
 * rb_box_03.jpg
 * rb_box_04.jpg
 * rb_box_05.jpg
-* rb_box_06.jpg
-* rb_bricks_01.jpg
-* rb_bricks_02.jpg
-* rb_bricks_03.jpg
+* rb_box_06.jpg
 * rb_concrete.jpg
 
 These are re-assembled from: packages/textures/makke
diff --git a/packages/textures/makke/rattrap/rb_planks02_trim.jpg b/packages/textures/makke/rattrap/rb_planks02_trim.jpg
deleted file mode 100644
index 57e03487b635c1efee1236c2ecfff7a9e03cad43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3693
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
X{<03!7O1u)+MyFt?Owm4TB7G~lql9(

diff --git a/packages/textures/mayang/license.txt b/packages/textures/mayang/license.txt
index 78f7de3f..fda5ff6b 100644
--- a/packages/textures/mayang/license.txt
+++ b/packages/textures/mayang/license.txt
@@ -26,3 +26,9 @@ These files would have been re-processed either by:
 	Markus "makkE" Bekel
    or:
 	wotwot
+
+The files with an "rb" prefix were re-processed by:
+	Pablo "RatBoy" Ciamarra
+
+... using "../makke/concrete_trim.jpg", so you'll need to adhere to that license
+for these images also.
\ No newline at end of file
diff --git a/packages/textures/makke/rattrap/rb_bricks_01.jpg b/packages/textures/mayang/rb_bricks_01.jpg
similarity index 100%
rename from packages/textures/makke/rattrap/rb_bricks_01.jpg
rename to packages/textures/mayang/rb_bricks_01.jpg
diff --git a/packages/textures/makke/rattrap/rb_bricks_02.jpg b/packages/textures/mayang/rb_bricks_02.jpg
similarity index 100%
rename from packages/textures/makke/rattrap/rb_bricks_02.jpg
rename to packages/textures/mayang/rb_bricks_02.jpg
diff --git a/packages/textures/makke/rattrap/rb_bricks_03.jpg b/packages/textures/mayang/rb_bricks_03.jpg
similarity index 100%
rename from packages/textures/makke/rattrap/rb_bricks_03.jpg
rename to packages/textures/mayang/rb_bricks_03.jpg
diff --git a/packages/textures/nieb/license.txt b/packages/textures/nieb/license.txt
new file mode 100644
index 00000000..25b7366f
--- /dev/null
+++ b/packages/textures/nieb/license.txt
@@ -0,0 +1,81 @@
+Textures by Nieb. Special thanks to makkE for critique and assistance. 
+
+All textures made with sources from:
+================================================================================
+http://www.burningwell.org/
+
+How may I use the images in the BurningWell repository?
+
+The images in the BurningWell repository are in the public domain. Basically, 
+this means that you are allowed to use the images freely for any purpose,
+commercial or private. You do not have to pay to use them, or even acknowledge
+or give credit to the BurningWell repository or original photographer (unless you
+are feeling generous).
+
+When recognizable people appear in any of the images, the photographers have
+obtained a "model release" and assigned all rights to the public domain. This
+allows the images to be used in any manner, including advertising. 
+================================================================================
+http://www.cgtextures.com/
+
+Please read this for the full license:
+	http://www.cgtextures.com/content.php?action=license
+
+To comply with their license, we have included the following text in this file:
+
+One or more textures on this 3D model have been created with images from CGTextures.com.
+These images may not be redistributed by default, please visit www.cgtextures.com for more information.
+
+
+Here is a quick brief of their license (please see their website for full terms):
+---------------------------------------------------------------------------------
+Use of the Textures is only allowed under the following conditions:
+ - Private or commercial use.
+ - Use in 2D or 3D computer graphics, movies and printed media.
+ - Incorporation in computer games, 3D models.
+ - Selling 3D models bundled with modified versions of the textures, when the
+   texture is customized for the 3D model.
+
+It is NOT permitted to:
+ - Sell or distribute any of these textures in an unmodified form, or where the
+   derived product you are selling or distributing is a Texture or a collection of 
+   Textures. IN OTHER WORDS: Do not sell or distribute any of these textures
+   (modified or not) by itself or in a texture pack, material, clipart, website
+   theme or scrapbooking pack!
+ - Bundle the images with software such as paint programs, 3D programs, photo-kiosk
+   software.
+ - Reselling or redistributing the images at 'print on demand' services (mugs, 
+   t-shirts, mouse mats, etc).
+ - Use the textures in graphic design themes or templates sold to multiple customers
+   on digital market places (this includes templates of websites and business cards
+   and e-cards).
+ - Selling or redistributing skins for laptops, phones and other devices, created
+   with images from CGTextures.
+ - Stockpile images with the goal of making a local texture library.
+ - Using a special program (spider, leecher) or script to automatically download all
+   Textures on the CGTextures website. Users who try to mass download will be banned
+   from the website automatically.
+ - Interfere with the security or otherwise abuse, disrupt, place excessive loads on,
+   or attempt to gain unauthorized access to the CGTextures website or any system
+   resources or networks connected to this website.
+ - Release the Textures or derivative products under Open Source Licences
+================================================================================
+http://www.imageafter.com/
+
+WHAT CAN YOU DO WITH IMAGE*AFTER IMAGES AND TEXTURES?
+ * You CAN modify our images and textures in any way you see fit.
+ * You CAN use our images and textures in your own work, whether it be for 
+    personal or commercial use.
+ * You CAN redistribute or sell our images and textures ALTERED OR UNALTERED as
+   part of printed work (e.g. posters, cd-covers, postcards, etc).
+
+WHAT CAN'T YOU DO WITH IMAGE*AFTER IMAGES AND TEXTURES?
+
+ * You CANNOT REDISTRIBUTE our images and textures as part of an online resource
+   site like our own, i.e. use them to directly compete with us.
+================================================================================
+http://www.ryane.com/
+
+USAGE: Feel free to use these texture where-ever you wish. Just let people know
+where you got it from.
+
diff --git a/packages/textures/nieb/readme.txt b/packages/textures/nieb/readme.txt
deleted file mode 100644
index 4d69ea2c..00000000
--- a/packages/textures/nieb/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Textures by Nieb
-
-Special thanks to makkE for critique and assistance. 
-
-All textures made with sources from:
-http://www.burningwell.org/
-http://www.cgtextures.com/
-http://www.imageafter.com/
-http://www.ryane.com/
\ No newline at end of file