Refactored SoundTheme.

Signed-off-by: Rob Caelers <rob.caelers@gmail.com>