Moved themes into separate folder, added candy theme