separated theme and default