Added more colors to change from theme options + other improvments