Restructure classes
Match colors