Pull in upstream's stuff, drop light theme

They did a big refactor and I just dropped the light theme instead of porting
it over.
-----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAAEoAAAAac2stc3NoLWVkMjU1MTlAb3BlbnNzaC5jb20AAAAgzEkAhr
f0dc6ZiSJXHc/mDhl7rRRGcNCSuENi7R/pfKkAAAAEc3NoOgAAAANnaXQAAAAAAAAABnNo
YTUxMgAAAGcAAAAac2stc3NoLWVkMjU1MTlAb3BlbnNzaC5jb20AAABA04d0OFqR+RZDeO
sGzgxRjmj9yiSv4pMCzjLvCVyN3Xd+qanWib3u2Ud9LTESyHzLH6sgvu9piqr/2IiAoZIM
AwEAAL9l
-----END SSH SIGNATURE-----