Refactoring of Styles. Still buggy

Author His Dad <John@hisdad.org>
Author date 2016-02-17 05:16:13
Author local date 2016-02-17 18:16:13 +1300
Committer His Dad <John@hisdad.org>
Committer date 2016-02-17 05:16:13
Committer local date 2016-02-17 18:16:13 +1300
Commit 0c7b32755e13473f7e8cbb67f7d144b6a4b7bf02
Tree 292cef5d9b63cb8000959a8053506fe0c237841c
Parent d0833a6f787ef506adc324a4108824c614e3eb54
Refactoring of Styles. Still buggy