Update theme for window mode
Fix html mail issue