diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt
index 25640fac52..80cb5467ce 100644
--- a/isis/CMakeLists.txt
+++ b/isis/CMakeLists.txt
@@ -521,6 +521,7 @@ add_custom_target(appdata ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
   ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn  ${CMAKE_SOURCE_DIR}/src/*/translations/*.trn
   ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.def
   ${CMAKE_SOURCE_DIR}/appdata/translations/*.def ${CMAKE_SOURCE_DIR}/appdata/translations/*.pvl
+#  ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pvl
   ${CMAKE_BINARY_DIR}/appdata/translations)
 add_dependencies(isis3 appdata)
 
diff --git a/isis/src/base/apps/footprintinit/footprintinit.xml b/isis/src/base/apps/footprintinit/footprintinit.xml
index 2ede9c6a53..5da0e0a957 100644
--- a/isis/src/base/apps/footprintinit/footprintinit.xml
+++ b/isis/src/base/apps/footprintinit/footprintinit.xml
@@ -368,8 +368,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$base/templates/maps</defaultPath>
-        <default><item>$base/templates/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
         <description>
           A file containing the desired XY mapping parameters.  This
           file can be a simple label file, hand produced or created via
@@ -385,7 +385,7 @@
               This helper button will cat out the mapping group of the given mapfile to the session log
               of the application
             </description>
-            <icon>$ISIS3DATA/base/icons/labels.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/labels.png</icon>
           </helper>
         </helpers>
         <filter>
diff --git a/isis/src/base/apps/map2map/map2map.xml b/isis/src/base/apps/map2map/map2map.xml
index 92b5209610..cd4dcc9f1c 100644
--- a/isis/src/base/apps/map2map/map2map.xml
+++ b/isis/src/base/apps/map2map/map2map.xml
@@ -167,8 +167,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$base/templates/maps</defaultPath>
-        <default><item>$base/templates/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
         <description>
           A file containing the desired output mapping parameters in PVL.  This
           file can be a simple label file, hand produced or created via
@@ -184,7 +184,7 @@
               This helper button will cat out the mapping group of the given mapfile to the session log
                of the application
              </description>
-            <icon>$ISIS3DATA/base/icons/labels.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/labels.png</icon>
           </helper>
         </helpers>
         <filter>
@@ -324,7 +324,7 @@
               DEFAULTRANGE = MAP, this will copy the latitudes/longitudes from 
               the map files and calculate the unfound ones from the input cube.
              </description>
-            <icon>$ISIS3DATA/base/icons/exec.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/exec.png</icon>
           </helper>
         </helpers>
       </parameter>
diff --git a/isis/src/base/apps/mosrange/tsts/default/Makefile b/isis/src/base/apps/mosrange/tsts/default/Makefile
index 969cf3c723..cc42fb5e30 100644
--- a/isis/src/base/apps/mosrange/tsts/default/Makefile
+++ b/isis/src/base/apps/mosrange/tsts/default/Makefile
@@ -11,7 +11,7 @@ include $(ISISROOT)/make/isismake.tsts
 commands:
 	$(LS) $(INPUT)/*.cub > $(OUTPUT)/files.lis;
 	$(APPNAME) FROMLIST=$(OUTPUT)/files.lis \
-	MAP=$(ISIS3DATA)/base/templates/maps/equirectangular.map \
+	MAP=$(ISISROOT)/appdata/maps/equirectangular.map \
 	TO=$(OUTPUT)/mosrange_equi.map PRECISION=4 > /dev/null;
 	/bin/mv $(OUTPUT)/mosrange_equi.map $(OUTPUT)/mosrange_equi.txt
 	$(RM) $(OUTPUT)/files.lis;
diff --git a/isis/src/base/apps/ringscam2map/ringscam2map.xml b/isis/src/base/apps/ringscam2map/ringscam2map.xml
index 739856882f..6d62df87e8 100644
--- a/isis/src/base/apps/ringscam2map/ringscam2map.xml
+++ b/isis/src/base/apps/ringscam2map/ringscam2map.xml
@@ -13,7 +13,7 @@
     be run on it with shape set to RingPlane prior to <i>ringscam2map</i>.  The 
     <def link="Map Projection">map projection</def> is defined using a <def>PVL</def> file 
     specified with the MAP parameter.  The system default is to use the Planar projection 
-    ($ISIS3DATA/base/templates/maps/planar.map).  To learn more about using map projections in 
+    ($ISISROOT/appdata/maps/planar.map).  To learn more about using map projections in 
     ISIS, refer to the ISIS Workshop 
     <a href="https://isis.astrogeology.usgs.gov/fixit/projects/isis/wiki/Learning_About_Map_Projections">
     "Learning About Map Projections"</a>.
@@ -294,8 +294,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$base/templates/maps</defaultPath>
-        <default><item>$base/templates/maps/planar.map</item></default>
+        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/maps/planar.map</item></default>
         <description>
           A file containing the desired output mapping parameters in PVL.  This
           file can be a simple label file, hand produced, or created via
@@ -311,7 +311,7 @@
               This helper button will cat out the mapping group of the given mapfile to the session log
                of the application
              </description>
-            <icon>$ISIS3DATA/base/icons/labels.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/labels.png</icon>
           </helper>
         </helpers>
         <filter>
@@ -368,7 +368,7 @@
             <function>LoadCameraRes</function>
             <brief>Load Camera Resolution </brief>
             <description>This helper button will load the default resolution from the camera</description>
-            <icon>$ISIS3DATA/base/icons/exec.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/exec.png</icon>
           </helper>
           <helper name="H2">
             <function>LoadMapRes</function>
@@ -448,7 +448,7 @@
             <function>LoadCameraRange</function>
             <brief>Load Camera Ground Range </brief>
             <description>This helper button will load the default ground range from the camera</description>
-            <icon>$ISIS3DATA/base/icons/exec.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/exec.png</icon>
           </helper>
           <helper name="H2">
             <function>LoadMapRange</function>
diff --git a/isis/src/base/apps/skymap/skymap.xml b/isis/src/base/apps/skymap/skymap.xml
index 12936cb2f4..8af8df5bc6 100644
--- a/isis/src/base/apps/skymap/skymap.xml
+++ b/isis/src/base/apps/skymap/skymap.xml
@@ -126,8 +126,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$base/templates/maps</defaultPath>
-        <default><item>$base/templates/maps/simplecylindrical.map</item></default>
+        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/maps/simplecylindrical.map</item></default>
         <description>
           A file containing the desired output mapping parameters in PVL form.  This
           file can be a simple hand produced label file.  It can also be an existing cube label
@@ -144,7 +144,7 @@
               This helper button will cat out the mapping group of the given mapfile to the session log
                of the application 
              </description>
-            <icon>$ISIS3DATA/base/icons/labels.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/labels.png</icon>
           </helper>
         </helpers>
       </parameter>
@@ -178,7 +178,7 @@
             <function>LoadCameraRes</function>
             <brief>Load Camera Scale </brief>
             <description>This helper button will load the default scale from the camera</description>
-            <icon>$ISIS3DATA/base/icons/exec.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/exec.png</icon>
           </helper>
           <helper name="H2">
             <function>LoadMapRes</function>
@@ -256,7 +256,7 @@
             <function>LoadCameraRange</function>
             <brief>Load Camera Sky Range </brief>
             <description>This helper button will load the default sky range from the camera</description>
-            <icon>$ISIS3DATA/base/icons/exec.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/exec.png</icon>
           </helper>
           <helper name="H2">
             <function>LoadMapRange</function>
diff --git a/isis/src/cassini/tsts/vims/Makefile b/isis/src/cassini/tsts/vims/Makefile
index 0be61b9d19..8dc7957d54 100644
--- a/isis/src/cassini/tsts/vims/Makefile
+++ b/isis/src/cassini/tsts/vims/Makefile
@@ -99,7 +99,7 @@ commands:
 #  images because the vims camera model finds solution for any lat/lon and the range checking 
 #  was not working correctly.
 	$(CAM2MAP) $(TSTARGS) from=$(INPUT)/C1514302573_1.irBand71.cub to=$(OUTPUT)/C1514302573_1.irBand71.sinu.cub \
-          map='$$base/templates/maps/sinusoidal.map' \
+          map='$ISISROOT/appdata/maps/sinusoidal.map' \
           pixres=ppd resolution=2 defaultrange=map minlat=-90 maxlat=90 minlon=0 maxlon=360 \
           trim=yes > /dev/null
 
diff --git a/isis/src/control/apps/seedgrid/seedgrid.xml b/isis/src/control/apps/seedgrid/seedgrid.xml
index 373c05a556..e1ab0dcb23 100644
--- a/isis/src/control/apps/seedgrid/seedgrid.xml
+++ b/isis/src/control/apps/seedgrid/seedgrid.xml
@@ -96,8 +96,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$base/templates/maps</defaultPath>
-        <default><item>$base/templates/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
         <description>
           A file containing the mapping parameters in PVL form.  This file can
           be a simple PVL file or an existing cube label that contains a
@@ -116,7 +116,7 @@
               This helper button will write the mapping group of the given
               mapfile to the session log of the application.
              </description>
-            <icon>$ISIS3DATA/base/icons/labels.png</icon>
+            <icon>$ISISROOT/appdata/images/icons/labels.png</icon>
           </helper>
         </helpers>
         <filter>