fixed empty theme handling
minor scaffold improvements