Some fixes

Added .servicemsg item
removed/fixed crappy stuff
Merge pull request #275 from MellonQ/master

Some fixes for Marine theme