Continue comment blocks where appropriate... A bunch of refactoring of text/indent code to expand further
Theme is not there as it should be manually merged into the elementary default theme.