Fixed Default theme appearing twice in ST2. Function changes for upcoming feature