fix regex and add g and b colour codes