Fixes theme selection