Addressed review comments

 - moved colors from category to theme manager