Some fixes for Marine theme

Added .servicemsg item
removed/fixed crappy stuff