updated theme fixes