diff --git a/OpenTerm.xcodeproj/project.pbxproj b/OpenTerm.xcodeproj/project.pbxproj
index 209141d4..acde6282 100644
--- a/OpenTerm.xcodeproj/project.pbxproj
+++ b/OpenTerm.xcodeproj/project.pbxproj
@@ -31,7 +31,6 @@
 		3C905FCA20265BC60084BA63 /* StoreReviewPrompter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C905FC920265BC60084BA63 /* StoreReviewPrompter.swift */; };
 		3CA320FD201FE73900974B5F /* TerminalTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA320FC201FE73900974B5F /* TerminalTextView.swift */; };
 		3CA320FF201FE8E100974B5F /* ScriptsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA320FE201FE8E100974B5F /* ScriptsViewController.swift */; };
-		3CA32102201FF6B100974B5F /* Script.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA32101201FF6B100974B5F /* Script.swift */; };
 		3CA32105201FFC1300974B5F /* ScriptEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA32104201FFC1300974B5F /* ScriptEditViewController.swift */; };
 		3CA3210920211D5600974B5F /* ScriptExecutorCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA3210820211D5600974B5F /* ScriptExecutorCommand.swift */; };
 		3CA3210B20212D4200974B5F /* CommandExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA3210A20212D4200974B5F /* CommandExecutionContext.swift */; };
@@ -42,20 +41,28 @@
 		3CE5769E202A7EC500760E43 /* Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE5769D202A7EC500760E43 /* Parser.swift */; };
 		3CE576A0202A874C00760E43 /* OutputSanitizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE5769F202A874C00760E43 /* OutputSanitizer.swift */; };
 		AEF20A4A223775F9F5101BF5 /* Pods_OpenTerm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 064CE91D25CE0DA967737711 /* Pods_OpenTerm.framework */; };
+		BE102815207A372C005E965F /* String+C.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE102814207A372C005E965F /* String+C.swift */; };
+		BE1643D22077E9D4002939B7 /* PridelandDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE1643D12077E9D4002939B7 /* PridelandDocument.swift */; };
+		BE1643D42077F857002939B7 /* DirectoryObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE1643D32077F857002939B7 /* DirectoryObserver.swift */; };
+		BE1643D62077FFC0002939B7 /* UICollectionView+Update.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE1643D52077FFC0002939B7 /* UICollectionView+Update.swift */; };
 		BE165408201909040067EC92 /* xCallBackUrl.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE165407201909030067EC92 /* xCallBackUrl.swift */; };
 		BE189036206FF36500EE6739 /* Logo.txt in Resources */ = {isa = PBXBuildFile; fileRef = BE189035206FF36500EE6739 /* Logo.txt */; };
 		BE18903B20700EFA00EE6739 /* Author.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE18903A20700EFA00EE6739 /* Author.swift */; };
+		BE1D5F9D204C66F1008A1C36 /* Cub+Runner.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE1D5F9C204C66F1008A1C36 /* Cub+Runner.swift */; };
 		BE244DC8201FBB6000A7EA4E /* cacert.pem in Resources */ = {isa = PBXBuildFile; fileRef = BE244DC7201FBB6000A7EA4E /* cacert.pem */; };
 		BE3808561FD9BFB600393EB8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE3808551FD9BFB600393EB8 /* AppDelegate.swift */; };
 		BE38085B1FD9BFB600393EB8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BE3808591FD9BFB600393EB8 /* Main.storyboard */; };
 		BE38085D1FD9BFB600393EB8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BE38085C1FD9BFB600393EB8 /* Assets.xcassets */; };
 		BE3808601FD9BFB600393EB8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BE38085E1FD9BFB600393EB8 /* LaunchScreen.storyboard */; };
 		BE505066201E5ED900CDFC60 /* Share.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE505065201E5ED900CDFC60 /* Share.swift */; };
+		BE57BDCF207BE0CD00A60950 /* CommandManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE57BDCE207BE0CD00A60950 /* CommandManager.swift */; };
+		BE70DA2C204DD5D900DEFF10 /* ScriptEditViewController+AutoComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE70DA2B204DD5D800DEFF10 /* ScriptEditViewController+AutoComplete.swift */; };
 		BE8E66FC206196A7007B14E6 /* Notification+Names.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE8E66FB206196A7007B14E6 /* Notification+Names.swift */; };
 		BE8E66FE206196B8007B14E6 /* UIDevice+Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE8E66FD206196B8007B14E6 /* UIDevice+Name.swift */; };
 		BE8E6700206196D5007B14E6 /* Bundle+Info.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE8E66FF206196D5007B14E6 /* Bundle+Info.swift */; };
 		BE9275062013961D00BD2761 /* UserDefaultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9275052013961D00BD2761 /* UserDefaultsController.swift */; };
-		BEA14A69202CEE5800AB7351 /* Cub+SavannaKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA14A68202CEE5800AB7351 /* Cub+SavannaKit.swift */; };
+		BEA14A65202CE5B700AB7351 /* Cub+SavannaKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA14A64202CE5B600AB7351 /* Cub+SavannaKit.swift */; };
+		BEA14A67202CE5D300AB7351 /* Cub.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA14A66202CE5D300AB7351 /* Cub.swift */; };
 		BEA499261FD9C4D7001B9B9D /* DocumentManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA499251FD9C4D7001B9B9D /* DocumentManager.swift */; };
 		BEA4992C1FDC0918001B9B9D /* icon-320.png in Resources */ = {isa = PBXBuildFile; fileRef = BEA4992B1FDC0918001B9B9D /* icon-320.png */; };
 		BEA4992E1FDC305B001B9B9D /* KeyboardObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA4992D1FDC305B001B9B9D /* KeyboardObserver.swift */; };
@@ -65,6 +72,13 @@
 		BEB774EF20701D8500201EBB /* authors.json in Resources */ = {isa = PBXBuildFile; fileRef = BEB774EE20701D8500201EBB /* authors.json */; };
 		BEB774F12070206E00201EBB /* Logo-small.txt in Resources */ = {isa = PBXBuildFile; fileRef = BEB774F02070206E00201EBB /* Logo-small.txt */; };
 		BEB7752220714E2C00201EBB /* UIViewController+Alerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEB7752120714E2C00201EBB /* UIViewController+Alerts.swift */; };
+		BEB7752520716B5200201EBB /* PridelandCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEB7752320716B5200201EBB /* PridelandCollectionViewCell.swift */; };
+		BEB7752620716B5200201EBB /* PridelandCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BEB7752420716B5200201EBB /* PridelandCollectionViewCell.xib */; };
+		BEB77528207172D100201EBB /* UIColor+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEB77527207172D100201EBB /* UIColor+Hex.swift */; };
+		BEB775642073F85600201EBB /* CustomColorBarPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEB775632073F85600201EBB /* CustomColorBarPicker.swift */; };
+		BEB775662074095800201EBB /* ScriptMetadataViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEB775652074095800201EBB /* ScriptMetadataViewController.swift */; };
+		BEB7756820740DFE00201EBB /* CustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEB7756720740DFE00201EBB /* CustomTextView.swift */; };
+		BEBD36E720755B0400C9725C /* StoryboardFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEBD36E620755B0400C9725C /* StoryboardFactory.swift */; };
 		BEC75BFD202B716600216462 /* OpenTermTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC75BFC202B716600216462 /* OpenTermTests.swift */; };
 		BEECFF0A1FFC1DC0009608B3 /* HistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEECFF091FFC1DC0009608B3 /* HistoryViewController.swift */; };
 		BEECFF391FFEC187009608B3 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEECFF381FFEC187009608B3 /* SettingsViewController.swift */; };
@@ -133,7 +147,6 @@
 		3C905FC920265BC60084BA63 /* StoreReviewPrompter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreReviewPrompter.swift; sourceTree = "<group>"; };
 		3CA320FC201FE73900974B5F /* TerminalTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalTextView.swift; sourceTree = "<group>"; };
 		3CA320FE201FE8E100974B5F /* ScriptsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptsViewController.swift; sourceTree = "<group>"; };
-		3CA32101201FF6B100974B5F /* Script.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Script.swift; sourceTree = "<group>"; };
 		3CA32104201FFC1300974B5F /* ScriptEditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptEditViewController.swift; sourceTree = "<group>"; };
 		3CA3210820211D5600974B5F /* ScriptExecutorCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptExecutorCommand.swift; sourceTree = "<group>"; };
 		3CA3210A20212D4200974B5F /* CommandExecutionContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandExecutionContext.swift; sourceTree = "<group>"; };
@@ -141,9 +154,14 @@
 		3CE5764720226A1500760E43 /* ANSITextState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ANSITextState.swift; sourceTree = "<group>"; };
 		3CE5769D202A7EC500760E43 /* Parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Parser.swift; sourceTree = "<group>"; };
 		3CE5769F202A874C00760E43 /* OutputSanitizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutputSanitizer.swift; sourceTree = "<group>"; };
+		BE102814207A372C005E965F /* String+C.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+C.swift"; sourceTree = "<group>"; };
+		BE1643D12077E9D4002939B7 /* PridelandDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PridelandDocument.swift; sourceTree = "<group>"; };
+		BE1643D32077F857002939B7 /* DirectoryObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectoryObserver.swift; sourceTree = "<group>"; };
+		BE1643D52077FFC0002939B7 /* UICollectionView+Update.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Update.swift"; sourceTree = "<group>"; };
 		BE165407201909030067EC92 /* xCallBackUrl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = xCallBackUrl.swift; sourceTree = "<group>"; };
 		BE189035206FF36500EE6739 /* Logo.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = Logo.txt; sourceTree = "<group>"; };
 		BE18903A20700EFA00EE6739 /* Author.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Author.swift; sourceTree = "<group>"; };
+		BE1D5F9C204C66F1008A1C36 /* Cub+Runner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Cub+Runner.swift"; sourceTree = "<group>"; };
 		BE244DC7201FBB6000A7EA4E /* cacert.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cacert.pem; sourceTree = "<group>"; };
 		BE3768EE1FEC4DCE00D5A2D1 /* ios_system.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ios_system.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		BE3808521FD9BFB600393EB8 /* OpenTerm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenTerm.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -154,11 +172,14 @@
 		BE38085F1FD9BFB600393EB8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		BE3808611FD9BFB600393EB8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BE505065201E5ED900CDFC60 /* Share.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Share.swift; sourceTree = "<group>"; };
+		BE57BDCE207BE0CD00A60950 /* CommandManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandManager.swift; sourceTree = "<group>"; };
+		BE70DA2B204DD5D800DEFF10 /* ScriptEditViewController+AutoComplete.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ScriptEditViewController+AutoComplete.swift"; sourceTree = "<group>"; };
 		BE8E66FB206196A7007B14E6 /* Notification+Names.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Notification+Names.swift"; sourceTree = "<group>"; };
 		BE8E66FD206196B8007B14E6 /* UIDevice+Name.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+Name.swift"; sourceTree = "<group>"; };
 		BE8E66FF206196D5007B14E6 /* Bundle+Info.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+Info.swift"; sourceTree = "<group>"; };
 		BE9275052013961D00BD2761 /* UserDefaultsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsController.swift; sourceTree = "<group>"; };
-		BEA14A68202CEE5800AB7351 /* Cub+SavannaKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Cub+SavannaKit.swift"; sourceTree = "<group>"; };
+		BEA14A64202CE5B600AB7351 /* Cub+SavannaKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Cub+SavannaKit.swift"; sourceTree = "<group>"; };
+		BEA14A66202CE5D300AB7351 /* Cub.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cub.swift; sourceTree = "<group>"; };
 		BEA499241FD9C46C001B9B9D /* OpenTerm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OpenTerm.entitlements; sourceTree = "<group>"; };
 		BEA499251FD9C4D7001B9B9D /* DocumentManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentManager.swift; sourceTree = "<group>"; };
 		BEA4992B1FDC0918001B9B9D /* icon-320.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-320.png"; sourceTree = "<group>"; };
@@ -169,6 +190,13 @@
 		BEB774EE20701D8500201EBB /* authors.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = authors.json; sourceTree = "<group>"; };
 		BEB774F02070206E00201EBB /* Logo-small.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Logo-small.txt"; sourceTree = "<group>"; };
 		BEB7752120714E2C00201EBB /* UIViewController+Alerts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Alerts.swift"; sourceTree = "<group>"; };
+		BEB7752320716B5200201EBB /* PridelandCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PridelandCollectionViewCell.swift; sourceTree = "<group>"; };
+		BEB7752420716B5200201EBB /* PridelandCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PridelandCollectionViewCell.xib; sourceTree = "<group>"; };
+		BEB77527207172D100201EBB /* UIColor+Hex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Hex.swift"; sourceTree = "<group>"; };
+		BEB775632073F85600201EBB /* CustomColorBarPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomColorBarPicker.swift; sourceTree = "<group>"; };
+		BEB775652074095800201EBB /* ScriptMetadataViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptMetadataViewController.swift; sourceTree = "<group>"; };
+		BEB7756720740DFE00201EBB /* CustomTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTextView.swift; sourceTree = "<group>"; };
+		BEBD36E620755B0400C9725C /* StoryboardFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryboardFactory.swift; sourceTree = "<group>"; };
 		BEC75BFA202B716600216462 /* OpenTermTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenTermTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		BEC75BFC202B716600216462 /* OpenTermTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTermTests.swift; sourceTree = "<group>"; };
 		BEC75BFE202B716600216462 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -209,14 +237,6 @@
 			name = Resources;
 			sourceTree = "<group>";
 		};
-		28CDA4272024B33D0055206D /* Bookmarks */ = {
-			isa = PBXGroup;
-			children = (
-				28CDA4282024B3510055206D /* BookmarkManager.swift */,
-			);
-			path = Bookmarks;
-			sourceTree = "<group>";
-		};
 		3C15E37C2026CE4F003216CF /* Commands */ = {
 			isa = PBXGroup;
 			children = (
@@ -224,6 +244,7 @@
 				1C81BE5620225C3800D07301 /* Clipboard.swift */,
 				BE165407201909030067EC92 /* xCallBackUrl.swift */,
 				BE505065201E5ED900CDFC60 /* Share.swift */,
+				BEA14A66202CE5D300AB7351 /* Cub.swift */,
 			);
 			path = Commands;
 			sourceTree = "<group>";
@@ -266,9 +287,9 @@
 		3CA32100201FF6A100974B5F /* Scripting */ = {
 			isa = PBXGroup;
 			children = (
-				3CA32101201FF6B100974B5F /* Script.swift */,
 				3CA3210820211D5600974B5F /* ScriptExecutorCommand.swift */,
-				BEA14A68202CEE5800AB7351 /* Cub+SavannaKit.swift */,
+				BEA14A64202CE5B600AB7351 /* Cub+SavannaKit.swift */,
+				BE1D5F9C204C66F1008A1C36 /* Cub+Runner.swift */,
 			);
 			path = Scripting;
 			sourceTree = "<group>";
@@ -278,18 +299,15 @@
 			children = (
 				3CA320FE201FE8E100974B5F /* ScriptsViewController.swift */,
 				3CA32104201FFC1300974B5F /* ScriptEditViewController.swift */,
+				BE70DA2B204DD5D800DEFF10 /* ScriptEditViewController+AutoComplete.swift */,
+				BEB7752320716B5200201EBB /* PridelandCollectionViewCell.swift */,
+				BEB7752420716B5200201EBB /* PridelandCollectionViewCell.xib */,
+				BEB775652074095800201EBB /* ScriptMetadataViewController.swift */,
+				BE1643D12077E9D4002939B7 /* PridelandDocument.swift */,
 			);
 			path = Scripting;
 			sourceTree = "<group>";
 		};
-		3CE5764120225E1B00760E43 /* History */ = {
-			isa = PBXGroup;
-			children = (
-				3CE5764220225E1B00760E43 /* HistoryManager.swift */,
-			);
-			path = History;
-			sourceTree = "<group>";
-		};
 		3CE576442022607000760E43 /* Parsing & Formatting */ = {
 			isa = PBXGroup;
 			children = (
@@ -317,6 +335,20 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		BE102813207A36A5005E965F /* Data */ = {
+			isa = PBXGroup;
+			children = (
+				3C406E1B2020987B005F97C4 /* AutoComplete */,
+				28CDA4282024B3510055206D /* BookmarkManager.swift */,
+				3CE5764220225E1B00760E43 /* HistoryManager.swift */,
+				BEBD36E620755B0400C9725C /* StoryboardFactory.swift */,
+				BEA499251FD9C4D7001B9B9D /* DocumentManager.swift */,
+				BE9275052013961D00BD2761 /* UserDefaultsController.swift */,
+				BE57BDCE207BE0CD00A60950 /* CommandManager.swift */,
+			);
+			path = Data;
+			sourceTree = "<group>";
+		};
 		BE18903720700EE200EE6739 /* Credits */ = {
 			isa = PBXGroup;
 			children = (
@@ -384,6 +416,7 @@
 				3C15E37C2026CE4F003216CF /* Commands */,
 				BE244DC6201FBB4F00A7EA4E /* Default certs */,
 				BEA8E28F2001346D00002475 /* Util */,
+				BE102813207A36A5005E965F /* Data */,
 				BEA8E28E2001345700002475 /* View */,
 				BEA8E28D2001344400002475 /* Controller */,
 				BEA4992B1FDC0918001B9B9D /* icon-320.png */,
@@ -417,6 +450,8 @@
 				3C2E4373201EF67C00E4254A /* TerminalView+AutoComplete.swift */,
 				F456629D200B9BC500C574AA /* ColorDisplayView.swift */,
 				3CA320FC201FE73900974B5F /* TerminalTextView.swift */,
+				BEB775632073F85600201EBB /* CustomColorBarPicker.swift */,
+				BEB7756720740DFE00201EBB /* CustomTextView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -425,21 +460,20 @@
 			isa = PBXGroup;
 			children = (
 				3CE576442022607000760E43 /* Parsing & Formatting */,
-				3C406E1B2020987B005F97C4 /* AutoComplete */,
 				3C406E1820207CDA005F97C4 /* Execution */,
 				3CA32100201FF6A100974B5F /* Scripting */,
-				3CE5764120225E1B00760E43 /* History */,
-				28CDA4272024B33D0055206D /* Bookmarks */,
 				BEA8E2902001348C00002475 /* UIColor+AssetCatalog.swift */,
 				F4602B48200A63FC009D0547 /* UserDefaults+UIColor.swift */,
 				BEA4992D1FDC305B001B9B9D /* KeyboardObserver.swift */,
-				BEA499251FD9C4D7001B9B9D /* DocumentManager.swift */,
-				BE9275052013961D00BD2761 /* UserDefaultsController.swift */,
 				3C905FC920265BC60084BA63 /* StoreReviewPrompter.swift */,
 				BE8E66FB206196A7007B14E6 /* Notification+Names.swift */,
 				BE8E66FD206196B8007B14E6 /* UIDevice+Name.swift */,
 				BE8E66FF206196D5007B14E6 /* Bundle+Info.swift */,
+				BEB77527207172D100201EBB /* UIColor+Hex.swift */,
 				BEB7752120714E2C00201EBB /* UIViewController+Alerts.swift */,
+				BE1643D32077F857002939B7 /* DirectoryObserver.swift */,
+				BE1643D52077FFC0002939B7 /* UICollectionView+Update.swift */,
+				BE102814207A372C005E965F /* String+C.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -558,6 +592,7 @@
 				BE244DC8201FBB6000A7EA4E /* cacert.pem in Resources */,
 				BE189036206FF36500EE6739 /* Logo.txt in Resources */,
 				BEB774EF20701D8500201EBB /* authors.json in Resources */,
+				BEB7752620716B5200201EBB /* PridelandCollectionViewCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -640,19 +675,22 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BE1D5F9D204C66F1008A1C36 /* Cub+Runner.swift in Sources */,
 				3CE57681202A52ED00760E43 /* TerminalViewController.swift in Sources */,
 				BEA8E2912001348C00002475 /* UIColor+AssetCatalog.swift in Sources */,
 				28CDA4292024B3510055206D /* BookmarkManager.swift in Sources */,
 				BEB7752220714E2C00201EBB /* UIViewController+Alerts.swift in Sources */,
 				BE8E66FC206196A7007B14E6 /* Notification+Names.swift in Sources */,
+				BE1643D62077FFC0002939B7 /* UICollectionView+Update.swift in Sources */,
 				3CA320FF201FE8E100974B5F /* ScriptsViewController.swift in Sources */,
+				BEBD36E720755B0400C9725C /* StoryboardFactory.swift in Sources */,
+				BE102815207A372C005E965F /* String+C.swift in Sources */,
 				3C2E4385201EFF4700E4254A /* AutoCompleteManager.swift in Sources */,
-				3CA32102201FF6B100974B5F /* Script.swift in Sources */,
 				BEA499301FDC3B93001B9B9D /* TerminalView.swift in Sources */,
 				BE18903B20700EFA00EE6739 /* Author.swift in Sources */,
+				BEB775662074095800201EBB /* ScriptMetadataViewController.swift in Sources */,
 				BE8E66FE206196B8007B14E6 /* UIDevice+Name.swift in Sources */,
 				3CE57680202A529200760E43 /* TerminalTabViewController.swift in Sources */,
-				BEA14A69202CEE5800AB7351 /* Cub+SavannaKit.swift in Sources */,
 				F4602B49200A63FC009D0547 /* UserDefaults+UIColor.swift in Sources */,
 				28CDA426202444CC0055206D /* BookmarkViewController.swift in Sources */,
 				3CA32105201FFC1300974B5F /* ScriptEditViewController.swift in Sources */,
@@ -661,24 +699,34 @@
 				F456629E200B9BC500C574AA /* ColorDisplayView.swift in Sources */,
 				BE165408201909040067EC92 /* xCallBackUrl.swift in Sources */,
 				BEA499261FD9C4D7001B9B9D /* DocumentManager.swift in Sources */,
+				BEA14A65202CE5B700AB7351 /* Cub+SavannaKit.swift in Sources */,
 				BE505066201E5ED900CDFC60 /* Share.swift in Sources */,
+				BEB7756820740DFE00201EBB /* CustomTextView.swift in Sources */,
 				3CE5764820226A1500760E43 /* ANSITextState.swift in Sources */,
+				BEB77528207172D100201EBB /* UIColor+Hex.swift in Sources */,
 				3CE576A0202A874C00760E43 /* OutputSanitizer.swift in Sources */,
 				BEECFF0A1FFC1DC0009608B3 /* HistoryViewController.swift in Sources */,
 				BE8E6700206196D5007B14E6 /* Bundle+Info.swift in Sources */,
 				BEA4992E1FDC305B001B9B9D /* KeyboardObserver.swift in Sources */,
 				3CA3210B20212D4200974B5F /* CommandExecutionContext.swift in Sources */,
+				BE70DA2C204DD5D900DEFF10 /* ScriptEditViewController+AutoComplete.swift in Sources */,
 				3CA320FD201FE73900974B5F /* TerminalTextView.swift in Sources */,
 				3CE5769E202A7EC500760E43 /* Parser.swift in Sources */,
 				F4602B41200A08D0009D0547 /* ColorPickerViewController.swift in Sources */,
+				BE57BDCF207BE0CD00A60950 /* CommandManager.swift in Sources */,
 				BE9275062013961D00BD2761 /* UserDefaultsController.swift in Sources */,
 				3CA3210920211D5600974B5F /* ScriptExecutorCommand.swift in Sources */,
 				3C406E1D2020988B005F97C4 /* AutoCompleteManager+InputAssistant.swift in Sources */,
 				1C81BE5720225C3800D07301 /* Clipboard.swift in Sources */,
+				BEB7752520716B5200201EBB /* PridelandCollectionViewCell.swift in Sources */,
+				BE1643D22077E9D4002939B7 /* PridelandDocument.swift in Sources */,
 				BE3808561FD9BFB600393EB8 /* AppDelegate.swift in Sources */,
 				3C406E1A20207CE7005F97C4 /* CommandExecutor.swift in Sources */,
 				3C905FCA20265BC60084BA63 /* StoreReviewPrompter.swift in Sources */,
+				BEA14A67202CE5D300AB7351 /* Cub.swift in Sources */,
+				BEB775642073F85600201EBB /* CustomColorBarPicker.swift in Sources */,
 				BEB774ED20701D2900201EBB /* Credits.swift in Sources */,
+				BE1643D42077F857002939B7 /* DirectoryObserver.swift in Sources */,
 				3CE5764320225E1B00760E43 /* HistoryManager.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/OpenTerm/Assets.xcassets/Main Tint Color.colorset/Contents.json b/OpenTerm/Assets.xcassets/Main Tint Color.colorset/Contents.json
index a76ac42c..2a896131 100644
--- a/OpenTerm/Assets.xcassets/Main Tint Color.colorset/Contents.json	
+++ b/OpenTerm/Assets.xcassets/Main Tint Color.colorset/Contents.json	
@@ -7,12 +7,12 @@
     {
       "idiom" : "universal",
       "color" : {
-        "color-space" : "srgb",
+        "color-space" : "display-p3",
         "components" : {
           "red" : "0x00",
           "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0xDB"
+          "blue" : "0x6D",
+          "green" : "0xE9"
         }
       }
     }
diff --git a/OpenTerm/Base.lproj/Main.storyboard b/OpenTerm/Base.lproj/Main.storyboard
index b62857e7..c1d8daa1 100644
--- a/OpenTerm/Base.lproj/Main.storyboard
+++ b/OpenTerm/Base.lproj/Main.storyboard
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
@@ -49,7 +49,7 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                             </tableViewSection>
                             <tableViewSection headerTitle="Appearance" footerTitle="" id="bVS-9S-NNQ">
                                 <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" rowHeight="49" id="HHF-UO-azR">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="49" id="HHF-UO-azR">
                                         <rect key="frame" x="0.0" y="142.5" width="375" height="49"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HHF-UO-azR" id="cWa-q4-aAy">
@@ -57,22 +57,22 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="aWJ-xk-8v2">
-                                                    <rect key="frame" x="20" y="11" width="627" height="27"/>
+                                                    <rect key="frame" x="16" y="11" width="343" height="27"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Font size" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DhC-12-cwh">
-                                                            <rect key="frame" x="0.0" y="4" width="499.5" height="19.5"/>
+                                                            <rect key="frame" x="0.0" y="4" width="215.5" height="19.5"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="14" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kKd-eU-F7d">
-                                                            <rect key="frame" x="507.5" y="4" width="17.5" height="19.5"/>
+                                                            <rect key="frame" x="223.5" y="4" width="17.5" height="19.5"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="eEp-2H-VCg">
-                                                            <rect key="frame" x="533" y="0.0" width="94" height="29"/>
+                                                            <rect key="frame" x="249" y="0.0" width="94" height="29"/>
                                                             <color key="tintColor" name="Main Tint Color"/>
                                                             <connections>
                                                                 <action selector="fontSizeStepperDidChange:" destination="iJD-Lv-nas" eventType="valueChanged" id="WCP-AQ-ONa"/>
@@ -202,7 +202,7 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                             </tableViewSection>
                             <tableViewSection headerTitle="Open Source" footerTitle="" id="tWz-OZ-bmh">
                                 <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="GrJ-Ev-Ihm" style="IBUITableViewCellStyleDefault" id="Nf3-aG-T2K">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="GrJ-Ev-Ihm" style="IBUITableViewCellStyleDefault" id="Nf3-aG-T2K">
                                         <rect key="frame" x="0.0" y="387" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Nf3-aG-T2K" id="j6g-QT-nMK">
@@ -220,7 +220,7 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="wWW-kp-UC4" style="IBUITableViewCellStyleDefault" id="5bv-0A-F3L">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="wWW-kp-UC4" style="IBUITableViewCellStyleDefault" id="5bv-0A-F3L">
                                         <rect key="frame" x="0.0" y="431" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5bv-0A-F3L" id="Cqv-Dw-h0s">
@@ -238,7 +238,7 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="dCr-Rq-Y5K" style="IBUITableViewCellStyleDefault" id="iE8-L3-jCi">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="dCr-Rq-Y5K" style="IBUITableViewCellStyleDefault" id="iE8-L3-jCi">
                                         <rect key="frame" x="0.0" y="475" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iE8-L3-jCi" id="0fY-C1-55y">
@@ -256,7 +256,7 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="DfM-kY-Uvt" style="IBUITableViewCellStyleDefault" id="pXV-gj-9Kb">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="DfM-kY-Uvt" style="IBUITableViewCellStyleDefault" id="pXV-gj-9Kb">
                                         <rect key="frame" x="0.0" y="519" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pXV-gj-9Kb" id="JZd-OJ-qp1">
@@ -278,7 +278,7 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                             </tableViewSection>
                             <tableViewSection footerTitle="Copyright" id="wba-Rp-4iP">
                                 <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="2uu-C0-q4m" style="IBUITableViewCellStyleDefault" id="ekI-Y7-Ecy">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="2uu-C0-q4m" style="IBUITableViewCellStyleDefault" id="ekI-Y7-Ecy">
                                         <rect key="frame" x="0.0" y="599" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ekI-Y7-Ecy" id="rI7-7s-026">
@@ -296,15 +296,15 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="S6F-N0-IeH" style="IBUITableViewCellStyleDefault" id="WmS-IE-23M">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="S6F-N0-IeH" style="IBUITableViewCellStyleDefault" id="WmS-IE-23M">
                                         <rect key="frame" x="0.0" y="643" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WmS-IE-23M" id="amP-Ne-Ebu">
-                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Follow @LouisDhauwe on Twitter for updates" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="S6F-N0-IeH">
-                                                    <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -318,7 +318,7 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
                                         <rect key="frame" x="0.0" y="687" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="msL-wC-ju6" id="PO0-Ws-4ya">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Contact Us" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Afx-4w-aV6">
@@ -440,46 +440,251 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
             </objects>
             <point key="canvasLocation" x="1484" y="134"/>
         </scene>
+        <!--Title-->
+        <scene sceneID="Gtn-Ux-dFV">
+            <objects>
+                <viewController storyboardIdentifier="ScriptMetadataViewController" id="LVr-rc-Vba" customClass="ScriptMetadataViewController" customModule="OpenTerm" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8EZ-gg-qCG">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="white" keyboardDismissMode="interactive" translatesAutoresizingMaskIntoConstraints="NO" id="EQ7-0x-lIs">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rud-0s-SPf">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="466"/>
+                                        <subviews>
+                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="5xd-aJ-Emr">
+                                                <rect key="frame" x="0.0" y="20" width="375" height="426"/>
+                                                <subviews>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B0O-69-NTh">
+                                                        <rect key="frame" x="0.0" y="0.0" width="375" height="245"/>
+                                                        <subviews>
+                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="eax-w5-thT">
+                                                                <rect key="frame" x="20" y="0.0" width="335" height="245"/>
+                                                                <subviews>
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="62t-gI-RUF">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="335" height="114.5"/>
+                                                                        <subviews>
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Command name:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="28F-Ie-IsW">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="335" height="23"/>
+                                                                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
+                                                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                <nil key="highlightedColor"/>
+                                                                            </label>
+                                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="my_command" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="Pow-u3-rNC">
+                                                                                <rect key="frame" x="0.0" y="27" width="335" height="30"/>
+                                                                                <constraints>
+                                                                                    <constraint firstAttribute="height" constant="30" id="cYe-tK-fR5"/>
+                                                                                </constraints>
+                                                                                <nil key="textColor"/>
+                                                                                <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="14"/>
+                                                                                <textInputTraits key="textInputTraits" returnKeyType="next"/>
+                                                                            </textField>
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Error" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g3K-L4-io6">
+                                                                                <rect key="frame" x="0.0" y="61" width="335" height="18"/>
+                                                                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                                                <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                                                                <nil key="highlightedColor"/>
+                                                                            </label>
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This is what you type in the terminal to run the script. May not contain spaces." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TKr-7a-Ob2">
+                                                                                <rect key="frame" x="0.0" y="83" width="335" height="31.5"/>
+                                                                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                <nil key="highlightedColor"/>
+                                                                            </label>
+                                                                        </subviews>
+                                                                    </stackView>
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="8wG-S7-0ho">
+                                                                        <rect key="frame" x="0.0" y="134.5" width="335" height="110.5"/>
+                                                                        <subviews>
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Description:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Iin-hr-aUp">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="335" height="20.5"/>
+                                                                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
+                                                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                <nil key="highlightedColor"/>
+                                                                            </label>
+                                                                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Oj8-uq-f2M" customClass="CustomTextView" customModule="OpenTerm" customModuleProvider="target">
+                                                                                <rect key="frame" x="0.0" y="24.5" width="335" height="66"/>
+                                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                <constraints>
+                                                                                    <constraint firstAttribute="height" constant="66" id="xqX-km-xqS"/>
+                                                                                </constraints>
+                                                                                <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                                                                <userDefinedRuntimeAttributes>
+                                                                                    <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Description (optional)"/>
+                                                                                </userDefinedRuntimeAttributes>
+                                                                            </textView>
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A short description of what the script does." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v58-yD-3bX">
+                                                                                <rect key="frame" x="0.0" y="94.5" width="335" height="16"/>
+                                                                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                                                <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                <nil key="highlightedColor"/>
+                                                                            </label>
+                                                                        </subviews>
+                                                                    </stackView>
+                                                                </subviews>
+                                                            </stackView>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="eax-w5-thT" firstAttribute="top" secondItem="B0O-69-NTh" secondAttribute="top" id="3JQ-0q-xfA"/>
+                                                            <constraint firstItem="eax-w5-thT" firstAttribute="leading" secondItem="B0O-69-NTh" secondAttribute="leading" constant="20" id="CbZ-Xb-9MU"/>
+                                                            <constraint firstAttribute="trailing" secondItem="eax-w5-thT" secondAttribute="trailing" constant="20" id="cPO-Bj-2Qn"/>
+                                                            <constraint firstAttribute="bottom" secondItem="eax-w5-thT" secondAttribute="bottom" id="wu3-vr-DfS"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Iah-7a-KkP">
+                                                        <rect key="frame" x="0.0" y="265" width="375" height="161"/>
+                                                        <subviews>
+                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vfV-BC-g7j">
+                                                                <rect key="frame" x="0.0" y="0.0" width="375" height="60.5"/>
+                                                                <subviews>
+                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Color:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J6F-aa-H5h">
+                                                                        <rect key="frame" x="20" y="0.0" width="335" height="61"/>
+                                                                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
+                                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        <nil key="highlightedColor"/>
+                                                                    </label>
+                                                                </subviews>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="bottom" secondItem="J6F-aa-H5h" secondAttribute="bottom" id="LZQ-2O-26U"/>
+                                                                    <constraint firstItem="J6F-aa-H5h" firstAttribute="top" secondItem="vfV-BC-g7j" secondAttribute="top" id="Npb-7E-uAX"/>
+                                                                    <constraint firstItem="J6F-aa-H5h" firstAttribute="leading" secondItem="vfV-BC-g7j" secondAttribute="leading" constant="20" id="jU8-2R-BSz"/>
+                                                                    <constraint firstAttribute="trailing" secondItem="J6F-aa-H5h" secondAttribute="trailing" constant="20" id="ooJ-At-tA1"/>
+                                                                </constraints>
+                                                            </view>
+                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iec-BN-z14" customClass="CustomColorBarPicker" customModule="OpenTerm" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="64.5" width="375" height="32"/>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="32" id="ZWf-Lm-U53"/>
+                                                                </constraints>
+                                                                <userDefinedRuntimeAttributes>
+                                                                    <userDefinedRuntimeAttribute type="number" keyPath="hue">
+                                                                        <real key="value" value="0.0"/>
+                                                                    </userDefinedRuntimeAttribute>
+                                                                </userDefinedRuntimeAttributes>
+                                                            </view>
+                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WCh-92-5xW">
+                                                                <rect key="frame" x="0.0" y="100.5" width="375" height="60.5"/>
+                                                                <subviews>
+                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This color will be used in your scripts collection." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aQM-X7-KZf">
+                                                                        <rect key="frame" x="20" y="0.0" width="335" height="60.5"/>
+                                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                                        <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        <nil key="highlightedColor"/>
+                                                                    </label>
+                                                                </subviews>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <constraints>
+                                                                    <constraint firstItem="aQM-X7-KZf" firstAttribute="top" secondItem="WCh-92-5xW" secondAttribute="top" id="GZT-MA-HPI"/>
+                                                                    <constraint firstItem="aQM-X7-KZf" firstAttribute="leading" secondItem="WCh-92-5xW" secondAttribute="leading" constant="20" id="jYe-PV-fCT"/>
+                                                                    <constraint firstAttribute="trailing" secondItem="aQM-X7-KZf" secondAttribute="trailing" constant="20" id="odj-Lg-OmI"/>
+                                                                    <constraint firstAttribute="bottom" secondItem="aQM-X7-KZf" secondAttribute="bottom" id="y8d-Ji-rmp"/>
+                                                                </constraints>
+                                                            </view>
+                                                        </subviews>
+                                                    </stackView>
+                                                </subviews>
+                                            </stackView>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="bottom" secondItem="5xd-aJ-Emr" secondAttribute="bottom" constant="20" id="1No-Al-qNc"/>
+                                            <constraint firstItem="5xd-aJ-Emr" firstAttribute="leading" secondItem="rud-0s-SPf" secondAttribute="leading" id="Pjg-0E-paP"/>
+                                            <constraint firstAttribute="trailing" secondItem="5xd-aJ-Emr" secondAttribute="trailing" id="gee-F7-lD3"/>
+                                            <constraint firstItem="5xd-aJ-Emr" firstAttribute="top" secondItem="rud-0s-SPf" secondAttribute="top" constant="20" id="oBI-Qp-HNO"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="rud-0s-SPf" firstAttribute="width" secondItem="EQ7-0x-lIs" secondAttribute="width" id="2xa-Gq-nnl"/>
+                                    <constraint firstAttribute="bottom" secondItem="rud-0s-SPf" secondAttribute="bottom" id="BdH-8b-APt"/>
+                                    <constraint firstItem="rud-0s-SPf" firstAttribute="leading" secondItem="EQ7-0x-lIs" secondAttribute="leading" id="TWc-Ak-wbD"/>
+                                    <constraint firstItem="rud-0s-SPf" firstAttribute="top" secondItem="EQ7-0x-lIs" secondAttribute="top" id="inl-sO-0Eh"/>
+                                    <constraint firstAttribute="trailing" secondItem="rud-0s-SPf" secondAttribute="trailing" id="oiY-qz-ybI"/>
+                                </constraints>
+                            </scrollView>
+                        </subviews>
+                        <color key="backgroundColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="EQ7-0x-lIs" firstAttribute="leading" secondItem="LdS-hg-0br" secondAttribute="leading" id="5EZ-4J-G7a"/>
+                            <constraint firstItem="EQ7-0x-lIs" firstAttribute="top" secondItem="8EZ-gg-qCG" secondAttribute="top" id="5bN-uD-PYd"/>
+                            <constraint firstItem="EQ7-0x-lIs" firstAttribute="trailing" secondItem="LdS-hg-0br" secondAttribute="trailing" id="GOc-Yi-rSf"/>
+                            <constraint firstItem="EQ7-0x-lIs" firstAttribute="bottom" secondItem="LdS-hg-0br" secondAttribute="bottom" id="uw8-K7-p3Y"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="LdS-hg-0br"/>
+                    </view>
+                    <navigationItem key="navigationItem" title="Title" id="0eD-5X-RNH">
+                        <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="WQH-Il-rdo">
+                            <connections>
+                                <action selector="cancel:" destination="LVr-rc-Vba" id="Hjc-sI-u6T"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" title="Item" id="otb-50-Zeq">
+                            <connections>
+                                <action selector="save:" destination="LVr-rc-Vba" id="pgg-wq-FbC"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" barStyle="black" prompted="NO"/>
+                    <connections>
+                        <outlet property="colorBarPicker" destination="iec-BN-z14" id="SB5-Re-gyo"/>
+                        <outlet property="descriptionTextView" destination="Oj8-uq-f2M" id="vUH-RE-LXr"/>
+                        <outlet property="nameErrorLbl" destination="g3K-L4-io6" id="zDa-gC-07I"/>
+                        <outlet property="nameTextField" destination="Pow-u3-rNC" id="nqZ-VZ-inC"/>
+                        <outlet property="saveBarButtonItem" destination="otb-50-Zeq" id="umQ-XK-t0Q"/>
+                        <outlet property="scrollView" destination="EQ7-0x-lIs" id="UVb-e8-2TD"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="5oF-w8-QSZ" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2336.8000000000002" y="-600.44977511244383"/>
+        </scene>
         <!--Scripts-->
-        <scene sceneID="Lu9-3r-2Ro">
+        <scene sceneID="7po-Bv-XJO">
             <objects>
-                <tableViewController storyboardIdentifier="ScriptsViewController" id="9AK-0c-p31" customClass="ScriptsViewController" customModule="OpenTerm" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="bin-oB-viz">
+                <viewController storyboardIdentifier="ScriptsViewController" title="Scripts" id="EpP-OH-xVH" customClass="ScriptsViewController" customModule="OpenTerm" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="GQF-u8-gyc">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" name="Panel Background Color"/>
-                        <color key="separatorColor" white="0.16213727680000001" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ScriptCell" textLabel="3Fb-vg-hd2" style="IBUITableViewCellStyleDefault" id="lCg-Nk-zL3">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lCg-Nk-zL3" id="eek-jL-6Hu">
-                                    <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3Fb-vg-hd2">
-                                            <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                </tableViewCellContentView>
+                        <subviews>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="I1w-LQ-Yti">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="9AK-0c-p31" id="tPJ-22-kKT"/>
-                            <outlet property="delegate" destination="9AK-0c-p31" id="mXk-8q-jlF"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Scripts" id="qUx-6l-a2N"/>
+                                <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="16" minimumInteritemSpacing="16" id="fpj-tK-XNf">
+                                    <size key="itemSize" width="322" height="141"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="16" minY="16" maxX="16" maxY="16"/>
+                                </collectionViewFlowLayout>
+                                <cells/>
+                            </collectionView>
+                        </subviews>
+                        <color key="backgroundColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="I1w-LQ-Yti" firstAttribute="bottom" secondItem="S39-X2-PFn" secondAttribute="bottom" id="16u-fn-xIl"/>
+                            <constraint firstItem="I1w-LQ-Yti" firstAttribute="top" secondItem="GQF-u8-gyc" secondAttribute="top" id="4bu-jm-Ugo"/>
+                            <constraint firstItem="I1w-LQ-Yti" firstAttribute="leading" secondItem="S39-X2-PFn" secondAttribute="leading" id="9La-0p-Rpk"/>
+                            <constraint firstItem="I1w-LQ-Yti" firstAttribute="trailing" secondItem="S39-X2-PFn" secondAttribute="trailing" id="l3H-hq-axl"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="S39-X2-PFn"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="QCl-xP-dn8">
+                        <nil key="title"/>
+                    </navigationItem>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" barStyle="black" prompted="NO"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Xoy-Rx-17A" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                    <connections>
+                        <outlet property="collectionView" destination="I1w-LQ-Yti" id="MMS-ZT-Ze4"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="PMe-5v-SKd" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2337" y="134"/>
+            <point key="canvasLocation" x="2336.8000000000002" y="133.5832083958021"/>
         </scene>
         <!--Bookmark View Controller-->
         <scene sceneID="llq-ne-b8C">
@@ -516,7 +721,7 @@ This project uses the open source ios_system project by Nicolas Holzschuch. This
     </scenes>
     <resources>
         <namedColor name="Main Tint Color">
-            <color red="0.0" green="0.85882352941176465" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.9137254901960784" blue="0.42745098039215684" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
         </namedColor>
         <namedColor name="Panel Background Color">
             <color white="0.064999997615814209" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/OpenTerm/Commands/Cub.swift b/OpenTerm/Commands/Cub.swift
new file mode 100644
index 00000000..ae2b2309
--- /dev/null
+++ b/OpenTerm/Commands/Cub.swift
@@ -0,0 +1,79 @@
+//
+//  Cub.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 03/02/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import Foundation
+import Cub
+import ios_system
+import TabView
+
+public func cub(argc: Int32, argv: UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>?) -> Int32 {
+
+	guard let tabViewContainer = UIApplication.shared.keyWindow?.rootViewController as? TabViewContainerViewController<TerminalTabViewController> else {
+		return 1
+	}
+
+	guard let activeVC = tabViewContainer.primaryTabViewController.visibleViewController as? TerminalViewController else {
+		return 1
+	}
+
+	let terminalView = activeVC.terminalView
+
+	let usage = "Usage: cub script.cub\n"
+	
+	guard argc == 2 else {
+		fputs(usage, thread_stderr)
+		return 1
+	}
+
+	guard let fileName = argv?[1] else {
+		fputs(usage, thread_stderr)
+		return 1
+	}
+
+	let path = String(cString: fileName)
+
+	let url = URL(fileURLWithPath: path)
+
+	guard let data = FileManager.default.contents(atPath: url.path) else {
+		fputs("Missing file \"\(path)\"\n", thread_stderr)
+		return 1
+	}
+
+	guard let source = String(data: data, encoding: .utf8) else {
+		fputs("Missing file \"\(path)\"\n", thread_stderr)
+		return 1
+	}
+
+	let runner = Runner.runner(executor: terminalView.executor, executorDelegate: terminalView)
+
+	do {
+
+		try runner.run(source)
+
+	} catch {
+
+		terminalView.stderrParser.delegate = terminalView
+		terminalView.stdoutParser.delegate = terminalView
+
+		terminalView.executor.delegate = terminalView
+
+		if let error = error as? DisplayableError {
+
+			terminalView.writeOutput("Error occurred: \(error.description(inSource: source))")
+
+		} else {
+
+			terminalView.writeOutput("Unknown error occurred")
+
+		}
+
+		return 1
+	}
+
+	return 0
+}
diff --git a/OpenTerm/Commands/Share.swift b/OpenTerm/Commands/Share.swift
index f073ff9f..a270985d 100644
--- a/OpenTerm/Commands/Share.swift
+++ b/OpenTerm/Commands/Share.swift
@@ -14,15 +14,19 @@ public weak var shareFileViewController: UIViewController?
 public func shareFile(argc: Int32, argv: UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>?) -> Int32 {
 	var itemsToShare = [Any]()
 
-	// share text from stdin when present
 	var bytes = [Int8]()
-	while stdin != thread_stdin {
-		var byte: Int8 = 0
-		let count = read(fileno(thread_stdin), &byte, 1)
-		guard count == 1 else {
-			break
+	
+	if Int(argc) == 1 {
+		
+		// share text from stdin when present
+		while stdin != thread_stdin {
+			var byte: Int8 = 0
+			let count = read(fileno(thread_stdin), &byte, 1)
+			guard count == 1 else {
+				break
+			}
+			bytes.append(byte)
 		}
-		bytes.append(byte)
 	}
 	
 	let data = Data(bytes: bytes, count: bytes.count)
diff --git a/OpenTerm/Controller/Scripting/PridelandCollectionViewCell.swift b/OpenTerm/Controller/Scripting/PridelandCollectionViewCell.swift
new file mode 100644
index 00000000..73c065a5
--- /dev/null
+++ b/OpenTerm/Controller/Scripting/PridelandCollectionViewCell.swift
@@ -0,0 +1,106 @@
+//
+//  PridelandCollectionViewCell.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 01/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import UIKit
+
+class PridelandCollectionViewCell: UICollectionViewCell {
+
+	let gradientLayer = CAGradientLayer()
+
+	@IBOutlet weak var titleLbl: UILabel!
+	@IBOutlet weak var descriptionLbl: UILabel!
+	
+	override func awakeFromNib() {
+        super.awakeFromNib()
+
+		gradientLayer.colors = [UIColor.white.cgColor, UIColor.black.cgColor]
+		gradientLayer.startPoint = .zero
+		gradientLayer.endPoint = CGPoint(x: 1, y: 1)
+		
+		self.contentView.layer.insertSublayer(gradientLayer, at: 0)
+	
+		self.contentView.layer.cornerRadius = 16.0
+		self.contentView.layer.masksToBounds = true
+		
+	}
+	
+	override func layoutSubviews() {
+		super.layoutSubviews()
+		
+		gradientLayer.frame = self.contentView.bounds
+
+	}
+	
+	func show(_ prideland: PridelandOverview) {
+		
+		titleLbl.text = prideland.metadata.name
+		descriptionLbl.text = prideland.metadata.description
+		
+		let hue = CGFloat(prideland.metadata.hueTint)
+		
+		updateGradient(hue: hue)
+		
+	}
+	
+	private func updateGradient(hue: CGFloat) {
+		
+		let gradientColor1: UIColor
+		var gradientColor2: UIColor
+		
+		let hue2: CGFloat
+		
+		if hue < 0.1 {
+
+			hue2 = 1.0 - (0.1 - hue)
+
+		} else {
+			
+			hue2 = hue - 0.1
+			
+		}
+		
+		if hue > 0.1 && hue < 0.6 {
+
+			gradientColor1 = UIColor(hue: hue, saturation: 1.0, brightness: 1.0, alpha: 1.0)
+			gradientColor2 = UIColor(hue: hue2, saturation: 0.9, brightness: 0.5, alpha: 1.0)
+
+		} else {
+
+			gradientColor1 = UIColor(hue: hue, saturation: 1.0, brightness: 1.0, alpha: 1.0)
+			gradientColor2 = UIColor(hue: hue2, saturation: 1.0, brightness: 1.0, alpha: 1.0)
+
+		}
+		
+		var grayscale1: CGFloat = 0
+		var grayscale2: CGFloat = 0
+
+		gradientColor1.getWhite(&grayscale1, alpha: nil)
+		gradientColor2.getWhite(&grayscale2, alpha: nil)
+		
+		if abs(grayscale1 - grayscale2) < 0.1 {
+			
+			gradientColor2 = UIColor(hue: hue2, saturation: 0.8, brightness: 0.6, alpha: 1.0)
+			gradientColor2.getWhite(&grayscale2, alpha: nil)
+
+		}
+		
+		// Gradient should always be light -> dark
+		if grayscale1 < grayscale2 {
+			
+			gradientLayer.colors = [gradientColor2.cgColor, gradientColor1.cgColor]
+
+		} else {
+			
+			gradientLayer.colors = [gradientColor1.cgColor, gradientColor2.cgColor]
+
+		}
+
+		
+	}
+
+}
diff --git a/OpenTerm/Controller/Scripting/PridelandCollectionViewCell.xib b/OpenTerm/Controller/Scripting/PridelandCollectionViewCell.xib
new file mode 100644
index 00000000..0a0ccbf4
--- /dev/null
+++ b/OpenTerm/Controller/Scripting/PridelandCollectionViewCell.xib
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PridelandCollectionViewCell" id="gTV-IL-0wX" customClass="PridelandCollectionViewCell" customModule="OpenTerm" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="281" height="139"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="281" height="139"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uXP-W8-rIG">
+                        <rect key="frame" x="0.0" y="0.0" width="281" height="139"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </view>
+                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="wbY-6H-ySy">
+                        <rect key="frame" x="20" y="20" width="241" height="99"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dmw-TQ-GTC">
+                                <rect key="frame" x="0.0" y="0.0" width="241" height="20"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" text="Description of the command Description of the command Description of the command Description of the command" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XaG-UW-eSE">
+                                <rect key="frame" x="0.0" y="20" width="241" height="79"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                    </stackView>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstItem="uXP-W8-rIG" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="8Dy-A6-OHY"/>
+                <constraint firstAttribute="trailing" secondItem="uXP-W8-rIG" secondAttribute="trailing" id="8St-tj-vHP"/>
+                <constraint firstAttribute="bottom" secondItem="wbY-6H-ySy" secondAttribute="bottom" constant="20" id="NUP-7B-2An"/>
+                <constraint firstItem="wbY-6H-ySy" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="20" id="Q2r-FG-ubV"/>
+                <constraint firstAttribute="trailing" secondItem="wbY-6H-ySy" secondAttribute="trailing" constant="20" id="X4d-5h-4mK"/>
+                <constraint firstItem="uXP-W8-rIG" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="azP-oN-TaZ"/>
+                <constraint firstItem="wbY-6H-ySy" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="20" id="e7I-TJ-5gq"/>
+                <constraint firstAttribute="bottom" secondItem="uXP-W8-rIG" secondAttribute="bottom" id="wJh-nn-3lZ"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
+            <size key="customSize" width="281" height="139"/>
+            <connections>
+                <outlet property="descriptionLbl" destination="XaG-UW-eSE" id="jPa-Ar-aKg"/>
+                <outlet property="titleLbl" destination="dmw-TQ-GTC" id="4Wh-pQ-KLp"/>
+            </connections>
+            <point key="canvasLocation" x="-37.5" y="22.5"/>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/OpenTerm/Controller/Scripting/PridelandDocument.swift b/OpenTerm/Controller/Scripting/PridelandDocument.swift
new file mode 100644
index 00000000..fb43dd09
--- /dev/null
+++ b/OpenTerm/Controller/Scripting/PridelandDocument.swift
@@ -0,0 +1,118 @@
+//
+//  PridelandDocument.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 06/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import UIKit
+
+enum PridelandDocumentError: Error {
+	case invalidDocument
+}
+
+class PridelandDocument: UIDocument {
+	
+	var text = ""
+	
+	var metadata: PridelandMetadata?
+	
+	override init(fileURL url: URL) {
+		super.init(fileURL: url)
+		
+	}
+	
+	override func contents(forType typeName: String) throws -> Any {
+		
+		let fileWrapper = FileWrapper(directoryWithFileWrappers: [:])
+	
+		let contentsFileWrapper = FileWrapper(directoryWithFileWrappers: [:])
+		contentsFileWrapper.preferredFilename = "contents"
+		
+		guard let textData = text.data(using: .utf8) else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		let cubFileWrapper = FileWrapper(regularFileWithContents: textData)
+		cubFileWrapper.preferredFilename = "1.cub"
+		
+		contentsFileWrapper.addFileWrapper(cubFileWrapper)
+		fileWrapper.addFileWrapper(contentsFileWrapper)
+		
+		guard let metadata = metadata else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		let decoder = PropertyListEncoder()
+		decoder.outputFormat = .xml
+		
+		guard let metadataData = try? decoder.encode(metadata) else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		let metadataFileWrapper = FileWrapper(regularFileWithContents: metadataData)
+		metadataFileWrapper.preferredFilename = "metadata.plist"
+		fileWrapper.addFileWrapper(metadataFileWrapper)
+		
+		return fileWrapper
+	}
+	
+	override func load(fromContents contents: Any, ofType typeName: String?) throws {
+		
+		guard let fileWrapper = contents as? FileWrapper else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		guard let wrappers = fileWrapper.fileWrappers else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		let contentsWrapper = wrappers["contents"]
+		
+		guard let cubContentsWrapper = contentsWrapper?.fileWrappers?["1.cub"] else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		guard let textData = cubContentsWrapper.regularFileContents else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		guard let text = String(data: textData, encoding: .utf8) else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		guard let metadataData = wrappers["metadata.plist"]?.regularFileContents else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		let decoder = PropertyListDecoder()
+		
+		guard let metadata = try? decoder.decode(PridelandMetadata.self, from: metadataData) else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		self.text = text
+		self.metadata = metadata
+		
+	}
+	
+}
+
+struct PridelandMetadata: Codable {
+	
+	let name: String
+	let description: String
+	let hueTint: Double
+	
+}
+
+extension PridelandMetadata: Equatable {
+	
+	static func ==(lhs: PridelandMetadata, rhs: PridelandMetadata) -> Bool {
+		return lhs.name == rhs.name &&
+			lhs.description == rhs.description &&
+			lhs.hueTint == rhs.hueTint
+	}
+	
+}
diff --git a/OpenTerm/Controller/Scripting/ScriptEditViewController+AutoComplete.swift b/OpenTerm/Controller/Scripting/ScriptEditViewController+AutoComplete.swift
new file mode 100644
index 00000000..05924140
--- /dev/null
+++ b/OpenTerm/Controller/Scripting/ScriptEditViewController+AutoComplete.swift
@@ -0,0 +1,92 @@
+//
+//  ScriptEditViewController+AutoComplete.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 05/03/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import Foundation
+import InputAssistant
+import Cub
+
+extension CubSyntaxAutoCompleteManager: InputAssistantViewDataSource {
+	
+	func textForEmptySuggestionsInInputAssistantView() -> String? {
+		return nil
+	}
+	
+	func numberOfSuggestionsInInputAssistantView() -> Int {
+		return self.completions.count
+	}
+	
+	func inputAssistantView(_ inputAssistantView: InputAssistantView, nameForSuggestionAtIndex index: Int) -> String {
+		return self.completions[index].data.title
+	}
+}
+
+// Make the input assistant reload when completions change
+extension InputAssistantView: CubSyntaxAutoCompleteManagerDelegate {
+	
+}
+
+
+protocol CubSyntaxAutoCompleteManagerDelegate: class {
+	func autoCompleteManagerDidChangeCompletions()
+}
+
+protocol CubSyntaxAutoCompleteManagerDataSource: class {
+	func completions() -> [CubSyntaxAutoCompleteManager.Completion]
+}
+
+class CubSyntaxAutoCompleteManager {
+	
+	struct Completion {
+		/// Display name for the completion
+		let name: String
+		
+		/// By default, a whitespace character will be inserted after the completion.
+		let appendingSuffix: String
+		
+		/// Additional information to store in the completion
+		let data: Cub.CompletionSuggestion
+		
+		init(_ name: String, data: Cub.CompletionSuggestion) {
+			self.init(name, appendingSuffix: " ", data: data)
+		}
+		
+		init(_ name: String, appendingSuffix: String, data: Cub.CompletionSuggestion) {
+			self.name = name
+			self.appendingSuffix = appendingSuffix
+			self.data = data
+		}
+	}
+	
+	/// A set of completions to be displayed to the user.
+	private(set) var completions: [Completion] = [] {
+		didSet {
+			self.delegate?.autoCompleteManagerDidChangeCompletions()
+		}
+	}
+	
+	/// Set this to receive notifications when state changes.
+	weak var delegate: CubSyntaxAutoCompleteManagerDelegate?
+	
+	/// Set this to provide completions.
+	weak var dataSource: CubSyntaxAutoCompleteManagerDataSource? {
+		didSet {
+			self.reloadData()
+		}
+	}
+	
+	/// Create a new auto complete manager. Starts in an empty state.
+	init() {
+		
+	}
+	
+	func reloadData() {
+		
+		completions = dataSource?.completions() ?? []
+	}
+	
+}
diff --git a/OpenTerm/Controller/Scripting/ScriptEditViewController.swift b/OpenTerm/Controller/Scripting/ScriptEditViewController.swift
index b482fabb..9acb6176 100644
--- a/OpenTerm/Controller/Scripting/ScriptEditViewController.swift
+++ b/OpenTerm/Controller/Scripting/ScriptEditViewController.swift
@@ -8,21 +8,27 @@
 
 import UIKit
 import InputAssistant
+import Cub
+import SavannaKit
+import PanelKit
 
 class ScriptEditViewController: UIViewController {
 
-	var script: Script
-	let textView: TerminalTextView
-	let autoCompleteManager: AutoCompleteManager
+	var url: URL
+	let document: PridelandDocument
+	let textView: SyntaxTextView
+	let autoCompleteManager: CubSyntaxAutoCompleteManager
 	let inputAssistantView: InputAssistantView
 
-	init(script: Script) {
-		self.script = script
-		self.textView = TerminalTextView()
-		self.autoCompleteManager = AutoCompleteManager()
+	init(url: URL) {
+		self.url = url
+		self.textView = SyntaxTextView()
+		self.autoCompleteManager = CubSyntaxAutoCompleteManager()
 		self.inputAssistantView = InputAssistantView()
+		self.document = PridelandDocument(fileURL: url)
+
 		super.init(nibName: nil, bundle: nil)
-		self.title = script.name
+		
 	}
 
 	required init?(coder aDecoder: NSCoder) {
@@ -33,78 +39,219 @@ class ScriptEditViewController: UIViewController {
 		view = textView
 	}
 
+	private var textViewSelectedRangeObserver: NSKeyValueObservation?
+
+	private let keyboardObserver = KeyboardObserver()
+	
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
+		self.view.tintColor = .defaultMainTintColor
+		self.navigationController?.navigationBar.barStyle = .blackTranslucent
+		
 		textView.delegate = self
 
 		// Set up auto complete manager
-		self.autoCompleteManager.delegate = self.inputAssistantView
-		self.autoCompleteManager.dataSource = self
+		autoCompleteManager.delegate = inputAssistantView
+		autoCompleteManager.dataSource = self
 
 		// Set up input assistant and text view for auto completion
-		self.inputAssistantView.delegate = self
-		self.inputAssistantView.dataSource = self.autoCompleteManager
-		self.textView.inputAccessoryView = self.inputAssistantView
-		self.inputAssistantView.tintColor = .lightGray
+		inputAssistantView.delegate = self
+		inputAssistantView.dataSource = autoCompleteManager
+		inputAssistantView.attach(to: textView.contentTextView)
+
+		textViewSelectedRangeObserver = textView.contentTextView.observe(\UITextView.selectedTextRange) { [weak self] (textView, value) in
+			
+			self?.autoCompleteManager.reloadData()
 
-		// Hide default undo/redo/etc buttons
-		textView.inputAssistantItem.leadingBarButtonGroups = []
-		textView.inputAssistantItem.trailingBarButtonGroups = []
+		}
+		
+		let infoButton = UIButton(type: .infoLight)
+		infoButton.addTarget(self, action: #selector(showScriptMetadata), for: .touchUpInside)
+		
+		let infoBarButtonItem = UIBarButtonItem(customView: infoButton)
+		navigationItem.rightBarButtonItem = infoBarButtonItem
+		
+		document.open { [weak self] (success) in
+			
+			if !success {
+				
+				self?.showErrorAlert(dismissCallback: {
+					self?.dismiss(animated: true, completion: nil)
+				})
+				
+			}
+			
+			self?.textView.text = self?.document.text ?? ""
 
-		// Disable built-in autocomplete
-		textView.autocorrectionType = .no
+		}
+		
+		keyboardObserver.observe { [weak self] (state) in
+			self?.adjustInsets(for: state)
+		}
+		
 	}
+	
+	private func adjustInsets(for state: KeyboardEvent) {
+		
+		let rect = self.textView.convert(state.keyboardFrameEnd, from: nil).intersection(self.textView.bounds)
+		
+		UIView.animate(withDuration: state.duration, delay: 0.0, options: state.options, animations: {
+			
+			if rect.height == 0 {
+				
+				// Keyboard is not visible.
+				
+				self.textView.contentInset.bottom = 0
+				
+			} else {
+				
+				// Keyboard is visible, keyboard height includes safeAreaInsets.
+				
+				let bottomInset = rect.height - self.view.safeAreaInsets.bottom
+				
+				self.textView.contentInset.bottom = bottomInset
+				
+			}
+			
+		}, completion: nil)
+		
+	}
+
+	override func viewWillAppear(_ animated: Bool) {
+		super.viewWillAppear(animated)
+
+		textView.contentTextView.becomeFirstResponder()
 
+	}
+	
 	override func viewDidAppear(_ animated: Bool) {
 		super.viewDidAppear(animated)
 
-		textView.becomeFirstResponder()
-		textView.text = script.value
+	}
+	
+	deinit {
+		
+		if self.document.documentState != .closed {
+			self.document.close(completionHandler: nil)
+		}
+		
+	}
+	
+	@objc
+	func showScriptMetadata() {
+		
+		let scriptMetadataVC = UIStoryboard.main.scriptMetadataViewController(state: .update(document))
+		scriptMetadataVC.delegate = self
+		
+		let navController = UINavigationController(rootViewController: scriptMetadataVC)
+		navController.navigationBar.barStyle = .blackTranslucent
+		navController.modalPresentationStyle = .formSheet
+		
+		self.present(navController, animated: true, completion: nil)
+		
 	}
 
 	private func save() {
-		// Save to disk
-		script.value = textView.text
+		
+		if document.text != textView.text {
+			
+			document.text = textView.text
+			document.updateChangeCount(.done)
+			
+		}
+		
 	}
 
 }
 
-extension ScriptEditViewController: UITextViewDelegate {
+extension ScriptEditViewController: ScriptMetadataViewControllerDelegate {
+	
+	func didUpdateScript(_ updatedDocument: PridelandDocument) {
+		self.title = updatedDocument.metadata?.name ?? ""
+	}
+	
+	func didCreateScript(_ document: PridelandDocument) {
+		
+	}
+	
+}
 
-	func textViewDidChange(_ textView: UITextView) {
-		save()
-		autoCompleteManager.reloadData()
+extension ScriptEditViewController: PanelContentDelegate {
+
+	var preferredPanelContentSize: CGSize {
+		return CGSize(width: 320, height: 480)
+	}
+	
+	var minimumPanelContentSize: CGSize {
+		return CGSize(width: 320, height: 320)
+	}
+	
+	var maximumPanelContentSize: CGSize {
+		return CGSize(width: 600, height: 800)
 	}
+	
+	var shouldAdjustForKeyboard: Bool {
+		return self.textView.contentTextView.isFirstResponder
+	}
+
 }
 
-extension ScriptEditViewController: AutoCompleteManagerDataSource {
+extension ScriptEditViewController: SyntaxTextViewDelegate {
 
-	func allCommandsForAutoCompletion() -> [String] {
-		return ["+ new argument"] + self.script.argumentNames
+	func didChangeText(_ syntaxTextView: SyntaxTextView) {
+		save()
+		autoCompleteManager.reloadData()
 	}
 
-	func completionsForProgram(_ command: String, _ currentArguments: [String]) -> [AutoCompleteManager.Completion] {
-		return []
+	func lexerForSource(_ source: String) -> SavannaKit.Lexer {
+		return Cub.Lexer(input: source)
 	}
 
-	func completionsForExecution() -> [AutoCompleteManager.Completion] {
-		return []
+}
+
+extension ScriptEditViewController: UITextViewDelegate {
+
+	func textViewDidChange(_ textView: UITextView) {
+		save()
+		autoCompleteManager.reloadData()
 	}
+}
+
+extension ScriptEditViewController: CubSyntaxAutoCompleteManagerDataSource {
 
-	func availableCompletions(in completions: [AutoCompleteManager.Completion], forArguments arguments: [String]) -> [AutoCompleteManager.Completion] {
-		return completions
+	func completions() -> [CubSyntaxAutoCompleteManager.Completion] {
+		
+		let autoCompletor = AutoCompleter()
+		
+		guard let text = textView.contentTextView.text else {
+			return []
+		}
+		
+		let selectedRange = textView.contentTextView.selectedRange
+		
+		guard let swiftRange = Range(selectedRange, in: text) else {
+			return []
+		}
+		
+		let cursor = text.distance(from: text.startIndex, to: swiftRange.lowerBound)
+		
+		let suggestions = autoCompletor.completionSuggestions(for: textView.text, cursor: cursor)
+		
+		return suggestions.map({ CubSyntaxAutoCompleteManager.Completion($0.content, data: $0) })
 	}
+
 }
 
 extension ScriptEditViewController: InputAssistantViewDelegate {
+	
 	func inputAssistantView(_ inputAssistantView: InputAssistantView, didSelectSuggestionAtIndex index: Int) {
-		let suggestion = autoCompleteManager.completions[index]
+		let completion = autoCompleteManager.completions[index]
+
+		let suggestion = completion.data
+		
+		textView.contentTextView.insertText(suggestion.content)
 
-		if suggestion.name == "+ new argument" {
-			textView.insertText("$<<argument>>")
-		} else {
-			textView.insertText("$<<\(suggestion.name)>>")
-		}
 	}
+	
 }
diff --git a/OpenTerm/Controller/Scripting/ScriptMetadataViewController.swift b/OpenTerm/Controller/Scripting/ScriptMetadataViewController.swift
new file mode 100644
index 00000000..0dd9d590
--- /dev/null
+++ b/OpenTerm/Controller/Scripting/ScriptMetadataViewController.swift
@@ -0,0 +1,319 @@
+//
+//  ScriptMetadataViewController.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 03/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import UIKit
+
+enum ScriptMetadataState {
+	case create
+	case update(PridelandDocument)
+}
+
+protocol ScriptMetadataViewControllerDelegate: class {
+	
+	func didUpdateScript(_ updatedDocument: PridelandDocument)
+	func didCreateScript(_ document: PridelandDocument)
+	
+}
+
+class ScriptMetadataViewController: UIViewController {
+
+	@IBOutlet weak var scrollView: UIScrollView!
+	@IBOutlet weak var nameTextField: UITextField!
+	@IBOutlet weak var descriptionTextView: CustomTextView!
+	@IBOutlet weak var saveBarButtonItem: UIBarButtonItem!
+	@IBOutlet weak var colorBarPicker: CustomColorBarPicker!
+	@IBOutlet weak var nameErrorLbl: UILabel!
+	
+	weak var delegate: ScriptMetadataViewControllerDelegate?
+	
+	let keyboardObserver = KeyboardObserver()
+
+	var state: ScriptMetadataState!
+	
+	override func viewDidLoad() {
+        super.viewDidLoad()
+
+		nameTextField.delegate = self
+		
+		nameTextField.keyboardAppearance = UserDefaultsController.shared.useDarkKeyboard ? .dark : .light
+		descriptionTextView.keyboardAppearance = UserDefaultsController.shared.useDarkKeyboard ? .dark : .light
+
+		nameErrorLbl.isHidden = true
+		
+		keyboardObserver.observe { [weak self] (state) in
+			self?.adjustInsets(for: state)
+		}
+		
+		guard let state = state else {
+			return
+		}
+		
+		switch state {
+		case .create:
+			self.title = "New script"
+			saveBarButtonItem.title = "Create"
+			
+		case .update(let document):
+			
+			if let name = document.metadata?.name {
+				self.title = "Edit “\(name)”"
+			} else {
+				self.title = "Edit ”\(document.fileURL.lastPathComponent)”"
+			}
+			
+			saveBarButtonItem.title = "Save"
+			nameTextField.text = document.metadata?.name ?? ""
+			descriptionTextView.text = document.metadata?.description ?? ""
+			colorBarPicker.hue = CGFloat(document.metadata?.hueTint ?? 0.0)
+			
+		}
+		
+		self.preferredContentSize = CGSize(width: 600, height: 344)
+		
+    }
+	
+	override func viewWillAppear(_ animated: Bool) {
+		super.viewWillAppear(animated)
+		
+		guard let state = state else {
+			return
+		}
+		
+		if case .create = state {
+			
+			nameTextField.becomeFirstResponder()
+			
+		}
+		
+	}
+	
+	override func viewWillDisappear(_ animated: Bool) {
+		super.viewWillDisappear(animated)
+		
+		self.view.endEditing(true)
+		
+	}
+	
+	private func adjustInsets(for state: KeyboardEvent) {
+		
+		let rect = self.scrollView.convert(state.keyboardFrameEnd, from: nil).intersection(self.scrollView.bounds)
+		
+		UIView.animate(withDuration: state.duration, delay: 0.0, options: state.options, animations: {
+			
+			if rect.height == 0 {
+				
+				// Keyboard is not visible.
+				
+				self.scrollView.contentInset.bottom = 0
+				self.scrollView.scrollIndicatorInsets.bottom = 0
+				
+			} else {
+				
+				// Keyboard is visible, keyboard height includes safeAreaInsets.
+				
+				let bottomInset = rect.height - self.view.safeAreaInsets.bottom
+				
+				self.scrollView.contentInset.bottom = bottomInset
+				self.scrollView.scrollIndicatorInsets.bottom = bottomInset
+				
+			}
+			
+		}, completion: nil)
+		
+	}
+	
+	@IBAction func cancel(_ sender: UIBarButtonItem) {
+		
+		self.dismiss(animated: true, completion: nil)
+		
+	}
+	
+	@IBAction func save(_ sender: UIBarButtonItem) {
+		
+		guard let state = state else {
+			return
+		}
+		
+		let name = nameTextField.text ?? ""
+
+		guard !name.isEmpty else {
+			validateName(name)
+			return
+		}
+		
+		let metadata = self.metadata()
+		
+		switch state {
+		case .create:
+			let url = DocumentManager.shared.scriptsURL.appendingPathComponent("\(metadata.name).prideland")
+			
+			let document = PridelandDocument(fileURL: url)
+			document.metadata = metadata
+			
+			document.save(to: url, for: .forCreating) { (success) in
+				
+				if success {
+					self.dismiss(animated: true, completion: nil)
+					self.delegate?.didCreateScript(document)
+				} else {
+					self.showErrorAlert()
+				}
+
+			}
+			
+		case .update(let currentDocument):
+			
+			let prevMetadata = currentDocument.metadata
+			
+			currentDocument.metadata = metadata
+
+			if prevMetadata?.name != metadata.name {
+				
+				// rename
+
+				let url = DocumentManager.shared.scriptsURL.appendingPathComponent("\(metadata.name).prideland")
+
+				currentDocument.save(to: url, for: .forCreating) { (success) in
+					
+					if success {
+						self.dismiss(animated: true, completion: nil)
+						self.delegate?.didUpdateScript(currentDocument)
+					} else {
+						self.showErrorAlert()
+					}
+					
+				}
+				
+			} else {
+				
+				currentDocument.updateChangeCount(.done)
+				delegate?.didUpdateScript(currentDocument)
+				self.dismiss(animated: true, completion: nil)
+
+			}
+
+		}
+		
+
+	}
+	
+	private func metadata() -> PridelandMetadata {
+		
+		let name = nameTextField.text ?? ""
+		let description = descriptionTextView.text ?? ""
+		let hueTint = Double(colorBarPicker.hue)
+		
+		return PridelandMetadata(name: name, description: description, hueTint: hueTint)
+	}
+
+}
+
+extension ScriptMetadataViewController: UITextFieldDelegate {
+
+	func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+		
+		guard let currentText = textField.text else {
+			return true
+		}
+		
+		let newString = (currentText as NSString).replacingCharacters(in: range, with: string) as String
+		
+		validateName(newString)
+		
+		return true
+	}
+	
+	func validateName(_ value: String) {
+		
+		if let error = nameValidationError(value) {
+			
+			nameErrorLbl.text = error
+			nameErrorLbl.isHidden = false
+			
+		} else {
+			
+			nameErrorLbl.isHidden = true
+			
+		}
+		
+	}
+	
+	func nameValidationError(_ name: String) -> String? {
+		
+		guard let state = state else {
+			return nil
+		}
+		
+		if name.isEmpty {
+			return "Command name is required."
+		}
+		
+		if name.contains(" ") {
+			return "Command name may not contain spaces."
+		}
+		
+		let url: URL?
+		
+		switch state {
+		case .create:
+			url = nil
+			
+		case .update(let document):
+			url = document.fileURL
+			
+		}
+		
+		let usedNames = allUsedScriptNames(ignoringURL: url)
+		
+		if usedNames.contains(name) {
+			return "This command name is already used."
+		}
+		
+		return nil
+	}
+	
+	func allUsedScriptNames(ignoringURL: URL?) -> [String] {
+		
+		let fileManager = DocumentManager.shared.fileManager
+		
+		do {
+			
+			let documentsURLs = try fileManager.contentsOfDirectory(at: DocumentManager.shared.scriptsURL, includingPropertiesForKeys: [], options: .skipsPackageDescendants)
+		
+			let pridelandURLs = documentsURLs.filter({ $0 != ignoringURL && $0.pathExtension.lowercased() == "prideland" })
+			
+			return pridelandURLs.map({ ($0.lastPathComponent as NSString).deletingPathExtension })
+			
+		} catch {
+			
+			return []
+		}
+		
+	}
+	
+	func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+	
+		if textField == nameTextField {
+			descriptionTextView.becomeFirstResponder()
+			
+			// Return false so text view doesn't type new line.
+			return false
+		}
+		
+		return true
+	}
+	
+}
+
+extension ScriptMetadataViewController: StoryboardIdentifiable {
+	
+	static var storyboardIdentifier: String {
+		return "ScriptMetadataViewController"
+	}
+
+}
diff --git a/OpenTerm/Controller/Scripting/ScriptsViewController.swift b/OpenTerm/Controller/Scripting/ScriptsViewController.swift
index d4f4b7f8..2af451c9 100644
--- a/OpenTerm/Controller/Scripting/ScriptsViewController.swift
+++ b/OpenTerm/Controller/Scripting/ScriptsViewController.swift
@@ -9,22 +9,81 @@
 import UIKit
 import PanelKit
 
-class ScriptsViewController: UITableViewController {
+struct PridelandOverview {
+	
+	let url: URL
+	let metadata: PridelandMetadata
+
+	init(url: URL, fileWrapper: FileWrapper) throws {
+
+		guard let wrappers = fileWrapper.fileWrappers else {
+			throw PridelandDocumentError.invalidDocument
+		}
+	
+		guard let metadataData = wrappers["metadata.plist"]?.regularFileContents else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		let decoder = PropertyListDecoder()
+		
+		guard let metadata = try? decoder.decode(PridelandMetadata.self, from: metadataData) else {
+			throw PridelandDocumentError.invalidDocument
+		}
+		
+		self.metadata = metadata
+		self.url = url
+		
+	}
+	
+}
 
-	var scriptNames: [String] = [] {
-		didSet {
-			tableView.reloadData()
+extension PridelandOverview: Equatable {
+	
+	static func ==(lhs: PridelandOverview, rhs: PridelandOverview) -> Bool {
+		return lhs.url == rhs.url &&
+			lhs.metadata == rhs.metadata
+	}
+	
+}
+
+class ScriptsViewController: UIViewController {
+
+	enum CellType: Equatable {
+		case prideland(PridelandOverview)
+		
+		static func ==(lhs: CellType, rhs: CellType) -> Bool {
+			switch (lhs, rhs) {
+			case let (.prideland(overview1), .prideland(overview2)):
+				return overview1 == overview2
+			}
 		}
 	}
+	
+	@IBOutlet weak var collectionView: UICollectionView!
+	
+	var cellItems: [CellType]?
+	
+	var directoryObserver: DirectoryObserver?
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
+		
+		self.title = "Scripts"
+		
+		collectionView.register(UINib(nibName: "PridelandCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "PridelandCollectionViewCell")
+
+		collectionView.dataSource = self
+		collectionView.delegate = self
 
 		self.view.tintColor = .defaultMainTintColor
 		self.navigationController?.navigationBar.barStyle = .blackTranslucent
 
-		// Remove separators beyond content
-		self.tableView.tableFooterView = UIView()
+		directoryObserver = DirectoryObserver(pathToWatch: DocumentManager.shared.scriptsURL) { [weak self] in
+			self?.reload()
+		}
+		
+		try? directoryObserver?.startObserving()
+		
 	}
 
 	override func viewWillAppear(_ animated: Bool) {
@@ -32,6 +91,19 @@ class ScriptsViewController: UITableViewController {
 
 		reload()
 	}
+	
+	override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+		
+		coordinator.animate(alongsideTransition: { (ctx) in
+			
+			
+		}, completion: { (ctx) in
+			
+			self.collectionView.collectionViewLayout.invalidateLayout()
+
+		})
+		
+	}
 
 	override var preferredStatusBarStyle: UIStatusBarStyle {
 		return .lightContent
@@ -39,56 +111,165 @@ class ScriptsViewController: UITableViewController {
 
 	@objc
 	fileprivate func addScript() {
-		let alertController = UIAlertController(title: "New Script", message: "Enter a unique name for your new script.", preferredStyle: .alert)
-		alertController.addTextField { textField in
-			textField.placeholder = "script_name"
-			textField.autocapitalizationType = .none
-			textField.autocorrectionType = .no
-		}
-		alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-		alertController.addAction(UIAlertAction(title: "Create", style: .default, handler: { [unowned self] _ in
-			guard let name = alertController.textFields?.first?.text else {
-				return
-			}
-			
-			Script.create(name)
-			self.reload()
-		}))
-		self.present(alertController, animated: true, completion: nil)
+		
+		let scriptMetadataVC = UIStoryboard.main.scriptMetadataViewController(state: .create)
+		scriptMetadataVC.delegate = self
+		
+		let navController = UINavigationController(rootViewController: scriptMetadataVC)
+		navController.navigationBar.barStyle = .blackTranslucent
+		navController.modalPresentationStyle = .formSheet
+		
+		self.present(navController, animated: true, completion: nil)
+		
 	}
 
 	private func reload() {
-		self.scriptNames = Script.allNames
+		
+		let fileManager = DocumentManager.shared.fileManager
+		
+		do {
+
+			let documentsURLs = try fileManager.contentsOfDirectory(at: DocumentManager.shared.scriptsURL, includingPropertiesForKeys: [], options: .skipsPackageDescendants)
+			
+			var pridelandOverviews = [PridelandOverview]()
+			
+			for documentURL in documentsURLs {
+
+				let pathExtension = documentURL.pathExtension.lowercased()
+				
+				if pathExtension == "icloud" {
+					try fileManager.startDownloadingUbiquitousItem(at: documentURL)
+					continue
+				}
+				
+				guard pathExtension == "prideland" else {
+					continue
+				}
+				
+				let fileWrapper = try FileWrapper(url: documentURL, options: [])
+				
+				let overview = try PridelandOverview(url: documentURL, fileWrapper: fileWrapper)
+				
+				pridelandOverviews.append(overview)
+				
+			}
+			
+			pridelandOverviews.sort(by: { $0.metadata.name < $1.metadata.name })
+			updatePridelandItems(pridelandOverviews)
+			
+		} catch {
+			
+			self.showErrorAlert(error)
+			
+		}
+			
+	}
+	
+	func updatePridelandItems(_ overviews: [PridelandOverview]) {
+		
+		let newItems: [CellType] = overviews.map({ .prideland($0) })
+		
+		guard let prevItems = cellItems else {
+			cellItems = newItems
+			collectionView.reloadData()
+			return
+		}
+		
+		collectionView.update(dataSourceUpdateClosure: {
+			
+			cellItems = newItems
+			
+		}, section: 0, from: prevItems, to: newItems, sameIdentityClosure: { (p1, p2) -> Bool in
+			
+			switch (p1, p2) {
+			case let (.prideland(overview1), .prideland(overview2)):
+				return overview1.url == overview2.url
+			}
+			
+		}, sameValueClosure: { (p1, p2) -> Bool in
+			
+			return p1 == p2
+			
+		})
+		
 	}
 	
 }
 
-extension ScriptsViewController {
+extension ScriptsViewController: UICollectionViewDataSource {
 	
-	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-		return scriptNames.count
+	func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+		return cellItems?.count ?? 0
 	}
-
-	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-		let cell = tableView.dequeueReusableCell(withIdentifier: "ScriptCell", for: indexPath)
-
-		cell.textLabel?.text = scriptNames[indexPath.row]
-
+	
+	func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+		
+		let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PridelandCollectionViewCell", for: indexPath) as! PridelandCollectionViewCell
+		
+		guard let cellItem = cellItems?[indexPath.row] else {
+			return cell
+		}
+		
+		switch cellItem {
+		case .prideland(let pridelandOverview):
+			cell.show(pridelandOverview)
+		}
+		
 		return cell
 	}
 	
 }
 
-extension ScriptsViewController {
-
-	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-		tableView.deselectRow(at: indexPath, animated: true)
+extension ScriptsViewController: UICollectionViewDelegateFlowLayout {
 
-		guard let script = try? Script.named(scriptNames[indexPath.row]) else {
+	func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+		
+		let preferredWidth: CGFloat = 240
+		
+		let availableWidth = collectionView.bounds.width - collectionView.contentInset.left - collectionView.contentInset.right - 32
+		
+		let columns = max(1, Int(availableWidth / preferredWidth))
+		
+		let spacing: CGFloat = 16
+		
+		let width: CGFloat = (availableWidth - ((CGFloat(columns) - 1.0) * spacing)) / CGFloat(columns)
+		
+		return CGSize(width: width, height: 100)
+	}
+	
+	func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+		
+		guard let cellItem = cellItems?[indexPath.row] else {
 			return
 		}
-		let vc = ScriptEditViewController(script: script)
-		self.navigationController?.pushViewController(vc, animated: true)
+		
+		switch cellItem {
+		case .prideland(let pridelandOverview):
+			openPrideland(url: pridelandOverview.url, title: pridelandOverview.metadata.name)
+			
+		}
+
+	}
+	
+	func openPrideland(url: URL, title: String) {
+		
+		let scriptVC = ScriptEditViewController(url: url)
+		scriptVC.title = title
+		self.navigationController?.pushViewController(scriptVC, animated: true)
+		
+	}
+	
+}
+
+extension ScriptsViewController: ScriptMetadataViewControllerDelegate {
+	
+	func didUpdateScript(_ updatedDocument: PridelandDocument) {
+		self.reload()
+	}
+	
+	func didCreateScript(_ document: PridelandDocument) {
+		self.reload()
+		openPrideland(url: document.fileURL, title: document.metadata?.name ?? "")
 	}
 	
 }
@@ -110,6 +291,15 @@ extension ScriptsViewController: PanelContentDelegate {
 	var maximumPanelContentSize: CGSize {
 		return CGSize(width: 600, height: 800)
 	}
+	
+	var shouldAdjustForKeyboard: Bool {
+		
+		if let scriptVC = self.navigationController?.visibleViewController as? ScriptEditViewController {
+			return scriptVC.shouldAdjustForKeyboard
+		}
+		
+		return false
+	}
 
 }
 
diff --git a/OpenTerm/Controller/TerminalViewController.swift b/OpenTerm/Controller/TerminalViewController.swift
index 329ece69..894bedc4 100644
--- a/OpenTerm/Controller/TerminalViewController.swift
+++ b/OpenTerm/Controller/TerminalViewController.swift
@@ -15,21 +15,6 @@ import PanelKit
 import StoreKit
 import MobileCoreServices
 
-extension String {
-	func toCString() -> UnsafePointer<Int8>? {
-		let nsSelf: NSString = self as NSString
-		return nsSelf.cString(using: String.Encoding.utf8.rawValue)
-	}
-}
-
-extension String {
-
-	var utf8CString: UnsafeMutablePointer<Int8> {
-		return UnsafeMutablePointer(mutating: (self as NSString).utf8String!)
-	}
-
-}
-
 class TerminalViewController: UIViewController {
 
 	let terminalView: TerminalView
@@ -45,6 +30,8 @@ class TerminalViewController: UIViewController {
 	var bookmarkViewController: BookmarkViewController!
 	var bookmarkPanelViewController: PanelViewController!
 
+	var cubPanels = [PanelViewController]()
+	
 	private var overflowItems: [OverflowItem] = [] {
 		didSet {
 			applyOverflowState()
@@ -126,6 +113,7 @@ class TerminalViewController: UIViewController {
 			contentWrapperView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
 			])
 
+		contentWrapperView.backgroundColor = .black
 		
 		terminalView.translatesAutoresizingMaskIntoConstraints = false
 		contentWrapperView.addSubview(terminalView)
@@ -148,6 +136,7 @@ class TerminalViewController: UIViewController {
 		replaceCommand("share", mangleFunctionName("shareFile"), true)
 		replaceCommand("pbcopy", mangleFunctionName("pbcopy"), true)
 		replaceCommand("pbpaste", mangleFunctionName("pbpaste"), true)
+		replaceCommand("cub", mangleFunctionName("cub"), true)
 		replaceCommand("credits", mangleFunctionName("credits"), true)
 
 		// Call reloadData for the added commands.
@@ -361,7 +350,9 @@ class TerminalViewController: UIViewController {
 	}
 	
 	private func showScripts(_ sender: UIView) {
-		presentPopover(scriptsPanelViewController, from: sender)
+				
+		present(scriptsPanelViewController, animated: true, completion: nil)
+		
 	}
 	
 	private func showBookmarks(_ sender: UIView) {
@@ -489,7 +480,7 @@ extension TerminalViewController: HistoryViewControllerDelegate {
 extension TerminalViewController: PanelManager {
 
 	var panels: [PanelViewController] {
-		return [historyPanelViewController, scriptsPanelViewController, bookmarkPanelViewController]
+		return [historyPanelViewController, scriptsPanelViewController, bookmarkPanelViewController] + cubPanels
 	}
 
 	var panelContentWrapperView: UIView {
diff --git a/OpenTerm/Util/AutoComplete/AutoCompleteManager+InputAssistant.swift b/OpenTerm/Data/AutoComplete/AutoCompleteManager+InputAssistant.swift
similarity index 100%
rename from OpenTerm/Util/AutoComplete/AutoCompleteManager+InputAssistant.swift
rename to OpenTerm/Data/AutoComplete/AutoCompleteManager+InputAssistant.swift
diff --git a/OpenTerm/Util/AutoComplete/AutoCompleteManager.swift b/OpenTerm/Data/AutoComplete/AutoCompleteManager.swift
similarity index 100%
rename from OpenTerm/Util/AutoComplete/AutoCompleteManager.swift
rename to OpenTerm/Data/AutoComplete/AutoCompleteManager.swift
diff --git a/OpenTerm/Util/Bookmarks/BookmarkManager.swift b/OpenTerm/Data/BookmarkManager.swift
similarity index 100%
rename from OpenTerm/Util/Bookmarks/BookmarkManager.swift
rename to OpenTerm/Data/BookmarkManager.swift
diff --git a/OpenTerm/Data/CommandManager.swift b/OpenTerm/Data/CommandManager.swift
new file mode 100644
index 00000000..08e65e57
--- /dev/null
+++ b/OpenTerm/Data/CommandManager.swift
@@ -0,0 +1,67 @@
+//
+//  CommandManager.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 09/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import Foundation
+
+class CommandManager {
+	
+	let documentManager: DocumentManager
+	
+	var fileManager: FileManager {
+		return documentManager.fileManager
+	}
+
+	static let shared = CommandManager(documentManager: .shared)
+
+	init(documentManager: DocumentManager) {
+		
+		self.documentManager = documentManager
+		
+	}
+	
+	var scriptCommands: [String] {
+		
+		do {
+			
+			let documentsURLs = try fileManager.contentsOfDirectory(at: documentManager.scriptsURL, includingPropertiesForKeys: [], options: .skipsPackageDescendants)
+			
+			let pridelandURLs = documentsURLs.filter({ $0.pathExtension.lowercased() == "prideland" })
+			
+			return pridelandURLs.map({ ($0.lastPathComponent as NSString).deletingPathExtension })
+			
+		} catch {
+			
+			return []
+		}
+		
+	}
+	
+	func script(named name: String) -> PridelandDocument? {
+		
+		guard scriptCommands.contains(name) else {
+			return nil
+		}
+		
+		let documentURL = documentManager.scriptsURL.appendingPathComponent("\(name).prideland")
+		
+		guard let fileWrapper = try? FileWrapper(url: documentURL, options: []) else {
+			return nil
+		}
+		
+		let document = PridelandDocument(fileURL: documentURL)
+		
+		do {
+			try document.load(fromContents: fileWrapper, ofType: "prideland")
+		} catch {
+			return nil
+		}
+		
+		return document
+	}
+	
+}
diff --git a/OpenTerm/Util/DocumentManager.swift b/OpenTerm/Data/DocumentManager.swift
similarity index 93%
rename from OpenTerm/Util/DocumentManager.swift
rename to OpenTerm/Data/DocumentManager.swift
index 575140f1..aeb4f42b 100644
--- a/OpenTerm/Util/DocumentManager.swift
+++ b/OpenTerm/Data/DocumentManager.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import UIKit
 import ios_system
 
 class DocumentManager {
@@ -15,7 +14,7 @@ class DocumentManager {
 	static let shared = DocumentManager()
 
 	let fileManager: FileManager
-
+	
 	init(fileManager: FileManager = .default) {
 
 		self.fileManager = fileManager
@@ -37,6 +36,10 @@ class DocumentManager {
 		return fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
 	}
 
+	lazy var scriptsURL: URL = {
+		return activeDocumentsFolderURL.appendingPathComponent(".scripts")
+	}()
+	
 	private var cloudDocumentsURL: URL? {
 
 		guard iCloudAvailable else {
diff --git a/OpenTerm/Util/History/HistoryManager.swift b/OpenTerm/Data/HistoryManager.swift
similarity index 100%
rename from OpenTerm/Util/History/HistoryManager.swift
rename to OpenTerm/Data/HistoryManager.swift
diff --git a/OpenTerm/Data/StoryboardFactory.swift b/OpenTerm/Data/StoryboardFactory.swift
new file mode 100644
index 00000000..d26b1f30
--- /dev/null
+++ b/OpenTerm/Data/StoryboardFactory.swift
@@ -0,0 +1,71 @@
+//
+//  StoryboardFactory.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 04/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+protocol StoryboardIdentifiable {
+	static var storyboardIdentifier: String { get }
+}
+
+extension UIStoryboard {
+	
+	static var main: MainStoryboard {
+		return MainStoryboard()
+	}
+	
+}
+
+class MainStoryboard: StoryboardWrapper {
+	
+	let uiStoryboard: UIStoryboard
+	
+	init() {
+		uiStoryboard = UIStoryboard(name: "Main", bundle: nil)
+	}
+	
+	func scriptMetadataViewController(state: ScriptMetadataState) -> ScriptMetadataViewController {
+		let vc: ScriptMetadataViewController = instantiateViewController()
+		vc.state = state
+		return vc
+	}
+	
+}
+
+protocol StoryboardWrapper {
+	
+	var uiStoryboard: UIStoryboard { get }
+	
+}
+
+extension StoryboardWrapper {
+	
+	// MARK: - Generic
+	
+	// Alternatively, you could use this generic function,
+	// Please note: this requires defining the UIViewController type
+	// E.g.:
+	// let fooVC: FooViewController = UIStoryboard.main.instantiateViewController()
+	//
+	// With the convenience functions, you can write:
+	// let fooVC = UIStoryboard.main.fooViewController()
+	
+	func instantiateViewController<T: UIViewController>() -> T where T: StoryboardIdentifiable {
+		
+		guard let vc: T = instantiateViewController(withIdentifier: T.storyboardIdentifier) else {
+			fatalError("Could not instantiate view controller \"\(T.self)\" for identifier: \"\(T.storyboardIdentifier)\"")
+		}
+		
+		return vc
+	}
+	
+	private func instantiateViewController<T: UIViewController>(withIdentifier identifier: String) -> T? {
+		return uiStoryboard.instantiateViewController(withIdentifier: identifier) as? T
+	}
+	
+}
diff --git a/OpenTerm/Util/UserDefaultsController.swift b/OpenTerm/Data/UserDefaultsController.swift
similarity index 100%
rename from OpenTerm/Util/UserDefaultsController.swift
rename to OpenTerm/Data/UserDefaultsController.swift
diff --git a/OpenTerm/Util/DirectoryObserver.swift b/OpenTerm/Util/DirectoryObserver.swift
new file mode 100644
index 00000000..ff683c58
--- /dev/null
+++ b/OpenTerm/Util/DirectoryObserver.swift
@@ -0,0 +1,161 @@
+//
+//  DirectoryObserver.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 06/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+// Adapted from https://github.com/dcvz/DirectoryObserver/blob/master/DirectoryObserver/Classes/DirectoryObserver.swift
+
+import Foundation
+
+public class DirectoryObserver {
+	
+	static let pollInterval: TimeInterval = 0.2
+	static let pollRetryCount = 5
+	
+	// MARK: - Errors
+	public enum DirectoryObserverError: Error {
+		case alreadyObserving
+		case failedToStartObserver
+		case invalidPath
+	}
+	
+	// MARK: - Attributes
+	public let watchedPath: URL
+	private(set) var isObserving = false
+	
+	
+	// MARK: - Attributes (Private)
+	private let completionHandler: (() -> Void)
+	private var queue = DispatchQueue(label: "DCDirectoryWatcherQueue")
+	private var retriesLeft = pollRetryCount
+	private var isDirectoryChanging = false
+	private var source: DispatchSourceFileSystemObject?
+	
+	// MARK: - Initializers
+	public init(pathToWatch path: URL, callback: @escaping () -> Void) {
+		watchedPath = path
+		completionHandler = callback
+	}
+	
+	deinit {
+		try? stopObserving()
+	}
+	
+	
+	// MARK: - Public Interface
+	/// Starts the observer
+	public func startObserving() throws {
+		if source != nil {
+			throw DirectoryObserverError.alreadyObserving
+		}
+		
+		let path = watchedPath.path
+		
+		// Open an event-only file descriptor associated with the directory
+		let fd: CInt = open(path, O_EVTONLY)
+		
+		if fd < 0 {
+			throw DirectoryObserverError.failedToStartObserver
+		}
+		
+		let cleanup = {  }
+		
+		// Get a low priority queue
+		let queue: DispatchQueue = DispatchQueue.global(qos: .background)
+		
+		// Monitor the directory for writes
+		source = DispatchSource.makeFileSystemObjectSource(fileDescriptor: fd, eventMask: [.write], queue: queue)
+		
+		if let source = source {
+			// Call directoryDidChange on event callback
+			source.setEventHandler { [weak self] in
+				self?.directoryDidChange()
+			}
+			
+			// Dispatch source destructor
+			source.setCancelHandler {
+				close(fd)
+			}
+			
+			// Sources are create in suspended state, so resume it
+			source.resume()
+		} else {
+			cleanup()
+			throw DirectoryObserverError.failedToStartObserver
+		}
+		
+		isObserving = true
+	}
+	
+	
+	/// Stops the observer
+	public func stopObserving() throws {
+		if source != nil {
+			source!.cancel()
+			source = nil
+		}
+		
+		isObserving = false
+	}
+	
+	
+	// MARK: - Private Methods
+	private func directoryDidChange() {
+		if !isDirectoryChanging {
+			isDirectoryChanging = true
+			retriesLeft = DirectoryObserver.pollRetryCount
+			checkForChangesAfterDelay()
+		}
+	}
+	
+	private func checkForChangesAfterDelay() {
+		let metadata: [String] = directoryMetadata()
+		
+		let popTime = DispatchTime.now() + DirectoryObserver.pollInterval
+
+		queue.asyncAfter(deadline: popTime, execute: { [weak self] in
+			self?.pollDirectoryForChanges(metadata: metadata)
+		})
+		
+	}
+	
+	private func directoryMetadata() -> [String] {
+		
+		let fm = FileManager.default
+		
+		let contents = try? fm.contentsOfDirectory(at: watchedPath, includingPropertiesForKeys: nil, options: [])
+		var directoryMetadata: [String] = []
+		
+		if let contents = contents {
+			for file in contents {
+				autoreleasepool {
+					if let fileAttributes = try? fm.attributesOfItem(atPath: file.path) {
+						let fileSize = fileAttributes[FileAttributeKey.size] as! Int
+						let fileHash = "\(file.lastPathComponent)\(fileSize)"
+						directoryMetadata.append(fileHash)
+					}
+				}
+			}
+		}
+		
+		return directoryMetadata
+	}
+	
+	private func pollDirectoryForChanges(metadata oldDirectoryMetadata: [String]) {
+		let newDirectoryMetadata = directoryMetadata()
+		
+		isDirectoryChanging = !(newDirectoryMetadata == oldDirectoryMetadata)
+		retriesLeft = isDirectoryChanging ? DirectoryObserver.pollRetryCount : retriesLeft
+		
+		if isDirectoryChanging || (retriesLeft > 0) {
+			retriesLeft -= 1
+			checkForChangesAfterDelay()
+		} else {
+			DispatchQueue.main.async { [weak self] in
+				self?.completionHandler()
+			}
+		}
+	}
+}
diff --git a/OpenTerm/Util/Execution/CommandExecutor.swift b/OpenTerm/Util/Execution/CommandExecutor.swift
index 842b922d..127e3ec7 100644
--- a/OpenTerm/Util/Execution/CommandExecutor.swift
+++ b/OpenTerm/Util/Execution/CommandExecutor.swift
@@ -14,6 +14,8 @@ protocol CommandExecutorDelegate: class {
 	func commandExecutor(_ commandExecutor: CommandExecutor, receivedStderr stderr: Data)
 	func commandExecutor(_ commandExecutor: CommandExecutor, didChangeWorkingDirectory to: URL)
 	func commandExecutor(_ commandExecutor: CommandExecutor, stateDidChange newState: CommandExecutor.State)
+	func commandExecutor(_ commandExecutor: CommandExecutor, waitForInput callback: @escaping (String) -> Void)
+	func commandExecutor(_ commandExecutor: CommandExecutor, executeSubCommand subCommand: String, callback: @escaping () -> Void)
 }
 
 // Exit status from an ios_system command
@@ -31,6 +33,7 @@ class CommandExecutor {
 	enum State {
 		case idle
 		case running
+		case waitingForInput
 	}
 
 	var state: State = .idle {
@@ -50,8 +53,6 @@ class CommandExecutor {
 		}
 	}
 
-	/// Dispatch queue to serially run commands on.
-	private let executionQueue = DispatchQueue(label: "CommandExecutor", qos: .userInteractive)
 	/// Dispatch queue that delegate methods will be called on.
 	private let delegateQueue = DispatchQueue(label: "CommandExecutor-Delegate", qos: .userInteractive)
 
@@ -83,7 +84,12 @@ class CommandExecutor {
 	// Dispatch a new text-based command to execute.
 	func dispatch(_ command: String) {
 
-		executionQueue.async {
+		let queue = DispatchQueue(label: "\(command)", qos: .utility)
+		
+		queue.async {
+		
+			Thread.current.name = command
+		
 			self.state = .running
 
 			DocumentManager.shared.currentDirectoryURL = self.currentWorkingDirectory
@@ -158,13 +164,16 @@ class CommandExecutor {
 
 		// Separate in to command and arguments
 		let components = command.components(separatedBy: .whitespaces)
-		guard components.count > 0 else { return EmptyExecutorCommand() }
+		guard components.count > 0 else {
+			return EmptyExecutorCommand()
+		}
+		
 		let program = components[0]
 		let args = Array(components[1..<components.endIndex])
 
 		// Special case for scripts
-		if Script.allNames.contains(program), let script = try? Script.named(program) {
-			return ScriptExecutorCommand(script: script, arguments: args, context: context)
+		if let scriptDocument = CommandManager.shared.script(named: program) {
+			return ScriptExecutorCommand(script: scriptDocument, arguments: args, context: context)
 		}
 
 		// Default case: Just execute the string itself
diff --git a/OpenTerm/Util/Scripting/Cub+Runner.swift b/OpenTerm/Util/Scripting/Cub+Runner.swift
new file mode 100644
index 00000000..d314775d
--- /dev/null
+++ b/OpenTerm/Util/Scripting/Cub+Runner.swift
@@ -0,0 +1,87 @@
+//
+//  Cub+Runner.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 04/03/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import Foundation
+import Cub
+
+extension Runner {
+	
+	static func runner(executor: CommandExecutor, executorDelegate: CommandExecutorDelegate) -> Runner {
+		
+		let runner = Runner(logDebug: false, logTime: false)
+		
+		runner.registerExternalFunction(name: "print", argumentNames: ["input"], returns: true) { (arguments, callback) in
+			
+			for (_, arg) in arguments {
+				
+				var input = arg.description(with: runner.compiler)
+				input = input.replacingOccurrences(of: "\\n", with: "\n")
+				
+				if let data = input.data(using: .utf8) {
+					executorDelegate.commandExecutor(executor, receivedStdout: data)
+				}
+			}
+			
+			Thread.sleep(forTimeInterval: 0.02)
+			_ = callback(.number(1))
+			return
+		}
+		
+		runner.registerExternalFunction(name: "readNumber", argumentNames: [], returns: true) { (arguments, callback) in
+			
+			executorDelegate.commandExecutor(executor, waitForInput: { (input) in
+				
+				if let i = NumberType(input) {
+					_ = callback(.number(i))
+				} else {
+					_ = callback(.number(0))
+				}
+				
+			})
+
+			return
+		}
+		
+		runner.registerExternalFunction(name: "readLine", argumentNames: [], returns: true) { (arguments, callback) in
+			
+			executorDelegate.commandExecutor(executor, waitForInput: { (input) in
+				_ = callback(.string(input))
+			})
+
+			return
+		}
+		
+		runner.registerExternalFunction(name: "exec", argumentNames: ["command"], returns: true) { (arguments, callback) in
+			
+			var arguments = arguments
+			
+			guard let command = arguments.removeValue(forKey: "command") else {
+				_ = callback(.number(1))
+				return
+			}
+			
+			guard case let .string(commandStr) = command else {
+				_ = callback(.number(1))
+				return
+			}
+
+			executorDelegate.commandExecutor(executor, executeSubCommand: commandStr, callback: {
+				
+				DispatchQueue.main.async {
+					
+					_ = callback(.number(1))
+				}
+
+			})
+			
+		}
+
+		return runner
+	}
+	
+}
diff --git a/OpenTerm/Util/Scripting/Script.swift b/OpenTerm/Util/Scripting/Script.swift
deleted file mode 100644
index 58592ee6..00000000
--- a/OpenTerm/Util/Scripting/Script.swift
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-//  Script.swift
-//  OpenTerm
-//
-//  Created by iamcdowe on 1/29/18.
-//  Copyright © 2018 Silver Fox. All rights reserved.
-//
-
-import Foundation
-
-private let scriptsDir = DocumentManager.shared.activeDocumentsFolderURL.appendingPathComponent(".scripts")
-
-private enum ScriptError: LocalizedError {
-	case missingArguments(arguments: [String])
-
-	var errorDescription: String? {
-		switch self {
-		case .missingArguments(let arguments): return "Script is missing arguments: \(arguments.joined(separator: ", "))"
-		}
-	}
-}
-
-/// This class contains methods for loading/parsing/executing scripts.
-/// A script is a text file in the .scripts folder, referenced by a unique name (it's file name).
-/// Each script can have a set of named arguments, which are stored in the file in the following format: $<<argument_name>>
-class Script {
-	let name: String
-	var value: String {
-		didSet { save() }
-	}
-
-	private init(name: String, value: String) {
-		self.name = name; self.value = value
-	}
-
-	/// Commands to run, in order.
-	private var commands: [String] { return value.components(separatedBy: .newlines) }
-
-	/// Replace argument templates with argument values
-	func runnableCommands(withArgs args: [String]) throws -> [String] {
-		// Step 1: Parse arguments from "--argname=value" to dictionary ["argname": "value"]
-		let argDict: [String: String] = Dictionary(uniqueKeysWithValues: args.flatMap({ arg in
-			let components = arg.components(separatedBy: "=")
-			guard let name = components.first, let value = components.last else { return nil }
-			return (name.replacingOccurrences(of: "--", with: ""), value)
-		}))
-
-		// Step 2: Find missing arguments, if any
-		let providedArgNames = Set(argDict.keys)
-		let requiredArgNames = Set(self.argumentNames)
-		let missingArgs = requiredArgNames.subtracting(providedArgNames)
-		if !missingArgs.isEmpty {
-			throw ScriptError.missingArguments(arguments: missingArgs.sorted())
-		}
-
-		// Step 3: Replace arg format strings with values for each command, return updated commands.
-		return commands.map { command in
-			var command = command
-			for (key, value) in argDict {
-				command = command.replacingOccurrences(of: "$<<\(key)>>", with: value)
-			}
-			return command
-		}
-	}
-
-	/// The names of the arguments, unique, and sorted by name
-	var argumentNames: [String] {
-		let matches = Script.argumentRegex.matches(in: value, options: [], range: NSRange(location: 0, length: value.count))
-		return Set(matches.flatMap { result in
-			let match = result.range(at: 1)
-			if let range = Range(match, in: value) {
-				return String(value[range])
-			}
-			return nil
-		}).sorted()
-	}
-
-	/// Save the contents of the script to disk
-	private func save() {
-		do {
-			if !DocumentManager.shared.fileManager.fileExists(atPath: scriptsDir.path) {
-				try DocumentManager.shared.fileManager.createDirectory(at: scriptsDir, withIntermediateDirectories: true, attributes: nil)
-			}
-			let scriptFile = scriptsDir.appendingPathComponent(name)
-			try value.write(to: scriptFile, atomically: true, encoding: .utf8)
-		} catch {
-			print("Unable to save script. \(error.localizedDescription)")
-		}
-	}
-
-	static let argumentRegex = try! NSRegularExpression(pattern: "\\$<<(\\w+)>>", options: [])
-
-	/// Load the script with the given name from disk.
-	static func named(_ name: String) throws -> Script {
-		let scriptFile = scriptsDir.appendingPathComponent(name)
-		let value = try String(contentsOf: scriptFile)
-		return Script(name: name, value: value)
-	}
-
-	/// Get all of the script names
-	static var allNames: [String] {
-		return (try? DocumentManager.shared.fileManager.contentsOfDirectory(atPath: scriptsDir.path)) ?? []
-	}
-
-	// Create a new script, or overwrite an existing one.
-	@discardableResult
-	static func create(_ name: String) -> Script {
-		let script = Script(name: name, value: "")
-		script.save()
-		return script
-	}
-}
diff --git a/OpenTerm/Util/Scripting/ScriptExecutorCommand.swift b/OpenTerm/Util/Scripting/ScriptExecutorCommand.swift
index 33164ab6..2e271a86 100644
--- a/OpenTerm/Util/Scripting/ScriptExecutorCommand.swift
+++ b/OpenTerm/Util/Scripting/ScriptExecutorCommand.swift
@@ -7,30 +7,61 @@
 //
 
 import Foundation
+import Cub
+import UIKit
+import TabView
 
 /// Implementation for running a script.
 class ScriptExecutorCommand: CommandExecutorCommand {
 
-	let script: Script
+	let script: PridelandDocument
 	let arguments: [String]
 	let context: CommandExecutionContext
 	
-	init(script: Script, arguments: [String], context: CommandExecutionContext) {
+	init(script: PridelandDocument, arguments: [String], context: CommandExecutionContext) {
 		self.script = script
 		self.arguments = arguments
 		self.context = context
 	}
 
 	func run(forExecutor executor: CommandExecutor) throws -> ReturnCode {
-		let commands = try script.runnableCommands(withArgs: self.arguments)
 
+		guard let executorDelegate = executor.delegate else {
+			return 1
+		}
+		
+		let runner = Runner.runner(executor: executor, executorDelegate: executorDelegate)
+		
+		let source = script.text
+		
 		var returnCode: Int32 = 0
-		for command in commands {
-			// Run the executor command
-			returnCode = try executor.executorCommand(forCommand: command, inContext: self.context).run(forExecutor: executor)
-			if returnCode != 0 {
-				break
+
+		do {
+			
+			try runner.run(source)
+			
+		} catch {
+			
+			let errorMessage: String
+			
+			if let error = error as? DisplayableError {
+				
+				// TODO: make error red in output?
+//				errorMessage = "\n\u{1B}[1m\u{1B}[31mlab\u{1B}[39;49m\u{1B}[0m"
+				
+				errorMessage = "\nError occurred: \(error.description(inSource: source))"
+
+			} else {
+				
+				errorMessage = "\nUnknown error occurred"
+				
+			}
+			
+			if let data = errorMessage.data(using: .utf8) {
+				executorDelegate.commandExecutor(executor, receivedStderr: data)
 			}
+			
+			returnCode = 1
 		}
 
 		return returnCode
diff --git a/OpenTerm/Util/String+C.swift b/OpenTerm/Util/String+C.swift
new file mode 100644
index 00000000..bb7db653
--- /dev/null
+++ b/OpenTerm/Util/String+C.swift
@@ -0,0 +1,22 @@
+//
+//  String+C.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 08/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import Foundation
+
+extension String {
+	
+	func toCString() -> UnsafePointer<Int8>? {
+		let nsSelf: NSString = self as NSString
+		return nsSelf.cString(using: String.Encoding.utf8.rawValue)
+	}
+
+	var utf8CString: UnsafeMutablePointer<Int8> {
+		return UnsafeMutablePointer(mutating: (self as NSString).utf8String!)
+	}
+	
+}
diff --git a/OpenTerm/Util/UICollectionView+Update.swift b/OpenTerm/Util/UICollectionView+Update.swift
new file mode 100644
index 00000000..9c3024f8
--- /dev/null
+++ b/OpenTerm/Util/UICollectionView+Update.swift
@@ -0,0 +1,176 @@
+//
+//  UICollectionView+Update.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 06/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+protocol CollectionView {
+	
+}
+
+extension CollectionView {
+	
+	typealias MoveItemClosure = (_ from: IndexPath, _ to: IndexPath) -> Void
+	typealias DeleteItemClosure = (_ at: IndexPath) -> Void
+	typealias InsertItemClosure = (_ at: IndexPath) -> Void
+	typealias SameIdentityClosure<T> = (T, T) -> Bool
+	typealias SameValueClosure<T> = (T, T) -> Bool
+
+	public func update<T>(section: Int, from oldElements: [T], to newElements: [T], onMoveItem: MoveItemClosure, onDeleteItem: DeleteItemClosure, onInsertItem: InsertItemClosure, sameIdentityClosure: SameIdentityClosure<T>, sameValueClosure: SameValueClosure<T>) {
+		
+		if oldElements.elementsEqual(newElements, by: { sameValueClosure($0, $1) }) {
+			return
+		}
+		
+		for i in 0..<max(oldElements.count, newElements.count) {
+			
+			let indexPath = IndexPath(item: i, section: section)
+			
+			let prevElement: T?
+			let newElement: T?
+			
+			if i < oldElements.count {
+				prevElement = oldElements[i]
+			} else {
+				prevElement = nil
+			}
+			
+			if i < newElements.count {
+				newElement = newElements[i]
+			} else {
+				newElement = nil
+			}
+			
+			if let prevElement = prevElement {
+				
+				// if prev element still exists: move
+				if let newRow = newElements.index(where: { sameIdentityClosure(prevElement, $0) }) {
+					let indexPathTo = IndexPath(item: newRow, section: section)
+					
+					if indexPath != indexPathTo {
+						onMoveItem(indexPath, indexPathTo)
+					}
+					
+				}
+				
+				// if prev element does not exist in new: delete
+				if !newElements.contains(where: { sameIdentityClosure(prevElement, $0) }) {
+					onDeleteItem(indexPath)
+				}
+				
+			}
+			
+			if let newElement = newElement {
+				
+				// if element does not exist in prev: insert
+				if !oldElements.contains(where: { sameIdentityClosure(newElement, $0) }) {
+					onInsertItem(indexPath)
+				}
+				
+			}
+			
+		}
+		
+	}
+	
+}
+
+extension UICollectionView: CollectionView {
+	
+	/// In order to reliable use this update mechanism, make sure every element (in
+	/// oldElements and newElements) is unique. Meaning the `sameIdentityClosure` will not
+	/// return true for 2 different elements in the `oldElements` and `newElements` arrays.
+	///
+	/// - Parameters:
+	///   - section: The section to update.
+	///   - oldElements: The elements in the collection view before the update.
+	///   - newElements: The elements in the collection view after the update.
+	func update<T>(dataSourceUpdateClosure: () -> Void, section: Int, from oldElements: [T], to newElements: [T], sameIdentityClosure: SameIdentityClosure<T>, sameValueClosure: SameValueClosure<T>) {
+		
+		self.performBatchUpdates({
+
+			dataSourceUpdateClosure()
+			
+			update(section: section, from: oldElements, to: newElements, onMoveItem: { (atIndexPath, toIndexPath) in
+				
+				self.moveItem(at: atIndexPath, to: toIndexPath)
+				
+			}, onDeleteItem: { (indexPath) in
+				
+				self.deleteItems(at: [indexPath])
+				
+			}, onInsertItem: { (indexPath) in
+				
+				self.insertItems(at: [indexPath])
+				
+			}, sameIdentityClosure: sameIdentityClosure, sameValueClosure: sameValueClosure)
+			
+		})
+		
+		self.performBatchUpdates({
+
+			for (i, element) in newElements.enumerated() {
+				
+				let indexPath = IndexPath(item: i, section: section)
+				
+				if let oldI = oldElements.index(where: { sameIdentityClosure($0, element) }) {
+					
+					if !sameValueClosure(oldElements[oldI], element) {
+						self.reloadItems(at: [indexPath])
+					}
+					
+				}
+				
+			}
+			
+		})
+			
+	}
+	
+}
+
+extension UITableView: CollectionView {
+
+	/// Make sure to call `beginUpdates()` before calling this, and `endUpdates()` after.
+	///
+	/// In order to reliable use this update mechanism, make sure every element (in
+	/// oldElements and newElements) is unique. Meaning the `Equatable` conformance will not
+	/// return true for 2 different elements in the `oldElements` and `newElements` arrays.
+	///
+	/// - Parameters:
+	///   - section: The section to update.
+	///   - oldElements: The elements in the table view before the update.
+	///   - newElements: The elements in the table view after the update.
+	///   - animation: Row animation to use. Default is `automatic`.
+	func update<T: Equatable>(section: Int, from oldElements: [T], to newElements: [T], animation: UITableViewRowAnimation = .automatic) {
+
+		update(section: section, from: oldElements, to: newElements, onMoveItem: { (atIndexPath, toIndexPath) in
+
+			self.moveRow(at: atIndexPath, to: toIndexPath)
+
+		}, onDeleteItem: { (indexPath) in
+
+			self.deleteRows(at: [indexPath], with: animation)
+
+		}, onInsertItem: { (indexPath) in
+
+			self.insertRows(at: [indexPath], with: animation)
+
+		}, sameIdentityClosure: { (v1, v2) -> Bool in
+			
+			return v1 == v2
+			
+		}, sameValueClosure: { (v1, v2) -> Bool in
+			
+			return v1 == v2
+			
+		})
+
+	}
+
+}
diff --git a/OpenTerm/Util/UIColor+Hex.swift b/OpenTerm/Util/UIColor+Hex.swift
new file mode 100644
index 00000000..2e9f9c3f
--- /dev/null
+++ b/OpenTerm/Util/UIColor+Hex.swift
@@ -0,0 +1,41 @@
+//
+//  UIColor+Hex.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 01/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import UIKit
+
+extension UIColor {
+	
+	public convenience init?(hexString: String) {
+		
+		guard hexString.hasPrefix("#") else {
+			return nil
+		}
+		
+		let start = hexString.index(hexString.startIndex, offsetBy: 1)
+		let hexColor = String(hexString[start...])
+		
+		guard hexColor.count == 6 else {
+			return nil
+		}
+		
+		let scanner = Scanner(string: hexColor)
+		var hexNumber: UInt64 = 0
+		
+		guard scanner.scanHexInt64(&hexNumber) else {
+			return nil
+		}
+		
+		let r = CGFloat((hexNumber & 0xff0000) >> 16) / 255
+		let g = CGFloat((hexNumber & 0x00ff00) >> 8) / 255
+		let b = CGFloat((hexNumber & 0x0000ff)) / 255
+		
+		self.init(red: r, green: g, blue: b, alpha: 1.0)
+	
+	}
+	
+}
diff --git a/OpenTerm/View/CustomColorBarPicker.swift b/OpenTerm/View/CustomColorBarPicker.swift
new file mode 100644
index 00000000..620c3402
--- /dev/null
+++ b/OpenTerm/View/CustomColorBarPicker.swift
@@ -0,0 +1,21 @@
+//
+//  CustomColorBarPicker.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 03/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import HueKit
+
+@IBDesignable
+class CustomColorBarPicker: ColorBarPicker {
+	
+	override open func layoutSubviews() {
+		super.layoutSubviews()
+		
+		colorBarView.layer.cornerRadius = 5.0
+		colorBarView.layer.masksToBounds = true
+	}
+	
+}
diff --git a/OpenTerm/View/CustomTextView.swift b/OpenTerm/View/CustomTextView.swift
new file mode 100644
index 00000000..4f89ef3b
--- /dev/null
+++ b/OpenTerm/View/CustomTextView.swift
@@ -0,0 +1,85 @@
+//
+//  CustomTextView.swift
+//  OpenTerm
+//
+//  Created by Louis D'hauwe on 03/04/2018.
+//  Copyright © 2018 Silver Fox. All rights reserved.
+//
+
+import UIKit
+
+@IBDesignable
+class CustomTextView: UITextView {
+
+	@IBInspectable
+	var placeholder: String = "" {
+		didSet {
+			placeholderLabel.text = placeholder
+		}
+	}
+	
+	override var font: UIFont? {
+		didSet {
+			placeholderLabel.font = self.font
+		}
+	}
+	
+	override var text: String! {
+		didSet {
+			textDidChange()
+		}
+	}
+	
+	@objc
+	private func textDidChange() {
+		
+		if text == nil || text.isEmpty {
+			placeholderLabel.isHidden = false
+		} else {
+			placeholderLabel.isHidden = true
+		}
+		
+	}
+
+	let placeholderLabel = UILabel()
+	
+	override init(frame: CGRect, textContainer: NSTextContainer?) {
+		super.init(frame: frame, textContainer: textContainer	)
+	
+		setup()
+	}
+	
+	required init?(coder aDecoder: NSCoder) {
+		super.init(coder: aDecoder)
+		
+		setup()
+	}
+	
+	private func setup() {
+		
+		NotificationCenter.default.addObserver(self, selector: #selector(self.textDidChange), name: .UITextViewTextDidChange, object: nil)
+		
+		placeholderLabel.translatesAutoresizingMaskIntoConstraints = false
+		placeholderLabel.textColor = .lightGray
+		placeholderLabel.font = self.font
+		
+		self.addSubview(placeholderLabel)
+		
+		NSLayoutConstraint.activate([
+			placeholderLabel.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 6.0),
+			placeholderLabel.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: 8.0),
+			placeholderLabel.topAnchor.constraint(equalTo: self.topAnchor, constant: 8.0),
+			placeholderLabel.bottomAnchor.constraint(equalTo: self.bottomAnchor, constant: 8.0)
+		])
+		
+	}
+	
+	override func layoutSubviews() {
+		super.layoutSubviews()
+		
+		self.layer.cornerRadius = 5.0
+		self.layer.masksToBounds = true
+		
+	}
+	
+}
diff --git a/OpenTerm/View/TerminalView+AutoComplete.swift b/OpenTerm/View/TerminalView+AutoComplete.swift
index 1c6b9fb5..4cd9259c 100644
--- a/OpenTerm/View/TerminalView+AutoComplete.swift
+++ b/OpenTerm/View/TerminalView+AutoComplete.swift
@@ -61,6 +61,8 @@ extension TerminalView {
 			autoCompleteManager.commandState = .running
 		case .idle:
 			autoCompleteManager.commandState = .typing(command: self.currentCommand)
+		case .waitingForInput:
+			autoCompleteManager.commandState = .running
 		}
 	}
 
@@ -134,13 +136,13 @@ extension TerminalView: AutoCompleteManagerDataSource {
 	func allCommandsForAutoCompletion() -> [String] {
 		let allCommands = (commandsAsArray() as? [String] ?? []).sorted()
 		let recentHistory = uniqueItemsInRecentHistory()
-		return recentHistory + Script.allNames + allCommands + ["help", "clear"]
+		return recentHistory + CommandManager.shared.scriptCommands + allCommands + ["help", "clear"]
 	}
 
 	func completionsForProgram(_ command: String, _ currentArguments: [String]) -> [AutoCompleteManager.Completion] {
-		// If command is a script, return the argument names in options form, for that script. Without ones that are already entered.
-		if Script.allNames.contains(command), let script = try? Script.named(command) {
-			return script.argumentNames.map { "--\($0)=" }.map { AutoCompleteManager.Completion($0, appendingSuffix: "") }
+
+		if CommandManager.shared.scriptCommands.contains(command) {
+			return []
 		}
 
 		var completions: [AutoCompleteManager.Completion] = []
diff --git a/OpenTerm/View/TerminalView.swift b/OpenTerm/View/TerminalView.swift
index cb58997e..854f338c 100644
--- a/OpenTerm/View/TerminalView.swift
+++ b/OpenTerm/View/TerminalView.swift
@@ -53,6 +53,9 @@ class TerminalView: UIView {
 		return Int(viewWidth / charWidth)
 	}
 
+	var didEnterInput: ((String) -> Void)?
+	var subCommandParserDidEndTransmissionCallback: (() -> Void)?
+
 	weak var delegate: TerminalViewDelegate?
 
 	init() {
@@ -143,9 +146,14 @@ class TerminalView: UIView {
 	}
 
 	func appendText(_ text: NSAttributedString) {
+		
+		if text.string.isEmpty {
+			return
+		}
+		
 		dispatchPrecondition(condition: .onQueue(.main))
 
-		let text = NSMutableAttributedString.init(attributedString: text)
+		let text = NSMutableAttributedString(attributedString: text)
 		OutputSanitizer.sanitize(text.mutableString)
 
 		let new = NSMutableAttributedString(attributedString: textView.attributedText ?? NSAttributedString())
@@ -158,7 +166,8 @@ class TerminalView: UIView {
 		self.textView.isScrollEnabled = true
 	}
 	
-	private func appendText(_ text: String) {
+	func appendText(_ text: String) {
+
 		dispatchPrecondition(condition: .onQueue(.main))
 
 		appendText(NSAttributedString(string: text, attributes: [.foregroundColor: textView.textColor ?? .black, .font: textView.font!]))
@@ -307,6 +316,12 @@ extension TerminalView {
 extension TerminalView: ParserDelegate {
 
 	func parserDidEndTransmission(_ parser: Parser) {
+
+		if let callback = subCommandParserDidEndTransmissionCallback {
+			callback()
+			return
+		}
+		
 		DispatchQueue.main.async {
 			self.writePrompt()
 		}
@@ -338,6 +353,27 @@ extension TerminalView: CommandExecutorDelegate {
 			self.updateAutoComplete()
 		}
 	}
+	
+	func commandExecutor(_ commandExecutor: CommandExecutor, waitForInput callback: @escaping (String) -> Void) {
+	
+		didEnterInput = callback
+		currentCommandStartIndex = textView.text.endIndex
+		executor.state = .waitingForInput
+		
+	}
+	
+	func commandExecutor(_ commandExecutor: CommandExecutor, executeSubCommand subCommand: String, callback: @escaping () -> Void) {
+		
+		subCommandParserDidEndTransmissionCallback = { [weak self] in
+			
+			self?.subCommandParserDidEndTransmissionCallback = nil
+			callback()
+		}
+		
+		commandExecutor.dispatch(subCommand)
+		
+	}
+	
 }
 
 extension TerminalView: UITextDragDelegate {
@@ -367,6 +403,13 @@ extension TerminalView: UITextViewDelegate {
 		//		}
 		//
 	}
+	
+	func waitForInput() {
+		
+		currentCommandStartIndex = textView.text.endIndex
+		executor.state = .waitingForInput
+		
+	}
 
 	func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
 
@@ -394,8 +437,25 @@ extension TerminalView: UITextViewDelegate {
 				return false
 			}
 
+			return true
+			
+		case .waitingForInput:
+			
+			if text == "\n" {
+			
+				self.executor.state = .running
+				
+				let input = textView.text[currentCommandStartIndex..<textView.text.endIndex]
+				
+				newLine()
+				didEnterInput?(String(input))
+				
+				return false
+			}
+			
 			return true
 		}
+		
 	}
 
 	func textViewDidChange(_ textView: UITextView) {
diff --git a/OpenTermTests/OpenTermTests.swift b/OpenTermTests/OpenTermTests.swift
index 616e161d..8b4bbe84 100644
--- a/OpenTermTests/OpenTermTests.swift
+++ b/OpenTermTests/OpenTermTests.swift
@@ -33,8 +33,8 @@ class OpenTermTests: XCTestCase {
 		
 		let commands = terminalVC.availableCommands()
 		
-		let expectedCommands = ["awk", "cat", "cd", "chflags", "chksum", "clear", "compress", "cp", "credits", "curl", "date", "dig", "du", "echo", "egrep", "env", "fgrep", "grep", "gunzip", "gzip", "help", "host", "link", "ln", "ls", "mkdir", "mv", "nc", "nslookup", "open-url", "pbcopy", "pbpaste", "ping", "printenv", "pwd", "readlink", "rlogin", "rm", "rmdir", "scp", "sed", "setenv", "sftp", "share", "ssh", "ssh-keygen", "stat", "sum", "tar", "tee", "telnet", "touch", "tr", "uname", "uncompress", "unlink", "unsetenv", "uptime", "wc", "whoami"]
-		
+		let expectedCommands = ["awk", "cat", "cd", "chflags", "chksum", "clear", "compress", "cp", "credits", "cub", "curl", "date", "dig", "du", "echo", "egrep", "env", "fgrep", "grep", "gunzip", "gzip", "help", "host", "link", "ln", "ls", "mkdir", "mv", "nc", "nslookup", "open-url", "pbcopy", "pbpaste", "ping", "printenv", "pwd", "readlink", "rlogin", "rm", "rmdir", "scp", "sed", "setenv", "sftp", "share", "ssh", "ssh-keygen", "stat", "sum", "tar", "tee", "telnet", "touch", "tr", "uname", "uncompress", "unlink", "unsetenv", "uptime", "wc", "whoami"]
+
 		XCTAssertEqual(commands, expectedCommands)
 		
 	}
@@ -192,6 +192,14 @@ class CallbackCommandExecutor: CommandExecutorDelegate, ParserDelegate {
 		
 	}
 	
+	func commandExecutor(_ commandExecutor: CommandExecutor, waitForInput callback: @escaping (String) -> Void) {
+		
+	}
+	
+	func commandExecutor(_ commandExecutor: CommandExecutor, executeSubCommand subCommand: String, callback: @escaping () -> Void) {
+		
+	}
+	
 	func parser(_ parser: Parser, didReceiveString string: NSAttributedString) {
 		
 		terminalView.performOnMain {