Integrate with Page Title - do not override the head_title is Page Title is present.

I could use some help fixing the Waffles Theme for this module. I looked at the 'template.php' file and it seemed to be missing the code from the 'readme.txt' file included with the module. Yet under the configuration for the theme there is a page title setting, however it seems to ignore this module. Furthermore it seems NOT to be open to the 'available tokens list' options, using either brackets [] or not.

One possible fix I attempted was to place the code from the 'readme.txt' file in to the waffles 'template.php' file, however that did not seem to affect it one way or the other.

What I did notice is that in the waffles 'template.php' file around line 224-282, it does it's own thing for the page title display. Should these lines be commented or deleted out and instead include the code from the readme.txt file that states

function _phptemplate_variables($hook, $vars) {
$vars = array();
if ($hook == 'page') {

// These are the only important lines
if (module_exists('page_title')) {
$vars['head_title'] = page_title_page_get_title();
}

}
return $vars;
}

The only other issue is that the waffles theme 'template.php' file references and insists that the exact variables be used in the 'theme-setting.php' file. Should these lines dealing with the page title be removed (lines 28-31)? and how should lines 651, 656, 664, 668, 678, 683, 692, 696 be altered in the 'theme-setting.php' file?

Thanks very much for your help?