Update and fix theme