Basic Colors, Padding Adjustments, Logo
Background for desktop sidebar, font updates
typography, sidebar padding adjustments
resolved conflicts