diff --git a/Assets.xcassets/ActivateImage.imageset/Activate Dark.png b/Assets.xcassets/ActivateImage.imageset/Activate Dark.png
index 0866d28..280d7d6 100644
Binary files a/Assets.xcassets/ActivateImage.imageset/Activate Dark.png and b/Assets.xcassets/ActivateImage.imageset/Activate Dark.png differ
diff --git a/Assets.xcassets/ActivatedFile.imageset/Activated Dark.png b/Assets.xcassets/ActivatedFile.imageset/Activated Dark.png
new file mode 100644
index 0000000..fa86f48
Binary files /dev/null and b/Assets.xcassets/ActivatedFile.imageset/Activated Dark.png differ
diff --git a/Assets.xcassets/ActivatedFile.imageset/Activated Dark@2x.png b/Assets.xcassets/ActivatedFile.imageset/Activated Dark@2x.png
new file mode 100644
index 0000000..ee67a4a
Binary files /dev/null and b/Assets.xcassets/ActivatedFile.imageset/Activated Dark@2x.png differ
diff --git a/Assets.xcassets/ActivatedFile.imageset/Activated.png b/Assets.xcassets/ActivatedFile.imageset/Activated.png
new file mode 100644
index 0000000..07d991f
Binary files /dev/null and b/Assets.xcassets/ActivatedFile.imageset/Activated.png differ
diff --git a/Assets.xcassets/ActivatedFile.imageset/Activated@2x.png b/Assets.xcassets/ActivatedFile.imageset/Activated@2x.png
new file mode 100644
index 0000000..b648641
Binary files /dev/null and b/Assets.xcassets/ActivatedFile.imageset/Activated@2x.png differ
diff --git a/Assets.xcassets/ActivatedFile.imageset/Contents.json b/Assets.xcassets/ActivatedFile.imageset/Contents.json
new file mode 100644
index 0000000..fe8092f
--- /dev/null
+++ b/Assets.xcassets/ActivatedFile.imageset/Contents.json
@@ -0,0 +1,57 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Activated.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Activated Dark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Activated@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Activated Dark@2x.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}
\ No newline at end of file
diff --git a/Assets.xcassets/CreateImage.imageset/Contents.json b/Assets.xcassets/CreateImage.imageset/Contents.json
new file mode 100644
index 0000000..3d360f9
--- /dev/null
+++ b/Assets.xcassets/CreateImage.imageset/Contents.json
@@ -0,0 +1,57 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Create.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Create Dark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Create@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Create Dark@2x.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}
\ No newline at end of file
diff --git a/Assets.xcassets/CreateImage.imageset/Create Dark.png b/Assets.xcassets/CreateImage.imageset/Create Dark.png
new file mode 100644
index 0000000..cf85ff7
Binary files /dev/null and b/Assets.xcassets/CreateImage.imageset/Create Dark.png differ
diff --git a/Assets.xcassets/CreateImage.imageset/Create Dark@2x.png b/Assets.xcassets/CreateImage.imageset/Create Dark@2x.png
new file mode 100644
index 0000000..a2d194b
Binary files /dev/null and b/Assets.xcassets/CreateImage.imageset/Create Dark@2x.png differ
diff --git a/Assets.xcassets/CreateImage.imageset/Create.png b/Assets.xcassets/CreateImage.imageset/Create.png
new file mode 100644
index 0000000..8397d5e
Binary files /dev/null and b/Assets.xcassets/CreateImage.imageset/Create.png differ
diff --git a/Assets.xcassets/CreateImage.imageset/Create@2x.png b/Assets.xcassets/CreateImage.imageset/Create@2x.png
new file mode 100644
index 0000000..724c2e2
Binary files /dev/null and b/Assets.xcassets/CreateImage.imageset/Create@2x.png differ
diff --git a/Assets.xcassets/SaveImage.imageset/Contents.json b/Assets.xcassets/SaveImage.imageset/Contents.json
new file mode 100644
index 0000000..7eb9ee3
--- /dev/null
+++ b/Assets.xcassets/SaveImage.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Save.png"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Save Dark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/Assets.xcassets/SaveImage.imageset/Save Dark.png b/Assets.xcassets/SaveImage.imageset/Save Dark.png
new file mode 100644
index 0000000..b42ab81
Binary files /dev/null and b/Assets.xcassets/SaveImage.imageset/Save Dark.png differ
diff --git a/Assets.xcassets/SaveImage.imageset/Save.png b/Assets.xcassets/SaveImage.imageset/Save.png
new file mode 100644
index 0000000..3533202
Binary files /dev/null and b/Assets.xcassets/SaveImage.imageset/Save.png differ
diff --git a/Editor.xib b/Editor.xib
index 724fcb6..34afbde 100644
--- a/Editor.xib
+++ b/Editor.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,17 +17,17 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="328" y="134" width="619" height="479"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1600" height="1178"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1792" height="1097"/>
             <value key="minSize" type="size" width="400" height="400"/>
             <view key="contentView" id="2">
                 <rect key="frame" x="0.0" y="0.0" width="619" height="479"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" id="35">
+                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="35">
                         <rect key="frame" x="-3" y="3" width="625" height="14"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="0 files" id="36">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="message" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -39,27 +39,27 @@
                             </binding>
                         </connections>
                     </textField>
-                    <splitView focusRingType="none" autosaveName="SplitViewSize" dividerStyle="thin" vertical="YES" id="61">
+                    <splitView focusRingType="none" fixedFrame="YES" autosaveName="SplitViewSize" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="61">
                         <rect key="frame" x="0.0" y="21" width="619" height="458"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="48">
+                            <scrollView focusRingType="none" fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="48">
                                 <rect key="frame" x="0.0" y="0.0" width="424" height="458"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
-                                <clipView key="contentView" id="Ooe-Fx-58w">
+                                <clipView key="contentView" ambiguous="YES" id="Ooe-Fx-58w">
                                     <rect key="frame" x="0.0" y="0.0" width="424" height="458"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="53" id="51" customClass="HostsListView">
+                                        <outlineView focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="53" id="51" customClass="HostsListView">
                                             <rect key="frame" x="0.0" y="0.0" width="424" height="458"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
                                                 <tableColumn identifier="NameColumn" width="421" minWidth="16" maxWidth="1000" id="53">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
-                                                        <font key="font" metaFont="smallSystem"/>
+                                                        <font key="font" metaFont="message" size="11"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
                                                     </tableHeaderCell>
@@ -90,18 +90,18 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                             </scrollView>
-                            <customView id="196">
+                            <customView fixedFrame="YES" id="196">
                                 <rect key="frame" x="425" y="0.0" width="194" height="458"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" id="197">
+                                    <scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="197">
                                         <rect key="frame" x="0.0" y="433" width="194" height="25"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                        <clipView key="contentView" id="bGa-9W-kRA">
+                                        <clipView key="contentView" ambiguous="YES" id="bGa-9W-kRA">
                                             <rect key="frame" x="0.0" y="0.0" width="194" height="25"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <predicateEditor verticalHuggingPriority="750" nestingMode="list" rowHeight="32" id="198">
+                                                <predicateEditor verticalHuggingPriority="750" ambiguous="YES" nestingMode="list" rowHeight="32" id="198">
                                                     <rect key="frame" x="0.0" y="0.0" width="194" height="32"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <rowTemplates>
@@ -177,14 +177,14 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                         </scroller>
                                     </scrollView>
-                                    <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="57">
+                                    <scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="57">
                                         <rect key="frame" x="0.0" y="0.0" width="194" height="433"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <clipView key="contentView" id="CgP-H2-BoD">
+                                        <clipView key="contentView" ambiguous="YES" id="CgP-H2-BoD">
                                             <rect key="frame" x="0.0" y="0.0" width="194" height="433"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" allowsUndo="YES" usesRuler="YES" smartInsertDelete="YES" id="60" customClass="HostsTextView">
+                                                <textView ambiguous="YES" importsGraphics="NO" richText="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" allowsUndo="YES" usesRuler="YES" smartInsertDelete="YES" id="60" customClass="HostsTextView">
                                                     <rect key="frame" x="0.0" y="0.0" width="194" height="433"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -228,11 +228,11 @@
                             <outlet property="delegate" destination="31" id="120"/>
                         </connections>
                     </splitView>
-                    <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="110">
+                    <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="110">
                         <rect key="frame" x="587" y="3" width="16" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                     </progressIndicator>
-                    <imageView id="146">
+                    <imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="146">
                         <rect key="frame" x="7" y="2" width="16" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <imageCell key="cell" controlSize="small" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Read Only" id="147"/>
@@ -247,7 +247,7 @@
                     <toolbarItem implicitItemIdentifier="FA447B91-2033-482B-B2AC-22D2E54C120D" label="Remove" paletteLabel="Remove" image="RemoveImage" id="20">
                         <nil key="toolTip"/>
                         <size key="minSize" width="35" height="25"/>
-                        <size key="maxSize" width="35" height="25"/>
+                        <size key="maxSize" width="36" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="21">
                             <rect key="frame" x="7" y="14" width="35" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -263,14 +263,14 @@
                         </connections>
                     </toolbarItem>
                     <toolbarItem implicitItemIdentifier="NSToolbarSeparatorItem" id="24"/>
-                    <toolbarItem implicitItemIdentifier="35C03423-493F-433D-A091-41FD795B7E29" label="Save" paletteLabel="Save" image="Save" id="25">
+                    <toolbarItem implicitItemIdentifier="35C03423-493F-433D-A091-41FD795B7E29" label="Save" paletteLabel="Save" image="SaveImage" id="25">
                         <nil key="toolTip"/>
                         <size key="minSize" width="35" height="25"/>
-                        <size key="maxSize" width="35" height="25"/>
+                        <size key="maxSize" width="36" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="26">
                             <rect key="frame" x="0.0" y="14" width="35" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <buttonCell key="cell" type="roundTextured" title="Create" bezelStyle="texturedRounded" image="Save" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="27">
+                            <buttonCell key="cell" type="roundTextured" title="Create" bezelStyle="texturedRounded" image="SaveImage" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="27">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                                 <string key="keyEquivalent">s</string>
@@ -289,7 +289,7 @@
                     <toolbarItem implicitItemIdentifier="DC8A19D6-1424-49DF-B7DB-CD4077AB727F" label="Activate" paletteLabel="Activate" image="ActivateImage" id="28">
                         <nil key="toolTip"/>
                         <size key="minSize" width="35" height="25"/>
-                        <size key="maxSize" width="35" height="25"/>
+                        <size key="maxSize" width="36" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="29">
                             <rect key="frame" x="8" y="14" width="35" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -322,9 +322,9 @@
                         <popUpButton key="view" verticalHuggingPriority="750" id="300">
                             <rect key="frame" x="0.0" y="14" width="52" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="Create" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" pullsDown="YES" selectedItem="303" id="301">
+                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="CreateImage" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" pullsDown="YES" selectedItem="303" id="301">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="menu"/>
+                                <font key="font" metaFont="system"/>
                                 <menu key="menu" title="OtherViews" id="302">
                                     <items>
                                         <menuItem state="on" image="Create" hidden="YES" id="303"/>
@@ -361,6 +361,7 @@
             <connections>
                 <outlet property="delegate" destination="31" id="121"/>
             </connections>
+            <point key="canvasLocation" x="140" y="124"/>
         </window>
         <customObject id="3" customClass="ListController">
             <connections>
@@ -408,13 +409,14 @@
                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
             </textFieldCell>
+            <point key="canvasLocation" x="139" y="452"/>
         </textField>
         <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="269">
             <rect key="frame" x="0.0" y="0.0" width="335" height="86"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <clipView key="contentView" id="Yis-pF-mer">
                 <rect key="frame" x="1" y="1" width="333" height="84"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <predicateEditor verticalHuggingPriority="750" nestingMode="compound" canRemoveAllRows="YES" rowHeight="32" id="270">
                         <rect key="frame" x="0.0" y="0.0" width="333" height="84"/>
@@ -503,13 +505,15 @@
                 <rect key="frame" x="278.20442551374435" y="1" width="15" height="78.598495364189148"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
+            <point key="canvasLocation" x="140" y="-295"/>
         </scrollView>
     </objects>
     <resources>
         <image name="ActivateImage" width="56" height="44"/>
         <image name="Create" width="15.5" height="16"/>
+        <image name="CreateImage" width="15.5" height="16"/>
         <image name="Read Only" width="16" height="16"/>
         <image name="RemoveImage" width="32" height="44"/>
-        <image name="Save" width="16" height="16"/>
+        <image name="SaveImage" width="16" height="16"/>
     </resources>
 </document>
diff --git a/Gas Mask.xcodeproj/project.pbxproj b/Gas Mask.xcodeproj/project.pbxproj
index 4da83bf..f5e514e 100644
--- a/Gas Mask.xcodeproj/project.pbxproj	
+++ b/Gas Mask.xcodeproj/project.pbxproj	
@@ -30,6 +30,13 @@
 		351D904510E76F7100CA6B5E /* Help in Resources */ = {isa = PBXBuildFile; fileRef = 351D904110E76F7100CA6B5E /* Help */; };
 		3522BEE0153316AA00035B90 /* ExtendedNSArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 3522BEDF153316AA00035B90 /* ExtendedNSArray.m */; };
 		3522BEE31533552200035B90 /* ExtendedNSPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3522BEE21533552200035B90 /* ExtendedNSPredicate.m */; };
+		35242BC9240A8C00001FF7AD /* Activated Dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 35242BC8240A8BFF001FF7AD /* Activated Dark@2x.png */; };
+		35242BCB240A8E7A001FF7AD /* Activated.png in Resources */ = {isa = PBXBuildFile; fileRef = 35242BCA240A8E7A001FF7AD /* Activated.png */; };
+		35242BCD240A8E84001FF7AD /* Activated Dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 35242BCC240A8E84001FF7AD /* Activated Dark.png */; };
+		35242BCF240A9179001FF7AD /* Activate Dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 35242BCE240A9178001FF7AD /* Activate Dark.png */; };
+		35242BD1240A9B91001FF7AD /* Save Dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 35242BD0240A9B91001FF7AD /* Save Dark.png */; };
+		35242BD4240A9CA0001FF7AD /* Create Dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 35242BD2240A9CA0001FF7AD /* Create Dark@2x.png */; };
+		35242BD5240A9CA0001FF7AD /* Create Dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 35242BD3240A9CA0001FF7AD /* Create Dark.png */; };
 		3528ECE910E3F87E003C8CB9 /* Syncing_arrows1.png in Resources */ = {isa = PBXBuildFile; fileRef = 3528ECE310E3F87E003C8CB9 /* Syncing_arrows1.png */; };
 		3528ECEA10E3F87E003C8CB9 /* Syncing_arrows2.png in Resources */ = {isa = PBXBuildFile; fileRef = 3528ECE410E3F87E003C8CB9 /* Syncing_arrows2.png */; };
 		3528ECEB10E3F87E003C8CB9 /* Syncing_arrows3.png in Resources */ = {isa = PBXBuildFile; fileRef = 3528ECE510E3F87E003C8CB9 /* Syncing_arrows3.png */; };
@@ -44,7 +51,6 @@
 		352E050E106283630071E25B /* EditorController.m in Sources */ = {isa = PBXBuildFile; fileRef = 352E050D106283630071E25B /* EditorController.m */; };
 		352E0556106288400071E25B /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 352E0555106288400071E25B /* Node.m */; };
 		352E059310628A2F0071E25B /* Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 352E059210628A2F0071E25B /* Cell.m */; };
-		352E05B610628D790071E25B /* Activated.png in Resources */ = {isa = PBXBuildFile; fileRef = 352E05B310628D790071E25B /* Activated.png */; };
 		352E05B710628D790071E25B /* Blue Dot.png in Resources */ = {isa = PBXBuildFile; fileRef = 352E05B410628D790071E25B /* Blue Dot.png */; };
 		352E05DA10628E400071E25B /* Local File.png in Resources */ = {isa = PBXBuildFile; fileRef = 352E05D910628E400071E25B /* Local File.png */; };
 		352F48D210DA90FE000003BE /* default.hst in Resources */ = {isa = PBXBuildFile; fileRef = 352F48D110DA90FE000003BE /* default.hst */; };
@@ -221,6 +227,13 @@
 		3522BEDF153316AA00035B90 /* ExtendedNSArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtendedNSArray.m; path = Source/ExtendedNSArray.m; sourceTree = "<group>"; };
 		3522BEE11533552200035B90 /* ExtendedNSPredicate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtendedNSPredicate.h; path = Source/ExtendedNSPredicate.h; sourceTree = "<group>"; };
 		3522BEE21533552200035B90 /* ExtendedNSPredicate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtendedNSPredicate.m; path = Source/ExtendedNSPredicate.m; sourceTree = "<group>"; };
+		35242BC8240A8BFF001FF7AD /* Activated Dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Activated Dark@2x.png"; path = "Resources/Images/Activated Dark@2x.png"; sourceTree = "<group>"; };
+		35242BCA240A8E7A001FF7AD /* Activated.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Activated.png; path = Resources/Images/Activated.png; sourceTree = "<group>"; };
+		35242BCC240A8E84001FF7AD /* Activated Dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Activated Dark.png"; path = "Resources/Images/Activated Dark.png"; sourceTree = "<group>"; };
+		35242BCE240A9178001FF7AD /* Activate Dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Activate Dark.png"; path = "Resources/Images/Activate Dark.png"; sourceTree = "<group>"; };
+		35242BD0240A9B91001FF7AD /* Save Dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Save Dark.png"; path = "Resources/Images/Save Dark.png"; sourceTree = "<group>"; };
+		35242BD2240A9CA0001FF7AD /* Create Dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Create Dark@2x.png"; path = "Resources/Images/Create Dark@2x.png"; sourceTree = "<group>"; };
+		35242BD3240A9CA0001FF7AD /* Create Dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Create Dark.png"; path = "Resources/Images/Create Dark.png"; sourceTree = "<group>"; };
 		3528ECE310E3F87E003C8CB9 /* Syncing_arrows1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Syncing_arrows1.png; path = Resources/Images/Syncing_arrows1.png; sourceTree = "<group>"; };
 		3528ECE410E3F87E003C8CB9 /* Syncing_arrows2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Syncing_arrows2.png; path = Resources/Images/Syncing_arrows2.png; sourceTree = "<group>"; };
 		3528ECE510E3F87E003C8CB9 /* Syncing_arrows3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Syncing_arrows3.png; path = Resources/Images/Syncing_arrows3.png; sourceTree = "<group>"; };
@@ -240,7 +253,6 @@
 		352E0555106288400071E25B /* Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Node.m; path = Source/Node.m; sourceTree = "<group>"; };
 		352E059110628A2F0071E25B /* Cell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Cell.h; path = Source/Cell.h; sourceTree = "<group>"; };
 		352E059210628A2F0071E25B /* Cell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Cell.m; path = Source/Cell.m; sourceTree = "<group>"; };
-		352E05B310628D790071E25B /* Activated.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Activated.png; path = Resources/Images/Activated.png; sourceTree = "<group>"; };
 		352E05B410628D790071E25B /* Blue Dot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Blue Dot.png"; path = "Resources/Images/Blue Dot.png"; sourceTree = "<group>"; };
 		352E05D910628E400071E25B /* Local File.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Local File.png"; path = "Resources/Images/Local File.png"; sourceTree = "<group>"; };
 		352F48D110DA90FE000003BE /* default.hst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = default.hst; path = Resources/default.hst; sourceTree = "<group>"; };
@@ -692,13 +704,19 @@
 				352E05D910628E400071E25B /* Local File.png */,
 				358E0A821A3A1C54004521D1 /* Local File yosemite.tiff */,
 				358E0A831A3A1C54004521D1 /* Local File yosemite@2x.tiff */,
-				352E05B310628D790071E25B /* Activated.png */,
+				35242BCE240A9178001FF7AD /* Activate Dark.png */,
+				35242BCA240A8E7A001FF7AD /* Activated.png */,
+				35B0499A1A462AE900EB89CA /* Activated@2x.png */,
+				35242BCC240A8E84001FF7AD /* Activated Dark.png */,
+				35242BC8240A8BFF001FF7AD /* Activated Dark@2x.png */,
 				352E05B410628D790071E25B /* Blue Dot.png */,
 				35B0499C1A462BC500EB89CA /* Blue Dot@2x.png */,
-				35B0499A1A462AE900EB89CA /* Activated@2x.png */,
 				352E04F9106281940071E25B /* Create.png */,
 				350C7F381A3C55B000B46B09 /* Create@2x.png */,
+				35242BD3240A9CA0001FF7AD /* Create Dark.png */,
+				35242BD2240A9CA0001FF7AD /* Create Dark@2x.png */,
 				352E04FB106281940071E25B /* Save.png */,
+				35242BD0240A9B91001FF7AD /* Save Dark.png */,
 				354E80A010AF33C100FC4757 /* applicationIcon.icns */,
 				35116A8410D6ABA000A5FAA1 /* menuIcon.tiff */,
 				35A183A71A0ACF37002D6289 /* menuIcon@2x.tiff */,
@@ -979,10 +997,10 @@
 				352E04FF106281940071E25B /* Save.png in Resources */,
 				358E0A891A3A1E1A004521D1 /* Remote yosemite@2x.tiff in Resources */,
 				35B049941A46234100EB89CA /* Remote.png in Resources */,
-				352E05B610628D790071E25B /* Activated.png in Resources */,
 				350C7F3B1A3C56BB00B46B09 /* Read Only@2x.png in Resources */,
 				352E05B710628D790071E25B /* Blue Dot.png in Resources */,
 				352E05DA10628E400071E25B /* Local File.png in Resources */,
+				35242BCB240A8E7A001FF7AD /* Activated.png in Resources */,
 				350C7F391A3C55B000B46B09 /* Create@2x.png in Resources */,
 				354E80A110AF33C100FC4757 /* applicationIcon.icns in Resources */,
 				353A80FC10B020B10005CAD1 /* UserDefaults.plist in Resources */,
@@ -1001,6 +1019,7 @@
 				3528ECEC10E3F87E003C8CB9 /* Syncing_arrows4.png in Resources */,
 				3528ECED10E3F87E003C8CB9 /* Syncing_arrows5.png in Resources */,
 				3528ECEE10E3F87E003C8CB9 /* Syncing_arrows6.png in Resources */,
+				35242BC9240A8C00001FF7AD /* Activated Dark@2x.png in Resources */,
 				35A183A81A0ACF37002D6289 /* menuIcon@2x.tiff in Resources */,
 				35B0499B1A462AE900EB89CA /* Activated@2x.png in Resources */,
 				356218B510E52CD600772473 /* Growl Registration Ticket.growlRegDict in Resources */,
@@ -1012,13 +1031,18 @@
 				356712D51132F80600DF30E0 /* URLSheet.xib in Resources */,
 				35730FDD1134291300066B68 /* Remote old.png in Resources */,
 				35730FE911342C6E00066B68 /* Remote_disabled.png in Resources */,
+				35242BCD240A8E84001FF7AD /* Activated Dark.png in Resources */,
+				35242BD4240A9CA0001FF7AD /* Create Dark@2x.png in Resources */,
 				3530F7EB1135536100E591BA /* Warning.png in Resources */,
 				3530F93D113598A800E591BA /* Alert_rollover.png in Resources */,
 				3530F93E113598A800E591BA /* Alert.png in Resources */,
 				3513A600113908A900AD789D /* Read Only.png in Resources */,
+				35242BCF240A9179001FF7AD /* Activate Dark.png in Resources */,
 				35E900B91147FC5D00851A25 /* InfoBubbleView.xib in Resources */,
 				35498EDB12187F5D00E46952 /* Offline_rollover.png in Resources */,
+				35242BD1240A9B91001FF7AD /* Save Dark.png in Resources */,
 				35DA4DF6123BF4F30043CA87 /* sparkle_dsa_pub.pem in Resources */,
+				35242BD5240A9CA0001FF7AD /* Create Dark.png in Resources */,
 				35A4CD301534927F005176BD /* Combined Hosts Hint.png in Resources */,
 				359289AB1659222E00492494 /* CHANGELOG.txt in Resources */,
 				358E0A841A3A1C54004521D1 /* Local File yosemite.tiff in Resources */,
@@ -1198,7 +1222,7 @@
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				INFOPLIST_FILE = "Launcher-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -1228,7 +1252,7 @@
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				INFOPLIST_FILE = "Launcher-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -1250,7 +1274,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEVELOPMENT_TEAM = P92T7G45SR;
@@ -1265,7 +1289,7 @@
 				GCC_PREFIX_HEADER = Gas_Mask_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = ee.clockwise.gmask;
 				PRODUCT_NAME = "Gas Mask";
@@ -1280,7 +1304,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = P92T7G45SR;
@@ -1293,7 +1317,7 @@
 				GCC_PREFIX_HEADER = Gas_Mask_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = ee.clockwise.gmask;
 				PRODUCT_NAME = "Gas Mask";
diff --git a/Resources/Images/Activate Dark.png b/Resources/Images/Activate Dark.png
new file mode 100644
index 0000000..280d7d6
Binary files /dev/null and b/Resources/Images/Activate Dark.png differ
diff --git a/Resources/Images/Activated Dark.png b/Resources/Images/Activated Dark.png
new file mode 100644
index 0000000..fa86f48
Binary files /dev/null and b/Resources/Images/Activated Dark.png differ
diff --git a/Resources/Images/Activated dark@2x.png b/Resources/Images/Activated dark@2x.png
new file mode 100644
index 0000000..ee67a4a
Binary files /dev/null and b/Resources/Images/Activated dark@2x.png differ
diff --git a/Resources/Images/Activated.png b/Resources/Images/Activated.png
index 3e3a508..07d991f 100644
Binary files a/Resources/Images/Activated.png and b/Resources/Images/Activated.png differ
diff --git a/Resources/Images/Create Dark.png b/Resources/Images/Create Dark.png
new file mode 100644
index 0000000..cf85ff7
Binary files /dev/null and b/Resources/Images/Create Dark.png differ
diff --git a/Resources/Images/Create Dark@2x.png b/Resources/Images/Create Dark@2x.png
new file mode 100644
index 0000000..a2d194b
Binary files /dev/null and b/Resources/Images/Create Dark@2x.png differ
diff --git a/Resources/Images/Save Dark.png b/Resources/Images/Save Dark.png
new file mode 100644
index 0000000..b42ab81
Binary files /dev/null and b/Resources/Images/Save Dark.png differ
diff --git a/Source/Cell.m b/Source/Cell.m
index 0a627b8..f80172b 100644
--- a/Source/Cell.m
+++ b/Source/Cell.m
@@ -99,7 +99,7 @@ - (id)init
         combinedFileIcon = [NSImage imageNamed: @"Combined_File_yosemite.tiff"];
     }
 
-	activeIcon = [NSImage imageNamed: @"Activated"];
+	activeIcon = [NSImage imageNamed: @"ActivatedFile"];
 	unsavedIcon = [NSImage imageNamed: @"Blue Dot"];
 	
 	syncingArrowsBadgeManager = [BadgeManager badgeManagerWithCreator:@selector(createSyncArrowsBadge) target:self];