Moved hardcoded values to params, fixed up colour issues