Fixes #569

It is a good idea to integrate this one. Besides adding two more themes, it also fixes a newly introduced bug in next that results in dual config files being written.