Moved SurfaceTheme into it's own folder.