Fix Dark UI toggle merge