Fix Dark/Black themes