Restyling + removed obsolete color stuff