Much better consistency of style. Still very much unfinished.
Finished re-establishing the basics. Easy to redesign once we have a designer
Merge branch 'master' of https://github.com/Sloth6/Beacon