made the cursor and selection independent from the theme