diff --git a/Docsis Toolkit.xcodeproj/project.pbxproj b/Docsis Toolkit.xcodeproj/project.pbxproj
index ff51c64..27604dd 100644
--- a/Docsis Toolkit.xcodeproj/project.pbxproj	
+++ b/Docsis Toolkit.xcodeproj/project.pbxproj	
@@ -577,19 +577,23 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
+<<<<<<< HEAD
 				LastUpgradeCheck = 1020;
+=======
+				LastUpgradeCheck = 1150;
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
 				ORGANIZATIONNAME = "Kilian Hofmann";
 				TargetAttributes = {
 					E220BF9B1EFB22D400DF5A97 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 795KPDV76S;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1150;
 						ProvisioningStyle = Automatic;
 					};
 					E2218C971EF2D345004298F6 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 795KPDV76S;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1150;
 						ProvisioningStyle = Automatic;
 					};
 					E2218CE51EF2D577004298F6 = {
@@ -600,7 +604,11 @@
 					E2218D281EF3271F004298F6 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 795KPDV76S;
+<<<<<<< HEAD
 						LastSwiftMigration = 1020;
+=======
+						LastSwiftMigration = 1150;
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
 						ProvisioningStyle = Automatic;
 					};
 					E2218D3D1EF32803004298F6 = {
@@ -615,6 +623,7 @@
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -751,6 +760,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 795KPDV76S;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Converter/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
@@ -758,7 +768,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -768,6 +778,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 795KPDV76S;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Converter/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
@@ -775,7 +786,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -901,6 +912,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 795KPDV76S;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Logger4/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Logger4;
@@ -909,7 +921,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Logger4/Logger4-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -921,6 +933,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 795KPDV76S;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Logger4/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Logger4;
@@ -928,7 +941,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Logger4/Logger4-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -964,12 +977,17 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 795KPDV76S;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Graphic Analysis 2/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.weebly.alikja.Graphic-Analysis-2";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_DISABLE_SAFETY_CHECKS = NO;
+<<<<<<< HEAD
+=======
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -981,6 +999,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 795KPDV76S;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Graphic Analysis 2/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.weebly.alikja.Graphic-Analysis-2";
@@ -988,6 +1007,10 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_DISABLE_SAFETY_CHECKS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+<<<<<<< HEAD
+=======
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
diff --git a/Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme b/Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme
index 0797a6f..4bcf10b 100644
--- a/Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme	
+++ b/Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme	
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+<<<<<<< HEAD
    LastUpgradeVersion = "1020"
+=======
+   LastUpgradeVersion = "1150"
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -55,8 +59,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -66,8 +68,8 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -88,8 +90,6 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme
index f899f8a..d23f925 100644
--- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme	
+++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme	
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+<<<<<<< HEAD
    LastUpgradeVersion = "1020"
+=======
+   LastUpgradeVersion = "1150"
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +31,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +40,8 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +63,6 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme
index 53b6f35..1c89048 100644
--- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme	
+++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme	
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+<<<<<<< HEAD
    LastUpgradeVersion = "1020"
+=======
+   LastUpgradeVersion = "1150"
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +31,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +40,8 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -68,8 +70,6 @@
             isEnabled = "NO">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
index c2db83c..a1ef61b 100644
--- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme	
+++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme	
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+<<<<<<< HEAD
    LastUpgradeVersion = "1020"
+=======
+   LastUpgradeVersion = "1150"
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +31,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +40,8 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +63,6 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Graphic Analysis 2/Info.plist b/Graphic Analysis 2/Info.plist
index fa5854c..6f5268f 100644
--- a/Graphic Analysis 2/Info.plist	
+++ b/Graphic Analysis 2/Info.plist	
@@ -44,7 +44,11 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.1</string>
 	<key>CFBundleVersion</key>
+<<<<<<< HEAD
 	<string>500</string>
+=======
+	<string>499</string>
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Graphic Analysis 2/buildnum.ver b/Graphic Analysis 2/buildnum.ver
index 10afcee..193ae49 100644
--- a/Graphic Analysis 2/buildnum.ver	
+++ b/Graphic Analysis 2/buildnum.ver	
@@ -1,2 +1,6 @@
 version 2.1
+<<<<<<< HEAD
 build 500
+=======
+build 499
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
diff --git a/Logger4/AppDelegate.swift b/Logger4/AppDelegate.swift
index 8d20ada..a781b24 100644
--- a/Logger4/AppDelegate.swift
+++ b/Logger4/AppDelegate.swift
@@ -24,7 +24,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     // URL Session for DOCSIS data and Internet check
     let urlSession: URLSession = URLSession(configuration: .default)
     // Preferences
-    let pref: NSWindowController = NSWindowController(windowNibName: NSNib.Name(rawValue: "SettingsWindowController"))
+    let pref: NSWindowController = NSWindowController(windowNibName: "SettingsWindowController")
     // Timers
     var timerFreqs: Timer = Timer()
     var timerFails: Timer = Timer()
@@ -60,7 +60,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let menuAbout: NSMenuItem = NSMenuItem(title: "About Logger", action: #selector(NSApp.orderFrontStandardAboutPanel(_:)), keyEquivalent: "")
         let menuQuit: NSMenuItem = NSMenuItem.init(title: "Quit", action: #selector(NSApp.terminate(_:)), keyEquivalent: "q")
         let menuPref: NSMenuItem = NSMenuItem(title: "Preferences", action: #selector(self.preferences(_:)), keyEquivalent: "")
-        menuPref.image = NSImage(named: NSImage.Name.actionTemplate)
+        menuPref.image = NSImage(named: NSImage.actionTemplateName)
         // Layout menu
         menu.addItem(menuAbout)
         menu.addItem(NSMenuItem.separator())
diff --git a/Logger4/Info.plist b/Logger4/Info.plist
index da1c648..f258208 100644
--- a/Logger4/Info.plist
+++ b/Logger4/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>4.2</string>
 	<key>CFBundleVersion</key>
-	<string>50</string>
+	<string>51</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Logger4/buildnum.ver b/Logger4/buildnum.ver
index ad85d96..a316536 100644
--- a/Logger4/buildnum.ver
+++ b/Logger4/buildnum.ver
@@ -1,2 +1,2 @@
 version 4.2
-build 50
+build 51