Adding fixes from original theme v1...