Restructure like Soda theme and add FlatlandB optional theme variant