Cleanup and implement new features

SystemUI replacement?, nope, this is way better!