Merge with master

Colors and some hardcoding fixed.