Fixed ... and Original Theme