Prepare themes for issue #210