#988 Theme improvements. Less files.