Layout rework, blue -> dark theme