I have the exact same problem, but with a twist. When i revert to the original joomla template it lines up just fine. Then i tried following the documentation and copying the folder into my template folder to override my custom template....
More