Revert "Revert "Merge branch 'NewGui' into UntitledLauncher""

This reverts commit a7254f6d939af5e889a83a86b305418b7b7a5898.
Stuff and things!
Revert "Revert "Revert "Merge branch 'NewGui' into UntitledLauncher"""

This reverts commit 65c25319d02da04c9acdf348be0886b36072fa13.
i will do this later