I've updated my local copy so that the script name is set in page.php ($php_self), and the templates have been updated to use <?echo $php_self?> instead of just page.php. I'd like to make it automatic, but it's kind of a pain to $HTTP_SERVER_VARs['PHP_SELF'] isn't just the script name itself, and may have extra stuff after the filename.

Adrian