Issue 734

Fixes #734. If this works we can add this to all the other themes.