diff --git a/Lazarus VPN/PacketTunnelProvider.swift b/Lazarus VPN/PacketTunnelProvider.swift
index 6e3d39f..c7509c7 100755
--- a/Lazarus VPN/PacketTunnelProvider.swift	
+++ b/Lazarus VPN/PacketTunnelProvider.swift	
@@ -26,7 +26,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
 
 	override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
         DDLog.removeAllLoggers()
-        DDLog.add(DDASLLogger.sharedInstance, with: DDLogLevel.info)
+        DDLog.add(DDOSLogger.sharedInstance, with: DDLogLevel.info)
         ObserverFactory.currentFactory = DebugObserverFactory()
         NSLog("-------------")
         
@@ -89,8 +89,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
                     let raw_dom = dom.string!
                     let index = raw_dom.index(raw_dom.startIndex, offsetBy: 1)
                     let index2 = raw_dom.index(raw_dom.startIndex, offsetBy: 2)
-                    let typeStr = raw_dom.substring(to: index)
-                    let url = raw_dom.substring(from: index2)
+                    let typeStr = String(raw_dom[..<index])
+                    let url = String(raw_dom[index2...])
                     
                     if typeStr == "s"{
                         rule_array.append(DomainListRule.MatchCriterion.suffix(url))
@@ -142,7 +142,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
 
             ]
         }
-        networkSettings.iPv4Settings = ipv4Settings
+        networkSettings.ipv4Settings = ipv4Settings
         
         let proxySettings = NEProxySettings()
         proxySettings.httpEnabled = true
diff --git a/Lazarus.xcodeproj/project.pbxproj b/Lazarus.xcodeproj/project.pbxproj
index 1ab2c3e..c7059ce 100755
--- a/Lazarus.xcodeproj/project.pbxproj
+++ b/Lazarus.xcodeproj/project.pbxproj
@@ -382,13 +382,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Fluid, LLC.";
 				TargetAttributes = {
 					09549ABE1DDF3B49000F198C = {
 						CreatedOnToolsVersion = 8.1;
 						DevelopmentTeam = 6578A826QL;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.VPNLite = {
@@ -399,7 +399,7 @@
 					353C0FD71DDF393F00A46EBD = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 6578A826QL;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.VPNLite = {
@@ -411,7 +411,7 @@
 			};
 			buildConfigurationList = 353C0FD31DDF393F00A46EBD /* Build configuration list for PBXProject "Lazarus" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -569,7 +569,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -596,7 +596,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -613,12 +613,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -650,6 +652,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -667,12 +670,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -697,6 +702,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -716,7 +722,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -733,7 +739,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = fun.ignition.Lazarus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/Lazarus/AppDelegate.swift b/Lazarus/AppDelegate.swift
index 46f2eda..a1abc70 100755
--- a/Lazarus/AppDelegate.swift
+++ b/Lazarus/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    internal func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
diff --git a/Lazarus/Assets.xcassets/AppIcon.appiconset/Contents.json b/Lazarus/Assets.xcassets/AppIcon.appiconset/Contents.json
index 191d433..4062365 100644
--- a/Lazarus/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Lazarus/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -149,30 +149,6 @@
       "idiom" : "ios-marketing",
       "filename" : "ItunesArtwork@2x.png",
       "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@3x.png",
-      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Lazarus/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png b/Lazarus/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png
deleted file mode 100644
index 152cfe8..0000000
Binary files a/Lazarus/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png and /dev/null differ
diff --git a/Lazarus/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png b/Lazarus/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png
deleted file mode 100644
index 4ecbf18..0000000
Binary files a/Lazarus/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png and /dev/null differ
diff --git a/Lazarus/Model/VPNManager.swift b/Lazarus/Model/VPNManager.swift
index 96041e2..531a6d7 100755
--- a/Lazarus/Model/VPNManager.swift
+++ b/Lazarus/Model/VPNManager.swift
@@ -66,6 +66,8 @@ class VPNManager {
             self.vpnStatus = .disconnecting
         case .disconnected, .invalid:
             self.vpnStatus = .off
+        @unknown default:
+            fatalError()
         }
         print(self.vpnStatus)
     }
diff --git a/Lazarus/ViewController.swift b/Lazarus/ViewController.swift
index 27c64f8..70cd05e 100644
--- a/Lazarus/ViewController.swift
+++ b/Lazarus/ViewController.swift
@@ -42,23 +42,23 @@ class ViewController: UIViewController {
         self.status = VPNManager.shared.vpnStatus
     }
     
-    func onVPNStatusChanged(){
+    @objc func onVPNStatusChanged(){
         self.status = VPNManager.shared.vpnStatus
     }
     
     func updateConnectButton(){
         switch status {
         case .connecting:
-            connectButton.setTitle("Starting", for: UIControlState())
+            connectButton.setTitle("Starting", for: UIControl.State())
         // statusLabel.text = "Starting"
         case .disconnecting:
-            connectButton.setTitle("Disconnecting", for: UIControlState())
+            connectButton.setTitle("Disconnecting", for: UIControl.State())
         // statusLabel.text = "Disconnecting"
         case .on:
-            connectButton.setTitle("Protecting", for: UIControlState())
+            connectButton.setTitle("Protecting", for: UIControl.State())
         // statusLabel.text = "Protecting"
         case .off:
-            connectButton.setTitle("Start Protecting", for: UIControlState())
+            connectButton.setTitle("Start Protecting", for: UIControl.State())
             // statusLabel.text = "Start Protecting"
             
         }