More Theme Changes

Still not finished.