diff --git a/edn-impl.scm b/edn-impl.scm
index f3a9f79..3d46d0e 100644
--- a/edn-impl.scm
+++ b/edn-impl.scm
@@ -153,12 +153,12 @@
     (and (char? x)
 	 (fun x))))
 
-;;@(heading "Reading EDN")
+@(==== "Reading EDN")
 
 (define tag-handlers 
-;;@("An a-list containing the handlers for reader tags. You can register your own reader tags by simply adding a new a-list entry.
-;;
-;;Example for a tag \"#keywordify\": add the entry `(cons keywordify: keywordify-procedure)`.")
+@("An a-list containing the handlers for reader tags. You can register your own reader tags by simply adding a new a-list entry.
+
+Example for a tag \"#keywordify\": add the entry `(cons keywordify: keywordify-procedure)`.")
   (list (cons _:  (lambda (input) edn/omit:))))
 
 (define reader-handlers
@@ -204,7 +204,7 @@
 	    (cdr result)))))
 
 (define (read-edn port)
-;;  @("Reads EDN data from given port, converts it to Chicken data and returns it. Precision suffixes for numbers get ignored, maps get converted to SRFI-69 hashtables, vectors to SRFI-4 vectors.")
+@("Reads EDN data from given port, converts it to Chicken data and returns it. Precision suffixes for numbers get ignored, maps get converted to SRFI-69 hashtables, vectors to SRFI-4 vectors.")
   (second ((parse-edn '()) port)))
 
 ;; EDN writing
@@ -309,9 +309,9 @@
 	  writer-handlers))
    parse-entry in))
 
-;;@(heading "Writing EDN")
+@(==== "Writing EDN")
 
 (define (write-edn port struct)
-;;  @("Converts Chicken data structures to EDN and writes it to the given port."
-;;    (struct "A Chicken data structure consisting of atoms, lists, vectors and hashtables."))
+  @("Converts Chicken data structures to EDN and writes it to the given port."
+    (struct "A Chicken data structure consisting of atoms, lists, vectors and hashtables."))
     (display (parse-entry struct) port))
diff --git a/edn.egg b/edn.egg
index 59ca84d..a5571a2 100644
--- a/edn.egg
+++ b/edn.egg
@@ -5,9 +5,9 @@
  (category parsing)
  (license "BSD")
  (version "0.5.2")
- (dependencies r7rs srfi-69 srfi-1 hahn)
- (test-dependencies r7rs srfi-64 hahn)
+ (dependencies r7rs srfi-69 srfi-1 chalk)
+ (test-dependencies r7rs srfi-64 chalk)
  (components (extension edn
 			(modules edn)
-			(csc-options "-X" "r7rs" "-R" "r7rs" "-X" "hahn")
+			(csc-options "-X" "r7rs" "-R" "r7rs" "-X" "chalk")
 			)))
diff --git a/edn.release-info b/edn.release-info
index 8d5a7e7..7452c3e 100644
--- a/edn.release-info
+++ b/edn.release-info
@@ -1,3 +1,4 @@
 (repo git "https:///gitea.lyrion.ch/zilti/edn.git")
 (uri targz "https://gitea.lyrion.ch/zilti/edn/archive/{egg-release}.tar.gz")
-(release "0.5.2")
+(release "0.5.3") ;; Replaced Hahn with Chalk
+(release "0.5.2") ;; Update for Chicken 5
diff --git a/edn.scm b/edn.scm
index b96c4de..5c4aeeb 100644
--- a/edn.scm
+++ b/edn.scm
@@ -1,9 +1,8 @@
-@(heading "EDN")
+@(== "EDN")
 
-@(text "This egg provides a parser and a writer for the [[https://github.com/edn-format/edn|Extensible Data Notation]].")
+@("This egg provides a parser and a writer for the [[https://github.com/edn-format/edn|Extensible Data Notation]].")
 
-@(heading "Documentation")
-@(noop)
+@(==="Documentation")
 
 (import r7rs)
 (define-library (edn)