First cleanup of style and themes