Merge branch 'master' of https://github.com/MaritalWheat/homebase

mergin upstream
Merge branch 'master' of https://github.com/MaritalWheat/homebase

merging upstream
colors bro
Merge pull request #53 from pcsmits/master

UI tweak