update theme
fixes merge