Added infrastructure for dark theme