Spell categories correctly
Move locations logic for desktops into partial
Move locations for desktop to partial