diff --git a/data/scene/default.scene b/data/scene/default.scene
index 48cb27dc77..4bfab819ee 100644
--- a/data/scene/default.scene
+++ b/data/scene/default.scene
@@ -1,6 +1,11 @@
 -- Add folders to this list that contain .info files describing HiRISE patches
 local mars_folders = {
     -- Add a folder here whose contents will be automatically added to the Mars globe
+    -- If multiple folders are added, the results will be added sequentially, meaning that
+    -- if areas overlap (for example CTX and HiRISE) and CTX is specified *after* HiRISE,
+    -- CTX will stomp over the HiRISE
+    --
+    -- tl;dr:  Specify CTX folders first, then HiRISE 
 }
 
 function preInitialization()
@@ -82,7 +87,7 @@ function postInitialization()
 
     openspace.printInfo("Done setting default values")
 
-    -- Add the HiRISE patches described at the top of this file
+    -- Add the CTX and HiRISE patches described at the top of this file
     for _, file in pairs(mars_folders) do
         openspace.globebrowsing.addBlendingLayersFromDirectory(file, "Mars")
     end
diff --git a/data/scene/mars/map_datasets.torrent b/data/scene/mars/map_datasets.torrent
new file mode 100644
index 0000000000..812a8df723
Binary files /dev/null and b/data/scene/mars/map_datasets.torrent differ
diff --git a/data/scene/mars/mars.data b/data/scene/mars/mars.data
index afaf7ab69d..efc7c2ab8f 100644
--- a/data/scene/mars/mars.data
+++ b/data/scene/mars/mars.data
@@ -3,6 +3,7 @@ return {
         { Identifier = "mars_textures", Destination = "textures", Version = 1 }
     },
     TorrentFiles = {
+        { File = "map_datasets.torrent", Destination = "." }
         -- { File = "MAR063.BSP.torrent", Destination = "${SPICE}" }
     }
 }
\ No newline at end of file
diff --git a/data/scene/mars/mars.mod b/data/scene/mars/mars.mod
index 8e5f786d53..6cd0d90847 100644
--- a/data/scene/mars/mars.mod
+++ b/data/scene/mars/mars.mod
@@ -31,50 +31,28 @@ return {
             SegmentsPerPatch = 90,
             Layers = {
                 ColorLayers = {
+                    {
+                        Name = "MOC WA AMNH Color",
+                        FilePath = "map_datasets/mars_COL_v006_mars2000_rgb.vrt",
+                        Enabled = true
+                    },
                     {
                         Name = "Viking MDIM",
                         FilePath = "map_service_configs/MARS_Viking_MDIM21.xml",
-                        Enabled = true,
                         Fallback =  {
                             Name = "Mars Texture",
                             FilePath = "textures/mars.jpg",
-                            Enabled = true,
-                        },
-                    },
-                    -- Linköping University based servers
-                    {
-                        Name = "CTX Mosaic [LiU]",
-                        FilePath = "map_service_configs/LiU/CTX.xml",
-                        BlendMode = "Color"
-                    },
-                    -- University of Utah based servers
-                    {
-                        Name = "CTX Mosaic [Utah]",
-                        FilePath = "map_service_configs/Utah/CTX.xml",
-                        BlendMode = "Color"
+                            Enabled = true
+                        }
                     },
                     {
                         Name = "MOLA Pseudo Color",
                         FilePath = "map_service_configs/Utah/Mola_PseudoColor.xml"
                     },
-                    {
-                        Name = "Themis IR Day [Utah]",
-                        FilePath = "map_service_configs/Utah/Themis_IR_Day.xml"
-                    },
-                    {
-                        Name = "Themis IR Night [Utah]",
-                        FilePath = "map_service_configs/Utah/Themis_IR_Night.xml"
-                    },
                     {
                         Name = "Viking MDIM [Utah]",
                         FilePath = "map_service_configs/Utah/Mdim.xml"
                     },
-                    -- AWS based servers
-                    {
-                        Name = "CTX Mosaic [AWS]",
-                        FilePath = "map_service_configs/AWS/CTX.wms",
-                        BlendMode = "Color"
-                    },
                     {
                         Name = "Viking MDIM [AWS]",
                         FilePath = "map_service_configs/AWS/Mdim.wms"
@@ -83,6 +61,30 @@ return {
                         Name = "MOLA Pseudo Color [AWS]",
                         FilePath = "map_service_configs/AWS/Mola_PseudoColor.wms"
                     },
+                    {
+                        Name = "CTX Mosaic [LiU]",
+                        FilePath = "map_service_configs/LiU/CTX.xml",
+                        BlendMode = "Color"
+                    },
+                    {
+                        Name = "CTX Mosaic [Utah]",
+                        FilePath = "map_service_configs/Utah/CTX.xml",
+                        BlendMode = "Color"
+                    },
+                    {
+                        Name = "CTX Mosaic [AWS]",
+                        FilePath = "map_service_configs/AWS/CTX.wms",
+                        BlendMode = "Color"
+                    },
+                    {
+                        Name = "Themis IR Day [Utah]",
+                        FilePath = "map_service_configs/Utah/Themis_IR_Day.xml"
+                    },
+                    {
+                        Name = "Themis IR Night [Utah]",
+                        FilePath = "map_service_configs/Utah/Themis_IR_Night.xml"
+                    },
+
                     {
                         Name = "Themis IR Day [AWS]",
                         FilePath = "map_service_configs/AWS/Themis_IR_Day.wms"
@@ -106,14 +108,13 @@ return {
                 HeightLayers = {
                     {
                         Name = "Mola Elevation",
-                        FilePath = "map_service_configs/Mars_MGS_MOLA_DEM.xml",
-                        Enabled = true,
+                        FilePath = "map_service_configs/Mars_MGS_MOLA_DEM.xml"
                         TilePixelSize = 90
                     },
                     {
                         Name = "Mola Elevation [Europe]",
                         FilePath = "map_service_configs/LiU/Mola_Elevation.xml",
-                        -- Enabled = true,
+                        Enabled = true,
                         TilePixelSize = 90
                     },
                     {