diff --git a/ccid/README.dox b/ccid/README.dox
index 6b75b19..e140f82 100644
--- a/ccid/README.dox
+++ b/ccid/README.dox
@@ -68,10 +68,4 @@ Questions
 
 For questions, please use http://sourceforge.net/projects/vsmartcard/support
 
-=========
-API index
-=========
-
-.. doxygenindex::
-
 .. @author Frank Morgner <morgner@informatik.hu-berlin.de>
diff --git a/doc/index.rst b/doc/index.rst
index 9e1941c..69b4631 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -13,12 +13,11 @@ Currently the following projects are part of vsmartcard:
 Contents:
 
 .. toctree::
-   :maxdepth: 3 
 
-   ccid
-   npa
-   pcsc-relay
    virtualsmartcard
+   pcsc-relay
+   npa
+   ccid
 
 Download
 ========
diff --git a/npa/README.dox b/npa/README.dox
index 99335d9..0c34e2f 100644
--- a/npa/README.dox
+++ b/npa/README.dox
@@ -1,3 +1,5 @@
+.. highlight:: c
+
 ***
 npa
 ***
@@ -6,7 +8,7 @@ Welcome to npa. The purpose of npa is to offer an easy to use API for the new
 German identity card (neuer Personalausweis, nPA). The library also implements
 secure messaging, which could also be used for other cards.
 
-npa is implemented using OpenPACE 0.6 (http://sourceforge.net/projects/openpace/).
+npa is implemented using `OpenPACE 0.6 <http://sourceforge.net/projects/openpace/>`_.
 Some fragments of the source code are based on the source code of the OpenSC tools.
 
 The included npa-tool has support for Password Authenticated Connection