Fix bug with arrow switching of themes