diff --git a/.gitignore b/.gitignore
index f643b1c..3e2da46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,6 @@ js/reveal.min.js
 /.idea/uiDesigner.xml
 .idea/libraries/
 .idea/artifacts/
+*.iml
 *.log
 .idea
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 49858d6..3c42e84 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" default="true">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index cf5d795..a2e0a88 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/ws-angular_slides.iml" filepath="$PROJECT_DIR$/ws-angular_slides.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ws-angular_slides_en.iml" filepath="$PROJECT_DIR$/ws-angular_slides_en.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 5bc078a..0e7513d 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,26 @@
 # Angular Workshop - Slides
 
-- Die Präsentation wurde mit [reveal.js](http://lab.hakim.se/reveal-js/) erstellt.
-- Die Dokumentation zur reveal.js findet man direkt auf Github: [Doku](https://github.com/hakimel/reveal.js) 
-- Durch die Folien kann mit den Pfeiltasten navigiert werden.
-- Die beste User Experience erreicht man mit Google Chrome
-- "F" springt in den FullScreen Modus, mit ESC verlassen
-- "O" zeigt einen Overview über alle Slides, mit ESC verlassen
-- mit CTRL+P erhält man eine für den Druck optimierte Seite. Diese kann auch als PDF gespeichert werden. (Dieses Feature ist nur lokal mit einem Dev Server möglich)
-- Bei Fehlern oder Fragen: Issue oder Pull Request erstellen
+- The presentation is created with [reveal.js](http://lab.hakim.se/reveal-js/).
+- You can find the documentation here: [Doku](https://github.com/hakimel/reveal.js) 
+- THe slides are navigatable with the arrows on your keyboard
+- Google Chrome offers the best user experience
+- "F" jumps to fullscreen mode, exit with ESC
+- "O" shows an overview of all slides, exit with ESC
+- CTRL + P offers a view which is perfect for printing. You can also print those as pdfs, but you need to have the dev server running locally to use this feature
+- You found an error or have a question? Open a pull request of fill an issue
 
 ## Inhalt
 - [01 Intro](https://baloise.github.io/ws-angular_slides/slides/01_Intro.html)
-- [02 Grundlagen](https://baloise.github.io/ws-angular_slides/slides/02_Grundlagen.html)
-- [03 Projekt Setup](https://baloise.github.io/ws-angular_slides/slides/03_ProjectSetup.html)
+- [02 Basiscs](https://baloise.github.io/ws-angular_slides/slides/02_Basics.html)
+- [03 Project Setup](https://baloise.github.io/ws-angular_slides/slides/03_ProjectSetup.html)
 - [04 Components](https://baloise.github.io/ws-angular_slides/slides/04_Components.html)
 - [05 Architecture](https://baloise.github.io/ws-angular_slides/slides/05_Architecture.html)
-- [06 Templates Grundlagen](https://baloise.github.io/ws-angular_slides/slides/06_Templates_Grundlagen.html)
-- [07 Templates Erweitert](https://baloise.github.io/ws-angular_slides/slides/07_Templates_Erweitert.html)
+- [06 Templates Basics](https://baloise.github.io/ws-angular_slides/slides/06_Templates_Basics.html)
+- [07 Templates Advanced](https://baloise.github.io/ws-angular_slides/slides/07_Templates_Advanced.html)
 - [08 Component Architecture](https://baloise.github.io/ws-angular_slides/slides/08_Component_Architecture.html)
 - [09 Services & HTTP](https://baloise.github.io/ws-angular_slides/slides/09_Services_HTTP.html)
 - [10 Routing](https://baloise.github.io/ws-angular_slides/slides/10_Routing.html)
 - [11 Forms](https://baloise.github.io/ws-angular_slides/slides/11_Forms.html)
 - [12 Testing](https://baloise.github.io/ws-angular_slides/slides/12_Testing.html)
-- [13 Weiteres](https://baloise.github.io/ws-angular_slides/slides/13_WeiterfuehrendeThemen.html)
+- [13 Additional](https://baloise.github.io/ws-angular_slides/slides/13_AdditionalTopics.html)
 
diff --git a/index.html b/index.html
index 08b0d2f..1a282de 100644
--- a/index.html
+++ b/index.html
@@ -1,14 +1,14 @@
 <p><a href="slides/01_Intro.html">01 Intro</a></p>
-<p><a href="slides/02_Grundlagen.html">02 Grundlagen</a></p>
-<p><a href="slides/03_ProjectSetup.html">03 Projekt Setup</a></p>
+<p><a href="slides/02_Basics.html">02 Basics</a></p>
+<p><a href="slides/03_ProjectSetup.html">03 Project Setup</a></p>
 <p><a href="slides/04_Components.html">04 Components</a></p>
 <p><a href="slides/05_Architecture.html">05 Architecture</a></p>
-<p><a href="slides/06_Templates_Grundlagen.html">06 Templates Grundlagen</a></p>
-<p><a href="slides/07_Templates_Erweitert.html">07 Templates Erweitert</a></p>
+<p><a href="slides/06_Templates_Basics.html">06 Templates Basics</a></p>
+<p><a href="slides/07_Templates_Advanced.html">07 Templates Advanced</a></p>
 <p><a href="slides/08_Component_Architecture.html">08 Component Architecture</a></p>
 <p><a href="slides/09_Services_HTTP.html">09 Services & HTTP</a></p>
 <p><a href="slides/10_Routing.html">10 Routing</a></p>
 <p><a href="slides/11_Forms.html">11 Forms</a></p>
 <p><a href="slides/12_Testing.html">12 Testing</a></p>
-<p><a href="slides/13_WeiterfuehrendeThemen.html">13 Weiterfuehrende Themen</a></p>
+<p><a href="slides/13_AdditionalTopics.html">13 Additional Topics</a></p>
 
diff --git a/package-lock.json b/package-lock.json
index 9bfd02c..1b2a737 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3739,6 +3739,15 @@
         "readable-stream": "2.3.3"
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "http://svx-build02.bvch.ch:9081/nexus/repository/npm/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "http://svx-build02.bvch.ch:9081/nexus/repository/npm/string-width/-/string-width-1.0.2.tgz",
@@ -3750,15 +3759,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "http://svx-build02.bvch.ch:9081/nexus/repository/npm/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "http://svx-build02.bvch.ch:9081/nexus/repository/npm/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/slides/02_Grundlagen.html b/slides/02_Basics.html
similarity index 100%
rename from slides/02_Grundlagen.html
rename to slides/02_Basics.html
diff --git a/slides/06_Templates_Grundlagen.html b/slides/06_Templates_Basics.html
similarity index 100%
rename from slides/06_Templates_Grundlagen.html
rename to slides/06_Templates_Basics.html
diff --git a/slides/07_Templates_Erweitert.html b/slides/07_Templates_Advanced.html
similarity index 100%
rename from slides/07_Templates_Erweitert.html
rename to slides/07_Templates_Advanced.html
diff --git a/slides/13_WeiterfuehrendeThemen.html b/slides/13_AdditionalTopics.html
similarity index 100%
rename from slides/13_WeiterfuehrendeThemen.html
rename to slides/13_AdditionalTopics.html