Added X-F-P prefixes to DSL package, more cleanup, added CSS integration test