diff --git a/_maps_/Source/Canon/Dasaraches_The_White_Fortress.jpg b/_maps_/Source/Canon/Dasaraches_The_White_Fortress.jpg
new file mode 100644
index 000000000..44863966a
Binary files /dev/null and b/_maps_/Source/Canon/Dasaraches_The_White_Fortress.jpg differ
diff --git a/_maps_/Source/Hidden_Village.jpg b/_maps_/Source/Canon/Hidden_Village.jpg
similarity index 100%
rename from _maps_/Source/Hidden_Village.jpg
rename to _maps_/Source/Canon/Hidden_Village.jpg
diff --git a/_maps_/Source/Hidden_Village.png b/_maps_/Source/Canon/Hidden_Village.png
similarity index 100%
rename from _maps_/Source/Hidden_Village.png
rename to _maps_/Source/Canon/Hidden_Village.png
diff --git a/_maps_/Source/Canon/Iron_Mines_of_Tyr.jpg b/_maps_/Source/Canon/Iron_Mines_of_Tyr.jpg
new file mode 100644
index 000000000..639536ea0
Binary files /dev/null and b/_maps_/Source/Canon/Iron_Mines_of_Tyr.jpg differ
diff --git a/_maps_/Source/Canon/New_Guistenal.jpg b/_maps_/Source/Canon/New_Guistenal.jpg
new file mode 100644
index 000000000..d2856bcfe
Binary files /dev/null and b/_maps_/Source/Canon/New_Guistenal.jpg differ
diff --git a/_maps_/Source/Canon/Ruins_of_Giustenal.jpg b/_maps_/Source/Canon/Ruins_of_Giustenal.jpg
new file mode 100644
index 000000000..7de5b7654
Binary files /dev/null and b/_maps_/Source/Canon/Ruins_of_Giustenal.jpg differ
diff --git a/_maps_/Source/Canon/Silver_Spring_Oasis.jpg b/_maps_/Source/Canon/Silver_Spring_Oasis.jpg
new file mode 100644
index 000000000..090220d91
Binary files /dev/null and b/_maps_/Source/Canon/Silver_Spring_Oasis.jpg differ
diff --git a/_maps_/Source/Tablelands_2e_extra sites.png b/_maps_/Source/Canon/Tablelands_2e_extra sites.png
similarity index 100%
rename from _maps_/Source/Tablelands_2e_extra sites.png
rename to _maps_/Source/Canon/Tablelands_2e_extra sites.png
diff --git a/_maps_/Source/Canon/The City of Ur Draxa.jpg b/_maps_/Source/Canon/The City of Ur Draxa.jpg
new file mode 100644
index 000000000..03e919e83
Binary files /dev/null and b/_maps_/Source/Canon/The City of Ur Draxa.jpg differ
diff --git a/_maps_/Source/Canon/The_Elven_Market.jpg b/_maps_/Source/Canon/The_Elven_Market.jpg
new file mode 100644
index 000000000..d144616d4
Binary files /dev/null and b/_maps_/Source/Canon/The_Elven_Market.jpg differ
diff --git a/_maps_/Source/Canon/The_Fortress_of_Akarakle.jpg b/_maps_/Source/Canon/The_Fortress_of_Akarakle.jpg
new file mode 100644
index 000000000..9d2505669
Binary files /dev/null and b/_maps_/Source/Canon/The_Fortress_of_Akarakle.jpg differ
diff --git a/_maps_/Source/Canon/The_Golden_Tower.jpg b/_maps_/Source/Canon/The_Golden_Tower.jpg
new file mode 100644
index 000000000..1ac022175
Binary files /dev/null and b/_maps_/Source/Canon/The_Golden_Tower.jpg differ
diff --git a/_maps_/Source/Canon/Trade_Fortress_of_Altaruk.png b/_maps_/Source/Canon/Trade_Fortress_of_Altaruk.png
new file mode 100644
index 000000000..55e75490f
Binary files /dev/null and b/_maps_/Source/Canon/Trade_Fortress_of_Altaruk.png differ
diff --git a/_maps_/Source/Canon/Yathazor_City_of_Calamity.jpg b/_maps_/Source/Canon/Yathazor_City_of_Calamity.jpg
new file mode 100644
index 000000000..77efb87b6
Binary files /dev/null and b/_maps_/Source/Canon/Yathazor_City_of_Calamity.jpg differ
diff --git a/_maps_/Source/black_sand_camp_top.png b/_maps_/Source/Canon/black_sand_camp_top.png
similarity index 100%
rename from _maps_/Source/black_sand_camp_top.png
rename to _maps_/Source/Canon/black_sand_camp_top.png
diff --git a/_maps_/Source/black_sand_camp_ug.png b/_maps_/Source/Canon/black_sand_camp_ug.png
similarity index 100%
rename from _maps_/Source/black_sand_camp_ug.png
rename to _maps_/Source/Canon/black_sand_camp_ug.png
diff --git a/_maps_/Source/elven_market.png b/_maps_/Source/Canon/elven_market.png
similarity index 100%
rename from _maps_/Source/elven_market.png
rename to _maps_/Source/Canon/elven_market.png
diff --git a/_maps_/Source/ft_prosper.png b/_maps_/Source/Canon/ft_prosper.png
similarity index 100%
rename from _maps_/Source/ft_prosper.png
rename to _maps_/Source/Canon/ft_prosper.png
diff --git a/_maps_/Source/jura_dai_fort.jpg b/_maps_/Source/Canon/jura_dai_fort.jpg
similarity index 100%
rename from _maps_/Source/jura_dai_fort.jpg
rename to _maps_/Source/Canon/jura_dai_fort.jpg
diff --git a/_maps_/Source/krikiks_village.png b/_maps_/Source/Canon/krikiks_village.png
similarity index 100%
rename from _maps_/Source/krikiks_village.png
rename to _maps_/Source/Canon/krikiks_village.png
diff --git a/_maps_/Source/silver_spring.png b/_maps_/Source/Canon/silver_spring.png
similarity index 100%
rename from _maps_/Source/silver_spring.png
rename to _maps_/Source/Canon/silver_spring.png
diff --git a/_maps_/Source/sky_singer_market_1.png b/_maps_/Source/Canon/sky_singer_market_1.png
similarity index 100%
rename from _maps_/Source/sky_singer_market_1.png
rename to _maps_/Source/Canon/sky_singer_market_1.png
diff --git a/_maps_/Source/sky_singer_market_2.png b/_maps_/Source/Canon/sky_singer_market_2.png
similarity index 100%
rename from _maps_/Source/sky_singer_market_2.png
rename to _maps_/Source/Canon/sky_singer_market_2.png
diff --git a/_maps_/Source/sky_singers_market.png b/_maps_/Source/Canon/sky_singers_market.png
similarity index 100%
rename from _maps_/Source/sky_singers_market.png
rename to _maps_/Source/Canon/sky_singers_market.png
diff --git a/_maps_/Source/sortars_camp.png b/_maps_/Source/Canon/sortars_camp.png
similarity index 100%
rename from _maps_/Source/sortars_camp.png
rename to _maps_/Source/Canon/sortars_camp.png
diff --git a/_maps_/Source/tenpug_band.png b/_maps_/Source/Canon/tenpug_band.png
similarity index 100%
rename from _maps_/Source/tenpug_band.png
rename to _maps_/Source/Canon/tenpug_band.png
diff --git a/_maps_/Source/City-State of Tyr.jpg b/_maps_/Source/DarkSun Rising Maps/City-State of Tyr.jpg
similarity index 100%
rename from _maps_/Source/City-State of Tyr.jpg
rename to _maps_/Source/DarkSun Rising Maps/City-State of Tyr.jpg
diff --git a/_maps_/Source/DarkSun Rising Maps/City_State_of_Draj.jpg b/_maps_/Source/DarkSun Rising Maps/City_State_of_Draj.jpg
new file mode 100644
index 000000000..16e7c5070
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/City_State_of_Draj.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/City_State_of_Gulg.jpg b/_maps_/Source/DarkSun Rising Maps/City_State_of_Gulg.jpg
new file mode 100644
index 000000000..d41e9ca3a
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/City_State_of_Gulg.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/City_State_of_Kalidnay.jpg b/_maps_/Source/DarkSun Rising Maps/City_State_of_Kalidnay.jpg
new file mode 100644
index 000000000..ef813b40b
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/City_State_of_Kalidnay.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/City_State_of_Nibenay.jpg b/_maps_/Source/DarkSun Rising Maps/City_State_of_Nibenay.jpg
new file mode 100644
index 000000000..1492f65a2
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/City_State_of_Nibenay.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/City_of_Thamasku.jpg b/_maps_/Source/DarkSun Rising Maps/City_of_Thamasku.jpg
new file mode 100644
index 000000000..4344ee3c5
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/City_of_Thamasku.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/Cromlin.jpg b/_maps_/Source/DarkSun Rising Maps/Cromlin.jpg
new file mode 100644
index 000000000..b8d418574
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/Cromlin.jpg differ
diff --git a/_maps_/Source/Gulg_2.jpg b/_maps_/Source/DarkSun Rising Maps/Gulg_2.jpg
similarity index 100%
rename from _maps_/Source/Gulg_2.jpg
rename to _maps_/Source/DarkSun Rising Maps/Gulg_2.jpg
diff --git a/_maps_/Source/DarkSun Rising Maps/Kled.jpg b/_maps_/Source/DarkSun Rising Maps/Kled.jpg
new file mode 100644
index 000000000..9067d499e
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/Kled.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/The_Anattan_Wastes.jpg b/_maps_/Source/DarkSun Rising Maps/The_Anattan_Wastes.jpg
new file mode 100644
index 000000000..09bb51806
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/The_Anattan_Wastes.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/The_Estuary_of_the_Forked_Tongue.jpg b/_maps_/Source/DarkSun Rising Maps/The_Estuary_of_the_Forked_Tongue.jpg
new file mode 100644
index 000000000..a6aa8b9c0
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/The_Estuary_of_the_Forked_Tongue.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/The_Jagged_Cliffs.jpg b/_maps_/Source/DarkSun Rising Maps/The_Jagged_Cliffs.jpg
new file mode 100644
index 000000000..c5cdee505
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/The_Jagged_Cliffs.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/The_Last_Sea.jpg b/_maps_/Source/DarkSun Rising Maps/The_Last_Sea.jpg
new file mode 100644
index 000000000..7ab2533ed
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/The_Last_Sea.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/The_Tablelands.jpg b/_maps_/Source/DarkSun Rising Maps/The_Tablelands.jpg
new file mode 100644
index 000000000..11999c3af
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/The_Tablelands.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/The_Valley_of_the_Cerulean_Storm.jpg b/_maps_/Source/DarkSun Rising Maps/The_Valley_of_the_Cerulean_Storm.jpg
new file mode 100644
index 000000000..1dc345dca
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/The_Valley_of_the_Cerulean_Storm.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/Town_of_North_Ledopolus.jpg b/_maps_/Source/DarkSun Rising Maps/Town_of_North_Ledopolus.jpg
new file mode 100644
index 000000000..d8f0aa643
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/Town_of_North_Ledopolus.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/Valley_of_Dust_and_Fire.jpg b/_maps_/Source/DarkSun Rising Maps/Valley_of_Dust_and_Fire.jpg
new file mode 100644
index 000000000..9fdb3bfe2
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/Valley_of_Dust_and_Fire.jpg differ
diff --git a/_maps_/Source/DarkSun Rising Maps/Village_of_Salt_View.jpg b/_maps_/Source/DarkSun Rising Maps/Village_of_Salt_View.jpg
new file mode 100644
index 000000000..8169c7a3d
Binary files /dev/null and b/_maps_/Source/DarkSun Rising Maps/Village_of_Salt_View.jpg differ
diff --git a/_maps_/Source/Other/City_State_of_Balic.jpg b/_maps_/Source/Other/City_State_of_Balic.jpg
new file mode 100644
index 000000000..c651a6151
Binary files /dev/null and b/_maps_/Source/Other/City_State_of_Balic.jpg differ
diff --git a/_maps_/Source/Other/City_State_of_Raam.png b/_maps_/Source/Other/City_State_of_Raam.png
new file mode 100644
index 000000000..0cba30637
Binary files /dev/null and b/_maps_/Source/Other/City_State_of_Raam.png differ
diff --git a/_maps_/Source/Other/City_of_Ur-Draxa.png b/_maps_/Source/Other/City_of_Ur-Draxa.png
new file mode 100644
index 000000000..28d8d5f76
Binary files /dev/null and b/_maps_/Source/Other/City_of_Ur-Draxa.png differ
diff --git a/_maps_/Source/Other/MapofUrik-1-.jpg b/_maps_/Source/Other/MapofUrik-1-.jpg
new file mode 100644
index 000000000..3b8289114
Binary files /dev/null and b/_maps_/Source/Other/MapofUrik-1-.jpg differ
diff --git a/_maps_/Source/Other/The_City_of_Saragar.jpg b/_maps_/Source/Other/The_City_of_Saragar.jpg
new file mode 100644
index 000000000..eda509fec
Binary files /dev/null and b/_maps_/Source/Other/The_City_of_Saragar.jpg differ
diff --git a/_maps_/Source/Other/Town_of_South_Ledopolus.jpg b/_maps_/Source/Other/Town_of_South_Ledopolus.jpg
new file mode 100644
index 000000000..65d71f003
Binary files /dev/null and b/_maps_/Source/Other/Town_of_South_Ledopolus.jpg differ
diff --git a/_maps_/Source/Other/Urik_Complete.png b/_maps_/Source/Other/Urik_Complete.png
new file mode 100644
index 000000000..85b8adcf0
Binary files /dev/null and b/_maps_/Source/Other/Urik_Complete.png differ
diff --git a/_maps_/Source/Other/urikcity[1].jpg b/_maps_/Source/Other/urikcity[1].jpg
new file mode 100644
index 000000000..24756a0c8
Binary files /dev/null and b/_maps_/Source/Other/urikcity[1].jpg differ
diff --git a/_maps_/Source/Shattered Lands/DrajFields.png b/_maps_/Source/Shattered Lands/DrajFields.png
new file mode 100644
index 000000000..92e7339a0
Binary files /dev/null and b/_maps_/Source/Shattered Lands/DrajFields.png differ
diff --git a/_maps_/Source/Hot_Springs.png b/_maps_/Source/Shattered Lands/Hot_Springs.png
similarity index 100%
rename from _maps_/Source/Hot_Springs.png
rename to _maps_/Source/Shattered Lands/Hot_Springs.png
diff --git a/_maps_/Source/Shattered Lands/TeaquetzalDesert.png b/_maps_/Source/Shattered Lands/TeaquetzalDesert.png
new file mode 100644
index 000000000..764704bc0
Binary files /dev/null and b/_maps_/Source/Shattered Lands/TeaquetzalDesert.png differ
diff --git a/_maps_/Source/Shattered Lands/rgn27.png b/_maps_/Source/Shattered Lands/rgn27.png
deleted file mode 100644
index 9c934e0b2..000000000
Binary files a/_maps_/Source/Shattered Lands/rgn27.png and /dev/null differ
diff --git a/_maps_/Source/Shattered Lands/rgn28.png b/_maps_/Source/Shattered Lands/rgn28.png
deleted file mode 100644
index 97b9bc9d9..000000000
Binary files a/_maps_/Source/Shattered Lands/rgn28.png and /dev/null differ
diff --git a/_maps_/Source/Shattered Lands/rgn29.png b/_maps_/Source/Shattered Lands/rgn29.png
deleted file mode 100644
index 469241859..000000000
Binary files a/_maps_/Source/Shattered Lands/rgn29.png and /dev/null differ