diff --git a/App.xaml b/App.xaml
index f496d81..cedbe95 100644
--- a/App.xaml
+++ b/App.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/App.xaml.cs b/App.xaml.cs
index a6f94d0..1542850 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/CommandLine.cs b/CommandLine.cs
index e9fa7f6..d2328ee 100644
--- a/CommandLine.cs
+++ b/CommandLine.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/FilePickerControl.xaml b/FilePickerControl.xaml
index 1fa7f66..3a2fd33 100644
--- a/FilePickerControl.xaml
+++ b/FilePickerControl.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/FilePickerControl.xaml.cs b/FilePickerControl.xaml.cs
index 780d51c..e7d8716 100644
--- a/FilePickerControl.xaml.cs
+++ b/FilePickerControl.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/HelperClasses.cs b/HelperClasses.cs
index c7d8511..0529fb6 100644
--- a/HelperClasses.cs
+++ b/HelperClasses.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -658,7 +658,7 @@ namespace WPinternals
                 Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." +
                 Assembly.GetExecutingAssembly().GetName().Version.Build.ToString() + "." +
                 Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString(), LogType.FileAndConsole);
-            Log("Copyright Heathcliff74 / wpinternals.net", LogType.FileAndConsole);
+            Log("Copyright Heathcliff74", LogType.FileAndConsole);
         }
 
         internal static void BeginAction(string Action)
@@ -673,7 +673,7 @@ namespace WPinternals
                 Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." +
                 Assembly.GetExecutingAssembly().GetName().Version.Build.ToString() + "." +
                 Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString());
-                LogBuilder.AppendLine("Copyright Heathcliff74 / wpinternals.net");
+                LogBuilder.AppendLine("Copyright Heathcliff74");
                 LogBuilder.AppendLine("Action: " + Action);
                 if (App.Config.RegistrationName != null)
                     LogBuilder.AppendLine("Name: " + App.Config.RegistrationName);
diff --git a/LICENSE b/LICENSE
index f879c1c..bdd2b78 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Models/ByteOperations.cs b/Models/ByteOperations.cs
index a441a2a..738fb67 100644
--- a/Models/ByteOperations.cs
+++ b/Models/ByteOperations.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/FFU.cs b/Models/FFU.cs
index 4305840..70f5fcd 100644
--- a/Models/FFU.cs
+++ b/Models/FFU.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/GPT.cs b/Models/GPT.cs
index ab04cf2..b669bd7 100644
--- a/Models/GPT.cs
+++ b/Models/GPT.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/LZMA.cs b/Models/LZMA.cs
index 416b60c..8c8c7d4 100644
--- a/Models/LZMA.cs
+++ b/Models/LZMA.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/LumiaDownloadModel.cs b/Models/LumiaDownloadModel.cs
index 490d948..a726574 100644
--- a/Models/LumiaDownloadModel.cs
+++ b/Models/LumiaDownloadModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/MassStorage.cs b/Models/MassStorage.cs
index d1d16f3..31950ff 100644
--- a/Models/MassStorage.cs
+++ b/Models/MassStorage.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/NativeMethods.cs b/Models/NativeMethods.cs
index 7129ccb..4250d75 100644
--- a/Models/NativeMethods.cs
+++ b/Models/NativeMethods.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/NokiaFlashModel.cs b/Models/NokiaFlashModel.cs
index d58c947..6421cea 100644
--- a/Models/NokiaFlashModel.cs
+++ b/Models/NokiaFlashModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/NokiaPhoneModel.cs b/Models/NokiaPhoneModel.cs
index ece07e3..bea83eb 100644
--- a/Models/NokiaPhoneModel.cs
+++ b/Models/NokiaPhoneModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/PatchEngine.cs b/Models/PatchEngine.cs
index 407a995..a8e7f44 100644
--- a/Models/PatchEngine.cs
+++ b/Models/PatchEngine.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -58,7 +58,7 @@ namespace WPinternals
             FileWriter.WriteLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
             FileWriter.WriteLine("");
             FileWriter.WriteLine("<!--");
-            FileWriter.WriteLine("Copyright(c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda");
+            FileWriter.WriteLine("Copyright(c) 2018, Rene Lergner - @Heathcliff74xda");
             FileWriter.WriteLine("");
             FileWriter.WriteLine("Permission is hereby granted, free of charge, to any person obtaining a");
             FileWriter.WriteLine("copy of this software and associated documentation files(the \"Software\"),");
diff --git a/Models/Privileges.cs b/Models/Privileges.cs
index 3adc218..441a38a 100644
--- a/Models/Privileges.cs
+++ b/Models/Privileges.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/QualcommDownload.cs b/Models/QualcommDownload.cs
index 86e78d5..5cca117 100644
--- a/Models/QualcommDownload.cs
+++ b/Models/QualcommDownload.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/QualcommFlasher.cs b/Models/QualcommFlasher.cs
index e77fcfc..34528f8 100644
--- a/Models/QualcommFlasher.cs
+++ b/Models/QualcommFlasher.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/QualcommLoader.cs b/Models/QualcommLoader.cs
index c73af49..e5373a3 100644
--- a/Models/QualcommLoader.cs
+++ b/Models/QualcommLoader.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/QualcommPartition.cs b/Models/QualcommPartition.cs
index f4d4c29..ff4ce53 100644
--- a/Models/QualcommPartition.cs
+++ b/Models/QualcommPartition.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/QualcommSahara.cs b/Models/QualcommSahara.cs
index 71396e2..192e84f 100644
--- a/Models/QualcommSahara.cs
+++ b/Models/QualcommSahara.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/QualcommSerial.cs b/Models/QualcommSerial.cs
index a81c1c4..0c8f6aa 100644
--- a/Models/QualcommSerial.cs
+++ b/Models/QualcommSerial.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/SBL1.cs b/Models/SBL1.cs
index 9c9122e..f266e51 100644
--- a/Models/SBL1.cs
+++ b/Models/SBL1.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/SBL2.cs b/Models/SBL2.cs
index 6b1bcc3..14ef595 100644
--- a/Models/SBL2.cs
+++ b/Models/SBL2.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/SBL3.cs b/Models/SBL3.cs
index 8a85864..3a41d4f 100644
--- a/Models/SBL3.cs
+++ b/Models/SBL3.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Models/UEFI.cs b/Models/UEFI.cs
index 1b05a70..f158800 100644
--- a/Models/UEFI.cs
+++ b/Models/UEFI.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/PatchDefinitions.xml b/PatchDefinitions.xml
index 0f89dfc..1bb28b5 100644
--- a/PatchDefinitions.xml
+++ b/PatchDefinitions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright(c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright(c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files(the "Software"),
diff --git a/Terminal.cs b/Terminal.cs
index 262833e..79b51cf 100644
--- a/Terminal.cs
+++ b/Terminal.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/TestCode.cs b/TestCode.cs
index a3270f6..ca19b23 100644
--- a/TestCode.cs
+++ b/TestCode.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/AboutViewModel.cs b/ViewModels/AboutViewModel.cs
index 61e6903..0d50faa 100644
--- a/ViewModels/AboutViewModel.cs
+++ b/ViewModels/AboutViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/BackupTargetSelectionViewModel.cs b/ViewModels/BackupTargetSelectionViewModel.cs
index 80842d1..8840e32 100644
--- a/ViewModels/BackupTargetSelectionViewModel.cs
+++ b/ViewModels/BackupTargetSelectionViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/BackupViewModel.cs b/ViewModels/BackupViewModel.cs
index fd61073..117cdbc 100644
--- a/ViewModels/BackupViewModel.cs
+++ b/ViewModels/BackupViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/BusyViewModel.cs b/ViewModels/BusyViewModel.cs
index 720fcb4..6b2af22 100644
--- a/ViewModels/BusyViewModel.cs
+++ b/ViewModels/BusyViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/ContextViewModel.cs b/ViewModels/ContextViewModel.cs
index 7044d0c..635cf65 100644
--- a/ViewModels/ContextViewModel.cs
+++ b/ViewModels/ContextViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/DisclaimerAndNdaViewModel.cs b/ViewModels/DisclaimerAndNdaViewModel.cs
index 0501f7b..344e0d3 100644
--- a/ViewModels/DisclaimerAndNdaViewModel.cs
+++ b/ViewModels/DisclaimerAndNdaViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/DisclaimerViewModel.cs b/ViewModels/DisclaimerViewModel.cs
index c1cd253..1ecc3b7 100644
--- a/ViewModels/DisclaimerViewModel.cs
+++ b/ViewModels/DisclaimerViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/DownloadsViewModel.cs b/ViewModels/DownloadsViewModel.cs
index 8a4f414..a596e03 100644
--- a/ViewModels/DownloadsViewModel.cs
+++ b/ViewModels/DownloadsViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/DumpRomTargetSelectionViewModel.cs b/ViewModels/DumpRomTargetSelectionViewModel.cs
index 467db78..6a8d960 100644
--- a/ViewModels/DumpRomTargetSelectionViewModel.cs
+++ b/ViewModels/DumpRomTargetSelectionViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/DumpRomViewModel.cs b/ViewModels/DumpRomViewModel.cs
index 942b46f..d4319bd 100644
--- a/ViewModels/DumpRomViewModel.cs
+++ b/ViewModels/DumpRomViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/GettingStartedViewModel.cs b/ViewModels/GettingStartedViewModel.cs
index 0ab2cb0..2d94676 100644
--- a/ViewModels/GettingStartedViewModel.cs
+++ b/ViewModels/GettingStartedViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs b/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
index 65d49f9..27ec86c 100644
--- a/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
+++ b/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaFlashRomViewModel.cs b/ViewModels/LumiaFlashRomViewModel.cs
index 788cbfd..faa3f15 100644
--- a/ViewModels/LumiaFlashRomViewModel.cs
+++ b/ViewModels/LumiaFlashRomViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaInfoViewModel.cs b/ViewModels/LumiaInfoViewModel.cs
index 776e39c..179158e 100644
--- a/ViewModels/LumiaInfoViewModel.cs
+++ b/ViewModels/LumiaInfoViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaModeViewModel.cs b/ViewModels/LumiaModeViewModel.cs
index 066124a..c6fa9ad 100644
--- a/ViewModels/LumiaModeViewModel.cs
+++ b/ViewModels/LumiaModeViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaUnlockBootViewModel.cs b/ViewModels/LumiaUnlockBootViewModel.cs
index 464c5eb..1b1c709 100644
--- a/ViewModels/LumiaUnlockBootViewModel.cs
+++ b/ViewModels/LumiaUnlockBootViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaUnlockBootloaderViewModel.cs b/ViewModels/LumiaUnlockBootloaderViewModel.cs
index 63b9fab..045a53b 100644
--- a/ViewModels/LumiaUnlockBootloaderViewModel.cs
+++ b/ViewModels/LumiaUnlockBootloaderViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs b/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
index 7a351c4..868af9a 100644
--- a/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
+++ b/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaUnlockRootViewModel.cs b/ViewModels/LumiaUnlockRootViewModel.cs
index 6f3eaa7..f62b97b 100644
--- a/ViewModels/LumiaUnlockRootViewModel.cs
+++ b/ViewModels/LumiaUnlockRootViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/LumiaV2UnlockBootViewModel.cs b/ViewModels/LumiaV2UnlockBootViewModel.cs
index 50fd8bb..d6c6094 100644
--- a/ViewModels/LumiaV2UnlockBootViewModel.cs
+++ b/ViewModels/LumiaV2UnlockBootViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs
index 339ddcc..f49dd96 100644
--- a/ViewModels/MainViewModel.cs
+++ b/ViewModels/MainViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -435,21 +435,6 @@ namespace WPinternals
             }
         }
 
-        private ICommand _OpenWebSiteCommand = null;
-        public ICommand OpenWebSiteCommand
-        {
-            get
-            {
-                return _OpenWebSiteCommand ??= new DelegateCommand(() =>
-                {
-                    Process process = new();
-                    process.StartInfo.UseShellExecute = true;
-                    process.StartInfo.FileName = "www.wpinternals.net";
-                    process.Start();
-                });
-            }
-        }
-
         private ICommand _DonateCommand = null;
         public ICommand DonateCommand
         {
diff --git a/ViewModels/MessageViewModel.cs b/ViewModels/MessageViewModel.cs
index d201f35..8183868 100644
--- a/ViewModels/MessageViewModel.cs
+++ b/ViewModels/MessageViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaBootloaderViewModel.cs b/ViewModels/NokiaBootloaderViewModel.cs
index 579e3e0..54a1e91 100644
--- a/ViewModels/NokiaBootloaderViewModel.cs
+++ b/ViewModels/NokiaBootloaderViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaFlashViewModel.cs b/ViewModels/NokiaFlashViewModel.cs
index da1681c..4937eaa 100644
--- a/ViewModels/NokiaFlashViewModel.cs
+++ b/ViewModels/NokiaFlashViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaLabelViewModel.cs b/ViewModels/NokiaLabelViewModel.cs
index 28c63f0..a385c29 100644
--- a/ViewModels/NokiaLabelViewModel.cs
+++ b/ViewModels/NokiaLabelViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaMassStorageViewModel.cs b/ViewModels/NokiaMassStorageViewModel.cs
index 9d478ea..afd1275 100644
--- a/ViewModels/NokiaMassStorageViewModel.cs
+++ b/ViewModels/NokiaMassStorageViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaModeBootloaderViewModel.cs b/ViewModels/NokiaModeBootloaderViewModel.cs
index 7694765..554bd40 100644
--- a/ViewModels/NokiaModeBootloaderViewModel.cs
+++ b/ViewModels/NokiaModeBootloaderViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaModeFlashViewModel.cs b/ViewModels/NokiaModeFlashViewModel.cs
index d39918b..50b2d02 100644
--- a/ViewModels/NokiaModeFlashViewModel.cs
+++ b/ViewModels/NokiaModeFlashViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaModeLabelViewModel.cs b/ViewModels/NokiaModeLabelViewModel.cs
index c4f21ca..3f467f1 100644
--- a/ViewModels/NokiaModeLabelViewModel.cs
+++ b/ViewModels/NokiaModeLabelViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaModeMassStorageViewModel.cs b/ViewModels/NokiaModeMassStorageViewModel.cs
index d977b2c..99c210a 100644
--- a/ViewModels/NokiaModeMassStorageViewModel.cs
+++ b/ViewModels/NokiaModeMassStorageViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaModeNormalViewModel.cs b/ViewModels/NokiaModeNormalViewModel.cs
index 67fe3b6..fb513e7 100644
--- a/ViewModels/NokiaModeNormalViewModel.cs
+++ b/ViewModels/NokiaModeNormalViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NokiaNormalViewModel.cs b/ViewModels/NokiaNormalViewModel.cs
index 0d40b3e..cd84dc7 100644
--- a/ViewModels/NokiaNormalViewModel.cs
+++ b/ViewModels/NokiaNormalViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/NotImplementedViewModel.cs b/ViewModels/NotImplementedViewModel.cs
index 3bd68da..2b2ae6e 100644
--- a/ViewModels/NotImplementedViewModel.cs
+++ b/ViewModels/NotImplementedViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/PhoneNotifierViewModel.cs b/ViewModels/PhoneNotifierViewModel.cs
index cdf3c97..09d94a1 100644
--- a/ViewModels/PhoneNotifierViewModel.cs
+++ b/ViewModels/PhoneNotifierViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/RegistrationViewModel.cs b/ViewModels/RegistrationViewModel.cs
index 1e095e7..1bc6d91 100644
--- a/ViewModels/RegistrationViewModel.cs
+++ b/ViewModels/RegistrationViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/RestoreSourceSelectionViewModel.cs b/ViewModels/RestoreSourceSelectionViewModel.cs
index f10278d..9b06475 100644
--- a/ViewModels/RestoreSourceSelectionViewModel.cs
+++ b/ViewModels/RestoreSourceSelectionViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/RestoreViewModel.cs b/ViewModels/RestoreViewModel.cs
index 4ec8506..f44fb62 100644
--- a/ViewModels/RestoreViewModel.cs
+++ b/ViewModels/RestoreViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/ViewModels/SwitchModeViewModel.cs b/ViewModels/SwitchModeViewModel.cs
index 14f5627..70144f1 100644
--- a/ViewModels/SwitchModeViewModel.cs
+++ b/ViewModels/SwitchModeViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/About.xaml b/Views/About.xaml
index 1b2fb46..70389c2 100644
--- a/Views/About.xaml
+++ b/Views/About.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -53,22 +53,16 @@ DEALINGS IN THE SOFTWARE.
                             </Run.Text>
                         </Run>
                         <LineBreak />
-                        <Run Text="Copyright © 2014 - 2019 by Heathcliff74" />
-                        <LineBreak />
-                        <Hyperlink NavigateUri="http://www.wpinternals.net">www.wpinternals.net</Hyperlink>
+                        <Run Text="Copyright © 2014 - 2021 by Heathcliff74" />
                         <LineBreak />
                         <LineBreak />
-                        <Run Text="Many thanks to the " />
-                        <Hyperlink NavigateUri="http://www.advance-box.com/">ATF Team</Hyperlink>
-                        <Run Text=" and the " />
-                        <Hyperlink NavigateUri="http://smart-gsm.net/">Smart GSM Team</Hyperlink>
-                        <Run Text=" for supplying JTAG and test equipment." />
+                        <Run Text="Many thanks to the ATF Team and the Smart GSM Team for supplying JTAG and test equipment." />
                         <LineBreak />
                         <LineBreak />
                         <Run Text="Many thanks to X-Shadow, Justin Angel, Joseph Manzy, Jeremy Sinclair, Vlad Slavskiy and Hikari Calyx for supplying test-phones." />
                         <LineBreak />
                         <LineBreak />
-                        <Run Text="Many thanks to X-Shadow, Cotulla, Rafael Rivera, Ultrashot and Gustave M. for having enlighting discussions about Windows Mobile." />
+                        <Run Text="Many thanks to X-Shadow, Cotulla, Rafael Rivera, Ultrashot and Gustave Monce for having enlighting discussions about Windows Mobile." />
                         <LineBreak />
                         <LineBreak />
                         <Run Text="This software uses the following libraries:" />
diff --git a/Views/About.xaml.cs b/Views/About.xaml.cs
index 70f9e93..7d525ba 100644
--- a/Views/About.xaml.cs
+++ b/Views/About.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/BackupView.xaml b/Views/BackupView.xaml
index 564223a..5fc703b 100644
--- a/Views/BackupView.xaml
+++ b/Views/BackupView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/BackupView.xaml.cs b/Views/BackupView.xaml.cs
index 5709393..ab44f44 100644
--- a/Views/BackupView.xaml.cs
+++ b/Views/BackupView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/BootRestoreResourcesView.xaml b/Views/BootRestoreResourcesView.xaml
index b917c6e..abe7948 100644
--- a/Views/BootRestoreResourcesView.xaml
+++ b/Views/BootRestoreResourcesView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/BootRestoreResourcesView.xaml.cs b/Views/BootRestoreResourcesView.xaml.cs
index 3cba0ff..957a062 100644
--- a/Views/BootRestoreResourcesView.xaml.cs
+++ b/Views/BootRestoreResourcesView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/BusyView.xaml b/Views/BusyView.xaml
index 3679a55..9873117 100644
--- a/Views/BusyView.xaml
+++ b/Views/BusyView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/BusyView.xaml.cs b/Views/BusyView.xaml.cs
index 34e9236..3498de8 100644
--- a/Views/BusyView.xaml.cs
+++ b/Views/BusyView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/ContextView.xaml b/Views/ContextView.xaml
index b2a7779..a7f10f6 100644
--- a/Views/ContextView.xaml
+++ b/Views/ContextView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/ContextView.xaml.cs b/Views/ContextView.xaml.cs
index 8110afb..a898d16 100644
--- a/Views/ContextView.xaml.cs
+++ b/Views/ContextView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/DisclaimerAndNdaView.xaml b/Views/DisclaimerAndNdaView.xaml
index 3d5b1d6..89f990b 100644
--- a/Views/DisclaimerAndNdaView.xaml
+++ b/Views/DisclaimerAndNdaView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/DisclaimerAndNdaView.xaml.cs b/Views/DisclaimerAndNdaView.xaml.cs
index 66a01b5..1e0c069 100644
--- a/Views/DisclaimerAndNdaView.xaml.cs
+++ b/Views/DisclaimerAndNdaView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/DisclaimerView.xaml b/Views/DisclaimerView.xaml
index d7911b2..69f5f24 100644
--- a/Views/DisclaimerView.xaml
+++ b/Views/DisclaimerView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/DisclaimerView.xaml.cs b/Views/DisclaimerView.xaml.cs
index 0946e5c..e07eabc 100644
--- a/Views/DisclaimerView.xaml.cs
+++ b/Views/DisclaimerView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/DumpRomView.xaml b/Views/DumpRomView.xaml
index 8e2ba7a..6528351 100644
--- a/Views/DumpRomView.xaml
+++ b/Views/DumpRomView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/DumpRomView.xaml.cs b/Views/DumpRomView.xaml.cs
index 93fd5e6..8d0253b 100644
--- a/Views/DumpRomView.xaml.cs
+++ b/Views/DumpRomView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/Empty.xaml b/Views/Empty.xaml
index 54e76c6..0d75f7f 100644
--- a/Views/Empty.xaml
+++ b/Views/Empty.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/Empty.xaml.cs b/Views/Empty.xaml.cs
index fbdb9e5..966a8c1 100644
--- a/Views/Empty.xaml.cs
+++ b/Views/Empty.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/FlashResourcesView.xaml b/Views/FlashResourcesView.xaml
index 8e27aad..5d12c31 100644
--- a/Views/FlashResourcesView.xaml
+++ b/Views/FlashResourcesView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/FlashResourcesView.xaml.cs b/Views/FlashResourcesView.xaml.cs
index 936e646..fa7ac96 100644
--- a/Views/FlashResourcesView.xaml.cs
+++ b/Views/FlashResourcesView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/FlashRomView.xaml b/Views/FlashRomView.xaml
index 2c2d3ed..2a4054f 100644
--- a/Views/FlashRomView.xaml
+++ b/Views/FlashRomView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/FlashRomView.xaml.cs b/Views/FlashRomView.xaml.cs
index eff88e0..3ebfe7d 100644
--- a/Views/FlashRomView.xaml.cs
+++ b/Views/FlashRomView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/GettingStartedView.xaml b/Views/GettingStartedView.xaml
index 80165fa..1932af2 100644
--- a/Views/GettingStartedView.xaml
+++ b/Views/GettingStartedView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -44,9 +44,6 @@ DEALINGS IN THE SOFTWARE.
                             <LineBreak />
                             <Run Text="If you appreciate the countless hours of hacking, research and development I put into creating this tool then consider " />
                             <Hyperlink NavigateUri="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=VY8N7BCBT9CS4">buying me a beer</Hyperlink>
-                            <Run Text=". If you wish to leave me a comment or ask a question visit my blog at " />
-                            <LineBreak />
-                            <Hyperlink NavigateUri="http://www.wpinternals.net/">www.wpinternals.net</Hyperlink>
                             <Run Text="." />
                             <LineBreak />
                             <LineBreak />
diff --git a/Views/GettingStartedView.xaml.cs b/Views/GettingStartedView.xaml.cs
index bd06aa8..ab7f666 100644
--- a/Views/GettingStartedView.xaml.cs
+++ b/Views/GettingStartedView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/LumiaDownloadView.xaml b/Views/LumiaDownloadView.xaml
index 62e5bfb..8249e27 100644
--- a/Views/LumiaDownloadView.xaml
+++ b/Views/LumiaDownloadView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/LumiaDownloadView.xaml.cs b/Views/LumiaDownloadView.xaml.cs
index 7fe7356..5de160f 100644
--- a/Views/LumiaDownloadView.xaml.cs
+++ b/Views/LumiaDownloadView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/LumiaUndoRootTargetSelectionView.xaml b/Views/LumiaUndoRootTargetSelectionView.xaml
index 4095af4..b18674f 100644
--- a/Views/LumiaUndoRootTargetSelectionView.xaml
+++ b/Views/LumiaUndoRootTargetSelectionView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/LumiaUndoRootTargetSelectionView.xaml.cs b/Views/LumiaUndoRootTargetSelectionView.xaml.cs
index ec8d4e9..4d2f265 100644
--- a/Views/LumiaUndoRootTargetSelectionView.xaml.cs
+++ b/Views/LumiaUndoRootTargetSelectionView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/LumiaUnlockRootTargetSelectionView.xaml b/Views/LumiaUnlockRootTargetSelectionView.xaml
index 96f5f1f..52bdf4b 100644
--- a/Views/LumiaUnlockRootTargetSelectionView.xaml
+++ b/Views/LumiaUnlockRootTargetSelectionView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/LumiaUnlockRootTargetSelectionView.xaml.cs b/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
index d100941..1f62477 100644
--- a/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
+++ b/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml
index 0f4effb..a6a1032 100644
--- a/Views/MainWindow.xaml
+++ b/Views/MainWindow.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -231,7 +231,6 @@ DEALINGS IN THE SOFTWARE.
             <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
             <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="About" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding AboutCommand}" Style="{DynamicResource MenuButtonStyle}"/>
             <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Donate" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding DonateCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="www.wpinternals.net" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding OpenWebSiteCommand}" Style="{DynamicResource MenuButtonStyle}"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/Views/MainWindow.xaml.cs b/Views/MainWindow.xaml.cs
index 2479212..236da37 100644
--- a/Views/MainWindow.xaml.cs
+++ b/Views/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/MessageView.xaml b/Views/MessageView.xaml
index 4bc1bc3..9f708d8 100644
--- a/Views/MessageView.xaml
+++ b/Views/MessageView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/MessageView.xaml.cs b/Views/MessageView.xaml.cs
index 68090ac..56742f9 100644
--- a/Views/MessageView.xaml.cs
+++ b/Views/MessageView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaBootloaderView.xaml b/Views/NokiaBootloaderView.xaml
index 558015e..47ec07a 100644
--- a/Views/NokiaBootloaderView.xaml
+++ b/Views/NokiaBootloaderView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaBootloaderView.xaml.cs b/Views/NokiaBootloaderView.xaml.cs
index 80624aa..dd44404 100644
--- a/Views/NokiaBootloaderView.xaml.cs
+++ b/Views/NokiaBootloaderView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaFlashView.xaml b/Views/NokiaFlashView.xaml
index 9619161..b4a873b 100644
--- a/Views/NokiaFlashView.xaml
+++ b/Views/NokiaFlashView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaFlashView.xaml.cs b/Views/NokiaFlashView.xaml.cs
index 4745048..6bf9a3d 100644
--- a/Views/NokiaFlashView.xaml.cs
+++ b/Views/NokiaFlashView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaLabelView.xaml b/Views/NokiaLabelView.xaml
index f2e4b61..5368ec8 100644
--- a/Views/NokiaLabelView.xaml
+++ b/Views/NokiaLabelView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaLabelView.xaml.cs b/Views/NokiaLabelView.xaml.cs
index 6373dee..6a556b2 100644
--- a/Views/NokiaLabelView.xaml.cs
+++ b/Views/NokiaLabelView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaMassStorageView.xaml b/Views/NokiaMassStorageView.xaml
index 89f1c50..383eb09 100644
--- a/Views/NokiaMassStorageView.xaml
+++ b/Views/NokiaMassStorageView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaMassStorageView.xaml.cs b/Views/NokiaMassStorageView.xaml.cs
index 8f70f8a..087cc39 100644
--- a/Views/NokiaMassStorageView.xaml.cs
+++ b/Views/NokiaMassStorageView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeBootloaderView.xaml b/Views/NokiaModeBootloaderView.xaml
index c6b6b55..d880496 100644
--- a/Views/NokiaModeBootloaderView.xaml
+++ b/Views/NokiaModeBootloaderView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeBootloaderView.xaml.cs b/Views/NokiaModeBootloaderView.xaml.cs
index a32a153..ba3b4c1 100644
--- a/Views/NokiaModeBootloaderView.xaml.cs
+++ b/Views/NokiaModeBootloaderView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeFlashView.xaml b/Views/NokiaModeFlashView.xaml
index 02043f4..fb635a8 100644
--- a/Views/NokiaModeFlashView.xaml
+++ b/Views/NokiaModeFlashView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeFlashView.xaml.cs b/Views/NokiaModeFlashView.xaml.cs
index bfedfb1..7d8a887 100644
--- a/Views/NokiaModeFlashView.xaml.cs
+++ b/Views/NokiaModeFlashView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeLabelView.xaml b/Views/NokiaModeLabelView.xaml
index 36084e1..5b9d3c5 100644
--- a/Views/NokiaModeLabelView.xaml
+++ b/Views/NokiaModeLabelView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeLabelView.xaml.cs b/Views/NokiaModeLabelView.xaml.cs
index fb8b96a..5363f25 100644
--- a/Views/NokiaModeLabelView.xaml.cs
+++ b/Views/NokiaModeLabelView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeMassStorageView.xaml b/Views/NokiaModeMassStorageView.xaml
index cd4503d..431ab37 100644
--- a/Views/NokiaModeMassStorageView.xaml
+++ b/Views/NokiaModeMassStorageView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeMassStorageView.xaml.cs b/Views/NokiaModeMassStorageView.xaml.cs
index 33338bf..28a23a6 100644
--- a/Views/NokiaModeMassStorageView.xaml.cs
+++ b/Views/NokiaModeMassStorageView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeNormalView.xaml b/Views/NokiaModeNormalView.xaml
index 8918977..92be4e3 100644
--- a/Views/NokiaModeNormalView.xaml
+++ b/Views/NokiaModeNormalView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaModeNormalView.xaml.cs b/Views/NokiaModeNormalView.xaml.cs
index d18a235..30fb3db 100644
--- a/Views/NokiaModeNormalView.xaml.cs
+++ b/Views/NokiaModeNormalView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaNormalView.xaml b/Views/NokiaNormalView.xaml
index 57d1571..1e91468 100644
--- a/Views/NokiaNormalView.xaml
+++ b/Views/NokiaNormalView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NokiaNormalView.xaml.cs b/Views/NokiaNormalView.xaml.cs
index 9144c06..0d14e07 100644
--- a/Views/NokiaNormalView.xaml.cs
+++ b/Views/NokiaNormalView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NotImplementedView.xaml b/Views/NotImplementedView.xaml
index ef0323d..5e5f220 100644
--- a/Views/NotImplementedView.xaml
+++ b/Views/NotImplementedView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/NotImplementedView.xaml.cs b/Views/NotImplementedView.xaml.cs
index 4e7e6f6..8755121 100644
--- a/Views/NotImplementedView.xaml.cs
+++ b/Views/NotImplementedView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/RegistrationView.xaml b/Views/RegistrationView.xaml
index 85db6b9..3b50c26 100644
--- a/Views/RegistrationView.xaml
+++ b/Views/RegistrationView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/RegistrationView.xaml.cs b/Views/RegistrationView.xaml.cs
index 9be0403..ac535a1 100644
--- a/Views/RegistrationView.xaml.cs
+++ b/Views/RegistrationView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/RestoreView.xaml b/Views/RestoreView.xaml
index 1e649d5..beac30c 100644
--- a/Views/RestoreView.xaml
+++ b/Views/RestoreView.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/RestoreView.xaml.cs b/Views/RestoreView.xaml.cs
index 3fe6f0b..7c0dc0b 100644
--- a/Views/RestoreView.xaml.cs
+++ b/Views/RestoreView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/Views/StartupWindow.xaml b/Views/StartupWindow.xaml
index 6e39567..8af5cf7 100644
--- a/Views/StartupWindow.xaml
+++ b/Views/StartupWindow.xaml
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Views/StartupWindow.xaml.cs b/Views/StartupWindow.xaml.cs
index 93af0de..bd827c4 100644
--- a/Views/StartupWindow.xaml.cs
+++ b/Views/StartupWindow.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/WPinternalsConfig.cs b/WPinternalsConfig.cs
index 1ac33fb..8f198a3 100644
--- a/WPinternalsConfig.cs
+++ b/WPinternalsConfig.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Rene Lergner - wpinternals.net - @Heathcliff74xda
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),