Colors, JS cleanup