diff --git a/MAPPACK.md b/MAPPACK.md
index aff2c2678..e762a047d 100644
--- a/MAPPACK.md
+++ b/MAPPACK.md
@@ -9,4 +9,5 @@ wop_alongwayCTL | A Long Way | Hectic | [![GPL-3.0](https://www.gnu.org/graphics
 wop_coloor | Coloor | 3aTmE! | [![CC-BY-NC](https://mirrors.creativecommons.org/presskit/buttons/88x31/svg/by-nc.svg "CC-BY-NC")](https://creativecommons.org/licenses/by-nc/4.0/)
 wop_fragbox | FragBox | 3aTmE! | [![CC-BY-NC](https://mirrors.creativecommons.org/presskit/buttons/88x31/svg/by-nc.svg "CC-BY-NC")](https://creativecommons.org/licenses/by-nc/4.0/)
 wop_pacman | Pac-Man | Hectic | [![GPL-3.0](https://www.gnu.org/graphics/gplv3-127x51.png "GPL-3.0")](https://www.gnu.org/licenses/gpl-3.0.html)
+wop_tinyCTL | TinyCTL | Blu | [![WTFPL](https://upload.wikimedia.org/wikipedia/commons/f/fa/WTFPL_badge.png "WTFPL")](http://www.wtfpl.net/)
 wop_workshop / wop_workshopBB | Workshop | Hectic | [![GPL-3.0](https://www.gnu.org/graphics/gplv3-127x51.png "GPL-3.0")](https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/wop/CMakeLists.txt b/wop/CMakeLists.txt
index a8b306275..75ba13ccf 100644
--- a/wop/CMakeLists.txt
+++ b/wop/CMakeLists.txt
@@ -142,6 +142,7 @@ set(MAPPACK_BSPS
     wop_coloor.bsp
     wop_fragbox.bsp
     wop_pacman.bsp
+    wop_tinyCTL.bsp
     wop_workshop.bsp
     wop_workshopBB.bsp
 )
diff --git a/wop/mappack.pk3dir/levelshots/blu_tinyctl.jpg b/wop/mappack.pk3dir/levelshots/blu_tinyctl.jpg
deleted file mode 100644
index e9c16eb99..000000000
--- a/wop/mappack.pk3dir/levelshots/blu_tinyctl.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1f3a3b40b7275774c20b0048a562315f3c944eb9e87ca7381a6938349b120a0
-size 1724300
diff --git a/wop/mappack.pk3dir/levelshots/blu_tinyctlA.jpg b/wop/mappack.pk3dir/levelshots/blu_tinyctlA.jpg
deleted file mode 100644
index be8feca99..000000000
--- a/wop/mappack.pk3dir/levelshots/blu_tinyctlA.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:693bee71397542ebc3441cf32310c40262ab1660cebc668d611166e036ec6e89
-size 1808371
diff --git a/wop/mappack.pk3dir/levelshots/wop_tinyCTL.jpg b/wop/mappack.pk3dir/levelshots/wop_tinyCTL.jpg
new file mode 100644
index 000000000..2a8b2da0b
--- /dev/null
+++ b/wop/mappack.pk3dir/levelshots/wop_tinyCTL.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e64e5678ce8fab06b94fef9a40cf68bfaeac9d73958554a7b293f52d4805ec3f
+size 304836
diff --git a/wop/mappack.pk3dir/levelshots/wop_tinyCTLA.jpg b/wop/mappack.pk3dir/levelshots/wop_tinyCTLA.jpg
new file mode 100644
index 000000000..ce6e70bd2
--- /dev/null
+++ b/wop/mappack.pk3dir/levelshots/wop_tinyCTLA.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bae308cedf174a530cdc71f8e8f9e3212b4ef1adfd72777bc7c9d5c67fbe615c
+size 73118
diff --git a/wop/mappack.pk3dir/levelshots/wop_tinyCTLB1.jpg b/wop/mappack.pk3dir/levelshots/wop_tinyCTLB1.jpg
new file mode 100644
index 000000000..47643d41a
--- /dev/null
+++ b/wop/mappack.pk3dir/levelshots/wop_tinyCTLB1.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90d80a24cfd57424b925db40d81489c15374d338c81dcd8663ead0cb6565a6b0
+size 47227
diff --git a/wop/mappack.pk3dir/levelshots/wop_tinyCTLB2.jpg b/wop/mappack.pk3dir/levelshots/wop_tinyCTLB2.jpg
new file mode 100644
index 000000000..a228ec53f
--- /dev/null
+++ b/wop/mappack.pk3dir/levelshots/wop_tinyCTLB2.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:141dbe57ad76dbef39459818f661041ad919c7673e22a8045e4da031217eabfe
+size 42833
diff --git a/wop/mappack.pk3dir/levelshots/wop_tinyCTLB3.jpg b/wop/mappack.pk3dir/levelshots/wop_tinyCTLB3.jpg
new file mode 100644
index 000000000..8e9b073a3
--- /dev/null
+++ b/wop/mappack.pk3dir/levelshots/wop_tinyCTLB3.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4288c15906c3bbbc02666096cadb09c4306fa837ca07a87ec948ce06ad1c6810
+size 52857
diff --git a/wop/mappack.pk3dir/maps/blu_tinyctl.aas b/wop/mappack.pk3dir/maps/blu_tinyctl.aas
deleted file mode 100644
index df6abe1e9..000000000
Binary files a/wop/mappack.pk3dir/maps/blu_tinyctl.aas and /dev/null differ
diff --git a/wop/mappack.pk3dir/maps/blu_tinyctl.bsp b/wop/mappack.pk3dir/maps/blu_tinyctl.bsp
deleted file mode 100644
index e5fa41027..000000000
--- a/wop/mappack.pk3dir/maps/blu_tinyctl.bsp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5929ee6029bdbc0e62c6a6c0b3038b88e6389542832b2a43cbf4881438b58dcc
-size 1459252
diff --git a/wop/mappack.pk3dir/maps/wop_tinyCTL.aas b/wop/mappack.pk3dir/maps/wop_tinyCTL.aas
new file mode 100644
index 000000000..ac789155f
Binary files /dev/null and b/wop/mappack.pk3dir/maps/wop_tinyCTL.aas differ
diff --git a/wop/mappack.pk3dir/maps/wop_tinyCTL.bsp b/wop/mappack.pk3dir/maps/wop_tinyCTL.bsp
new file mode 100644
index 000000000..ae36a398d
--- /dev/null
+++ b/wop/mappack.pk3dir/maps/wop_tinyCTL.bsp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c91be6454eedc1990b002405b786ee863879e852bda7fde806da2285a557e524
+size 3113832
diff --git a/wop/mappack.pk3dir/maps/blu_tinyctl.map b/wop/mappack.pk3dir/maps/wop_tinyCTL.map
similarity index 99%
rename from wop/mappack.pk3dir/maps/blu_tinyctl.map
rename to wop/mappack.pk3dir/maps/wop_tinyCTL.map
index a21b43975..2a13e001a 100644
--- a/wop/mappack.pk3dir/maps/blu_tinyctl.map
+++ b/wop/mappack.pk3dir/maps/wop_tinyCTL.map
@@ -1,8 +1,9 @@
-
 // entity 0
 {
 "classname" "worldspawn"
-"ambient" "25"
+"message" "TinyCTL by Blu"
+"_lightmapscale" "0.5"
+"_minlight" "25"
 // brush 0
 {
 ( 1472 -64 -168 ) ( 1536 64 -168 ) ( 1472 64 -168 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -4877,7 +4878,7 @@ pad_tex/col18
 {
 ( 0 64 -1008 ) ( 0 -64 -1008 ) ( -576 64 -1008 ) pad_tex/col05 0 0 0 0.5 0.5 0 0 0
 ( 0 64 -1008 ) ( -576 64 -1008 ) ( 0 64 -1024 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -576 -64 -1024 ) ( 0 -64 -1024 ) ( -576 64 -1024 ) common/invisible 0 0 0 0.5 0.5 0 0 0
+( -576 -64 -1024 ) ( 0 -64 -1024 ) ( -576 64 -1024 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -576 -64 -1024 ) ( -576 -64 -1008 ) ( 0 -64 -1024 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -576 -64 -1024 ) ( -576 64 -1024 ) ( -576 -64 -1008 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 576 64 -1024 ) ( 576 -64 -1024 ) ( 576 64 -1008 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -4949,12 +4950,12 @@ pad_tex/col18
 }
 // brush 492
 {
-( 64 -64 -912 ) ( 64 64 -912 ) ( 640 -64 -912 ) pad_bookroom/hotlava 0 0 0 0.5 0.5 0 0 0
-( 0 -64 -176 ) ( 576 -64 -176 ) ( 0 -64 -1008 ) common/invisible 0 0 0 0.5 0.5 0 0 0
-( 560 64 -1024 ) ( -16 64 -1024 ) ( 560 -64 -1024 ) common/invisible 0 0 0 0.5 0.5 0 0 0
-( 576 64 -1008 ) ( 576 64 -176 ) ( 0 64 -1008 ) common/invisible 0 0 0 0.5 0.5 0 0 0
-( 576 64 -1008 ) ( 576 -64 -1008 ) ( 576 64 -176 ) common/invisible 0 0 0 0.5 0.5 0 0 0
-( -576 -64 -1008 ) ( -576 64 -1008 ) ( -576 -64 -176 ) common/invisible 0 0 0 0.5 0.5 0 0 0
+( 64 -64 -912 ) ( 64 64 -912 ) ( 640 -64 -912 ) pad_gfx02b/hotlava1 0 0 0 0.5 0.5 0 0 0
+( 0 -64 -176 ) ( 576 -64 -176 ) ( 0 -64 -1008 ) common/lavacaulk 0 0 0 0.5 0.5 0 0 0
+( 561 64 -1008 ) ( -15 64 -1008 ) ( 561 -64 -1008 ) common/lavacaulk 126 0 0 0.5 0.5 0 0 0
+( 576 64 -1008 ) ( 576 64 -176 ) ( 0 64 -1008 ) common/lavacaulk 0 0 0 0.5 0.5 0 0 0
+( 576 64 -1008 ) ( 576 -64 -1008 ) ( 576 64 -176 ) common/lavacaulk 0 0 0 0.5 0.5 0 0 0
+( -576 -64 -1008 ) ( -576 64 -1008 ) ( -576 -64 -176 ) common/lavacaulk 0 0 0 0.5 0.5 0 0 0
 }
 // brush 493
 {
@@ -4963,7 +4964,7 @@ pad_tex/col18
 ( 960 -592 168 ) ( 960 -592 120 ) ( 960 560 168 ) common/caulk 30.7199935913 47.6595726013 0 -3.125 5.875 0 0 0
 ( 968 560 -96 ) ( 960 560 -96 ) ( 968 -592 -96 ) common/caulk 0 33.2800292969 180 0.125 3.125 0 0 0
 ( 936 -104 120 ) ( 936 -104 168 ) ( 928 -104 120 ) common/caulk 0 47.6595726013 0 -0.125 5.875 0 0 0
-( 968 560 120 ) ( 968 -592 120 ) ( 968 560 168 ) pad_tex02/redflag 266.240234375 762.5532226562 0 0.390625 0.3671874702 0 0 0
+( 968 560 120 ) ( 968 -592 120 ) ( 968 560 168 ) pad_tex02/redflag 266.240234375 762.5532226563 0 0.390625 0.3671874702 0 0 0
 }
 // brush 494
 {
@@ -5086,7 +5087,7 @@ pad_tex/col06
 ( -960 568 168 ) ( -960 568 120 ) ( -960 -584 168 ) common/caulk 38.4000015259 47.6595726013 0 3.125 5.875 0 0 0
 ( -968 -584 -96 ) ( -960 -584 -96 ) ( -968 568 -96 ) common/caulk 0 25.5999984741 0 0.125 3.125 0 0 0
 ( -936 80 120 ) ( -936 80 168 ) ( -928 80 120 ) common/caulk 0 47.6595726013 0 0.125 5.875 0 0 0
-( -968 -584 120 ) ( -968 568 120 ) ( -968 -584 168 ) pad_tex02/blueflag 204.799987793 762.5532226562 0 -0.390625 0.3671874702 0 0 0
+( -968 -584 120 ) ( -968 568 120 ) ( -968 -584 168 ) pad_tex02/blueflag 204.799987793 762.5532226563 0 -0.390625 0.3671874702 0 0 0
 }
 // brush 501
 {
@@ -6836,3 +6837,51 @@ pad_wop/padtele
 "angle" "-90.000000"
 "range" "200"
 }
+// entity 208
+{
+"classname" "target_location"
+"origin" "1920.000000 0.000000 128.000000"
+"count" "1"
+"message" "red base"
+}
+// entity 209
+{
+"classname" "target_location"
+"origin" "-1920.000000 0.000000 128.000000"
+"count" "4"
+"message" "blue base"
+}
+// entity 210
+{
+"classname" "target_location"
+"origin" "1.000000 -5.000000 253.000000"
+"message" "center top"
+}
+// entity 211
+{
+"classname" "target_location"
+"origin" "645.000000 -875.000000 89.000000"
+"message" "red tunnel"
+"count" "1"
+}
+// entity 212
+{
+"classname" "target_location"
+"origin" "1937.000000 -898.000000 160.000000"
+"message" "red tunnel"
+"count" "1"
+}
+// entity 213
+{
+"classname" "target_location"
+"origin" "-645.000000 875.000000 89.000000"
+"message" "blue tunnel"
+"count" "4"
+}
+// entity 214
+{
+"classname" "target_location"
+"origin" "-1937.000000 898.000000 160.000000"
+"message" "blue tunnel"
+"count" "4"
+}
diff --git a/wop/mappack.pk3dir/scripts/blu_tinyctl.arena b/wop/mappack.pk3dir/scripts/blu_tinyctl.arena
deleted file mode 100644
index 1b01d34b2..000000000
--- a/wop/mappack.pk3dir/scripts/blu_tinyctl.arena
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- map         "blu_tinyctl"
- longname    "Blu's TinyCTL"
- type        "ctl"
-}
-
diff --git a/wop/mappack.pk3dir/scripts/wop_mappack-levelshots.shader b/wop/mappack.pk3dir/scripts/wop_mappack-levelshots.shader
index 14bd13ca9..929e1f3d6 100644
--- a/wop/mappack.pk3dir/scripts/wop_mappack-levelshots.shader
+++ b/wop/mappack.pk3dir/scripts/wop_mappack-levelshots.shader
@@ -48,6 +48,18 @@ levelshots/wop_fragboxB
     }
 }
 
+// ==============
+// TinyCTL
+// ==============
+
+levelshots/wop_tinyCTLB
+{
+    nomipmaps
+    {
+        animmap 0.5 levelshots/wop_tinyCTLB1 levelshots/wop_tinyCTLB2 levelshots/wop_tinyCTLB3
+    }
+}
+
 // ==============
 // Pac-Man
 // ==============
diff --git a/wop/mappack.pk3dir/scripts/wop_mappack.arena b/wop/mappack.pk3dir/scripts/wop_mappack.arena
index 68ae0e20e..00cd524f9 100644
--- a/wop/mappack.pk3dir/scripts/wop_mappack.arena
+++ b/wop/mappack.pk3dir/scripts/wop_mappack.arena
@@ -30,6 +30,12 @@
 	type "ffa"
 }
 
+{
+    map "wop_tinyCTL"
+    longname "Blu's TinyCTL"
+    type "ctl"
+}
+
 {
     map "wop_workshop"
     longname "Hectic's Workshop"
diff --git a/wop/mappack.pk3dir/readme.txt b/wop/mappack.pk3dir/wop_tinyCTL_readme.txt
similarity index 61%
rename from wop/mappack.pk3dir/readme.txt
rename to wop/mappack.pk3dir/wop_tinyCTL_readme.txt
index 1628cfb3c..b772c2557 100644
--- a/wop/mappack.pk3dir/readme.txt
+++ b/wop/mappack.pk3dir/wop_tinyCTL_readme.txt
@@ -1,6 +1,6 @@
 This is a map originally created for the game World of Padman in the year 2014.
 It is licensed under the WTFPL.
 
-Put the .pk3 file into either "~/.padman/wop" (Linux) or "C:\Path\to\installation\Worldofpadman1.6\wop"
+Put the .pk3 file into either "~/.worldofpadman/wop" (Linux) or "C:\Path\to\installation\WorldOfPadman\wop" (Windows)
 
 But... you probably already know this if you managed to open this file.