[Sync] Project Sync. Thanks Project Goblin

Many thanks to LfxGroove and Daniel S. Reichenbach
- Changes were based on their MangosZero Commits