Finished less bugfixing
Put colors, borders in variables
Define more colors, substitutions, cleanup