Match screen and stylesheet name; add screen test
Merge pull request #1 from squidpunch/tweaks

Match screen and stylesheet name; add screen test