Can't change notification sounds

I can't seem to change the notification sounds for individual apps like calendar reminders and Gmail notifications. When I choose "select ringtone" from the settings of the app in question, it only gives me 2 options: "Music" and "Theme Manager". I want to use system sounds so Music isn't an option for me, and Theme Manager only seems to set the default notification ringtone, and doesn't set the one for Gmail or Calendar. What this results in is no sound when a calendar reminder fires, or when I get a new email.

Is it just me? Has the "Android System" option been removed from the notification sound choosing options?