diff --git a/boxes-config b/boxes-config
index 9b34c7f..b840a39 100644
--- a/boxes-config
+++ b/boxes-config
@@ -3,7 +3,7 @@
 #   Date created:     March 17, 1999 (Wednesday, 17:02h)
 #   Author:           Thomas Jensen
 #                     tsjensen@stud.informatik.uni-erlangen.de
-#   Version:          $Id: boxes-config,v 1.13 1999/08/16 16:24:32 tsjensen Exp tsjensen $
+#   Version:          $Id: boxes-config,v 1.14 1999/08/18 15:34:38 tsjensen Exp tsjensen $
 #   Format:           ASCII Text
 #   World Wide Web:   http://home.pages.de/~jensen/boxes/
 #   Purpose:          Example configuration file for the boxes program
@@ -82,7 +82,7 @@ shapes {
     ese ()
 }
 
-padding { top 1 }
+padding { top 1 h 1 }
 
 elastic (n,e,s,w)
 
@@ -232,8 +232,8 @@ END scroll
 BOX simple
 
 author "Thomas Jensen <tsjensen@stud.informatik.uni-erlangen.de>"
-revision "1.0"
-revdate "March 18, 1999 (Thursday, 15:24h)"
+revision "1.1"
+revdate "August 22, 1999 (Sunday, 12:44h)"
 created "March 18, 1999 (Thursday, 15:24h)"
 
 sample
@@ -247,6 +247,8 @@ shapes { nw ("*") ne ("*") sw ("*") se ("*")
          n  ("*") e  ("*") s  ("*") w  ("*")
 }
 
+padding { horiz 1 }
+
 elastic (n,e,s,W)
 
 END simple
@@ -324,8 +326,8 @@ END c-cmt2
 BOX html
 
 author "Thomas Jensen <tsjensen@stud.informatik.uni-erlangen.de>"
-revision "1.0"
-revdate "March 18, 1999 (Thursday, 15:26h)"
+revision "1.1"
+revdate "August 22, 1999 (Sunday, 12:48h)"
 created "March 18, 1999 (Thursday, 15:26h)"
 
 sample
@@ -337,12 +339,16 @@ sample
 ends
 
 shapes {
-    nw ("<!-- ") n ("-") ne (" -->")
-     w ("<!-- ")          e (" -->")
-    sw ("<!-- ") s ("-") se (" -->")
+    nw ("<!--") nnw (" ") n ("-") nne (" ") ne ("-->")
+     w ("<!--")                              e ("-->")
+    sw ("<!--") ssw (" ") s ("-") sse (" ") se ("-->")
 }
 
-replace "-->" with "-\\-\\>"
+padding { h 1 }
+
+delim ?"
+replace "-->" with "-\-\>"
+reverse "-\\-\\>" to "-->"
 
 elastic (n,e,s,w)
 
@@ -373,6 +379,8 @@ shapes {
     ne ("#") w ("#")
 }
 
+padding { h 1 }
+
 elastic (n,s,e, w)
 
 END shell
@@ -384,8 +392,8 @@ END shell
 BOX nuke
 
 author "Joan G. Stark <spunk1111@juno.com>"
-revision "1.0"
-revdate "March 30, 1999 (Tuesday, 15:55h)"
+revision "1.1"
+revdate "August 22, 1999 (Sunday, 12:51h)"
 created "March 30, 1999 (Tuesday, 15:55h)"
 
 sample
@@ -403,10 +411,10 @@ sample
 ends
 
 shapes {
-    nw  (" "," "," "," "," "," "," "," ","|")
-    ne  (" "," "," "," "," "," "," "," ","|")
-    nnw (" "," "," "," "," "," "," ","_"," ")
-    nne (" "," "," "," "," "," "," ","_"," ")
+    nw  (" "," "," "," "," "," "," "," ")
+    ne  (" "," "," "," "," "," "," "," ")
+    nnw (" "," "," "," "," "," "," ","_")
+    nne (" "," "," "," "," "," "," ","_")
     n   ("      _ ._  _ , _ ._     ",
          "    (_ ' ( `  )_  .__)   ",
          "  ( (  (    )   `)  ) _) ",
@@ -414,12 +422,16 @@ shapes {
          "     `~~`\\ ' . /`~~`     ",
          "     ,::: ;   ; :::,     ",
          "    ':::::::::::::::'    ",
-         "jgs______/_ __ \\_________",
-         "                         ")
+         "jgs______/_ __ \\_________")
     w   ("|")              e ("|")
     sw  ("|")   s ("_")   se ("|")
 }
 
+padding {
+    all 1
+    bottom 0
+}
+
 elastic (nne,nnw, s, e, w)
 
 END nuke
@@ -472,16 +484,26 @@ shapes {
     w   (: /\   :, ://\\  :, :\\//  :, : \/   :)
     wsw (: /\   :, ://\\/\:)
 
-    sw  (:\\///\:, : \/\\/:, :    \/:, :      :)
-    ssw (:\/\//\\\:, ://\\\//\:, :\\//\/  :, : \/     :)
+    sw  (:\\///\:,
+         : \/\\/:,
+         :    \/:,
+         :      :)
+
+    ssw (:\/\//\\\:,
+         ://\\\//\:,
+         :\\//\/  :,
+         : \/     :)
+
     s   (:///\\/\//\\\:,
          :/\\///\\\//\:,
          :  \/\\//\/  :,
          :     \/     :)
+
     sse (:///\\/\/:,
          :/\\///\\:,
          :  \/\\//:,
          :     \/ :)
+
     se  (:/\\\//:,
          :\//\/ :,
          :\/    :,
@@ -499,8 +521,8 @@ END diamonds
 BOX mouse
 
 author "Joan G. Stark <spunk1111@juno.com>"
-revision "1.0"
-revdate "March 18, 1999 (Thursday, 15:27h)"
+revision "1.1"
+revdate "August 22, 1999 (Sunday, 12:57h)"
 created "March 18, 1999 (Thursday, 15:27h)"
 
 sample
@@ -521,22 +543,23 @@ sample
 ends
 
 shapes {
-    nnw (" ", " ", " ", " ", " ", "_", " ")
-    nne (" ", " ", " ", " ", " ", "_", " ")
-    ne  (" ", " ", " ", " ", " ", " ", "\\")
-    nw  (" ", " ", " ", " ", " ", " ", "/")
+    nnw (" ", " ", " ", " ", " ", "_")
+    nne (" ", " ", " ", " ", " ", "_")
+    ne  (" ", " ", " ", " ", " ", " ")
+    nw  (" ", " ", " ", " ", " ", " ")
 
-    sw ("\\", " ", " ")
-    se ("/", " ", " ")
-    e  ("/","\\")
-    w  ("\\","/")
+    sw  ("\\", " ", " ")
+    se  ("/", " ", " ")
+    ene ("\\")
+    wnw ("/")
+    e   ("/","\\")
+    w   ("\\","/")
     n (" .--,       .--, ",
        "( (  \\.---./  ) )",
        " '.__/o   o\\__.' ",
        "    {=  ^  =}    ",
        "     >  -  <     ",
-       "_.\"\"`-------`\"\"._",
-       "                 ")
+       "_.\"\"`-------`\"\"._")
 
     s ("_____________",
        " ___)( )(___ ",
@@ -548,6 +571,11 @@ shapes {
 
 elastic (nne,nnw, sse,ssw, e, w)
 
+padding {
+    top 1
+    horiz 1
+}
+
 END mouse
 
 
@@ -606,8 +634,8 @@ END sunset
 BOX boy
 
 author "Joan G. Stark <spunk1111@juno.com>"
-revision "1.0"
-revdate "April 02, 1999 (Friday, 15:02h)"
+revision "1.1"
+revdate "August 22, 1999 (Sunday, 13:02h)"
 created "April 02, 1999 (Friday, 15:02h)"
 
 sample
@@ -636,16 +664,17 @@ shapes {
     se  ("/ ", "  ", "  ", "  ", "  ", "  ", "  ")
     ssw ("_", " ", " ", " ", " ", " ", " ")
     sse ("_", " ", " ", " ", " ", " ", " ")
-    nw  ("  ", "  ", "  ", "  ", "  ", " /")
-    nnw (" ", " ", " ", " ", "_", " ") 
-    nne (" ", " ", " ", " ", "_", " ") 
-    ne ("  ", "  ", "  ", "  ", "  ", "\\ ")
+    nw  ("  ", "  ", "  ", "  ", "  ")
+    nnw (" ", " ", " ", " ", "_") 
+    nne (" ", " ", " ", " ", "_") 
+    ne ("  ", "  ", "  ", "  ", "  ")
+    ene ("\\ ")
+    wnw (" /")
     n ("     .-\"\"\"-.     ",
        "    / .===. \\    ",
        "    \\/ 6 6 \\/    ",
        "    ( \\___/ )    ",
-       "ooo__\\_____/_____",
-       "                 ")
+       "ooo__\\_____/_____")
     s ("______________ooo",
        "     |  |  |     ",
        "     |_ | _|     ",
@@ -655,6 +684,8 @@ shapes {
        "    (__/ \\__)    ")
 }
 
+padding { top 1 }
+
 #elastic (n,s,e, w)        # then I'd have to call this "boys"
 elastic (nne,nnw, sse,ssw, e, w)
 
@@ -740,7 +771,6 @@ SAmple
      *      b     barfoo mode (0 == off)
      *
      *  Memory will be allocated for the result.
-     *  Should only be called for lines of length > 0;
      *
      *  RETURNS:  Success: Pointer to result line
      *            Error:   0       (e.g. out of memory)
@@ -1154,6 +1184,7 @@ shapes {
          "    |//  ")
     se  (" \\ |/ / ",
          "^^^^^^^^^")
+
     s   ("\   \./    \",
          "^^^^^^^^^^^^")
 }
@@ -1234,10 +1265,11 @@ ends
 
 shapes {
     nw ("=") ne ("=") nne ("-") N ("-=")
-    e  ("^")  w ("^")
+    e  ("^")                     w ("^")
     sw ("=") ssw ("-") s ("=-") se ("=")
 }
 
+padding {h 1}
 elastic (n,s,e, w)
 
 END stark1
@@ -1279,6 +1311,7 @@ shapes {
 }
 
 replace "\\*/" with "*\\/"               # quote closing comment tags
+reverse "\\*\\\\/" to "*/"
 
 elastic (n,e,s,w)
 
@@ -1606,8 +1639,8 @@ END retest
 BOX headline
 
 author "Thomas Jensen <tsjensen@stud.informatik.uni-erlangen.de>"
-revision "1.0"
-revdate "March 18, 1999 (Thursday, 15:25h)"
+revision "1.2"
+revdate "August 22, 1999 (Sunday, 13:22h)"
 created "March 18, 1999 (Thursday, 15:25h)"
 
 sample
@@ -1623,8 +1656,10 @@ shapes {
     sw ("/*") s ("*") se ("*/")
 }
 
-replace "(.)" with "\\1 "
-reverse "(.) " to "\\1"
+replace "^( *)([^ ])" with "\\1\\2 "
+replace "([^ ])  ([^ ])" with "\\1   \\2"
+reverse "^( *)([^ ]*) " to "\\1\\2"       # \1 to leave indentation untouched
+reverse "([^ ])  ([^ ])" to "\\1 \\2"
 
 padding {
     left 2