A little cleanup, but still no backlight
Resolve small merge conflict