Further theme updates