Some theme css updates regarding #483