changed colour scheme
A fix for JSON error in i3bar I believe, not like I tested or anything
re-organised stuff