diff --git a/Docsis Toolkit.xcodeproj/project.pbxproj b/Docsis Toolkit.xcodeproj/project.pbxproj
index 03b135e..ff51c64 100644
--- a/Docsis Toolkit.xcodeproj/project.pbxproj	
+++ b/Docsis Toolkit.xcodeproj/project.pbxproj	
@@ -577,7 +577,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Kilian Hofmann";
 				TargetAttributes = {
 					E220BF9B1EFB22D400DF5A97 = {
@@ -600,7 +600,7 @@
 					E2218D281EF3271F004298F6 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 795KPDV76S;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					E2218D3D1EF32803004298F6 = {
@@ -612,7 +612,7 @@
 			};
 			buildConfigurationList = E2218C7D1EF2D2B5004298F6 /* Build configuration list for PBXProject "Docsis Toolkit" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -783,6 +783,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -843,6 +844,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -968,8 +970,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_DISABLE_SAFETY_CHECKS = NO;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -987,8 +988,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_DISABLE_SAFETY_CHECKS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				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 c92d46e..0797a6f 100644
--- a/Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme	
+++ b/Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme
index 768cbd6..f899f8a 100644
--- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme	
+++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
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 a228886..53b6f35 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,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
index 4a7f3a9..c2db83c 100644
--- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme	
+++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Graphic Analysis 2/Document.swift b/Graphic Analysis 2/Document.swift
index 17a0649..5c61d4f 100644
--- a/Graphic Analysis 2/Document.swift	
+++ b/Graphic Analysis 2/Document.swift	
@@ -42,7 +42,7 @@ class Document: NSDocument {
     }
     
     override var windowNibName: NSNib.Name? {
-        return NSNib.Name(rawValue: "Document")
+        return "Document"
     }
 
     override func read(from fileWrapper: FileWrapper, ofType typeName: String) throws {
@@ -103,8 +103,8 @@ class Document: NSDocument {
     override func printOperation(withSettings printSettings: [NSPrintInfo.AttributeKey : Any]) throws -> NSPrintOperation {
         let printOperation: NSPrintOperation = NSPrintOperation(view: collectionViewMonth)
         printOperation.printInfo.orientation = .landscape
-        printOperation.printInfo.horizontalPagination = .fitPagination
-        printOperation.printInfo.verticalPagination = .fitPagination
+        printOperation.printInfo.horizontalPagination = .fit
+        printOperation.printInfo.verticalPagination = .fit
         printOperation.printInfo.topMargin = 1
         printOperation.printInfo.rightMargin = 1
         printOperation.printInfo.bottomMargin = 1
diff --git a/Graphic Analysis 2/GraphWindow.swift b/Graphic Analysis 2/GraphWindow.swift
index 5df69d0..4f0252c 100644
--- a/Graphic Analysis 2/GraphWindow.swift	
+++ b/Graphic Analysis 2/GraphWindow.swift	
@@ -24,7 +24,7 @@ class GraphWindow: NSWindowController {
     let loadingQueue4: OperationQueue = OperationQueue()
     
    override var windowNibName: NSNib.Name? {
-    return NSNib.Name(rawValue: "GraphWindow")
+    return "GraphWindow"
     }
 
     required init?(coder: NSCoder) {
diff --git a/Graphic Analysis 2/Info.plist b/Graphic Analysis 2/Info.plist
index 7ffe635..fa5854c 100644
--- a/Graphic Analysis 2/Info.plist	
+++ b/Graphic Analysis 2/Info.plist	
@@ -44,7 +44,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.1</string>
 	<key>CFBundleVersion</key>
-	<string>496</string>
+	<string>500</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Graphic Analysis 2/PDFDraw.swift b/Graphic Analysis 2/PDFDraw.swift
index 469757b..d7b0f3e 100644
--- a/Graphic Analysis 2/PDFDraw.swift	
+++ b/Graphic Analysis 2/PDFDraw.swift	
@@ -48,7 +48,7 @@ class PDFDraw: NSWindowController {
     
     //override var windowNibName: NSNib.Name! {
     override var windowNibName: NSNib.Name? {
-        return NSNib.Name(rawValue: "PDFDraw")
+        return "PDFDraw"
     }
     
     required init?(coder: NSCoder)
diff --git a/Graphic Analysis 2/PDFItemViewController.swift b/Graphic Analysis 2/PDFItemViewController.swift
index c439efa..5ebba59 100644
--- a/Graphic Analysis 2/PDFItemViewController.swift	
+++ b/Graphic Analysis 2/PDFItemViewController.swift	
@@ -25,14 +25,14 @@ class PDFItemViewController: NSViewController {
     }
     
     init(dayFW: FileWrapper?, day: Int, monthName: String) {
-        super.init(nibName: NSNib.Name(rawValue: "PDFItemViewController"), bundle: Bundle.main)
+        super.init(nibName: "PDFItemViewController", bundle: Bundle.main)
         self.dayFW = dayFW
         self.dayI = day
         self.monthName = monthName
     }
     
     init(dayFW: FileWrapper?, day: Int) {
-        super.init(nibName: NSNib.Name(rawValue: "PDFItemViewController"), bundle: Bundle.main)
+        super.init(nibName: "PDFItemViewController", bundle: Bundle.main)
         self.dayFW = dayFW
         self.dayI = day
     }
diff --git a/Graphic Analysis 2/PDFTitle.swift b/Graphic Analysis 2/PDFTitle.swift
index fae7fef..35ed596 100644
--- a/Graphic Analysis 2/PDFTitle.swift	
+++ b/Graphic Analysis 2/PDFTitle.swift	
@@ -31,7 +31,7 @@ class PDFTitle: NSWindowController {
     }
     
     override var windowNibName: NSNib.Name? {
-        return NSNib.Name(rawValue: "PDFTitle")
+        return "PDFTitle"
     }
     
     required init?(coder: NSCoder)
diff --git a/Graphic Analysis 2/buildnum.ver b/Graphic Analysis 2/buildnum.ver
index 0ca8281..10afcee 100644
--- a/Graphic Analysis 2/buildnum.ver	
+++ b/Graphic Analysis 2/buildnum.ver	
@@ -1,2 +1,2 @@
 version 2.1
-build 496
+build 500