10.0.5

10.0

README.md

@@ -1,7 +1,7 @@
 ![Banner](https://i.imgur.com/p0P4tcI.png)
 
 GUI and CLI Launcher for [Project Reboot](https://github.com/Milxnor/Project-Reboot-3.0/)
-Join our discord at https://discord.gg/reboot
+Join our [Discord](https://discord.gg/rebootmp)
 
 ## Modules
 

archive/README.md

@@ -0,0 +1,8 @@
+# Builds Archive
+
+Builds are stored on a Cloudflare R2 instance at `https://builds.rebootfn.org/versions.json`.
+If you want to move them to another AWS-compatible object storage, run:
+```
+python move.py
+```
+and provide the required parameters.

archive/move.py

@@ -0,0 +1,66 @@
+import argparse
+import os
+import requests
+import boto3
+
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from urllib.parse import urlparse
+
+def upload_url_to_s3(s3_client, bucket_name, url, object_key):
+    response = requests.get(url, stream=True, verify=False, headers={"Cookie": "_c_t_c=1"})
+    response.raise_for_status()
+    s3_client.upload_fileobj(response.raw, bucket_name, object_key)
+    return url, object_key
+
+def derive_key_from_url(url, prefix=None):
+    parsed = urlparse(url)
+    filename = os.path.basename(parsed.path)
+    if prefix:
+        return f"{prefix}/{filename}"
+    else:
+        return filename
+
+def main():
+    parser = argparse.ArgumentParser(description="Upload multiple URLs from versions.txt to an S3 bucket concurrently.")
+    parser.add_argument('--bucket', required=True, help="Name of the S3 bucket.")
+    parser.add_argument('--concurrency', required=True, type=int, help="Number of concurrent uploads.")
+    parser.add_argument('--versions-file', default='versions.txt', help="File containing one URL per line.")
+    parser.add_argument('--access-key', required=True, help="AWS Access Key ID.")
+    parser.add_argument('--secret-key', required=True, help="AWS Secret Access Key.")
+    parser.add_argument('--endpoint-url', required=True, help="Custom endpoint URL for S3 or S3-compatible storage.")
+    args = parser.parse_args()
+
+    bucket_name = args.bucket
+    concurrency = args.concurrency
+    versions_file = args.versions_file
+    access_key = args.access_key
+    secret_key = args.secret_key
+    endpoint_url = args.endpoint_url
+
+    with open(versions_file, 'r') as f:
+        urls = [line.strip() for line in f if line.strip()]
+
+    print(f"Uploading {len(urls)} files...")
+    s3_params = {}
+    if access_key and secret_key:
+        s3_params['aws_access_key_id'] = access_key
+        s3_params['aws_secret_access_key'] = secret_key
+    if endpoint_url:
+        s3_params['endpoint_url'] = endpoint_url
+
+    s3 = boto3.client('s3', **s3_params)
+
+    futures = []
+    with ThreadPoolExecutor(max_workers=concurrency) as executor:
+        for url in urls:
+            object_key = derive_key_from_url(url)
+            futures.append(executor.submit(upload_url_to_s3, s3, bucket_name, url, object_key))
+        for future in as_completed(futures):
+            try:
+                uploaded_url, uploaded_key = future.result()
+                print(f"Uploaded: {uploaded_url}")
+            except Exception as e:
+                print(f"Error uploading: {e}")
+
+if __name__ == "__main__":
+    main()

archive/versions.txt

@@ -0,0 +1,85 @@
+https://builds.rebootfn.org/1.7.2.zip
+https://builds.rebootfn.org/1.8.rar
+https://builds.rebootfn.org/1.8.1.rar
+https://builds.rebootfn.org/1.8.2.rar
+https://builds.rebootfn.org/1.9.rar
+https://builds.rebootfn.org/1.9.1.rar
+https://builds.rebootfn.org/1.10.rar
+https://builds.rebootfn.org/1.11.zip
+https://builds.rebootfn.org/2.1.0.zip
+https://builds.rebootfn.org/2.2.0.rar
+https://builds.rebootfn.org/2.3.rar
+https://builds.rebootfn.org/2.4.0.zip
+https://builds.rebootfn.org/2.4.2.zip
+https://builds.rebootfn.org/2.5.0.rar
+https://builds.rebootfn.org/3.0.zip
+https://builds.rebootfn.org/3.1.rar
+https://builds.rebootfn.org/3.1.1.zip
+https://builds.rebootfn.org/3.2.zip
+https://builds.rebootfn.org/3.3.rar
+https://builds.rebootfn.org/3.5.rar
+https://builds.rebootfn.org/3.6.zip
+https://builds.rebootfn.org/4.0.zip
+https://builds.rebootfn.org/4.1.zip
+https://builds.rebootfn.org/4.2.zip
+https://builds.rebootfn.org/4.4.rar
+https://builds.rebootfn.org/4.5.rar
+https://builds.rebootfn.org/5.00.rar
+https://builds.rebootfn.org/5.0.1.rar
+https://builds.rebootfn.org/5.10.rar
+https://builds.rebootfn.org/5.21.rar
+https://builds.rebootfn.org/5.30.rar
+https://builds.rebootfn.org/5.40.rar
+https://builds.rebootfn.org/6.00.rar
+https://builds.rebootfn.org/6.01.rar
+https://builds.rebootfn.org/6.1.1.rar
+https://builds.rebootfn.org/6.02.rar
+https://builds.rebootfn.org/6.2.1.rar
+https://builds.rebootfn.org/6.10.rar
+https://builds.rebootfn.org/6.10.1.rar
+https://builds.rebootfn.org/6.10.2.rar
+https://builds.rebootfn.org/6.21.rar
+https://builds.rebootfn.org/6.22.rar
+https://builds.rebootfn.org/6.30.rar
+https://builds.rebootfn.org/6.31.rar
+https://builds.rebootfn.org/7.00.rar
+https://builds.rebootfn.org/7.10.rar
+https://builds.rebootfn.org/7.20.rar
+https://builds.rebootfn.org/7.30.zip
+https://builds.rebootfn.org/7.40.rar
+https://builds.rebootfn.org/8.00.zip
+https://builds.rebootfn.org/8.20.rar
+https://builds.rebootfn.org/8.30.rar
+https://builds.rebootfn.org/8.40.zip
+https://builds.rebootfn.org/8.50.zip
+https://builds.rebootfn.org/8.51.rar
+https://builds.rebootfn.org/9.00.zip
+https://builds.rebootfn.org/9.01.zip
+https://builds.rebootfn.org/9.10.rar
+https://builds.rebootfn.org/9.21.zip
+https://builds.rebootfn.org/9.30.zip
+https://builds.rebootfn.org/9.40.zip
+https://builds.rebootfn.org/9.41.rar
+https://builds.rebootfn.org/10.00.zip
+https://builds.rebootfn.org/10.10.zip
+https://builds.rebootfn.org/10.20.zip
+https://builds.rebootfn.org/10.31.zip
+https://builds.rebootfn.org/10.40.rar
+https://builds.rebootfn.org/11.00.zip
+https://builds.rebootfn.org/11.31.rar
+https://builds.rebootfn.org/12.00.rar
+https://builds.rebootfn.org/12.21.zip
+https://builds.rebootfn.org/12.50.zip
+https://builds.rebootfn.org/12.61.zip
+https://builds.rebootfn.org/13.00.rar
+https://builds.rebootfn.org/13.40.zip
+https://builds.rebootfn.org/14.00.rar
+https://builds.rebootfn.org/14.40.rar
+https://builds.rebootfn.org/14.60.rar
+https://builds.rebootfn.org/15.30.rar
+https://builds.rebootfn.org/16.40.rar
+https://builds.rebootfn.org/17.30.zip
+https://builds.rebootfn.org/17.50.zip
+https://builds.rebootfn.org/18.40.zip
+https://builds.rebootfn.org/19.10.rar
+https://builds.rebootfn.org/20.40.zip

common/lib/src/constant/game.dart

@@ -1,4 +1,5 @@
 const String kDefaultPlayerName = "Player";
+const String kDefaultHostName = "Host";
 const String kDefaultGameServerHost = "127.0.0.1";
 const String kDefaultGameServerPort = "7777";
 const String kInitializedLine = "Game Engine Initialized";

common/lib/src/model/dll.dart

@@ -1,6 +1,10 @@
 enum InjectableDll {
   console,
-  cobalt,
-  reboot,
-  memory
+  auth,
+  gameServer,
+  memoryLeak
+}
+
+extension InjectableDllVersionAware on InjectableDll {
+  bool get isVersionDependent => this == InjectableDll.gameServer;
 }

common/lib/src/model/fortnite_build.dart

@@ -17,13 +17,15 @@ class FortniteBuild {
 
 class FortniteBuildDownloadProgress {
   final double progress;
-  final int? minutesLeft;
+  final int? timeLeft;
   final bool extracting;
+  final int speed;
 
   FortniteBuildDownloadProgress({
     required this.progress,
     required this.extracting,
-    this.minutesLeft,
+    required this.timeLeft,
+    required this.speed
   });
 }
 

common/lib/src/model/game_instance.dart

@@ -1,10 +1,11 @@
 import 'dart:io';
 
 import 'package:reboot_common/common.dart';
+import 'package:version/version.dart';
 
 
 class GameInstance {
-  final String versionName;
+  final Version version;
   final int gamePid;
   final int? launcherPid;
   final int? eacPid;
@@ -17,7 +18,7 @@ class GameInstance {
   GameInstance? child;
 
   GameInstance({
-    required this.versionName,
+    required this.version,
     required this.gamePid,
     required this.launcherPid,
     required this.eacPid,

common/lib/src/util/build.dart

@@ -3,165 +3,248 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:dio/dio.dart';
-import 'package:dio/io.dart';
 import 'package:path/path.dart' as path;
 import 'package:reboot_common/common.dart';
 import 'package:reboot_common/src/extension/types.dart';
+import 'package:uuid/uuid.dart';
 import 'package:version/version.dart';
 
+import 'package:http/http.dart' as http;
+
 const String kStopBuildDownloadSignal = "kill";
 
-final Dio _dio = _buildDioInstance();
-Dio _buildDioInstance() {
-  final dio = Dio();
-  final httpClientAdapter = dio.httpClientAdapter as IOHttpClientAdapter;
-  httpClientAdapter.createHttpClient = () {
-    final client = HttpClient();
-    client.badCertificateCallback = (X509Certificate cert, String host, int port) => true;
-    return client;
-  };
-  return dio;
-}
-
-final String _archiveSourceUrl = "https://raw.githubusercontent.com/simplyblk/Fortnitebuilds/main/README.md";
+final Uri _archiveSourceUrl = Uri.parse("https://builds.rebootfn.org/versions.json");
+final int _ariaPort = 6800;
+final Uri _ariaEndpoint = Uri.parse('http://localhost:$_ariaPort/jsonrpc');
+final Duration _ariaMaxSpawnTime = const Duration(seconds: 10);
+final String _ariaSecret = "RebootLauncher";
 final RegExp _rarProgressRegex = RegExp("^((100)|(\\d{1,2}(.\\d*)?))%\$");
-const String _deniedConnectionError = "The connection was denied: your firewall might be blocking the download";
-const String _unavailableError = "The build downloader is not available right now";
-const String _genericError = "The build downloader is not working correctly";
-const int _maxErrors = 100;
 
 Future<List<FortniteBuild>> fetchBuilds(ignored) async {
-  final response = await _dio.get<String>(
-      _archiveSourceUrl,
-      options: Options(
-          responseType: ResponseType.plain
-      )
-  );
+  final response = await http.get(_archiveSourceUrl);
   if (response.statusCode != 200) {
     return [];
   }
 
-  var results = <FortniteBuild>[];
-  for (final line in response.data?.split("\n") ?? []) {
-    if (!line.startsWith("|")) {
-      continue;
-    }
-
-    var parts = line.substring(1, line.length - 1).split("|");
-    if (parts.isEmpty) {
-      continue;
-    }
-
-    var versionName = parts.first.trim();
-    final separator = versionName.indexOf("-");
-    if(separator != -1) {
-      versionName = versionName.substring(0, separator);
-    }
-
-    final link = parts.last.trim();
+  return jsonDecode(response.body)
+      .map((entry) {
         try {
-      results.add(FortniteBuild(
-          version: Version.parse(versionName),
-          link: link,
-          available: link.endsWith(".zip") || link.endsWith(".rar")
-      ));
-    } on FormatException {
-      // Ignore
+          final fileUrl = entry as String;
+          final fileName = Uri.parse(fileUrl).pathSegments.last;
+          final fileNameWithoutExtension = path.basenameWithoutExtension(fileName);
+          return FortniteBuild(
+              version: Version.parse(fileNameWithoutExtension),
+              link: entry,
+              available: true
+          );
+        }catch(_) {
+          return null;
         }
+      })
+      .whereType<FortniteBuild>()
+      .toList();
 }
 
-  return results;
-}
-
-
 Future<void> downloadArchiveBuild(FortniteBuildDownloadOptions options) async {
+  final fileName = options.build.link.substring(options.build.link.lastIndexOf("/") + 1);
+  final outputFile = File("${options.destination.path}\\.build\\$fileName");
   try {
     final stopped = _setupLifecycle(options);
-    final outputDir = Directory("${options.destination.path}\\.build");
-    await outputDir.create(recursive: true);
-    final fileName = options.build.link.substring(options.build.link.lastIndexOf("/") + 1);
-    final extension = path.extension(fileName);
-    final tempFile = File("${outputDir.path}\\$fileName");
-    if(await tempFile.exists()) {
-      await tempFile.delete(recursive: true);
-    }
+    await outputFile.parent.create(recursive: true);
 
-    final startTime = DateTime.now().millisecondsSinceEpoch;
-    final response = _downloadArchive(options, stopped, tempFile, startTime);
-    await Future.any([stopped.future, response]);
-    if(!stopped.isCompleted) {
-      await _extractArchive(stopped, extension, tempFile, options);
-    }
+    final downloadItemCompleter = Completer<File>();
 
-    delete(outputDir);
-  }catch(error) {
-    _onError(error, options);
-  }
-}
-
-Future<void> _downloadArchive(FortniteBuildDownloadOptions options, Completer stopped, File tempFile, int startTime, [int? byteStart = null, int errorsCount = 0]) async {
-  var received = byteStart ?? 0;
+    await _startAriaServer();
+    final downloadId = await _startAriaDownload(options, outputFile);
+    Timer.periodic(const Duration(seconds: 5), (Timer timer) async {
       try {
-    await _dio.download(
-        options.build.link,
-        tempFile.path,
-        onReceiveProgress: (data, length) {
-          if(stopped.isCompleted) {
-            throw StateError("Download interrupted");
+        final statusRequestId = Uuid().toString().replaceAll("-", "");
+        final statusRequest = {
+          "jsonrcp": "2.0",
+          "id": statusRequestId,
+          "method": "aria2.tellStatus",
+          "params": [
+            "token:${_ariaSecret}",
+            downloadId
+          ]
+        };
+        final statusResponse = await http.post(_ariaEndpoint, body: jsonEncode(statusRequest));
+        final statusResponseJson = jsonDecode(statusResponse.body) as Map?;
+        if(statusResponseJson == null) {
+          downloadItemCompleter.completeError("Invalid download status (invalid JSON)");
+          timer.cancel();
+          return;
         }
 
-          received = data;
-          final percentage = (received / length) * 100;
-          _onProgress(startTime, percentage < 1 ? null : DateTime.now().millisecondsSinceEpoch, percentage, false, options);
-        },
-        deleteOnError: false,
-        options: Options(
-          validateStatus: (statusCode) {
-            if(statusCode == 200) {
-              return true;
+        final result = statusResponseJson["result"];
+        final files = result["files"] as List?;
+        if(files == null || files.isEmpty) {
+          downloadItemCompleter.completeError("Download aborted");
+          timer.cancel();
+          return;
         }
 
-            if(statusCode == 403 || statusCode == 503) {
-              throw _deniedConnectionError;
+        final error = result["errorCode"];
+        if(error != null) {
+          final errorCode = int.tryParse(error);
+          if(errorCode == 0) {
+            final path = File(files[0]["path"]);
+            downloadItemCompleter.complete(path);
+          }else if(errorCode == 3) {
+            downloadItemCompleter.completeError("This build is not available yet");
+          }else {
+            final errorMessage = result["errorMessage"];
+            downloadItemCompleter.completeError("$errorMessage (error code $errorCode)");
           }
 
-            if(statusCode == 404) {
-              throw _unavailableError;
+          timer.cancel();
+          return;
         }
 
-            throw _genericError;
-          },
-          headers: byteStart == null || byteStart <= 0 ? {
-            "Cookie": "_c_t_c=1"
-          } :  {
-            "Cookie": "_c_t_c=1",
-            "Range": "bytes=${byteStart}-"
-          },
-        )
+        final speed = int.parse(result["downloadSpeed"] ?? "0");
+        final completedLength = int.parse(files[0]["completedLength"] ?? "0");
+        final totalLength = int.parse(files[0]["length"] ?? "0");
+
+        final percentage = completedLength * 100 / totalLength;
+        final minutesLeft = speed == 0 ? -1 : ((totalLength - completedLength) / speed / 60).round();
+        _onProgress(
+            options.port,
+            percentage,
+            speed,
+            minutesLeft,
+            false
         );
       }catch(error) {
-    if(stopped.isCompleted) {
-      return;
+        throw "Invalid download status (${error})";
       }
+    });
 
-    if(errorsCount > _maxErrors || error.toString().contains(_deniedConnectionError) || error.toString().contains(_unavailableError)) {
+    await Future.any([stopped.future, downloadItemCompleter.future]);
+    if(!stopped.isCompleted) {
+      final extension = path.extension(fileName);
+      await _extractArchive(stopped, extension, await downloadItemCompleter.future, options);
+    }else {
+      await _stopAriaDownload(downloadId);
+    }
+  }catch(error) {
     _onError(error, options);
-      return;
+  }finally {
+    delete(outputFile);
+  }
 }
 
-    await _downloadArchive(options, stopped, tempFile, startTime, received, errorsCount + 1);
+Future<void> _startAriaServer() async {
+  await stopDownloadServer();
+  final aria2c = File("${assetsDirectory.path}\\build\\aria2c.exe");
+  if(!aria2c.existsSync()) {
+    throw "Missing aria2c.exe";
+  }
+
+  final process = await startProcess(
+      executable: aria2c,
+      args: [
+        "--max-connection-per-server=${Platform.numberOfProcessors}",
+        "--split=${Platform.numberOfProcessors}",
+        "--enable-rpc",
+        "--rpc-listen-all=true",
+        "--rpc-allow-origin-all",
+        "--rpc-secret=$_ariaSecret",
+        "--rpc-listen-port=$_ariaPort",
+        "--file-allocation=none"
+      ],
+      window: false
+  );
+  process.stdOutput.listen((message) => log("[ARIA] Message: $message"));
+  process.stdError.listen((error) => log("[ARIA] Error: $error"));
+  process.exitCode.then((exitCode) => log("[ARIA] Exit code: $exitCode"));
+  for(var i = 0; i < _ariaMaxSpawnTime.inSeconds; i++) {
+    if(await _isAriaRunning()) {
+      return;
+    }
+    await Future.delayed(const Duration(seconds: 1));
+  }
+  throw "cannot start download server (timeout exceeded)";
+}
+
+Future<bool> _isAriaRunning() async {
+  try {
+    final statusRequestId = Uuid().toString().replaceAll("-", "");
+    final statusRequest = {
+      "jsonrcp": "2.0",
+      "id": statusRequestId,
+      "method": "aria2.getVersion",
+      "params": [
+        "token:${_ariaSecret}"
+      ]
+    };
+    final response = await http.post(_ariaEndpoint, body: jsonEncode(statusRequest));
+    return response.statusCode == 200;
+  }catch(_) {
+    return false;
   }
 }
 
+Future<String> _startAriaDownload(FortniteBuildDownloadOptions options, File outputFile) async {
+  http.Response? addDownloadResponse;
+  try {
+    final addDownloadRequestId = Uuid().toString().replaceAll("-", "");
+    final addDownloadRequest = {
+      "jsonrcp": "2.0",
+      "id": addDownloadRequestId,
+      "method": "aria2.addUri",
+      "params": [
+        "token:${_ariaSecret}",
+        [options.build.link],
+        {
+          "dir": outputFile.parent.path,
+          "out": path.basename(outputFile.path)
+        }
+      ]
+    };
+    addDownloadResponse = await http.post(_ariaEndpoint, body: jsonEncode(addDownloadRequest));
+    final addDownloadResponseJson = jsonDecode(addDownloadResponse.body);
+    final downloadId = addDownloadResponseJson is Map ? addDownloadResponseJson['result'] : null;
+    if(downloadId == null) {
+      throw "Start failed (${addDownloadResponse.body})";
+    }
+
+    return downloadId;
+  }catch(error) {
+    throw "Start failed (${addDownloadResponse?.body ?? error})";
+  }
+}
+
+Future<void> _stopAriaDownload(String downloadId) async {
+  try {
+    final addDownloadRequestId = Uuid().toString().replaceAll("-", "");
+    final addDownloadRequest = {
+      "jsonrcp": "2.0",
+      "id": addDownloadRequestId,
+      "method": "aria2.forceRemove",
+      "params": [
+        "token:${_ariaSecret}",
+        downloadId
+      ]
+    };
+    await http.post(_ariaEndpoint, body: jsonEncode(addDownloadRequest));
+    stopDownloadServer();
+  }catch(error) {
+    throw "Stop failed (${error})";
+  }
+}
+
+Future<void> stopDownloadServer() async {
+  await killProcessByPort(_ariaPort);
+}
+
+
 Future<void> _extractArchive(Completer<dynamic> stopped, String extension, File tempFile, FortniteBuildDownloadOptions options) async {
-  final startTime = DateTime.now().millisecondsSinceEpoch;
   Process? process;
   switch (extension.toLowerCase()) {
     case ".zip":
       final sevenZip = File("${assetsDirectory.path}\\build\\7zip.exe");
       if(!sevenZip.existsSync()) {
-        throw "Corrupted installation: missing 7zip.exe";
+        throw "Missing 7zip.exe";
       }
 
       process = await startProcess(
@@ -176,10 +259,15 @@ Future<void> _extractArchive(Completer<dynamic> stopped, String extension, File
       );
       var completed = false;
       process.stdOutput.listen((data) {
-        final now = DateTime.now().millisecondsSinceEpoch;
         if(data.toLowerCase().contains("everything is ok")) {
           completed = true;
-          _onProgress(startTime, now, 100, true, options);
+          _onProgress(
+              options.port,
+              100,
+              0,
+              -1,
+              true
+          );
           process?.kill(ProcessSignal.sigabrt);
           return;
         }
@@ -190,7 +278,13 @@ Future<void> _extractArchive(Completer<dynamic> stopped, String extension, File
         }
 
         final percentage = int.parse(element.substring(0, element.length - 1)).toDouble();
-        _onProgress(startTime, now, percentage, true, options);
+        _onProgress(
+            options.port,
+            percentage,
+            0,
+            -1,
+            true
+        );
       });
       process.stdError.listen((data) {
         if(!data.isBlank) {
@@ -206,7 +300,7 @@ Future<void> _extractArchive(Completer<dynamic> stopped, String extension, File
     case ".rar":
       final winrar = File("${assetsDirectory.path}\\build\\winrar.exe");
       if(!winrar.existsSync()) {
-        throw "Corrupted installation: missing winrar.exe";
+        throw "Missing winrar.exe";
       }
 
       process = await startProcess(
@@ -221,11 +315,16 @@ Future<void> _extractArchive(Completer<dynamic> stopped, String extension, File
       );
       var completed = false;
       process.stdOutput.listen((data) {
-        final now = DateTime.now().millisecondsSinceEpoch;
         data = data.replaceAll("\r", "").replaceAll("\b", "").trim();
         if(data == "All OK") {
           completed = true;
-          _onProgress(startTime, now, 100, true, options);
+          _onProgress(
+              options.port,
+              100,
+              0,
+              -1,
+              true
+          );
           process?.kill(ProcessSignal.sigabrt);
           return;
         }
@@ -236,7 +335,13 @@ Future<void> _extractArchive(Completer<dynamic> stopped, String extension, File
         }
 
         final percentage = int.parse(element).toDouble();
-        _onProgress(startTime, now, percentage, true, options);
+        _onProgress(
+            options.port,
+            percentage,
+            0,
+            -1,
+            true
+        );
       });
       process.stdError.listen((data) {
         if(!data.isBlank) {
@@ -257,21 +362,22 @@ Future<void> _extractArchive(Completer<dynamic> stopped, String extension, File
   process.kill(ProcessSignal.sigabrt);
 }
 
-void _onProgress(int startTime, int? now, double percentage, bool extracting, FortniteBuildDownloadOptions options) {
+void _onProgress(SendPort port, double percentage, int speed, int minutesLeft, bool extracting) {
   if(percentage == 0) {
-    options.port.send(FortniteBuildDownloadProgress(
+    port.send(FortniteBuildDownloadProgress(
         progress: percentage,
-        extracting: extracting
+        extracting: extracting,
+        timeLeft: null,
+        speed: speed
     ));
     return;
   }
 
-  final msLeft = now == null ? null : startTime + (now - startTime) * 100 / percentage - now;
-  final minutesLeft = msLeft == null ? null : (msLeft / 1000 / 60).round();
-  options.port.send(FortniteBuildDownloadProgress(
+  port.send(FortniteBuildDownloadProgress(
       progress: percentage,
       extracting: extracting,
-      minutesLeft: minutesLeft
+      timeLeft: minutesLeft,
+      speed: speed
   ));
 }
 
@@ -292,3 +398,4 @@ Completer<dynamic> _setupLifecycle(FortniteBuildDownloadOptions options) {
   options.port.send(lifecyclePort.sendPort);
   return stopped;
 }
+

common/lib/src/util/dll.dart

@@ -5,19 +5,36 @@ import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as path;
 import 'package:reboot_common/common.dart';
 
-bool _watcher = false;
-final File rebootDllFile = File("${dllsDirectory.path}\\reboot.dll");
-const String kRebootDownloadUrl =
-    "http://nightly.link/Milxnor/Project-Reboot-3.0/workflows/msbuild/master/Release.zip";
+final File rebootBeforeS20DllFile = File("${dllsDirectory.path}\\reboot.dll");
+final File rebootAboveS20DllFile = File("${dllsDirectory.path}\\rebootS20.dll");
+const String kRebootBelowS20DownloadUrl =
+    "https://nightly.link/Milxnor/Project-Reboot-3.0/workflows/msbuild/master/Reboot.zip";
+const String kRebootAboveS20DownloadUrl =
+    "https://nightly.link/Milxnor/Project-Reboot-3.0/workflows/msbuild/master/RebootS20.zip";
 
 Future<bool> hasRebootDllUpdate(int? lastUpdateMs, {int hours = 24, bool force = false}) async {
     final lastUpdate = await _getLastUpdate(lastUpdateMs);
-    final exists = await rebootDllFile.exists();
+    final exists = await rebootBeforeS20DllFile.exists() && await rebootAboveS20DllFile.exists();
     final now = DateTime.now();
     return force || !exists || (hours > 0 && lastUpdate != null && now.difference(lastUpdate).inHours > hours);
 }
 
-Future<void> downloadCriticalDll(String name, String outputPath) async {
+Future<void> downloadDependency(InjectableDll dll, String outputPath) async {
+    String? name;
+    switch(dll) {
+      case InjectableDll.console:
+        name = "console.dll";
+      case InjectableDll.auth:
+          name = "starfall.dll";
+      case InjectableDll.memoryLeak:
+        name = "memory.dll";
+        case InjectableDll.gameServer:
+         name = null;
+    }
+    if(name == null) {
+        return;
+    }
+
     final response = await http.get(Uri.parse("https://github.com/Auties00/reboot_launcher/raw/master/gui/dependencies/dlls/$name"));
     if(response.statusCode != 200) {
         throw Exception("Cannot download $name: status code ${response.statusCode}");
@@ -28,9 +45,8 @@ Future<void> downloadCriticalDll(String name, String outputPath) async {
     await output.writeAsBytes(response.bodyBytes, flush: true);
 }
 
-Future<int> downloadRebootDll(String url) async {
+Future<void> downloadRebootDll(File file, String url) async {
     Directory? outputDir;
-    final now = DateTime.now();
     try {
         final response = await http.get(Uri.parse(url));
         if(response.statusCode != 200) {
@@ -42,8 +58,7 @@ Future<int> downloadRebootDll(String url) async {
         await tempZip.writeAsBytes(response.bodyBytes, flush: true);
         await extractFileToDisk(tempZip.path, outputDir.path);
         final rebootDll = File(outputDir.listSync().firstWhere((element) => path.extension(element.path) == ".dll").path);
-        await rebootDllFile.writeAsBytes(await rebootDll.readAsBytes(), flush: true);
-        return now.millisecondsSinceEpoch;
+        await file.writeAsBytes(await rebootDll.readAsBytes(), flush: true);
     } finally{
         if(outputDir != null) {
             delete(outputDir);
@@ -56,16 +71,3 @@ Future<DateTime?> _getLastUpdate(int? lastUpdateMs) async {
       ? DateTime.fromMillisecondsSinceEpoch(lastUpdateMs)
       : null;
 }
-
-Stream<String> watchDlls() async* {
-    if(_watcher) {
-        return;
-    }
-
-    _watcher = true;
-    await for(final event in rebootDllFile.parent.watch(events: FileSystemEvent.delete | FileSystemEvent.move)) {
-        if (event.path.endsWith(".dll")) {
-            yield event.path;
-        }
-    }
-}

common/lib/src/util/process.dart

@@ -8,10 +8,7 @@ import 'dart:isolate';
 import 'dart:math';
 
 import 'package:ffi/ffi.dart';
-import 'package:path/path.dart' as path;
 import 'package:reboot_common/common.dart';
-import 'package:reboot_common/src/util/log.dart';
-import 'package:sync/semaphore.dart';
 import 'package:win32/win32.dart';
 
 final _ntdll = DynamicLibrary.open('ntdll.dll');
@@ -98,8 +95,8 @@ Future<bool> startElevatedProcess({required String executable, required String a
   var shellInput = calloc<SHELLEXECUTEINFO>();
   shellInput.ref.lpFile = executable.toNativeUtf16();
   shellInput.ref.lpParameters = args.toNativeUtf16();
-  shellInput.ref.nShow = window ? SW_SHOWNORMAL : SW_HIDE;
-  shellInput.ref.fMask = ES_AWAYMODE_REQUIRED;
+  shellInput.ref.nShow = window ? SHOW_WINDOW_CMD.SW_SHOWNORMAL : SHOW_WINDOW_CMD.SW_HIDE;
+  shellInput.ref.fMask = EXECUTION_STATE.ES_AWAYMODE_REQUIRED;
   shellInput.ref.lpVerb = "runas".toNativeUtf16();
   shellInput.ref.cbSize = sizeOf<SHELLEXECUTEINFO>();
   return ShellExecuteEx(shellInput) == 1;
@@ -154,47 +151,36 @@ final _NtSuspendProcess = _ntdll.lookupFunction<Int32 Function(IntPtr hWnd),
     int Function(int hWnd)>('NtSuspendProcess');
 
 bool suspend(int pid) {
-  final processHandle = OpenProcess(PROCESS_SUSPEND_RESUME, FALSE, pid);
-  final result = _NtSuspendProcess(processHandle);
-  CloseHandle(processHandle);
-  return result == 0;
-}
-
-bool resume(int pid) {
-  final processHandle = OpenProcess(PROCESS_SUSPEND_RESUME, FALSE, pid);
-  final result = _NtResumeProcess(processHandle);
-  CloseHandle(processHandle);
-  return result == 0;
-}
-
-void _watchProcess(int pid) {
-  final processHandle = OpenProcess(SYNCHRONIZE, FALSE, pid);
+  final processHandle = OpenProcess(PROCESS_ACCESS_RIGHTS.PROCESS_SUSPEND_RESUME, FALSE, pid);
   try {
-    WaitForSingleObject(processHandle, INFINITE);
+    return _NtSuspendProcess(processHandle) == 0;
   } finally {
     CloseHandle(processHandle);
   }
 }
 
-Future<bool> watchProcess(int pid) async {
-  var completer = Completer<bool>();
-  var exitPort = ReceivePort();
-  exitPort.listen((_) {
-    if(!completer.isCompleted) {
-      completer.complete(true);
+bool resume(int pid) {
+  final processHandle = OpenProcess(PROCESS_ACCESS_RIGHTS.PROCESS_SUSPEND_RESUME, FALSE, pid);
+  try {
+    return _NtResumeProcess(processHandle) == 0;
+  } finally {
+    CloseHandle(processHandle);
+  }
+}
+
+
+Future<void> watchProcess(int pid) => Isolate.run(() {
+  final processHandle = OpenProcess(FILE_ACCESS_RIGHTS.SYNCHRONIZE, FALSE, pid);
+  if (processHandle == 0) {
+    return;
+  }
+
+  try {
+    WaitForSingleObject(processHandle, INFINITE);
+  }finally {
+    CloseHandle(processHandle);
   }
 });
-  var errorPort = ReceivePort();
-  errorPort.listen((_) => completer.complete(false));
-  await Isolate.spawn(
-      _watchProcess,
-      pid,
-      onExit: exitPort.sendPort,
-      onError: errorPort.sendPort,
-      errorsAreFatal: true
-  );
-  return await completer.future;
-}
 
 List<String> createRebootArgs(String username, String password, bool host, GameServerType hostType, bool logging, String additionalArgs) {
   log("[PROCESS] Generating reboot args");

common/pubspec.yaml

@@ -7,19 +7,18 @@ environment:
   sdk: ">=3.0.0 <=4.0.0"
 
 dependencies:
-  dio: ^5.3.2
-  win32: 3.0.0
-  ffi: ^2.1.0
-  path: ^1.8.3
-  http: ^1.1.0
-  crypto: ^3.0.2
-  archive: ^3.3.7
+  win32: ^5.5.4
+  ffi: ^2.1.3
+  path: ^1.9.0
+  http: ^1.2.2
+  crypto: ^3.0.5
+  archive: ^3.6.1
   ini: ^2.1.0
   shelf_proxy: ^1.0.2
   sync: ^0.3.0
-  uuid: ^3.0.6
+  uuid: ^4.5.1
   shelf_web_socket: ^2.0.0
   version: ^3.0.2
 
 dev_dependencies:
-  flutter_lints: ^2.0.1
+  flutter_lints: ^5.0.0

gui/README.md

@@ -1,16 +1,39 @@
-# reboot_launcher
 
-Launcher for project reboot
+# Reboot Launcher
+
+Welcome to the **Reboot Launcher**! 
+This is a GUI application developed as part of the **Reboot Project**.
 
 ## Getting Started
 
-This project is a starting point for a Flutter application.
+### Running the Project
+To launch the project in development mode, simply run:
+```
+flutter run
+```
 
-A few resources to get you started if this is your first Flutter project:
+### Building the Project
+To create a production-ready build, use:
+```
+flutter build
+```
 
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+### Packaging the Project
+To package the application for distribution, run:
+```
+package.bat
+```
 
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+## Requirements
+- [Flutter SDK](https://flutter.dev/docs/get-started/install)
+- Supported operating systems: Windows
+
+## Other platforms
+
+Native support for these platforms is not currently planned, but Linux support is a priority for the 10.0 release cycle
+
+- [Linux Tutorial using Proton](https://www.reddit.com/r/linux_gaming/comments/1fwa4l8/guide_running_a_fortnite_private_server_to_play/)
+- No tutorials are available for MacOS(got lost when the Reboot discord was banned), but it's possible to run Reboot using a compatibility layer
+
+## Contributing
+Contributions are welcome! Feel free to open an issue or submit a pull request.

gui/assets/build/stop.bat

@@ -1,2 +0,0 @@
-taskkill /f /im winrar.exe
-taskkill /f /im tar.exe

gui/lib/l10n/reboot_en.arb

@@ -76,7 +76,7 @@
   "playGameServerCustomContent": "Enter IP",
   "settingsName": "Settings",
   "settingsClientName": "Internal files",
-  "settingsClientDescription": "Configure the internal files used by the launcher for Fortnite",
+  "settingsClientDescription": "Configure the internal files used by the launcher",
   "settingsClientOptionsName": "Options",
   "settingsClientOptionsDescription": "Configure additional options for Fortnite",
   "settingsClientConsoleName": "Unreal engine patcher",
@@ -94,18 +94,19 @@
   "settingsServerSubtitle": "Configure the internal files used by the launcher for the game server",
   "settingsServerOptionsName": "Options",
   "settingsServerOptionsSubtitle": "Configure additional options for the game server",
-  "settingsServerTypeName": "Type",
+  "settingsServerTypeName": "Game server type",
   "settingsServerTypeDescription": "The type of game server to inject",
   "settingsServerTypeEmbeddedName": "Embedded",
   "settingsServerTypeCustomName": "Custom",
-  "settingsServerFileName": "Implementation",
+  "settingsOldServerFileName": "Game server",
   "settingsServerFileDescription": "The file injected to create the game server",
   "settingsServerPortName": "Port",
   "settingsServerPortDescription": "The port the launcher expects the game server to be hosted on",
-  "settingsServerMirrorName": "Update mirror",
+  "settingsServerOldMirrorName": "Update mirror (Before season 20)",
+  "settingsServerNewMirrorName": "Update mirror (Season 20 and above)",
   "settingsServerMirrorDescription": "The URL used to update the game server dll",
   "settingsServerMirrorPlaceholder": "mirror",
-  "settingsServerTimerName": "Update timer",
+  "settingsServerTimerName": "Game server updater",
   "settingsServerTimerSubtitle": "Determines when the game server should be updated",
   "settingsUtilsName": "Launcher",
   "settingsUtilsSubtitle": "This section contains settings related to the launcher",
@@ -215,6 +216,7 @@
   "downloadedVersion": "The download was completed successfully!",
   "download": "Download",
   "downloading": "Downloading...",
+  "startingDownload": "Starting download...",
   "extracting": "Extracting...",
   "buildProgress": "{progress}%",
   "buildInstallationDirectory": "Installation directory",
@@ -234,7 +236,7 @@
   "startGame": "Start fortnite",
   "stopGame": "Close fortnite",
   "waitingForGameServer": "Waiting for the game server to boot up...",
-  "gameServerStartWarning": "The game server was started successfully, but Reboot didn't load",
+  "gameServerStartWarning": "Unsupported version: the game server crashed while setting up the server",
   "gameServerStartLocalWarning": "The game server was started successfully, but other players can't join",
   "gameServerStarted": "The game server was started successfully",
   "gameClientStarted": "The game client was started successfully",
@@ -324,6 +326,8 @@
   "backendErrorMessage": "The backend reported an unexpected error",
   "welcomeTitle": "Welcome to Reboot Launcher",
   "welcomeDescription": "If you have never used a Fortnite game server, or this launcher in particular, please click on take a tour\nPlease don't ask for support on Discord without taking the tour: this helps me prioritize real bugs\nYou can always take the tour again in the Info tab",
+  "hostAccountText": "The host tab shows different credentials compared to the play tab.\nIf you are advanced user, you can set a different email and password\nhere if the backend you are using needs authentication.",
+  "hostAccountAction": "I understand",
   "welcomeAction": "Take the tour",
   "startOnboardingText": "Start by choosing a username: this will be visible to other players on Fortnite.\nIf you are advanced user, you can set the email and password here if the backend\nyou are using supports authentication.",
   "startOnboardingActionLabel": "Let's do it",
@@ -368,5 +372,7 @@
   "automaticGameServerDialogStart": "Start server",
   "gameResetDefaultsName": "Reset",
   "gameResetDefaultsDescription": "Resets the game's settings to their default values",
-  "gameResetDefaultsContent": "Reset"
+  "gameResetDefaultsContent": "Reset",
+  "selectFile": "Select a file",
+  "reset": "Reset"
 }

gui/lib/main.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter_acrylic/flutter_acrylic.dart';
 import 'package:flutter_gen/gen_l10n/reboot_localizations.dart';
@@ -16,12 +15,12 @@ import 'package:reboot_launcher/src/controller/dll_controller.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
 import 'package:reboot_launcher/src/controller/hosting_controller.dart';
 import 'package:reboot_launcher/src/controller/settings_controller.dart';
-import 'package:reboot_launcher/src/messenger/implementation/error.dart';
-import 'package:reboot_launcher/src/page/implementation/home_page.dart';
+import 'package:reboot_launcher/src/widget/message/error.dart';
+import 'package:reboot_launcher/src/widget/page/home_page.dart';
 import 'package:reboot_launcher/src/util/os.dart';
+import 'package:reboot_launcher/src/util/url_protocol.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:system_theme/system_theme.dart';
-import 'package:url_protocol/url_protocol.dart';
 import 'package:version/version.dart';
 import 'package:window_manager/window_manager.dart';
 
@@ -83,9 +82,7 @@ Future<void> _startApp() async {
     errors.add(uncaughtError);
   } finally{
     log("[APP] Started applications with errors: $errors");
-    runApp(RebootApplication(
-      errors: errors,
-    ));
+    runApp(RebootApplication(errors: errors));
   }
 }
 
@@ -146,45 +143,47 @@ Future<Object?> _initVersion() async {
 
 Future<Object?> _initUrlHandler() async {
   try {
-    registerProtocolHandler(kCustomUrlSchema, arguments: ['%s']);
+    registerUrlProtocol(kCustomUrlSchema, arguments: ['%s']);
     return null;
   }catch(error) {
     return error;
   }
 }
 
-void _initWindow() => doWhenWindowReady(() async {
+Future<void> _initWindow() async {
   try {
     await SystemTheme.accentColor.load();
     await windowManager.ensureInitialized();
     await Window.initialize();
     var settingsController = Get.find<SettingsController>();
     var size = Size(settingsController.width, settingsController.height);
-    appWindow.size = size;
+    await windowManager.setSize(size);
     var offsetX = settingsController.offsetX;
     var offsetY = settingsController.offsetY;
     if(offsetX != null && offsetY != null) {
-      appWindow.position = Offset(
+      final position = Offset(
           offsetX,
           offsetY
       );
+      await windowManager.setPosition(position);
     }else {
-      appWindow.alignment = Alignment.center;
+      await windowManager.setAlignment(Alignment.center);
     }
-
+    await windowManager.setPreventClose(true);
+    await windowManager.setResizable(true);
     if(isWin11) {
       await Window.setEffect(
           effect: WindowEffect.acrylic,
-          color: Colors.transparent,
+          color: Colors.green,
           dark: isDarkMode
       );
     }
   }catch(error, stackTrace) {
     onError(error, stackTrace, false);
   }finally {
-    appWindow.show();
+    windowManager.show();
+  }
 }
-});
 
 Future<List<Object>> _initStorage() async {
   final errors = <Object>[];
@@ -231,7 +230,6 @@ Future<List<Object>> _initStorage() async {
     errors.add(error);
   }
 
-
   return errors;
 }
 
@@ -253,7 +251,11 @@ class _RebootApplicationState extends State<RebootApplication> {
   }
 
   void _handleErrors(List<Object?> errors) {
-    errors.where((element) => element != null).forEach((element) => onError(element!, null, false));
+    for(final error in errors) {
+      if(error != null) {
+        onError(error, null, false);
+      }
+    }
   }
 
   @override

gui/lib/src/controller/backend_controller.dart

@@ -1,16 +1,28 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:fluent_ui/fluent_ui.dart';
+import 'package:clipboard/clipboard.dart';
+import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/main.dart';
+import 'package:reboot_launcher/src/controller/game_controller.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
+import 'package:reboot_launcher/src/page/pages.dart';
+import 'package:reboot_launcher/src/util/cryptography.dart';
 import 'package:reboot_launcher/src/util/keyboard.dart';
+import 'package:reboot_launcher/src/util/matchmaker.dart';
+import 'package:reboot_launcher/src/util/translations.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class BackendController extends GetxController {
-  static const String storageName = "backend_storage";
+  static const String storageName = "v2_backend_storage";
   static const PhysicalKeyboardKey _kDefaultConsoleKey = PhysicalKeyboardKey(0x00070041);
 
   late final GetStorage? _storage;
@@ -22,6 +34,7 @@ class BackendController extends GetxController {
   late final Rx<PhysicalKeyboardKey> consoleKey;
   late final RxBool started;
   late final RxBool detached;
+  late final List<InfoBarEntry> _infoBars;
   StreamSubscription? worker;
   int? embeddedProcessPid;
   HttpServer? localServer;
@@ -70,15 +83,7 @@ class BackendController extends GetxController {
       }
     });
     gameServerAddressFocusNode = FocusNode();
-    consoleKey = Rx(_readConsoleKey());
-    _writeConsoleKey(consoleKey.value);
-    consoleKey.listen((newValue) {
-      _storage?.write("console_key", newValue.usbHidUsage);
-      _writeConsoleKey(newValue);
-    });
-  }
-
-  PhysicalKeyboardKey _readConsoleKey() {
+    consoleKey = Rx(() {
       final consoleKeyValue = _storage?.read("console_key");
       if(consoleKeyValue == null) {
         return _kDefaultConsoleKey;
@@ -95,6 +100,13 @@ class BackendController extends GetxController {
       }
 
       return consoleKey;
+    }());
+    _writeConsoleKey(consoleKey.value);
+    consoleKey.listen((newValue) {
+      _storage?.write("console_key", newValue.usbHidUsage);
+      _writeConsoleKey(newValue);
+    });
+    _infoBars = [];
   }
 
   Future<void> _writeConsoleKey(PhysicalKeyboardKey keyValue) async {
@@ -103,6 +115,21 @@ class BackendController extends GetxController {
     await defaultInput.writeAsString("[/Script/Engine.InputSettings]\n+ConsoleKeys=Tilde\n+ConsoleKeys=${keyValue.unrealEngineName}", flush: true);
   }
 
+  String _readHost() {
+    String? value = _storage?.read("${type.value.name}_host");
+    if (value != null && value.isNotEmpty) {
+      return value;
+    }
+
+    if (type.value != ServerType.remote) {
+      return kDefaultBackendHost;
+    }
+
+    return "";
+  }
+
+  String _readPort() => _storage?.read("${type.value.name}_port") ?? kDefaultBackendPort.toString();
+
   void joinLocalhost() {
     gameServerAddress.text = kDefaultGameServerHost;
   }
@@ -121,22 +148,44 @@ class BackendController extends GetxController {
     detached.value = false;
   }
 
-  String _readHost() {
-    String? value = _storage?.read("${type.value.name}_host");
-    if (value != null && value.isNotEmpty) {
-      return value;
+  Future<bool> toggleInteractive() async {
+    _cancel();
+    final stream = started.value ? stop() : start(
+        onExit: () {
+          _cancel();
+          _showRebootInfoBar(
+              translations.backendProcessError,
+              severity: InfoBarSeverity.error
+          );
+        },
+        onError: (errorMessage) {
+          _cancel();
+          _showRebootInfoBar(
+              translations.backendErrorMessage,
+              severity: InfoBarSeverity.error,
+              duration: infoBarLongDuration,
+              action: Button(
+                onPressed: () => launchUrl(launcherLogFile.uri),
+                child: Text(translations.openLog),
+              )
+          );
         }
-
-    if (type.value != ServerType.remote) {
-      return kDefaultBackendHost;
+    );
+    final completer = Completer<bool>();
+    InfoBarEntry? entry;
+    worker = stream.listen((event) {
+      entry?.close();
+      entry = _handeEvent(event);
+      if(event.type.isError) {
+        completer.complete(false);
+      }else if(event.type.isSuccess) {
+        completer.complete(true);
       }
+    });
 
-    return "";
+    return await completer.future;
   }
 
-  String _readPort() =>
-      _storage?.read("${type.value.name}_port") ?? kDefaultBackendPort.toString();
-
   Stream<ServerResult> start({required void Function() onExit, required void Function(String) onError}) async* {
     try {
       if(started.value) {
@@ -286,14 +335,267 @@ class BackendController extends GetxController {
     }
   }
 
-  Stream<ServerResult> toggle({required void Function() onExit, required void Function(String) onError}) async* {
-    if(started()) {
-      yield* stop();
-    }else {
-      yield* start(
-        onExit: onExit,
-        onError: onError
+  void _cancel() {
+    worker?.cancel(); // Do not await or it will hang
+    _infoBars.forEach((infoBar) => infoBar.close());
+    _infoBars.clear();
+  }
+
+  InfoBarEntry _handeEvent(ServerResult event) {
+    log("[BACKEND] Handling event: $event");
+    switch (event.type) {
+      case ServerResultType.starting:
+        return _showRebootInfoBar(
+            translations.startingServer,
+            severity: InfoBarSeverity.info,
+            loading: true,
+            duration: null
+        );
+      case ServerResultType.startSuccess:
+        return _showRebootInfoBar(
+            type.value == ServerType.local ? translations.checkedServer : translations.startedServer,
+            severity: InfoBarSeverity.success
+        );
+      case ServerResultType.startError:
+        print(event.stackTrace);
+        return _showRebootInfoBar(
+            type.value == ServerType.local ? translations.localServerError(event.error ?? translations.unknownError) : translations.startServerError(event.error ?? translations.unknownError),
+            severity: InfoBarSeverity.error,
+            duration: infoBarLongDuration
+        );
+      case ServerResultType.stopping:
+        return _showRebootInfoBar(
+            translations.stoppingServer,
+            severity: InfoBarSeverity.info,
+            loading: true,
+            duration: null
+        );
+      case ServerResultType.stopSuccess:
+        return _showRebootInfoBar(
+            translations.stoppedServer,
+            severity: InfoBarSeverity.success
+        );
+      case ServerResultType.stopError:
+        return _showRebootInfoBar(
+            translations.stopServerError(event.error ?? translations.unknownError),
+            severity: InfoBarSeverity.error,
+            duration: infoBarLongDuration
+        );
+      case ServerResultType.missingHostError:
+        return _showRebootInfoBar(
+            translations.missingHostNameError,
+            severity: InfoBarSeverity.error
+        );
+      case ServerResultType.missingPortError:
+        return _showRebootInfoBar(
+            translations.missingPortError,
+            severity: InfoBarSeverity.error
+        );
+      case ServerResultType.illegalPortError:
+        return _showRebootInfoBar(
+            translations.illegalPortError,
+            severity: InfoBarSeverity.error
+        );
+      case ServerResultType.freeingPort:
+        return _showRebootInfoBar(
+            translations.freeingPort,
+            loading: true,
+            duration: null
+        );
+      case ServerResultType.freePortSuccess:
+        return _showRebootInfoBar(
+            translations.freedPort,
+            severity: InfoBarSeverity.success,
+            duration: infoBarShortDuration
+        );
+      case ServerResultType.freePortError:
+        return _showRebootInfoBar(
+            translations.freePortError(event.error ?? translations.unknownError),
+            severity: InfoBarSeverity.error,
+            duration: infoBarLongDuration
+        );
+      case ServerResultType.pingingRemote:
+        return _showRebootInfoBar(
+            translations.pingingServer(ServerType.remote.name),
+            severity: InfoBarSeverity.info,
+            loading: true,
+            duration: null
+        );
+      case ServerResultType.pingingLocal:
+        return _showRebootInfoBar(
+            translations.pingingServer(type.value.name),
+            severity: InfoBarSeverity.info,
+            loading: true,
+            duration: null
+        );
+      case ServerResultType.pingError:
+        return _showRebootInfoBar(
+            translations.pingError(type.value.name),
+            severity: InfoBarSeverity.error
         );
     }
   }
+
+  Future<void> joinServer(String uuid, FortniteServer server) async {
+    if(!kDebugMode && uuid == server.id) {
+      _showRebootInfoBar(
+          translations.joinSelfServer,
+          duration: infoBarLongDuration,
+          severity: InfoBarSeverity.error
+      );
+      return;
+    }
+
+    final version = Get.find<GameController>()
+        .getVersionByName(server.version.toString());
+    if(version == null) {
+      _showRebootInfoBar(
+          translations.cannotJoinServerVersion(server.version.toString()),
+          duration: infoBarLongDuration,
+          severity: InfoBarSeverity.error
+      );
+      return;
+    }
+
+    final hashedPassword = server.password;
+    final hasPassword = hashedPassword != null;
+    final embedded = type.value == ServerType.embedded;
+    final author = server.author;
+    final encryptedIp = server.ip;
+    if(!hasPassword) {
+      final valid = await _isServerValid(encryptedIp);
+      if(!valid) {
+        return;
+      }
+
+      _onServerJoined(embedded, encryptedIp, author, version);
+      return;
+    }
+
+    final confirmPassword = await _askForPassword();
+    if(confirmPassword == null) {
+      return;
+    }
+
+    if(!checkPassword(confirmPassword, hashedPassword)) {
+      _showRebootInfoBar(
+          translations.wrongServerPassword,
+          duration: infoBarLongDuration,
+          severity: InfoBarSeverity.error
+      );
+      return;
+    }
+
+    final decryptedIp = aes256Decrypt(encryptedIp, confirmPassword);
+    final valid = await _isServerValid(decryptedIp);
+    if(!valid) {
+      return;
+    }
+
+    _onServerJoined(embedded, decryptedIp, author, version);
+  }
+
+  Future<bool> _isServerValid(String address) async {
+    final result = await pingGameServer(address);
+    if(result) {
+      return true;
+    }
+
+    _showRebootInfoBar(
+        translations.offlineServer,
+        duration: infoBarLongDuration,
+        severity: InfoBarSeverity.error
+    );
+    return false;
+  }
+
+  Future<String?> _askForPassword() async {
+    final confirmPasswordController = TextEditingController();
+    final showPassword = RxBool(false);
+    final showPasswordTrailing = RxBool(false);
+    return await showRebootDialog<String?>(
+        builder: (context) => FormDialog(
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                InfoLabel(
+                    label: translations.serverPassword,
+                    child: Obx(() => TextFormBox(
+                        placeholder: translations.serverPasswordPlaceholder,
+                        controller: confirmPasswordController,
+                        autovalidateMode: AutovalidateMode.always,
+                        obscureText: !showPassword.value,
+                        enableSuggestions: false,
+                        autofocus: true,
+                        autocorrect: false,
+                        onChanged: (text) => showPasswordTrailing.value = text.isNotEmpty,
+                        suffix: !showPasswordTrailing.value ? null : Button(
+                          onPressed: () => showPassword.value = !showPassword.value,
+                          style: ButtonStyle(
+                              shape: WidgetStateProperty.all(const CircleBorder()),
+                              backgroundColor: WidgetStateProperty.all(Colors.transparent)
+                          ),
+                          child: Icon(
+                              showPassword.value ? FluentIcons.eye_off_24_regular : FluentIcons.eye_24_regular
+                          ),
+                        )
+                    ))
+                ),
+                const SizedBox(height: 8.0)
+              ],
+            ),
+            buttons: [
+              DialogButton(
+                  text: translations.serverPasswordCancel,
+                  type: ButtonType.secondary
+              ),
+
+              DialogButton(
+                  text: translations.serverPasswordConfirm,
+                  type: ButtonType.primary,
+                  onTap: () => Navigator.of(context).pop(confirmPasswordController.text)
+              )
+            ]
+        )
+    );
+  }
+
+  void _onServerJoined(bool embedded, String decryptedIp, String author, FortniteVersion version) {
+    if(embedded) {
+      gameServerAddress.text = decryptedIp;
+      pageIndex.value = RebootPageType.play.index;
+    }else {
+      FlutterClipboard.controlC(decryptedIp);
+    }
+    Get.find<GameController>()
+        .selectedVersion = version;
+    WidgetsBinding.instance.addPostFrameCallback((_) => _showRebootInfoBar(
+        embedded ? translations.joinedServer(author) : translations.copiedIp,
+        duration: infoBarLongDuration,
+        severity: InfoBarSeverity.success
+    ));
+  }
+
+  InfoBarEntry _showRebootInfoBar(dynamic text, {
+    InfoBarSeverity severity = InfoBarSeverity.info,
+    bool loading = false,
+    Duration? duration = infoBarShortDuration,
+    void Function()? onDismissed,
+    Widget? action
+  }) {
+    final result = showRebootInfoBar(
+        text,
+        severity: severity,
+        loading: loading,
+        duration: duration,
+        onDismissed: onDismissed,
+        action: action
+    );
+    if(severity == InfoBarSeverity.info || severity == InfoBarSeverity.success) {
+      _infoBars.add(result);
+    }
+    return result;
+  }
 }

gui/lib/src/controller/dll_controller.dart

@@ -4,18 +4,16 @@ import 'dart:io';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
-import 'package:http/http.dart' as http;
 import 'package:path/path.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/main.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:url_launcher/url_launcher.dart';
 import 'package:version/version.dart';
-import 'package:yaml/yaml.dart';
+import 'package:path/path.dart' as path;
 
 class DllController extends GetxController {
-  static const String storageName = "dll_storage";
+  static const String storageName = "v2_dll_storage";
 
   late final GetStorage? _storage;
   late final String originalDll;
@@ -25,26 +23,28 @@ class DllController extends GetxController {
   late final TextEditingController memoryLeakDll;
   late final TextEditingController gameServerPort;
   late final Rx<UpdateTimer> timer;
-  late final TextEditingController url;
+  late final TextEditingController beforeS20Mirror;
+  late final TextEditingController aboveS20Mirror;
   late final RxBool customGameServer;
   late final RxnInt timestamp;
   late final Rx<UpdateStatus> status;
   InfoBarEntry? infoBarEntry;
-  Future<bool>? _updater;
 
   DllController() {
     _storage = appWithNoStorage ? null : GetStorage(storageName);
-    gameServerDll = _createController("game_server", InjectableDll.reboot);
+    gameServerDll = _createController("game_server", InjectableDll.gameServer);
     unrealEngineConsoleDll = _createController("unreal_engine_console", InjectableDll.console);
-    backendDll = _createController("backend", InjectableDll.cobalt);
-    memoryLeakDll = _createController("memory_leak", InjectableDll.memory);
+    backendDll = _createController("backend", InjectableDll.auth);
+    memoryLeakDll = _createController("memory_leak", InjectableDll.memoryLeak);
     gameServerPort = TextEditingController(text: _storage?.read("game_server_port") ?? kDefaultGameServerPort);
     gameServerPort.addListener(() => _storage?.write("game_server_port", gameServerPort.text));
     final timerIndex = _storage?.read("timer");
     timer = Rx(timerIndex == null ? UpdateTimer.hour : UpdateTimer.values.elementAt(timerIndex));
     timer.listen((value) => _storage?.write("timer", value.index));
-    url = TextEditingController(text: _storage?.read("update_url") ?? kRebootDownloadUrl);
-    url.addListener(() => _storage?.write("update_url", url.text));
+    beforeS20Mirror = TextEditingController(text: _storage?.read("update_url") ?? kRebootBelowS20DownloadUrl);
+    beforeS20Mirror.addListener(() => _storage?.write("update_url", beforeS20Mirror.text));
+    aboveS20Mirror = TextEditingController(text: _storage?.read("old_update_url") ?? kRebootAboveS20DownloadUrl);
+    aboveS20Mirror.addListener(() => _storage?.write("new_update_url", aboveS20Mirror.text));
     status = Rx(UpdateStatus.waiting);
     customGameServer = RxBool(_storage?.read("custom_game_server") ?? false);
     customGameServer.listen((value) => _storage?.write("custom_game_server", value));
@@ -59,16 +59,16 @@ class DllController extends GetxController {
   }
 
   void resetGame() {
-    gameServerDll.text = getDefaultDllPath(InjectableDll.reboot);
+    gameServerDll.text = getDefaultDllPath(InjectableDll.gameServer);
     unrealEngineConsoleDll.text = getDefaultDllPath(InjectableDll.console);
-    backendDll.text = getDefaultDllPath(InjectableDll.cobalt);
-    memoryLeakDll.text = getDefaultDllPath(InjectableDll.memory);
+    backendDll.text = getDefaultDllPath(InjectableDll.auth);
   }
 
   void resetServer() {
     gameServerPort.text = kDefaultGameServerPort;
     timer.value = UpdateTimer.hour;
-    url.text = kRebootDownloadUrl;
+    beforeS20Mirror.text = kRebootBelowS20DownloadUrl;
+    aboveS20Mirror.text = kRebootAboveS20DownloadUrl;
     status.value = UpdateStatus.waiting;
     customGameServer.value = false;
     timestamp.value = null;
@@ -76,16 +76,6 @@ class DllController extends GetxController {
   }
 
   Future<bool> updateGameServerDll({bool force = false, bool silent = false}) async {
-    if(_updater != null) {
-      return await _updater!;
-    }
-
-    final result = _updateGameServerDll(force, silent);
-    _updater = result;
-    return await result;
-  }
-
-  Future<bool> _updateGameServerDll(bool force, bool silent) async {
     try {
       if(customGameServer.value) {
         status.value = UpdateStatus.success;
@@ -109,7 +99,15 @@ class DllController extends GetxController {
             duration: null
         );
       }
-      timestamp.value = await downloadRebootDll(url.text);
+      await Future.wait(
+          [
+            downloadRebootDll(rebootBeforeS20DllFile, beforeS20Mirror.text),
+            downloadRebootDll(rebootAboveS20DllFile, aboveS20Mirror.text),
+            Future.delayed(const Duration(seconds: 1))
+          ],
+          eagerError: false
+      );
+      timestamp.value = DateTime.now().millisecondsSinceEpoch;
       status.value = UpdateStatus.success;
       infoBarEntry?.close();
       if(!silent) {
@@ -126,61 +124,78 @@ class DllController extends GetxController {
       error = error.contains(": ") ? error.substring(error.indexOf(": ") + 2) : error;
       error = error.toLowerCase();
       status.value = UpdateStatus.error;
-      showRebootInfoBar(
-          translations.downloadDllError("reboot.dll", error.toString()),
+      infoBarEntry = showRebootInfoBar(
+          translations.downloadDllError(error.toString(), "reboot.dll"),
           duration: infoBarLongDuration,
           severity: InfoBarSeverity.error,
           action: Button(
-            onPressed: () => updateGameServerDll(
+            onPressed: () async {
+              infoBarEntry?.close();
+              updateGameServerDll(
                   force: true,
                   silent: silent
-            ),
+              );
+            },
             child: Text(translations.downloadDllRetry),
           )
       );
       return false;
-    }finally {
-      _updater = null;
     }
   }
 
-  (File, bool) getInjectableData(InjectableDll dll) {
+  (File, bool) getInjectableData(Version version, InjectableDll dll) {
     final defaultPath = canonicalize(getDefaultDllPath(dll));
     switch(dll){
-      case InjectableDll.reboot:
+      case InjectableDll.gameServer:
         if(customGameServer.value) {
-          final file = File(gameServerDll.text);
-          if(file.existsSync()) {
-            return (file, true);
-          }
+          return (File(gameServerDll.text), true);
         }
 
-        return (rebootDllFile, false);
+        return (version.major >= 20 ? rebootAboveS20DllFile : rebootBeforeS20DllFile, false);
       case InjectableDll.console:
         final ue4ConsoleFile = File(unrealEngineConsoleDll.text);
         return (ue4ConsoleFile, canonicalize(ue4ConsoleFile.path) != defaultPath);
-      case InjectableDll.cobalt:
+      case InjectableDll.auth:
         final backendFile = File(backendDll.text);
         return (backendFile, canonicalize(backendFile.path) != defaultPath);
-      case InjectableDll.memory:
-        final memoryLeakFile = File(memoryLeakDll.text);
-        return (memoryLeakFile, canonicalize(memoryLeakFile.path) != defaultPath);
+      case InjectableDll.memoryLeak:
+        final memoryFile = File(memoryLeakDll.text);
+        return (memoryFile, canonicalize(memoryFile.path) != defaultPath);
     }
   }
 
-  String getDefaultDllPath(InjectableDll dll) => "${dllsDirectory.path}\\${dll.name}.dll";
+  TextEditingController getDllEditingController(InjectableDll dll) {
+    switch(dll) {
+      case InjectableDll.console:
+        return unrealEngineConsoleDll;
+      case InjectableDll.auth:
+        return backendDll;
+      case InjectableDll.gameServer:
+        return gameServerDll;
+      case InjectableDll.memoryLeak:
+        return memoryLeakDll;
+    }
+  }
 
-  Future<bool> downloadCriticalDllInteractive(String filePath, {bool silent = false, bool force = false}) async {
-    log("[DLL] Asking for $filePath(silent: $silent)");
-    final fileName = basename(filePath).toLowerCase();
-    log("[DLL] File name: $fileName");
+  String getDefaultDllPath(InjectableDll dll) {
+   switch(dll) {
+     case InjectableDll.console:
+       return "${dllsDirectory.path}\\console.dll";
+     case InjectableDll.auth:
+       return "${dllsDirectory.path}\\starfall.dll";
+     case InjectableDll.gameServer:
+       return "${dllsDirectory.path}\\reboot.dll";
+     case InjectableDll.memoryLeak:
+       return "${dllsDirectory.path}\\memory.dll";
+   }
+  }
+
+  Future<bool> download(InjectableDll dll, String filePath, {bool silent = false, bool force = false}) async {
+    log("[DLL] Asking for $dll at $filePath(silent: $silent, force: $force)");
     InfoBarEntry? entry;
     try {
-      if (fileName == "reboot.dll") {
-        log("[DLL] Downloading reboot.dll...");
-        return await updateGameServerDll(
-            silent: silent
-        );
+      if (dll == InjectableDll.gameServer) {
+        return await updateGameServerDll(silent: silent);
       }
 
       if(!force && File(filePath).existsSync()) {
@@ -196,7 +211,7 @@ class DllController extends GetxController {
             duration: null
         );
       }
-      await downloadCriticalDll(fileName, filePath);
+      await downloadDependency(dll, filePath);
       entry?.close();
       if(!silent) {
         entry = await showRebootInfoBar(
@@ -215,13 +230,13 @@ class DllController extends GetxController {
       error = error.toLowerCase();
       final completer = Completer();
       await showRebootInfoBar(
-          translations.downloadDllError(fileName, error.toString()),
+          translations.downloadDllError(error.toString(), dll.name),
           duration: infoBarLongDuration,
           severity: InfoBarSeverity.error,
           onDismissed: () => completer.complete(null),
           action: Button(
             onPressed: () async {
-              await downloadCriticalDllInteractive(filePath);
+              await download(dll, filePath, silent: silent, force: force);
               completer.complete(null);
             },
             child: Text(translations.downloadDllRetry),
@@ -231,6 +246,32 @@ class DllController extends GetxController {
       return false;
     }
   }
+
+  void guardFiles() {
+    for(final injectable in InjectableDll.values) {
+      final controller = getDllEditingController(injectable);
+      final defaultPath = getDefaultDllPath(injectable);
+      if (path.equals(controller.text, defaultPath)) {
+        download(injectable, controller.text);
+      }
+      controller.addListener(() async {
+        try {
+          if (!path.equals(controller.text, defaultPath)) {
+            return;
+          }
+
+          final filePath = controller.text;
+          await for(final event in File(filePath).parent.watch(events: FileSystemEvent.delete | FileSystemEvent.move)) {
+            if (path.equals(event.path, filePath)) {
+              await download(injectable, filePath);
+            }
+          }
+        } catch(_) {
+          // Ignore
+        }
+      });
+    }
+  }
 }
 
 extension _UpdateTimerExtension on UpdateTimer {

gui/lib/src/controller/game_controller.dart

@@ -8,7 +8,7 @@ import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/main.dart';
 
 class GameController extends GetxController {
-  static const String storageName = "game_storage";
+  static const String storageName = "v2_game_storage";
 
   late final GetStorage? _storage;
   late final TextEditingController username;

gui/lib/src/controller/hosting_controller.dart

@@ -12,10 +12,12 @@ import 'package:sync/semaphore.dart';
 import 'package:uuid/uuid.dart';
 
 class HostingController extends GetxController {
-  static const String storageName = "hosting_storage";
+  static const String storageName = "v2_hosting_storage";
 
   late final GetStorage? _storage;
   late final String uuid;
+  late final TextEditingController accountUsername;
+  late final TextEditingController accountPassword;
   late final TextEditingController name;
   late final FocusNode nameFocusNode;
   late final TextEditingController description;
@@ -37,6 +39,10 @@ class HostingController extends GetxController {
     _storage = appWithNoStorage ? null : GetStorage(storageName);
     uuid = _storage?.read("uuid") ?? const Uuid().v4();
     _storage?.write("uuid", uuid);
+    accountUsername = TextEditingController(text: _storage?.read("account_username") ?? kDefaultHostName);
+    accountUsername.addListener(() => _storage?.write("account_username", accountUsername.text));
+    accountPassword = TextEditingController(text: _storage?.read("account_password") ?? "");
+    accountPassword.addListener(() => _storage?.write("account_password", password.text));
     name = TextEditingController(text: _storage?.read("name"));
     name.addListener(() => _storage?.write("name", name.text));
     description = TextEditingController(text: _storage?.read("description"));
@@ -56,20 +62,36 @@ class HostingController extends GetxController {
     published = RxBool(false);
     showPassword = RxBool(false);
     instance = Rxn();
-    final supabase = Supabase.instance.client;
     servers = Rxn();
-    supabase.from("hosting_v2")
-        .stream(primaryKey: ['id'])
-        .map((event) => event.map((element) => FortniteServer.fromJson(element)).where((element) => element.ip.isNotEmpty).toSet())
-        .listen((event) {
-          servers.value = event;
-          published.value = event.any((element) => element.id == uuid);
-        });
+    _listenServers();
     customLaunchArgs = TextEditingController(text: _storage?.read("custom_launch_args") ?? "");
     customLaunchArgs.addListener(() => _storage?.write("custom_launch_args", customLaunchArgs.text));
     _semaphore = Semaphore();
   }
 
+  void _listenServers([int attempt = 0]) {
+    log("[SUPABASE] Listening...");
+    final supabase = Supabase.instance.client;
+    supabase.from("hosting_v2")
+        .stream(primaryKey: ['id'])
+        .map((event) => event.map((element) => FortniteServer.fromJson(element)).where((element) => element.ip.isNotEmpty).toSet())
+        .listen(
+          _onNewServer,
+          onError: (error) async {
+            log("[SUPABASE] Error: ${error}");
+            await Future.delayed(Duration(seconds: attempt * 5));
+            _listenServers(attempt + 1);
+          },
+          cancelOnError: true
+    );
+  }
+
+  void _onNewServer(Set<FortniteServer> event) {
+    log("[SUPABASE] New event: ${event}");
+    servers.value = event;
+    published.value = event.any((element) => element.id == uuid);
+  }
+
   Future<void> publishServer(String author, String version) async {
     try {
       _semaphore.acquire();
@@ -136,6 +158,8 @@ class HostingController extends GetxController {
   }
 
   void reset() {
+    accountUsername.text = kDefaultHostName;
+    accountPassword.text = "";
     name.text = "";
     description.text = "";
     showPassword.value = false;

gui/lib/src/controller/settings_controller.dart

@@ -1,27 +1,24 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:http/http.dart' as http;
-import 'package:path/path.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/main.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:version/version.dart';
 import 'package:yaml/yaml.dart';
 
 class SettingsController extends GetxController {
-  static const String storageName = "settings_storage";
+  static const String storageName = "v2_settings_storage";
 
   late final GetStorage? _storage;
   late final RxString language;
   late final Rx<ThemeMode> themeMode;
   late final RxBool firstRun;
-  late final RxBool debug;
   late double width;
   late double height;
   late double? offsetX;
@@ -39,7 +36,6 @@ class SettingsController extends GetxController {
     language.listen((value) => _storage?.write("language", value));
     firstRun = RxBool(_storage?.read("first_run_tutorial") ?? true);
     firstRun.listen((value) => _storage?.write("first_run_tutorial", value));
-    debug = RxBool(false);
   }
 
   void saveWindowSize(Size size) {

gui/lib/src/messenger/dialog.dart

@@ -1,7 +1,7 @@
 import 'package:clipboard/clipboard.dart';
 import 'package:fluent_ui/fluent_ui.dart' as fluent show showDialog;
 import 'package:fluent_ui/fluent_ui.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
 import 'package:reboot_launcher/src/page/pages.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 
@@ -300,7 +300,7 @@ class _DialogButtonState extends State<DialogButton> {
 
   Widget get _primaryButton => Button(
     style: ButtonStyle(
-        backgroundColor: ButtonState.all(FluentTheme.of(context).accentColor)
+        backgroundColor: WidgetStateProperty.all(FluentTheme.of(context).accentColor)
     ),
     onPressed: widget.onTap!,
     child: Text(widget.text!),
@@ -308,7 +308,7 @@ class _DialogButtonState extends State<DialogButton> {
 
   Widget get _secondaryButton => Button(
     style: widget.color != null ? ButtonStyle(
-        backgroundColor: ButtonState.all(widget.color!)
+        backgroundColor: WidgetStateProperty.all(widget.color!)
     ) : null,
     onPressed: widget.onTap ?? _onDefaultSecondaryActionTap,
     child: Text(widget.text ?? translations.defaultDialogSecondaryAction),

gui/lib/src/messenger/implementation/server.dart

@@ -1,323 +0,0 @@
-import 'dart:async';
-
-import 'package:clipboard/clipboard.dart';
-import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:flutter/foundation.dart';
-import 'package:get/get.dart';
-import 'package:reboot_common/common.dart';
-import 'package:reboot_launcher/src/controller/backend_controller.dart';
-import 'package:reboot_launcher/src/controller/game_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
-import 'package:reboot_launcher/src/page/pages.dart';
-import 'package:reboot_launcher/src/util/cryptography.dart';
-import 'package:reboot_launcher/src/util/matchmaker.dart';
-import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-final List<InfoBarEntry> _infoBars = [];
-
-extension ServerControllerDialog on BackendController {
-  void cancelInteractive() {
-    worker?.cancel(); // Do not await or it will hang
-    _infoBars.forEach((infoBar) => infoBar.close());
-    _infoBars.clear();
-  }
-
-  Future<bool> toggleInteractive() async {
-    cancelInteractive();
-    final stream = toggle(
-      onExit: () {
-        cancelInteractive();
-        _showRebootInfoBar(
-            translations.backendProcessError,
-            severity: InfoBarSeverity.error
-        );
-      },
-      onError: (errorMessage) {
-        cancelInteractive();
-        _showRebootInfoBar(
-            translations.backendErrorMessage,
-            severity: InfoBarSeverity.error,
-            duration: infoBarLongDuration,
-            action: Button(
-              onPressed: () => launchUrl(launcherLogFile.uri),
-              child: Text(translations.openLog),
-            )
-        );
-      }
-    );
-    final completer = Completer<bool>();
-    InfoBarEntry? entry;
-    worker = stream.listen((event) {
-      entry?.close();
-      entry = _handeEvent(event);
-      if(event.type.isError) {
-        completer.complete(false);
-      }else if(event.type.isSuccess) {
-        completer.complete(true);
-      }
-    });
-
-    return await completer.future;
-  }
-
-  InfoBarEntry _handeEvent(ServerResult event) {
-    log("[BACKEND] Handling event: $event");
-    switch (event.type) {
-      case ServerResultType.starting:
-        return _showRebootInfoBar(
-            translations.startingServer,
-            severity: InfoBarSeverity.info,
-            loading: true,
-            duration: null
-        );
-      case ServerResultType.startSuccess:
-        return _showRebootInfoBar(
-            type.value == ServerType.local ? translations.checkedServer : translations.startedServer,
-            severity: InfoBarSeverity.success
-        );
-      case ServerResultType.startError:
-        print(event.stackTrace);
-        return _showRebootInfoBar(
-            type.value == ServerType.local ? translations.localServerError(event.error ?? translations.unknownError) : translations.startServerError(event.error ?? translations.unknownError),
-            severity: InfoBarSeverity.error,
-            duration: infoBarLongDuration
-        );
-      case ServerResultType.stopping:
-        return _showRebootInfoBar(
-            translations.stoppingServer,
-            severity: InfoBarSeverity.info,
-            loading: true,
-            duration: null
-        );
-      case ServerResultType.stopSuccess:
-        return _showRebootInfoBar(
-            translations.stoppedServer,
-            severity: InfoBarSeverity.success
-        );
-      case ServerResultType.stopError:
-        return _showRebootInfoBar(
-            translations.stopServerError(event.error ?? translations.unknownError),
-            severity: InfoBarSeverity.error,
-            duration: infoBarLongDuration
-        );
-      case ServerResultType.missingHostError:
-        return _showRebootInfoBar(
-            translations.missingHostNameError,
-            severity: InfoBarSeverity.error
-        );
-      case ServerResultType.missingPortError:
-        return _showRebootInfoBar(
-            translations.missingPortError,
-            severity: InfoBarSeverity.error
-        );
-      case ServerResultType.illegalPortError:
-        return _showRebootInfoBar(
-            translations.illegalPortError,
-            severity: InfoBarSeverity.error
-        );
-      case ServerResultType.freeingPort:
-        return _showRebootInfoBar(
-            translations.freeingPort,
-            loading: true,
-            duration: null
-        );
-      case ServerResultType.freePortSuccess:
-        return _showRebootInfoBar(
-            translations.freedPort,
-            severity: InfoBarSeverity.success,
-            duration: infoBarShortDuration
-        );
-      case ServerResultType.freePortError:
-        return _showRebootInfoBar(
-            translations.freePortError(event.error ?? translations.unknownError),
-            severity: InfoBarSeverity.error,
-            duration: infoBarLongDuration
-        );
-      case ServerResultType.pingingRemote:
-        return _showRebootInfoBar(
-            translations.pingingServer(ServerType.remote.name),
-            severity: InfoBarSeverity.info,
-            loading: true,
-            duration: null
-        );
-      case ServerResultType.pingingLocal:
-        return _showRebootInfoBar(
-            translations.pingingServer(type.value.name),
-            severity: InfoBarSeverity.info,
-            loading: true,
-            duration: null
-        );
-      case ServerResultType.pingError:
-        return _showRebootInfoBar(
-            translations.pingError(type.value.name),
-            severity: InfoBarSeverity.error
-        );
-    }
-  }
-
-  Future<void> joinServerInteractive(String uuid, FortniteServer server) async {
-    if(!kDebugMode && uuid == server.id) {
-      _showRebootInfoBar(
-          translations.joinSelfServer,
-          duration: infoBarLongDuration,
-          severity: InfoBarSeverity.error
-      );
-      return;
-    }
-
-    final gameController = Get.find<GameController>();
-    final version = gameController.getVersionByName(server.version.toString());
-    if(version == null) {
-      _showRebootInfoBar(
-          translations.cannotJoinServerVersion(server.version.toString()),
-          duration: infoBarLongDuration,
-          severity: InfoBarSeverity.error
-      );
-      return;
-    }
-
-    final hashedPassword = server.password;
-    final hasPassword = hashedPassword != null;
-    final embedded = type.value == ServerType.embedded;
-    final author = server.author;
-    final encryptedIp = server.ip;
-    if(!hasPassword) {
-      final valid = await _isServerValid(encryptedIp);
-      if(!valid) {
-        return;
-      }
-
-      _onSuccess(gameController, embedded, encryptedIp, author, version);
-      return;
-    }
-
-    final confirmPassword = await _askForPassword();
-    if(confirmPassword == null) {
-      return;
-    }
-
-    if(!checkPassword(confirmPassword, hashedPassword)) {
-      _showRebootInfoBar(
-          translations.wrongServerPassword,
-          duration: infoBarLongDuration,
-          severity: InfoBarSeverity.error
-      );
-      return;
-    }
-
-    final decryptedIp = aes256Decrypt(encryptedIp, confirmPassword);
-    final valid = await _isServerValid(decryptedIp);
-    if(!valid) {
-      return;
-    }
-
-    _onSuccess(gameController, embedded, decryptedIp, author, version);
-  }
-
-  Future<bool> _isServerValid(String address) async {
-    final result = await pingGameServer(address);
-    if(result) {
-      return true;
-    }
-
-    _showRebootInfoBar(
-        translations.offlineServer,
-        duration: infoBarLongDuration,
-        severity: InfoBarSeverity.error
-    );
-    return false;
-  }
-
-  Future<String?> _askForPassword() async {
-    final confirmPasswordController = TextEditingController();
-    final showPassword = RxBool(false);
-    final showPasswordTrailing = RxBool(false);
-    return await showRebootDialog<String?>(
-        builder: (context) => FormDialog(
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                InfoLabel(
-                    label: translations.serverPassword,
-                    child: Obx(() => TextFormBox(
-                        placeholder: translations.serverPasswordPlaceholder,
-                        controller: confirmPasswordController,
-                        autovalidateMode: AutovalidateMode.always,
-                        obscureText: !showPassword.value,
-                        enableSuggestions: false,
-                        autofocus: true,
-                        autocorrect: false,
-                        onChanged: (text) => showPasswordTrailing.value = text.isNotEmpty,
-                        suffix: !showPasswordTrailing.value ? null : Button(
-                          onPressed: () => showPassword.value = !showPassword.value,
-                          style: ButtonStyle(
-                              shape: ButtonState.all(const CircleBorder()),
-                              backgroundColor: ButtonState.all(Colors.transparent)
-                          ),
-                          child: Icon(
-                              showPassword.value ? FluentIcons.eye_off_24_regular : FluentIcons.eye_24_regular
-                          ),
-                        )
-                    ))
-                ),
-                const SizedBox(height: 8.0)
-              ],
-            ),
-            buttons: [
-              DialogButton(
-                  text: translations.serverPasswordCancel,
-                  type: ButtonType.secondary
-              ),
-
-              DialogButton(
-                  text: translations.serverPasswordConfirm,
-                  type: ButtonType.primary,
-                  onTap: () => Navigator.of(context).pop(confirmPasswordController.text)
-              )
-            ]
-        )
-    );
-  }
-
-  void _onSuccess(GameController controller, bool embedded, String decryptedIp, String author, FortniteVersion version) {
-    if(embedded) {
-      gameServerAddress.text = decryptedIp;
-      pageIndex.value = RebootPageType.play.index;
-    }else {
-      FlutterClipboard.controlC(decryptedIp);
-    }
-    controller.selectedVersion = version;
-    WidgetsBinding.instance.addPostFrameCallback((_) => _showRebootInfoBar(
-        embedded ? translations.joinedServer(author) : translations.copiedIp,
-        duration: infoBarLongDuration,
-        severity: InfoBarSeverity.success
-    ));
-  }
-
-  InfoBarEntry _showRebootInfoBar(dynamic text, {
-    InfoBarSeverity severity = InfoBarSeverity.info,
-    bool loading = false,
-    Duration? duration = infoBarShortDuration,
-    void Function()? onDismissed,
-    Widget? action
-  }) {
-    final result = showRebootInfoBar(
-      text,
-      severity: severity,
-      loading: loading,
-      duration: duration,
-      onDismissed: onDismissed,
-      action: action
-    );
-    if(severity == InfoBarSeverity.info || severity == InfoBarSeverity.success) {
-      _infoBars.add(result);
-    }
-    return result;
-  }
-}

gui/lib/src/messenger/overlay.dart

@@ -1,6 +1,6 @@
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter/rendering.dart';
-import 'package:reboot_launcher/src/page/implementation/home_page.dart';
+import 'package:reboot_launcher/src/widget/page/home_page.dart';
 import 'package:reboot_launcher/src/page/pages.dart';
 
 typedef WidgetBuilder = Widget Function(BuildContext, void Function());
@@ -148,7 +148,7 @@ class _RenderAbsorbPointer extends RenderProxyBox {
     
     // 32 is the height of the title bar (need this offset as the overlay area doesn't include it)
     // Not an optimal solution but it works (calculating it is kind of complicated)
-    position = Offset(position.dx, position.dy + HomePage.kTitleBarHeight);
+    position = Offset(position.dx, position.dy);
     final exclusionPosition = exclusion.localToGlobal(Offset.zero);
     final exclusionSize = Rect.fromLTRB(
       exclusionPosition.dx,

gui/lib/src/page/implementation/settings_page.dart

@@ -1,139 +0,0 @@
-import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:flutter_gen/gen_l10n/reboot_localizations.dart';
-import 'package:flutter_localized_locales/flutter_localized_locales.dart';
-import 'package:get/get.dart';
-import 'package:reboot_common/common.dart';
-import 'package:reboot_launcher/src/controller/settings_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/implementation/data.dart';
-import 'package:reboot_launcher/src/page/abstract/page.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
-import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/setting_tile.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class SettingsPage extends RebootPage {
-  const SettingsPage({Key? key}) : super(key: key);
-
-  @override
-  String get name => translations.settingsName;
-
-  @override
-  String get iconAsset => "assets/images/settings.png";
-
-  @override
-  RebootPageType get type => RebootPageType.settings;
-
-  @override
-  bool hasButton(String? pageName) => false;
-
-  @override
-  RebootPageState<SettingsPage> createState() => _SettingsPageState();
-}
-
-class _SettingsPageState extends RebootPageState<SettingsPage> {
-  final SettingsController _settingsController = Get.find<SettingsController>();
-
-  @override
-  Widget? get button => null;
-
-  @override
-  List<Widget> get settings => [
-    _language,
-    _theme,
-    _debugMode,
-    _installationDirectory,
-  ];
-
-  SettingTile get _language => SettingTile(
-      icon: Icon(
-          FluentIcons.local_language_24_regular
-      ),
-      title: Text(translations.settingsUtilsLanguageName),
-      subtitle: Text(translations.settingsUtilsLanguageDescription),
-      content: Obx(() => DropDownButton(
-          onOpen: () => inDialog = true,
-          onClose: () => inDialog = false,
-          leading: Text(_getLocaleName(_settingsController.language.value)),
-          items: AppLocalizations.supportedLocales.map((locale) => MenuFlyoutItem(
-              text: Text(_getLocaleName(locale.languageCode)),
-              onPressed: () => _settingsController.language.value = locale.languageCode
-          )).toList()
-      ))
-  );
-
-  String _getLocaleName(String locale) {
-    var result = LocaleNames.of(context)!.nameOf(locale);
-    if(result != null) {
-      return "${result.substring(0, 1).toUpperCase()}${result.substring(1).toLowerCase()}";
-    }
-
-    return locale;
-  }
-
-  SettingTile get _theme => SettingTile(
-      icon: Icon(
-          FluentIcons.dark_theme_24_regular
-      ),
-      title: Text(translations.settingsUtilsThemeName),
-      subtitle: Text(translations.settingsUtilsThemeDescription),
-      content: Obx(() => DropDownButton(
-          onOpen: () => inDialog = true,
-          onClose: () => inDialog = false,
-          leading: Text(_settingsController.themeMode.value.title),
-          items: ThemeMode.values.map((themeMode) => MenuFlyoutItem(
-              text: Text(themeMode.title),
-              onPressed: () => _settingsController.themeMode.value = themeMode
-          )).toList()
-      ))
-  );
-  
-  SettingTile get _installationDirectory => SettingTile(
-      icon: Icon(
-          FluentIcons.folder_24_regular
-      ),
-      title: Text(translations.settingsUtilsInstallationDirectoryName),
-      subtitle: Text(translations.settingsUtilsInstallationDirectorySubtitle),
-      content: Button(
-        onPressed: () => launchUrl(installationDirectory.uri),
-        child: Text(translations.settingsUtilsInstallationDirectoryContent),
-      )
-  );
-
-  SettingTile get _debugMode => SettingTile(
-      icon: Icon(
-          FluentIcons.developer_board_24_regular
-      ),
-      title: Text("Debug mode"),
-      subtitle: Text("Whether the launcher should disable automatic features for troubleshooting"),
-      contentWidth: null,
-      content: Row(
-        children: [
-          Text(
-              _settingsController.debug.value ? translations.on : translations.off
-          ),
-          const SizedBox(
-              width: 16.0
-          ),
-          Obx(() => ToggleSwitch(
-              checked: _settingsController.debug.value,
-              onChanged: (value) => _settingsController.debug.value = value
-          ))
-        ],
-      )
-  );
-}
-
-extension _ThemeModeExtension on ThemeMode {
-  String get title {
-    switch(this) {
-      case ThemeMode.system:
-        return translations.system;
-      case ThemeMode.dark:
-        return translations.dark;
-      case ThemeMode.light:
-        return translations.light;
-    }
-  }
-}

gui/lib/src/page/page.dart

@@ -1,9 +1,8 @@
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
-import 'package:get/get_state_manager/src/rx_flutter/rx_obx_widget.dart';
 import 'package:reboot_launcher/src/controller/settings_controller.dart';
-import 'package:reboot_launcher/src/messenger/implementation/onboard.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
+import 'package:reboot_launcher/src/widget/message/onboard.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 
 abstract class RebootPage extends StatefulWidget {
@@ -35,7 +34,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           _buildFirstLaunchInfo(),
-          _buildDebugInfo(),
           Expanded(
             child: _listView
           )
@@ -47,7 +45,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         _buildFirstLaunchInfo(),
-        _buildDebugInfo(),
         Expanded(
           child: Column(
             children: [
@@ -99,35 +96,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
     );
   });
 
-  Widget _buildDebugInfo() => Obx(() {
-    if(!_settingsController.debug.value) {
-      return const SizedBox.shrink();
-    }
-
-    return Padding(
-        padding: const EdgeInsets.only(
-            bottom: 8.0
-        ),
-        child: SizedBox(
-          width: double.infinity,
-          child: InfoBar(
-            title: Text("Debug mode is enabled"),
-            severity: InfoBarSeverity.warning,
-            isLong: true,
-            content: SizedBox(
-                width: double.infinity,
-                child: Text( "• Automatic dll injection is disabled\n"
-                    "• The game server cannot start automatically\n"
-                    "• The game server runs in a normal window")
-            ),
-            onClose: () {
-              _settingsController.debug.value = false;
-            },
-          ),
-        )
-    );
-  });
-
   ListView get _listView => ListView.builder(
     itemCount: settings.length,
     itemBuilder: (context, index) => settings[index],

gui/lib/src/page/pages.dart

@@ -3,16 +3,16 @@ import 'dart:collection';
 
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
-import 'package:reboot_launcher/src/page/abstract/page.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
-import 'package:reboot_launcher/src/page/implementation/backend_page.dart';
-import 'package:reboot_launcher/src/page/implementation/browser_page.dart';
-import 'package:reboot_launcher/src/page/implementation/host_page.dart';
-import 'package:reboot_launcher/src/page/implementation/info_page.dart';
-import 'package:reboot_launcher/src/page/implementation/play_page.dart';
-import 'package:reboot_launcher/src/page/implementation/settings_page.dart';
-import 'package:reboot_launcher/src/widget/info_bar_area.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
+import 'package:reboot_launcher/src/page/page.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
+import 'package:reboot_launcher/src/widget/page/backend_page.dart';
+import 'package:reboot_launcher/src/widget/page/browser_page.dart';
+import 'package:reboot_launcher/src/widget/page/host_page.dart';
+import 'package:reboot_launcher/src/widget/page/info_page.dart';
+import 'package:reboot_launcher/src/widget/page/play_page.dart';
+import 'package:reboot_launcher/src/widget/page/settings_page.dart';
+import 'package:reboot_launcher/src/widget/window/info_bar_area.dart';
 
 final StreamController<void> pagesController = StreamController.broadcast();
 bool hitBack = false;

gui/lib/src/util/matchmaker.dart

@@ -1,12 +1,47 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:math';
 
 import 'package:reboot_common/common.dart';
 
 const Duration _timeout = Duration(seconds: 5);
 
-Future<bool> pingGameServer(String address, {Duration? timeout}) async {
-  Future<bool> ping(String hostname, int port) async {
+Completer<bool> pingGameServerOrTimeout(String address, Duration timeout) {
+  final completer = Completer<bool>();
+  final start = DateTime.now();
+  _pingGameServerOrTimeout(completer, start, timeout, address);
+  return completer;
+}
+
+Future<void> _pingGameServerOrTimeout(Completer<bool> completer, DateTime start, Duration timeout, String address) async {
+  while (!completer.isCompleted && max(DateTime.now().millisecondsSinceEpoch - start.millisecondsSinceEpoch, 0) < timeout.inMilliseconds) {
+    final result = await pingGameServer(address);
+    if(result) {
+      completer.complete(true);
+    }else {
+      await Future.delayed(_timeout);
+    }
+  }
+  if(!completer.isCompleted) {
+    completer.complete(false);
+  }
+}
+
+Future<bool> pingGameServer(String address) async {
+  final split = address.split(":");
+  var hostname = split[0];
+  if(isLocalHost(hostname)) {
+    hostname = "127.0.0.1";
+  }
+
+  final port = int.parse(split.length > 1 ? split[1] : kDefaultGameServerPort);
+  return await _ping(hostname, port)
+      .timeout(_timeout, onTimeout: () => false);
+}
+
+
+Future<bool> _ping(String hostname, int port) async {
   log("[MATCHMAKER] Pinging $hostname:$port");
   RawDatagramSocket? socket;
   try {
@@ -35,29 +70,3 @@ Future<bool> pingGameServer(String address, {Duration? timeout}) async {
     socket?.close();
   }
 }
-
-  final start = DateTime.now();
-  var firstTime = true;
-  final split = address.split(":");
-  var hostname = split[0];
-  if(isLocalHost(hostname)) {
-    hostname = "127.0.0.1";
-  }
-
-  final port = int.parse(split.length > 1 ? split[1] : kDefaultGameServerPort);
-  while (firstTime || (timeout != null && DateTime.now().millisecondsSinceEpoch - start.millisecondsSinceEpoch < timeout.inMilliseconds)) {
-    final result = await ping(hostname, port)
-        .timeout(_timeout, onTimeout: () => false);
-    if(result) {
-      return true;
-    }
-
-    if(firstTime) {
-      firstTime = false;
-    }else {
-      await Future.delayed(_timeout);
-    }
-  }
-
-  return false;
-}

gui/lib/src/util/os.dart

@@ -7,6 +7,7 @@ import 'package:file_picker/file_picker.dart';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:win32/win32.dart';
+import 'package:window_manager/window_manager.dart';
 
 final RegExp _winBuildRegex = RegExp(r'(?<=\(Build )(.*)(?=\))');
 
@@ -24,10 +25,13 @@ bool get isWin11 {
   return intBuild != null && intBuild > 22000;
 }
 
-Future<String?> openFolderPicker(String title) async =>
-    await FilePicker.platform.getDirectoryPath(dialogTitle: title);
+Future<String?> openFolderPicker(String title) async {
+  FilePicker.platform = FilePickerWindows();
+  return await FilePicker.platform.getDirectoryPath(dialogTitle: title);
+}
 
 Future<String?> openFilePicker(String extension) async {
+  FilePicker.platform = FilePickerWindows();
   var result = await FilePicker.platform.pickFiles(
       type: FileType.custom,
       allowMultiple: false,
@@ -93,7 +97,7 @@ class IVirtualDesktop extends IUnknown {
       throw WindowsException(code);
     }
 
-    return convertFromHString(result.value);
+    return _convertFromHString(result.value);
   }
 }
 
@@ -280,7 +284,7 @@ class _IVirtualDesktopManagerInternal extends IUnknown {
                 HRESULT Function(Pointer, COMObject, Int8)>>>()
         .value
         .asFunction<int Function(Pointer, COMObject, int)>()(
-        ptr.ref.lpVtbl, desktop.ptr.ref, convertToHString(newName));
+        ptr.ref.lpVtbl, desktop.ptr.ref, _convertToHString(newName));
     if (code != 0) {
       throw WindowsException(code);
     }
@@ -369,7 +373,7 @@ List<int> _getHWnds(int pid, String? excludedWindowName) {
     result.ref.excluded = excludedWindowName.toNativeUtf16();
   }
 
-  EnumWindows(Pointer.fromFunction<EnumWindowsProc>(_filter, TRUE), result.address);
+  EnumWindows(Pointer.fromFunction<WNDENUMPROC>(_filter, TRUE), result.address);
   final length = result.ref.HWndLength;
   final HWndsPointer = result.ref.HWnd;
   if(HWndsPointer == nullptr) {
@@ -397,7 +401,7 @@ class VirtualDesktopManager {
     }
 
     final hr = CoInitializeEx(
-        nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+        nullptr, COINIT.COINIT_APARTMENTTHREADED | COINIT.COINIT_DISABLE_OLE1DDE);
     if (FAILED(hr)) {
       throw WindowsException(hr);
     }
@@ -468,3 +472,77 @@ class VirtualDesktopManager {
   void setDesktopName(IVirtualDesktop desktop, String newName) =>
       windowManager.setDesktopName(desktop, newName);
 }
+
+String _convertFromHString(int hstring) =>
+    WindowsGetStringRawBuffer(hstring, nullptr).toDartString();
+
+int _convertToHString(String string) {
+  final hString = calloc<HSTRING>();
+  final stringPtr = string.toNativeUtf16();
+  try {
+    final hr = WindowsCreateString(stringPtr, string.length, hString);
+    if (FAILED(hr)) throw WindowsException(hr);
+    return hString.value;
+  } finally {
+    free(stringPtr);
+    free(hString);
+  }
+}
+
+extension WindowManagerExtension on WindowManager {
+  Future<void> maximizeOrRestore() async => await windowManager.isMaximized() ? windowManager.restore() : windowManager.maximize();
+}
+
+class WindowsDisk {
+  static final String _nullTerminator = String.fromCharCode(0);
+
+  final String path;
+  final int freeBytesAvailable;
+  final int totalNumberOfBytes;
+
+  const WindowsDisk._internal(this.path, this.freeBytesAvailable, this.totalNumberOfBytes);
+
+  static List<WindowsDisk> available() {
+    final buffer = malloc.allocate<Utf16>(MAX_PATH);
+    try {
+      final length = GetLogicalDriveStrings(MAX_PATH, buffer);
+      if (length == 0) {
+        return [];
+      }
+
+      return buffer.toDartString(length: length)
+          .split(_nullTerminator)
+          .where((drive) => drive.length > 1)
+          .map((driveName) {
+              final freeBytesAvailable = calloc<Uint64>();
+              final totalNumberOfBytes = calloc<Uint64>();
+              final totalNumberOfFreeBytes = calloc<Uint64>();
+              try {
+                GetDiskFreeSpaceEx(
+                    driveName.toNativeUtf16(),
+                    freeBytesAvailable,
+                    totalNumberOfBytes,
+                    totalNumberOfFreeBytes
+                );
+                return WindowsDisk._internal(
+                    driveName,
+                    freeBytesAvailable.value,
+                    totalNumberOfBytes.value
+                );
+              } finally {
+                calloc.free(freeBytesAvailable);
+                calloc.free(totalNumberOfBytes);
+                calloc.free(totalNumberOfFreeBytes);
+              }
+          })
+          .toList(growable: false);
+    } finally {
+      calloc.free(buffer);
+    }
+  }
+
+  @override
+  String toString() {
+    return 'WindowsDisk{path: $path, freeBytesAvailable: $freeBytesAvailable, totalNumberOfBytes: $totalNumberOfBytes}';
+  }
+}

gui/lib/src/util/types.dart

@@ -6,3 +6,14 @@ extension IterableExtension<E> on Iterable<E> {
     return null;
   }
 }
+
+extension StringExtension on String {
+  String? after(String leading) {
+    final index = indexOf(leading);
+    if(index == -1) {
+      return null;
+    }
+
+    return substring(index + leading.length);
+  }
+}

gui/lib/src/util/url_protocol.dart

@@ -0,0 +1,63 @@
+import 'dart:io';
+
+import 'package:ffi/ffi.dart';
+import 'package:win32/win32.dart';
+
+final _hive = HKEY_CURRENT_USER;
+
+void registerUrlProtocol(String scheme, {String? executable, List<String>? arguments}) {
+  final prefix = _regPrefix(scheme);
+  final capitalized = scheme[0].toUpperCase() + scheme.substring(1);
+  final args = _getArguments(arguments).map((a) => _sanitize(a));
+  final cmd =
+      '${executable ?? Platform.resolvedExecutable} ${args.join(' ')}';
+  _regCreateStringKey(_hive, prefix, '', 'URL:$capitalized');
+  _regCreateStringKey(_hive, prefix, 'URL Protocol', '');
+  _regCreateStringKey(_hive, prefix + '\\shell\\open\\command', '', cmd);
+}
+
+void unregisterUrlProtocol(String scheme) {
+  final txtKey = TEXT(_regPrefix(scheme));
+  try {
+    RegDeleteTree(HKEY_CURRENT_USER, txtKey);
+  } finally {
+    free(txtKey);
+  }
+}
+
+String _regPrefix(String scheme) => 'SOFTWARE\\Classes\\$scheme';
+
+int _regCreateStringKey(int hKey, String key, String valueName, String data) {
+  final txtKey = TEXT(key);
+  final txtValue = TEXT(valueName);
+  final txtData = TEXT(data);
+  try {
+    return RegSetKeyValue(
+      hKey,
+      txtKey,
+      txtValue,
+      REG_VALUE_TYPE.REG_SZ,
+      txtData,
+      txtData.length * 2 + 2,
+    );
+  } finally {
+    free(txtKey);
+    free(txtValue);
+    free(txtData);
+  }
+}
+
+String _sanitize(String value) {
+  value = value.replaceAll(r'%s', '%1').replaceAll(r'"', '\\"');
+  return '"$value"';
+}
+
+List<String> _getArguments(List<String>? arguments) {
+  if (arguments == null) return ['%s'];
+
+  if (arguments.isEmpty && !arguments.any((e) => e.contains('%s'))) {
+    throw ArgumentError('arguments must contain at least 1 instance of "%s"');
+  }
+
+  return arguments;
+}

gui/lib/src/widget/file/file_selector.dart

@@ -19,10 +19,10 @@ class FileSelector extends StatefulWidget {
         required this.controller,
         required this.validator,
         required this.folder,
+        required this.allowNavigator,
         this.label,
         this.extension,
         this.validatorMode,
-        this.allowNavigator = true,
         Key? key})
       : assert(folder || extension != null, "Missing extension for file selector"),
         super(key: key);

gui/lib/src/widget/file/file_setting_tile.dart

@@ -0,0 +1,121 @@
+import 'dart:io';
+
+import 'package:fluent_ui/fluent_ui.dart' as fluentIcons show FluentIcons;
+import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/foundation.dart';
+import 'package:get/get.dart';
+import 'package:reboot_launcher/src/util/os.dart';
+import 'package:reboot_launcher/src/util/translations.dart';
+import 'package:reboot_launcher/src/widget/file/file_selector.dart';
+import 'package:reboot_launcher/src/widget/fluent/setting_tile.dart';
+
+const double _kButtonDimensions = 30;
+const double _kButtonSpacing = 8;
+
+// FIXME: If the user clicks on the reset button, the text field checker won't be called
+SettingTile createFileSetting({required String title, required String description, required TextEditingController controller, required void Function() onReset}) {
+  final obx = RxString(controller.text);
+  controller.addListener(() => obx.value = controller.text);
+  final selecting = RxBool(false);
+  return SettingTile(
+      icon: Icon(
+          FluentIcons.document_24_regular
+      ),
+      title: Text(title),
+      subtitle: Text(description),
+      contentWidth: SettingTile.kDefaultContentWidth + _kButtonDimensions,
+      content: Row(
+        children: [
+          Expanded(
+            child: FileSelector(
+              placeholder: translations.selectPathPlaceholder,
+              windowTitle: translations.selectPathWindowTitle,
+              controller: controller,
+              validator: _checkDll,
+              extension: "dll",
+              folder: false,
+              validatorMode: AutovalidateMode.always,
+              allowNavigator: false,
+            ),
+          ),
+          const SizedBox(width: _kButtonSpacing),
+          Obx(() => Padding(
+            padding: EdgeInsets.only(
+                bottom: _checkDll(obx.value) == null ? 0.0 : 20.0
+            ),
+            child: Tooltip(
+              message: translations.selectFile,
+              child: Button(
+                  style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
+                  ),
+                  onPressed: () => _onPressed(selecting, controller),
+                  child: SizedBox.square(
+                    dimension: _kButtonDimensions,
+                    child: Icon(
+                        fluentIcons.FluentIcons.open_folder_horizontal
+                    ),
+                  )
+              ),
+            ),
+          )),
+          const SizedBox(width: _kButtonSpacing),
+          Obx(() => Padding(
+            padding: EdgeInsets.only(
+                bottom: _checkDll(obx.value) == null ? 0.0 : 20.0
+            ),
+            child: Tooltip(
+              message: translations.reset,
+              child: Button(
+                  style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
+                  ),
+                  onPressed: onReset,
+                  child: SizedBox.square(
+                    dimension: _kButtonDimensions,
+                    child: Icon(
+                        FluentIcons.arrow_reset_24_regular
+                    ),
+                  )
+              ),
+            ),
+          ))
+        ],
+      )
+  );
+}
+
+void _onPressed(RxBool selecting, TextEditingController controller) {
+  if(selecting.value){
+    return;
+  }
+
+  selecting.value = true;
+  compute(openFilePicker, "dll")
+      .then((value) => _updateText(controller, value))
+      .then((_) => selecting.value = false);
+}
+
+void _updateText(TextEditingController controller, String? value) {
+  final text = value ?? controller.text;
+  controller.text = text;
+  controller.selection = TextSelection.collapsed(offset: text.length);
+}
+
+String? _checkDll(String? text) {
+  if (text == null || text.isEmpty) {
+    return translations.invalidDllPath;
+  }
+
+  final file = File(text);
+  if (!file.existsSync()) {
+    return translations.dllDoesNotExist;
+  }
+
+  if (!text.endsWith(".dll")) {
+    return translations.invalidDllExtension;
+  }
+
+  return null;
+}

gui/lib/src/widget/file_setting_tile.dart

@@ -1,70 +0,0 @@
-import 'dart:io';
-
-import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:get/get.dart';
-import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/file_selector.dart';
-import 'package:reboot_launcher/src/widget/setting_tile.dart';
-
-SettingTile createFileSetting({required String title, required String description, required TextEditingController controller, required void Function() onReset}) {
-  final obx = RxString(controller.text);
-  controller.addListener(() => obx.value = controller.text);
-    return SettingTile(
-    icon: Icon(
-        FluentIcons.document_24_regular
-    ),
-    title: Text(title),
-    subtitle: Text(description),
-    content: Row(
-        children: [
-            Expanded(
-                child: FileSelector(
-                    placeholder: translations.selectPathPlaceholder,
-                    windowTitle: translations.selectPathWindowTitle,
-                    controller: controller,
-                    validator: _checkDll,
-                    extension: "dll",
-                    folder: false,
-                    validatorMode: AutovalidateMode.always
-                ),
-            ),
-            const SizedBox(width: 8.0),
-            Obx(() => Padding(
-              padding: EdgeInsets.only(
-                  bottom: _checkDll(obx.value) == null ? 0.0 : 20.0
-              ),
-              child: Button(
-                  style: ButtonStyle(
-                      padding: ButtonState.all(EdgeInsets.zero)
-                  ),
-                  onPressed: onReset,
-                  child: SizedBox.square(
-                      dimension: 30,
-                      child: Icon(
-                          FluentIcons.arrow_reset_24_regular
-                      ),
-                  )
-              ),
-            ))
-        ],
-    )
-);
-}
-
-String? _checkDll(String? text) {
-    if (text == null || text.isEmpty) {
-        return translations.invalidDllPath;
-    }
-
-    final file = File(text);
-    if (!file.existsSync()) {
-        return translations.dllDoesNotExist;
-    }
-
-    if (!text.endsWith(".dll")) {
-        return translations.invalidDllExtension;
-    }
-
-    return null;
-}

gui/lib/src/widget/fluent/profile_tile.dart

@@ -2,8 +2,11 @@ import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
-import 'package:reboot_launcher/src/messenger/implementation/profile.dart';
+import 'package:reboot_launcher/src/controller/hosting_controller.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
+import 'package:reboot_launcher/src/widget/message/profile.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
+import 'package:reboot_launcher/src/page/pages.dart';
 
 class ProfileWidget extends StatefulWidget {
   final GlobalKey<OverlayTargetState> overlayKey;
@@ -15,6 +18,7 @@ class ProfileWidget extends StatefulWidget {
 
 class _ProfileWidgetState extends State<ProfileWidget> {
   final GameController _gameController = Get.find<GameController>();
+  final HostingController _hostingController = Get.find<HostingController>();
 
   @override
   Widget build(BuildContext context) => OverlayTarget(
@@ -22,7 +26,7 @@ class _ProfileWidgetState extends State<ProfileWidget> {
     child: HoverButton(
         margin: const EdgeInsets.all(8.0),
         onPressed: () async {
-          if(await showProfileForm(context)) {
+          if(await showProfileForm(context, _username, _password)) {
             setState(() {});
           }
         },
@@ -57,7 +61,7 @@ class _ProfileWidgetState extends State<ProfileWidget> {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Text(
-                        _username,
+                        _usernameLabel,
                         textAlign: TextAlign.start,
                         style: const TextStyle(
                             fontWeight: FontWeight.w600
@@ -65,7 +69,7 @@ class _ProfileWidgetState extends State<ProfileWidget> {
                         maxLines: 1
                     ),
                     Text(
-                        _email,
+                        _emailLabel,
                         textAlign: TextAlign.start,
                         style: const TextStyle(
                             fontWeight: FontWeight.w100
@@ -81,8 +85,8 @@ class _ProfileWidgetState extends State<ProfileWidget> {
     ),
   );
 
-  String get _username {
-    var username = _gameController.username.text;
+  String get _usernameLabel {
+    final username = _username.text;
     if(username.isEmpty) {
       return kDefaultPlayerName;
     }
@@ -96,8 +100,8 @@ class _ProfileWidgetState extends State<ProfileWidget> {
     return result.substring(0, 1).toUpperCase() + result.substring(1);
   }
 
-  String get _email {
-    var username = _gameController.username.text;
+  String get _emailLabel {
+    final username = _username.text;
     if(username.isEmpty) {
       return "$kDefaultPlayerName@projectreboot.dev";
     }
@@ -108,4 +112,7 @@ class _ProfileWidgetState extends State<ProfileWidget> {
 
     return "$username@projectreboot.dev".toLowerCase();
   }
+
+  TextEditingController get _username => pageIndex.value == RebootPageType.host.index ? _hostingController.accountUsername : _gameController.username;
+  TextEditingController get _password => pageIndex.value == RebootPageType.host.index ? _hostingController.accountPassword : _gameController.password;
 }

gui/lib/src/widget/fluent/setting_tile.dart

@@ -1,6 +1,6 @@
 import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
 import 'package:reboot_launcher/src/page/pages.dart';
 import 'package:skeletons/skeletons.dart';
 
@@ -80,15 +80,19 @@ class SettingTileState extends State<SettingTile> {
                 )
               else
                 widget.icon,
+
               const SizedBox(width: 16.0),
-              Column(
+
+              Expanded(
+                child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     widget.title == null ? _skeletonTitle : widget.title!,
                     widget.subtitle == null ? _skeletonSubtitle : widget.subtitle!,
                   ],
                 ),
-              const Spacer(),
+              ),
+
               _trailing
             ],
           ),

gui/lib/src/widget/game/game_start_button.dart

@@ -12,16 +12,15 @@ import 'package:reboot_launcher/src/controller/backend_controller.dart';
 import 'package:reboot_launcher/src/controller/dll_controller.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
 import 'package:reboot_launcher/src/controller/hosting_controller.dart';
-import 'package:reboot_launcher/src/controller/settings_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
-import 'package:reboot_launcher/src/messenger/implementation/server.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
 import 'package:reboot_launcher/src/page/pages.dart';
 import 'package:reboot_launcher/src/util/matchmaker.dart';
 import 'package:reboot_launcher/src/util/os.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:url_launcher/url_launcher_string.dart';
+import 'package:version/version.dart';
 
 class LaunchButton extends StatefulWidget {
   final bool host;
@@ -41,12 +40,11 @@ class _LaunchButtonState extends State<LaunchButton> {
   final HostingController _hostingController = Get.find<HostingController>();
   final BackendController _backendController = Get.find<BackendController>();
   final DllController _dllController = Get.find<DllController>();
-  final SettingsController _settingsController = Get.find<SettingsController>();
 
   InfoBarEntry? _gameClientInfoBar;
   InfoBarEntry? _gameServerInfoBar;
   CancelableOperation? _operation;
-  CancelableOperation? _pingOperation;
+  Completer? _pingOperation;
   IVirtualDesktop? _virtualDesktop;
 
   @override
@@ -95,7 +93,7 @@ class _LaunchButtonState extends State<LaunchButton> {
     log("[${host ? 'HOST' : 'GAME'}] Set started");
     log("[${host ? 'HOST' : 'GAME'}] Checking dlls: ${InjectableDll.values}");
     for (final injectable in InjectableDll.values) {
-      if(await _getDllFileOrStop(injectable, host) == null) {
+      if(await _getDllFileOrStop(version.content, injectable, host) == null) {
         return;
       }
     }
@@ -121,7 +119,7 @@ class _LaunchButtonState extends State<LaunchButton> {
         return;
       }
       log("[${host ? 'HOST' : 'GAME'}] Backend works");
-      final serverType = _settingsController.debug.value ? GameServerType.window : _hostingController.type.value;
+      final serverType = _hostingController.type.value;
       log("[${host ? 'HOST' : 'GAME'}] Implicit game server metadata: headless($serverType)");
       final linkedHostingInstance = await _startMatchMakingServer(version, host, serverType, false);
       log("[${host ? 'HOST' : 'GAME'}] Implicit game server result: $linkedHostingInstance");
@@ -159,11 +157,6 @@ class _LaunchButtonState extends State<LaunchButton> {
       return null;
     }
 
-    if(_settingsController.debug.value) {
-      log("[${host ? 'HOST' : 'GAME'}] The user is on debug mode, not asking for auto server");
-      return null;
-    }
-
     if(!forceLinkedHosting && _backendController.type.value == ServerType.embedded && !isLocalHost(_backendController.gameServerAddress.text)) {
       log("[${host ? 'HOST' : 'GAME'}] Backend is not set to embedded and/or not pointing to the local game server");
       return null;
@@ -235,7 +228,7 @@ class _LaunchButtonState extends State<LaunchButton> {
 
     log("[${host ? 'HOST' : 'GAME'}] Created game process: ${gameProcess}");
     final instance = GameInstance(
-        versionName: version.content.toString(),
+        version: version.content,
         gamePid: gameProcess,
         launcherPid: launcherProcess,
         eacPid: eacProcess,
@@ -248,7 +241,7 @@ class _LaunchButtonState extends State<LaunchButton> {
     }else{
       _gameController.instance.value = instance;
     }
-    await _injectOrShowError(InjectableDll.cobalt, host);
+    await _injectOrShowError(InjectableDll.auth, host);
     log("[${host ? 'HOST' : 'GAME'}] Finished creating game instance");
     return instance;
   }
@@ -256,8 +249,8 @@ class _LaunchButtonState extends State<LaunchButton> {
   Future<int?> _createGameProcess(FortniteVersion version, File executable, bool host, GameServerType hostType, GameInstance? linkedHosting) async {
     log("[${host ? 'HOST' : 'GAME'}] Generating instance args...");
     final gameArgs = createRebootArgs(
-        _gameController.username.text,
-        _gameController.password.text,
+        host ? _hostingController.accountUsername.text : _gameController.username.text,
+        host ? _hostingController.accountPassword.text :_gameController.password.text,
         host,
         hostType,
         false,
@@ -280,13 +273,7 @@ class _LaunchButtonState extends State<LaunchButton> {
           line: line,
           host: host,
           onShutdown: () => _onStop(reason: _StopReason.normal),
-          onTokenError: () {
-            if(_settingsController.debug.value) {
-              log("[PROCESS] Ignoring token error because debug mode is on");
-            }else {
-              _onStop(reason: _StopReason.tokenError);
-            }
-          },
+          onTokenError: () => _onStop(reason: _StopReason.tokenError),
           onBuildCorrupted: () {
             if(instance == null) {
               return;
@@ -410,7 +397,7 @@ class _LaunchButtonState extends State<LaunchButton> {
     if(instance != null && !instance.launched) {
       instance.launched = true;
       instance.tokenError = false;
-      await _injectOrShowError(InjectableDll.memory, host);
+      await _injectOrShowError(InjectableDll.memoryLeak, host);
       if(!host){
         await _injectOrShowError(InjectableDll.console, host);
         _onGameClientInjected();
@@ -419,7 +406,7 @@ class _LaunchButtonState extends State<LaunchButton> {
         if(gameServerPort != null) {
           await killProcessByPort(gameServerPort);
         }
-        await _injectOrShowError(InjectableDll.reboot, host);
+        await _injectOrShowError(InjectableDll.gameServer, host);
         _onGameServerInjected();
       }
     }
@@ -449,11 +436,12 @@ class _LaunchButtonState extends State<LaunchButton> {
           duration: null
       );
       final gameServerPort = _dllController.gameServerPort.text;
-      this._pingOperation = await CancelableOperation.fromFuture(pingGameServer(
+      final pingOperation = pingGameServerOrTimeout(
           "127.0.0.1:$gameServerPort",
-          timeout: const Duration(minutes: 2)
-      ));
-      final localPingResult = (await _pingOperation?.value) ?? false;
+          const Duration(minutes: 2)
+      );
+      this._pingOperation = pingOperation;
+      final localPingResult = await pingOperation.future;
       _gameServerInfoBar?.close();
       if (!localPingResult) {
         showRebootInfoBar(
@@ -475,8 +463,8 @@ class _LaunchButtonState extends State<LaunchButton> {
       }
 
       await _hostingController.publishServer(
-        _gameController.username.text,
-        _hostingController.instance.value!.versionName,
+        _hostingController.accountUsername.text,
+        _hostingController.instance.value!.version.toString(),
       );
       showRebootInfoBar(
           translations.gameServerStarted,
@@ -496,18 +484,17 @@ class _LaunchButtonState extends State<LaunchButton> {
           duration: null
       );
       final publicIp = await Ipify.ipv4();
-      this._pingOperation = CancelableOperation.fromFuture(pingGameServer("$publicIp:$gameServerPort"));
-      final externalResult = (await _pingOperation?.value) ?? false;
-      if (externalResult) {
+      final available = await pingGameServer("$publicIp:$gameServerPort");
+      if(available) {
+        _gameServerInfoBar?.close();
         return true;
       }
 
-      _gameServerInfoBar?.close();
-      this._pingOperation = CancelableOperation.fromFuture(pingGameServer(
+      final pingOperation = pingGameServerOrTimeout(
           "$publicIp:$gameServerPort",
-          timeout: const Duration(days: 365)
-      ));
-      final future = await _pingOperation?.value ?? false;
+          const Duration(days: 1)
+      );
+      this._pingOperation = pingOperation;
       _gameServerInfoBar = showRebootInfoBar(
           translations.checkGameServerFixMessage(gameServerPort),
           action: Button(
@@ -518,7 +505,9 @@ class _LaunchButtonState extends State<LaunchButton> {
           duration: null,
           loading: true
       );
-      return await future;
+      final result = await pingOperation.future;
+      _gameServerInfoBar?.close();
+      return result;
     }finally {
       _gameServerInfoBar?.close();
     }
@@ -526,18 +515,20 @@ class _LaunchButtonState extends State<LaunchButton> {
 
   Future<void> _onStop({required _StopReason reason, bool? host, String? error, StackTrace? stackTrace}) async {
     if(host == null) {
-      await _pingOperation?.cancel();
+      try {
+        _pingOperation?.complete(false);
+      }catch(_) {
+        // Ignore: might be running, don't bother checking
+      } finally {
         _pingOperation = null;
+      }
       await _operation?.cancel();
       _operation = null;
-      _backendController.cancelInteractive();
+      _backendController.stop();
     }
 
     host = host ?? widget.host;
     final instance = host ? _hostingController.instance.value : _gameController.instance.value;
-    if(instance == null) {
-      return;
-    }
 
     if(host){
       _hostingController.instance.value = null;
@@ -561,11 +552,11 @@ class _LaunchButtonState extends State<LaunchButton> {
     }
 
     if(reason == _StopReason.normal) {
-      instance.launched = true;
+      instance?.launched = true;
     }
 
-    instance.kill();
-    final child = instance.child;
+    instance?.kill();
+    final child = instance?.child;
     if(child != null) {
       await _onStop(
           reason: reason,
@@ -602,7 +593,7 @@ class _LaunchButtonState extends State<LaunchButton> {
         );
         break;
       case _StopReason.exitCode:
-        if(!instance.launched) {
+        if(instance != null && !instance.launched) {
           showRebootInfoBar(
             translations.corruptedVersionError,
             severity: InfoBarSeverity.error,
@@ -638,7 +629,7 @@ class _LaunchButtonState extends State<LaunchButton> {
       case _StopReason.tokenError:
         _backendController.stop();
         showRebootInfoBar(
-          translations.tokenError(instance.injectedDlls.map((element) => element.name).join(", ")),
+            translations.tokenError(instance == null ? translations.none : instance.injectedDlls.map((element) => element.name).join(", ")),
             severity: InfoBarSeverity.error,
             duration: infoBarLongDuration,
             action: Button(
@@ -674,7 +665,7 @@ class _LaunchButtonState extends State<LaunchButton> {
     try {
       final gameProcess = instance.gamePid;
       log("[${hosting ? 'HOST' : 'GAME'}] Injecting ${injectable.name} into process with pid $gameProcess");
-      final dllPath = await _getDllFileOrStop(injectable, hosting);
+      final dllPath = await _getDllFileOrStop(instance.version, injectable, hosting);
       log("[${hosting ? 'HOST' : 'GAME'}] File to inject for ${injectable.name} at path $dllPath");
       if(dllPath == null) {
         log("[${hosting ? 'HOST' : 'GAME'}] The file doesn't exist");
@@ -687,10 +678,6 @@ class _LaunchButtonState extends State<LaunchButton> {
       }
 
       log("[${hosting ? 'HOST' : 'GAME'}] Trying to inject ${injectable.name}...");
-      if(_settingsController.debug.value) {
-        return;
-      }
-
       await injectDll(gameProcess, dllPath);
       instance.injectedDlls.add(injectable);
       log("[${hosting ? 'HOST' : 'GAME'}] Injected ${injectable.name}");
@@ -705,9 +692,9 @@ class _LaunchButtonState extends State<LaunchButton> {
     }
   }
 
-  Future<File?> _getDllFileOrStop(InjectableDll injectable, bool host, [bool isRetry = false]) async {
+  Future<File?> _getDllFileOrStop(Version version, InjectableDll injectable, bool host, [bool isRetry = false]) async {
     log("[${host ? 'HOST' : 'GAME'}] Checking dll ${injectable}...");
-    final (file, customDll) = _dllController.getInjectableData(injectable);
+    final (file, customDll) = _dllController.getInjectableData(version, injectable);
     log("[${host ? 'HOST' : 'GAME'}] Path: ${file.path}, custom: $customDll");
     if(await file.exists()) {
       log("[${host ? 'HOST' : 'GAME'}] Path exists");
@@ -725,9 +712,9 @@ class _LaunchButtonState extends State<LaunchButton> {
     }
 
     log("[${host ? 'HOST' : 'GAME'}] Path does not exist, downloading critical dll again...");
-    await _dllController.downloadCriticalDllInteractive(file.path, force: true);
+    await _dllController.download(injectable, file.path, force: true);
     log("[${host ? 'HOST' : 'GAME'}] Downloaded dll again, retrying check...");
-    return _getDllFileOrStop(injectable, host, true);
+    return _getDllFileOrStop(version, injectable, host, true);
   }
 
   InfoBarEntry _showLaunchingGameServerWidget() => _gameServerInfoBar = showRebootInfoBar(
@@ -742,7 +729,7 @@ class _LaunchButtonState extends State<LaunchButton> {
         loading: true,
         duration: null,
         action: Obx(() {
-        if(_settingsController.debug.value || _hostingController.started.value || linkedHosting) {
+          if(_hostingController.started.value || linkedHosting) {
             return const SizedBox.shrink();
           }
 

gui/lib/src/widget/message/data.dart

@@ -1,5 +1,5 @@
 import 'package:fluent_ui/fluent_ui.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 
 Future<void> showResetDialog(Function() onConfirm) => showRebootDialog(

gui/lib/src/widget/message/dll.dart

@@ -1,5 +1,5 @@
 import 'package:fluent_ui/fluent_ui.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 
 Future<void> showDllDeletedDialog(Function() onConfirm) => showRebootDialog(

gui/lib/src/widget/message/error.dart

@@ -1,6 +1,6 @@
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:reboot_common/common.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
 import 'package:reboot_launcher/src/page/pages.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 
@@ -18,9 +18,12 @@ void onError(Object exception, StackTrace? stackTrace, bool framework) {
   }
 
   lastError = exception.toString();
-  final route = ModalRoute.of(pageKey.currentContext!);
-  if(route != null && !route.isCurrent){
-    Navigator.of(pageKey.currentContext!).pop(false);
+  if(inDialog){
+    final context = pageKey.currentContext;
+    if(context != null) {
+      Navigator.of(context).pop(false);
+      inDialog = false;
+    }
   }
 
   WidgetsBinding.instance.addPostFrameCallback((timeStamp) => showRebootDialog(

gui/lib/src/widget/message/onboard.dart

@@ -5,18 +5,19 @@ import 'package:reboot_launcher/src/controller/backend_controller.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
 import 'package:reboot_launcher/src/controller/hosting_controller.dart';
 import 'package:reboot_launcher/src/controller/settings_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
-import 'package:reboot_launcher/src/messenger/implementation/profile.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
-import 'package:reboot_launcher/src/page/implementation/backend_page.dart';
-import 'package:reboot_launcher/src/page/implementation/home_page.dart';
-import 'package:reboot_launcher/src/page/implementation/host_page.dart';
-import 'package:reboot_launcher/src/page/implementation/play_page.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
+import 'package:reboot_launcher/src/widget/message/profile.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
+import 'package:reboot_launcher/src/widget/page/backend_page.dart';
+import 'package:reboot_launcher/src/widget/page/home_page.dart';
+import 'package:reboot_launcher/src/widget/page/host_page.dart';
+import 'package:reboot_launcher/src/widget/page/play_page.dart';
 import 'package:reboot_launcher/src/page/pages.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/version_selector.dart';
+import 'package:reboot_launcher/src/widget/version/version_selector.dart';
 
 void startOnboarding() {
+  final gameController = Get.find<GameController>();
   final settingsController = Get.find<SettingsController>();
   settingsController.firstRun.value = false;
   profileOverlayKey.currentState!.showOverlay(
@@ -27,7 +28,7 @@ void startOnboarding() {
           label: translations.startOnboardingActionLabel,
           onTap: () async {
             onClose();
-            await showProfileForm(context);
+            await showProfileForm(context, gameController.username, gameController.password);
             _promptPlayPage();
           }
       )
@@ -62,7 +63,7 @@ void _promptPlayVersion() {
           onTap: () async {
             onClose();
             if(!hasBuilds) {
-              await VersionSelector.openDownloadDialog(closable: false);
+              await VersionSelector.openDownloadDialog();
             }
             _promptServerBrowserPage();
           }
@@ -78,6 +79,22 @@ void _promptServerBrowserPage() {
           context: context,
           label: translations.promptServerBrowserPageActionLabel,
           onTap: () {
+            onClose();
+            _promptHostAccount();
+          }
+      )
+  );
+}
+
+void _promptHostAccount() {
+  pageIndex.value = RebootPageType.host.index;
+  profileOverlayKey.currentState!.showOverlay(
+      text: translations.hostAccountText,
+      offset: Offset(27.5, 17.5),
+      actionBuilder: (context, onClose) => _buildActionButton(
+          context: context,
+          label: translations.hostAccountAction,
+          onTap: () async {
             onClose();
             _promptHostPage();
           }
@@ -86,7 +103,6 @@ void _promptServerBrowserPage() {
 }
 
 void _promptHostPage() {
-  pageIndex.value = RebootPageType.host.index;
   pageOverlayTargetKey.currentState!.showOverlay(
       text: translations.promptHostPageText,
       actionBuilder: (context, onClose) => _buildActionButton(
@@ -339,7 +355,7 @@ Widget _buildActionButton({
   required void Function() onTap,
 }) => Button(
     style: themed ? ButtonStyle(
-        backgroundColor: ButtonState.all(FluentTheme.of(context).accentColor)
+        backgroundColor: WidgetStateProperty.all(FluentTheme.of(context).accentColor)
     ) : null,
     child: Text(label),
     onPressed: onTap

gui/lib/src/widget/message/profile.dart

@@ -2,17 +2,14 @@ import 'package:email_validator/email_validator.dart';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter/material.dart' show Icons;
 import 'package:get/get.dart';
-import 'package:reboot_launcher/src/controller/game_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 
-final GameController _gameController = Get.find<GameController>();
-
-Future<bool> showProfileForm(BuildContext context) async{
+Future<bool> showProfileForm(BuildContext context, TextEditingController username, TextEditingController password) async{
   final showPassword = RxBool(false);
-  final oldUsername = _gameController.username.text;
+  final oldUsername = username.text;
   final showPasswordTrailing = RxBool(oldUsername.isNotEmpty);
-  final oldPassword = _gameController.password.text;
+  final oldPassword = password.text;
   final result = await showRebootDialog<bool?>(
       builder: (context) => Obx(() => FormDialog(
           content: Column(
@@ -25,17 +22,17 @@ Future<bool> showProfileForm(BuildContext context) async{
                   child: TextFormBox(
                     placeholder: translations.usernameOrEmailPlaceholder,
                     validator: (text) {
-                      if(_gameController.password.text.isEmpty) {
+                      if(password.text.isEmpty) {
                         return null;
                       }
 
-                      if(EmailValidator.validate(_gameController.username.text)) {
+                      if(EmailValidator.validate(username.text)) {
                         return null;
                       }
 
                       return translations.invalidEmail;
                     },
-                    controller: _gameController.username,
+                    controller: username,
                     autovalidateMode: AutovalidateMode.always,
                     enableSuggestions: true,
                     autofocus: true,
@@ -47,7 +44,7 @@ Future<bool> showProfileForm(BuildContext context) async{
                   label: translations.password,
                   child: TextFormBox(
                       placeholder: translations.passwordPlaceholder,
-                      controller: _gameController.password,
+                      controller: password,
                       autovalidateMode: AutovalidateMode.always,
                       obscureText: !showPassword.value,
                       enableSuggestions: false,
@@ -56,8 +53,8 @@ Future<bool> showProfileForm(BuildContext context) async{
                       suffix: Button(
                         onPressed: () => showPassword.value = !showPassword.value,
                         style: ButtonStyle(
-                            shape: ButtonState.all(const CircleBorder()),
-                            backgroundColor: ButtonState.all(Colors.transparent)
+                            shape: WidgetStateProperty.all(const CircleBorder()),
+                            backgroundColor: WidgetStateProperty.all(Colors.transparent)
                         ),
                         child: Icon(
                             showPassword.value ? Icons.visibility_off : Icons.visibility,
@@ -87,7 +84,7 @@ Future<bool> showProfileForm(BuildContext context) async{
     return true;
   }
 
-  _gameController.username.text = oldUsername;
-  _gameController.password.text = oldPassword;
+  username.text = oldUsername;
+  password.text = oldPassword;
   return false;
 }

gui/lib/src/widget/message/version.dart

@@ -7,10 +7,11 @@ import 'package:flutter/foundation.dart';
 import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/util/os.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/file_selector.dart';
-import 'package:universal_disk_space/universal_disk_space.dart';
+import 'package:reboot_launcher/src/util/types.dart';
+import 'package:reboot_launcher/src/widget/file/file_selector.dart';
 import 'package:windows_taskbar/windows_taskbar.dart';
 
 class AddVersionDialog extends StatefulWidget {
@@ -32,22 +33,20 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
   final Rxn<FortniteBuild> _build = Rxn();
   final RxnInt _timeLeft = RxnInt();
   final Rxn<double> _progress = Rxn();
+  final RxInt _speed = RxInt(0);
 
-  late DiskSpace _diskSpace;
   late Future<List<FortniteBuild>> _fetchFuture;
-  late Future _diskFuture;
 
-  Isolate? _isolate;
   SendPort? _downloadPort;
   Object? _error;
   StackTrace? _stackTrace;
 
   @override
   void initState() {
-    _fetchFuture = compute(fetchBuilds, null);
-    _diskSpace = DiskSpace();
-    _diskFuture = _diskSpace.scan()
-        .then((_) => _updateFormDefaults());
+    _fetchFuture = compute(fetchBuilds, null).then((value) {
+      _updateFormDefaults();
+      return value;
+    });
     super.initState();
   }
 
@@ -59,9 +58,8 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
   }
 
   void _cancelDownload() {
-    Process.run('${assetsDirectory.path}\\build\\stop.bat', []);
     _downloadPort?.send(kStopBuildDownloadSignal);
-    _isolate?.kill(priority: Isolate.immediate);
+    WindowsTaskbar.setProgressMode(TaskbarProgressMode.noProgress);
   }
 
   @override
@@ -71,7 +69,7 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
         switch(_status.value){
           case _DownloadStatus.form:
             return FutureBuilder(
-                future: Future.wait([_fetchFuture, _diskFuture]).then((_) async => await _fetchFuture),
+                future: _fetchFuture,
                 builder: (context, snapshot) {
                   if (snapshot.hasError) {
                     WidgetsBinding.instance.addPostFrameCallback((_) => _onDownloadError(snapshot.error, snapshot.stackTrace));
@@ -102,7 +100,12 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
             return ErrorDialog(
                 exception: _error ?? Exception(translations.unknownError),
                 stackTrace: _stackTrace,
-                errorMessageBuilder: (exception) => translations.downloadVersionError(exception.toString())
+                errorMessageBuilder: (exception) {
+                  var error = exception.toString();
+                  error = error.after("Error: ")?.replaceAll(":", ",") ?? error.after(": ") ?? error;
+                  error = error.toLowerCase();
+                  return translations.downloadVersionError(error);
+                }
             );
           case _DownloadStatus.done:
             return InfoDialog(
@@ -151,7 +154,7 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
       final communicationPort = ReceivePort();
       communicationPort.listen((message) {
         if(message is FortniteBuildDownloadProgress) {
-          _onProgress(build, message.progress, message.minutesLeft, message.extracting);
+          _onProgress(build, message);
         }else if(message is SendPort) {
           _downloadPort = message;
         }else {
@@ -165,7 +168,7 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
       );
       final errorPort = ReceivePort();
       errorPort.listen((message) => _onDownloadError(message, null));
-      _isolate = await Isolate.spawn(
+      await Isolate.spawn(
           downloadArchiveBuild,
           options,
           onError: errorPort.sendPort,
@@ -205,23 +208,24 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
     _stackTrace = stackTrace;
   }
 
-  void _onProgress(FortniteBuild build, double progress, int? timeLeft, bool extracting) {
+  void _onProgress(FortniteBuild build, FortniteBuildDownloadProgress message) {
     if (!mounted) {
       return;
     }
 
-    if(progress >= 100 && extracting) {
+    if(message.progress >= 100 && message.extracting) {
       _onDownloadComplete(build);
       return;
     }
 
-    _status.value = extracting ? _DownloadStatus.extracting : _DownloadStatus.downloading;
-    if(progress >= 0) {
-      WindowsTaskbar.setProgress(progress.round(), 100);
+    _status.value = message.extracting ? _DownloadStatus.extracting : _DownloadStatus.downloading;
+    if(message.progress >= 0) {
+      WindowsTaskbar.setProgress(message.progress.round(), 100);
     }
 
-    _timeLeft.value = timeLeft;
-    _progress.value = progress;
+    _timeLeft.value = message.timeLeft;
+    _progress.value = message.progress;
+    _speed.value = message.speed;
   }
 
   Widget get _progressBody {
@@ -232,16 +236,18 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
         Align(
           alignment: Alignment.centerLeft,
           child: Text(
-            _status.value == _DownloadStatus.downloading ? translations.downloading : translations.extracting,
+            _statusText,
             style: FluentTheme.maybeOf(context)?.typography.body,
             textAlign: TextAlign.start,
           ),
         ),
 
+        if(_progress.value != null)
           const SizedBox(
             height: 8.0,
           ),
 
+        if(_progress.value != null)
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
@@ -264,7 +270,7 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
 
         SizedBox(
             width: double.infinity,
-            child: ProgressBar(value: (_progress.value ?? 0).toDouble())
+            child: ProgressBar(value: _progress.value?.toDouble())
         ),
 
         const SizedBox(
@@ -274,7 +280,20 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
     );
   }
 
-  Widget _buildFormBody(List<FortniteBuild> builds) => Column(
+  String get _statusText {
+    if (_status.value != _DownloadStatus.downloading) {
+      return translations.extracting;
+    }
+
+    if (_progress.value == null) {
+      return translations.startingDownload;
+    }
+
+    return translations.downloading;
+  }
+
+  Widget _buildFormBody(List<FortniteBuild> builds) {
+    return Column(
     mainAxisSize: MainAxisSize.min,
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
@@ -292,7 +311,8 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
           windowTitle: _source.value == _BuildSource.local ? translations.gameFolderPlaceWindowTitle : translations.buildInstallationDirectoryWindowTitle,
           controller: _pathController,
           validator: _source.value == _BuildSource.local ? _checkGameFolder : _checkDownloadDestination,
-          folder: true
+          folder: true,
+          allowNavigator: true
       ),
 
       const SizedBox(
@@ -300,6 +320,7 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
       )
     ],
   );
+  }
 
   String? _checkGameFolder(text) {
     if (text == null || text.isEmpty) {
@@ -421,16 +442,16 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
       _build.value = null;
     }
 
-    if(_source.value != _BuildSource.local && _diskSpace.disks.isNotEmpty) {
-      await _fetchFuture;
-      final bestDisk = _diskSpace.disks
-          .reduce((first, second) => first.availableSpace > second.availableSpace ? first : second);
+    final disks = WindowsDisk.available();
+    if(_source.value != _BuildSource.local && disks.isNotEmpty) {
+      final bestDisk = disks.reduce((first, second) => first.freeBytesAvailable > second.freeBytesAvailable ? first : second);
       final build = _build.value;
       if(build == null){
         return;
       }
 
-      final pathText = "${bestDisk.devicePath}\\FortniteBuilds\\${build.version}";
+      print("${bestDisk.path}\\FortniteBuilds\\${build.version}");
+      final pathText = "${bestDisk.path}FortniteBuilds\\${build.version}";
       _pathController.text = pathText;
       _pathController.selection = TextSelection.collapsed(offset: pathText.length);
     }

gui/lib/src/widget/page/backend_page.dart

@@ -5,17 +5,16 @@ import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/backend_controller.dart';
-import 'package:reboot_launcher/src/controller/game_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
-import 'package:reboot_launcher/src/messenger/implementation/data.dart';
-import 'package:reboot_launcher/src/page/abstract/page.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
+import 'package:reboot_launcher/src/widget/message/data.dart';
+import 'package:reboot_launcher/src/page/page.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
 import 'package:reboot_launcher/src/util/keyboard.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/server_start_button.dart';
-import 'package:reboot_launcher/src/widget/server_type_selector.dart';
-import 'package:reboot_launcher/src/widget/setting_tile.dart';
+import 'package:reboot_launcher/src/widget/server/server_start_button.dart';
+import 'package:reboot_launcher/src/widget/server/server_type_selector.dart';
+import 'package:reboot_launcher/src/widget/fluent/setting_tile.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 final GlobalKey<OverlayTargetState> backendTypeOverlayTargetKey = GlobalKey();
@@ -153,9 +152,9 @@ class _BackendPageState extends RebootPageState<BackendPage> {
         contentWidth: null,
         content: Row(
           children: [
-            Text(
+            Obx(() => Text(
                 _backendController.detached.value ? translations.on : translations.off
-            ),
+            )),
             const SizedBox(
                 width: 16.0
             ),

gui/lib/src/widget/page/browser_page.dart

@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:fluent_ui/fluent_ui.dart';
@@ -9,12 +8,11 @@ import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/backend_controller.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
 import 'package:reboot_launcher/src/controller/hosting_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/implementation/server.dart';
-import 'package:reboot_launcher/src/page/abstract/page.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/page/page.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/setting_tile.dart';
+import 'package:reboot_launcher/src/widget/fluent/setting_tile.dart';
 
 class BrowsePage extends RebootPage {
   const BrowsePage({Key? key}) : super(key: key);
@@ -211,10 +209,18 @@ class _BrowsePageState extends RebootPageState<BrowsePage> {
               icon: Icon(
                   hasPassword ? FluentIcons.lock : FluentIcons.globe
               ),
-              title: Text("${_formatName(entry)} • ${entry.author}"),
-              subtitle: Text("${_formatDescription(entry)} • ${_formatVersion(entry)}"),
+              title: Text(
+                  "${_formatName(entry)} • ${entry.author}",
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis
+              ),
+              subtitle: Text(
+                  "${_formatDescription(entry)} • ${_formatVersion(entry)}",
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis
+              ),
               content: Button(
-                onPressed: () => _backendController.joinServerInteractive(_hostingController.uuid, entry),
+                onPressed: () => _backendController.joinServer(_hostingController.uuid, entry),
                 child: Text(_backendController.type.value == ServerType.embedded ? translations.joinServer : translations.copyIp),
               )
           );
@@ -276,8 +282,8 @@ class _BrowsePageState extends RebootPageState<BrowsePage> {
         _filterControllerStream.add("");
       },
       style: ButtonStyle(
-          backgroundColor: ButtonState.all(Colors.transparent),
-          shape: ButtonState.all(Border())
+          backgroundColor: WidgetStateProperty.all(Colors.transparent),
+          shape: WidgetStateProperty.all(Border())
       ),
       child: _searchBarIconData
   );

gui/lib/src/widget/page/home_page.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'dart:ui';
 
 import 'package:app_links/app_links.dart';
-import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart' show MaterialPage;
@@ -11,29 +10,28 @@ import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/backend_controller.dart';
 import 'package:reboot_launcher/src/controller/dll_controller.dart';
+import 'package:reboot_launcher/src/controller/game_controller.dart';
 import 'package:reboot_launcher/src/controller/hosting_controller.dart';
 import 'package:reboot_launcher/src/controller/settings_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
-import 'package:reboot_launcher/src/messenger/implementation/dll.dart';
-import 'package:reboot_launcher/src/messenger/implementation/server.dart';
-import 'package:reboot_launcher/src/page/abstract/page.dart';
-import 'package:reboot_launcher/src/page/abstract/page_suggestion.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
+import 'package:reboot_launcher/src/widget/message/dll.dart';
+import 'package:reboot_launcher/src/page/page.dart';
+import 'package:reboot_launcher/src/page/page_suggestion.dart';
 import 'package:reboot_launcher/src/page/pages.dart';
 import 'package:reboot_launcher/src/util/matchmaker.dart';
 import 'package:reboot_launcher/src/util/os.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/info_bar_area.dart';
-import 'package:reboot_launcher/src/widget/profile_tile.dart';
-import 'package:reboot_launcher/src/widget/title_bar.dart';
+import 'package:reboot_launcher/src/widget/window/info_bar_area.dart';
+import 'package:reboot_launcher/src/widget/fluent/profile_tile.dart';
+import 'package:version/version.dart';
 import 'package:window_manager/window_manager.dart';
 
 final GlobalKey<OverlayTargetState> profileOverlayKey = GlobalKey();
 
 class HomePage extends StatefulWidget {
   static const double kDefaultPadding = 12.0;
-  static const double kTitleBarHeight = 32;
 
   const HomePage({Key? key}) : super(key: key);
 
@@ -43,6 +41,7 @@ class HomePage extends StatefulWidget {
 
 class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepAliveClientMixin {
   final BackendController _backendController = Get.find<BackendController>();
+  final GameController _gameController = Get.find<GameController>();
   final HostingController _hostingController = Get.find<HostingController>();
   final SettingsController _settingsController = Get.find<SettingsController>();
   final DllController _dllController = Get.find<DllController>();
@@ -58,7 +57,6 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
   @override
   void initState() {
     super.initState();
-    windowManager.setPreventClose(true);
     windowManager.addListener(this);
     _syncPageViewWithNavigator();
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -94,7 +92,7 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
     final uuid = uri.host;
     final server = _hostingController.findServerById(uuid);
     if(server != null) {
-      _backendController.joinServerInteractive(_hostingController.uuid, server);
+      _backendController.joinServer(_hostingController.uuid, server);
     }else {
       showRebootInfoBar(
           translations.noServerFound,
@@ -111,7 +109,7 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
         return;
       }
 
-      var result = await pingGameServer(address);
+      final result = await pingGameServer(address);
       if(result) {
         return;
       }
@@ -135,28 +133,50 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
       dllsDirectory.createSync(recursive: true);
     }
 
-    for(final injectable in InjectableDll.values) {
-      final (file, custom) = _dllController.getInjectableData(injectable);
-      if(!custom) {
-        _dllController.downloadCriticalDllInteractive(
-            file.path,
-            silent: true
-        );
-      }
-    }
-
-    watchDlls().listen((filePath) => showDllDeletedDialog(() {
-      _dllController.downloadCriticalDllInteractive(filePath);
-    }));
+    _dllController.guardFiles();
   }
 
   @override
   void onWindowClose() async {
     try {
-      await _hostingController.discardServer();
-    }finally {
-      exit(0); // Force closing
+      await windowManager.hide();
+    }catch(error) {
+      log("[WINDOW] Cannot hide window: $error");
     }
+
+    try {
+      await _hostingController.discardServer();
+    }catch(error) {
+      log("[HOSTING] Cannot discard server on exit: $error");
+    }
+
+    try {
+      if(_backendController.started.value) {
+        await _backendController.toggleInteractive();
+      }
+    }catch(error) {
+      log("[BACKEND] Cannot stop backend on exit: $error");
+    }
+
+    try {
+      _gameController.instance.value?.kill();
+    }catch(error) {
+      log("[GAME] Cannot stop game on exit: $error");
+    }
+
+    try {
+      _hostingController.instance.value?.kill();
+    }catch(error) {
+      log("[HOST] Cannot stop host on exit: $error");
+    }
+
+    try {
+      await stopDownloadServer();
+    }catch(error) {
+      log("[ARIA] Cannot stop aria server on exit: $error");
+    }
+
+    exit(0);
   }
 
   @override
@@ -220,14 +240,18 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
 
   @override
   void onWindowResized() {
-    _settingsController.saveWindowSize(appWindow.size);
     _focused.value = true;
+    windowManager.getSize().then((size) {
+      _settingsController.saveWindowSize(size);
+    });
   }
 
   @override
   void onWindowMoved() {
-    _settingsController.saveWindowOffset(appWindow.position);
     _focused.value = true;
+    windowManager.getPosition().then((position) {
+      _settingsController.saveWindowOffset(position);
+    });
   }
 
   @override
@@ -240,35 +264,13 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
     _focused.value = true;
   }
 
-  @override
-  void onWindowEvent(String eventName) {
-    if(eventName != "move") {
-      WidgetsBinding.instance.addPostFrameCallback((_) => log("[WINDOW] Event: $eventName ${_focused.value}"));
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     super.build(context);
     _settingsController.language.value;
     loadTranslations(context);
-    return Obx(() {
     return Container(
         color: FluentTheme.of(context).micaBackgroundColor.withOpacity(0.93),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            SizedBox(
-              height: HomePage.kTitleBarHeight,
-              child: Row(
-                children: [
-                  _backButton,
-                  Expanded(child: _draggableArea),
-                  WindowTitleBar(focused: _focused())
-                ],
-              )
-            ),
-            Expanded(
         child: Navigator(
           key: appNavigatorKey,
           onPopPage: (page, data) => false,
@@ -291,15 +293,10 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
             )
           ],
         )
-            )
-          ],
-        ),
     );
-    });
   }
 
-  Widget _buildBody() {
-    return Expanded(
+  Widget _buildBody() => Expanded(
     child: Padding(
         padding: EdgeInsets.only(
             left: HomePage.kDefaultPadding,
@@ -339,7 +336,6 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
         )
     ),
   );
-  }
 
   Widget _buildBodyContent() => PageView.builder(
       controller: _pageController,
@@ -451,9 +447,12 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
     child: Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        ProfileWidget(
+        Obx(() {
+          pageIndex.value;
+          return ProfileWidget(
               overlayKey: profileOverlayKey
-        ),
+          );
+        }),
         _autoSuggestBox,
         const SizedBox(height: 12.0),
         _buildNavigationTrail()
@@ -500,7 +499,7 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
           decoration: BoxDecoration(
               color: ButtonThemeData.uncheckedInputColor(
                 FluentTheme.of(context),
-                pageIndex.value == index ? {ButtonStates.hovering} : states,
+                pageIndex.value == index ? {WidgetState.hovered} : states,
                 transparentWhenNone: true,
               ),
               borderRadius: BorderRadius.all(Radius.circular(6.0))
@@ -529,12 +528,12 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
       stream: pagesController.stream,
       builder: (context, _) => Button(
         style: ButtonStyle(
-            padding: ButtonState.all(const EdgeInsets.symmetric(
+            padding: WidgetStateProperty.all(const EdgeInsets.symmetric(
               vertical: 12.0,
               horizontal: 16.0
             )),
-            backgroundColor: ButtonState.all(Colors.transparent),
-            shape: ButtonState.all(Border())
+            backgroundColor: WidgetStateProperty.all(Colors.transparent),
+            shape: WidgetStateProperty.all(Border())
         ),
         onPressed: appStack.isEmpty && !inDialog ? null : () {
           if(inDialog) {
@@ -555,12 +554,6 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
       )
   );
 
-  GestureDetector get _draggableArea => GestureDetector(
-      onDoubleTap: appWindow.maximizeOrRestore,
-      onHorizontalDragStart: (_) => windowManager.startDragging(),
-      onVerticalDragStart: (_) => windowManager.startDragging()
-  );
-
   Widget get _autoSuggestBox => Padding(
       padding: const EdgeInsets.symmetric(
           horizontal: 16.0,

gui/lib/src/widget/page/host_page.dart

@@ -10,18 +10,16 @@ import 'package:reboot_launcher/main.dart';
 import 'package:reboot_launcher/src/controller/dll_controller.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
 import 'package:reboot_launcher/src/controller/hosting_controller.dart';
-import 'package:reboot_launcher/src/controller/settings_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
-import 'package:reboot_launcher/src/messenger/implementation/data.dart';
-import 'package:reboot_launcher/src/page/abstract/page.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
+import 'package:reboot_launcher/src/widget/message/data.dart';
+import 'package:reboot_launcher/src/page/page.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/file_setting_tile.dart';
-import 'package:reboot_launcher/src/widget/game_start_button.dart';
-import 'package:reboot_launcher/src/widget/setting_tile.dart';
-import 'package:reboot_launcher/src/widget/version_selector_tile.dart';
+import 'package:reboot_launcher/src/widget/game/game_start_button.dart';
+import 'package:reboot_launcher/src/widget/fluent/setting_tile.dart';
+import 'package:reboot_launcher/src/widget/version/version_selector_tile.dart';
 
 final GlobalKey<OverlayTargetState> hostVersionOverlayTargetKey = GlobalKey();
 final GlobalKey<OverlayTargetState> hostInfoOverlayTargetKey = GlobalKey();
@@ -53,7 +51,6 @@ class HostPage extends RebootPage {
 class _HostingPageState extends RebootPageState<HostPage> {
   final GameController _gameController = Get.find<GameController>();
   final HostingController _hostingController = Get.find<HostingController>();
-  final SettingsController _settingsController = Get.find<SettingsController>();
   final DllController _dllController = Get.find<DllController>();
 
   late final RxBool _showPasswordTrailing = RxBool(_hostingController.password.text.isNotEmpty);
@@ -85,7 +82,6 @@ class _HostingPageState extends RebootPageState<HostPage> {
         key: hostVersionOverlayTargetKey
     ),
     _options,
-    _internalFiles,
     _share,
     _resetDefaults
   ];
@@ -155,8 +151,8 @@ class _HostingPageState extends RebootPageState<HostPage> {
                   suffix: Button(
                     onPressed: () => _hostingController.showPassword.value = !_hostingController.showPassword.value,
                     style: ButtonStyle(
-                        shape: ButtonState.all(const CircleBorder()),
-                        backgroundColor: ButtonState.all(Colors.transparent)
+                        shape: WidgetStateProperty.all(const CircleBorder()),
+                        backgroundColor: WidgetStateProperty.all(Colors.transparent)
                     ),
                     child: Icon(
                         _hostingController.showPassword.value ? FluentIcons.eye_off_24_filled : FluentIcons.eye_24_filled,
@@ -175,9 +171,9 @@ class _HostingPageState extends RebootPageState<HostPage> {
             contentWidth: null,
             content: Obx(() => Row(
               children: [
-                Text(
+  Obx(() => Text(
                     _hostingController.discoverable.value ? translations.on : translations.off
-                ),
+                )),
                 const SizedBox(
                     width: 16.0
                 ),
@@ -221,12 +217,11 @@ class _HostingPageState extends RebootPageState<HostPage> {
         content: Obx(() => DropDownButton(
             onOpen: () => inDialog = true,
             onClose: () => inDialog = false,
-            leading: Text(_settingsController.debug.value ? GameServerType.window.translatedName : _hostingController.type.value.translatedName),
+            leading: Text(_hostingController.type.value.translatedName),
             items: GameServerType.values.map((entry) => MenuFlyoutItem(
                 text: Text(entry.translatedName),
                 onPressed: () => _hostingController.type.value = entry
-            )).toList(),
-          disabled: _settingsController.debug.value
+            )).toList()
         )),
       ),
       SettingTile(
@@ -238,9 +233,9 @@ class _HostingPageState extends RebootPageState<HostPage> {
         contentWidth: null,
         content: Row(
           children: [
-            Text(
+            Obx(() => Text(
                 _hostingController.autoRestart.value ? translations.on : translations.off
-            ),
+            )),
             const SizedBox(
                 width: 16.0
             ),
@@ -271,159 +266,6 @@ class _HostingPageState extends RebootPageState<HostPage> {
     ],
   );
 
-  SettingTile get _internalFiles => SettingTile(
-    icon: Icon(
-        FluentIcons.archive_settings_24_regular
-    ),
-    title: Text(translations.settingsServerName),
-    subtitle: Text(translations.settingsServerSubtitle),
-    children: [
-      SettingTile(
-          icon: Icon(
-              FluentIcons.timer_24_regular
-          ),
-          title: Text(translations.settingsServerTypeName),
-          subtitle: Text(translations.settingsServerTypeDescription),
-          content: Obx(() => DropDownButton(
-              onOpen: () => inDialog = true,
-              onClose: () => inDialog = false,
-              leading: Text(_dllController.customGameServer.value ? translations.settingsServerTypeCustomName : translations.settingsServerTypeEmbeddedName),
-              items: {
-                false: translations.settingsServerTypeEmbeddedName,
-                true: translations.settingsServerTypeCustomName
-              }.entries.map((entry) => MenuFlyoutItem(
-                  text: Text(entry.value),
-                  onPressed: () {
-                    final oldValue = _dllController.customGameServer.value;
-                    if(oldValue == entry.key) {
-                      return;
-                    }
-
-                    _dllController.customGameServer.value = entry.key;
-                    _dllController.infoBarEntry?.close();
-                    if(!entry.key) {
-                      _dllController.updateGameServerDll(
-                          force: true
-                      );
-                    }
-                  }
-              )).toList()
-          ))
-      ),
-      Obx(() {
-        if(!_dllController.customGameServer.value) {
-          return const SizedBox.shrink();
-        }
-
-        return createFileSetting(
-            title: translations.settingsServerFileName,
-            description: translations.settingsServerFileDescription,
-            controller: _dllController.gameServerDll,
-            onReset: () {
-              final path = _dllController.getDefaultDllPath(InjectableDll.reboot);
-              _dllController.gameServerDll.text = path;
-              _dllController.downloadCriticalDllInteractive(path);
-            }
-        );
-      }),
-      Obx(() {
-        if(_dllController.customGameServer.value) {
-          return const SizedBox.shrink();
-        }
-
-        return SettingTile(
-            icon: Icon(
-                FluentIcons.globe_24_regular
-            ),
-            title: Text(translations.settingsServerMirrorName),
-            subtitle: Text(translations.settingsServerMirrorDescription),
-            content: Row(
-              children: [
-                Expanded(
-                  child: TextFormBox(
-                      placeholder:  translations.settingsServerMirrorPlaceholder,
-                      controller: _dllController.url,
-                      validator: _checkUpdateUrl
-                  ),
-                ),
-                const SizedBox(width: 8.0),
-                Button(
-                    style: ButtonStyle(
-                        padding: ButtonState.all(EdgeInsets.zero)
-                    ),
-                    onPressed: () => _dllController.url.text = kRebootDownloadUrl,
-                    child: SizedBox.square(
-                      dimension: 30,
-                      child: Icon(
-                          FluentIcons.arrow_reset_24_regular
-                      ),
-                    )
-                )
-              ],
-            )
-        );
-      }),
-      Obx(() {
-        if(_dllController.customGameServer.value) {
-          return const SizedBox.shrink();
-        }
-
-        return SettingTile(
-            icon: Icon(
-                FluentIcons.timer_24_regular
-            ),
-            title: Text(translations.settingsServerTimerName),
-            subtitle: Text(translations.settingsServerTimerSubtitle),
-            content: Row(
-              children: [
-                Expanded(
-                  child: Obx(() => DropDownButton(
-                      onOpen: () => inDialog = true,
-                      onClose: () => inDialog = false,
-                      leading: Text(_dllController.timer.value.text),
-                      items: UpdateTimer.values.map((entry) => MenuFlyoutItem(
-                          text: Text(entry.text),
-                          onPressed: () {
-                            _dllController.timer.value = entry;
-                            _dllController.infoBarEntry?.close();
-                            _dllController.updateGameServerDll(
-                                force: true
-                            );
-                          }
-                      )).toList()
-                  )),
-                ),
-                const SizedBox(width: 8.0),
-                Button(
-                  style: ButtonStyle(
-                    padding: ButtonState.all(EdgeInsets.zero)
-                  ),
-                  onPressed: () {
-                    _dllController.updateGameServerDll(force: true);
-                  },
-                  child: SizedBox.square(
-                    dimension: 30,
-                    child: Icon(
-                        FluentIcons.arrow_download_24_regular
-                    ),
-                  )
-                )
-              ],
-            )
-        );
-      })
-    ],
-  );
-
-
-  String? _checkUpdateUrl(String? text) {
-    if (text == null || text.isEmpty) {
-      return translations.emptyURL;
-    }
-
-    return null;
-  }
-
   SettingTile get _share => SettingTile(
     icon: Icon(
         FluentIcons.link_24_regular
@@ -494,8 +336,8 @@ class _HostingPageState extends RebootPageState<HostPage> {
 
     try {
       _hostingController.publishServer(
-          _gameController.username.text,
-          _hostingController.instance.value!.versionName
+          _hostingController.accountUsername.text,
+          _hostingController.instance.value!.version.toString()
       );
     } catch(error) {
       _showCannotUpdateGameServer(error);
@@ -530,13 +372,3 @@ class _HostingPageState extends RebootPageState<HostPage> {
       duration: infoBarLongDuration
   );
 }
-
-extension _UpdateTimerExtension on UpdateTimer {
-  String get text {
-    if (this == UpdateTimer.never) {
-      return translations.updateGameServerDllNever;
-    }
-
-    return translations.updateGameServerDllEvery(name);
-  }
-}

gui/lib/src/widget/page/info_page.dart

@@ -1,11 +1,11 @@
 import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
-import 'package:reboot_launcher/src/messenger/implementation/onboard.dart';
-import 'package:reboot_launcher/src/page/abstract/page.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
+import 'package:reboot_launcher/src/widget/message/onboard.dart';
+import 'package:reboot_launcher/src/page/page.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/setting_tile.dart';
+import 'package:reboot_launcher/src/widget/fluent/setting_tile.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 class InfoPage extends RebootPage {
@@ -29,7 +29,7 @@ class InfoPage extends RebootPage {
 
 class _InfoPageState extends RebootPageState<InfoPage> {
   static const String _kReportBugUrl = "https://github.com/Auties00/reboot_launcher/issues/new"; 
-  static const String _kDiscordInviteUrl = "https://discord.gg/reboot";
+  static const String _kDiscordInviteUrl = "https://discord.gg/rebootmp";
   
   @override
   List<SettingTile> get settings => [

gui/lib/src/widget/page/play_page.dart

@@ -1,20 +1,16 @@
 import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:get/get.dart';
-import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/dll_controller.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
-import 'package:reboot_launcher/src/controller/settings_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
-import 'package:reboot_launcher/src/messenger/implementation/data.dart';
-import 'package:reboot_launcher/src/messenger/implementation/onboard.dart';
-import 'package:reboot_launcher/src/page/abstract/page.dart';
-import 'package:reboot_launcher/src/page/abstract/page_type.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
+import 'package:reboot_launcher/src/widget/message/data.dart';
+import 'package:reboot_launcher/src/page/page.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/file_setting_tile.dart';
-import 'package:reboot_launcher/src/widget/game_start_button.dart';
-import 'package:reboot_launcher/src/widget/setting_tile.dart';
-import 'package:reboot_launcher/src/widget/version_selector_tile.dart';
+import 'package:reboot_launcher/src/widget/game/game_start_button.dart';
+import 'package:reboot_launcher/src/widget/fluent/setting_tile.dart';
+import 'package:reboot_launcher/src/widget/version/version_selector_tile.dart';
 
 final GlobalKey<OverlayTargetState> gameVersionOverlayTargetKey = GlobalKey();
 
@@ -38,7 +34,6 @@ class PlayPage extends RebootPage {
 }
 
 class _PlayPageState extends RebootPageState<PlayPage> {
-  final SettingsController _settingsController = Get.find<SettingsController>();
   final GameController _gameController = Get.find<GameController>();
   final DllController _dllController = Get.find<DllController>();
 
@@ -55,50 +50,9 @@ class _PlayPageState extends RebootPageState<PlayPage> {
       key: gameVersionOverlayTargetKey
     ),
     _options,
-    _internalFiles,
     _resetDefaults
   ];
 
-  SettingTile get _internalFiles => SettingTile(
-    icon: Icon(
-        FluentIcons.archive_settings_24_regular
-    ),
-    title: Text(translations.settingsClientName),
-    subtitle: Text(translations.settingsClientDescription),
-    children: [
-      createFileSetting(
-          title: translations.settingsClientConsoleName,
-          description: translations.settingsClientConsoleDescription,
-          controller: _dllController.unrealEngineConsoleDll,
-          onReset: () {
-            final path = _dllController.getDefaultDllPath(InjectableDll.console);
-            _dllController.unrealEngineConsoleDll.text = path;
-            _dllController.downloadCriticalDllInteractive(path, force: true);
-          }
-      ),
-      createFileSetting(
-          title: translations.settingsClientAuthName,
-          description: translations.settingsClientAuthDescription,
-          controller: _dllController.backendDll,
-          onReset: () {
-            final path = _dllController.getDefaultDllPath(InjectableDll.cobalt);
-            _dllController.backendDll.text = path;
-            _dllController.downloadCriticalDllInteractive(path, force: true);
-          }
-      ),
-      createFileSetting(
-          title: translations.settingsClientMemoryName,
-          description: translations.settingsClientMemoryDescription,
-          controller: _dllController.memoryLeakDll,
-          onReset: () {
-            final path = _dllController.getDefaultDllPath(InjectableDll.memory);
-            _dllController.memoryLeakDll.text = path;
-            _dllController.downloadCriticalDllInteractive(path, force: true);
-          }
-      ),
-    ],
-  );
-
   SettingTile get _options => SettingTile(
       icon: Icon(
           FluentIcons.options_24_regular

gui/lib/src/widget/page/settings_page.dart

@@ -0,0 +1,363 @@
+import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter_gen/gen_l10n/reboot_localizations.dart';
+import 'package:flutter_localized_locales/flutter_localized_locales.dart';
+import 'package:get/get.dart';
+import 'package:reboot_common/common.dart';
+import 'package:reboot_launcher/src/controller/dll_controller.dart';
+import 'package:reboot_launcher/src/controller/settings_controller.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/page/page.dart';
+import 'package:reboot_launcher/src/page/page_type.dart';
+import 'package:reboot_launcher/src/util/translations.dart';
+import 'package:reboot_launcher/src/widget/file/file_setting_tile.dart';
+import 'package:reboot_launcher/src/widget/fluent/setting_tile.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class SettingsPage extends RebootPage {
+  const SettingsPage({Key? key}) : super(key: key);
+
+  @override
+  String get name => translations.settingsName;
+
+  @override
+  String get iconAsset => "assets/images/settings.png";
+
+  @override
+  RebootPageType get type => RebootPageType.settings;
+
+  @override
+  bool hasButton(String? pageName) => false;
+
+  @override
+  RebootPageState<SettingsPage> createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends RebootPageState<SettingsPage> {
+  final SettingsController _settingsController = Get.find<SettingsController>();
+  final DllController _dllController = Get.find<DllController>();
+
+  @override
+  Widget? get button => null;
+
+  @override
+  List<Widget> get settings => [
+    _language,
+    _theme,
+    _internalFiles,
+    _installationDirectory,
+  ];
+
+  SettingTile get _internalFiles => SettingTile(
+    icon: Icon(
+        FluentIcons.archive_settings_24_regular
+    ),
+    title: Text(translations.settingsClientName),
+    subtitle: Text(translations.settingsClientDescription),
+    children: [
+      createFileSetting(
+          title: translations.settingsClientConsoleName,
+          description: translations.settingsClientConsoleDescription,
+          controller: _dllController.unrealEngineConsoleDll,
+          onReset: () {
+            final path = _dllController.getDefaultDllPath(InjectableDll.console);
+            _dllController.unrealEngineConsoleDll.text = path;
+            _dllController.download(InjectableDll.console, path, force: true);
+          }
+      ),
+      createFileSetting(
+          title: translations.settingsClientAuthName,
+          description: translations.settingsClientAuthDescription,
+          controller: _dllController.backendDll,
+          onReset: () {
+            final path = _dllController.getDefaultDllPath(InjectableDll.auth);
+            _dllController.backendDll.text = path;
+            _dllController.download(InjectableDll.auth, path, force: true);
+          }
+      ),
+      createFileSetting(
+          title: translations.settingsClientMemoryName,
+          description: translations.settingsClientMemoryDescription,
+          controller: _dllController.memoryLeakDll,
+          onReset: () {
+            final path = _dllController.getDefaultDllPath(InjectableDll.memoryLeak);
+            _dllController.memoryLeakDll.text = path;
+            _dllController.download(InjectableDll.memoryLeak, path, force: true);
+          }
+      ),
+      _internalFilesServerType,
+      _internalFilesUpdateTimer,
+      _internalFilesServerSource,
+      _internalFilesNewServerSource,
+    ],
+  );
+
+  Widget get _internalFilesServerType => SettingTile(
+      icon: Icon(
+          FluentIcons.games_24_regular
+      ),
+      title: Text(translations.settingsServerTypeName),
+      subtitle: Text(translations.settingsServerTypeDescription),
+      contentWidth: SettingTile.kDefaultContentWidth + 30,
+      content: Obx(() => DropDownButton(
+          onOpen: () => inDialog = true,
+          onClose: () => inDialog = false,
+          leading: Text(_dllController.customGameServer.value ? translations.settingsServerTypeCustomName : translations.settingsServerTypeEmbeddedName),
+          items: {
+            false: translations.settingsServerTypeEmbeddedName,
+            true: translations.settingsServerTypeCustomName
+          }.entries.map((entry) => MenuFlyoutItem(
+              text: Text(entry.value),
+              onPressed: () {
+                final oldValue = _dllController.customGameServer.value;
+                if(oldValue == entry.key) {
+                  return;
+                }
+
+                _dllController.customGameServer.value = entry.key;
+                _dllController.infoBarEntry?.close();
+                if(!entry.key) {
+                  _dllController.updateGameServerDll(
+                      force: true
+                  );
+                }
+              }
+          )).toList()
+      ))
+  );
+
+  Widget get _internalFilesServerSource => Obx(() {
+    if(!_dllController.customGameServer.value) {
+      return SettingTile(
+          icon: Icon(
+              FluentIcons.globe_24_regular
+          ),
+          title: Text(translations.settingsServerOldMirrorName),
+          subtitle: Text(translations.settingsServerMirrorDescription),
+          contentWidth: SettingTile.kDefaultContentWidth + 30,
+          content: Row(
+            children: [
+              Expanded(
+                child: TextFormBox(
+                  placeholder:  translations.settingsServerMirrorPlaceholder,
+                  controller: _dllController.beforeS20Mirror,
+                  onChanged: (value) {
+                    if(Uri.tryParse(value) != null) {
+                      _dllController.updateGameServerDll(force: true);
+                    }
+                  },
+                ),
+              ),
+              const SizedBox(width: 8.0),
+              Button(
+                  style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
+                  ),
+                  onPressed: () => _dllController.updateGameServerDll(force: true),
+                  child: SizedBox.square(
+                    dimension: 30,
+                    child: Icon(
+                        FluentIcons.arrow_download_24_regular
+                    ),
+                  )
+              ),
+              const SizedBox(width: 8.0),
+              Button(
+                  style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
+                  ),
+                  onPressed: () {
+                    _dllController.beforeS20Mirror.text = kRebootBelowS20DownloadUrl;
+                    _dllController.updateGameServerDll(force: true);
+                  },
+                  child: SizedBox.square(
+                    dimension: 30,
+                    child: Icon(
+                        FluentIcons.arrow_reset_24_regular
+                    ),
+                  )
+              )
+            ],
+          )
+      );
+    }else {
+      return createFileSetting(
+          title: translations.settingsOldServerFileName,
+          description: translations.settingsServerFileDescription,
+          controller: _dllController.gameServerDll,
+          onReset: () {
+            final path = _dllController.getDefaultDllPath(InjectableDll.gameServer);
+            _dllController.gameServerDll.text = path;
+            _dllController.download(InjectableDll.gameServer, path);
+          }
+      );
+    }
+  });
+
+  Widget get _internalFilesNewServerSource => Obx(() {
+    if(!_dllController.customGameServer.value) {
+      return SettingTile(
+          icon: Icon(
+              FluentIcons.globe_24_regular
+          ),
+          title: Text(translations.settingsServerNewMirrorName),
+          subtitle: Text(translations.settingsServerMirrorDescription),
+          contentWidth: SettingTile.kDefaultContentWidth + 30,
+          content: Row(
+            children: [
+              Expanded(
+                child: TextFormBox(
+                  placeholder: translations.settingsServerMirrorPlaceholder,
+                  controller: _dllController.aboveS20Mirror,
+                  onChanged: (value) {
+                    if(Uri.tryParse(value) != null) {
+                      _dllController.updateGameServerDll(force: true);
+                    }
+                  },
+                ),
+              ),
+              const SizedBox(width: 8.0),
+              Button(
+                  style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
+                  ),
+                  onPressed: () => _dllController.updateGameServerDll(force: true),
+                  child: SizedBox.square(
+                    dimension: 30,
+                    child: Icon(
+                        FluentIcons.arrow_download_24_regular
+                    ),
+                  )
+              ),
+              const SizedBox(width: 8.0),
+              Button(
+                  style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
+                  ),
+                  onPressed: () {
+                    _dllController.aboveS20Mirror.text = kRebootBelowS20DownloadUrl;
+                    _dllController.updateGameServerDll(force: true);
+                  },
+                  child: SizedBox.square(
+                    dimension: 30,
+                    child: Icon(
+                        FluentIcons.arrow_reset_24_regular
+                    ),
+                  )
+              )
+            ],
+          )
+      );
+    }else {
+      return const SizedBox();
+    }
+  });
+
+  Widget get _internalFilesUpdateTimer => Obx(() {
+    if(_dllController.customGameServer.value) {
+      return const SizedBox.shrink();
+    }
+
+    return SettingTile(
+        icon: Icon(
+            FluentIcons.timer_24_regular
+        ),
+        title: Text(translations.settingsServerTimerName),
+        subtitle: Text(translations.settingsServerTimerSubtitle),
+        contentWidth: SettingTile.kDefaultContentWidth + 30,
+        content: Obx(() => DropDownButton(
+            onOpen: () => inDialog = true,
+            onClose: () => inDialog = false,
+            leading: Text(_dllController.timer.value.text),
+            items: UpdateTimer.values.map((entry) => MenuFlyoutItem(
+                text: Text(entry.text),
+                onPressed: () {
+                  _dllController.timer.value = entry;
+                  _dllController.infoBarEntry?.close();
+                  _dllController.updateGameServerDll(
+                      force: true
+                  );
+                }
+            )).toList()
+        ))
+    );
+  });
+
+  SettingTile get _language => SettingTile(
+      icon: Icon(
+          FluentIcons.local_language_24_regular
+      ),
+      title: Text(translations.settingsUtilsLanguageName),
+      subtitle: Text(translations.settingsUtilsLanguageDescription),
+      content: Obx(() => DropDownButton(
+          onOpen: () => inDialog = true,
+          onClose: () => inDialog = false,
+          leading: Text(_getLocaleName(_settingsController.language.value)),
+          items: AppLocalizations.supportedLocales.map((locale) => MenuFlyoutItem(
+              text: Text(_getLocaleName(locale.languageCode)),
+              onPressed: () => _settingsController.language.value = locale.languageCode
+          )).toList()
+      ))
+  );
+
+  String _getLocaleName(String locale) {
+    var result = LocaleNames.of(context)!.nameOf(locale);
+    if(result != null) {
+      return "${result.substring(0, 1).toUpperCase()}${result.substring(1).toLowerCase()}";
+    }
+
+    return locale;
+  }
+
+  SettingTile get _theme => SettingTile(
+      icon: Icon(
+          FluentIcons.dark_theme_24_regular
+      ),
+      title: Text(translations.settingsUtilsThemeName),
+      subtitle: Text(translations.settingsUtilsThemeDescription),
+      content: Obx(() => DropDownButton(
+          onOpen: () => inDialog = true,
+          onClose: () => inDialog = false,
+          leading: Text(_settingsController.themeMode.value.title),
+          items: ThemeMode.values.map((themeMode) => MenuFlyoutItem(
+              text: Text(themeMode.title),
+              onPressed: () => _settingsController.themeMode.value = themeMode
+          )).toList()
+      ))
+  );
+  
+  SettingTile get _installationDirectory => SettingTile(
+      icon: Icon(
+          FluentIcons.folder_24_regular
+      ),
+      title: Text(translations.settingsUtilsInstallationDirectoryName),
+      subtitle: Text(translations.settingsUtilsInstallationDirectorySubtitle),
+      content: Button(
+        onPressed: () => launchUrl(installationDirectory.uri),
+        child: Text(translations.settingsUtilsInstallationDirectoryContent),
+      )
+  );
+}
+
+extension _ThemeModeExtension on ThemeMode {
+  String get title {
+    switch(this) {
+      case ThemeMode.system:
+        return translations.system;
+      case ThemeMode.dark:
+        return translations.dark;
+      case ThemeMode.light:
+        return translations.light;
+    }
+  }
+}
+
+extension _UpdateTimerExtension on UpdateTimer {
+  String get text {
+    if (this == UpdateTimer.never) {
+      return translations.updateGameServerDllNever;
+    }
+
+    return translations.updateGameServerDllEvery(name);
+  }
+}

gui/lib/src/widget/server/server_start_button.dart

@@ -4,7 +4,6 @@ import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/backend_controller.dart';
-import 'package:reboot_launcher/src/messenger/implementation/server.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 
 class ServerButton extends StatefulWidget {

gui/lib/src/widget/server/server_type_selector.dart

@@ -2,8 +2,8 @@ import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/backend_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 
 class ServerTypeSelector extends StatefulWidget {

gui/lib/src/widget/title_bar.dart

@@ -1,51 +0,0 @@
-import 'package:fluent_ui/fluent_ui.dart';
-import 'package:reboot_launcher/src/util/os.dart';
-import 'package:reboot_launcher/src/widget/title_bar_buttons.dart';
-import 'package:system_theme/system_theme.dart';
-
-class WindowTitleBar extends StatelessWidget {
-  final bool focused;
-  
-  const WindowTitleBar({Key? key, required this.focused}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    var lightMode = FluentTheme.of(context).brightness.isLight;
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.end,
-      children: [
-        MinimizeWindowButton(
-          colors: WindowButtonColors(
-              iconNormal: focused || !isWin11 ? lightMode ? Colors.black : Colors.white : SystemTheme.accentColor.lighter,
-              iconMouseDown: lightMode ? Colors.black : Colors.white,
-              iconMouseOver: lightMode ? Colors.black : Colors.white,
-              normal: Colors.transparent,
-              mouseOver: _color,
-              mouseDown: _color.withOpacity(0.7)),
-        ),
-        MaximizeWindowButton(
-          colors: WindowButtonColors(
-              iconNormal: focused || !isWin11 ? lightMode ? Colors.black : Colors.white : SystemTheme.accentColor.lighter,
-              iconMouseDown: lightMode ? Colors.black : Colors.white,
-              iconMouseOver: lightMode ? Colors.black : Colors.white,
-              normal: Colors.transparent,
-              mouseOver: _color,
-              mouseDown: _color.withOpacity(0.7)),
-        ),
-        CloseWindowButton(
-          colors: WindowButtonColors(
-            iconNormal: focused || !isWin11 ? lightMode ? Colors.black : Colors.white : SystemTheme.accentColor.lighter,
-            iconMouseDown: lightMode ? Colors.black : Colors.white,
-            iconMouseOver: lightMode ? Colors.black : Colors.white,
-            normal: Colors.transparent,
-            mouseOver: Colors.red,
-            mouseDown: Colors.red.withOpacity(0.7),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Color get _color =>
-      SystemTheme.accentColor.accent;
-}

gui/lib/src/widget/title_bar_buttons.dart

@@ -1,173 +0,0 @@
-import 'package:bitsdojo_window/bitsdojo_window.dart' show appWindow;
-import 'package:flutter/material.dart';
-
-import 'title_bar_icons.dart';
-import 'title_bar_mouse.dart';
-
-typedef WindowButtonIconBuilder = Widget Function(
-    WindowButtonContext buttonContext);
-typedef WindowButtonBuilder = Widget Function(
-    WindowButtonContext buttonContext, Widget icon);
-
-class WindowButtonContext {
-  BuildContext context;
-  MouseState mouseState;
-  Color? backgroundColor;
-  Color iconColor;
-
-  WindowButtonContext(
-      {required this.context,
-      required this.mouseState,
-      this.backgroundColor,
-      required this.iconColor});
-}
-
-class WindowButtonColors {
-  late Color normal;
-  late Color mouseOver;
-  late Color mouseDown;
-  late Color iconNormal;
-  late Color iconMouseOver;
-  late Color iconMouseDown;
-
-  WindowButtonColors(
-      {Color? normal,
-      Color? mouseOver,
-      Color? mouseDown,
-      Color? iconNormal,
-      Color? iconMouseOver,
-      Color? iconMouseDown}) {
-    this.normal = normal ?? _defaultButtonColors.normal;
-    this.mouseOver = mouseOver ?? _defaultButtonColors.mouseOver;
-    this.mouseDown = mouseDown ?? _defaultButtonColors.mouseDown;
-    this.iconNormal = iconNormal ?? _defaultButtonColors.iconNormal;
-    this.iconMouseOver = iconMouseOver ?? _defaultButtonColors.iconMouseOver;
-    this.iconMouseDown = iconMouseDown ?? _defaultButtonColors.iconMouseDown;
-  }
-}
-
-final _defaultButtonColors = WindowButtonColors(
-    normal: Colors.transparent,
-    iconNormal: const Color(0xFF805306),
-    mouseOver: const Color(0xFF404040),
-    mouseDown: const Color(0xFF202020),
-    iconMouseOver: const Color(0xFFFFFFFF),
-    iconMouseDown: const Color(0xFFF0F0F0));
-
-class WindowButton extends StatelessWidget {
-  final WindowButtonBuilder? builder;
-  final WindowButtonIconBuilder? iconBuilder;
-  late final WindowButtonColors colors;
-  final bool animate;
-  final EdgeInsets? padding;
-  final VoidCallback? onPressed;
-
-  WindowButton(
-      {Key? key,
-      WindowButtonColors? colors,
-      this.builder,
-      @required this.iconBuilder,
-      this.padding,
-      this.onPressed,
-      this.animate = false})
-      : super(key: key) {
-    this.colors = colors ?? _defaultButtonColors;
-  }
-
-  Color getBackgroundColor(MouseState mouseState) {
-    if (mouseState.isMouseDown) return colors.mouseDown;
-    if (mouseState.isMouseOver) return colors.mouseOver;
-    return colors.normal;
-  }
-
-  Color getIconColor(MouseState mouseState) {
-    if (mouseState.isMouseDown) return colors.iconMouseDown;
-    if (mouseState.isMouseOver) return colors.iconMouseOver;
-    return colors.iconNormal;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MouseStateBuilder(
-        builder: (context, mouseState) {
-          WindowButtonContext buttonContext = WindowButtonContext(
-              mouseState: mouseState,
-              context: context,
-              backgroundColor: getBackgroundColor(mouseState),
-              iconColor: getIconColor(mouseState));
-
-          var icon =
-              (iconBuilder != null) ? iconBuilder!(buttonContext) : Container();
-          var fadeOutColor =
-              getBackgroundColor(MouseState()..isMouseOver = true)
-                  .withOpacity(0);
-          var padding = this.padding ?? EdgeInsets.zero;
-          var animationMs = mouseState.isMouseOver
-              ? (animate ? 100 : 0)
-              : (animate ? 200 : 0);
-          Widget iconWithPadding = Padding(padding: padding, child: icon);
-          iconWithPadding = AnimatedContainer(
-              curve: Curves.easeOut,
-              duration: Duration(milliseconds: animationMs),
-              color: buttonContext.backgroundColor ?? fadeOutColor,
-              child: iconWithPadding);
-          var button = (builder != null)
-              ? builder!(buttonContext, icon)
-              : iconWithPadding;
-          return SizedBox.square(dimension: 45, child: button);
-        },
-        onPressed: onPressed);
-  }
-}
-
-class MinimizeWindowButton extends WindowButton {
-  MinimizeWindowButton(
-      {Key? key,
-      WindowButtonColors? colors,
-      VoidCallback? onPressed,
-      bool? animate})
-      : super(
-            key: key,
-            colors: colors,
-            animate: animate ?? false,
-            iconBuilder: (buttonContext) =>
-                MinimizeIcon(color: buttonContext.iconColor),
-            onPressed: onPressed ?? () => appWindow.minimize());
-}
-
-class MaximizeWindowButton extends WindowButton {
-  MaximizeWindowButton(
-      {Key? key,
-      WindowButtonColors? colors,
-      VoidCallback? onPressed,
-      bool? animate})
-      : super(
-            key: key,
-            colors: colors,
-            animate: animate ?? false,
-            iconBuilder: (buttonContext) =>
-                MaximizeIcon(color: buttonContext.iconColor),
-            onPressed: onPressed ??
-                    () => appWindow.maximizeOrRestore());
-}
-
-final _defaultCloseButtonColors = WindowButtonColors(
-    mouseOver: const Color(0xFFD32F2F),
-    mouseDown: const Color(0xFFB71C1C),
-    iconNormal: const Color(0xFF805306),
-    iconMouseOver: const Color(0xFFFFFFFF));
-
-class CloseWindowButton extends WindowButton {
-  CloseWindowButton(
-      {Key? key,
-      WindowButtonColors? colors,
-      VoidCallback? onPressed,
-      bool? animate})
-      : super(
-            key: key,
-            colors: colors ?? _defaultCloseButtonColors,
-            animate: animate ?? false,
-            iconBuilder: (buttonContext) =>
-                CloseIcon(color: buttonContext.iconColor),
-            onPressed: onPressed ?? () => appWindow.close());
-}

gui/lib/src/widget/title_bar_icons.dart

@@ -1,118 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/widgets.dart';
-
-class CloseIcon extends StatelessWidget {
-  final Color color;
-
-  const CloseIcon({Key? key, required this.color}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) => Align(
-    alignment: Alignment.topLeft,
-    child: Stack(children: [
-      Transform.rotate(
-          angle: pi * .25,
-          child:
-          Center(child: Container(width: 14, height: 1, color: color))),
-      Transform.rotate(
-          angle: pi * -.25,
-          child:
-          Center(child: Container(width: 14, height: 1, color: color))),
-    ]),
-  );
-}
-
-class MaximizeIcon extends StatelessWidget {
-  final Color color;
-
-  const MaximizeIcon({Key? key, required this.color}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) => _AlignedPaint(_MaximizePainter(color));
-}
-
-class _MaximizePainter extends _IconPainter {
-  _MaximizePainter(Color color) : super(color);
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    Paint p = getPaint(color);
-    canvas.drawRect(Rect.fromLTRB(0, 0, size.width - 1, size.height - 1), p);
-  }
-}
-
-class RestoreIcon extends StatelessWidget {
-  final Color color;
-
-  const RestoreIcon({
-    Key? key,
-    required this.color,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) => _AlignedPaint(_RestorePainter(color));
-}
-
-class _RestorePainter extends _IconPainter {
-  _RestorePainter(Color color) : super(color);
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    Paint p = getPaint(color);
-    canvas.drawRect(Rect.fromLTRB(0, 2, size.width - 2, size.height), p);
-    canvas.drawLine(const Offset(2, 2), const Offset(2, 0), p);
-    canvas.drawLine(const Offset(2, 0), Offset(size.width, 0), p);
-    canvas.drawLine(
-        Offset(size.width, 0), Offset(size.width, size.height - 2), p);
-    canvas.drawLine(Offset(size.width, size.height - 2),
-        Offset(size.width - 2, size.height - 2), p);
-  }
-}
-
-class MinimizeIcon extends StatelessWidget {
-  final Color color;
-
-  const MinimizeIcon({Key? key, required this.color}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) => _AlignedPaint(_MinimizePainter(color));
-}
-
-class _MinimizePainter extends _IconPainter {
-  _MinimizePainter(Color color) : super(color);
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    Paint p = getPaint(color);
-    canvas.drawLine(
-        Offset(0, size.height / 2), Offset(size.width, size.height / 2), p);
-  }
-}
-
-abstract class _IconPainter extends CustomPainter {
-  _IconPainter(this.color);
-
-  final Color color;
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
-}
-
-class _AlignedPaint extends StatelessWidget {
-  const _AlignedPaint(this.painter, {Key? key}) : super(key: key);
-  final CustomPainter painter;
-
-  @override
-  Widget build(BuildContext context) {
-    return Align(
-        alignment: Alignment.center,
-        child: CustomPaint(size: const Size(10, 10), painter: painter));
-  }
-}
-
-Paint getPaint(Color color, [bool isAntiAlias = false]) => Paint()
-  ..color = color
-  ..style = PaintingStyle.stroke
-  ..isAntiAlias = isAntiAlias
-  ..strokeWidth = 1;

gui/lib/src/widget/title_bar_mouse.dart

@@ -1,71 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-typedef MouseStateBuilderCB = Widget Function(
-    BuildContext context, MouseState mouseState);
-
-class MouseState {
-  bool isMouseOver;
-  bool isMouseDown;
-
-  MouseState() : isMouseOver = false, isMouseDown = false;
-}
-
-class MouseStateBuilder extends StatefulWidget {
-  final MouseStateBuilderCB builder;
-  final VoidCallback? onPressed;
-
-  const MouseStateBuilder({Key? key, required this.builder, this.onPressed})
-      : super(key: key);
-
-  @override
-  State<MouseStateBuilder> createState() => _MouseStateBuilderState();
-}
-
-class _MouseStateBuilderState extends State<MouseStateBuilder> {
-  late MouseState _mouseState;
-
-  _MouseStateBuilderState() {
-    _mouseState = MouseState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MouseRegion(
-        onEnter: (event) {
-          setState(() {
-            _mouseState.isMouseOver = true;
-          });
-        },
-        onExit: (event) {
-          setState(() {
-            _mouseState.isMouseOver = false;
-          });
-        },
-        child: GestureDetector(
-            onTapDown: (_) {
-              setState(() {
-                _mouseState.isMouseDown = true;
-              });
-            },
-            onTapCancel: () {
-              setState(() {
-                _mouseState.isMouseDown = false;
-              });
-            },
-            onTap: () {
-              setState(() {
-                _mouseState.isMouseDown = false;
-                _mouseState.isMouseOver = false;
-              });
-              WidgetsBinding.instance.addPostFrameCallback((_) {
-                if (widget.onPressed != null) {
-                  widget.onPressed!();
-                }
-              });
-            },
-            onTapUp: (_) {},
-            child: widget.builder(context, _mouseState)
-        )
-    );
-  }
-}

gui/lib/src/widget/version/version_selector.dart

@@ -6,20 +6,20 @@ import 'package:flutter/gestures.dart';
 import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/game_controller.dart';
-import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
-import 'package:reboot_launcher/src/messenger/implementation/version.dart';
+import 'package:reboot_launcher/src/messenger/dialog.dart';
+import 'package:reboot_launcher/src/messenger/info_bar.dart';
+import 'package:reboot_launcher/src/widget/message/version.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class VersionSelector extends StatefulWidget {
   const VersionSelector({Key? key}) : super(key: key);
 
-  static Future<void> openDownloadDialog({bool closable = true}) => showRebootDialog<bool>(
+  static Future<void> openDownloadDialog() => showRebootDialog<bool>(
     builder: (context) => AddVersionDialog(
-      closable: closable,
+      closable: true,
     ),
-    dismissWithEsc: closable
+    dismissWithEsc: true
   );
 
   @override

gui/lib/src/widget/version/version_selector_tile.dart

@@ -1,9 +1,9 @@
 import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
+import 'package:reboot_launcher/src/messenger/overlay.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
-import 'package:reboot_launcher/src/widget/setting_tile.dart';
-import 'package:reboot_launcher/src/widget/version_selector.dart';
+import 'package:reboot_launcher/src/widget/fluent/setting_tile.dart';
+import 'package:reboot_launcher/src/widget/version/version_selector.dart';
 
 SettingTile buildVersionSelector({
   required GlobalKey<OverlayTargetState> key

gui/lib/src/widget/window/info_bar_area.dart

@@ -24,7 +24,9 @@ class InfoBarAreaState extends State<InfoBarArea> {
   }
 
   @override
-  Widget build(BuildContext context) => Obx(() => Padding(
+  Widget build(BuildContext context) => StreamBuilder(
+      stream: pagesController.stream,
+      builder: (context, _) => Obx(() => Padding(
         padding: EdgeInsets.only(
             bottom: hasPageButton ? 72.0 : 16.0
         ),
@@ -38,5 +40,6 @@ class InfoBarAreaState extends State<InfoBarArea> {
                 child: child
             )).toList(growable: false)
         ),
-  ));
+      ))
+  );
 }

gui/pubspec.yaml

@@ -1,11 +1,15 @@
 name: reboot_launcher
 description: Graphical User Interface for Project Reboot
-version: "9.2.6"
+version: "10.0.5"
 
 publish_to: 'none'
 
 environment:
-  sdk: ">=3.0.0 <=4.0.0"
+  # 3.19.0 is the last version that supports Windows 7/8/8.1 officially
+  # I have no clue who is still using Windows 7, but some users requested support, so might as well add it
+  # Repository Issue: https://github.com/Auties00/Reboot-Launcher/issues/58
+  # Flutter issue: https://github.com/flutter/flutter/issues/140830#issuecomment-1936397549
+  sdk: ">=3.0.0 <=3.19.0"
 
 dependencies:
   # The flutter SDK
@@ -17,53 +21,47 @@ dependencies:
     path: ./../common
 
   # Windows UI 3
-  fluent_ui: ^4.8.7
-  flutter_acrylic:
-    path: ./dependencies/flutter_acrylic
-  fluentui_system_icons: ^1.1.238
-  system_theme: ^2.0.0
+  fluent_ui: ^4.9.1
+  flutter_acrylic: ^1.1.4
+  fluentui_system_icons: ^1.1.258
+  system_theme: ^3.1.1
   skeletons:
     git:
       url: https://github.com/talok/skeletons
       ref: main
 
   # Window management
-  bitsdojo_window: ^0.1.5
-  window_manager: ^0.3.8
+  window_manager: ^0.4.2
 
   # Extract zip archives (for example the reboot.zip)
-  archive: ^3.3.1
+  archive: ^3.6.1
 
   # Cryptographic functions
-  crypto: ^3.0.2
   bcrypt: ^1.1.3
-  pointycastle: ^3.7.3
+  pointycastle: ^3.9.1
 
   # Async helpers
-  async: ^2.8.2
+  async: ^2.11.0
   sync: ^0.3.0
 
   # State management
-  get: ^4.6.5
+  get: ^4.6.6
 
   # Native utilities
   clipboard: ^0.1.3
-  app_links: ^6.0.2
-  url_protocol: ^1.0.0
+  app_links: ^6.3.2
   windows_taskbar: ^1.1.2
-  file_picker: ^8.0.3
-  url_launcher: ^6.1.5
+  file_picker: ^8.1.2
+  url_launcher: ^6.3.0
   local_notifier: ^0.1.6
 
   # Server browser
-  supabase_flutter: ^2.5.2
-  uuid: ^3.0.6
+  supabase_flutter: ^2.7.0
   dart_ipify: ^1.1.1
 
   # Storage
-  get_storage: ^2.0.3
-  universal_disk_space: ^0.2.3
-  path: ^1.8.3
+  get_storage: ^2.1.1
+  path: ^1.9.0
 
   # Translations
   intl: any
@@ -71,23 +69,17 @@ dependencies:
 
   # Auto updater
   yaml: ^3.1.2
-  package_info_plus: ^8.0.0
+  package_info_plus: ^8.0.2
   version: ^3.0.2
 
   # Validate profile
   email_validator: ^3.0.0
 
-dependency_overrides:
-  xml: ^6.3.0
-  http: ^0.13.5
-  win32: ^3.0.0
-  ffi: ^2.0.0
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
 flutter:
   uses-material-design: true

gui/windows/flutter/generated_plugin_registrant.cc

@@ -7,10 +7,9 @@
 #include "generated_plugin_registrant.h"
 
 #include <app_links/app_links_plugin_c_api.h>
-#include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
 #include <flutter_acrylic/flutter_acrylic_plugin.h>
 #include <local_notifier/local_notifier_plugin.h>
-#include <screen_retriever/screen_retriever_plugin.h>
+#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <system_theme/system_theme_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 #include <window_manager/window_manager_plugin.h>
@@ -19,14 +18,12 @@
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   AppLinksPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("AppLinksPluginCApi"));
-  BitsdojoWindowPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("BitsdojoWindowPlugin"));
   FlutterAcrylicPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterAcrylicPlugin"));
   LocalNotifierPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("LocalNotifierPlugin"));
-  ScreenRetrieverPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
+  ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
   SystemThemePluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SystemThemePlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(

gui/windows/flutter/generated_plugins.cmake

@@ -4,10 +4,9 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   app_links
-  bitsdojo_window_windows
   flutter_acrylic
   local_notifier
-  screen_retriever
+  screen_retriever_windows
   system_theme
   url_launcher_windows
   window_manager

gui/windows/packaging/exe/custom-inno-setup-script.iss

@@ -36,7 +36,6 @@ Source: "{{SOURCE_DIR}}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdir
 Source: "..\..\dependencies\redist\VC_redist.x64.exe"; DestDir: {tmp}; Flags: dontcopy
 
 [Run]
-Filename: "powershell.exe"; Parameters: "-ExecutionPolicy Bypass -Command ""Add-MpPreference -ExclusionPath '{app}'"""; Flags: runhidden
 Filename: "{app}\{{EXECUTABLE_NAME}}"; Description: "{cm:LaunchProgram,{{DISPLAY_NAME}}}"; Flags: runascurrentuser nowait postinstall skipifsilent
 Filename: "{tmp}\VC_redist.x64.exe"; StatusMsg: "{cm:InstallingVC2017redist}"; Parameters: "/quiet"; Check: VC2017RedistNeedsInstall; Flags: waituntilterminated
 
@@ -46,6 +45,44 @@ Name: "{autodesktop}\{{DISPLAY_NAME}}"; Filename: "{app}\{{EXECUTABLE_NAME}}"; T
 Name: "{userstartup}\{{DISPLAY_NAME}}"; Filename: "{app}\{{EXECUTABLE_NAME}}"; WorkingDir: "{app}"; Tasks: launchAtStartup
 
 [Code]
+var
+  Page: TInputOptionWizardPage;
+
+procedure InitializeWizard();
+begin
+  Page := CreateInputOptionPage(
+         wpWelcome,
+        '   Allow DLL injection',
+        ' The Reboot Launcher needs to inject DLLs into Fortnite to create the game server',
+        'Selecting the option below will add the Reboot Launcher to the Windows Exclusions list. ' +
+        'This is necessary because DLL injection is often detected as a virus, but is necessary to modify Fortnite. ' +
+        'This option was designed for advanced users who want to manually manage the exclusions list on their machine. ' +
+        'If you do not trust the Reboot Launcher, you can audit the source code at https://github.com/Auties00/reboot_launcher and build it from source.',
+        False,
+        False
+  );
+  Page.Add('&Add the launcher to the Windows Exclusions list');
+  Page.Values[0] := True;
+end;
+
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+  Result := False;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+  ResultCode: Integer;
+  InstallationDir: String;
+begin
+  if (CurStep = ssPostInstall) and Page.Values[0] then
+  begin
+    InstallationDir := ExpandConstant('{app}');
+    Exec('powershell.exe', '-ExecutionPolicy Bypass -Command ""Add-MpPreference -ExclusionPath ''' + InstallationDir + '''""' , '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
+    Log('Powershell exit code: ' + IntToStr(ResultCode));
+  end;
+end;
+
 function CompareVersion(version1, version2: String): Integer;
 var
     packVersion1, packVersion2: Int64;

gui/windows/runner/main.cpp

@@ -1,6 +1,3 @@
-#include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
-auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP);
-
 #include <cstdlib>
 
 #include <flutter/dart_project.h>

gui/windows/runner/win32_window.cpp

@@ -6,6 +6,10 @@
 
 #include <dwmapi.h>
 
+#include <iostream>
+
+#include "Windowsx.h"
+
 namespace {
 
     constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
@@ -121,7 +125,7 @@ bool Win32Window::CreateAndShow(const std::wstring &title,
     HWND window = CreateWindow(
             window_class,
             title.c_str(),
-            WS_OVERLAPPED | WS_BORDER | WS_THICKFRAME,
+            WS_OVERLAPPEDWINDOW,
             Scale(origin.x, scale_factor),
             Scale(origin.y, scale_factor),
             Scale(size.width, scale_factor),
@@ -160,47 +164,43 @@ LRESULT CALLBACK Win32Window::WndProc(HWND const window,
 }
 
 LRESULT
-Win32Window::MessageHandler(HWND hwnd,
-                            UINT const message,
-                            WPARAM const wparam,
-                            LPARAM const lparam) noexcept {
-    switch (message) {
-        case WM_DESTROY:
+Win32Window::MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) noexcept {
+    switch (uMsg) {
+        case WM_DESTROY: {
             window_handle_ = nullptr;
             Destroy();
             if (quit_on_close_) {
                 PostQuitMessage(0);
             }
             return 0;
+        }
 
         case WM_DPICHANGED: {
-            auto newRectSize = reinterpret_cast<RECT *>(lparam);
+            auto newRectSize = reinterpret_cast<RECT *>(lParam);
             LONG newWidth = newRectSize->right - newRectSize->left;
             LONG newHeight = newRectSize->bottom - newRectSize->top;
-
-            SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth,
-                         newHeight, SWP_NOZORDER | SWP_NOACTIVATE);
-
+            SetWindowPos(hWnd, nullptr, newRectSize->left, newRectSize->top, newWidth,newHeight, SWP_NOZORDER | SWP_NOACTIVATE);
             return 0;
         }
+
         case WM_SIZE: {
-            RECT rect = GetClientArea();
+            auto rect = GetClientArea();
             if (child_content_ != nullptr) {
-                // Size and position the child window.
-                MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left,
-                           rect.bottom - rect.top, TRUE);
+                MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left,rect.bottom - rect.top, TRUE);
             }
-            return 0;
+            return DefWindowProc(child_content_, uMsg, wParam, lParam);
         }
 
-        case WM_ACTIVATE:
+        case WM_ACTIVATE: {
             if (child_content_ != nullptr) {
                 SetFocus(child_content_);
             }
             return 0;
         }
 
-    return DefWindowProc(window_handle_, message, wparam, lparam);
+        default:
+            return DefWindowProc(window_handle_, uMsg, wParam, lParam);
+        }
     }
 
 void Win32Window::Destroy() {
@@ -225,8 +225,7 @@ void Win32Window::SetChildContent(HWND content) {
     SetParent(content, window_handle_);
     RECT frame = GetClientArea();
 
-    MoveWindow(content, frame.left, frame.top, frame.right - frame.left,
-               frame.bottom - frame.top, true);
+    MoveWindow(content, frame.left, frame.top, frame.right - frame.left,frame.bottom - frame.top, true);
 
     SetFocus(child_content_);
 }