Changed to flexbox based theme