OK, I think I got it fixed. Gotta get those themes cleaned up but it will have to wait until tomorrow.