Enhanced theme switcher and added line number options