Improvements in the darker theme