Added Rebels and Jedi Frame and Template