fixed color choosing if-statement, changed theme