diff --git a/m2ebook-content/src/main/resources/appendix-contribute.xml b/m2ebook-content/src/main/resources/appendix-contribute.xml
index 4560bb6..cf3c00d 100644
--- a/m2ebook-content/src/main/resources/appendix-contribute.xml
+++ b/m2ebook-content/src/main/resources/appendix-contribute.xml
@@ -285,11 +285,6 @@ $ <command>mvn clean install</command>
         <filename>m2ebook-pdf/target</filename></para>
       </listitem>
 
-      <listitem>
-        <para>The m2eclipse Book ePub can be found in
-        <filename>m2ebook-epub/target</filename></para>
-      </listitem>
-
       <listitem>
         <para>The m2eclipse Book HTML can be found in
         <filename>m2ebook-html/target</filename></para>
@@ -343,20 +338,8 @@ $ <command>mvn clean install</command>
           <filename>src/main/resources</filename>.</para>
         </listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term>m2ebook-epub</term>
-
-        <listitem>
-          <para>This project contains the ePub-specific XSL stylesheets. The
-          ePub specific stylesheets can be found in
-          <filename>src/main/resources</filename>.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>m2ebook-site</term>
-
         <listitem>
           <para>This project combines all of the book projects into a single,
           deployable site and is only meant to be published by internal
diff --git a/m2ebook-epub/pom.xml b/m2ebook-epub/pom.xml
deleted file mode 100644
index 995fa9e..0000000
--- a/m2ebook-epub/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.m2eclipsebook</groupId>
-    <artifactId>m2ebook-parent</artifactId>
-    <version>1.4-SNAPSHOT</version>
-  </parent>
-  <artifactId>m2ebook-epub</artifactId>
-  <packaging>jar</packaging>
-  <name>m2eclipse Book ePub Rendering Project</name>
-  <description>A book about m2eclipse</description>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>epub-custom.xsl</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.cjcook</groupId>
-        <artifactId>docbook-plugin</artifactId>
-        <version>1.0</version>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <escapeString>\</escapeString>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-        <version>${docbkx-tools.version}</version>
-        <!-- <dependencies> <dependency> <groupId>docbook</groupId> <artifactId>docbook-xml</artifactId> 
-          <version>4.5</version> </dependency> </dependencies> -->
-        <executions>
-          <execution>
-            <id>generate-epub</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>generate-epub</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <sourceDirectory>${basedir}/target/docbook</sourceDirectory>
-          <targetDirectory>${basedir}/target/epub</targetDirectory>
-          <includes>book-m2e.xml</includes>
-          <xincludeSupported>true</xincludeSupported>
-          <bookFile>${project.build.directory}/book-m2e.epub</bookFile>
-          <htmlStylesheet>epub-custom.css</htmlStylesheet>
-          <epubCustomization>${basedir}/src/main/resources/epub-custom.xsl</epubCustomization>
-          <postProcess>
-            <!-- Copy the images -->
-            <copy todir="${project.build.directory}/epub/figs/web">
-              <fileset dir="target/docbook/figs/web" />
-            </copy>
-            <copy todir="${project.build.directory}/epub/covers">
-              <fileset dir="target/docbook/covers" />
-            </copy>
-            <copy todir="${project.build.directory}/epub" file="src/main/resources/epub-custom.css" />
-          </postProcess>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>m2ebook-content</artifactId>
-                  <version>${project.version}</version>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${basedir}/target/docbook</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <classesDirectory>${basedir}/target/epub</classesDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>install-epub</id>
-            <phase>install</phase>
-            <goals>
-              <goal>install-file</goal>
-            </goals>
-            <configuration>
-              <file>${basedir}/target/epub/book-m2e.epub</file>
-              <groupId>${groupId}</groupId>
-              <artifactId>${artifactId}</artifactId>
-              <version>${version}</version>
-              <packaging>epub</packaging>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>m2ebook-content</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/m2ebook-epub/src/main/resources/epub-custom.css b/m2ebook-epub/src/main/resources/epub-custom.css
deleted file mode 100644
index 723ffd7..0000000
--- a/m2ebook-epub/src/main/resources/epub-custom.css
+++ /dev/null
@@ -1,7 +0,0 @@
-pre {
-	font-size: 75%;
-}
-
-code {
-	font-size: 85%;
-}
\ No newline at end of file
diff --git a/m2ebook-epub/src/main/resources/epub-custom.xsl b/m2ebook-epub/src/main/resources/epub-custom.xsl
deleted file mode 100644
index 6e1aade..0000000
--- a/m2ebook-epub/src/main/resources/epub-custom.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-    <xsl:import href="urn:docbkx:stylesheet"/>
-
-    <!-- Generate the TOCs for named components only -->
-    <xsl:param name="generate.toc">
-        book toc
-    </xsl:param>
-
-    <!-- Show only Sections up to level 3 in the TOCs -->
-    <xsl:param name="toc.section.depth">0</xsl:param>
-
-
-</xsl:stylesheet>
diff --git a/m2ebook-epub/src/main/resources/images/annot-close.png b/m2ebook-epub/src/main/resources/images/annot-close.png
deleted file mode 100644
index b9e1a0d..0000000
Binary files a/m2ebook-epub/src/main/resources/images/annot-close.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/annot-open.png b/m2ebook-epub/src/main/resources/images/annot-open.png
deleted file mode 100644
index 71040ec..0000000
Binary files a/m2ebook-epub/src/main/resources/images/annot-open.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/blank.png b/m2ebook-epub/src/main/resources/images/blank.png
deleted file mode 100644
index 764bf4f..0000000
Binary files a/m2ebook-epub/src/main/resources/images/blank.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/1.gif b/m2ebook-epub/src/main/resources/images/callouts/1.gif
deleted file mode 100644
index 9e7a87f..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/1.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/1.png b/m2ebook-epub/src/main/resources/images/callouts/1.png
deleted file mode 100644
index 7d47343..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/1.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/1.svg b/m2ebook-epub/src/main/resources/images/callouts/1.svg
deleted file mode 100644
index e2e87dc..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/1.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M10.428,10.411h0.56c3.78,0,4.788-1.96,4.872-3.444h3.22v19.88h-3.92V13.154h-4.732V10.411z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/10.gif b/m2ebook-epub/src/main/resources/images/callouts/10.gif
deleted file mode 100644
index e80f7f8..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/10.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/10.png b/m2ebook-epub/src/main/resources/images/callouts/10.png
deleted file mode 100644
index 997bbc8..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/10.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/10.svg b/m2ebook-epub/src/main/resources/images/callouts/10.svg
deleted file mode 100644
index 4740f58..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/10.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.815,10.758h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.11H3.815V10.758z"/>
-		<path style="fill:#FFFFFF;" d="M22.175,7.806c4.009,0,5.904,2.76,5.904,8.736c0,5.975-1.896,8.76-5.904,8.76
-			c-4.008,0-5.904-2.785-5.904-8.76C16.271,10.566,18.167,7.806,22.175,7.806z M22.175,22.613c1.921,0,2.448-1.68,2.448-6.071
-			c0-4.393-0.527-6.049-2.448-6.049c-1.92,0-2.448,1.656-2.448,6.049C19.727,20.934,20.255,22.613,22.175,22.613z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/11.gif b/m2ebook-epub/src/main/resources/images/callouts/11.gif
deleted file mode 100644
index 67f91a2..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/11.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/11.png b/m2ebook-epub/src/main/resources/images/callouts/11.png
deleted file mode 100644
index ce47dac..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/11.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/11.svg b/m2ebook-epub/src/main/resources/images/callouts/11.svg
deleted file mode 100644
index 09a0b2c..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/11.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M5.209,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H5.209V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M18.553,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.359V12.764h-4.056V10.412z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/12.gif b/m2ebook-epub/src/main/resources/images/callouts/12.gif
deleted file mode 100644
index 54c4b42..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/12.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/12.png b/m2ebook-epub/src/main/resources/images/callouts/12.png
deleted file mode 100644
index 31daf4e..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/12.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/12.svg b/m2ebook-epub/src/main/resources/images/callouts/12.svg
deleted file mode 100644
index 9794044..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/12.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.813V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M17.316,13.484c0-5.545,4.056-6.024,5.568-6.024c3.265,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.553,5.544c-2.256,1.584-3.432,2.353-3.815,3.145h7.392V24.5h-11.64c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.353-2.424c-2.352,0-2.423,1.944-2.447,3.192H17.316z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/13.gif b/m2ebook-epub/src/main/resources/images/callouts/13.gif
deleted file mode 100644
index dd5d7d9..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/13.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/13.png b/m2ebook-epub/src/main/resources/images/callouts/13.png
deleted file mode 100644
index 14021a8..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/13.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/13.svg b/m2ebook-epub/src/main/resources/images/callouts/13.svg
deleted file mode 100644
index 64268bb..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/13.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H3.813V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M20.611,14.636h0.529c1.008,0,2.855-0.096,2.855-2.304c0-0.624-0.288-2.185-2.137-2.185
-			c-2.303,0-2.303,2.185-2.303,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.279,0,5.279,1.152,5.279,4.752
-			c0,1.728-1.08,2.808-2.039,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.377,5.496-5.809,5.496
-			c-1.607,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.52-0.911,2.52-2.808
-			c0-2.328-2.256-2.424-3.816-2.424V14.636z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/14.gif b/m2ebook-epub/src/main/resources/images/callouts/14.gif
deleted file mode 100644
index 3d7a952..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/14.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/14.png b/m2ebook-epub/src/main/resources/images/callouts/14.png
deleted file mode 100644
index 64014b7..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/14.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/14.svg b/m2ebook-epub/src/main/resources/images/callouts/14.svg
deleted file mode 100644
index 469aa97..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/14.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.146,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.146V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M28.457,20.732h-1.896V24.5h-3.36v-3.768h-6.72v-2.904L22.746,7.46h3.815v10.656h1.896V20.732z
-			 M23.201,18.116c0-4.128,0.072-6.792,0.072-7.32h-0.048l-4.272,7.32H23.201z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/15.gif b/m2ebook-epub/src/main/resources/images/callouts/15.gif
deleted file mode 100644
index 1c9183d..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/15.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/15.png b/m2ebook-epub/src/main/resources/images/callouts/15.png
deleted file mode 100644
index 0d65765..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/15.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/15.svg b/m2ebook-epub/src/main/resources/images/callouts/15.svg
deleted file mode 100644
index 8202233..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/15.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.479,11.079h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.43H3.479V11.079z"/>
-		<path style="fill:#FFFFFF;" d="M19.342,14.943c0.625-0.433,1.392-0.937,3.048-0.937c2.279,0,5.16,1.584,5.16,5.496
-			c0,2.328-1.176,6.121-6.192,6.121c-2.664,0-5.376-1.584-5.544-5.016h3.36c0.144,1.391,0.888,2.326,2.376,2.326
-			c1.607,0,2.544-1.367,2.544-3.191c0-1.512-0.72-3.047-2.496-3.047c-0.456,0-1.608,0.023-2.256,1.223l-3-0.143l1.176-9.361h9.36
-			v2.832h-6.937L19.342,14.943z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/16.svg b/m2ebook-epub/src/main/resources/images/callouts/16.svg
deleted file mode 100644
index 01d6bf8..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/16.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H3.813V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M24.309,11.78c-0.097-0.96-0.721-1.633-1.969-1.633c-2.184,0-2.688,2.496-2.808,4.704L19.58,14.9
-			c0.456-0.624,1.296-1.416,3.191-1.416c3.529,0,5.209,2.712,5.209,5.256c0,3.72-2.28,6.216-5.568,6.216
-			c-5.16,0-6.168-4.32-6.168-8.568c0-3.24,0.432-8.928,6.336-8.928c0.695,0,2.641,0.264,3.48,1.104
-			c0.936,0.912,1.271,1.416,1.584,3.217H24.309z M22.172,16.172c-1.271,0-2.568,0.792-2.568,2.928c0,1.849,1.056,3.168,2.664,3.168
-			c1.225,0,2.353-0.936,2.353-3.239C24.62,16.868,23.229,16.172,22.172,16.172z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/17.svg b/m2ebook-epub/src/main/resources/images/callouts/17.svg
deleted file mode 100644
index 0a04c55..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/17.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.479,11.079h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.43H3.479V11.079z"/>
-		<path style="fill:#FFFFFF;" d="M27.838,11.006c-1.631,1.776-5.807,6.816-6.215,14.16h-3.457c0.36-6.816,4.632-12.24,6.072-13.776
-			h-8.472l0.072-2.976h12V11.006z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/18.svg b/m2ebook-epub/src/main/resources/images/callouts/18.svg
deleted file mode 100644
index 1cb891b..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/18.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.813V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M23.172,24.956c-4.392,0-5.904-2.856-5.904-5.185c0-0.863,0-3.119,2.592-4.319
-			c-1.344-0.672-2.064-1.752-2.064-3.336c0-2.904,2.328-4.656,5.304-4.656c3.528,0,5.4,2.088,5.4,4.44
-			c0,1.464-0.6,2.712-1.968,3.432c1.632,0.815,2.544,1.896,2.544,4.104C29.076,21.596,27.684,24.956,23.172,24.956z M23.124,16.916
-			c-1.224,0-2.4,0.792-2.4,2.64c0,1.632,0.936,2.712,2.472,2.712c1.752,0,2.424-1.512,2.424-2.688
-			C25.62,18.38,24.996,16.916,23.124,16.916z M25.284,12.26c0-1.296-0.888-2.112-1.968-2.112c-1.512,0-2.305,0.864-2.305,2.112
-			c0,1.008,0.744,2.112,2.185,2.112C24.516,14.372,25.284,13.484,25.284,12.26z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/19.svg b/m2ebook-epub/src/main/resources/images/callouts/19.svg
deleted file mode 100644
index e6fbb17..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/19.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.146,10.746h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.041h-3.36V13.097H4.146V10.746z"/>
-		<path style="fill:#FFFFFF;" d="M20.225,20.898v0.023c0.192,1.176,0.936,1.68,1.968,1.68c1.392,0,2.783-1.176,2.808-4.752
-			l-0.048-0.049c-0.768,1.152-2.088,1.441-3.24,1.441c-3.264,0-5.16-2.473-5.16-5.329c0-4.176,2.472-6.12,5.808-6.12
-			c5.904,0,6,6.36,6,8.76c0,6.601-3.12,8.736-6.192,8.736c-2.904,0-4.992-1.68-5.28-4.391H20.225z M22.434,16.553
-			c1.176,0,2.472-0.84,2.472-2.855c0-1.944-0.841-3.145-2.568-3.145c-0.864,0-2.424,0.433-2.424,2.88
-			C19.913,16.001,21.161,16.553,22.434,16.553z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/2.gif b/m2ebook-epub/src/main/resources/images/callouts/2.gif
deleted file mode 100644
index 94d42a3..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/2.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/2.png b/m2ebook-epub/src/main/resources/images/callouts/2.png
deleted file mode 100644
index 5d09341..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/2.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/2.svg b/m2ebook-epub/src/main/resources/images/callouts/2.svg
deleted file mode 100644
index 07d0339..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/2.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M9.668,12.328c0-6.469,4.732-7.028,6.496-7.028c3.808,0,6.833,2.24,6.833,6.271
-			c0,3.416-2.213,5.152-4.145,6.469c-2.632,1.848-4.004,2.744-4.452,3.668h8.624v3.472H9.444c0.14-2.324,0.308-4.76,4.62-7.896
-			c3.584-2.604,5.012-3.612,5.012-5.853c0-1.315-0.84-2.828-2.744-2.828c-2.744,0-2.828,2.269-2.856,3.725H9.668z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/20.svg b/m2ebook-epub/src/main/resources/images/callouts/20.svg
deleted file mode 100644
index ccbfd40..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/20.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M23.172,7.46c4.008,0,5.904,2.76,5.904,8.736c0,5.976-1.896,8.76-5.904,8.76
-			s-5.904-2.784-5.904-8.76C17.268,10.22,19.164,7.46,23.172,7.46z M23.172,22.268c1.92,0,2.448-1.68,2.448-6.071
-			c0-4.393-0.528-6.049-2.448-6.049s-2.448,1.656-2.448,6.049C20.724,20.588,21.252,22.268,23.172,22.268z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/21.svg b/m2ebook-epub/src/main/resources/images/callouts/21.svg
deleted file mode 100644
index 93ec53f..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/21.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M5.306,13.151c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392v2.976H5.114c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H5.306z"/>
-		<path style="fill:#FFFFFF;" d="M19.49,10.079h0.48c3.239,0,4.104-1.681,4.176-2.952h2.761v17.04h-3.361V12.431H19.49V10.079z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/22.svg b/m2ebook-epub/src/main/resources/images/callouts/22.svg
deleted file mode 100644
index f48c5f3..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/22.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M17.316,13.484c0-5.545,4.056-6.024,5.568-6.024c3.265,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.553,5.544c-2.256,1.584-3.432,2.353-3.815,3.145h7.392V24.5h-11.64c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.353-2.424c-2.352,0-2.423,1.944-2.447,3.192H17.316z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/23.svg b/m2ebook-epub/src/main/resources/images/callouts/23.svg
deleted file mode 100644
index 6624212..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/23.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M21.612,14.636h0.528c1.008,0,2.855-0.096,2.855-2.304c0-0.624-0.287-2.185-2.136-2.185
-			c-2.304,0-2.304,2.185-2.304,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.28,0,5.28,1.152,5.28,4.752
-			c0,1.728-1.08,2.808-2.04,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.377,5.496-5.809,5.496
-			c-1.607,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.521-0.911,2.521-2.808
-			c0-2.328-2.257-2.424-3.816-2.424V14.636z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/24.svg b/m2ebook-epub/src/main/resources/images/callouts/24.svg
deleted file mode 100644
index a3d5525..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/24.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H4.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H4.972z"/>
-		<path style="fill:#FFFFFF;" d="M30.124,20.732h-1.896V24.5h-3.36v-3.768h-6.72v-2.904L24.412,7.46h3.816v10.656h1.896V20.732z
-			 M24.868,18.116c0-4.128,0.071-6.792,0.071-7.32h-0.047l-4.272,7.32H24.868z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/25.svg b/m2ebook-epub/src/main/resources/images/callouts/25.svg
deleted file mode 100644
index 56614a9..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/25.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M20.676,14.276c0.624-0.433,1.393-0.937,3.049-0.937c2.279,0,5.16,1.584,5.16,5.496
-			c0,2.328-1.177,6.12-6.193,6.12c-2.664,0-5.375-1.584-5.543-5.016h3.36c0.144,1.392,0.889,2.327,2.376,2.327
-			c1.608,0,2.544-1.367,2.544-3.191c0-1.513-0.72-3.048-2.496-3.048c-0.455,0-1.607,0.023-2.256,1.224l-3-0.144l1.176-9.36h9.36
-			v2.832h-6.937L20.676,14.276z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/26.svg b/m2ebook-epub/src/main/resources/images/callouts/26.svg
deleted file mode 100644
index 56faeac..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/26.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M25.309,11.78c-0.097-0.96-0.721-1.633-1.969-1.633c-2.184,0-2.688,2.496-2.808,4.704L20.58,14.9
-			c0.456-0.624,1.296-1.416,3.191-1.416c3.529,0,5.209,2.712,5.209,5.256c0,3.72-2.28,6.216-5.568,6.216
-			c-5.16,0-6.168-4.32-6.168-8.568c0-3.24,0.432-8.928,6.336-8.928c0.695,0,2.641,0.264,3.48,1.104
-			c0.936,0.912,1.271,1.416,1.584,3.217H25.309z M23.172,16.172c-1.271,0-2.568,0.792-2.568,2.928c0,1.849,1.056,3.168,2.664,3.168
-			c1.225,0,2.353-0.936,2.353-3.239C25.62,16.868,24.229,16.172,23.172,16.172z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/27.svg b/m2ebook-epub/src/main/resources/images/callouts/27.svg
deleted file mode 100644
index a75c812..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/27.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M29.172,10.34c-1.632,1.776-5.808,6.816-6.216,14.16H19.5c0.36-6.816,4.632-12.24,6.072-13.776
-			H17.1l0.072-2.976h12V10.34z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/28.svg b/m2ebook-epub/src/main/resources/images/callouts/28.svg
deleted file mode 100644
index 7f8cf1a..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/28.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M23.172,24.956c-4.392,0-5.904-2.856-5.904-5.185c0-0.863,0-3.119,2.592-4.319
-			c-1.344-0.672-2.064-1.752-2.064-3.336c0-2.904,2.328-4.656,5.304-4.656c3.528,0,5.4,2.088,5.4,4.44
-			c0,1.464-0.6,2.712-1.968,3.432c1.632,0.815,2.544,1.896,2.544,4.104C29.076,21.596,27.684,24.956,23.172,24.956z M23.124,16.916
-			c-1.224,0-2.4,0.792-2.4,2.64c0,1.632,0.936,2.712,2.472,2.712c1.752,0,2.424-1.512,2.424-2.688
-			C25.62,18.38,24.996,16.916,23.124,16.916z M25.284,12.26c0-1.296-0.888-2.112-1.968-2.112c-1.512,0-2.305,0.864-2.305,2.112
-			c0,1.008,0.744,2.112,2.185,2.112C24.516,14.372,25.284,13.484,25.284,12.26z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/29.svg b/m2ebook-epub/src/main/resources/images/callouts/29.svg
deleted file mode 100644
index cb63adf..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/29.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M20.893,20.564v0.023c0.191,1.176,0.936,1.68,1.967,1.68c1.393,0,2.785-1.176,2.809-4.752
-			l-0.048-0.048c-0.769,1.152-2.088,1.44-3.24,1.44c-3.264,0-5.16-2.473-5.16-5.328c0-4.176,2.472-6.12,5.807-6.12
-			c5.904,0,6.001,6.36,6.001,8.76c0,6.601-3.12,8.736-6.192,8.736c-2.904,0-4.992-1.68-5.28-4.392H20.893z M23.1,16.22
-			c1.176,0,2.473-0.84,2.473-2.855c0-1.944-0.84-3.145-2.568-3.145c-0.863,0-2.424,0.433-2.424,2.88
-			C20.58,15.668,21.828,16.22,23.1,16.22z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/3.gif b/m2ebook-epub/src/main/resources/images/callouts/3.gif
deleted file mode 100644
index dd3541a..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/3.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/3.png b/m2ebook-epub/src/main/resources/images/callouts/3.png
deleted file mode 100644
index ef7b700..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/3.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/3.svg b/m2ebook-epub/src/main/resources/images/callouts/3.svg
deleted file mode 100644
index 918be80..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/3.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M15.127,14.005h0.616c1.176,0,3.332-0.112,3.332-2.688c0-0.728-0.336-2.548-2.492-2.548
-			c-2.688,0-2.688,2.548-2.688,3.248h-3.64c0-3.724,2.1-6.384,6.58-6.384c2.66,0,6.16,1.344,6.16,5.544
-			c0,2.016-1.261,3.276-2.38,3.78v0.056c0.699,0.196,2.996,1.232,2.996,4.62c0,3.752-2.772,6.412-6.776,6.412
-			c-1.876,0-6.916-0.42-6.916-6.636h3.836l-0.028,0.027c0,1.064,0.28,3.473,2.912,3.473c1.568,0,2.94-1.064,2.94-3.276
-			c0-2.716-2.632-2.828-4.452-2.828V14.005z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/30.svg b/m2ebook-epub/src/main/resources/images/callouts/30.svg
deleted file mode 100644
index dc43ba1..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/30.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M8.268,14.636h0.528c1.008,0,2.856-0.096,2.856-2.304c0-0.624-0.288-2.185-2.136-2.185
-			c-2.304,0-2.304,2.185-2.304,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.28,0,5.28,1.152,5.28,4.752
-			c0,1.728-1.08,2.808-2.04,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.376,5.496-5.808,5.496
-			c-1.608,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.52-0.911,2.52-2.808
-			c0-2.328-2.256-2.424-3.816-2.424V14.636z"/>
-		<path style="fill:#FFFFFF;" d="M23.172,7.46c4.008,0,5.904,2.76,5.904,8.736c0,5.976-1.896,8.76-5.904,8.76
-			s-5.904-2.784-5.904-8.76C17.268,10.22,19.164,7.46,23.172,7.46z M23.172,22.268c1.92,0,2.448-1.68,2.448-6.071
-			c0-4.393-0.528-6.049-2.448-6.049s-2.448,1.656-2.448,6.049C20.724,20.588,21.252,22.268,23.172,22.268z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/4.gif b/m2ebook-epub/src/main/resources/images/callouts/4.gif
deleted file mode 100644
index 4bcbf7e..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/4.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/4.png b/m2ebook-epub/src/main/resources/images/callouts/4.png
deleted file mode 100644
index adb8364..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/4.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/4.svg b/m2ebook-epub/src/main/resources/images/callouts/4.svg
deleted file mode 100644
index 8eb6a53..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/4.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M21.891,20.784h-2.212v4.396h-3.92v-4.396h-7.84v-3.389L15.227,5.3h4.452v12.432h2.212V20.784z
-			 M15.759,17.731c0-4.815,0.084-7.924,0.084-8.54h-0.056l-4.984,8.54H15.759z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/5.gif b/m2ebook-epub/src/main/resources/images/callouts/5.gif
deleted file mode 100644
index 1c62b4f..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/5.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/5.png b/m2ebook-epub/src/main/resources/images/callouts/5.png
deleted file mode 100644
index 4d7eb46..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/5.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/5.svg b/m2ebook-epub/src/main/resources/images/callouts/5.svg
deleted file mode 100644
index ca7a9f2..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/5.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M14.035,14.252c0.728-0.504,1.624-1.092,3.556-1.092c2.66,0,6.02,1.848,6.02,6.411
-			c0,2.717-1.372,7.141-7.224,7.141c-3.108,0-6.272-1.849-6.468-5.853h3.92c0.168,1.624,1.036,2.717,2.772,2.717
-			c1.876,0,2.968-1.597,2.968-3.725c0-1.764-0.839-3.556-2.912-3.556c-0.532,0-1.876,0.028-2.632,1.428l-3.5-0.168l1.372-10.92
-			h10.919v3.304h-8.092L14.035,14.252z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/6.gif b/m2ebook-epub/src/main/resources/images/callouts/6.gif
deleted file mode 100644
index 23bc555..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/6.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/6.png b/m2ebook-epub/src/main/resources/images/callouts/6.png
deleted file mode 100644
index 0ba694a..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/6.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/6.svg b/m2ebook-epub/src/main/resources/images/callouts/6.svg
deleted file mode 100644
index 783a0b9..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/6.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M19.106,10.673c-0.112-1.12-0.84-1.904-2.296-1.904c-2.548,0-3.136,2.912-3.276,5.488l0.056,0.056
-			c0.532-0.728,1.512-1.651,3.724-1.651c4.116,0,6.077,3.164,6.077,6.131c0,4.34-2.66,7.252-6.497,7.252
-			c-6.02,0-7.196-5.039-7.196-9.996c0-3.78,0.504-10.416,7.392-10.416c0.812,0,3.08,0.308,4.061,1.288
-			c1.092,1.063,1.483,1.652,1.848,3.752H19.106z M16.614,15.797c-1.484,0-2.996,0.924-2.996,3.416c0,2.156,1.232,3.697,3.108,3.697
-			c1.428,0,2.745-1.094,2.745-3.781C19.471,16.609,17.846,15.797,16.614,15.797z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/7.gif b/m2ebook-epub/src/main/resources/images/callouts/7.gif
deleted file mode 100644
index e55ce89..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/7.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/7.png b/m2ebook-epub/src/main/resources/images/callouts/7.png
deleted file mode 100644
index 472e96f..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/7.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/7.svg b/m2ebook-epub/src/main/resources/images/callouts/7.svg
deleted file mode 100644
index 59b3714..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/7.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M24.28,9.66c-1.904,2.071-6.776,7.951-7.252,16.52h-4.032c0.42-7.952,5.404-14.28,7.084-16.072
-			h-9.884l0.084-3.472h14V9.66z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/8.gif b/m2ebook-epub/src/main/resources/images/callouts/8.gif
deleted file mode 100644
index 49375e0..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/8.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/8.png b/m2ebook-epub/src/main/resources/images/callouts/8.png
deleted file mode 100644
index 5e60973..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/8.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/8.svg b/m2ebook-epub/src/main/resources/images/callouts/8.svg
deleted file mode 100644
index c1803a3..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/8.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M16.28,26.712c-5.124,0-6.888-3.332-6.888-6.048c0-1.009,0-3.641,3.024-5.04
-			c-1.568-0.784-2.408-2.044-2.408-3.893c0-3.388,2.716-5.432,6.188-5.432c4.116,0,6.3,2.436,6.3,5.18
-			c0,1.708-0.7,3.164-2.296,4.004c1.903,0.952,2.968,2.212,2.968,4.788C23.168,22.792,21.544,26.712,16.28,26.712z M16.224,17.332
-			c-1.428,0-2.8,0.924-2.8,3.08c0,1.903,1.092,3.164,2.884,3.164c2.043,0,2.829-1.765,2.829-3.137
-			C19.137,19.04,18.408,17.332,16.224,17.332z M18.744,11.899c0-1.512-1.036-2.464-2.296-2.464c-1.764,0-2.688,1.008-2.688,2.464
-			c0,1.177,0.868,2.464,2.548,2.464C17.848,14.363,18.744,13.328,18.744,11.899z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/callouts/9.gif b/m2ebook-epub/src/main/resources/images/callouts/9.gif
deleted file mode 100644
index da12a4f..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/9.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/9.png b/m2ebook-epub/src/main/resources/images/callouts/9.png
deleted file mode 100644
index a0676d2..0000000
Binary files a/m2ebook-epub/src/main/resources/images/callouts/9.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/callouts/9.svg b/m2ebook-epub/src/main/resources/images/callouts/9.svg
deleted file mode 100644
index bc149d3..0000000
--- a/m2ebook-epub/src/main/resources/images/callouts/9.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M13.953,21.921v0.027c0.224,1.372,1.092,1.961,2.296,1.961c1.624,0,3.248-1.372,3.276-5.545
-			l-0.057-0.056c-0.896,1.344-2.436,1.68-3.78,1.68c-3.808,0-6.02-2.884-6.02-6.216c0-4.872,2.884-7.14,6.776-7.14
-			c6.888,0,7,7.42,7,10.22c0,7.7-3.641,10.192-7.224,10.192c-3.388,0-5.824-1.96-6.16-5.124H13.953z M16.529,16.853
-			c1.372,0,2.884-0.979,2.884-3.332c0-2.268-0.98-3.668-2.996-3.668c-1.008,0-2.828,0.504-2.828,3.36
-			C13.589,16.209,15.045,16.853,16.529,16.853z"/>
-	</g>
-</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/caution.gif b/m2ebook-epub/src/main/resources/images/caution.gif
deleted file mode 100644
index d9f5e5b..0000000
Binary files a/m2ebook-epub/src/main/resources/images/caution.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/caution.png b/m2ebook-epub/src/main/resources/images/caution.png
deleted file mode 100644
index 5b7809c..0000000
Binary files a/m2ebook-epub/src/main/resources/images/caution.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/caution.svg b/m2ebook-epub/src/main/resources/images/caution.svg
deleted file mode 100644
index dd84f3f..0000000
--- a/m2ebook-epub/src/main/resources/images/caution.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:#FFFFFF;stroke:none;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke-width:6.6112;stroke-linecap:round;stroke-linejoin:round;">
-	<!ENTITY st2 "stroke:#FFFFFF;stroke-width:6.6112;">
-	<!ENTITY st3 "fill:none;stroke:none;">
-	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st5 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st4;">
-		<g>
-			<path style="&st2;" d="M41.7,35.3L26.6,9.4c-0.6-1-1.7-1.7-2.9-1.6c-1.2,0-2.3,0.7-2.9,1.7L6.3,35.4c-0.6,1-0.6,2.3,0,3.3c0.6,1,1.7,1.6,2.9,1.6h29.6c1.2,0,2.3-0.6,2.9-1.7c0.6-1,0.6-2.3,0-3.3z"/>
-			<path style="&st1;" d="M23.7,11L9.2,37h29.6L23.7,11z"/>
-			<path style="&st0;" d="M23.7,11.9L10.3,36.1h27.5l-14-24.1z"/>
-			<g>
-				<path style="&st5;" d="M24.1,34c-1.1,0-1.8-0.8-1.8-1.8c0-1.1,0.7-1.8,1.8-1.8c1.1,0,1.8,0.7,1.8,1.8c0,1-0.7,1.8-1.8,1.8h0z M22.9,29.3l-0.4-9.1h3.2l-0.4,9.1h-2.3z"/>
-			</g>
-		</g>
-	</g>
-	<g id="crop_x0020_marks" style="&st4;">
-		<path style="&st3;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/caution.tif b/m2ebook-epub/src/main/resources/images/caution.tif
deleted file mode 100644
index 4a28294..0000000
Binary files a/m2ebook-epub/src/main/resources/images/caution.tif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/draft.png b/m2ebook-epub/src/main/resources/images/draft.png
deleted file mode 100644
index 59673fe..0000000
Binary files a/m2ebook-epub/src/main/resources/images/draft.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/home.gif b/m2ebook-epub/src/main/resources/images/home.gif
deleted file mode 100644
index 6784f5b..0000000
Binary files a/m2ebook-epub/src/main/resources/images/home.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/home.png b/m2ebook-epub/src/main/resources/images/home.png
deleted file mode 100644
index cbb711d..0000000
Binary files a/m2ebook-epub/src/main/resources/images/home.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/home.svg b/m2ebook-epub/src/main/resources/images/home.svg
deleted file mode 100644
index e803a31..0000000
--- a/m2ebook-epub/src/main/resources/images/home.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st1 "fill:none;stroke:none;">
-	<!ENTITY st2 "fill:#000000;">
-	<!ENTITY st3 "fill:none;stroke:#FFFFFF;stroke-width:6.3469;stroke-linejoin:round;">
-	<!ENTITY st4 "fill-rule:evenodd;clip-rule:evenodd;stroke:none;">
-	<!ENTITY st5 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st0;">
-		<g style="&st4;">
-			<path style="&st3;" d="M22.9,7.1L5.1,21.8l0,0c-0.3,0.3-0.5,0.8-0.5,1.2c0,0.2,0,0.4,0.1,0.6c0.3,0.6,0.9,1,1.6,1c0,0,1.1,0,2.2,0c0,2.4,0,14.2,0,14.2c0,1.1,0.8,1.9,1.8,1.9h27.4c1.1,0,1.9-0.9,1.9-2c0,0,0-11.8,0-14.2c1,0,2,0,2,0c0.8,0,1.4-0.5,1.7-1.2
-				c0.1-0.2,0.1-0.4,0.1-0.6c0-0.5-0.2-1-0.7-1.4c0,0-3.6-3-4.5-3.7c0-1.2,0-6.9,0-6.9c0-1.2-0.8-2-2-2h-4.8c-1,0-1.7,0.6-1.9,1.5c-1.9-1.6-4.1-3.5-4.1-3.5l0.1,0.1c-0.7-0.7-1.8-0.8-2.7-0.1z"/>
-			<path style="&st2;" d="M22.9,7.1L5.1,21.8l0,0c-0.3,0.3-0.5,0.8-0.5,1.2c0,0.2,0,0.4,0.1,0.6c0.3,0.6,0.9,1,1.6,1c0,0,1.1,0,2.2,0c0,2.4,0,14.2,0,14.2c0,1.1,0.8,1.9,1.8,1.9h27.4c1.1,0,1.9-0.9,1.9-2c0,0,0-11.8,0-14.2c1,0,2,0,2,0c0.8,0,1.4-0.5,1.7-1.2
-				c0.1-0.2,0.1-0.4,0.1-0.6c0-0.5-0.2-1-0.7-1.4c0,0-3.6-3-4.5-3.7c0-1.2,0-6.9,0-6.9c0-1.2-0.8-2-2-2h-4.8c-1,0-1.7,0.6-1.9,1.5c-1.9-1.6-4.1-3.5-4.1-3.5l0.1,0.1c-0.7-0.7-1.8-0.8-2.7-0.1z"/>
-			<path style="&st2;" d="M41.8,22.8l-5.1-4.2v-0.1L31,13.7v0l-6.5-5.5C24.2,8,24,8,23.8,8.2L6.2,22.9c-0.1,0.1-0.1,0.3,0.1,0.3h1.6H10h28.1h1.2h2.3c0.2,0,0.4-0.2,0.2-0.4z"/>
-			<path d="M35.8,16.8l0-5.1c0-0.2-0.1-0.4-0.3-0.4h-3.2c-0.2,0-0.3,0.1-0.3,0.3v2.2l3.9,2.9z"/>
-			<path d="M11.9,24.7V37c0,0.3,0.1,0.4,0.3,0.4h23.6c0.3,0,0.4-0.2,0.4-0.4V24.7H11.9z"/>
-		</g>
-	</g>
-	<g id="crop_x0020_marks" style="&st5;">
-		<path style="&st1;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/important.gif b/m2ebook-epub/src/main/resources/images/important.gif
deleted file mode 100644
index 6795d9a..0000000
Binary files a/m2ebook-epub/src/main/resources/images/important.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/important.png b/m2ebook-epub/src/main/resources/images/important.png
deleted file mode 100644
index 12c90f6..0000000
Binary files a/m2ebook-epub/src/main/resources/images/important.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/important.svg b/m2ebook-epub/src/main/resources/images/important.svg
deleted file mode 100644
index dd84f3f..0000000
--- a/m2ebook-epub/src/main/resources/images/important.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:#FFFFFF;stroke:none;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke-width:6.6112;stroke-linecap:round;stroke-linejoin:round;">
-	<!ENTITY st2 "stroke:#FFFFFF;stroke-width:6.6112;">
-	<!ENTITY st3 "fill:none;stroke:none;">
-	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st5 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st4;">
-		<g>
-			<path style="&st2;" d="M41.7,35.3L26.6,9.4c-0.6-1-1.7-1.7-2.9-1.6c-1.2,0-2.3,0.7-2.9,1.7L6.3,35.4c-0.6,1-0.6,2.3,0,3.3c0.6,1,1.7,1.6,2.9,1.6h29.6c1.2,0,2.3-0.6,2.9-1.7c0.6-1,0.6-2.3,0-3.3z"/>
-			<path style="&st1;" d="M23.7,11L9.2,37h29.6L23.7,11z"/>
-			<path style="&st0;" d="M23.7,11.9L10.3,36.1h27.5l-14-24.1z"/>
-			<g>
-				<path style="&st5;" d="M24.1,34c-1.1,0-1.8-0.8-1.8-1.8c0-1.1,0.7-1.8,1.8-1.8c1.1,0,1.8,0.7,1.8,1.8c0,1-0.7,1.8-1.8,1.8h0z M22.9,29.3l-0.4-9.1h3.2l-0.4,9.1h-2.3z"/>
-			</g>
-		</g>
-	</g>
-	<g id="crop_x0020_marks" style="&st4;">
-		<path style="&st3;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/important.tif b/m2ebook-epub/src/main/resources/images/important.tif
deleted file mode 100644
index 184de63..0000000
Binary files a/m2ebook-epub/src/main/resources/images/important.tif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/next.gif b/m2ebook-epub/src/main/resources/images/next.gif
deleted file mode 100644
index aa1516e..0000000
Binary files a/m2ebook-epub/src/main/resources/images/next.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/next.png b/m2ebook-epub/src/main/resources/images/next.png
deleted file mode 100644
index 45835bf..0000000
Binary files a/m2ebook-epub/src/main/resources/images/next.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/next.svg b/m2ebook-epub/src/main/resources/images/next.svg
deleted file mode 100644
index 75fa83e..0000000
--- a/m2ebook-epub/src/main/resources/images/next.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:none;stroke:none;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
-	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st3 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st2;">
-		<g>
-			<path style="&st1;" d="M22.4,41.1c0,0.3,0.3,0.3,0.5,0.2l16.6-16.9c0.5-0.5,0.4-0.7,0-1L22.9,6.7c-0.1-0.1-0.4-0.1-0.4,0.1v10H8.9c-0.3,0-0.5,0.2-0.5,0.4l0,13.3C8.4,30.9,8.6,31,9,31h13.5l-0.1,10.1z"/>
-			<path style="&st3;" d="M22.4,41.1c0,0.3,0.3,0.3,0.5,0.2l16.6-16.9c0.5-0.5,0.4-0.7,0-1L22.9,6.7c-0.1-0.1-0.4-0.1-0.4,0.1v10H8.9c-0.3,0-0.5,0.2-0.5,0.4l0,13.3C8.4,30.9,8.6,31,9,31h13.5l-0.1,10.1z"/>
-		</g>
-	</g>
-	<g id="crop_x0020_marks" style="&st2;">
-		<path style="&st0;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/note.gif b/m2ebook-epub/src/main/resources/images/note.gif
deleted file mode 100644
index f329d35..0000000
Binary files a/m2ebook-epub/src/main/resources/images/note.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/note.png b/m2ebook-epub/src/main/resources/images/note.png
deleted file mode 100644
index d0c3c64..0000000
Binary files a/m2ebook-epub/src/main/resources/images/note.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/note.svg b/m2ebook-epub/src/main/resources/images/note.svg
deleted file mode 100644
index 648299d..0000000
--- a/m2ebook-epub/src/main/resources/images/note.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:none;stroke:#FFFFFF;stroke-width:12.1438;stroke-linejoin:round;">
-	<!ENTITY st1 "fill:none;stroke-width:1.2429;">
-	<!ENTITY st2 "fill:#FFFFFF;stroke:none;">
-	<!ENTITY st3 "fill:none;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;">
-	<!ENTITY st4 "fill:#FFFFFF;stroke-width:6.3824;stroke-linejoin:round;">
-	<!ENTITY st5 "fill:none;stroke:none;">
-	<!ENTITY st6 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st7 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;">
-	<!ENTITY st8 "stroke:none;">
-	<!ENTITY st9 "fill:none;stroke-width:4.9715;stroke-linejoin:round;">
-]>
-<svg  xmlns="http://www.w3.org/2000/svg" width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve">
-	<g id="Layer_x0020_1" style="&st6;">
-		<path style="&st0;" d="M35.7,19.8v18.9H11V8.8h13.9l10.8,11z"/>
-		<path style="&st3;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
-		<path style="&st7;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
-		<path style="&st4;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
-		<path style="&st2;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
-	</g>
-	<g id="Layer_x0020_4" style="&st6;">
-		<path style="&st9;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
-		<path style="&st8;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
-		<path style="&st8;" d="M20.6,14.7l-2.5,2.5L17,13.4l3.6,1.3z"/>
-		<path style="&st1;" d="M19.6,22.2l3-0.3l2.4-2.4l0.4-2.8"/>
-		<path style="&st2;" d="M20.4,14.9L18.3,17l1.6,5.2l2.7-0.3l2.4-2.4l0.3-2.4l-5-2.2z"/>
-	</g>
-	<g id="crop" style="&st6;">
-		<path style="&st5;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/note.tif b/m2ebook-epub/src/main/resources/images/note.tif
deleted file mode 100644
index 08644d6..0000000
Binary files a/m2ebook-epub/src/main/resources/images/note.tif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/prev.gif b/m2ebook-epub/src/main/resources/images/prev.gif
deleted file mode 100644
index 64ca8f3..0000000
Binary files a/m2ebook-epub/src/main/resources/images/prev.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/prev.png b/m2ebook-epub/src/main/resources/images/prev.png
deleted file mode 100644
index cf24654..0000000
Binary files a/m2ebook-epub/src/main/resources/images/prev.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/prev.svg b/m2ebook-epub/src/main/resources/images/prev.svg
deleted file mode 100644
index 6d88ffd..0000000
--- a/m2ebook-epub/src/main/resources/images/prev.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:none;stroke:none;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
-	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st3 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st2;">
-		<g>
-			<path style="&st1;" d="M25.6,6.9c0-0.3-0.3-0.3-0.5-0.2L8.4,23.6c-0.5,0.5-0.4,0.7,0,1l16.6,16.6c0.1,0.1,0.4,0.1,0.4-0.1v-10h13.6c0.3,0,0.5-0.2,0.5-0.4l0-13.3c0-0.3-0.2-0.5-0.5-0.5H25.5l0.1-10.1z"/>
-			<path style="&st3;" d="M25.6,6.9c0-0.3-0.3-0.3-0.5-0.2L8.4,23.6c-0.5,0.5-0.4,0.7,0,1l16.6,16.6c0.1,0.1,0.4,0.1,0.4-0.1v-10h13.6c0.3,0,0.5-0.2,0.5-0.4l0-13.3c0-0.3-0.2-0.5-0.5-0.5H25.5l0.1-10.1z"/>
-		</g>
-	</g>
-	<g id="crop_x0020_marks" style="&st2;">
-		<path style="&st0;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/tip.gif b/m2ebook-epub/src/main/resources/images/tip.gif
deleted file mode 100644
index 823f2b4..0000000
Binary files a/m2ebook-epub/src/main/resources/images/tip.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/tip.png b/m2ebook-epub/src/main/resources/images/tip.png
deleted file mode 100644
index 5c4aab3..0000000
Binary files a/m2ebook-epub/src/main/resources/images/tip.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/tip.svg b/m2ebook-epub/src/main/resources/images/tip.svg
deleted file mode 100644
index 4a64a15..0000000
--- a/m2ebook-epub/src/main/resources/images/tip.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:none;stroke:#000000;stroke-width:1.0944;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke:none;">
-	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#FFFFFF;stroke-width:5.6139;stroke-miterlimit:4;">
-	<!ENTITY st3 "fill:none;stroke:none;">
-	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st5 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st2;">
-		<g>
-			<path d="M9.5,18.6c0,8,6.5,14.4,14.4,14.4c8,0,14.4-6.5,14.4-14.4c0-8-6.5-14.4-14.4-14.4c-8,0-14.4,6.5-14.4,14.4z M12.8,18.6c0-6.2,5-11.2,11.2-11.2c6.2,0,11.2,5,11.2,11.2c0,6.2-5,11.2-11.2,11.2c-6.2,0-11.2-5-11.2-11.2z"/>
-			<path d="M28.1,37.9l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path d="M28.1,34.8l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path d="M28.1,31.6l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8s0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8s-0.9-1.5-1.8-1.4z"/>
-			<path d="M23.1,41.3v0.9c0,0.9,0.7,1.6,1.6,1.6c0.9,0,1.6-0.7,1.6-1.6v-0.9h-3.3z"/>
-			<path style="&st1;" d="M35.9,18.7c0,6.6-5.4,12-12,12c-6.6,0-12-5.4-12-12s5.4-12,12-12c6.6,0,12,5.4,12,12z"/>
-			<path style="&st5;" d="M9.6,18.6c0,8,6.5,14.4,14.4,14.4c8,0,14.4-6.5,14.4-14.4c0-8-6.5-14.4-14.4-14.4c-8,0-14.4,6.5-14.4,14.4z M12.9,18.6c0-6.2,5-11.2,11.2-11.2c6.2,0,11.2,5,11.2,11.2c0,6.2-5,11.2-11.2,11.2c-6.2,0-11.2-5-11.2-11.2z"/>
-			<path style="&st5;" d="M28.2,37.9l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path style="&st5;" d="M28.2,34.7l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path style="&st5;" d="M28.2,31.6l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path style="&st5;" d="M23.1,41.3v0.9c0,0.9,0.7,1.6,1.6,1.6s1.6-0.7,1.6-1.6v-0.9h-3.3z"/>
-			<path style="&st0;" d="M22.3,28.3l-3.5-10.7c0,0,6.6,3.9,10.5,0"/>
-		</g>
-	</g>
-	<g id="crop_x0020_marks" style="&st4;">
-		<path style="&st3;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/tip.tif b/m2ebook-epub/src/main/resources/images/tip.tif
deleted file mode 100644
index 4a3d8c7..0000000
Binary files a/m2ebook-epub/src/main/resources/images/tip.tif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/toc-blank.png b/m2ebook-epub/src/main/resources/images/toc-blank.png
deleted file mode 100644
index 6ffad17..0000000
Binary files a/m2ebook-epub/src/main/resources/images/toc-blank.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/toc-minus.png b/m2ebook-epub/src/main/resources/images/toc-minus.png
deleted file mode 100644
index abbb020..0000000
Binary files a/m2ebook-epub/src/main/resources/images/toc-minus.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/toc-plus.png b/m2ebook-epub/src/main/resources/images/toc-plus.png
deleted file mode 100644
index 941312c..0000000
Binary files a/m2ebook-epub/src/main/resources/images/toc-plus.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/up.gif b/m2ebook-epub/src/main/resources/images/up.gif
deleted file mode 100644
index aabc2d0..0000000
Binary files a/m2ebook-epub/src/main/resources/images/up.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/up.png b/m2ebook-epub/src/main/resources/images/up.png
deleted file mode 100644
index 07634de..0000000
Binary files a/m2ebook-epub/src/main/resources/images/up.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/up.svg b/m2ebook-epub/src/main/resources/images/up.svg
deleted file mode 100644
index d31aa9c..0000000
--- a/m2ebook-epub/src/main/resources/images/up.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:none;stroke:none;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
-	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st3 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st2;">
-		<g>
-			<path style="&st1;" d="M41.1,25.6c0.3,0,0.3-0.3,0.2-0.5L24.4,8.4c-0.5-0.5-0.7-0.4-1,0L6.7,25.1c-0.1,0.1-0.1,0.4,0.1,0.4h10v13.6c0,0.3,0.2,0.5,0.4,0.5l13.3,0c0.3,0,0.5-0.2,0.5-0.5V25.5l10.1,0.1z"/>
-			<path style="&st3;" d="M41.1,25.6c0.3,0,0.3-0.3,0.2-0.5L24.4,8.4c-0.5-0.5-0.7-0.4-1,0L6.7,25.1c-0.1,0.1-0.1,0.4,0.1,0.4h10v13.6c0,0.3,0.2,0.5,0.4,0.5l13.3,0c0.3,0,0.5-0.2,0.5-0.5V25.5l10.1,0.1z"/>
-		</g>
-	</g>
-	<g id="crop_x0020_marks" style="&st2;">
-		<path style="&st0;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/warning.gif b/m2ebook-epub/src/main/resources/images/warning.gif
deleted file mode 100644
index 3adf191..0000000
Binary files a/m2ebook-epub/src/main/resources/images/warning.gif and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/warning.png b/m2ebook-epub/src/main/resources/images/warning.png
deleted file mode 100644
index 1c33db8..0000000
Binary files a/m2ebook-epub/src/main/resources/images/warning.png and /dev/null differ
diff --git a/m2ebook-epub/src/main/resources/images/warning.svg b/m2ebook-epub/src/main/resources/images/warning.svg
deleted file mode 100644
index fc8d748..0000000
--- a/m2ebook-epub/src/main/resources/images/warning.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:#000000;stroke:#FFFFFF;stroke-width:7.9139;stroke-linejoin:round;">
-	<!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st2 "fill:none;stroke:none;">
-	<!ENTITY st3 "fill:#000000;">
-	<!ENTITY st4 "fill-rule:evenodd;clip-rule:evenodd;stroke:none;">
-	<!ENTITY st5 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_4" style="&st1;">
-		<g style="&st4;">
-			<path style="&st0;" d="M16.4,42.3L5.7,31.6V16.4L16.4,5.7h15.2l10.7,10.7v15.2L31.6,42.3H16.4z"/>
-			<path style="&st3;" d="M16.4,42.3L5.7,31.6V16.4L16.4,5.7h15.2l10.7,10.7v15.2L31.6,42.3H16.4z"/>
-			<path d="M11.7,17.7l18.7,18.7l5.9-5.9L17.6,11.7l-5.9,5.9z"/>
-			<path d="M11.7,30.5l5.9,5.9l18.7-18.7l-5.9-5.9L11.7,30.5z"/>
-		</g>
-	</g>
-	<g id="crop_x0020_marks" style="&st5;">
-		<path style="&st2;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
diff --git a/m2ebook-epub/src/main/resources/images/warning.tif b/m2ebook-epub/src/main/resources/images/warning.tif
deleted file mode 100644
index 7b6611e..0000000
Binary files a/m2ebook-epub/src/main/resources/images/warning.tif and /dev/null differ
diff --git a/m2ebook-site/pom.xml b/m2ebook-site/pom.xml
index 62cfb11..233ff5a 100644
--- a/m2ebook-site/pom.xml
+++ b/m2ebook-site/pom.xml
@@ -57,25 +57,6 @@
               <stripVersion>true</stripVersion>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-epub</id>
-            <phase>site</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>m2ebook-epub</artifactId>
-                  <version>${project.version}</version>
-                  <type>epub</type>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${basedir}/target/site/epub</outputDirectory>
-              <stripVersion>true</stripVersion>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/pom.xml b/pom.xml
index f8b10b3..0e7652f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
   </developers>
   <modules>
     <module>m2ebook-content</module>
-    <module>m2ebook-epub</module>
     <module>m2ebook-pdf</module>
     <module>m2ebook-html</module>
     <module>m2ebook-site</module>
diff --git a/pom.xml.orig b/pom.xml.orig
deleted file mode 100644
index b42dfaf..0000000
--- a/pom.xml.orig
+++ /dev/null
@@ -1,182 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.sonatype.m2eclipsebook</groupId>
-  <artifactId>m2ebook-parent</artifactId>
-  <version>1.2-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Developing with Eclipse and Maven Parent Project</name>
-  <description>A book about m2eclipse</description>
-  <url>http://m2eclipse.sonatype.org/book</url>
-  <organization>
-    <name>Sonatype, Inc.</name>
-    <url>http://www.sonatype.com</url>
-  </organization>
-  <properties>
-    <book.title>Developing with Eclipse and Maven</book.title>
-    <book.subtitle>A User's Guide to m2eclipse</book.subtitle>
-    <organization.address>800 W. El Camino Real, Suite 400, Mountain View, CA, 94040</organization.address>
-    <organization.slogan>Sonatype: The Maven Company</organization.slogan>
-    <organization.logo>http://www.sonatype.com/sites/all/themes/sonatype/images/sonatype_logo.gif</organization.logo>
-    <copyright.year>2010</copyright.year>
-    <core.update.site>http://m2eclipse.sonatype.org/sites/m2e</core.update.site>
-    <extras.update.site>http://m2eclipse.sonatype.org/sites/m2e-extras</extras.update.site>
-    <m2eclipse.version>0.10.2</m2eclipse.version>
-    <docbkx-tools.version>2.0.11</docbkx-tools.version>
-  </properties>
-  <developers>
-    <developer>
-      <id>tobrien</id>
-      <name>Tim O'Brien</name>
-      <email>tobrien@sonatype.com</email>
-      <organization>Sonatype, Inc.</organization>
-      <organizationUrl>http://www.sonatype.com</organizationUrl>
-      <roles>
-        <role>Author</role>
-      </roles>
-    </developer>
-  </developers>
-  <modules>
-    <module>m2ebook-content</module>
-    <module>m2ebook-epub</module>
-    <module>m2ebook-pdf</module>
-    <module>m2ebook-html</module>
-    <module>m2ebook-site</module>
-  </modules>
-  
-  <profiles>
-    <profile>
-      <id>publish</id>
-      <distributionManagement>
-        <site>
-          <id>sonatype-site</id>
-          <name>Sonatype Book Examples</name>
-          <url>scp://deployer@172.16.0.1/var/www/domains/sonatype.com/books/htdocs/m2eclipse-book/parent</url>
-        </site>
-      </distributionManagement>
-      <properties>
-        <maven.book.baseurl>http://books.sonatype.com/m2eclipse-book</maven.book.baseurl>
-      </properties>
-    </profile>
-    <profile>
-      <id>publish-external</id>
-      <distributionManagement>
-        <site>
-          <id>sonatype-site</id>
-          <name>Sonatype Book Examples</name>
-          <url>scp://deployer@svn.sonatype.com/var/www/domains/sonatype.com/books/htdocs/m2eclipse-book/parent</url>
-        </site>
-      </distributionManagement>
-      <properties>
-        <maven.book.baseurl>http://books.sonatype.com/m2eclipse-book</maven.book.baseurl>
-      </properties>
-    </profile>
-    <profile>
-      <id>stage</id>
-      <distributionManagement>
-        <site>
-          <id>sonatype-site</id>
-          <name>Sonatype Book Examples</name>
-          <url>scp://deployer@172.16.0.1/var/www/domains/sonatype.com/books/htdocs/m2eclipse-book-stage/parent</url>
-        </site>
-      </distributionManagement>
-    </profile>
-    <profile>
-      <id>stage-external</id>
-      <distributionManagement>
-        <site>
-          <id>sonatype-site</id>
-          <name>Sonatype Book Examples</name>
-          <url>scp://deployer@svn.sonatype.com/var/www/domains/sonatype.com/books/htdocs/m2eclipse-book-stage/parent</url>
-        </site>
-      </distributionManagement>
-    </profile>
-  </profiles>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.0-alpha-4</version>
-      </plugin>
-      <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-compiler-plugin</artifactId>
-	<configuration>
-	  <source>1.5</source>
-	  <target>1.5</target>
-	</configuration>
-      </plugin>
-      <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-9</version>
-        <configuration>
-          <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <goals>clean compile install site-deploy</goals>
-          <releaseProfiles>publish</releaseProfiles>
-	  <preparationGoals>clean install</preparationGoals>
-          <useReleaseProfile>false</useReleaseProfile>
-        </configuration>
-	<dependencies>
-	  <dependency>
-	    <groupId>org.apache.maven.scm</groupId>
-	    <artifactId>maven-scm-provider-gitexe
-	    </artifactId>
-	    <version>1.2</version>
-	  </dependency>
-	</dependencies>
-      </plugin>
-      <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-scm-plugin</artifactId>
-	<version>1.2</version>
-	<dependencies>
-	  <dependency>
-	    <groupId>org.apache.maven.scm</groupId>
-	    <artifactId>maven-scm-provider-gitexe
-	    </artifactId>
-	    <version>1.2</version>
-	  </dependency>
-	</dependencies>
-      </plugin>
-      <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-gpg-plugin</artifactId>
-	<configuration>
-	  <skip>true</skip>
-	</configuration>
-      </plugin>
-    </plugins>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-ssh</artifactId>
-         <version>1.0-beta-6</version>
-      </extension>
-    </extensions>
-<<<<<<< HEAD:pom.xml
-  </build>
-=======
- </build>
->>>>>>> production:pom.xml
-
-  <scm>
-    <connection>scm:git:git://github.com/sonatype/m2eclipse-book.git</connection>
-    <url>scm:git:git://github.com/sonatype/m2eclipse-book.git</url>
-    <developerConnection>scm:git:git://github.com/sonatype/m2eclipse-book.git</developerConnection>	
-  </scm>
-  <distributionManagement>
-    <repository>
-      <id>forge-releases</id>
-      <name>Sonatype Forge Releases</name>
-      <url>http://repository.sonatype.org/content/repositories/releases</url>
-    </repository>
-    <snapshotRepository>
-      <id>forge-snapshots</id>
-      <name>Sonatype Forge Snapshot</name>
-      <url>http://repository.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-  </distributionManagement>
-</project>