Added Bioncle Themes (SOUND!) & refactored some code