fix regex error and new colors