Update setup for 2.1
diff --git a/releng/org.eclipse.epsilon.releng/epsilonUse.setup b/releng/org.eclipse.epsilon.releng/epsilonUse.setup
index dae5827..1b64185 100644
--- a/releng/org.eclipse.epsilon.releng/epsilonUse.setup
+++ b/releng/org.eclipse.epsilon.releng/epsilonUse.setup
@@ -81,15 +81,26 @@
     </setupTask>
     <setupTask
         xsi:type="setup:ResourceCreationTask"
-        content="defaultPerspectiveId=org.eclipse.epsilon.perspective.EpsilonPerspectiveFactory&#xA;"
         targetURL="configuration:/.settings/org.eclipse.ui.prefs">
       <description>Default preferences</description>
+      <content>
+        defaultPerspectiveId=org.eclipse.epsilon.perspective.EpsilonPerspectiveFactory
+
+      </content>
     </setupTask>
     <setupTask
         xsi:type="setup:ResourceCreationTask"
-        content="RECENT_WORKSPACES=${epsilon.workspace}&#xA;MAX_RECENT_WORKSPACES=5&#xA;RECENT_WORKSPACES_PROTOCOL=3&#xA;SHOW_RECENT_WORKSPACES=false&#xA;SHOW_WORKSPACE_SELECTION_DIALOG=false&#xA;eclipse.preferences.version=1&#xA;"
         targetURL="configuration:/.settings/org.eclipse.ui.ide.prefs">
       <description>Default workspace</description>
+      <content>
+        RECENT_WORKSPACES=${epsilon.workspace}
+        MAX_RECENT_WORKSPACES=5
+        RECENT_WORKSPACES_PROTOCOL=3
+        SHOW_RECENT_WORKSPACES=false
+        SHOW_WORKSPACE_SELECTION_DIALOG=false
+        eclipse.preferences.version=1
+
+      </content>
     </setupTask>
     <setupTask
         xsi:type="setup:TextModifyTask"
@@ -112,19 +123,30 @@
     </setupTask>
     <setupTask
         xsi:type="setup:ResourceCreationTask"
-        content="eclipse.preferences.version=1&#xA;showIntro=false&#xA;defaultPerspectiveId=org.eclipse.epsilon.perspective.EpsilonPerspectiveFactory&#xA;"
         targetURL="${epsilon.workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs|uri}">
       <description>Populate default workspace preferences.</description>
+      <content>
+        eclipse.preferences.version=1
+        showIntro=false
+        defaultPerspectiveId=org.eclipse.epsilon.perspective.EpsilonPerspectiveFactory
+
+      </content>
     </setupTask>
     <setupTask
         xsi:type="setup:ResourceCreationTask"
-        content="EXIT_PROMPT_ON_CLOSE_LAST_WINDOW=false&#xA;eclipse.preferences.version=1&#xA;quickStart=false&#xA;tipsAndTricks=true&#xA;"
         targetURL="${epsilon.workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs|uri}">
       <description>Populate default workspace preferences.</description>
+      <content>
+        EXIT_PROMPT_ON_CLOSE_LAST_WINDOW=false
+        eclipse.preferences.version=1
+        quickStart=false
+        tipsAndTricks=true
+
+      </content>
     </setupTask>
     <description>Creates the workspace and points Eclipse to it, with default preferences pre-configured.</description>
   </setupTask>
-  <version name="2.0"
+  <version name="2.1"
       requiredJavaVersion="1.8">
     <setupTask
         xsi:type="setup.p2:P2Task"
@@ -278,11 +300,11 @@
       <requirement
           name="org.eclipse.epsilon.flexmi.dt.feature.feature.group"/>
       <repository
-          url="http://download.eclipse.org/releases/2020-03"/>
+          url="http://download.eclipse.org/releases/2020-06"/>
       <repository
           url="http://download.eclipse.org/oomph/updates/release"/>
       <repository
-          url="http://download.eclipse.org/epsilon/updates/2.0"/>
+          url="http://download.eclipse.org/epsilon/updates/2.1"/>
       <repository
           url="http://download.eclipse.org/emfatic/update"/>
       <repository
@@ -290,7 +312,7 @@
       <repository
           url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases"/>
     </setupTask>
-    <description>Epsilon v2.0</description>
+    <description>Epsilon v2.1</description>
   </version>
   <version name="Interim"
       requiredJavaVersion="1.8">