diff --git a/.gitignore b/.gitignore
index f57469ffc8..fa96862c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 build
 src/config.vala
+*flatpak*
 *~
 
diff --git a/data/io.elementary.code.appdata.xml.in b/data/io.elementary.code.appdata.xml.in
index aeb2154c81..3103543e0b 100644
--- a/data/io.elementary.code.appdata.xml.in
+++ b/data/io.elementary.code.appdata.xml.in
@@ -26,6 +26,14 @@
     </ul>
   </description>
   <releases>
+    <release version="6.1.1" date="2021-11-23" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>Show symbol list on the right of the document instead of as a tab in the sidebar</li>
+        </ul>
+      </description>
+    </release>
     <release version="6.1.0" date="2021-11-23" urgency="medium">
       <description>
         <p>Improvements:</p>
diff --git a/data/io.elementary.code.gschema.xml b/data/io.elementary.code.gschema.xml
index 6ec10220c8..dd893ffa2e 100644
--- a/data/io.elementary.code.gschema.xml
+++ b/data/io.elementary.code.gschema.xml
@@ -121,7 +121,7 @@
       <description>Set the preferred font.</description>
     </key>
     <key name="style-scheme" type="s">
-      <default>'solarized-light'</default>
+      <default>'elementary-light'</default>
       <summary>Preferred Style Scheme</summary>
       <description>Set the preferred style scheme.</description>
     </key>
@@ -140,6 +140,11 @@
       <summary>Whether search is cyclic</summary>
       <description>Whether text searching should cycle back to the beginning of the document after reaching the end of the document.</description>
     </key>
+    <key name="strip-trailing-on-save" type="b">
+      <default>false</default>
+      <summary>Whether to automatically remove trailing whitespace on saving</summary>
+      <description>Whether trailing whitespace should be removed from a document whenever it is saved, including on autosave.</description>
+    </key>
   </schema>
 
   <schema path="/io/elementary/code/services/" id="io.elementary.code.services" gettext-domain="io.elementary.code">
diff --git a/data/meson.build b/data/meson.build
index c2ff0c2881..471d1eea6c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -11,6 +11,11 @@ foreach i : icon_sizes
     )
 endforeach
 
+install_data([
+  'styles/elementary-dark.xml',
+  'styles/elementary-light.xml',
+], install_dir: join_paths(get_option('datadir'), 'gtksourceview-4', 'styles'))
+
 install_data([
   'fonts/BuilderBlocks.ttf',
 ], install_dir: join_paths(get_option('datadir'), meson.project_name(), 'fonts'))
diff --git a/data/styles/elementary-dark.xml b/data/styles/elementary-dark.xml
new file mode 100644
index 0000000000..5bf17e7e8d
--- /dev/null
+++ b/data/styles/elementary-dark.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<style-scheme id="elementary-dark" _name="elementary Dark" version="1.0">
+  <author>Micah Ilbery</author>
+  <_description>Color scheme using the elementary color palette</_description>
+
+  <!-- Background Colors Palette -->
+  <color name="bg-0"  value="#485a6c"/> <!-- SLATE500 -->
+  <color name="bg-1"  value="#2a3441"/> <!-- SLATE700 BLACK500 MIX 75% -->
+  <color name="bg-2"  value="#212730"/> <!-- SLATE700 BLACK700 MIX 50% -->
+  <color name="bg-3"  value="#1d2125"/> <!-- SLATE700 BLACK700 MIX 25% -->
+  <color name="bg-4"  value="#0e141f"/> <!-- SLATE900 -->
+
+  <color name="fg-0"   value="#d4d4d4"/> <!-- SILVER300 -->
+  <color name="fg-1"   value="#abacae"/> <!-- SILVER500 -->
+  <color name="fg-2"   value="#667885"/> <!-- SLATE300 -->
+
+  <color name="yellow"  value="#ffe16b"/> <!-- BANANA -->
+  <color name="orange"  value="#ffa154"/> <!-- ORANGE -->
+  <color name="red"     value="#ed5353"/> <!-- STRAWBERRY -->
+  <color name="pink"    value="#f4679d"/> <!-- BUBBLEGUM -->
+  <color name="purple"  value="#cd9ef7"/> <!-- GRAPE -->
+  <color name="blue"    value="#64baff"/> <!-- BLUEBERRY -->
+  <color name="cyan"    value="#28bca3"/> <!-- MINT -->
+  <color name="green"   value="#9bdb4d"/> <!-- LIME -->
+
+  <!-- Global Settings -->
+  <style name="text"                        foreground="fg-0" background="bg-2"/>
+  <style name="selection"                   foreground="bg-4" background="bg-0"/>
+  <style name="cursor"                      foreground="fg-0"/>
+  <style name="secondary-cursor"            foreground="fg-1"/>
+  <style name="current-line"                background="bg-1"/>
+  <style name="line-numbers"                foreground="fg-2" background="bg-3"/>
+  <style name="background-pattern"          background="bg-4"/>
+  <style name="draw-spaces"                 foreground="fg-2"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="bg-4" background="fg-0"/>
+  <style name="bracket-mismatch"            foreground="red" background="fg-2"/>
+
+  <!-- Right Margin -->
+  <style name="right-margin"                foreground="bg-2" background="fg-1"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                foreground="bg-4" background="yellow"/>
+
+  <!-- Comments -->
+  <style name="def:comment"                 foreground="fg-2"/>
+  <style name="def:shebang"                 foreground="fg-2" bold="true"/>
+  <style name="def:doc-comment-element"     italic="true"/>
+
+  <!-- Constants -->
+  <style name="def:constant"                foreground="cyan"/>
+  <style name="def:special-char"            foreground="green"/>
+
+  <!-- Identifiers -->
+  <style name="def:identifier"              foreground="blue"/>
+
+  <!-- Statements -->
+  <style name="def:statement"               foreground="orange"/>
+
+  <!-- Types -->
+  <style name="def:type"                    foreground="yellow"/>
+
+  <!-- Markup -->
+  <style name="def:emphasis"                italic="true"/>
+  <style name="def:strong-emphasis"         foreground="orange"/>
+  <style name="def:inline-code"             foreground="blue"/>
+  <style name="def:insertion"               underline="single"/>
+  <style name="def:deletion"                strikethrough="true"/>
+  <style name="def:link-text"               foreground="fg-2"/>
+  <style name="def:link-symbol"             foreground="fg-2" bold="true"/>
+  <style name="def:link-destination"        italic="true" underline="single"/>
+  <style name="def:heading"                 foreground="yellow"/>
+  <style name="def:thematic-break"          foreground="yellow"/>
+  <style name="def:preformatted-section"    foreground="blue"/>
+  <style name="def:list-marker"             foreground="orange"/>
+
+  <!-- Operators -->
+  <style name="def:operator"                foreground="green"/>
+
+  <!-- Others -->
+  <style name="def:preprocessor"            foreground="purple"/>
+  <style name="def:error"                   foreground="red" bold="true"/>
+  <style name="def:note"                    foreground="pink" bold="true"/>
+  <style name="def:net-address"             italic="true" underline="single"/>
+
+  <!-- Language specific styles -->
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="yellow"/>
+  <style name="diff:special-case"           use-style="def:constant"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+
+  <style name="xml:tags"                    foreground="cyan"/>
+  <style name="xml:attribute-name"          foreground="purple"/>
+  <style name="xml:namespace"               foreground="green" bold="true"/>
+
+  <style name="js:built-in-constructor"     use-style="def:identifier"/>
+
+  <style name="latex:display-math"          foreground="purple"/>
+  <style name="latex:command"               foreground="green" bold="true"/>
+  <style name="latex:include"               use-style="def:preprocessor"/>
+
+  <style name="sh:variable"                 foreground="purple"/>
+
+  <!-- legacy styles for old lang files -->
+  <style name="Others"                      foreground="green" bold="true"/>
+  <style name="Others 2"                    foreground="cyan"/>
+  <style name="Others 3"                    foreground="purple"/>
+
+</style-scheme>
diff --git a/data/styles/elementary-light.xml b/data/styles/elementary-light.xml
new file mode 100644
index 0000000000..21eb6a3dd5
--- /dev/null
+++ b/data/styles/elementary-light.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<style-scheme id="elementary-light" _name="elementary Light" version="1.0">
+  <author>Micah Ilbery</author>
+  <_description>Color scheme using the elementary color palette</_description>
+
+  <!-- Background Colors Palette -->
+  <color name="bg-0"  value="#f7f3ed"/> <!-- LATTE100 SILVER100 MIX 25% -->
+  <color name="bg-1"  value="#f5eddf"/> <!-- LATTE100 SILVER100 MIX 50% -->
+  <color name="bg-2"  value="#f2e6d2"/> <!-- LATTE100 SILVER100 MIX 75% -->
+  <color name="bg-3"  value="#f0e2c9"/> <!-- LATTE100 SILVER100 MIX 90% -->
+  <color name="bg-4"  value="#efdfc4"/> <!-- LATTE100 -->
+
+  <color name="fg-0"   value="#555761"/> <!-- SILVER900 -->
+  <color name="fg-1"   value="#7e8087"/> <!-- SILVER700 -->
+  <color name="fg-2"   value="#abacae"/> <!-- SILVER300 -->
+
+  <color name="yellow"  value="#d48e15"/> <!-- BANANA700 -->
+  <color name="orange"  value="#cc3b02"/> <!-- ORANGE700 -->
+  <color name="red"     value="#c6262e"/> <!-- STRAWBERRY500 -->
+  <color name="pink"    value="#bc245d"/> <!-- BUBBLEGUM700 -->
+  <color name="purple"  value="#a56de2"/> <!-- GRAPE500 -->
+  <color name="blue"    value="#3689e6"/> <!-- BLUEBERRY500 -->
+  <color name="cyan"    value="#0e9a83"/> <!-- MINT700 -->
+  <color name="green"   value="#68b723"/> <!-- LIME500 -->
+
+  <!-- Global Settings -->
+  <style name="text"                        foreground="fg-0" background="bg-1"/>
+  <style name="selection"                   foreground="fg-1" background="bg-4"/>
+  <style name="cursor"                      foreground="fg-0"/>
+  <style name="secondary-cursor"            foreground="fg-1"/>
+  <style name="current-line"                background="bg-1"/>
+  <style name="line-numbers"                foreground="fg-1" background="bg-2"/>
+  <style name="background-pattern"          background="bg-4"/>
+  <style name="draw-spaces"                 foreground="fg-1"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="bg-4" background="fg-2"/>
+  <style name="bracket-mismatch"            foreground="red" background="fg-2"/>
+
+  <!-- Right Margin -->
+  <style name="right-margin"                foreground="bg-3" background="fg-1"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                foreground="bg-4" background="yellow"/>
+
+  <!-- Comments -->
+  <style name="def:comment"                 foreground="fg-1"/>
+  <style name="def:shebang"                 foreground="fg-1" bold="true"/>
+  <style name="def:doc-comment-element"     italic="true"/>
+
+  <!-- Constants -->
+  <style name="def:constant"                foreground="cyan"/>
+  <style name="def:special-char"            foreground="green"/>
+
+  <!-- Identifiers -->
+  <style name="def:identifier"              foreground="blue"/>
+
+  <!-- Statements -->
+  <style name="def:statement"               foreground="orange"/>
+
+  <!-- Types -->
+  <style name="def:type"                    foreground="yellow"/>
+
+  <!-- Markup -->
+  <style name="def:emphasis"                italic="true"/>
+  <style name="def:strong-emphasis"         foreground="orange"/>
+  <style name="def:inline-code"             foreground="blue"/>
+  <style name="def:insertion"               underline="single"/>
+  <style name="def:deletion"                strikethrough="true"/>
+  <style name="def:link-text"               foreground="fg-1"/>
+  <style name="def:link-symbol"             foreground="fg-1" bold="true"/>
+  <style name="def:link-destination"        italic="true" underline="single"/>
+  <style name="def:heading"                 foreground="yellow"/>
+  <style name="def:thematic-break"          foreground="yellow"/>
+  <style name="def:preformatted-section"    foreground="blue"/>
+  <style name="def:list-marker"             foreground="orange"/>
+
+  <!-- Operators -->
+  <style name="def:operator"                foreground="green"/>
+
+  <!-- Others -->
+  <style name="def:preprocessor"            foreground="purple"/>
+  <style name="def:error"                   foreground="red" bold="true"/>
+  <style name="def:note"                    foreground="pink" bold="true"/>
+  <style name="def:net-address"             italic="true" underline="single"/>
+
+  <!-- Language specific styles -->
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="yellow"/>
+  <style name="diff:special-case"           use-style="def:constant"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+
+  <style name="xml:tags"                    foreground="cyan"/>
+  <style name="xml:attribute-name"          foreground="purple"/>
+  <style name="xml:namespace"               foreground="green" bold="true"/>
+
+  <style name="js:built-in-constructor"     use-style="def:identifier"/>
+
+  <style name="latex:display-math"          foreground="purple"/>
+  <style name="latex:command"               foreground="green" bold="true"/>
+  <style name="latex:include"               use-style="def:preprocessor"/>
+
+  <style name="sh:variable"                 foreground="purple"/>
+
+  <!-- legacy styles for old lang files -->
+  <style name="Others"                      foreground="green" bold="true"/>
+  <style name="Others 2"                    foreground="cyan"/>
+  <style name="Others 3"                    foreground="purple"/>
+
+</style-scheme>
diff --git a/plugins/meson.build b/plugins/meson.build
index 2e8855ee1d..39e9c51f59 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -9,7 +9,8 @@ subdir('outline')
 subdir('pastebin')
 subdir('preserve-indent')
 subdir('spell')
-subdir('strip-trailing-save')
+subdir('snippets')
 subdir('terminal')
 subdir('vim-emulation')
 subdir('word-completion')
+
diff --git a/plugins/outline/C/CtagsSymbolOutline.vala b/plugins/outline/C/CtagsSymbolOutline.vala
index 59205380e3..2370b53a49 100644
--- a/plugins/outline/C/CtagsSymbolOutline.vala
+++ b/plugins/outline/C/CtagsSymbolOutline.vala
@@ -18,14 +18,19 @@
 
 public class Code.Plugins.CtagsSymbolOutline : Object, Code.Plugins.SymbolOutline {
     public const string OUTLINE_RESOURCE_URI = "resource:///io/elementary/code/plugin/outline/";
-    public Scratch.Services.Document doc { get; protected set; }
-    Granite.Widgets.SourceList store;
-    Granite.Widgets.SourceList.ExpandableItem root;
-    GLib.Subprocess current_subprocess;
+    public Scratch.Services.Document doc { get; construct; }
+    private Granite.Widgets.SourceList store;
+    private Granite.Widgets.SourceList.ExpandableItem root;
+    private GLib.Subprocess current_subprocess;
 
     public CtagsSymbolOutline (Scratch.Services.Document _doc) {
-        doc = _doc;
-        doc.doc_saved.connect (() => {parse_symbols ();});
+        Object (
+            doc: _doc
+        );
+    }
+
+    construct {
+        doc.doc_saved.connect (parse_symbols);
         doc.doc_closed.connect (doc_closed);
 
         root = new Granite.Widgets.SourceList.ExpandableItem (_("Symbols"));
@@ -43,13 +48,16 @@ public class Code.Plugins.CtagsSymbolOutline : Object, Code.Plugins.SymbolOutlin
     }
 
     ~CtagsSymbolOutline () {
-        doc.doc_closed.disconnect (doc_closed);
+        debug ("Destroy Ctags outline");
     }
 
     void doc_closed (Scratch.Services.Document doc) {
-        closed ();
-    }
+        doc.doc_closed.disconnect (doc_closed);
+        doc.doc_saved.disconnect (parse_symbols);
 
+        doc.remove_outline_widget ();
+        doc.steal_data<SymbolOutline> ("SymbolOutline");
+    }
     public void parse_symbols () {
         if (current_subprocess != null)
             current_subprocess.force_exit ();
diff --git a/plugins/outline/OutlinePlugin.vala b/plugins/outline/OutlinePlugin.vala
index 4523219740..3757dfec69 100644
--- a/plugins/outline/OutlinePlugin.vala
+++ b/plugins/outline/OutlinePlugin.vala
@@ -21,12 +21,6 @@ namespace Code.Plugins {
         public Object object { owned get; construct; }
 
         Scratch.Services.Interface scratch_interface;
-        SymbolOutline? current_view = null;
-        unowned Scratch.MainWindow window;
-
-        OutlinePane? container = null;
-
-        Gee.LinkedList<SymbolOutline> views;
 
         private Gtk.Grid placeholder;
 
@@ -41,7 +35,6 @@ namespace Code.Plugins {
             placeholder.attach (new Gtk.Image.from_icon_name ("plugin-outline-symbolic", Gtk.IconSize.DND), 0, 0);
             placeholder.attach (placeholder_label, 0, 1);
 
-            views = new Gee.LinkedList<SymbolOutline> ();
             weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
             default_theme.add_resource_path ("/io/elementary/code/plugin/outline");
         }
@@ -53,121 +46,63 @@ namespace Code.Plugins {
         }
 
         public void deactivate () {
-            remove_container ();
             scratch_interface.hook_document.disconnect (on_hook_document);
             scratch_interface.hook_window.disconnect (on_hook_window);
+            scratch_interface.manager.window.document_view.docs.foreach (remove_outline_from_doc);
         }
 
         public void update_state () {
-
         }
 
-        void on_hook_window (Scratch.MainWindow window) {
-            if (container != null) {
-                return;
+        public void on_hook_window (Scratch.MainWindow window) {
+            if (window != null) {
+                on_hook_document (window.get_current_document ());
             }
-
-            this.window = window;
-
-            container = new OutlinePane ();
-            container.add (placeholder);
         }
 
-        void on_hook_document (Scratch.Services.Document doc) {
-            if (current_view != null &&
-                current_view.doc == doc &&
-                current_view.get_source_list ().get_parent () != null) {
-
-                /* Ensure correct source list shown */
-                container.set_visible_child (current_view.get_source_list ());
-
-                return;
-            }
-
-            SymbolOutline view = null;
-            foreach (var v in views) {
-                if (v.doc == doc) {
-                    view = v;
-                    break;
-                }
-            }
-
-            if (view == null && doc.file != null) {
+        void on_hook_document (Scratch.Services.Document? doc) {
+            if (doc != null && doc.file != null && !doc.has_outline_widget ()) {
+                SymbolOutline outline = null;
                 var mime_type = doc.mime_type;
                 switch (mime_type) {
                     case "text/x-vala":
-                        view = new ValaSymbolOutline (doc);
+                        outline = new ValaSymbolOutline (doc);
                         break;
                     case "text/x-csrc":
                     case "text/x-chdr":
                     case "text/x-c++src":
                     case "text/x-c++hdr":
-                        view = new CtagsSymbolOutline (doc);
+                        outline = new CtagsSymbolOutline (doc);
                         break;
                 }
-
-                if (view != null) {
-                    view.closed.connect (() => {remove_view (view);});
-                    view.goto.connect (goto);
-                    views.add (view);
-                    view.parse_symbols ();
+                if (outline != null) {
+                    add_outline_to_doc (doc, outline);
                 }
             }
-
-            if (view != null) {
-                var source_list = view.get_source_list ();
-                if (source_list.parent == null) {
-                    container.add (source_list);
-                }
-
-                container.set_visible_child (source_list);
-                container.show_all ();
-                current_view = view;
-                add_container ();
-            } else {
-                container.set_visible_child (placeholder);
-            }
-        }
-
-        void add_container () {
-            if (container.get_parent () == null) {
-                window.sidebar.add_tab (container);
-                container.show_all ();
-            }
         }
 
-        void remove_container () {
-            var parent = container.get_parent ();
-            if (parent != null) {
-                window.sidebar.remove_tab (container);
-            }
-
-            container.destroy ();
+        private void add_outline_to_doc (Scratch.Services.Document doc, SymbolOutline outline) {
+            outline.goto.connect (on_goto);
+            outline.parse_symbols ();
+            doc.add_outline_widget (outline.get_source_list ());
+            doc.set_data<SymbolOutline> ("SymbolOutline", outline);
         }
 
-        void remove_view (SymbolOutline view) {
-            views.remove (view);
-            var source_list = view.get_source_list ();
-            if (source_list.parent == container) {
-                container.remove (source_list);
-            }
-
-            if (views.is_empty) {
-                remove_container ();
-            }
-
-            view.goto.disconnect (goto);
-        }
-
-        void goto (Scratch.Services.Document doc, int line) {
-            scratch_interface.open_file (doc.file);
-
+        private void on_goto (Scratch.Services.Document doc, int line) {
+            // scratch_interface.open_file (doc.file);
+            // Document must already be open for this signal to be triggered
             var text = doc.source_view;
             Gtk.TextIter iter;
             text.buffer.get_iter_at_line (out iter, line - 1);
             text.buffer.place_cursor (iter);
             text.scroll_to_iter (iter, 0.0, true, 0.5, 0.5);
         }
+
+        private void remove_outline_from_doc (Scratch.Services.Document doc) {
+            doc.remove_outline_widget ();
+            var outline = doc.steal_data<SymbolOutline> ("SymbolOutline");
+            outline.goto.disconnect (on_goto);
+        }
     }
 }
 
diff --git a/plugins/outline/SymbolOutline.vala b/plugins/outline/SymbolOutline.vala
index b024175453..b08e68bc96 100644
--- a/plugins/outline/SymbolOutline.vala
+++ b/plugins/outline/SymbolOutline.vala
@@ -17,9 +17,8 @@
  */
 
 public interface Code.Plugins.SymbolOutline : Object {
-    public abstract Scratch.Services.Document doc { get; protected set; }
+    public abstract Scratch.Services.Document doc { get; construct; }
     public abstract void parse_symbols ();
     public abstract Granite.Widgets.SourceList get_source_list ();
-    public signal void closed ();
     public signal void goto (Scratch.Services.Document doc, int line);
 }
diff --git a/plugins/outline/Vala/ValaSymbolItem.vala b/plugins/outline/Vala/ValaSymbolItem.vala
index b57a9760f2..a17c658042 100644
--- a/plugins/outline/Vala/ValaSymbolItem.vala
+++ b/plugins/outline/Vala/ValaSymbolItem.vala
@@ -30,6 +30,10 @@ public class Code.Plugins.ValaSymbolItem : Granite.Widgets.SourceList.Expandable
         }
     }
 
+    ~ValaSymbolItem () {
+        debug ("Destroy Vala symbol");
+    }
+
     public int compare (Granite.Widgets.SourceList.Item a, Granite.Widgets.SourceList.Item b) {
         return ValaComparison.sort_function (a, b);
     }
diff --git a/plugins/outline/Vala/ValaSymbolOutline.vala b/plugins/outline/Vala/ValaSymbolOutline.vala
index 94c38401ed..1f94503e79 100644
--- a/plugins/outline/Vala/ValaSymbolOutline.vala
+++ b/plugins/outline/Vala/ValaSymbolOutline.vala
@@ -18,16 +18,21 @@
 
 public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline {
     public const string OUTLINE_RESOURCE_URI = "resource:///io/elementary/code/plugin/outline/";
-    public Scratch.Services.Document doc { get; protected set; }
-    public Granite.Widgets.SourceList store { get; private set; }
-    Granite.Widgets.SourceList.ExpandableItem root;
-    Code.Plugins.ValaSymbolResolver resolver;
-    Vala.Parser parser;
-    GLib.Cancellable cancellable;
+    public Scratch.Services.Document doc { get; construct; }
+    private Granite.Widgets.SourceList store;
+    private Granite.Widgets.SourceList.ExpandableItem root;
+    private Code.Plugins.ValaSymbolResolver resolver;
+    private Vala.Parser parser;
+    private GLib.Cancellable cancellable;
 
     public ValaSymbolOutline (Scratch.Services.Document _doc) {
-        doc = _doc;
-        doc.doc_saved.connect (() => {parse_symbols ();});
+        Object (
+            doc: _doc
+        );
+    }
+
+    construct {
+        doc.doc_saved.connect (parse_symbols);
         doc.doc_closed.connect (doc_closed);
 
         store = new Granite.Widgets.SourceList ();
@@ -43,16 +48,20 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
     }
 
     ~ValaSymbolOutline () {
-        doc.doc_closed.disconnect (doc_closed);
+        debug ("Destroy symbol out line");
     }
 
     void doc_closed (Scratch.Services.Document doc) {
+        doc.doc_closed.disconnect (doc_closed);
+        doc.doc_saved.disconnect (parse_symbols);
+
+        doc.remove_outline_widget ();
+        doc.steal_data<SymbolOutline> ("SymbolOutline");
+
         if (cancellable != null) {
             cancellable.cancel ();
             cancellable = null;
         }
-
-        closed ();
     }
 
     public Granite.Widgets.SourceList get_source_list () {
@@ -68,8 +77,10 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
 #endif
         context.add_source_filename (doc.file.get_path ());
         context.report = new Report ();
-        if (cancellable != null)
+        if (cancellable != null && !cancellable.is_cancelled ()) {
             cancellable.cancel ();
+        }
+
         cancellable = new GLib.Cancellable ();
         new Thread<void*> ("parse-symbols", () => {
             Vala.CodeContext.push (context);
@@ -79,36 +90,40 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
             Vala.CodeContext.pop ();
 
             var new_root = construct_tree (cancellable);
-            if (cancellable.is_cancelled () == false) {
+            if (!cancellable.is_cancelled ()) {
                 Idle.add (() => {
                     double adjustment_value = store.vadjustment.value;
-                    store.root.clear ();
+                    var root_children = store.root.children; // Keep reference to children for later destruction
+                    store.root.clear (); // This does not destroy children but disconnects signals - avoids terminal warnings
+                    foreach (var child in root_children) { // Destroy items after clearing list to avoid memory leak
+                        destroy_all_children ((Granite.Widgets.SourceList.ExpandableItem)child);
+                    }
+
                     store.root.add (new_root);
                     store.root.expand_all ();
                     store.vadjustment.set_value (adjustment_value);
 
-                    destroy_root (root);
-                    root = new_root;
-
                     return false;
                 });
             } else {
-                destroy_root (new_root);
+                destroy_all_children (new_root);
             }
             return null;
         });
     }
 
-    private void destroy_root (Granite.Widgets.SourceList.ExpandableItem to_destroy) {
-        var children = iterate_children (to_destroy);
-        to_destroy.clear ();
-        foreach (var item in children) {
-            item.clear ();
-            var parent = item.parent;
-            if (parent != null) {
-                parent.remove (item);
-            }
+    private void destroy_all_children (Granite.Widgets.SourceList.ExpandableItem parent) {
+        foreach (var child in parent.children) {
+            remove (child, parent);
+        }
+    }
+
+    private new void remove (Granite.Widgets.SourceList.Item item, Granite.Widgets.SourceList.ExpandableItem parent) {
+        if (item is Granite.Widgets.SourceList.ExpandableItem) {
+            destroy_all_children ((Granite.Widgets.SourceList.ExpandableItem)item);
         }
+
+        parent.remove (item);
     }
 
     private Granite.Widgets.SourceList.ExpandableItem construct_tree (GLib.Cancellable cancellable) {
@@ -134,14 +149,6 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
         return new_root;
     }
 
-    private Gee.TreeSet<ValaSymbolItem> iterate_children (Granite.Widgets.SourceList.ExpandableItem parent) {
-        var result = new Gee.TreeSet<ValaSymbolItem> ();
-        foreach (var child in parent.children) {
-            result.add_all (iterate_children ((ValaSymbolItem)child));
-        }
-        return result;
-    }
-
     private ValaSymbolItem construct_child (Vala.Symbol symbol, Granite.Widgets.SourceList.ExpandableItem given_parent, GLib.Cancellable cancellable) {
         Granite.Widgets.SourceList.ExpandableItem parent;
         if (symbol.scope.parent_scope.owner.name == null)
diff --git a/plugins/outline/Vala/ValaSymbolResolver.vala b/plugins/outline/Vala/ValaSymbolResolver.vala
index 0a181dba2d..3b9aae35d6 100644
--- a/plugins/outline/Vala/ValaSymbolResolver.vala
+++ b/plugins/outline/Vala/ValaSymbolResolver.vala
@@ -17,11 +17,11 @@
  */
 
 public class Code.Plugins.ValaSymbolResolver : Vala.SymbolResolver {
-    private Gee.TreeSet<Vala.Property> properties = new Gee.TreeSet<Vala.Property> ();
-    private Gee.TreeSet<Vala.Symbol> symbols = new Gee.TreeSet<Vala.Symbol> ();
+    private Gee.TreeSet<unowned Vala.Property> properties = new Gee.TreeSet<unowned Vala.Property> ();
+    private Gee.TreeSet<unowned Vala.Symbol> symbols = new Gee.TreeSet<unowned Vala.Symbol> ();
 
-    public Gee.TreeSet<Vala.Field> get_properties_fields () {
-        var return_fields = new Gee.TreeSet<Vala.Field> ();
+    public Gee.TreeSet<unowned Vala.Field> get_properties_fields () {
+        var return_fields = new Gee.TreeSet<unowned Vala.Field> ();
         foreach (var prop in properties) {
             if (prop.field != null) {
                 return_fields.add (prop.field);
@@ -31,8 +31,8 @@ public class Code.Plugins.ValaSymbolResolver : Vala.SymbolResolver {
         return return_fields;
     }
 
-    public Gee.TreeSet<Vala.Symbol> get_symbols () {
-        var return_symbols = new Gee.TreeSet<Vala.Symbol> ();
+    public Gee.TreeSet<unowned Vala.Symbol> get_symbols () {
+        var return_symbols = new Gee.TreeSet<unowned Vala.Symbol> ();
         return_symbols.add_all (symbols);
         return return_symbols;
     }
diff --git a/plugins/preserve-indent/preserve-indent.vala b/plugins/preserve-indent/preserve-indent.vala
index 6f07e0c3d3..5e83214f70 100644
--- a/plugins/preserve-indent/preserve-indent.vala
+++ b/plugins/preserve-indent/preserve-indent.vala
@@ -55,30 +55,6 @@ public class Scratch.Plugins.PreserveIndent : Peas.ExtensionBase, Peas.Activatab
     public void update_state () {
     }
 
-    // determine how many characters precede a given iterator position
-    private int measure_indent_at_iter (Widgets.SourceView view, Gtk.TextIter iter) {
-        Gtk.TextIter line_begin, pos;
-
-        view.buffer.get_iter_at_line (out line_begin, iter.get_line ());
-
-        pos = line_begin;
-        int indent = 0;
-        int tabwidth = Scratch.settings.get_int ("indent-width");
-
-        unichar ch = pos.get_char ();
-        while (pos.get_offset () < iter.get_offset () && ch != '\n' && ch.isspace ()) {
-            if (ch == '\t') {
-                indent += tabwidth;
-            } else {
-                ++indent;
-            }
-
-            pos.forward_char ();
-            ch = pos.get_char ();
-        }
-        return indent;
-    }
-
     private void on_cut_or_copy_clipboard () {
         Widgets.SourceView view = this.active_document.source_view;
         if (!view.auto_indent) {
@@ -90,7 +66,7 @@ public class Scratch.Plugins.PreserveIndent : Peas.ExtensionBase, Peas.Activatab
         var buffer = view.buffer;
 
         if (buffer.get_selection_bounds (out select_begin, out select_end)) {
-            int indent = this.measure_indent_at_iter (view, select_begin);
+            int indent = Scratch.Utils.measure_indent_at_iter (view, select_begin);
             this.last_clipboard_indent_level = indent;
         } else {
             this.last_clipboard_indent_level = 0;
@@ -135,110 +111,21 @@ public class Scratch.Plugins.PreserveIndent : Peas.ExtensionBase, Peas.Activatab
         view.buffer.get_iter_at_mark (out paste_begin, view.buffer.get_mark ("paste_start"));
         view.buffer.get_iter_at_mark (out paste_end, view.buffer.get_insert ());
 
-        int indent_level = this.measure_indent_at_iter (view, paste_begin);
+        int indent_level = Scratch.Utils.measure_indent_at_iter (view, paste_begin);
         int indent_diff = indent_level - this.last_clipboard_indent_level;
 
         paste_begin.forward_line ();
 
         if (indent_diff > 0) {
-            this.increase_indent_in_region (view, paste_begin, paste_end, indent_diff);
+            Scratch.Utils.increase_indent_in_region (view, paste_begin, paste_end, indent_diff);
         } else if (indent_diff < 0) {
-            this.decrease_indent_in_region (view, paste_begin, paste_end, indent_diff.abs ());
+            Scratch.Utils.decrease_indent_in_region (view, paste_begin, paste_end, indent_diff.abs ());
         }
 
         view.buffer.delete_mark_by_name ("paste_start");
         view.buffer.end_user_action ();
         this.waiting_for_clipboard_text = false;
     }
-
-    private void increase_indent_in_region (
-        Widgets.SourceView view,
-        Gtk.TextIter region_begin,
-        Gtk.TextIter region_end,
-        int nchars
-    ) {
-        int first_line = region_begin.get_line ();
-        int last_line = region_end.get_line ();
-        int buf_last_line = view.buffer.get_line_count () - 1;
-
-        int nlines = (first_line - last_line).abs () + 1;
-        if (nlines < 1 || nchars < 1 || last_line < first_line || !view.editable
-            || first_line == buf_last_line
-        ) {
-            return;
-        }
-
-        // add a string of whitespace to each line after the first pasted line
-        string indent_str;
-
-        if (view.insert_spaces_instead_of_tabs) {
-            indent_str = string.nfill (nchars, ' ');
-        } else {
-            int tabwidth = Scratch.settings.get_int ("indent-width");
-            int tabs = nchars / tabwidth;
-            int spaces = nchars % tabwidth;
-
-            indent_str = string.nfill (tabs, '\t');
-            if (spaces > 0) {
-                indent_str += string.nfill (spaces, ' ');
-            }
-        }
-
-        Gtk.TextIter itr;
-        for (var i = first_line; i <= last_line; ++i) {
-            view.buffer.get_iter_at_line (out itr, i);
-            view.buffer.insert (ref itr, indent_str, indent_str.length);
-        }
-    }
-
-    private void decrease_indent_in_region (
-        Widgets.SourceView view,
-        Gtk.TextIter region_begin,
-        Gtk.TextIter region_end,
-        int nchars
-    ) {
-        int first_line = region_begin.get_line ();
-        int last_line = region_end.get_line ();
-
-        int nlines = (first_line - last_line).abs () + 1;
-        if (nlines < 1 || nchars < 1 || last_line < first_line || !view.editable) {
-            return;
-        }
-
-        Gtk.TextBuffer buffer = view.buffer;
-        int tabwidth = Scratch.settings.get_int ("indent-width");
-        Gtk.TextIter del_begin, del_end, itr;
-
-        for (var line = first_line; line <= last_line; ++line) {
-            buffer.get_iter_at_line (out itr, line);
-            // crawl along the line and tally indentation as we go,
-            // when requested number of chars is hit, or if we run out of whitespace (eg. find glyphs or newline),
-            // delete the segment from line start to where we are now
-            int chars_to_delete = 0;
-            int indent_chars_found = 0;
-            unichar ch = itr.get_char ();
-            while (ch != '\n' && !ch.isgraph () && indent_chars_found < nchars) {
-                if (ch == ' ') {
-                    ++chars_to_delete;
-                    ++indent_chars_found;
-                } else if (ch == '\t') {
-                    ++chars_to_delete;
-                    indent_chars_found += tabwidth;
-                }
-                itr.forward_char ();
-                ch = itr.get_char ();
-            }
-
-            if (ch == '\n' || chars_to_delete < 1) {
-                continue;
-            }
-
-            buffer.get_iter_at_line (out del_begin, line);
-            buffer.get_iter_at_line_offset (out del_end, line, chars_to_delete);
-            buffer.delete (ref del_begin, ref del_end);
-        }
-
-    }
 }
 
 [ModuleInit]
diff --git a/plugins/strip-trailing-save/meson.build b/plugins/snippets/meson.build
similarity index 76%
rename from plugins/strip-trailing-save/meson.build
rename to plugins/snippets/meson.build
index 9276df73d1..04d076b645 100644
--- a/plugins/strip-trailing-save/meson.build
+++ b/plugins/snippets/meson.build
@@ -1,11 +1,14 @@
-module_name = 'strip-trailing-save'
+module_name = 'snippets'
 
 module_files = [
-    'strip-trailing-save.vala'
+    'plugin.vala'
 ]
 
+json_dep = dependency('json-glib-1.0')
+
 module_deps = [
-    codecore_dep
+    codecore_dep,
+    json_dep
 ]
 
 shared_module(
@@ -16,6 +19,11 @@ shared_module(
     install_dir: join_paths(pluginsdir, module_name),
 )
 
+install_data(
+    'snippets.json', 
+    install_dir:  join_paths(pluginsdir, module_name),
+)
+
 custom_target(module_name + '.plugin_merge',
     input: module_name + '.plugin',
     output: module_name + '.plugin',
diff --git a/plugins/snippets/plugin.vala b/plugins/snippets/plugin.vala
new file mode 100644
index 0000000000..c5a382ce0a
--- /dev/null
+++ b/plugins/snippets/plugin.vala
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2021 Igor Montagner <igordsm@gmail.com>
+ *
+ * This is a free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+
+ private class Code.Plugins.Snippets.Snippet : Object {
+    public string name {get; construct; }
+    public string tag {get; construct; }
+    public string language {get; construct; }
+
+    public Gee.ArrayList<int> tabstops;
+    public uint n_tabstops {
+        get {
+            return tabstops.size;
+        }
+    }
+
+    private string _body;
+    public string body {
+        get { return _body; }
+        set {
+            _body = value;
+
+            // PARSE $1 - $n
+            int next_tabstop = 1;
+            int next_tabstop_idx = 1;
+            while ((next_tabstop_idx = _body.index_of ("$%d".printf (next_tabstop), 0)) >= 0) {
+                for (int i = 0; i < next_tabstop - 1; i++) {
+                    if (tabstops[i] > next_tabstop_idx) {
+                        tabstops[i] -= 2;
+                    }
+                }
+
+                tabstops.add (next_tabstop_idx);
+                _body = _body.splice (next_tabstop_idx, next_tabstop_idx + 2);
+                next_tabstop++;
+            }
+
+            // PARSE $0
+            next_tabstop_idx = _body.index_of ("$0", 0);
+            if (next_tabstop_idx >= 0) {
+                for (int i = 0; i < next_tabstop - 1; i++) {
+                    if (tabstops[i] > next_tabstop_idx) {
+                        tabstops[i] -= 2;
+                    }
+                }
+                tabstops.add (next_tabstop_idx);
+                _body = _body.splice (next_tabstop_idx, next_tabstop_idx + 2);
+            } else {
+                tabstops.add (_body.length);
+            }
+        }
+    }
+
+    public Snippet (string name, string tag, string body, string language) {
+        Object (
+            name: name,
+            tag: tag,
+            body: body,
+            language: language
+        );
+    }
+
+    construct {
+        tabstops = new Gee.ArrayList<int> ();
+    }
+}
+
+private class Code.Plugins.Snippets.Provider : Gtk.SourceCompletionProvider, Object {
+    public Code.Plugins.Snippets.Plugin snippets;
+    public Gee.HashMultiMap<string, Snippet> snippet_map;
+
+    private int current_tabstop = 0;
+    private Snippet current_editing_snippet;
+    private uint placeholder_edit_timeout = -1;
+    private bool still_editing_placeholder = false;
+
+    private const int FINISH_EDITING_TIMEOUT = 1000;
+
+    construct {
+        snippet_map = new Gee.HashMultiMap<string, Snippet> ();
+
+        var par = new Json.Parser ();
+        string user_snippets_filename = GLib.Path.build_filename (Constants.PLUGINDIR, "snippets", "snippets.json");
+        par.load_from_file (user_snippets_filename);
+        var reader = new Json.Reader (par.get_root ());
+
+        foreach (string language in reader.list_members ()) {
+            reader.read_member (language);
+
+            var n_snippets = reader.count_elements ();
+            for (int i = 0; i < n_snippets; i++) {
+                reader.read_element (i);
+
+                reader.read_member ("name");
+                var name = reader.get_string_value ();
+                reader.end_member ();
+
+                reader.read_member ("tag");
+                var tag = reader.get_string_value ();
+                reader.end_member ();
+
+                reader.read_member ("body");
+                var body = reader.get_string_value ();
+                reader.end_member ();
+
+                var snippet = new Snippet (name, tag, body, language);
+
+                snippet_map.@set (language, snippet);
+                reader.end_element ();
+            }
+            reader.end_member ();
+        }
+
+    }
+
+    public string get_name () {
+        return "Snippets";
+    }
+
+    private string word_prefix (Gtk.SourceCompletionContext context) {
+        var ins_mark = snippets.current_view.buffer.get_insert ();
+        Gtk.TextIter? word;
+        snippets.current_view.buffer.get_iter_at_mark (out word, ins_mark);
+        var word_start = word.copy ();
+        word_start.backward_word_start ();
+
+        return word.get_buffer ().get_text (word_start, word, false);
+    }
+
+    public bool match (Gtk.SourceCompletionContext context) {
+        if (still_editing_placeholder) {
+            return false;
+        }
+
+        var word = word_prefix (context);
+        var snips = snippet_map.@get (snippets.current_document.get_language_name ());
+        var found = false;
+        snips.foreach ((sni) => {
+            if (sni.tag.has_prefix (word)) found = true;
+            return !found;
+        });
+        return found;
+    }
+
+    public void populate (Gtk.SourceCompletionContext context) {
+        var word = word_prefix (context);
+        var snips = snippet_map.@get (snippets.current_document.get_language_name ());
+        var props = new List<Gtk.SourceCompletionProposal> ();
+
+        snips.foreach ((sni) => {
+            if (sni.tag.has_prefix (word)) {
+                var item = new Gtk.SourceCompletionItem () {
+                    label = sni.name,
+                    text = sni.body,
+                    info = sni.body
+                };
+                item.set_data<Snippet> ("snippet", sni);
+                props.append (item);
+            }
+            return true;
+        });
+        context.add_proposals (this, props, true);
+    }
+
+    public void start_editing_placeholders () {
+        var current_view = snippets.current_view;
+        var buffer = current_view.buffer;
+        Gtk.TextIter snippet_start, snippet_end;
+        buffer.get_iter_at_mark (out snippet_start, buffer.get_mark ("SNIPPET_START"));
+        buffer.get_iter_at_mark (out snippet_end, buffer.get_mark ("SNIPPET_END"));
+
+        for (int i = 0; i < current_editing_snippet.n_tabstops; i++) {
+            Gtk.TextIter tab_i = snippet_start.copy ();
+            tab_i.forward_chars (current_editing_snippet.tabstops[i]);
+            current_view.buffer.create_mark ("SNIPPET_TAB_%d".printf (i), tab_i, true);
+        }
+
+        var indent_start = Scratch.Utils.measure_indent_at_iter (current_view, snippet_start);
+        var snippet_line2 = snippet_start.copy ();
+        snippet_line2.forward_line ();
+        Scratch.Utils.increase_indent_in_region (current_view, snippet_line2, snippet_end, indent_start);
+
+        current_tabstop = 0;
+        place_cursor_at_tabstop (buffer, current_tabstop);
+        if (current_editing_snippet.n_tabstops > 1) {
+            current_view.key_press_event.connect (next_placeholder);
+
+            still_editing_placeholder = true;
+            placeholder_edit_timeout = Timeout.add (FINISH_EDITING_TIMEOUT, () => {
+                if (!still_editing_placeholder) {
+                    end_editing_placeholders ();
+                    return false;
+                }
+                still_editing_placeholder = false;
+                return true;
+            });
+        } else {
+            end_editing_placeholders ();
+        }
+    }
+
+    public bool next_placeholder (Gdk.EventKey evt) {
+        still_editing_placeholder = true;
+        if (evt.keyval == Gdk.Key.Tab) {
+            var current_view = snippets.current_view;
+            var buffer = current_view.buffer;
+
+            current_tabstop++;
+            place_cursor_at_tabstop (buffer, current_tabstop);
+            if (current_tabstop == current_editing_snippet.n_tabstops - 1) {
+                end_editing_placeholders ();
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public void place_cursor_at_tabstop (Gtk.TextBuffer buffer, int tabstop) {
+        Gtk.TextIter iter_start;
+        var mark = buffer.get_mark ("SNIPPET_TAB_%d".printf (tabstop));
+        buffer.get_iter_at_mark (out iter_start, mark);
+        buffer.place_cursor (iter_start);
+    }
+
+    public void end_editing_placeholders () {
+        still_editing_placeholder = false;
+        if (current_editing_snippet.n_tabstops > 0) {
+            snippets.current_view.key_press_event.disconnect (next_placeholder);
+        }
+
+        for (int i = 0; i < current_editing_snippet.n_tabstops; i++) {
+            snippets.current_view.buffer.delete_mark_by_name ("SNIPPET_TAB_%d".printf (i));
+        }
+
+        snippets.current_view.buffer.delete_mark_by_name ("SNIPPET_START");
+        snippets.current_view.buffer.delete_mark_by_name ("SNIPPET_END");
+        Source.remove (placeholder_edit_timeout);
+        placeholder_edit_timeout = -1;
+    }
+
+    public bool activate_proposal (Gtk.SourceCompletionProposal proposal, Gtk.TextIter iter) {
+        current_editing_snippet = proposal.get_data<Snippet> ("snippet");
+        var iter_start = iter.copy ();
+        iter_start.backward_word_start ();
+
+        var current_buffer = iter.get_buffer ();
+        current_buffer.delete (ref iter_start, ref iter);
+        current_buffer.create_mark ("SNIPPET_START", iter_start, true);
+        current_buffer.create_mark ("SNIPPET_END", iter_start, false);
+        iter.get_buffer ().insert (ref iter, current_editing_snippet.body, current_editing_snippet.body.length);
+        start_editing_placeholders ();
+        return true;
+    }
+}
+
+
+public class Code.Plugins.Snippets.Plugin : Peas.ExtensionBase, Peas.Activatable {
+    public Object object { owned get; construct; }
+
+    private List<Gtk.SourceView> text_view_list = new List<Gtk.SourceView> ();
+    public Scratch.Widgets.SourceView? current_view {get; private set;}
+    public Scratch.Services.Document current_document {get; private set;}
+
+    private Scratch.MainWindow main_window;
+    private Scratch.Services.Interface plugins;
+
+    public void activate () {
+        plugins = (Scratch.Services.Interface) object;
+        plugins.hook_window.connect ((w) => {
+            this.main_window = w;
+        });
+
+        plugins.hook_document.connect (on_new_source_view);
+    }
+
+    public void deactivate () {
+        text_view_list.@foreach (cleanup);
+    }
+
+    public void update_state () {
+
+    }
+
+    public void on_new_source_view (Scratch.Services.Document doc) {
+        if (current_view != null) {
+            if (current_view == doc.source_view)
+                return;
+
+            cleanup (current_view);
+        }
+
+        current_document = doc;
+        current_view = doc.source_view;
+
+        if (text_view_list.find (current_view) == null)
+            text_view_list.append (current_view);
+
+        var comp_provider = new Code.Plugins.Snippets.Provider () {
+            snippets = this
+        };
+
+        try {
+            current_view.completion.add_provider (comp_provider);
+            current_view.completion.show_headers = true;
+            current_view.completion.show_icons = true;
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+
+    private void cleanup (Gtk.SourceView view) {
+        current_view.completion.get_providers ().foreach ((p) => {
+            try {
+                /* Only remove provider added by this plug in */
+                if (p.get_name () == "Snippets") {
+                    debug ("removing provider %s", p.get_name ());
+                    current_view.completion.remove_provider (p);
+                }
+            } catch (Error e) {
+                warning (e.message);
+            }
+        });
+    }
+}
+
+[ModuleInit]
+public void peas_register_types (GLib.TypeModule module) {
+    var objmodule = module as Peas.ObjectModule;
+    objmodule.register_extension_type (typeof (Peas.Activatable),
+                                       typeof (Code.Plugins.Snippets.Plugin));
+}
diff --git a/plugins/snippets/snippets.json b/plugins/snippets/snippets.json
new file mode 100644
index 0000000000..ffcb2db956
--- /dev/null
+++ b/plugins/snippets/snippets.json
@@ -0,0 +1,18 @@
+{
+    "Vala": [
+        {"name": "Namespace", "tag": "name", "body": "namespace $1 {\n    $0\n}"},
+        {"name": "Class", "tag": "class", "body": "class $1 {\n    $0\n}"},
+        {"name": "Construct", "tag": "constr", "body": "construct {\n    $0\n}"},
+        
+        {"name": "While", "tag": "while", "body": "while ($1) {\n    $0\n}"},
+        {"name": "ForEach", "tag": "foreach", "body": "foreach ($1 in $2) {\n    $0\n}"},
+        {"name": "For", "tag": "for", "body": "for ($1; $2; $3) {\n     $0\n}"},
+
+        {"name": "If", "tag": "if", "body": "if ($1) {\n    $0\n}"},
+        {"name": "IfElse", "tag": "ifelse", "body": "if ($1) {\n    $0\n} else {\n    \n}"},
+
+        {"name": "Public Method", "tag": "pubfunc", "body": "public $1 $2 ($3) {\n    $0\n}"},
+        {"name": "Private Method", "tag": "privfunc", "body": "public $1 $2 ($3) {\n    $0\n}"}
+
+    ]
+}
\ No newline at end of file
diff --git a/plugins/snippets/snippets.plugin b/plugins/snippets/snippets.plugin
new file mode 100644
index 0000000000..edb4385959
--- /dev/null
+++ b/plugins/snippets/snippets.plugin
@@ -0,0 +1,9 @@
+[Plugin]
+Name=Snippets
+Module=snippets
+Loader=C
+IAge=2
+Description=Turbo charge productivity using snippets
+Authors=Igor Montagner <igordsm@gmail.com>
+Copyright=Copyright © Igor Montagner
+Website=https://github.com/elementary/code
diff --git a/plugins/strip-trailing-save/strip-trailing-save.plugin b/plugins/strip-trailing-save/strip-trailing-save.plugin
deleted file mode 100644
index 8096de0cc6..0000000000
--- a/plugins/strip-trailing-save/strip-trailing-save.plugin
+++ /dev/null
@@ -1,10 +0,0 @@
-[Plugin]
-Module=strip-trailing-save
-Loader=C
-IAge=2
-Name=Strip trailing whitespace
-Description=Strip trailing whitespace on save
-Icon=document-save
-Authors=Filipe Funenga <filipe.funenga@ist.utl.pt>
-Copyright=Copyright © 2012 Code and Euclide Developers
-Website=https://github.com/elementary/code
diff --git a/plugins/strip-trailing-save/strip-trailing-save.vala b/plugins/strip-trailing-save/strip-trailing-save.vala
deleted file mode 100644
index 9eba330060..0000000000
--- a/plugins/strip-trailing-save/strip-trailing-save.vala
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2011-2012 Mario Guerriero <mefrio.g@gmail.com>
- *               2018 elementary LLC. <https://elementary.io>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-public class Scratch.Plugins.StripTrailSave: Peas.ExtensionBase, Peas.Activatable {
-    Scratch.Services.Interface plugins;
-    public Object object {owned get; construct;}
-    Scratch.MainWindow main_window;
-    public void update_state () {return;}
-
-    /*
-     * Activate plugin.
-     */
-    public void activate () {
-        plugins = (Scratch.Services.Interface) object;
-        plugins.hook_window.connect ((w) => {
-            this.main_window = w;
-            var action = w.actions.lookup_action ("action_save") as SimpleAction;
-            action.activate.connect (on_save);
-        });
-    }
-
-    /*
-     * Deactivate plugin.
-     */
-    public void deactivate () {
-        var action = this.main_window.actions.lookup_action ("action_save") as SimpleAction;
-        action.activate.disconnect (on_save);
-    }
-
-    /*
-     * Strip trailing spaces in document.
-     */
-    void on_save () {
-        if (main_window.get_current_document () != null) {
-            var text_view = main_window.get_current_document ().source_view;
-            var source_buffer = (Gtk.SourceBuffer) text_view.buffer;
-            source_buffer.begin_user_action ();
-            strip_trailing_spaces (source_buffer);
-            source_buffer.end_user_action ();
-        }
-    }
-
-    /*
-     * Pull the buffer into an array and then work out which parts are to
-     * be deleted.
-     */
-    private void strip_trailing_spaces (Gtk.SourceBuffer buffer) {
-        Gtk.TextIter iter;
-
-        var cursor_pos = buffer.cursor_position;
-        buffer.get_iter_at_offset (out iter, cursor_pos);
-        var orig_line = iter.get_line ();
-        var orig_offset = iter.get_line_offset ();
-
-        var text = buffer.text;
-
-        string[] lines = Regex.split_simple ("""[\r\n]""", text);
-        if (lines.length != buffer.get_line_count ()) {
-            critical ("Mismatch between line counts when stripping trailing spaces, not continuing");
-            return;
-        }
-
-        MatchInfo info;
-        Gtk.TextIter start_delete, end_delete;
-        Regex whitespace;
-
-        try {
-            whitespace = new Regex ("[ \t]+$", 0);
-        } catch (RegexError e) {
-            critical ("Error while building regex to replace trailing whitespace: %s", e.message);
-            return;
-        }
-
-        for (int line_no = 0; line_no < lines.length; line_no++) {
-            if (whitespace.match (lines[line_no], 0, out info)) {
-                buffer.get_iter_at_line (out start_delete, line_no);
-                start_delete.forward_to_line_end ();
-                end_delete = start_delete;
-                end_delete.backward_chars (info.fetch (0).length);
-
-                buffer.@delete (ref start_delete, ref end_delete);
-            }
-        }
-
-        buffer.get_iter_at_line_offset (out iter, orig_line, orig_offset);
-        buffer.place_cursor (iter);
-    }
-}
-
-[ModuleInit]
-public void peas_register_types (GLib.TypeModule module) {
-    var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (
-        typeof (Peas.Activatable),
-        typeof (Scratch.Plugins.StripTrailSave)
-    );
-}
diff --git a/plugins/word-completion/completion-provider.vala b/plugins/word-completion/completion-provider.vala
index 65bcb4649c..d9abbc7b77 100644
--- a/plugins/word-completion/completion-provider.vala
+++ b/plugins/word-completion/completion-provider.vala
@@ -55,7 +55,7 @@ public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider,
         Gtk.TextIter start, end;
         buffer.get_iter_at_offset (out end, buffer.cursor_position);
         start = end.copy ();
-        start.backward_word_start ();
+        Euclide.Completion.Parser.back_to_word_start (ref start);
         string text = buffer.get_text (start, end, true);
 
         return parser.match (text);
@@ -102,10 +102,11 @@ public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider,
         buffer.get_iter_at_mark (out cursor_iter, mark);
 
         iter = cursor_iter;
-        iter.backward_word_start ();
+        Euclide.Completion.Parser.back_to_word_start (ref iter);
         return true;
     }
 
+
     private bool get_proposals (out GLib.List<Gtk.SourceCompletionItem>? props, bool no_minimum) {
         string to_find = "";
         Gtk.TextBuffer temp_buffer = buffer;
@@ -120,7 +121,7 @@ public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider,
             temp_buffer.get_iter_at_offset (out end, buffer.cursor_position);
 
             start = end;
-            start.backward_word_start ();
+            Euclide.Completion.Parser.back_to_word_start (ref start);
 
             to_find = buffer.get_text (start, end, false);
         }
@@ -128,7 +129,6 @@ public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider,
         buffer.move_mark_by_name (COMPLETION_END_MARK_NAME, end);
         buffer.move_mark_by_name (COMPLETION_START_MARK_NAME, start);
 
-
         /* There is no minimum length of word to find if the user requested a completion */
         if (no_minimum || to_find.length >= Euclide.Completion.Parser.MINIMUM_WORD_LENGTH) {
             /* Get proposals, if any */
diff --git a/plugins/word-completion/engine.vala b/plugins/word-completion/engine.vala
index 9d73598dc3..a9cae9d6de 100644
--- a/plugins/word-completion/engine.vala
+++ b/plugins/word-completion/engine.vala
@@ -29,6 +29,11 @@ public class Euclide.Completion.Parser : GLib.Object {
         return DELIMITERS.index_of_char (c) >= 0;
     }
 
+    public static void back_to_word_start (ref Gtk.TextIter iter) {
+        iter.backward_find_char (is_delimiter, null);
+        iter.forward_char ();
+    }
+
     public Gee.HashMap<Gtk.TextView,Scratch.Plugins.PrefixTree> text_view_words;
     public bool parsing_cancelled = false;
 
@@ -43,6 +48,7 @@ public class Euclide.Completion.Parser : GLib.Object {
 
     public bool get_for_word (string to_find, out List<string> list) {
         list = prefix_tree.get_all_matches (to_find);
+
         return list.first () != null;
     }
 
diff --git a/plugins/word-completion/plugin.vala b/plugins/word-completion/plugin.vala
index 4a32dd093c..b4d2ff9467 100644
--- a/plugins/word-completion/plugin.vala
+++ b/plugins/word-completion/plugin.vala
@@ -141,16 +141,15 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
             }
         }
 
-        if (!completion_in_progress && parser.is_delimiter (uc) &&
+        if (!completion_in_progress && Euclide.Completion.Parser.is_delimiter (uc) &&
             (uc.isprint () || uc.isspace ())) {
-
             var buffer = current_view.buffer;
             var mark = buffer.get_insert ();
             Gtk.TextIter cursor_iter;
             buffer.get_iter_at_mark (out cursor_iter, mark);
 
             var word_start = cursor_iter;
-            word_start.backward_word_start ();
+            Euclide.Completion.Parser.back_to_word_start (ref word_start);
 
             string word = buffer.get_text (word_start, cursor_iter, false);
             parser.add_word (word);
diff --git a/src/Application.vala b/src/Application.vala
index fb5cd8a103..01c05de7d9 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -129,10 +129,10 @@ namespace Scratch {
         protected override void activate () {
             var window = get_last_window ();
             if (window != null && create_new_window) {
+                window = new_window (); // Will *not* restore documents
                 create_new_window = false;
-                this.new_window ();
             } else if (window == null) {
-                window = this.new_window (); // Will restore documents if required
+                window = new MainWindow (this, true); // Will restore documents if required
                 window.show ();
             } else {
                 window.present ();
@@ -149,12 +149,14 @@ namespace Scratch {
             var window = get_last_window ();
 
             foreach (var file in files) {
-                var type = file.query_file_type (FileQueryInfoFlags.NONE);
-                if (type == FileType.DIRECTORY) {
-                    window.open_folder (file);
-                } else {
-                    var doc = new Scratch.Services.Document (window.actions, file);
-                    window.open_document (doc);
+                bool is_folder;
+                if (Scratch.Services.FileHandler.can_open_file (file, out is_folder)) {
+                    if (is_folder) {
+                        window.open_folder (file);
+                    } else {
+                        var doc = new Scratch.Services.Document (window.actions, file);
+                        window.open_document (doc);
+                    }
                 }
             }
         }
@@ -164,8 +166,8 @@ namespace Scratch {
             return windows.length () > 0 ? windows.last ().data as MainWindow : null;
         }
 
-        public MainWindow new_window () {
-            return new MainWindow (this);
+        public MainWindow new_window () { // Only use for additional windows
+            return new MainWindow (this, false);
         }
 
         public static int main (string[] args) {
diff --git a/src/Dialogs/GlobalSearchDialog.vala b/src/Dialogs/GlobalSearchDialog.vala
index 6f754c17fd..e43a907f97 100644
--- a/src/Dialogs/GlobalSearchDialog.vala
+++ b/src/Dialogs/GlobalSearchDialog.vala
@@ -26,7 +26,16 @@ public class Scratch.Dialogs.GlobalSearchDialog : Granite.MessageDialog {
     private Gtk.Switch case_switch;
     private Gtk.Switch regex_switch;
 
-    public string search_term { get {return search_term_entry.text;} }
+    public string search_term {
+        get {
+            return search_term_entry.text;
+        }
+
+        set {
+            search_term_entry.text = value;
+        }
+    }
+
     public bool use_regex {
         get {
             return regex_switch.active;
diff --git a/src/Dialogs/PreferencesDialog.vala b/src/Dialogs/PreferencesDialog.vala
index 75580a28aa..f5878982e6 100644
--- a/src/Dialogs/PreferencesDialog.vala
+++ b/src/Dialogs/PreferencesDialog.vala
@@ -63,8 +63,10 @@ namespace Scratch.Dialogs {
             general_grid.attach (new SettingsSwitch ("auto-indent"), 1, 4, 2);
             general_grid.attach (new SettingsLabel (_("Insert spaces instead of tabs:")), 0, 5);
             general_grid.attach (new SettingsSwitch ("spaces-instead-of-tabs"), 1, 5, 2);
-            general_grid.attach (new SettingsLabel (_("Tab width:")), 0, 6);
-            general_grid.attach (indent_width, 1, 6, 2);
+            general_grid.attach (new SettingsLabel (_("Strip trailing whitespace:")), 0, 6);
+            general_grid.attach (new SettingsSwitch ("strip-trailing-on-save"), 1, 6, 2);
+            general_grid.attach (new SettingsLabel (_("Tab width:")), 0, 7);
+            general_grid.attach (indent_width, 1, 7, 2);
 
             main_stack = new Gtk.Stack () {
                 margin = 12
@@ -82,6 +84,7 @@ namespace Scratch.Dialogs {
             main_grid.attach (main_stackswitcher, 0, 0);
             main_grid.attach (main_stack, 0, 1);
 
+
             border_width = 0;
             get_content_area ().add (main_grid);
 
@@ -157,7 +160,7 @@ namespace Scratch.Dialogs {
             content.attach (show_mini_map, 1, 5, 1, 1);
             content.attach (show_right_margin_label, 0, 6, 1, 1);
             content.attach (show_right_margin, 1, 6, 1, 1);
-            content.attach (right_margin_position, 2, 6, 1, 1);
+            content.attach (right_margin_position, 2, 7, 1, 1);
             content.attach (font_header, 0, 7, 3, 1);
             content.attach (use_custom_font_label , 0, 9, 1, 1);
             content.attach (use_custom_font, 1, 9, 1, 1);
diff --git a/src/FolderManager/FileView.vala b/src/FolderManager/FileView.vala
index 77fcfc0d68..fdec141eaf 100644
--- a/src/FolderManager/FileView.vala
+++ b/src/FolderManager/FileView.vala
@@ -23,24 +23,37 @@
  */
 public class Scratch.FolderManager.FileView : Granite.Widgets.SourceList, Code.PaneSwitcher {
     private GLib.Settings settings;
+    private Scratch.Services.GitManager git_manager;
+    private ActionGroup? toplevel_action_group = null;
 
     public signal void select (string file);
-    public signal void close_all_docs_from_path (string path);
 
     // This is a workaround for SourceList silliness: you cannot remove an item
     // without it automatically selecting another one.
     public bool ignore_next_select { get; set; default = false; }
     public string icon_name { get; set; }
     public string title { get; set; }
+    public string active_project_path {
+        get {
+            return git_manager.active_project_path;
+        }
+    }
 
     construct {
         width_request = 180;
         icon_name = "folder-symbolic";
         title = _("Folders");
 
+        settings = new GLib.Settings ("io.elementary.code.folder-manager");
+        git_manager = Scratch.Services.GitManager.get_instance ();
+
         item_selected.connect (on_item_selected);
 
-        settings = new GLib.Settings ("io.elementary.code.folder-manager");
+        realize.connect (() => {
+            toplevel_action_group = get_action_group (MainWindow.ACTION_GROUP);
+            assert_nonnull (toplevel_action_group);
+        });
+
     }
 
     private void on_item_selected (Granite.Widgets.SourceList.Item? item) {
@@ -81,9 +94,29 @@ public class Scratch.FolderManager.FileView : Granite.Widgets.SourceList, Code.P
         }
     }
 
+    public void collapse_other_projects (string? keep_open_path = null) {
+        unowned string path;
+        if (keep_open_path == null) {
+            path = git_manager.active_project_path;
+        } else {
+            path = keep_open_path;
+            git_manager.active_project_path = path;
+        }
+
+        foreach (var child in root.children) {
+            var project_folder = ((ProjectFolderItem) child);
+            if (project_folder.path != path) {
+                project_folder.expanded = false;
+                toplevel_action_group.activate_action (MainWindow.ACTION_HIDE_PROJECT_DOCS, new Variant.string (project_folder.path));
+            } else if (project_folder.path == path) {
+                project_folder.expanded = true;
+                toplevel_action_group.activate_action (MainWindow.ACTION_RESTORE_PROJECT_DOCS, new Variant.string (project_folder.path));
+            }
+        }
+    }
+
     public void order_folders () {
         var list = new Gee.ArrayList<ProjectFolderItem> ();
-
         foreach (var child in root.children) {
             root.remove (child as ProjectFolderItem);
             list.add (child as ProjectFolderItem);
@@ -152,21 +185,21 @@ public class Scratch.FolderManager.FileView : Granite.Widgets.SourceList, Code.P
         return null;
     }
 
-    public unowned Granite.Widgets.SourceList.Item? expand_to_path (string path) {
-         return find_path (root, path, true);
-    }
-
     /* Do global search on project containing the file path supplied in parameter */
-    public void search_global (string path) {
+    public void search_global (string path, string? term = null) {
         var item_for_path = (Item?)(expand_to_path (path));
         if (item_for_path != null) {
             var search_root = item_for_path.get_root_folder ();
             if (search_root is ProjectFolderItem) {
-                search_root.global_search (search_root.file.file);
+                search_root.global_search (search_root.file.file, term);
             }
         }
     }
 
+    public unowned Granite.Widgets.SourceList.Item? expand_to_path (string path) {
+         return find_path (root, path, true);
+    }
+
     public void clear_badges () {
         foreach (var child in root.children) {
             if (child is ProjectFolderItem) {
@@ -195,6 +228,15 @@ public class Scratch.FolderManager.FileView : Granite.Widgets.SourceList, Code.P
         }
     }
 
+    // Returns diff of entire project associated with param file
+    public string? get_project_diff (string active_project_path) throws GLib.Error {
+        unowned var active_project = (ProjectFolderItem)(find_path (root, active_project_path));
+        if (active_project != null) {
+            return active_project.get_project_diff ();
+        }
+
+        throw new GLib.IOError.FAILED ("Could not determine the active Git project");
+    }
 
     private void rename_items_with_same_name (Item item) {
         string item_name = item.file.name;
@@ -231,7 +273,7 @@ public class Scratch.FolderManager.FileView : Granite.Widgets.SourceList, Code.P
 
         folder_root.expanded = expand;
         folder_root.closed.connect (() => {
-            close_all_docs_from_path (folder_root.file.path);
+            toplevel_action_group.activate_action (MainWindow.ACTION_CLOSE_PROJECT_DOCS, new Variant.string (folder_root.path));
             root.remove (folder_root);
             foreach (var child in root.children) {
                 var child_folder = (ProjectFolderItem) child;
@@ -239,6 +281,20 @@ public class Scratch.FolderManager.FileView : Granite.Widgets.SourceList, Code.P
                     rename_items_with_same_name (child_folder);
                 }
             }
+            git_manager.remove_project (folder_root);
+            write_settings ();
+        });
+
+        folder_root.close_all_except.connect (() => {
+            foreach (var child in root.children) {
+                var project_folder_item = (ProjectFolderItem)child;
+                if (project_folder_item != folder_root) {
+                    toplevel_action_group.activate_action (MainWindow.ACTION_CLOSE_PROJECT_DOCS, new Variant.string (project_folder_item.path));
+                    root.remove (project_folder_item);
+                    git_manager.remove_project (project_folder_item);
+                }
+            }
+
             Scratch.Services.GitManager.get_instance ().remove_project (folder_root);
             write_settings ();
         });
diff --git a/src/FolderManager/ProjectFolderItem.vala b/src/FolderManager/ProjectFolderItem.vala
index e0a8266e82..9f4b01c8b8 100644
--- a/src/FolderManager/ProjectFolderItem.vala
+++ b/src/FolderManager/ProjectFolderItem.vala
@@ -108,8 +108,8 @@ namespace Scratch.FolderManager {
         }
 
         public override Gtk.Menu? get_context_menu () {
-            var close_item = new Gtk.MenuItem.with_label (_("Close Folder"));
-            close_item.activate.connect (() => {
+            var close_folder_item = new Gtk.MenuItem.with_label (_("Close Folder"));
+            close_folder_item.activate.connect (() => {
                 closed ();
             });
 
@@ -117,6 +117,49 @@ namespace Scratch.FolderManager {
             close_all_except_item.activate.connect (() => { close_all_except (); });
             close_all_except_item.sensitive = view.root.children.size > 1;
 
+            var n_open = Scratch.Services.DocumentManager.get_instance ().open_for_project (path);
+            var open_text = ngettext (_("Close %u Open Document"),
+                                      _("Close %u Open Documents"),
+                                      n_open).printf (n_open);
+
+            var close_accellabel = new Granite.AccelLabel.from_action_name (
+                open_text,
+                MainWindow.ACTION_PREFIX + MainWindow.ACTION_CLOSE_PROJECT_DOCS + "::"
+            );
+            var close_item = new Gtk.MenuItem () {
+                action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_CLOSE_PROJECT_DOCS,
+                action_target = new Variant.string (file.file.get_path ())
+            };
+            close_item.add (close_accellabel);
+
+            var hide_text = ngettext (_("Hide %u Open Document"),
+                                      _("Hide %u Open Documents"),
+                                      n_open).printf (n_open);
+
+            var hide_accellabel = new Granite.AccelLabel.from_action_name (
+                hide_text,
+                MainWindow.ACTION_PREFIX + MainWindow.ACTION_HIDE_PROJECT_DOCS + "::"
+            );
+            var hide_item = new Gtk.MenuItem () {
+                action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_HIDE_PROJECT_DOCS,
+                action_target = new Variant.string (file.file.get_path ())
+            };
+            hide_item.add (hide_accellabel);
+
+            var n_restorable = Scratch.Services.DocumentManager.get_instance ().restorable_for_project (path);
+            var restore_text = ngettext (_("Restore %u Hidden Document"),
+                                         _("Restore %u Hidden Documents"),
+                                         n_restorable).printf (n_restorable);
+            var restore_accellabel = new Granite.AccelLabel.from_action_name (
+                restore_text,
+                MainWindow.ACTION_PREFIX + MainWindow.ACTION_RESTORE_PROJECT_DOCS + "::"
+            );
+            var restore_item = new Gtk.MenuItem () {
+                action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_RESTORE_PROJECT_DOCS,
+                action_target = new Variant.string (file.file.get_path ())
+            };
+            restore_item.add (restore_accellabel);
+
             var delete_item = new Gtk.MenuItem.with_label (_("Move to Trash"));
             delete_item.activate.connect (() => {
                 closed ();
@@ -129,7 +172,7 @@ namespace Scratch.FolderManager {
             );
 
             var search_item = new Gtk.MenuItem () {
-                action_name = "win.action_find_global",
+                action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_FIND_GLOBAL,
                 action_target = new Variant.string (file.file.get_path ())
             };
             search_item.add (search_accellabel);
@@ -150,6 +193,17 @@ namespace Scratch.FolderManager {
             menu.append (create_submenu_for_new ());
 
             if (monitored_repo != null) {
+                var diff_accellabel = new Granite.AccelLabel.from_action_name (
+                    _("Show Diff"),
+                    MainWindow.ACTION_PREFIX + MainWindow.ACTION_SHOW_DIFF + "::"
+                );
+
+                var diff_item = new Gtk.MenuItem () {
+                    action_name = "win.action_show_diff",
+                    action_target = new Variant.string (file.file.get_path ())
+                };
+                diff_item.add (diff_accellabel);
+                menu.append (diff_item);
                 var branch_menu = new ChangeBranchMenu (this) {
                     sensitive = !monitored_repo.has_uncommitted
                 };
@@ -157,8 +211,22 @@ namespace Scratch.FolderManager {
             }
 
             menu.append (new Gtk.SeparatorMenuItem ());
-            menu.append (close_item);
+            menu.append (close_folder_item);
             menu.append (close_all_except_item);
+            menu.append (new Gtk.SeparatorMenuItem ());
+            if (n_restorable > 0) {
+                menu.append (restore_item);
+            }
+
+            if (n_open > 0) {
+                menu.append (hide_item);
+                menu.append (close_item);
+            }
+
+            if (n_restorable + n_open > 1) {
+                menu.append (new Gtk.SeparatorMenuItem ());
+            }
+
             menu.append (delete_item);
             menu.append (new Gtk.SeparatorMenuItem ());
             menu.append (search_item);
@@ -262,10 +330,10 @@ namespace Scratch.FolderManager {
             return is_git_repo ? monitored_repo.is_valid_new_local_branch_name (new_name) : false;
         }
 
-        public void global_search (GLib.File start_folder = this.file.file) {
+        public void global_search (GLib.File start_folder = this.file.file, string? term = null) {
             /* For now set all options to the most inclusive (except case).
              * The ability to set these in the dialog (or by parameter) may be added later. */
-            string? term = null;
+            string? search_term = null;
             bool use_regex = false;
             bool search_tracked_only = false;
             bool recurse_subfolders = true;
@@ -285,13 +353,14 @@ namespace Scratch.FolderManager {
                 monitored_repo != null && monitored_repo.git_repo != null
             ) {
                 case_sensitive = case_sensitive,
-                use_regex = use_regex
+                use_regex = use_regex,
+                search_term = term
             };
 
             dialog.response.connect ((response) => {
                 switch (response) {
                     case Gtk.ResponseType.ACCEPT:
-                        term = dialog.search_term;
+                        search_term = dialog.search_term;
                         use_regex = dialog.use_regex;
                         case_sensitive = dialog.case_sensitive;
                         break;
@@ -306,15 +375,15 @@ namespace Scratch.FolderManager {
 
             dialog.run ();
 
-            if (term != null) {
+            if (search_term != null) {
                 /* Put search term in search bar to help user locate the position of the matches in each doc */
-                var search_variant = new Variant.string (term);
+                var search_variant = new Variant.string (search_term);
                 var app = (Gtk.Application)GLib.Application.get_default ();
                 var win = (Scratch.MainWindow)(app.get_active_window ());
                 win.actions.lookup_action ("action_find").activate (search_variant);
 
                 if (!use_regex) {
-                    term = Regex.escape_string (term);
+                    search_term = Regex.escape_string (search_term);
                 }
 
                 try {
@@ -323,9 +392,9 @@ namespace Scratch.FolderManager {
                         flags |= RegexCompileFlags.CASELESS;
                     }
 
-                    pattern = new Regex (term, flags);
+                    pattern = new Regex (search_term, flags);
                 } catch (Error e) {
-                    critical ("Error creating regex from '%s': %s", term, e.message);
+                    critical ("Error creating regex from '%s': %s", search_term, e.message);
                     return;
                 }
             } else {
@@ -469,6 +538,10 @@ namespace Scratch.FolderManager {
             monitored_repo.refresh_diff (doc_path, ref line_status_map);
         }
 
+        public string? get_project_diff () throws GLib.Error {
+            return monitored_repo.get_project_diff ();
+        }
+
         private class ChangeBranchMenu : Gtk.MenuItem {
             public Scratch.Services.MonitoredRepository monitored_repo {
                 get {
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 1034aa9c93..60b5bb237d 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -34,6 +34,7 @@ namespace Scratch {
         public Scratch.Widgets.SearchBar search_bar;
         private Code.WelcomeView welcome_view;
         private FolderManager.FileView folder_manager_view;
+        private Scratch.Services.DocumentManager document_manager;
 
         // Plugins
         private Scratch.Services.PluginsManager plugins;
@@ -54,7 +55,8 @@ namespace Scratch {
 
         public SimpleActionGroup actions { get; construct; }
 
-        public const string ACTION_PREFIX = "win.";
+        public const string ACTION_GROUP = "win";
+        public const string ACTION_PREFIX = ACTION_GROUP + ".";
         public const string ACTION_FIND = "action_find";
         public const string ACTION_FIND_NEXT = "action_find_next";
         public const string ACTION_FIND_PREVIOUS = "action_find_previous";
@@ -90,6 +92,14 @@ namespace Scratch {
         public const string ACTION_PREVIOUS_TAB = "action_previous_tab";
         public const string ACTION_CLEAR_LINES = "action_clear_lines";
         public const string ACTION_NEW_BRANCH = "action_new_branch";
+        public const string ACTION_SHOW_DIFF = "action_show_diff";
+        public const string ACTION_CLOSE_PROJECT_DOCS = "action_close_project_docs";
+        public const string ACTION_HIDE_PROJECT_DOCS = "action_hide_project_docs";
+        public const string ACTION_RESTORE_PROJECT_DOCS = "action_restore_project_docs";
+        public const string ACTION_PREVIOUS_MARK = "action_previous_mark";
+        public const string ACTION_NEXT_MARK = "action_next_mark";
+        public const string ACTION_PREVIOUS_DOC = "action_previous_doc";
+        public const string ACTION_NEXT_DOC = "action_next_doc";
 
         public static Gee.MultiMap<string, string> action_accelerators = new Gee.HashMultiMap<string, string> ();
 
@@ -129,16 +139,37 @@ namespace Scratch {
             { ACTION_NEXT_TAB, action_next_tab },
             { ACTION_PREVIOUS_TAB, action_previous_tab },
             { ACTION_CLEAR_LINES, action_clear_lines },
-            { ACTION_NEW_BRANCH, action_new_branch, "s" }
+            { ACTION_NEW_BRANCH, action_new_branch, "s" },
+            { ACTION_SHOW_DIFF, action_show_diff, "s" },
+            { ACTION_HIDE_PROJECT_DOCS, action_hide_project_docs, "s"},
+            { ACTION_CLOSE_PROJECT_DOCS, action_close_project_docs, "s"},
+            { ACTION_RESTORE_PROJECT_DOCS, action_restore_project_docs, "s"},
+            { ACTION_PREVIOUS_MARK, action_previous_mark},
+            { ACTION_NEXT_MARK, action_next_mark},
+            { ACTION_PREVIOUS_DOC, action_previous_doc},
+            { ACTION_NEXT_DOC, action_next_doc}
         };
 
-        public MainWindow (Scratch.Application scratch_app) {
+        public MainWindow (Scratch.Application scratch_app, bool restore_docs) {
             Object (
                 application: scratch_app,
                 app: scratch_app,
                 icon_name: Constants.PROJECT_NAME,
                 title: _("Code")
             );
+
+            document_view.realize.connect (() => {
+                if (restore_docs) {
+                    restore_opened_documents ();
+                }
+
+                Idle.add (() => {
+                    document_view.request_placeholder_if_empty ();
+                    return Source.REMOVE;
+                });
+            });
+
+            show_all (); // Do not show document view until realize signal connected
         }
 
         static construct {
@@ -176,6 +207,13 @@ namespace Scratch {
             action_accelerators.set (ACTION_PREVIOUS_TAB, "<Control><Shift>Tab");
             action_accelerators.set (ACTION_CLEAR_LINES, "<Control>K"); //Geany
             action_accelerators.set (ACTION_NEW_BRANCH + "::", "<Control>B");
+            action_accelerators.set (ACTION_SHOW_DIFF + "::", "<Control><Shift>D");
+            action_accelerators.set (ACTION_HIDE_PROJECT_DOCS + "::", "<Control><Shift>h");
+            action_accelerators.set (ACTION_RESTORE_PROJECT_DOCS + "::", "<Control><Shift>r");
+            action_accelerators.set (ACTION_PREVIOUS_MARK, "<Alt>Left");
+            action_accelerators.set (ACTION_NEXT_MARK, "<Alt>Right");
+            action_accelerators.set (ACTION_PREVIOUS_DOC, "<Control><Alt>Left");
+            action_accelerators.set (ACTION_NEXT_DOC, "<Control><Alt>Right");
 
             var provider = new Gtk.CssProvider ();
             provider.load_from_resource ("io/elementary/code/Application.css");
@@ -190,9 +228,11 @@ namespace Scratch {
             weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
             default_theme.add_resource_path ("/io/elementary/code");
 
+            document_manager = Scratch.Services.DocumentManager.get_instance ();
+
             actions = new SimpleActionGroup ();
             actions.add_action_entries (ACTION_ENTRIES, this);
-            insert_action_group ("win", actions);
+            insert_action_group (ACTION_GROUP, actions);
 
             actions.action_state_changed.connect ((name, new_state) => {
                 if (name == ACTION_SHOW_FIND) {
@@ -257,8 +297,6 @@ namespace Scratch {
             }
 
             sidebar.bind_property ("visible", toolbar.choose_project_revealer, "reveal-child");
-            // Show/Hide widgets
-            show_all ();
 
             toolbar.templates_button.visible = (plugins.plugin_iface.template_manager.template_available);
             plugins.plugin_iface.template_manager.notify["template_available"].connect (() => {
@@ -279,6 +317,10 @@ namespace Scratch {
             toolbar = new Scratch.Widgets.HeaderBar ();
             toolbar.title = title;
 
+            toolbar.choose_project_button.project_chosen.connect (() => {
+                folder_manager_view.collapse_other_projects ();
+            });
+
             // SearchBar
             search_bar = new Scratch.Widgets.SearchBar (this);
             search_revealer = new Gtk.Revealer ();
@@ -288,7 +330,7 @@ namespace Scratch {
                 set_search_text ();
             });
             search_bar.search_entry.unmap.connect_after (() => { /* signalled when reveal child */
-                search_bar.set_search_string ("");
+                search_bar.search_entry.text = "";
                 search_bar.highlight_none ();
             });
             search_bar.search_empty.connect (() => {
@@ -309,8 +351,12 @@ namespace Scratch {
                     for (var i = 0; i < uris.length; i++) {
                         string filename = uris[i];
                         var file = File.new_for_uri (filename);
-                        Scratch.Services.Document doc = new Scratch.Services.Document (actions, file);
-                        document_view.open_document (doc);
+                        bool is_folder;
+                        //TODO Handle folders dropped here
+                        if (Scratch.Services.FileHandler.can_open_file (file, out is_folder) && !is_folder) {
+                            Scratch.Services.Document doc = new Scratch.Services.Document (actions, file);
+                            document_view.open_document (doc);
+                        }
                     }
 
                     Gtk.drag_finish (ctx, true, false, time);
@@ -322,7 +368,6 @@ namespace Scratch {
             folder_manager_view = new FolderManager.FileView ();
 
             sidebar.add_tab (folder_manager_view);
-            folder_manager_view.show_all ();
 
             folder_manager_view.select.connect ((a) => {
                 var file = new Scratch.FolderManager.File (a);
@@ -335,14 +380,6 @@ namespace Scratch {
                 }
             });
 
-            folder_manager_view.close_all_docs_from_path.connect ((a) => {
-                var docs = document_view.docs.copy ();
-                docs.foreach ((doc) => {
-                    if (doc.file.get_path ().has_prefix (a)) {
-                        document_view.close_document (doc);
-                    }
-                });
-            });
 
             folder_manager_view.restore_saved_state ();
 
@@ -407,10 +444,6 @@ namespace Scratch {
                 hook_func ();
             });
 
-            document_view.realize.connect (() => {
-                restore_opened_documents ();
-            });
-
             document_view.request_placeholder.connect (() => {
                 content_stack.visible_child = welcome_view;
                 title = _("Code");
@@ -475,6 +508,7 @@ namespace Scratch {
                            But for files that do not exist we need to make sure that doc won't create a new file
                         */
                         if (file.query_exists ()) {
+                            //TODO Check files valid (settings could have been manually altered)
                             var doc = new Scratch.Services.Document (actions, file);
                             bool is_focused = file.get_uri () == focused_document;
                             if (doc.exists () || !doc.is_file_temporary) {
@@ -488,11 +522,6 @@ namespace Scratch {
                     }
                 }
             }
-
-            Idle.add (() => {
-                document_view.request_placeholder_if_empty ();
-                return Source.REMOVE;
-            });
         }
 
         private bool on_key_pressed (Gdk.EventKey event) {
@@ -557,7 +586,10 @@ namespace Scratch {
             folder_manager_view.open_folder (foldermanager_file);
         }
 
-        public void open_document (Scratch.Services.Document doc, bool focus = true, int cursor_position = 0) {
+        public void open_document (Scratch.Services.Document doc,
+                                   bool focus = true,
+                                   int cursor_position = 0) {
+
             FolderManager.ProjectFolderItem? project = folder_manager_view.get_project_for_file (doc.file);
             doc.source_view.project = project;
             document_view.open_document (doc, focus, cursor_position);
@@ -794,7 +826,7 @@ namespace Scratch {
                 if (doc.is_file_temporary == true) {
                     action_save_as ();
                 } else {
-                    doc.save.begin ();
+                    doc.save.begin (true);
                 }
             }
         }
@@ -855,6 +887,42 @@ namespace Scratch {
             }
         }
 
+        private void action_hide_project_docs (SimpleAction action, Variant? param) {
+            close_project_docs (get_target_path_for_git_actions (param), true);
+        }
+
+        private void action_close_project_docs (SimpleAction action, Variant? param) {
+            close_project_docs (get_target_path_for_git_actions (param), false);
+        }
+
+        private void action_restore_project_docs (SimpleAction action, Variant? param) {
+            restore_project_docs (get_target_path_for_git_actions (param));
+        }
+
+        private void close_project_docs (string project_path, bool make_restorable) {
+            unowned var docs = document_view.docs;
+            docs.foreach ((doc) => {
+                if (doc.file.get_path ().has_prefix (project_path)) {
+                    document_view.close_document (doc);
+                    if (make_restorable) {
+                        document_manager.make_restorable (doc);
+                    }
+                }
+            });
+
+            if (!make_restorable) {
+                document_manager.remove_project (project_path);
+            }
+        }
+
+        private void restore_project_docs (string project_path) {
+            document_manager.take_restorable_paths (project_path).@foreach ((doc_path) => {
+                var doc = new Scratch.Services.Document (actions, File.new_for_path (doc_path));
+                open_document (doc); // Use this to reassociate project and document.
+                return true;
+            });
+        }
+
         /** Not a toggle action - linked to keyboard short cut (Ctrl-f). **/
         private string current_search_term = "";
         private void action_fetch (SimpleAction action, Variant? param) {
@@ -882,12 +950,27 @@ namespace Scratch {
         }
 
         private void action_find_global (SimpleAction action, Variant? param) {
-            folder_manager_view.search_global (get_target_path_for_git_actions (param));
+            var current_doc = get_current_document ();
+            var selected_text = current_doc.get_selected_text ();
+
+            // If search entry focused use its text for search term, else use selected text
+            var term = search_bar.search_entry.has_focus ?
+                            search_bar.search_entry.text : selected_text;
+
+            // If no focused selected text fallback to search entry text if visible
+            if (term == "" &&
+                !search_bar.search_entry.has_focus &&
+                search_revealer.reveal_child) {
+
+                term = search_bar.search_entry.text;
+            }
+
+            folder_manager_view.search_global (get_target_path_for_git_actions (param), term);
         }
 
         private void set_search_text () {
             if (current_search_term != "") {
-                search_bar.set_search_string (current_search_term);
+                search_bar.search_entry.text = current_search_term;
                 search_bar.search_entry.grab_focus ();
                 search_bar.search_next ();
             } else {
@@ -897,7 +980,7 @@ namespace Scratch {
                     var selected_text = current_doc.get_selected_text ();
                     if (selected_text != "" && selected_text.length < MAX_SEARCH_TEXT_LENGTH) {
                         current_search_term = selected_text;
-                        search_bar.set_search_string (current_search_term);
+                        search_bar.search_entry.text = current_search_term;
                     }
 
                     search_bar.search_entry.grab_focus (); /* causes loss of document selection */
@@ -1003,25 +1086,70 @@ namespace Scratch {
             folder_manager_view.new_branch (get_target_path_for_git_actions (param));
         }
 
+        private void action_show_diff (SimpleAction action, Variant? param) {
+            try {
+                string diff_text = folder_manager_view.get_project_diff (get_target_path_for_git_actions (param));
+                FileIOStream iostream;
+                File diff_file = File.new_tmp ("git-diff-XXXXXX.diff", out iostream);
+                warning ("tmp file name: %s\n", diff_file.get_path ());
+
+                var ostream = iostream.output_stream;
+                var dostream = new DataOutputStream (ostream);
+                dostream.put_string (diff_text);
+                iostream.close ();
+
+                var doc = new Services.Document (actions, diff_file);
+                document_view.open_document (doc);
+            } catch (Error e) {
+                warning ("Unable to get project diff: %s", e.message);
+            }
+        }
+
+        private void action_previous_mark () {
+            var doc = get_focused_document ();
+            if (doc == null) {
+                return;
+            }
+
+            doc.source_view.goto_previous_mark ();
+        }
+
+        private void action_next_mark () {
+            var doc = get_focused_document ();
+            if (doc == null) {
+                return;
+            }
+
+            doc.source_view.goto_next_mark ();
+        }
+
+        private void action_previous_doc () {
+            document_view.goto_previous_doc ();
+        }
+
+        private void action_next_doc () {
+            document_view.goto_next_doc ();
+        }
+
         private string? get_target_path_for_git_actions (Variant? path_variant) {
-             string? path = "";
-             if (path_variant != null) {
-                 path = path_variant.get_string ();
-             }
-
-             if (path == "") { // Happens when keyboard accelerator is used
-                 path = Services.GitManager.get_instance ().active_project_path;
-                 if (path == null) {
-                     var current_doc = get_current_document ();
-                     if (current_doc != null) {
-                         path = current_doc.file.get_path ();
-                     } else {
-                         return null; // Cannot determine target project
-                     }
-                 }
-             }
-
-             return path;
-         }
+            string? path = "";
+            if (path_variant != null) {
+                path = path_variant.get_string ();
+            }
+
+            if (path == "") { // Happens when keyboard accelerator is used
+                path = Services.GitManager.get_instance ().active_project_path;
+                if (path == null) {
+                    var current_doc = get_current_document ();
+                    if (current_doc != null) {
+                        path = current_doc.file.get_path ();
+                    } else {
+                        return null; // Cannot determine target project
+                    }
+                }
+            }
+
+            return path;
+        }
     }
 }
diff --git a/src/Services/Document.vala b/src/Services/Document.vala
index f301e399b5..15a21c3c28 100644
--- a/src/Services/Document.vala
+++ b/src/Services/Document.vala
@@ -32,6 +32,7 @@ namespace Scratch.Services {
         public signal void doc_opened ();
         public signal void doc_saved ();
         public signal void doc_closed ();
+        public signal void doc_changed ();
 
         // The parent window's actions
         public unowned SimpleActionGroup actions { get; set construct; }
@@ -93,22 +94,24 @@ namespace Scratch.Services {
         public string original_content;
         private string last_save_content;
         public bool saved = true;
+        private bool completion_shown = false;
 
         private Gtk.ScrolledWindow scroll;
         private Gtk.InfoBar info_bar;
         private Gtk.SourceMap source_map;
+        private Gtk.Paned outline_widget_pane;
 
         private GLib.Cancellable save_cancellable;
         private GLib.Cancellable load_cancellable;
         private ulong onchange_handler_id = 0; // It is used to not mark files as changed on load
-        private bool loaded = false;
-        private bool mounted = true; // Mount state of the file
+        public bool loaded { get; private set; default = false; }
+        public bool mounted = true; // Mount state of the file
         private Mount mount;
 
         private static Pango.FontDescription? builder_blocks_font = null;
         private static Pango.FontMap? builder_font_map = null;
 
-        public Document (SimpleActionGroup actions, File? file = null) {
+        public Document (SimpleActionGroup actions, File file) {
             Object (actions: actions);
 
             this.file = file;
@@ -134,11 +137,15 @@ namespace Scratch.Services {
             main_stack = new Gtk.Stack ();
             source_view = new Scratch.Widgets.SourceView ();
 
-            scroll = new Gtk.ScrolledWindow (null, null);
+            scroll = new Gtk.ScrolledWindow (null, null) {
+                expand = true
+            };
             scroll.add (source_view);
             info_bar = new Gtk.InfoBar ();
             source_file = new Gtk.SourceFile ();
             source_map = new Gtk.SourceMap ();
+            outline_widget_pane = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
+
             if (builder_blocks_font != null && builder_font_map != null) {
                 source_map.set_font_map (builder_font_map);
                 source_map.font_desc = builder_blocks_font;
@@ -161,15 +168,18 @@ namespace Scratch.Services {
                 return working;
             });
 
-            var source_grid = new Gtk.Grid ();
-            source_grid.orientation = Gtk.Orientation.HORIZONTAL;
+            var source_grid = new Gtk.Grid () {
+                orientation = Gtk.Orientation.HORIZONTAL,
+                column_homogeneous = false
+            };
             source_grid.add (scroll);
             source_grid.add (source_map);
+            outline_widget_pane.pack1 (source_grid, true, false);
 
             var doc_grid = new Gtk.Grid ();
             doc_grid.orientation = Gtk.Orientation.VERTICAL;
             doc_grid.add (info_bar);
-            doc_grid.add (source_grid);
+            doc_grid.add (outline_widget_pane);
             doc_grid.show_all ();
 
             main_stack.add_named (doc_grid, "content");
@@ -179,6 +189,7 @@ namespace Scratch.Services {
             toggle_changed_handlers (true);
 
             // Focus out event for SourceView
+
             this.source_view.focus_out_event.connect (() => {
                 if (Scratch.settings.get_boolean ("autosave")) {
                     save.begin ();
@@ -188,8 +199,10 @@ namespace Scratch.Services {
             });
 
             source_view.buffer.changed.connect (() => {
+                doc_changed ();
                 if (source_view.buffer.text != last_save_content) {
                     saved = false;
+
                     if (!Scratch.settings.get_boolean ("autosave")) {
                         set_saved_status (false);
                     }
@@ -198,8 +211,16 @@ namespace Scratch.Services {
                 }
             });
 
-            /* Create as loaded - could be new document */
-            loaded = true;
+            source_view.completion.show.connect (() => {
+                completion_shown = true;
+            });
+
+            source_view.completion.hide.connect (() => {
+                completion_shown = false;
+            });
+
+            // /* Create as loaded - could be new document */
+            loaded = file == null;
             ellipsize_mode = Pango.EllipsizeMode.MIDDLE;
         }
 
@@ -238,6 +259,7 @@ namespace Scratch.Services {
         public async void open (bool force = false) {
             /* Loading improper files may hang so we cancel after a certain time as a fallback.
              * In most cases, an error will be thrown and caught. */
+            loaded = false;
             if (load_cancellable != null) { /* just in case */
                 load_cancellable.cancel ();
             }
@@ -256,7 +278,6 @@ namespace Scratch.Services {
 
             source_view.sensitive = false;
             this.working = true;
-            loaded = false;
 
             var content_type = ContentType.from_mime_type (mime_type);
 
@@ -317,7 +338,6 @@ namespace Scratch.Services {
                     source_view.buffer.text = buffer.text;
                 }
 
-                loaded = true;
             } catch (Error e) {
                 critical (e.message);
                 source_view.buffer.text = "";
@@ -354,7 +374,8 @@ namespace Scratch.Services {
              * (large documents take time to format/display after loading)
              */
             Idle.add (() => {
-                this.working = false;
+                working = false;
+                loaded = true;
                 return false;
             });
 
@@ -447,12 +468,19 @@ namespace Scratch.Services {
         }
 
         public async bool save (bool force = false) {
-            if (!force && (source_view.buffer.get_modified () == false || this.loaded == false)) {
+            if (completion_shown ||
+                !force && (source_view.buffer.get_modified () == false ||
+                !loaded)) {
+
                 return false;
             }
 
             this.create_backup ();
 
+            if (Scratch.settings.get_boolean ("strip-trailing-on-save")) {
+                strip_trailing_spaces (force);
+            }
+
             // Replace old content with the new one
             save_cancellable.cancel ();
             save_cancellable = new GLib.Cancellable ();
@@ -468,7 +496,7 @@ namespace Scratch.Services {
 
             source_view.buffer.set_modified (false);
 
-            doc_saved ();
+            doc_saved (); // Signal outline plugin
             this.set_saved_status (true);
             last_save_content = source_view.buffer.text;
 
@@ -516,7 +544,7 @@ namespace Scratch.Services {
 
             if (success) {
                 source_view.buffer.set_modified (true);
-                var is_saved = yield save ();
+                var is_saved = yield save (true);
 
                 if (is_saved && is_current_file_temporary) {
                     try {
@@ -554,6 +582,10 @@ namespace Scratch.Services {
                 source_map.no_show_all = true;
                 scroll.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
             }
+
+            if (Scratch.settings.get_boolean ("strip-trailing-on-save")) {
+                strip_trailing_spaces (true);
+            }
         }
 
         // Focus the SourceView
@@ -916,5 +948,88 @@ namespace Scratch.Services {
             warning ("Folder containing the file was unmounted");
             mounted = false;
         }
+
+        public bool add_outline_widget (Gtk.Widget extra) {
+            if (has_outline_widget ()) {
+                return false;
+            } else {
+                //TODO Style the extra widget to match the document.
+                outline_widget_pane.pack2 (extra, false, false);
+                var position = int.max (outline_widget_pane.get_allocated_width () * 4 / 5, 100);
+                outline_widget_pane.set_position (position);
+                return true;
+            }
+        }
+
+        public bool remove_outline_widget () {
+            if (!has_outline_widget ()) {
+                return false;
+            } else {
+                outline_widget_pane.get_child2 ().destroy ();
+                return true;
+            }
+        }
+
+        public bool has_outline_widget () {
+            return outline_widget_pane.get_child2 () != null;
+        }
+
+        /* Pull the buffer into an array and then work out which parts are to be deleted.
+         * Do not strip line currently being edited  unless forced */
+        private void strip_trailing_spaces (bool force = false) {
+            if (!loaded || source_view.language == null || source_view.language.id != "vala") {
+                return;
+            }
+
+            var source_buffer = (Gtk.SourceBuffer)source_view.buffer;
+            Gtk.TextIter iter;
+
+            var cursor_pos = source_buffer.cursor_position;
+            source_buffer.get_iter_at_offset (out iter, cursor_pos);
+            var orig_line = iter.get_line ();
+            var orig_offset = iter.get_line_offset ();
+
+            var text = source_buffer.text;
+
+            string[] lines = Regex.split_simple ("""[\r\n]""", text);
+            if (lines.length == 0) { // Can legitimately happen at startup or new document
+                return;
+            }
+
+            if (lines.length != source_buffer.get_line_count ()) {
+                critical ("Mismatch between line counts when stripping trailing spaces, not continuing");
+                debug ("lines.length %u, buffer lines %u \n %s", lines.length, source_buffer.get_line_count (), text);
+                return;
+            }
+
+            MatchInfo info;
+            Gtk.TextIter start_delete, end_delete;
+            Regex whitespace;
+
+            try {
+                whitespace = new Regex ("[ \t]+$", 0);
+            } catch (RegexError e) {
+                critical ("Error while building regex to replace trailing whitespace: %s", e.message);
+                return;
+            }
+
+            for (int line_no = 0; line_no < lines.length; line_no++) {
+                if (whitespace.match (lines[line_no], 0, out info) &&
+                    (line_no != orig_line || force)) {
+
+                    source_buffer.get_iter_at_line (out start_delete, line_no);
+                    start_delete.forward_to_line_end ();
+                    end_delete = start_delete;
+                    end_delete.backward_chars (info.fetch (0).length);
+
+                    source_buffer.begin_not_undoable_action ();
+                    source_buffer.@delete (ref start_delete, ref end_delete);
+                    source_buffer.end_not_undoable_action ();
+                }
+            }
+
+            source_buffer.get_iter_at_line_offset (out iter, orig_line, orig_offset);
+            source_buffer.place_cursor (iter);
+        }
     }
 }
diff --git a/src/Services/DocumentManager.vala b/src/Services/DocumentManager.vala
new file mode 100644
index 0000000000..7b28448ee5
--- /dev/null
+++ b/src/Services/DocumentManager.vala
@@ -0,0 +1,76 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2020 elementary LLC. (https://elementary.io),
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jeremy Wootten <jeremy@elementaryos.org>
+ */
+
+ public class Scratch.Services.DocumentManager : Object {
+    static Gee.HashMultiMap <string, string> project_restorable_docs_map;
+    static Gee.HashMultiMap <string, string> project_open_docs_map;
+
+    static DocumentManager? instance;
+    public static DocumentManager get_instance () {
+         if (instance == null) {
+             instance = new DocumentManager ();
+         }
+
+         return instance;
+     }
+
+    static construct {
+        project_restorable_docs_map = new Gee.HashMultiMap<string, string> ();
+        project_open_docs_map = new Gee.HashMultiMap<string, string> ();
+    }
+
+    public void make_restorable (Document doc) {
+        project_restorable_docs_map.@set (doc.source_view.project.path, doc.file.get_path ());
+    }
+
+    public void add_open_document (Document doc) {
+        if (doc.source_view.project == null) {
+            return;
+        }
+
+        project_open_docs_map.@set (doc.source_view.project.path, doc.file.get_path ());
+    }
+
+    public void remove_open_document (Document doc) {
+        if (doc.source_view.project == null) {
+            return;
+        }
+
+        project_open_docs_map.remove (doc.source_view.project.path, doc.file.get_path ());
+    }
+
+    public void remove_project (string project_path) {
+        project_restorable_docs_map.remove_all (project_path);
+    }
+
+    public Gee.Collection<string> take_restorable_paths (string project_path) {
+        var docs = project_restorable_docs_map.@get (project_path);
+        project_restorable_docs_map.remove_all (project_path);
+        return docs;
+    }
+
+    public uint restorable_for_project (string project_path) {
+        return project_restorable_docs_map.@get (project_path).size;
+    }
+
+    public uint open_for_project (string project_path) {
+        return project_open_docs_map.@get (project_path).size;
+    }
+ }
diff --git a/src/Services/FileHandler.vala b/src/Services/FileHandler.vala
index 852305fe03..1d2b077fd9 100644
--- a/src/Services/FileHandler.vala
+++ b/src/Services/FileHandler.vala
@@ -27,6 +27,31 @@ namespace Scratch.Services {
     }
 
     public class FileHandler : GLib.Object {
+        public static bool can_open_file (File file, out bool is_folder) {
+            is_folder = false;
+            if (file == null || file.get_path () == null) {
+                warning ("Ignoring  file %s. Cannot determine path",
+                    file != null ? file.get_uri () ?? "null" : "null"
+                );
+
+                return false;
+            }
+
+            // For now only allow diretories and regular files to be opened from commandline
+            // TODO Consider need for handling other types
+            var type = file.query_file_type (FileQueryInfoFlags.NONE);
+            switch (type) {
+                case FileType.DIRECTORY:
+                     is_folder = true;
+                     return true;
+                case FileType.REGULAR:
+                case FileType.UNKNOWN: // Cannot be sure it is not a text file so try
+                    return true;
+                default:
+                    warning ("Cannot open %s. Cannot handle file type %s", file.get_path (), type.to_string ());
+                    return false;
+            }
+        }
 
         public static async string? load_content_from_file (File file) {
             var text = new StringBuilder ();
diff --git a/src/Services/GitManager.vala b/src/Services/GitManager.vala
index 99a28b72e4..9bd8f4a195 100644
--- a/src/Services/GitManager.vala
+++ b/src/Services/GitManager.vala
@@ -45,15 +45,15 @@ namespace Scratch.Services {
         }
 
         public MonitoredRepository? add_project (FolderManager.ProjectFolderItem root_folder) {
-            project_liststore.insert_sorted (root_folder, (CompareDataFunc<GLib.Object>) project_sort_func);
-
             var root_path = root_folder.file.file.get_path ();
             try {
                 var git_repo = Ggit.Repository.open (root_folder.file.file);
+                // Only add projects that are not already in open in sidebar
                 if (project_gitrepo_map.has_key (root_path)) {
                     return project_gitrepo_map.@get (root_path);
                 }
 
+                project_liststore.insert_sorted (root_folder, (CompareDataFunc<GLib.Object>) project_sort_func);
                 var monitored_repo = new MonitoredRepository (git_repo);
                 project_gitrepo_map.@set (root_path, monitored_repo);
                 return project_gitrepo_map.@get (root_path);
diff --git a/src/Services/MonitoredRepository.vala b/src/Services/MonitoredRepository.vala
index 0bf8d8c451..3f64823321 100644
--- a/src/Services/MonitoredRepository.vala
+++ b/src/Services/MonitoredRepository.vala
@@ -280,7 +280,9 @@ namespace Scratch.Services {
             int prev_additions = 0;
             try {
                 var repo_diff_list = new Ggit.Diff.index_to_workdir (git_repo, null, null);
-                repo_diff_list.foreach (null, null, null,
+                // To avoid error under Flatpak, need to provide all the callbacks even though nulls are accepted
+                // when running natively.
+                repo_diff_list.foreach (() => {return 0;}, () => {return 0;}, () => {return 0;},
                     (delta, hunk, line) => {
                         unowned var file_diff = delta.get_old_file ();
                         if (file_diff == null) {
@@ -349,5 +351,40 @@ namespace Scratch.Services {
                 }
             }
         }
+
+        public string get_project_diff () throws GLib.Error {
+            var sb = new StringBuilder ("");
+            var repo_diff_list = new Ggit.Diff.index_to_workdir (git_repo, null, null);
+            repo_diff_list.print (Ggit.DiffFormatType.PATCH, (delta, hunk, line) => {
+
+                unowned var file_diff = delta.get_old_file ();
+                if (file_diff == null) {
+                    return 0;
+                }
+
+                if (line != null) {
+                    var delta_type = line.get_origin ();
+                    string prefix = "?";
+                    switch (delta_type) {
+                        case Ggit.DiffLineType.ADDITION:
+                            prefix = "+";
+                            break;
+                        case Ggit.DiffLineType.DELETION:
+                            prefix = "-";
+                            break;
+                        case Ggit.DiffLineType.CONTEXT:
+                            prefix = " ";
+                            break;
+                        default:
+                            break;
+                    }
+                    //TODO Add color according to linetype
+                    sb.append (prefix + line.get_text ());
+                }
+                return 0;
+            });
+
+            return sb.str;
+        }
     }
 }
diff --git a/src/Services/PluginManager.vala b/src/Services/PluginManager.vala
index c8036d5db5..df7c2859bf 100644
--- a/src/Services/PluginManager.vala
+++ b/src/Services/PluginManager.vala
@@ -1,7 +1,7 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /***
   BEGIN LICENSE
-  
+
   Copyright (C) 2013 Mario Guerriero <mario@elementaryos.org>
   This program is free software: you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License version 3, as published
@@ -51,8 +51,8 @@ namespace Scratch.Services {
         }
     }
 
-
     public class PluginsManager : GLib.Object {
+        private const string[] BLACKLISTED = {"strip-trailing-save"};
         Peas.Engine engine;
         Peas.ExtensionSet exts;
         Peas.Engine engine_core;
@@ -86,6 +86,26 @@ namespace Scratch.Services {
             engine = Peas.Engine.get_default ();
             engine.enable_loader ("python");
             engine.add_search_path (Constants.PLUGINDIR, null);
+
+            var core_list = engine.get_plugin_list ().copy ();
+            string[] core_plugins = new string[core_list.length ()];
+            for (int i = 0; i < core_list.length (); i++) {
+                unowned var mod_name = core_list.nth_data (i).get_module_name ();
+                bool load = true;
+                foreach (string black_listed in BLACKLISTED) {
+                    if (mod_name.has_prefix (black_listed)) {
+                        warning ("Ignoring blacklisted %s", mod_name);
+                        load = false;
+                    }
+                }
+
+                if (load) {
+                    core_plugins[i] = mod_name;
+                }
+
+            }
+
+            engine.loaded_plugins = core_plugins;
             Scratch.settings.bind ("plugins-enabled", engine, "loaded-plugins", SettingsBindFlags.DEFAULT);
 
             /* Our extension set */
@@ -95,31 +115,13 @@ namespace Scratch.Services {
                 ((Peas.Activatable)ext).activate ();
                 extension_added (info);
             });
+
             exts.extension_removed.connect ((info, ext) => {
                 ((Peas.Activatable)ext).deactivate ();
                 extension_removed (info);
             });
-            exts.foreach (on_extension_foreach);
-
-            if (set_name != null) {
-                /* The core now */
-                engine_core = new Peas.Engine ();
-                engine_core.enable_loader ("python");
-                engine_core.add_search_path (Constants.PLUGINDIR + "/" + set_name + "/", null);
 
-                var core_list = engine_core.get_plugin_list ().copy ();
-                string[] core_plugins = new string[core_list.length ()];
-                for (int i = 0; i < core_list.length (); i++) {
-                    core_plugins[i] = core_list.nth_data (i).get_module_name ();
-
-                }
-                engine_core.loaded_plugins = core_plugins;
-
-                /* Our extension set */
-                exts_core = new Peas.ExtensionSet (engine_core, typeof (Peas.Activatable), "object", plugin_iface, null);
-
-                exts_core.foreach (on_extension_foreach);
-            }
+            exts.foreach (on_extension_foreach);
 
             // Connect managers signals to interface's signals
             this.hook_window.connect ((w) => {
diff --git a/src/Utils.vala b/src/Utils.vala
index f96356af5f..3d39d6cef3 100644
--- a/src/Utils.vala
+++ b/src/Utils.vala
@@ -143,6 +143,118 @@ namespace Scratch.Utils {
         }
     }
 
+    // determine how many characters precede a given iterator position
+    public int measure_indent_at_iter (Widgets.SourceView view, Gtk.TextIter iter) {
+        Gtk.TextIter line_begin, pos;
+
+        view.buffer.get_iter_at_line (out line_begin, iter.get_line ());
+
+        pos = line_begin;
+        int indent = 0;
+        int tabwidth = Scratch.settings.get_int ("indent-width");
+
+        unichar ch = pos.get_char ();
+        while (pos.get_offset () < iter.get_offset () && ch != '\n' && ch.isspace ()) {
+            if (ch == '\t') {
+                indent += tabwidth;
+            } else {
+                ++indent;
+            }
+
+            pos.forward_char ();
+            ch = pos.get_char ();
+        }
+        return indent;
+    }
+
+    public void increase_indent_in_region (
+        Widgets.SourceView view,
+        Gtk.TextIter region_begin,
+        Gtk.TextIter region_end,
+        int nchars
+    ) {
+        int first_line = region_begin.get_line ();
+        int last_line = region_end.get_line ();
+        int buf_last_line = view.buffer.get_line_count () - 1;
+
+        int nlines = (first_line - last_line).abs () + 1;
+        if (nlines < 1 || nchars < 1 || last_line < first_line || !view.editable
+            || first_line == buf_last_line
+        ) {
+            return;
+        }
+
+        // add a string of whitespace to each line after the first pasted line
+        string indent_str;
+
+        if (view.insert_spaces_instead_of_tabs) {
+            indent_str = string.nfill (nchars, ' ');
+        } else {
+            int tabwidth = Scratch.settings.get_int ("indent-width");
+            int tabs = nchars / tabwidth;
+            int spaces = nchars % tabwidth;
+
+            indent_str = string.nfill (tabs, '\t');
+            if (spaces > 0) {
+                indent_str += string.nfill (spaces, ' ');
+            }
+        }
+
+        Gtk.TextIter itr;
+        for (var i = first_line; i <= last_line; ++i) {
+            view.buffer.get_iter_at_line (out itr, i);
+            view.buffer.insert (ref itr, indent_str, indent_str.length);
+        }
+    }
+
+    public void decrease_indent_in_region (
+        Widgets.SourceView view,
+        Gtk.TextIter region_begin,
+        Gtk.TextIter region_end,
+        int nchars
+    ) {
+        int first_line = region_begin.get_line ();
+        int last_line = region_end.get_line ();
+
+        int nlines = (first_line - last_line).abs () + 1;
+        if (nlines < 1 || nchars < 1 || last_line < first_line || !view.editable) {
+            return;
+        }
+
+        Gtk.TextBuffer buffer = view.buffer;
+        int tabwidth = Scratch.settings.get_int ("indent-width");
+        Gtk.TextIter del_begin, del_end, itr;
+
+        for (var line = first_line; line <= last_line; ++line) {
+            buffer.get_iter_at_line (out itr, line);
+            // crawl along the line and tally indentation as we go,
+            // when requested number of chars is hit, or if we run out of whitespace (eg. find glyphs or newline),
+            // delete the segment from line start to where we are now
+            int chars_to_delete = 0;
+            int indent_chars_found = 0;
+            unichar ch = itr.get_char ();
+            while (ch != '\n' && !ch.isgraph () && indent_chars_found < nchars) {
+                if (ch == ' ') {
+                    ++chars_to_delete;
+                    ++indent_chars_found;
+                } else if (ch == '\t') {
+                    ++chars_to_delete;
+                    indent_chars_found += tabwidth;
+                }
+                itr.forward_char ();
+                ch = itr.get_char ();
+            }
+
+            if (ch == '\n' || chars_to_delete < 1) {
+                continue;
+            }
+
+            buffer.get_iter_at_line (out del_begin, line);
+            buffer.get_iter_at_line_offset (out del_end, line, chars_to_delete);
+            buffer.delete (ref del_begin, ref del_end);
+        }
+    }
+
     public bool find_unique_path (File f1, File f2, out string? path1, out string? path2) {
         if (f1.equal (f2)) {
             path1 = null;
diff --git a/src/Widgets/ChooseProjectButton.vala b/src/Widgets/ChooseProjectButton.vala
index 378aaa0a0f..62dfe3ee90 100644
--- a/src/Widgets/ChooseProjectButton.vala
+++ b/src/Widgets/ChooseProjectButton.vala
@@ -22,6 +22,8 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {
     private Gtk.ListBox project_listbox;
     private ProjectRow? last_entry = null;
 
+    public signal void project_chosen ();
+
     construct {
         var img = new Gtk.Image () {
             gicon = new ThemedIcon ("git-symbolic"),
@@ -105,6 +107,7 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {
         project_listbox.row_activated.connect ((row) => {
             var project_entry = ((ProjectRow) row);
             select_project (project_entry);
+            project_chosen ();
         });
     }
 
diff --git a/src/Widgets/DocumentView.vala b/src/Widgets/DocumentView.vala
index bc08f09528..75dd11be3f 100644
--- a/src/Widgets/DocumentView.vala
+++ b/src/Widgets/DocumentView.vala
@@ -38,6 +38,9 @@ public class Scratch.Widgets.DocumentView : Granite.Widgets.DynamicNotebook {
     public bool is_closing = false;
 
     private Gtk.CssProvider style_provider;
+    private Queue<Services.Document> previous_docs;
+    private Queue<Services.Document> next_docs;
+    private bool current_doc_edited = false;
 
     public DocumentView (MainWindow window) {
         base ();
@@ -52,7 +55,8 @@ public class Scratch.Widgets.DocumentView : Granite.Widgets.DynamicNotebook {
 
     construct {
         docs = new GLib.List<Services.Document> ();
-
+        previous_docs = new Queue<Services.Document> ();
+        next_docs = new Queue<Services.Document> ();
         // Layout
         tab_added.connect (on_doc_added);
         tab_removed.connect (on_doc_removed);
@@ -73,6 +77,28 @@ public class Scratch.Widgets.DocumentView : Granite.Widgets.DynamicNotebook {
         });
 
         tab_switched.connect ((old_tab, new_tab) => {
+            if (new_tab == previous_docs.peek_head ()) { // Only track history of edited docs
+                if (old_tab != null && current_doc_edited) {
+                    next_docs.push_head ((Services.Document)old_tab);
+                }
+
+                previous_docs.pop_head ();
+                current_doc_edited = true;
+            } else if (new_tab == next_docs.peek_head ()) {
+                if (old_tab != null && current_doc_edited) {
+                    previous_docs.push_head ((Services.Document)old_tab);
+                }
+
+                next_docs.pop_head ();
+                current_doc_edited = true;
+            } else {
+                if (old_tab != null && current_doc_edited) {
+                    previous_docs.push_head ((Services.Document)old_tab);
+                }
+                next_docs.clear ();
+                current_doc_edited = false;
+            }
+
             /* The 'document_change' signal is emitted when the document is focused. We do not need to emit it here */
             save_focused_document_uri (new_tab as Services.Document);
         });
@@ -140,12 +166,13 @@ public class Scratch.Widgets.DocumentView : Granite.Widgets.DynamicNotebook {
         return unsaved_file_path_builder (extension);
     }
 
-    public void new_document () {
+    public Services.Document? new_document () {
+        Services.Document? doc = null;
         var file = File.new_for_path (unsaved_file_path_builder ());
         try {
             file.create (FileCreateFlags.PRIVATE);
 
-            var doc = new Services.Document (window.actions, file);
+            doc = new Services.Document (window.actions, file);
 
             insert_tab (doc, -1);
             current_document = doc;
@@ -155,6 +182,8 @@ public class Scratch.Widgets.DocumentView : Granite.Widgets.DynamicNotebook {
         } catch (Error e) {
             critical (e.message);
         }
+
+        return doc;
     }
 
     public void new_document_from_clipboard (string clipboard) {
@@ -195,6 +224,7 @@ public class Scratch.Widgets.DocumentView : Granite.Widgets.DynamicNotebook {
         }
 
         insert_tab (doc, -1);
+
         if (focus) {
             current_document = doc;
         }
@@ -312,18 +342,46 @@ public class Scratch.Widgets.DocumentView : Granite.Widgets.DynamicNotebook {
         doc.actions = window.actions;
 
         docs.append (doc);
+        Scratch.Services.DocumentManager.get_instance ().add_open_document (doc);
+
         if (!doc.is_file_temporary) {
             rename_tabs_with_same_title (doc);
         }
 
         doc.source_view.focus_in_event.connect_after (on_focus_in_event);
         doc.source_view.drag_data_received.connect (drag_received);
+        doc.doc_changed.connect_after (() => {
+            if (!doc.working && doc.loaded) { // Ignore changes generated during loading/restoring file
+                current_doc_edited = true;
+            }
+        });
+    }
+
+    private void remove_from_history (Services.Document doc) {
+        previous_docs.remove_all (doc);
+        next_docs.remove_all (doc);
+    }
+
+    public void goto_previous_doc () {
+        if (!previous_docs.is_empty ()) {
+            current_document = previous_docs.peek_head ();
+            current_document.focus ();
+        }
+    }
+
+    public void goto_next_doc () {
+        if (!next_docs.is_empty ()) {
+            current_document = next_docs.peek_head ();
+            current_document.focus ();
+        }
     }
 
     private void on_doc_removed (Granite.Widgets.Tab tab) {
         var doc = tab as Services.Document;
-
+        remove_from_history (doc);
         docs.remove (doc);
+        Scratch.Services.DocumentManager.get_instance ().remove_open_document (doc);
+
         doc.source_view.focus_in_event.disconnect (on_focus_in_event);
         doc.source_view.drag_data_received.disconnect (drag_received);
 
diff --git a/src/Widgets/FormatBar.vala b/src/Widgets/FormatBar.vala
index 8aad085e24..b713748443 100644
--- a/src/Widgets/FormatBar.vala
+++ b/src/Widgets/FormatBar.vala
@@ -173,23 +173,24 @@ public class Code.FormatBar : Gtk.Grid {
         tab_popover.add (tab_grid);
 
         tab_toggle.bind_property ("active", tab_popover, "visible", GLib.BindingFlags.BIDIRECTIONAL);
-        Scratch.settings.changed["indent-width"].connect (() => format_tab_header ());
-        Scratch.settings.changed["spaces-instead-of-tabs"].connect (() => format_tab_header ());
+        Scratch.settings.changed["indent-width"].connect (format_tab_header);
+        Scratch.settings.changed["spaces-instead-of-tabs"].connect (format_tab_header);
     }
 
     private void format_tab_header () {
         var indent_width = Scratch.settings.get_int ("indent-width");
         var spaces_instead_of_tabs = Scratch.settings.get_boolean ("spaces-instead-of-tabs");
-        if (doc != null) {
-            indent_width = (int)doc.source_view.tab_width;
-            spaces_instead_of_tabs = doc.source_view.insert_spaces_instead_of_tabs;
-        }
 
         if (spaces_instead_of_tabs) {
             tab_toggle.text = ngettext ("%d Space", "%d Spaces", indent_width).printf (indent_width);
         } else {
             tab_toggle.text = ngettext ("%d Tab", "%d Tabs", indent_width).printf (indent_width);
         }
+
+        if (doc != null) {
+            doc.source_view.tab_width = (uint)indent_width;
+            doc.source_view.insert_spaces_instead_of_tabs = spaces_instead_of_tabs;
+        }
     }
 
     private void format_line_header () {
diff --git a/src/Widgets/HeaderBar.vala b/src/Widgets/HeaderBar.vala
index 2ca4efef59..c9940c5732 100644
--- a/src/Widgets/HeaderBar.vala
+++ b/src/Widgets/HeaderBar.vala
@@ -31,8 +31,8 @@ namespace Scratch.Widgets {
         public Gtk.Revealer choose_project_revealer;
 
         private const string STYLE_SCHEME_HIGH_CONTRAST = "classic";
-        private const string STYLE_SCHEME_LIGHT = "solarized-light";
-        private const string STYLE_SCHEME_DARK = "solarized-dark";
+        private const string STYLE_SCHEME_LIGHT = "elementary-light";
+        private const string STYLE_SCHEME_DARK = "elementary-dark";
 
         public HeaderBar () {
             Object (
diff --git a/src/Widgets/SearchBar.vala b/src/Widgets/SearchBar.vala
index 253ca8f197..14c843162b 100644
--- a/src/Widgets/SearchBar.vala
+++ b/src/Widgets/SearchBar.vala
@@ -42,6 +42,8 @@ namespace Scratch.Widgets {
         private Gtk.Button replace_tool_button;
         private Gtk.Button replace_all_tool_button;
 
+        private Gtk.Button global_search_button;
+
         private Scratch.Widgets.SourceView? text_view = null;
         private Gtk.TextBuffer? text_buffer = null;
         private Gtk.SourceSearchContext search_context = null;
@@ -113,6 +115,18 @@ namespace Scratch.Widgets {
             );
             case_sensitive_button.clicked.connect (on_search_entry_text_changed);
 
+            global_search_button = new Gtk.Button.from_icon_name ("gnome-globe") {
+                can_focus = false,
+                tooltip_markup = Granite.markup_accel_tooltip ({"<Control><Shift>F"}, "Global Search"),
+                action_name = "win.action_find_global",
+                action_target = new Variant.string ("") // Search in current active project
+            };
+
+            global_search_button.button_press_event.connect (() => {
+                search_entry.grab_focus ();
+                return false;
+            });
+
             var search_grid = new Gtk.Grid ();
             search_grid.margin = 3;
             search_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED);
@@ -122,6 +136,7 @@ namespace Scratch.Widgets {
             search_grid.add (tool_arrow_up);
             search_grid.add (tool_cycle_search);
             search_grid.add (case_sensitive_button);
+            search_grid.add (global_search_button);
 
             var search_flow_box_child = new Gtk.FlowBoxChild ();
             search_flow_box_child.can_focus = false;
@@ -253,10 +268,6 @@ namespace Scratch.Widgets {
             this.window.get_current_document ().toggle_changed_handlers (true);
         }
 
-        public void set_search_string (string to_search) {
-            search_entry.text = to_search;
-        }
-
         private void on_search_entry_text_changed () {
             var search_string = search_entry.text;
             search_context.settings.search_text = search_string;
diff --git a/src/Widgets/SourceView.vala b/src/Widgets/SourceView.vala
index fa361ef52f..eaee4c114b 100644
--- a/src/Widgets/SourceView.vala
+++ b/src/Widgets/SourceView.vala
@@ -36,7 +36,10 @@ namespace Scratch.Widgets {
         private Gtk.TextIter last_select_start_iter;
         private Gtk.TextIter last_select_end_iter;
         private SourceGutterRenderer git_diff_gutter_renderer;
-
+        private Queue<Gtk.TextMark> previous_marks;
+        private Queue<Gtk.TextMark> next_marks;
+        private Gtk.TextMark? current_edit_point = null;
+        private int last_edit_point_line = 0;
         private const uint THROTTLE_MS = 400;
 
         public signal void style_changed (Gtk.SourceStyleScheme style);
@@ -79,6 +82,8 @@ namespace Scratch.Widgets {
         }
 
         construct {
+            previous_marks = new Queue<Gtk.TextMark> ();
+            next_marks = new Queue<Gtk.TextMark> ();
             // Make the gutter renderer and insert into the left side of the source view.
             git_diff_gutter_renderer = new SourceGutterRenderer ();
             get_gutter (Gtk.TextWindowType.LEFT).insert (git_diff_gutter_renderer, 1);
@@ -195,6 +200,26 @@ namespace Scratch.Widgets {
                     });
                 }
             });
+
+            button_release_event.connect (() => {
+                Gtk.TextIter? iter = null;
+                buffer.get_iter_at_offset (out iter, buffer.cursor_position);
+                var line = iter.get_line ();
+                if ((line - last_edit_point_line).abs () > 10) {
+                    last_edit_point_line = line;
+                    if (current_edit_point != null) {
+                        previous_marks.push_head (current_edit_point);
+                    }
+
+                    current_edit_point = new Gtk.TextMark (null);
+                    buffer.add_mark (current_edit_point, iter);
+                    var mark = next_marks.pop_head ();
+                    while (mark != null) {
+                        buffer.delete_mark (mark);
+                        mark = next_marks.pop_head ();
+                    }
+                }
+            });
         }
 
         private bool get_current_line (out Gtk.TextIter start, out Gtk.TextIter end) {
@@ -207,11 +232,6 @@ namespace Scratch.Widgets {
             return !start.equal (end);
         }
 
-        ~SourceView () {
-            // Update settings when an instance is deleted
-            update_settings ();
-        }
-
         public void change_syntax_highlight_from_file (File file) {
             try {
                 var info = file.query_info ("standard::*", FileQueryInfoFlags.NONE, null);
@@ -220,7 +240,7 @@ namespace Scratch.Widgets {
                 );
                 language = manager.guess_language (file.get_path (), mime_type);
             } catch (Error e) {
-                critical (e.message);
+                critical ("SourceView: Error getting language %s", e.message);
             }
 
             // Fake file type detection
@@ -298,18 +318,6 @@ namespace Scratch.Widgets {
             style_changed (source_buffer.style_scheme);
         }
 
-        private void update_settings () {
-            var source_buffer = (Gtk.SourceBuffer) buffer;
-            Scratch.settings.set_boolean ("show-right-margin", show_right_margin);
-            Scratch.settings.set_int ("right-margin-position", (int) right_margin_position);
-            Scratch.settings.set_boolean ("highlight-matching-brackets", source_buffer.highlight_matching_brackets);
-            Scratch.settings.set_boolean ("spaces-instead-of-tabs", insert_spaces_instead_of_tabs);
-            Scratch.settings.set_int ("indent-width", (int) tab_width);
-            Scratch.settings.set_string ("font", font);
-            Scratch.settings.set_string ("style-scheme", source_buffer.style_scheme.id);
-            style_changed (source_buffer.style_scheme);
-        }
-
         public void go_to_line (int line, int offset = 0) {
             Gtk.TextIter it;
             buffer.get_iter_at_line (out it, line - 1);
@@ -344,7 +352,7 @@ namespace Scratch.Widgets {
 
         // If selected text does not exists duplicate current line.
         // If selected text is only in one line duplicate in place.
-        // If seected text covers more than one line, duplicate all lines complete.
+        // If selected text covers more than one line, duplicate all lines complete.
         public void duplicate_selection () {
             Gtk.TextIter? start = null;
             Gtk.TextIter? end = null;
@@ -357,7 +365,6 @@ namespace Scratch.Widgets {
                 buffer.get_selection_bounds (out start, out end);
                 start_line = start.get_line ();
                 end_line = end.get_line ();
-
                 if (start_line != end_line) {
                     buffer.get_iter_at_line (out start, start_line);
                     buffer.get_iter_at_line (out end, end_line);
@@ -370,10 +377,13 @@ namespace Scratch.Widgets {
                 selection_end_offset = end.get_offset ();
             } else {
                 buffer.get_iter_at_mark (out start, buffer.get_insert ());
-                start.backward_line (); //To start of previous line
-                start.forward_line (); //To start of original line
+                start.backward_chars (start.get_line_offset ());
                 end = start.copy ();
-                end.forward_to_line_end ();
+                end.forward_chars (end.get_chars_in_line ());
+                if (end.get_line () != start.get_line ()) { // Line lacked final return character
+                    end.backward_char ();
+                }
+
                 selection = "\n" + buffer.get_text (start, end, true);
             }
 
@@ -487,6 +497,40 @@ namespace Scratch.Widgets {
             return buffer.text;
         }
 
+        public void goto_previous_mark () {
+            var mark = previous_marks.pop_head ();
+            if (mark != null) {
+                if (current_edit_point != null) {
+                    next_marks.push_head (current_edit_point);
+                }
+
+                current_edit_point = mark;
+                Gtk.TextIter? iter = null;
+                buffer.get_iter_at_mark (out iter, current_edit_point);
+                if (iter != null) {
+                    // buffer.delete_mark (mark);
+                    cursor_position = iter.get_offset ();
+                }
+            }
+        }
+
+        public void goto_next_mark () {
+            var mark = next_marks.pop_head ();
+            if (mark != null) {
+                if (current_edit_point != null) {
+                    previous_marks.push_head (current_edit_point);
+                }
+
+                current_edit_point = mark;
+                Gtk.TextIter? iter = null;
+                buffer.get_iter_at_mark (out iter, current_edit_point);
+                if (iter != null) {
+                    cursor_position = iter.get_offset ();
+                    // buffer.add_mark (mark, iter);
+                }
+            }
+        }
+
         private void update_draw_spaces () {
             Gtk.TextIter doc_start, doc_end;
             buffer.get_start_iter (out doc_start);
@@ -516,6 +560,28 @@ namespace Scratch.Widgets {
 
             menu.add (sort_item);
 
+            var previous_edit_item = new Gtk.MenuItem () {
+                sensitive = previous_marks.length > 0,
+                action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_PREVIOUS_MARK
+            };
+            previous_edit_item.add (new Granite.AccelLabel.from_action_name (
+                _("Goto Previous Edit"),
+                previous_edit_item.action_name
+
+            ));
+            menu.add (previous_edit_item);
+
+            var next_edit_item = new Gtk.MenuItem () {
+                sensitive = next_marks.length > 0,
+                action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_NEXT_MARK
+            };
+            next_edit_item.add (new Granite.AccelLabel.from_action_name (
+                _("Goto Next Edit"),
+                next_edit_item.action_name
+
+            ));
+            menu.add (next_edit_item);
+
             if (buffer is Gtk.SourceBuffer) {
                 var can_comment = CommentToggler.language_has_comments (((Gtk.SourceBuffer) buffer).get_language ());
 
diff --git a/src/meson.build b/src/meson.build
index 8404a86ebb..a3075d043d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -29,6 +29,7 @@ code_files = files(
     'FolderManager/ProjectFolderItem.vala',
     'Services/CommentToggler.vala',
     'Services/Document.vala',
+    'Services/DocumentManager.vala',
     'Services/FileHandler.vala',
     'Services/GitManager.vala',
     'Services/MonitoredRepository.vala',