Grey theme, cleanup