I have merged this as is because:
1. It works for me and others
2. The remaining issues appear to only be stylistic in code and manual, they can be fixed later if "somebody" is interested enough
3. those who understand accessibility issues will understand that colour perception issues affect a significant proportion of the population, who have been unable to use dark themes due to hard coded colours whilst we bickered about code style