You could try setting up a test site of a clean v1.5.4 with a copy of your database and set the database settings and path in the two configure.php files to see if things work correctly with the Classic Template ...

If all works correctly, then install your template and test the test site with your template and see if this corrects the problems ...