Fix integration styles

Fix issues #6, #7, #8, #10 and #13