Update content
Remove underscores from stylesheet filenames
Implement more content expansion