More categories and color cleanup

Added more categories and cleaned up colors