diff --git a/README.md b/README.md
index 738d4bfd47..b95f45bc32 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,11 @@ Official WorldWind Java releases have the latest stable features, enhancements a
 
 ## Run a Demo
 
-With the deprecation of WebStart/JNLP, the only option for running a Java demo is to clone the SDK, open it with Apache Netbeans and run it via the Netbeans interface. 
+The following options are available to run a WorldWind Java demo:
+
+###### From the Apache NetBeans IDE
+
+Clone the SDK with git, open the WorldWind Java project with Apache Netbeans and run demos via the Netbeans interface. 
 
 ###### From a Windows Development Environment
 
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
new file mode 100644
index 0000000000..c92a05cca0
--- /dev/null
+++ b/RELEASE_NOTES.txt
@@ -0,0 +1,26 @@
+################### WorldWindJava 2.2.1
+
+This version of WorldWind Java is a maintenance release that addresses small fixes (updated formatting, typos, bad references, etc.) to various areas of the code and removes references to services that are no longer supported by the WorldWind servers.
+
+WorldWind's API remains unchanged in this release and we are committed to maintaining a consistent API in future releases.
+
+################### WorldWindJava 2.2.0
+
+The primary goal of the WorldWind Java (WWJ) v2.2.0 release is to modernize the SDK after a period of inactivity. During this process some defects were addressed as well. Highlights of v2.2.0:
+
+- Upgrade to Java 11
+- Upgrade to the OpenGL layer (JOGL) 2.4
+- Switch to the Apache 2.0 license
+- Deprecation of unsupported functionality such as Applets, WebStart and WebView.
+
+WorldWind's API remains largely unchanged in this release and we are committed to maintaining a consistent API in future releases.
+
+The prior release of WorldWind Java, v2.1.0, was compiled with Java 8. The decision was made to upgrade WWJ to Java 11 based on questionable support options for Java 8 at the time. This situation has evolved over time and we are evaluating whether a Java 8 version of WWJ is desirable. Your feedback is welcome. 
+
+Migrating to Java 11 and JOGL 2.4 went relatively smoothly. Primary areas of work:
+
+- The package names for JOGL have changed although the API remains relatively consistent.
+- Creating work alike code to replace the use of unpublished JRE APIs that now throw an access exception. For example, setting the java library path system property. Discussions around the types of changes that need to be made when moving from 8 to 11 are broadly available on the Web.
+- Removing deprecated functionality like WebStart, Applets and WebView.
+
+This release positions WorldWind Java to begin adding new functionality in the near future, please watch this repository for further updates.
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 2e5268b58c..506f468c86 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -46,8 +46,8 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.6"/>
-        <property name="default.javac.target" value="1.6"/>
+        <property name="default.javac.source" value="1.8"/>
+        <property name="default.javac.target" value="1.8"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
@@ -119,7 +119,43 @@ is divided into following sections:
         <property name="module.name" value=""/>
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
-        <property name="platform.java" value="${java.home}/bin/java"/>
+        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+        <condition property="platform.javac" value="${platform.home}/bin/javac">
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+        </condition>
+        <property name="platform.javac" value="${platform.javac.tmp}"/>
+        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+        <condition property="platform.java" value="${platform.home}/bin/java">
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+        </condition>
+        <property name="platform.java" value="${platform.java.tmp}"/>
+        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+        </condition>
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+        <condition property="platform.invalid" value="true">
+            <or>
+                <contains string="${platform.javac}" substring="$${platforms."/>
+                <contains string="${platform.java}" substring="$${platforms."/>
+                <contains string="${platform.javadoc}" substring="$${platforms."/>
+            </or>
+        </condition>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">
+ The J2SE Platform is not correctly set up.
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. 
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.
+ For example like this:
+     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
+  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) 
+  </fail>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
             <and>
@@ -242,20 +278,6 @@ is divided into following sections:
         <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
             <isset property="profile.available"/>
         </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="javac.fork">
-            <or>
-                <istrue value="${jdkBug6558476}"/>
-                <istrue value="${javac.external.vm}"/>
-            </or>
-        </condition>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
         <property name="copylibs.rebase" value="true"/>
@@ -343,7 +365,7 @@ is divided into following sections:
                         </path>
                     </resourcecount>
                 </condition>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -394,7 +416,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
                 <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -436,7 +458,7 @@ is divided into following sections:
             <sequential>
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -515,7 +537,7 @@ is divided into following sections:
             <element name="customizePrototype" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -543,7 +565,7 @@ is divided into following sections:
             <element name="customizePrototype" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -619,7 +641,7 @@ is divided into following sections:
                     </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="WorldWindJava" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="WorldWindJava" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -850,6 +872,9 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
                 </nbjpdastart>
             </sequential>
         </macrodef>
@@ -899,7 +924,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}" module="@{modulename}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -933,7 +958,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -965,7 +990,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -1199,7 +1224,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
     </target>
     <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
         <j2seproject1:jar manifest="${tmp.manifest.file}"/>
@@ -1301,8 +1326,8 @@ is divided into following sections:
                 <isset property="main.class.available"/>
             </and>
         </condition>
-        <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
-        <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
+        <property name="platform.jlink" value="${platform.home}/bin/jlink"/>
+        <property name="jlink.systemmodules.internal" value="${platform.home}/jmods"/>
         <exec executable="${platform.jlink}">
             <arg value="--module-path"/>
             <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
@@ -1495,16 +1520,19 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
+        <exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
+            <arg value="-version"/>
+        </exec>
         <condition else="" property="bug5101868workaround" value="*.java">
-            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+            <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
         </condition>
         <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
             <and>
                 <isset property="javadoc.html5"/>
-                <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
+                <available file="${platform.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
             </and>
         </condition>
-        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 80786b06c2..6a15e776fa 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=6106e3d1
+build.xml.data.CRC32=ed839dc9
 build.xml.script.CRC32=b2ee8dee
-build.xml.stylesheet.CRC32=f85dc8f2@1.95.0.48
+build.xml.stylesheet.CRC32=f85dc8f2@1.102.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=6106e3d1
-nbproject/build-impl.xml.script.CRC32=8e6690c6
-nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.97.0.48
+nbproject/build-impl.xml.data.CRC32=ed839dc9
+nbproject/build-impl.xml.script.CRC32=2e7bce4f
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.102.0.48
diff --git a/nbproject/project.properties b/nbproject/project.properties
index fab181db51..1adab5d73f 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -104,7 +104,7 @@ manifest.custom.permissions=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
-platform.active=default_platform
+platform.active=JDK_11
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/nbproject/project.xml b/nbproject/project.xml
index e27d90a9ba..cba6c32199 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -4,6 +4,7 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>WorldWindJava</name>
+            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>
diff --git a/release-build.xml b/release-build.xml
index 8877973d0e..9810ad732d 100644
--- a/release-build.xml
+++ b/release-build.xml
@@ -381,24 +381,4 @@
             </manifest>
         </jar>
     </target>
-
-    <!-- Helper tasks for compiling and linking the WebView native library for the current platform. Output libraries
-         are placed in the WorldWind project root folder and overwrite any existing files of the same name.
-
-         On Mac OS X this compiles the Objective-C sources under the folder 'lib-external/webview/macosx' into
-         'libwebview.jnilib', and requires that the XCode and Java development toolkits for Mac are installed.
-
-         On Windows this compiles the C and C++ sources under 'lib-external/webview/windows' into 'WebView32.dll' and
-         'WebView64.dll', and requires that the Microsoft Visual C++ build tools are avialable on the path. -->
-
-    <target name="help.assembleWebviewLibrary">
-        <exec os="Mac OS X" dir="${basedir}/lib-external/webview/macosx" executable="/bin/sh" failonerror="true">
-            <arg value="build.sh"/>
-        </exec>
-        <exec osfamily="Windows" dir="${basedir}/lib-external/webview/windows" executable="nmake" failonerror="true">
-            <arg value="clean"/>
-            <arg value="all"/>
-        </exec>
-    </target>
-
 </project>
diff --git a/src/config/Earth/MSVirtualEarthAerialLayer.xml b/src/config/Earth/MSVirtualEarthAerialLayer.xml
deleted file mode 100644
index 51d3ef162b..0000000000
--- a/src/config/Earth/MSVirtualEarthAerialLayer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
-  ~ Administrator of the National Aeronautics and Space Administration.
-  ~ All rights reserved.
-  ~ 
-  ~ The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software distributed
-  ~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-  ~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations under the License.
-  ~ 
-  ~ NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
-  ~ software:
-  ~ 
-  ~     Jackson Parser – Licensed under Apache 2.0
-  ~     GDAL – Licensed under MIT
-  ~     JOGL – Licensed under  Berkeley Software Distribution (BSD)
-  ~     Gluegen – Licensed under Berkeley Software Distribution (BSD)
-  ~ 
-  ~ A complete listing of 3rd Party software notices and licenses included in
-  ~ NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
-  ~ notices and licenses PDF found in code directory.
-  -->
-
-<!--$Id: MSVirtualEarthAerialLayer.xml 1171 2013-02-11 21:45:02Z dcollins $-->
-<Layer version="1" layerType="TiledImageLayer">
-    <DisplayName>MS Virtual Earth Aerial</DisplayName>
-    <Service serviceName="WWTileService">
-        <URL>https://worldwind28.arc.nasa.gov/vewms/vewms.aspx</URL>
-    </Service>
-    <!-- day month year hours:minutes:seconds timezone -->
-    <LastUpdate>19 09 2009 04:10:00 GMT</LastUpdate>
-    <DatasetName>a</DatasetName>
-    <DataCacheName>Earth/MS Virtual Earth a</DataCacheName>
-    <ImageFormat>image/jpg</ImageFormat>
-    <AvailableImageFormats>
-        <ImageFormat>image/jpg</ImageFormat>
-    </AvailableImageFormats>
-    <FormatSuffix>.dds</FormatSuffix>
-    <NumLevels count="16" numEmpty="4"/>
-    <TileOrigin>
-        <LatLon units="degrees" latitude="-90" longitude="-180"/>
-    </TileOrigin>
-    <LevelZeroTileDelta>
-        <LatLon units="degrees" latitude="36" longitude="36"/>
-    </LevelZeroTileDelta>
-    <TileSize>
-        <Dimension width="512" height="512"/>
-    </TileSize>
-    <Sector>
-        <SouthWest>
-            <LatLon units="degrees" latitude="-90" longitude="-180"/>
-        </SouthWest>
-        <NorthEast>
-            <LatLon units="degrees" latitude="90" longitude="180"/>
-        </NorthEast>
-    </Sector>
-    <ActiveAltitudes max="1000e3"/>
-    <UseTransparentTextures>true</UseTransparentTextures>
-</Layer>
\ No newline at end of file
diff --git a/src/config/Earth/MSVirtualEarthHybridLayer.xml b/src/config/Earth/MSVirtualEarthHybridLayer.xml
deleted file mode 100644
index 356562fdcb..0000000000
--- a/src/config/Earth/MSVirtualEarthHybridLayer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
-  ~ Administrator of the National Aeronautics and Space Administration.
-  ~ All rights reserved.
-  ~ 
-  ~ The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software distributed
-  ~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-  ~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations under the License.
-  ~ 
-  ~ NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
-  ~ software:
-  ~ 
-  ~     Jackson Parser – Licensed under Apache 2.0
-  ~     GDAL – Licensed under MIT
-  ~     JOGL – Licensed under  Berkeley Software Distribution (BSD)
-  ~     Gluegen – Licensed under Berkeley Software Distribution (BSD)
-  ~ 
-  ~ A complete listing of 3rd Party software notices and licenses included in
-  ~ NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
-  ~ notices and licenses PDF found in code directory.
-  -->
-
-<!--$Id: MSVirtualEarthHybridLayer.xml 1171 2013-02-11 21:45:02Z dcollins $-->
-<Layer version="1" layerType="TiledImageLayer">
-    <DisplayName>MS Virtual Earth Hybrid</DisplayName>
-    <Service serviceName="WWTileService">
-        <URL>https://worldwind28.arc.nasa.gov/vewms/vewms.aspx</URL>
-    </Service>
-    <!-- day month year hours:minutes:seconds timezone -->
-    <LastUpdate>19 09 2009 04:10:00 GMT</LastUpdate>
-    <DatasetName>h</DatasetName>
-    <DataCacheName>Earth/MS Virtual Earth h</DataCacheName>
-    <ImageFormat>image/jpg</ImageFormat>
-    <AvailableImageFormats>
-        <ImageFormat>image/jpg</ImageFormat>
-    </AvailableImageFormats>
-    <FormatSuffix>.dds</FormatSuffix>
-    <NumLevels count="16" numEmpty="4"/>
-    <TileOrigin>
-        <LatLon units="degrees" latitude="-90" longitude="-180"/>
-    </TileOrigin>
-    <LevelZeroTileDelta>
-        <LatLon units="degrees" latitude="36" longitude="36"/>
-    </LevelZeroTileDelta>
-    <TileSize>
-        <Dimension width="512" height="512"/>
-    </TileSize>
-    <Sector>
-        <SouthWest>
-            <LatLon units="degrees" latitude="-90" longitude="-180"/>
-        </SouthWest>
-        <NorthEast>
-            <LatLon units="degrees" latitude="90" longitude="180"/>
-        </NorthEast>
-    </Sector>
-    <ActiveAltitudes max="1000e3"/>
-    <UseTransparentTextures>true</UseTransparentTextures>
-</Layer>
\ No newline at end of file
diff --git a/src/config/Earth/MSVirtualEarthRoadsLayer.xml b/src/config/Earth/MSVirtualEarthRoadsLayer.xml
deleted file mode 100644
index 715e37ac55..0000000000
--- a/src/config/Earth/MSVirtualEarthRoadsLayer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
-  ~ Administrator of the National Aeronautics and Space Administration.
-  ~ All rights reserved.
-  ~ 
-  ~ The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software distributed
-  ~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-  ~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations under the License.
-  ~ 
-  ~ NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
-  ~ software:
-  ~ 
-  ~     Jackson Parser – Licensed under Apache 2.0
-  ~     GDAL – Licensed under MIT
-  ~     JOGL – Licensed under  Berkeley Software Distribution (BSD)
-  ~     Gluegen – Licensed under Berkeley Software Distribution (BSD)
-  ~ 
-  ~ A complete listing of 3rd Party software notices and licenses included in
-  ~ NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
-  ~ notices and licenses PDF found in code directory.
-  -->
-
-<!--$Id: MSVirtualEarthRoadsLayer.xml 1171 2013-02-11 21:45:02Z dcollins $-->
-<Layer version="1" layerType="TiledImageLayer">
-    <DisplayName>MS Virtual Earth Roads</DisplayName>
-    <Service serviceName="WWTileService">
-        <URL>https://worldwind28.arc.nasa.gov/vewms/vewms.aspx</URL>
-    </Service>
-    <!-- day month year hours:minutes:seconds timezone -->
-    <LastUpdate>19 09 2009 04:10:00 GMT</LastUpdate>
-    <DatasetName>r</DatasetName>
-    <DataCacheName>Earth/MS Virtual Earth r</DataCacheName>
-    <ImageFormat>image/jpg</ImageFormat>
-    <AvailableImageFormats>
-        <ImageFormat>image/jpg</ImageFormat>
-    </AvailableImageFormats>
-    <FormatSuffix>.dds</FormatSuffix>
-    <NumLevels count="16" numEmpty="4"/>
-    <TileOrigin>
-        <LatLon units="degrees" latitude="-90" longitude="-180"/>
-    </TileOrigin>
-    <LevelZeroTileDelta>
-        <LatLon units="degrees" latitude="36" longitude="36"/>
-    </LevelZeroTileDelta>
-    <TileSize>
-        <Dimension width="512" height="512"/>
-    </TileSize>
-    <Sector>
-        <SouthWest>
-            <LatLon units="degrees" latitude="-90" longitude="-180"/>
-        </SouthWest>
-        <NorthEast>
-            <LatLon units="degrees" latitude="90" longitude="180"/>
-        </NorthEast>
-    </Sector>
-    <ActiveAltitudes max="1000e3"/>
-    <UseTransparentTextures>true</UseTransparentTextures>
-</Layer>
\ No newline at end of file
diff --git a/src/config/Earth/USDANAIPWMSImageLayer.xml b/src/config/Earth/USDANAIPWMSImageLayer.xml
deleted file mode 100644
index 7d74784a7a..0000000000
--- a/src/config/Earth/USDANAIPWMSImageLayer.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
-  ~ Administrator of the National Aeronautics and Space Administration.
-  ~ All rights reserved.
-  ~ 
-  ~ The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software distributed
-  ~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-  ~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations under the License.
-  ~ 
-  ~ NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
-  ~ software:
-  ~ 
-  ~     Jackson Parser – Licensed under Apache 2.0
-  ~     GDAL – Licensed under MIT
-  ~     JOGL – Licensed under  Berkeley Software Distribution (BSD)
-  ~     Gluegen – Licensed under Berkeley Software Distribution (BSD)
-  ~ 
-  ~ A complete listing of 3rd Party software notices and licenses included in
-  ~ NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
-  ~ notices and licenses PDF found in code directory.
-  -->
-
-<!--$Id: USDANAIPWMSImageLayer.xml 1171 2013-02-11 21:45:02Z dcollins $-->
-<!--DEPRECATED. The preferred NAIP layer is USGS NAIP Plus (USGSNAIPPlusLayer.xml) -->
-<Layer version="1" layerType="TiledImageLayer">
-    <DisplayName>USDA NAIP</DisplayName>
-    <Service serviceName="OGC:WMS" version="1.3">
-        <GetCapabilitiesURL>https://worldwind47.arc.nasa.gov/wms</GetCapabilitiesURL>
-        <GetMapURL>https://worldwind47.arc.nasa.gov/wms</GetMapURL>
-        <LayerNames>NAIP</LayerNames>
-    </Service>
-    <LastUpdate>1240509300000</LastUpdate>
-    <!-- day month year hours:minutes:seconds timezone -->
-    <LastUpdate>23 04 2009 17:55:00 GMT</LastUpdate>
-    <DataCacheName>Earth/USDA NAIP</DataCacheName>
-    <ImageFormat>image/dds</ImageFormat>
-    <AvailableImageFormats>
-        <ImageFormat>image/png</ImageFormat>
-        <ImageFormat>image/dds</ImageFormat>
-    </AvailableImageFormats>
-    <FormatSuffix>.dds</FormatSuffix>
-    <NumLevels count="15" numEmpty="6"/>
-    <TileOrigin>
-        <LatLon units="degrees" latitude="-90" longitude="-180"/>
-    </TileOrigin>
-    <LevelZeroTileDelta>
-        <LatLon units="degrees" latitude="36" longitude="36"/>
-    </LevelZeroTileDelta>
-    <TileSize>
-        <Dimension width="512" height="512"/>
-    </TileSize>
-    <Sector>
-        <SouthWest>
-            <LatLon units="degrees" latitude="24.0" longitude="-125.0"/>
-        </SouthWest>
-        <NorthEast>
-            <LatLon units="degrees" latitude="50.0" longitude="-66.0"/>
-        </NorthEast>
-    </Sector>
-    <UseTransparentTextures>true</UseTransparentTextures>
-    <ScreenCredit creditType="ScreenImage">
-        <FileName>images/usda_logo-32x32.png</FileName>
-        <Link>http://www.fsa.usda.gov/FSA</Link>
-    </ScreenCredit>
-    <RetrievalTimeouts>
-        <ReadTimeout>
-            <Time units="milliseconds" value="30000"/>
-        </ReadTimeout>
-    </RetrievalTimeouts>
-</Layer>
\ No newline at end of file
diff --git a/src/config/Earth/USGSTopoHighResLayer.xml b/src/config/Earth/USGSTopoHighResLayer.xml
deleted file mode 100644
index 3f626c65a2..0000000000
--- a/src/config/Earth/USGSTopoHighResLayer.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
-  ~ Administrator of the National Aeronautics and Space Administration.
-  ~ All rights reserved.
-  ~ 
-  ~ The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software distributed
-  ~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-  ~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations under the License.
-  ~ 
-  ~ NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
-  ~ software:
-  ~ 
-  ~     Jackson Parser – Licensed under Apache 2.0
-  ~     GDAL – Licensed under MIT
-  ~     JOGL – Licensed under  Berkeley Software Distribution (BSD)
-  ~     Gluegen – Licensed under Berkeley Software Distribution (BSD)
-  ~ 
-  ~ A complete listing of 3rd Party software notices and licenses included in
-  ~ NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
-  ~ notices and licenses PDF found in code directory.
-  -->
-
-<!--$Id: USGSTopoHighResLayer.xml 1171 2013-02-11 21:45:02Z dcollins $-->
-<Layer version="1" layerType="TiledImageLayer">
-    <DisplayName>USGS Topo Scanned Maps 1:24K</DisplayName>
-    <LastUpdate>25 06 2011 05:00:00 GMT</LastUpdate>
-    <ActiveAltitudes max="1e6"/>
-    <MapScale>24e3</MapScale>
-    <NumLevels count="13" numEmpty="0"/>
-    <DetailHint>0.3</DetailHint>
-    <Service serviceName="OGC:WMS" version="1.3">
-        <GetCapabilitiesURL>https://worldwind47.arc.nasa.gov/topo</GetCapabilitiesURL>
-        <GetMapURL>https://worldwind47.arc.nasa.gov/topo</GetMapURL>
-        <LayerNames>US_TOPO_3</LayerNames>
-    </Service>
-    <DataCacheName>Earth/USGS Topographic Maps 24k Scale</DataCacheName>
-    <RetrievePropertiesFromService>true</RetrievePropertiesFromService>
-    <AvailableImageFormats>
-        <ImageFormat>image/png</ImageFormat>
-        <ImageFormat>image/jpeg</ImageFormat>
-        <ImageFormat>image/dds</ImageFormat>
-    </AvailableImageFormats>
-    <ImageFormat>image/png</ImageFormat>
-    <FormatSuffix>.png</FormatSuffix>
-    <TileOrigin>
-        <LatLon units="degrees" latitude="-90" longitude="-180"/>
-    </TileOrigin>
-    <LevelZeroTileDelta>
-        <LatLon units="degrees" latitude="36" longitude="36"/>
-    </LevelZeroTileDelta>
-    <TileSize>
-        <Dimension width="512" height="512"/>
-    </TileSize>
-    <Sector>
-        <SouthWest>
-            <LatLon units="degrees" latitude="18" longitude="-161"/>
-        </SouthWest>
-        <NorthEast>
-            <LatLon units="degrees" latitude="50" longitude="-66"/>
-        </NorthEast>
-    </Sector>
-    <RetrievalTimeouts>
-        <ReadTimeout>
-            <Time units="milliseconds" value="30000"/>
-        </ReadTimeout>
-    </RetrievalTimeouts>
-</Layer>
\ No newline at end of file
diff --git a/src/config/Earth/USGSTopoLowResLayer.xml b/src/config/Earth/USGSTopoLowResLayer.xml
deleted file mode 100644
index 23387c5ad2..0000000000
--- a/src/config/Earth/USGSTopoLowResLayer.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
-  ~ Administrator of the National Aeronautics and Space Administration.
-  ~ All rights reserved.
-  ~ 
-  ~ The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software distributed
-  ~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-  ~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations under the License.
-  ~ 
-  ~ NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
-  ~ software:
-  ~ 
-  ~     Jackson Parser – Licensed under Apache 2.0
-  ~     GDAL – Licensed under MIT
-  ~     JOGL – Licensed under  Berkeley Software Distribution (BSD)
-  ~     Gluegen – Licensed under Berkeley Software Distribution (BSD)
-  ~ 
-  ~ A complete listing of 3rd Party software notices and licenses included in
-  ~ NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
-  ~ notices and licenses PDF found in code directory.
-  -->
-
-<!--$Id: USGSTopoLowResLayer.xml 1171 2013-02-11 21:45:02Z dcollins $-->
-<Layer version="1" layerType="TiledImageLayer">
-    <DisplayName>USGS Topo Scanned Maps 1:250K</DisplayName>
-    <LastUpdate>25 06 2011 05:00:00 GMT</LastUpdate>
-    <ActiveAltitudes max="50e6"/>
-    <MapScale>250e3</MapScale>
-    <DetailHint>0.3</DetailHint>
-    <NumLevels count="10" numEmpty="0"/>
-    <Service serviceName="OGC:WMS" version="1.3">
-        <GetCapabilitiesURL>https://worldwind47.arc.nasa.gov/topo</GetCapabilitiesURL>
-        <GetMapURL>https://worldwind47.arc.nasa.gov/topo</GetMapURL>
-        <LayerNames>US_TOPO_1</LayerNames>
-    </Service>
-    <DataCacheName>Earth/USGS Topographic Maps 250k Scale</DataCacheName>
-    <RetrievePropertiesFromService>true</RetrievePropertiesFromService>
-    <AvailableImageFormats>
-        <ImageFormat>image/png</ImageFormat>
-        <ImageFormat>image/jpeg</ImageFormat>
-        <ImageFormat>image/dds</ImageFormat>
-    </AvailableImageFormats>
-    <ImageFormat>image/png</ImageFormat>
-    <FormatSuffix>.png</FormatSuffix>
-    <TileOrigin>
-        <LatLon units="degrees" latitude="-90" longitude="-180"/>
-    </TileOrigin>
-    <LevelZeroTileDelta>
-        <LatLon units="degrees" latitude="20" longitude="20"/>
-    </LevelZeroTileDelta>
-    <TileSize>
-        <Dimension width="512" height="512"/>
-    </TileSize>
-    <Sector>
-        <SouthWest>
-            <LatLon units="degrees" latitude="18" longitude="-178"/>
-        </SouthWest>
-        <NorthEast>
-            <LatLon units="degrees" latitude="72" longitude="-66"/>
-        </NorthEast>
-    </Sector>
-</Layer>
\ No newline at end of file
diff --git a/src/config/Earth/USGSTopoMedResLayer.xml b/src/config/Earth/USGSTopoMedResLayer.xml
deleted file mode 100644
index d108ed21ce..0000000000
--- a/src/config/Earth/USGSTopoMedResLayer.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
-  ~ Administrator of the National Aeronautics and Space Administration.
-  ~ All rights reserved.
-  ~ 
-  ~ The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software distributed
-  ~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-  ~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations under the License.
-  ~ 
-  ~ NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
-  ~ software:
-  ~ 
-  ~     Jackson Parser – Licensed under Apache 2.0
-  ~     GDAL – Licensed under MIT
-  ~     JOGL – Licensed under  Berkeley Software Distribution (BSD)
-  ~     Gluegen – Licensed under Berkeley Software Distribution (BSD)
-  ~ 
-  ~ A complete listing of 3rd Party software notices and licenses included in
-  ~ NASA World Wind Java (WWJ)  can be found in the WorldWindJava-v2.2 3rd-party
-  ~ notices and licenses PDF found in code directory.
-  -->
-
-<!--$Id: USGSTopoMedResLayer.xml 1171 2013-02-11 21:45:02Z dcollins $-->
-<Layer version="1" layerType="TiledImageLayer">
-    <DisplayName>USGS Topo Scanned Maps 1:100K</DisplayName>
-    <LastUpdate>25 06 2011 05:00:00 GMT</LastUpdate>
-    <ActiveAltitudes max="10e6"/>
-    <MapScale>100e3</MapScale>
-    <NumLevels count="10" numEmpty="0"/>
-    <DetailHint>0.3</DetailHint>
-    <Service serviceName="OGC:WMS" version="1.3">
-        <GetCapabilitiesURL>https://worldwind47.arc.nasa.gov/topo</GetCapabilitiesURL>
-        <GetMapURL>https://worldwind47.arc.nasa.gov/topo</GetMapURL>
-        <LayerNames>US_TOPO_2</LayerNames>
-    </Service>
-    <DataCacheName>Earth/USGS Topographic Maps 100k Scale</DataCacheName>
-    <RetrievePropertiesFromService>true</RetrievePropertiesFromService>
-    <AvailableImageFormats>
-        <ImageFormat>image/png</ImageFormat>
-        <ImageFormat>image/jpeg</ImageFormat>
-        <ImageFormat>image/dds</ImageFormat>
-    </AvailableImageFormats>
-    <ImageFormat>image/png</ImageFormat>
-    <FormatSuffix>.png</FormatSuffix>
-    <TileOrigin>
-        <LatLon units="degrees" latitude="-90" longitude="-180"/>
-    </TileOrigin>
-    <LevelZeroTileDelta>
-        <LatLon units="degrees" latitude="20" longitude="20"/>
-    </LevelZeroTileDelta>
-    <TileSize>
-        <Dimension width="512" height="512"/>
-    </TileSize>
-    <Sector>
-        <SouthWest>
-            <LatLon units="degrees" latitude="18" longitude="-178"/>
-        </SouthWest>
-        <NorthEast>
-            <LatLon units="degrees" latitude="72" longitude="-66"/>
-        </NorthEast>
-    </Sector>
-    <RetrievalTimeouts>
-        <ReadTimeout>
-            <Time units="milliseconds" value="20000"/>
-        </ReadTimeout>
-    </RetrievalTimeouts>
-</Layer>
\ No newline at end of file
diff --git a/src/config/worldwind.layers.xml b/src/config/worldwind.layers.xml
index d119d4f418..49e9db44b4 100644
--- a/src/config/worldwind.layers.xml
+++ b/src/config/worldwind.layers.xml
@@ -47,12 +47,11 @@
     <Layer href="config/Earth/USGSNAIPPlusLayer.xml" actuate="onRequest"/>
     <!--<Layer href="config/Earth/MSVirtualEarthAerialLayer.xml" actuate="onRequest"/>-->
     <Layer href="config/Earth/BingImagery.xml" actuate="onRequest"/>
-    <Layer href="config/Earth/USGSTNMTopoLayer.xml" actuate="onRequest"/>
+<!--    <Layer href="config/Earth/USGSTNMTopoLayer.xml" actuate="onRequest"/>
     <Layer href="config/Earth/USGSTNMTopoLargeLayer.xml" actuate="onRequest"/>
     <Layer href="config/Earth/USGSTopoLowResLayer.xml" actuate="onRequest"/>
     <Layer href="config/Earth/USGSTopoMedResLayer.xml" actuate="onRequest"/>
-    <Layer href="config/Earth/USGSTopoHighResLayer.xml" actuate="onRequest"/>
-    <!--<Layer className="gov.nasa.worldwind.layers.Earth.OpenTopoMapLayer" actuate="onRequest"/>-->
+    <Layer href="config/Earth/USGSTopoHighResLayer.xml" actuate="onRequest"/>-->
     <!--<Layer className="gov.nasa.worldwind.layers.Earth.OSMMapnikLayer" actuate="onRequest"/>-->
     <!--<Layer className="gov.nasa.worldwind.layers.Earth.OSMCycleMapLayer" actuate="onRequest"/>-->
     <!--<Layer className="gov.nasa.worldwind.layers.Earth.WikimapiaLayer" actuate="onRequest"/>-->
diff --git a/src/config/worldwind.xml b/src/config/worldwind.xml
index bd3d8d82b7..dc95479b47 100644
--- a/src/config/worldwind.xml
+++ b/src/config/worldwind.xml
@@ -117,7 +117,7 @@
     <!--<Property name="gov.nasa.worldwind.avkey.UrlProxyType" value="Proxy.Type.Http"/>-->
 
     <!-- Location of icons for MIL-STD-2525C symbol set. This can be a URL to a web server, to a local zip or jar archive.
-See https://goworldwind.org/developers-guide/symbology/tactical-symbols/#offline-use for more information on how
+See https://worldwind.arc.nasa.gov/java/tutorials/tactical-symbols/#offline-use for more information on how
 to configure a local symbol repository.
 Examples: http://myserver.com/milstd2525/   (web server)
     jar:file:milstd2525-symbols.zip!  (local zip archive)  -->
diff --git a/src/gov/nasa/worldwind/Version.java b/src/gov/nasa/worldwind/Version.java
index 9a1a4e7bd0..7fc7e9cb24 100644
--- a/src/gov/nasa/worldwind/Version.java
+++ b/src/gov/nasa/worldwind/Version.java
@@ -35,7 +35,7 @@ public class Version {
 
     private static final String MAJOR_VALUE = "2";
     private static final String MINOR_VALUE = "2";
-    private static final String DOT_VALUE = "0";
+    private static final String DOT_VALUE = "1";
     private static final String versionNumber = "v" + MAJOR_VALUE + "." + MINOR_VALUE + "." + DOT_VALUE;
     private static final String versionName = "NASA WorldWind Java";
 
diff --git a/src/gov/nasa/worldwind/data/package-info.java b/src/gov/nasa/worldwind/data/package-info.java
index 700285cd03..dcf64cff4e 100644
--- a/src/gov/nasa/worldwind/data/package-info.java
+++ b/src/gov/nasa/worldwind/data/package-info.java
@@ -311,7 +311,7 @@ GDAL and PROJ4 have been incorporated for MacOSX (Snow Leopard, 64-bit), Windows
 <h3>Deploying with Java Web Start</h3>
  *
     Instructions for using the WorldWind GDAL libraries with a Java Web Start application are available at
- * <a href="https://goworldwind.org/getting-started/" target="_blank">https://goworldwind.org/getting-started/</a>.
+ * <a href="https://worldwind.arc.nasa.gov/java/get-started/" target="_blank">https://worldwind.arc.nasa.gov/java/get-started/</a>.
  *
  * <!--**************************************************************-->
  * <!--********************  Use Case Examples  *********************-->