Theme fixing