Swap files, finishing touches

Make some changes to the Stylesheet, and change the file names