Closes #96: Fix themes