--- node.tpl.php.orig	Tue Jul 18 11:14:47 2006
+++ node.tpl.php	Tue Jul 18 11:11:48 2006
@@ -4,7 +4,9 @@
   <?php endif; ?>
   <?php print $picture ?>
     <div class="info-top"></div>
-    <div class="info">Posted On: <?php print $date ?> by <?php print $name ?></div>
+    <?php if (theme_get_setting('toggle_node_info_' . $node->type) == 1): ?>
+      <div class="info">Posted On: <?php print $date ?> by <?php print $name ?></div>
+    <?php endif; ?>
     <div class="content">
       <?php print $content ?>
     </div>
@@ -14,5 +16,7 @@
     <?php endif; ?>
     <div class="links"><?php print $links ?></div>
   <?php endif; ?>
-  <div class="terms">( categories: <?php print $terms ?> )</div>
+  <?php if ($terms): ?>
+    <div class="terms">( categories: <?php print $terms ?> )</div>
+  <?php endif; ?>
 </div>