Patch httplib.h for gcc maybe-uninitialized warning.

Recent version of gcc warn about the use `buf` where it may be uninitialized. But here, buf is used as a output buffer to initialize it. I'm not sure we can fix this differently than ignoring the warning.
2025-12-24 23:17:59 -05:00 · 2021-06-30 17:30:30 +02:00
71 changed files with 2792 additions and 7365 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
      - name: Install deps
        shell: bash
        run: |
-          ARCHIVE_NAME=deps2_osx_native_dyn_libkiwix.tar.xz
+          ARCHIVE_NAME=deps2_osx_native_dyn_kiwix-lib.tar.xz
          wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C $HOME
      - name: Compile
        shell: bash
@@ -94,7 +94,7 @@ jobs:
      HOME: /home/runner
    runs-on: ubuntu-latest
    container:
-      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-26"
    steps:
    - name: Extract branch name
      shell: bash
@@ -115,7 +115,7 @@ jobs:
    - name: Install deps
      shell: bash
      run: |
-        ARCHIVE_NAME=deps2_${OS_NAME}_${{matrix.target}}_libkiwix.tar.xz
+        ARCHIVE_NAME=deps2_${OS_NAME}_${{matrix.target}}_kiwix-lib.tar.xz
        wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C /home/runner
    - name: Compile
      shell: bash
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -7,11 +7,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        distro:
-          - ubuntu-impish
-          - ubuntu-hirsute
-          - ubuntu-focal
-          - ubuntu-bionic
+        distro: [ubuntu-hirsute, ubuntu-groovy, ubuntu-focal, ubuntu-bionic]
    steps:
      - uses: actions/checkout@v2

@@ -34,14 +30,6 @@ jobs:
          email: release+launchpad@kiwix.org
          distro: ${{ matrix.distro }}

-      - uses: legoktm/gh-action-build-deb@ubuntu-impish
-        if: matrix.distro == 'ubuntu-impish'
-        name: Build package for ubuntu-impish
-        id: build-ubuntu-impish
-        with:
-          args: --no-sign
-          ppa: ${{ steps.ppa.outputs.ppa }}
-
      - uses: legoktm/gh-action-build-deb@ubuntu-hirsute
        if: matrix.distro == 'ubuntu-hirsute'
        name: Build package for ubuntu-hirsute
@@ -50,6 +38,14 @@ jobs:
          args: --no-sign
          ppa: ${{ steps.ppa.outputs.ppa }}

+      - uses: legoktm/gh-action-build-deb@ubuntu-groovy
+        if: matrix.distro == 'ubuntu-groovy'
+        name: Build package for ubuntu-groovy
+        id: build-ubuntu-groovy
+        with:
+          args: --no-sign
+          ppa: ${{ steps.ppa.outputs.ppa }}
+
      - uses: legoktm/gh-action-build-deb@ubuntu-focal
        if: matrix.distro == 'ubuntu-focal'
        name: Build package for ubuntu-focal
--- a/README.md
+++ b/README.md
@@ -146,53 +146,6 @@ cp ninja ../bin
 cd ..
 ```

-Custom Index Page
-----------------
-
-to use custom welcome page mention `customIndexPage` argument in `kiwix::internalServer()` or use `kiwix::server->setCustomIndexTemplate()`.
-(note - while using custom html file please mention all external links as absolute path.)
-
-to create a HTML template with custom JS you need to have a look at various OPDS based endpoints as mentioned [here](https://wiki.kiwix.org/wiki/OPDS) to load books.
-
-To use JS provided by kiwix-serve you can use the following template to start with -> 
-
-```
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <title><-- Custom Tittle --></title>
-    <script
-      type="text/javascript"
-      src="{{root}}/skin/jquery-ui/external/jquery/jquery.js"
-    ></script>
-    <script
-      type="text/javascript"
-      src="{{root}}/skin/jquery-ui/jquery-ui.min.js"
-    ></script>
-    <script src="{{root}}/skin/isotope.pkgd.min.js" defer></script>
-    <script src="{{root}}/skin/iso6391To3.js"></script>
-    <script type="text/javascript" src="{{root}}/skin/index.js" defer></script>
-  </head>
-  <body>
-  </body>
-</html>
-```
-
- To get books listed using `index.js` add - `<div class="book__list"></div>` under body tag.
- To get number of books listed add - `<h3 class="kiwixHomeBody__results"></h3>` under body tag.
- To add language select box add - `<select id="languageFilter"></select>` under body tag.
- To add language select box add - `<select id="categoryFilter"></select>` under body tag.
- To add search box for books use following form - 
-    ```
-        <form id='kiwixSearchForm'>
-        <input type="text" name="q" placeholder="Search" id="searchFilter" class='kiwixSearch filter'>
-        <input type="submit" class="searchButton" value="Search"/>
-        </form>
-    ```
-
-
 If you compile manually Libmicrohttpd, you might need to compile it
 without GNU TLS, a bug here will empeach further compilation
 otherwise.
--- a/format_code.sh
+++ b/format_code.sh
@@ -7,7 +7,6 @@ files=(
 "include/common/otherTools.h"
 "include/common/regexTools.h"
 "include/common/networkTools.h"
-"include/common/archiveTools.h"
 "include/manager.h"
 "include/reader.h"
 "include/kiwix.h"
@@ -23,7 +22,6 @@ files=(
 "src/common/pathTools.cpp"
 "src/common/regexTools.cpp"
 "src/common/otherTools.cpp"
-"src/common/archiveTools.cpp"
 "src/common/networkTools.cpp"
 "src/common/stringTools.cpp"
 "src/xapianSearcher.cpp"
--- a/include/book.h
+++ b/include/book.h
@@ -26,10 +26,6 @@ namespace pugi {
 class xml_node;
 }

-namespace zim {
-class Archive;
-}
-
 namespace kiwix
 {

@@ -47,7 +43,6 @@ class Book

  bool update(const Book& other);
  void update(const Reader& reader);
-  void update(const zim::Archive& archive);
  void updateFromXml(const pugi::xml_node& node, const std::string& baseDir);
  void updateFromOpds(const pugi::xml_node& node, const std::string& urlHost);
  std::string getHumanReadableIdFromPath() const;
--- a/include/library.h
+++ b/include/library.h
@@ -24,7 +24,6 @@
 #include <vector>
 #include <map>
 #include <memory>
-#include <zim/archive.h>

 #include "book.h"
 #include "bookmark.h"
@@ -147,14 +146,12 @@ class Library
 {
  std::map<std::string, kiwix::Book> m_books;
  std::map<std::string, std::shared_ptr<Reader>> m_readers;
-  std::map<std::string, std::shared_ptr<zim::Archive>> m_archives;
  std::vector<kiwix::Bookmark> m_bookmarks;
  class BookDB;
  std::unique_ptr<BookDB> m_bookDB;

 public:
  typedef std::vector<std::string> BookIdCollection;
-  typedef std::map<std::string, int> AttributeCounts;

 public:
  Library();
@@ -201,7 +198,6 @@ class Library
  const Book& getBookByPath(const std::string& path) const;
  Book& getBookByPath(const std::string& path);
  std::shared_ptr<Reader> getReaderById(const std::string& id);
-  std::shared_ptr<zim::Archive> getArchiveById(const std::string& id);

  /**
   * Remove a book from the library.
@@ -243,13 +239,6 @@ class Library
   */
  std::vector<std::string> getBooksLanguages() const;

-  /**
-   * Get all languagues of the books in the library with counts.
-   *
-   * @return A list of languages with the count of books in each language.
-   */
-  AttributeCounts getBooksLanguagesWithCounts() const;
-
  /**
   * Get all categories of the books in the library.
   *
@@ -349,12 +338,7 @@ class Library
  friend class OPDSDumper;
  friend class libXMLDumper;

-private: // types
-  typedef const std::string& (Book::*BookStrPropMemFn)() const;
-
 private: // functions
-  AttributeCounts getBookAttributeCounts(BookStrPropMemFn p) const;
-  std::vector<std::string> getBookPropValueSet(BookStrPropMemFn p) const;
  BookIdCollection filterViaBookDB(const Filter& filter) const;
  void updateBookDB(const Book& book);
 };
--- a/include/meson.build
+++ b/include/meson.build
@@ -13,8 +13,18 @@ headers = [
  'search_renderer.h',
  'server.h',
  'kiwixserve.h',
-  'name_mapper.h',
-  'tools.h'
+  'name_mapper.h'
 ]

 install_headers(headers, subdir:'kiwix')
+
+install_headers(
+  'tools/base64.h',
+  'tools/networkTools.h',
+  'tools/otherTools.h',
+  'tools/pathTools.h',
+  'tools/regexTools.h',
+  'tools/stringTools.h',
+  subdir:'kiwix/tools'
+)
+
--- a/include/opds_catalog.h
+++ b/include/opds_catalog.h
@@ -1,33 +0,0 @@
-/*
- * Copyright 2021 Veloman Yunkan <veloman.yunkan@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef KIWIX_OPDS_CATALOG_H
-#define KIWIX_OPDS_CATALOG_H
-
-
-#include "library.h"
-
-namespace kiwix
-{
-
-std::string getSearchUrl(const Filter& f);
-
-} // namespace kiwix
-
-#endif // KIWIX_OPDS_CATALOG_H
--- a/include/opds_dumper.h
+++ b/include/opds_dumper.h
@@ -26,6 +26,9 @@

 #include <pugixml.hpp>

+#include "tools/base64.h"
+#include "tools/pathTools.h"
+#include "tools/regexTools.h"
 #include "library.h"
 #include "reader.h"

@@ -59,32 +62,17 @@ class OPDSDumper
   *
   * @param bookIds the ids of the books to include in the feed
   * @param query the query used to obtain the list of book ids
-   * @param partial whether the feed should include partial or complete entries
   * @return The OPDS feed.
   */
-  std::string dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query, bool partial) const;
-
-  /**
-   * Dump the OPDS complete entry document.
-   *
-   * @param bookId the id of the book
-   * @return The OPDS complete entry document.
-   */
-  std::string dumpOPDSCompleteEntry(const std::string& bookId) const;
+  std::string dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query) const;

  /**
   * Dump the categories OPDS feed.
   *
+   * @param categories list of category names
   * @return The OPDS feed.
   */
-  std::string categoriesOPDSFeed() const;
-
-  /**
-   * Dump the languages OPDS feed.
-   *
-   * @return The OPDS feed.
-   */
-  std::string languagesOPDSFeed() const;
+  std::string categoriesOPDSFeed(const std::vector<std::string>& categories) const;

  /**
   * Set the id of the library.
--- a/include/reader.h
+++ b/include/reader.h
@@ -29,6 +29,8 @@
 #include <string>
 #include "common.h"
 #include "entry.h"
+#include "tools/pathTools.h"
+#include "tools/stringTools.h"

 using namespace std;

@@ -39,26 +41,26 @@ namespace kiwix
 * The SuggestionItem is a helper class that contains the info about a single
 * suggestion item.
 */
+
 class SuggestionItem
 {
  // Functions
-  // Temporarily making the constructor public until the code move is complete
-  public:
+  private:
    // Create a sugggestion item.
-    explicit SuggestionItem(const std::string& title, const std::string& normalizedTitle,
-                            const std::string& path, const std::string& snippet = "") :
+    explicit SuggestionItem(std::string title, std::string normalizedTitle,
+                            std::string path, std::string snippet = "") :
      title(title),
      normalizedTitle(normalizedTitle),
      path(path),
      snippet(snippet) {}

  public:
-    const std::string& getTitle() const           { return title;}
-    const std::string& getNormalizedTitle() const { return normalizedTitle;}
-    const std::string& getPath() const            { return path;}
-    const std::string& getSnippet() const         { return snippet;}
+    const std::string getTitle()           {return title;}
+    const std::string getNormalizedTitle() {return normalizedTitle;}
+    const std::string getPath()            {return path;}
+    const std::string getSnippet()         {return snippet;}

-    bool hasSnippet() const                { return !snippet.empty();}
+    const bool hasSnippet()                {return !snippet.empty();}

  // Data
  private:
@@ -89,13 +91,6 @@ class Reader
   *                    (.zim extesion).
   */
  explicit Reader(const string zimFilePath);
-
-   /**
-   * Create a Reader to read a zim file given by the Archive.
-   *
-   * @param archive The shared pointer to the Archive object.
-   */
-  explicit Reader(const std::shared_ptr<zim::Archive> archive);
 #ifndef _WIN32
  explicit Reader(int fd);
  Reader(int fd, zim::offset_type offset, zim::size_type size);
@@ -292,6 +287,16 @@ class Reader
   */
  string getScraper() const;

+  /**
+   * Get the origId of the zim file.
+   *
+   * The origId is only used in the case of patch zim file and is the Id
+   * of the original zim file.
+   *
+   * @return The origId of the zim file as specified in the zim metadata.
+   */
+  string getOrigId() const;
+
  /**
   * Get the favicon of the zim file.
   *
@@ -483,7 +488,7 @@ class Reader
  zim::Archive* getZimArchive() const;

 protected:
-  std::shared_ptr<zim::Archive> zimArchive;
+  std::unique_ptr<zim::Archive> zimArchive;
  std::string zimFilePath;

  SuggestionsList_t suggestions;
--- a/include/search_renderer.h
+++ b/include/search_renderer.h
@@ -21,7 +21,6 @@
 #define KIWIX_SEARCH_RENDERER_H

 #include <string>
-#include <zim/search.h>

 namespace kiwix
 {
@@ -41,8 +40,6 @@ class SearchRenderer
   *                          Used to generate pagination links.
   */
  SearchRenderer(Searcher* searcher, NameMapper* mapper);
-  SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper,
-                 unsigned int start, unsigned int estimatedResultCount);

  ~SearchRenderer();

@@ -77,7 +74,7 @@ class SearchRenderer

 protected:
  std::string beautifyInteger(const unsigned int number);
-  zim::SearchResultSet m_srs;
+  Searcher* mp_searcher;
  NameMapper* mp_nameMapper;
  std::string searchContent;
  std::string searchPattern;
--- a/include/searcher.h
+++ b/include/searcher.h
@@ -29,8 +29,8 @@
 #include <string>
 #include <memory>
 #include <vector>
-
-#include <zim/search.h>
+#include "tools/pathTools.h"
+#include "tools/stringTools.h"

 using namespace std;

@@ -52,7 +52,6 @@ class Result
 };

 struct SearcherInternal;
-struct SuggestionInternal;
 /**
 * The Searcher class is reponsible to do different kind of search using the
 * fulltext index.
@@ -86,12 +85,12 @@ class Searcher
   *
   * @param search The search query.
   * @param resultStart the start offset of the search results (used for pagination).
-   * @param maxResultCount Maximum results to get from start (used for pagination).
+   * @param resultEnd the end offset of the search results (used for pagination).
   * @param verbose print some info on stdout if true.
   */
  void search(const std::string& search,
              unsigned int resultStart,
-              unsigned int maxResultCount,
+              unsigned int resultEnd,
              const bool verbose = false);

  /**
@@ -105,12 +104,12 @@ class Searcher
   * @param longitude The longitude of the center point.
   * @param distance The radius of the disc.
   * @param resultStart the start offset of the search results (used for pagination).
-   * @param maxResultCount Maximum number of results to get from start (used for pagination).
+   * @param resultEnd the end offset of the search results (used for pagination).
   * @param verbose print some info on stdout if true.
   */
  void geo_search(float latitude, float longitude, float distance,
                  unsigned int resultStart,
-                  unsigned int maxResultCount,
+                  unsigned int resultEnd,
                  const bool verbose = false);

  /**
@@ -143,29 +142,23 @@ class Searcher
   */
  unsigned int getEstimatedResultCount();

-  /**
-   * Get a SearchResultSet object for current search
-   */
-  zim::SearchResultSet getSearchResultSet();
-
  unsigned int getResultStart() { return resultStart; }
-  unsigned int getMaxResultCount() { return maxResultCount; }
+  unsigned int getResultEnd() { return resultEnd; }

 protected:
  std::string beautifyInteger(const unsigned int number);
  void closeIndex();
  void searchInIndex(string& search,
                     const unsigned int resultStart,
-                     const unsigned int maxResultCount,
+                     const unsigned int resultEnd,
                     const bool verbose = false);

  std::vector<Reader*> readers;
  std::unique_ptr<SearcherInternal> internal;
-  std::unique_ptr<SuggestionInternal> suggestionInternal;
  std::string searchPattern;
  unsigned int estimatedResultCount;
  unsigned int resultStart;
-  unsigned int maxResultCount;
+  unsigned int resultEnd;

 private:
  void reset();
--- a/include/server.h
+++ b/include/server.h
@@ -55,7 +55,6 @@ namespace kiwix
       void setPort(int port) { m_port = port; }
       void setNbThreads(int threads) { m_nbThreads = threads; }
       void setVerbose(bool verbose) { m_verbose = verbose; }
-       void setIndexTemplateString(const std::string& indexTemplateString) { m_indexTemplateString = indexTemplateString; }
       void setTaskbar(bool withTaskbar, bool withLibraryButton)
        { m_withTaskbar = withTaskbar; m_withLibraryButton = withLibraryButton; }
       void setBlockExternalLinks(bool blockExternalLinks)
@@ -66,7 +65,6 @@ namespace kiwix
       NameMapper* mp_nameMapper;
       std::string m_root = "";
       std::string m_addr = "";
-       std::string m_indexTemplateString = "";
       int m_port = 80;
       int m_nbThreads = 1;
       bool m_verbose = false;
--- a/include/tools.h
+++ b/include/tools.h
@@ -1,198 +0,0 @@
-/*
- * Copyright 2021 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef KIWIX_TOOLS_H
-#define KIWIX_TOOLS_H
-
-#include <string>
-#include <vector>
-
-namespace kiwix {
-
-/**
- * Return the current directory.
- *
- * @return the current directory (utf8 encoded)
- */
-std::string getCurrentDirectory();
-
-/**
- * Return the data directory.
- *
- * The data directory is a directory where to put data (zim files, ...)
- * It depends of the platform and it may be changed by user using environment variable.
- *
- * The resolution order is :
- * - `KIWIX_DATA_DIR` env variable (if set).
- * - On Windows :
- *    . `$APPDATA/kiwix` if $APPDATA is set
- *    . `$USERPROFILE/kiwix` if $USERPROFILE is set
- * - Else :
- *    . `$XDG_DATA_HOME/kiwix`if $XDG_DATA_HOME is set
- *    . `$HOME/.local/share/kiwx` if $HOWE is set
- * - current directory
- *
- * @return the path of the data directory (utf8 encoded)
- */
-std::string getDataDirectory();
-
-/** Return the path of the executable
- *
- * Some application may be packaged in auto extractible archive (Appimage) and the
- * real executable is different of the path of the archive.
- * If `realPathOnly` is true, return the path of the real executable instead of the
- * archive launched by the user.
- *
- * @param realPathOnly If we must return the real path of the executable.
- * @return the path of the executable (utf8 encoded)
- */
-std::string getExecutablePath(bool realPathOnly = false);
-
-/** Tell if the path is a relative path.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path A utf8 encoded path.
- * @return true if the path is relative.
- */
-bool isRelativePath(const std::string& path);
-
-/** Append a path to another one.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param basePath the base path.
- * @param relativePath a path to add to the base path, must be a relative path.
- * @return The concatenation of the paths, using the right separator.
- */
-std::string appendToDirectory(const std::string& basePath, const std::string& relativePath);
-
-/** Remove the last element of a path.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path a path.
- * @return The parent directory (or empty string if none).
- */
-std::string removeLastPathElement(const std::string& path);
-
-/** Get the last element of a path.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path a path.
- * @return The base name of the path or empty string if none (ending with a separator).
- */
-std::string getLastPathElement(const std::string& path);
-
-/** Compute the absolute path of a relative path based on another one
- *
- * Equivalent to appendToDirectory followed by a normalization of the path.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path the base path (if empty, current directory is taken).
- * @param relativePath the relative path.
- * @return a absolute path.
- */
-std::string computeAbsolutePath(const std::string& path, const std::string& relativePath);
-
-/** Compute the relative path of a path relative to another one
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path the base path.
- * @param absolutePath the absolute path to find the relative path for.
- * @return a relative path (pointing to absolutePath, relative to path).
- */
-std::string computeRelativePath(const std::string& path, const std::string& absolutePath);
-
-/** Sleep the current thread.
- *
- * This function is provided as a small helper. It is probably better to use native tools.
- *
- * @param milliseconds The number of milliseconds to wait for.
- */
-void sleep(unsigned int milliseconds);
-
-/** Split a string
- *
- * This function is provided as a small helper. It is probably better to use native tools.
- *
- * Assuming text = "foo:;bar;baz,oups;"
- *
- * split(text, ":;", true, true) => ["foo", ":", ";", "bar", ";", "baz,oups", ";"]
- * split(text, ":;", true, false) => ["foo", "bar", "baz,oups"] (default)
- * split(text, ":;", false, true) => ["foo", ":", "", ";", "bar", ";", "baz,oups", ";", ""]
- * split(text, ":;", false, false) => ["foo", "", "bar", "baz,oups", ""]
- *
- * @param str The string to split.
- * @param delims A string of potential delimiters.
- *               Each charater in the string can be a individual delimiters.
- * @param dropEmpty true if empty part must be dropped from the result.
- * @param keepDelim true if delimiter must be included from the result.
- * @return a list of part (potentially containing delimiters)
- */
-std::vector<std::string> split(const std::string& str, const std::string& delims, bool dropEmpty=true, bool keepDelim = false);
-
-/** Convert language code from iso2 code to iso3
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate locales.
- *
- * @param a2code a iso2 code string.
- * @return the corresponding iso3 code.
- * @throw std::out_of_range if iso2 code is not known.
- */
-std::string converta2toa3(const std::string& a2code);
-
-/** Extracts content from given file.
- *
- * This function provides content of a file provided it's path.
- *
- * @param path The absolute path provided in string format.
- * @return Content of corresponding file in string format.
- */
-std::string getFileContent(const std::string& path);
-
-/** checks if file exists.
- *
- * This function returns boolean stating if file exists or not.
- *
- * @param path The absolute path provided in string format.
- * @return Boolean representing if file exists or not.
- */
-bool fileExists(const std::string& path);
-
-/** provides mimetype from filename.
- *
- * This function provides mimetype from file-name.
- *
- * @param filename string containing filename.
- * @return mimetype from filename in string format.
- */
-std::string getMimeTypeForFile(const std::string& filename);
-}
-#endif // KIWIX_TOOLS_H
--- a/include/tools/base64.h
+++ b/include/tools/base64.h
--- a/include/tools/networkTools.h
+++ b/include/tools/networkTools.h
--- a/include/tools/otherTools.h
+++ b/include/tools/otherTools.h
@@ -32,7 +32,9 @@ namespace pugi {

 namespace kiwix
 {
+  void sleep(unsigned int milliseconds);
  std::string nodeToString(const pugi::xml_node& node);
+  std::string converta2toa3(const std::string& a2code);

  /*
   * Convert all format tag string to new format
--- a/include/tools/pathTools.h
+++ b/include/tools/pathTools.h
@@ -26,13 +26,23 @@
 std::string WideToUtf8(const std::wstring& wstr);
 std::wstring Utf8ToWide(const std::string& str);
 #endif
+bool isRelativePath(const std::string& path);
+std::string computeAbsolutePath(const std::string& path, const std::string& relativePath);
+std::string computeRelativePath(const std::string& path, const std::string& absolutePath);
+std::string removeLastPathElement(const std::string& path);
+std::string appendToDirectory(const std::string& directoryPath, const std::string& filename);

 unsigned int getFileSize(const std::string& path);
 std::string getFileSizeAsString(const std::string& path);
+std::string getFileContent(const std::string& path);
+bool fileExists(const std::string& path);
 bool makeDirectory(const std::string& path);
 std::string makeTmpDirectory();
 bool copyFile(const std::string& sourcePath, const std::string& destPath);
+std::string getLastPathElement(const std::string& path);
+std::string getExecutablePath(bool realPathOnly = false);
+std::string getCurrentDirectory();
+std::string getDataDirectory();
 bool writeTextFile(const std::string& path, const std::string& content);
-
+std::string getMimeTypeForFile(const std::string& filename);
 #endif
-
--- a/include/tools/regexTools.h
+++ b/include/tools/regexTools.h
--- a/include/tools/stringTools.h
+++ b/include/tools/stringTools.h
@@ -43,6 +43,7 @@ void loadICUExternalTables();
 std::string urlEncode(const std::string& value, bool encodeReserved = false);
 std::string urlDecode(const std::string& value, bool component = false);

+std::vector<std::string> split(const std::string& str, const std::string& delims, bool trimEmpty = true, bool keepDelim = false);
 std::string join(const std::vector<std::string>& list, const std::string& sep);

 std::string ucAll(const std::string& word);
@@ -69,7 +70,5 @@ T extractFromString(const std::string& str) {
 }

 bool startsWith(const std::string& base, const std::string& start);
-
-std::vector<std::string> getTitleVariants(const std::string& title);
 } //namespace kiwix
 #endif
--- a/src/aria2.cpp
+++ b/src/aria2.cpp
@@ -6,10 +6,10 @@
 #include <sstream>
 #include <thread>
 #include <chrono>
-#include "tools.h"
-#include "tools/pathTools.h"
-#include "tools/stringTools.h"
-#include "downloader.h" // For AriaError
+#include <tools/otherTools.h>
+#include <tools/pathTools.h>
+#include <tools/stringTools.h>
+#include <downloader.h> // For AriaError

 #ifdef _WIN32
 # define ARIA2_CMD "aria2c.exe"
--- a/src/book.cpp
+++ b/src/book.cpp
@@ -20,16 +20,10 @@
 #include "book.h"
 #include "reader.h"

-#include "tools.h"
 #include "tools/base64.h"
 #include "tools/regexTools.h"
 #include "tools/networkTools.h"
 #include "tools/otherTools.h"
-#include "tools/stringTools.h"
-#include "tools/pathTools.h"
-#include "tools/archiveTools.h"
-
-#include <zim/archive.h>

 #include <pugixml.hpp>

@@ -83,28 +77,26 @@ bool Book::update(const kiwix::Book& other)

 void Book::update(const kiwix::Reader& reader)
 {
-  update(*reader.getZimArchive());
-}
-
-void Book::update(const zim::Archive& archive) {
-  m_path = archive.getFilename();
+  m_path = reader.getZimFilePath();
  m_pathValid = true;
-  m_id = getArchiveId(archive);
-  m_title = getArchiveTitle(archive);
-  m_description = getMetaDescription(archive);
-  m_language = getMetaLanguage(archive);
-  m_creator = getMetaCreator(archive);
-  m_publisher = getMetaPublisher(archive);
-  m_date = getMetaDate(archive);
-  m_name = getMetaName(archive);
-  m_flavour = getMetaFlavour(archive);
-  m_tags = getMetaTags(archive);
+  m_id = reader.getId();
+  m_title = reader.getTitle();
+  m_description = reader.getDescription();
+  m_language = reader.getLanguage();
+  m_creator = reader.getCreator();
+  m_publisher = reader.getPublisher();
+  m_date = reader.getDate();
+  m_name = reader.getName();
+  m_flavour = reader.getFlavour();
+  m_tags = reader.getTags();
  m_category = getCategoryFromTags();
-  m_articleCount = archive.getArticleCount();
-  m_mediaCount = getArchiveMediaCount(archive);
-  m_size = static_cast<uint64_t>(getArchiveFileSize(archive)) << 10;
+  m_origId = reader.getOrigId();
+  m_articleCount = reader.getArticleCount();
+  m_mediaCount = reader.getMediaCount();
+  m_size = static_cast<uint64_t>(reader.getFileSize()) << 10;
+  m_pathValid = true;

-  getArchiveFavicon(archive, 48, m_favicon, m_faviconMimeType);
+  reader.getFavicon(m_favicon, m_faviconMimeType);
 }

 #define ATTR(name) node.attribute(name).value()
--- a/src/kiwixserve.cpp
+++ b/src/kiwixserve.cpp
@@ -9,7 +9,6 @@
    # include <unistd.h>
 #endif

-#include "tools.h"
 #include "tools/pathTools.h"
 #include "tools/stringTools.h"

--- a/src/library.cpp
+++ b/src/library.cpp
@@ -22,7 +22,6 @@
 #include "reader.h"
 #include "libxml_dumper.h"

-#include "tools.h"
 #include "tools/base64.h"
 #include "tools/regexTools.h"
 #include "tools/pathTools.h"
@@ -109,7 +108,6 @@ bool Library::removeBookById(const std::string& id)
 {
  m_bookDB->delete_document("Q" + id);
  m_readers.erase(id);
-  m_archives.erase(id);
  return m_books.erase(id) == 1;
 }

@@ -148,35 +146,11 @@ std::shared_ptr<Reader> Library::getReaderById(const std::string& id)
    return m_readers.at(id);
  } catch (std::out_of_range& e) {}

-  try {
-    auto reader = make_shared<Reader>(m_archives.at(id));
-    m_readers[id] = reader;
-    return reader;
-  } catch (std::out_of_range& e) {}
-
  auto book = getBookById(id);
  if (!book.isPathValid())
    return nullptr;
-
-  auto archive = make_shared<zim::Archive>(book.getPath());
-  m_archives[id] = archive;
-  auto reader = make_shared<Reader>(archive);
-  m_readers[id] = reader;
-  return reader;
-}
-
-std::shared_ptr<zim::Archive> Library::getArchiveById(const std::string& id)
-{
-  try {
-    return m_archives.at(id);
-  } catch (std::out_of_range& e) {}
-
-  auto book = getBookById(id);
-  if (!book.isPathValid())
-    return nullptr;
-
-  auto sptr = make_shared<zim::Archive>(book.getPath());
-  m_archives[id] = sptr;
+  auto sptr = make_shared<Reader>(book.getPath());
+  m_readers[id] = sptr;
  return sptr;
 }

@@ -208,36 +182,23 @@ bool Library::writeBookmarksToFile(const std::string& path) const
  return writeTextFile(path, dumper.dumpLibXMLBookmark());
 }

-Library::AttributeCounts Library::getBookAttributeCounts(BookStrPropMemFn p) const
-{
-  AttributeCounts propValueCounts;
-
-  for (const auto& pair: m_books) {
-    const auto& book = pair.second;
-    if (book.getOrigId().empty()) {
-      propValueCounts[(book.*p)()] += 1;
-    }
-  }
-  return propValueCounts;
-}
-
-std::vector<std::string> Library::getBookPropValueSet(BookStrPropMemFn p) const
-{
-  std::vector<std::string> result;
-  for ( const auto& kv : getBookAttributeCounts(p) ) {
-    result.push_back(kv.first);
-  }
-  return result;
-}
-
 std::vector<std::string> Library::getBooksLanguages() const
 {
-  return getBookPropValueSet(&Book::getLanguage);
-}
+  std::vector<std::string> booksLanguages;
+  std::map<std::string, bool> booksLanguagesMap;

-Library::AttributeCounts Library::getBooksLanguagesWithCounts() const
-{
-  return getBookAttributeCounts(&Book::getLanguage);
+  for (auto& pair: m_books) {
+    auto& book = pair.second;
+    auto& language = book.getLanguage();
+    if (booksLanguagesMap.find(language) == booksLanguagesMap.end()) {
+      if (book.getOrigId().empty()) {
+        booksLanguagesMap[language] = true;
+        booksLanguages.push_back(language);
+      }
+    }
+  }
+
+  return booksLanguages;
 }

 std::vector<std::string> Library::getBooksCategories() const
@@ -257,12 +218,40 @@ std::vector<std::string> Library::getBooksCategories() const

 std::vector<std::string> Library::getBooksCreators() const
 {
-  return getBookPropValueSet(&Book::getCreator);
+  std::vector<std::string> booksCreators;
+  std::map<std::string, bool> booksCreatorsMap;
+
+  for (auto& pair: m_books) {
+    auto& book = pair.second;
+    auto& creator = book.getCreator();
+    if (booksCreatorsMap.find(creator) == booksCreatorsMap.end()) {
+      if (book.getOrigId().empty()) {
+        booksCreatorsMap[creator] = true;
+        booksCreators.push_back(creator);
+      }
+    }
+  }
+
+  return booksCreators;
 }

 std::vector<std::string> Library::getBooksPublishers() const
 {
-  return getBookPropValueSet(&Book::getPublisher);
+  std::vector<std::string> booksPublishers;
+  std::map<std::string, bool> booksPublishersMap;
+
+  for (auto& pair:m_books) {
+    auto& book = pair.second;
+    auto& publisher = book.getPublisher();
+    if (booksPublishersMap.find(publisher) == booksPublishersMap.end()) {
+      if (book.getOrigId().empty()) {
+        booksPublishersMap[publisher] = true;
+        booksPublishers.push_back(publisher);
+      }
+    }
+  }
+
+  return booksPublishers;
 }

 const std::vector<kiwix::Bookmark> Library::getBookmarks(bool onlyValidBookmarks) const
--- a/src/libxml_dumper.cpp
+++ b/src/libxml_dumper.cpp
@@ -20,10 +20,10 @@
 #include "libxml_dumper.h"
 #include "book.h"

-#include "tools.h"
 #include "tools/base64.h"
 #include "tools/stringTools.h"
 #include "tools/otherTools.h"
+#include "tools/pathTools.h"

 namespace kiwix
 {
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -19,7 +19,6 @@

 #include "manager.h"

-#include "tools.h"
 #include "tools/pathTools.h"

 #include <pugixml.hpp>
@@ -215,8 +214,8 @@ bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book)
    tmp_path = computeAbsolutePath(getCurrentDirectory(), path);
  }
  try {
-    zim::Archive archive(tmp_path);
-    book->update(archive);
+    kiwix::Reader reader(tmp_path);
+    book->update(reader);
    book->setPathValid(true);
  } catch (const std::exception& e) {
    book->setPathValid(false);
--- a/src/meson.build
+++ b/src/meson.build
@@ -19,7 +19,6 @@ kiwix_sources = [
  'tools/stringTools.cpp',
  'tools/networkTools.cpp',
  'tools/otherTools.cpp',
-  'tools/archiveTools.cpp',
  'kiwixserve.cpp',
  'name_mapper.cpp',
  'server/byte_range.cpp',
@@ -27,8 +26,7 @@ kiwix_sources = [
  'server/request_context.cpp',
  'server/response.cpp',
  'server/internalServer.cpp',
-  'server/internalServer_catalog_v2.cpp',
-  'opds_catalog.cpp'
+  'server/internalServer_catalog_v2.cpp'
 ]
 kiwix_sources += lib_resources

--- a/src/opds_catalog.cpp
+++ b/src/opds_catalog.cpp
@@ -1,74 +0,0 @@
-/*
- * Copyright 2021 Veloman Yunkan <veloman.yunkan@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "opds_catalog.h"
-#include "tools/stringTools.h"
-
-#include <sstream>
-
-namespace kiwix
-{
-
-namespace
-{
-const char opdsSearchEndpoint[] = "/catalog/v2/entries";
-
-enum Separator { AMP };
-
-std::ostringstream& operator<<(std::ostringstream& oss, Separator sep)
-{
-  if ( oss.tellp() > 0 )
-    oss << "&";
-  return oss;
-}
-
-std::string buildSearchString(const Filter& f)
-{
-  std::ostringstream oss;
-  if ( f.hasQuery() )
-    oss << AMP << "q=" << urlEncode(f.getQuery());
-
-  if ( f.hasCategory() )
-    oss << AMP << "category=" << urlEncode(f.getCategory());
-
-  if ( f.hasLang() )
-    oss << AMP << "lang=" << urlEncode(f.getLang());
-
-  if ( f.hasName() )
-    oss << AMP << "name=" << urlEncode(f.getName());
-
-  if ( !f.getAcceptTags().empty() )
-    oss << AMP << "tag=" << urlEncode(join(f.getAcceptTags(), ";"));
-
-  return oss.str();
-}
-
-} // unnamed namespace
-
-std::string getSearchUrl(const Filter& f)
-{
-  const std::string searchString = buildSearchString(f);
-
-  if ( searchString.empty() )
-    return opdsSearchEndpoint;
-  else
-    return opdsSearchEndpoint + ("?" + searchString);
-}
-
-} // namespace kiwix
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -20,12 +20,10 @@
 #include "opds_dumper.h"
 #include "book.h"

+#include "tools/otherTools.h"
+
 #include "kiwixlib-resources.h"
 #include <mustache.hpp>
-#include <unicode/locid.h>
-
-#include "tools/stringTools.h"
-#include "tools/otherTools.h"

 namespace kiwix
 {
@@ -51,31 +49,18 @@ namespace
 {

 typedef kainjow::mustache::data MustacheData;
-typedef kainjow::mustache::list BooksData;
-typedef kainjow::mustache::list IllustrationInfo;
+typedef kainjow::mustache::list BookData;

-IllustrationInfo getBookIllustrationInfo(const Book& book)
-{
-    kainjow::mustache::list illustrations;
-    if ( book.isPathValid() ) {
-      for ( auto illustration_size : zim::Archive(book.getPath()).getIllustrationSizes() ) {
-        illustrations.push_back(kainjow::mustache::object{
-          {"icon_width", to_string(illustration_size)},
-          {"icon_height", to_string(illustration_size)},
-          {"icon_scale", "1"},
-        });
-      }
-    }
-    return illustrations;
-}
-
-kainjow::mustache::object getSingleBookData(const Book& book)
+BookData getBookData(const Library* library, const std::vector<std::string>& bookIds)
 {
+  BookData bookData;
+  for ( const auto& bookId : bookIds ) {
+    const Book& book = library->getBookById(bookId);
    const MustacheData bookUrl = book.getUrl().empty()
                               ? MustacheData(false)
                               : MustacheData(book.getUrl());
-    return kainjow::mustache::object{
-      {"id", book.getId()},
+    bookData.push_back(kainjow::mustache::object{
+      {"id", "urn:uuid:"+book.getId()},
      {"name", book.getName()},
      {"title", book.getTitle()},
      {"description", book.getDescription()},
@@ -91,46 +76,17 @@ kainjow::mustache::object getSingleBookData(const Book& book)
      {"publisher_name", book.getPublisher()},
      {"url", bookUrl},
      {"size", to_string(book.getSize())},
-      {"icons", getBookIllustrationInfo(book)},
-    };
-}
-
-std::string getSingleBookEntryXML(const Book& book, bool withXMLHeader, const std::string& endpointRoot, bool partial)
-{
-  auto data = getSingleBookData(book);
-  data["with_xml_header"] = MustacheData(withXMLHeader);
-  data["dump_partial_entries"] = MustacheData(partial);
-  data["endpoint_root"] = endpointRoot;
-  return render_template(RESOURCE::templates::catalog_v2_entry_xml, data);
-}
-
-BooksData getBooksData(const Library* library, const std::vector<std::string>& bookIds, const std::string& endpointRoot, bool partial)
-{
-  BooksData booksData;
-  for ( const auto& bookId : bookIds ) {
-    const Book& book = library->getBookById(bookId);
-    booksData.push_back(kainjow::mustache::object{
-        {"entry", getSingleBookEntryXML(book, false, endpointRoot, partial)}
    });
  }

-  return booksData;
+  return bookData;
 }

-std::string getLanguageSelfName(const std::string& lang) {
-  const icu::Locale locale(lang.c_str());
-  icu::UnicodeString ustring;
-  locale.getDisplayLanguage(locale, ustring);
-  std::string result;
-  ustring.toUTF8String(result);
-  return result;
-};
-
 } // unnamed namespace

 string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const std::string& query) const
 {
-  const auto booksData = getBooksData(library, bookIds, "", false);
+  const auto bookData = getBookData(library, bookIds);
  const kainjow::mustache::object template_data{
     {"date", gen_date_str()},
     {"root", rootLocation},
@@ -139,44 +95,36 @@ string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const s
     {"totalResults", to_string(m_totalResults)},
     {"startIndex", to_string(m_startIndex)},
     {"itemsPerPage", to_string(m_count)},
-     {"books", booksData }
+     {"books", bookData }
  };

  return render_template(RESOURCE::templates::catalog_entries_xml, template_data);
 }

-string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query, bool partial) const
+string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query) const
 {
-  const auto endpointRoot = rootLocation + "/catalog/v2";
-  const auto booksData = getBooksData(library, bookIds, endpointRoot, partial);
+  const auto bookData = getBookData(library, bookIds);

-  const char* const endpoint = partial ? "/partial_entries" : "/entries";
  const kainjow::mustache::object template_data{
     {"date", gen_date_str()},
-     {"endpoint_root", endpointRoot},
-     {"feed_id", gen_uuid(libraryId + endpoint + "?" + query)},
+     {"endpoint_root", rootLocation + "/catalog/v2"},
+     {"feed_id", gen_uuid(libraryId + "/entries?"+query)},
     {"filter", query.empty() ? MustacheData(false) : MustacheData(query)},
     {"query", query.empty() ? "" : "?" + urlEncode(query)},
     {"totalResults", to_string(m_totalResults)},
     {"startIndex", to_string(m_startIndex)},
     {"itemsPerPage", to_string(m_count)},
-     {"books", booksData },
-     {"dump_partial_entries", MustacheData(partial)}
+     {"books", bookData }
  };

  return render_template(RESOURCE::templates::catalog_v2_entries_xml, template_data);
 }

-std::string OPDSDumper::dumpOPDSCompleteEntry(const std::string& bookId) const
-{
-  return getSingleBookEntryXML(library->getBookById(bookId), true, "", false);
-}
-
-std::string OPDSDumper::categoriesOPDSFeed() const
+std::string OPDSDumper::categoriesOPDSFeed(const std::vector<std::string>& categories) const
 {
  const auto now = gen_date_str();
  kainjow::mustache::list categoryData;
-  for ( const auto& category : library->getBooksCategories() ) {
+  for ( const auto& category : categories ) {
    const auto urlencodedCategoryName = urlEncode(category);
    categoryData.push_back(kainjow::mustache::object{
      {"name", category},
@@ -197,32 +145,4 @@ std::string OPDSDumper::categoriesOPDSFeed() const
  );
 }

-std::string OPDSDumper::languagesOPDSFeed() const
-{
-  const auto now = gen_date_str();
-  kainjow::mustache::list languageData;
-  for ( const auto& langAndBookCount : library->getBooksLanguagesWithCounts() ) {
-    const std::string languageCode = langAndBookCount.first;
-    const int bookCount = langAndBookCount.second;
-    const auto languageSelfName = getLanguageSelfName(languageCode);
-    languageData.push_back(kainjow::mustache::object{
-      {"lang_code",  languageCode},
-      {"lang_self_name", languageSelfName},
-      {"book_count", to_string(bookCount)},
-      {"updated", now},
-      {"id", gen_uuid(libraryId + "/languages/" + languageCode)}
-    });
-  }
-
-  return render_template(
-             RESOURCE::templates::catalog_v2_languages_xml,
-             kainjow::mustache::object{
-               {"date", now},
-               {"endpoint_root", rootLocation + "/catalog/v2"},
-               {"feed_id", gen_uuid(libraryId + "/languages")},
-               {"languages", languageData }
-             }
-  );
-}
-
 }
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -21,14 +21,48 @@
 #include <time.h>

 #include <zim/search.h>
-#include <zim/suggestion.h>
 #include <zim/item.h>
 #include <zim/error.h>

-#include "tools.h"
-#include "tools/stringTools.h"
 #include "tools/otherTools.h"
-#include "tools/archiveTools.h"
+
+inline char hi(char v)
+{
+  char hex[] = "0123456789abcdef";
+  return hex[(v >> 4) & 0xf];
+}
+
+inline char lo(char v)
+{
+  char hex[] = "0123456789abcdef";
+  return hex[v & 0xf];
+}
+
+std::string hexUUID(std::string in)
+{
+  std::ostringstream out;
+  for (unsigned n = 0; n < 4; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  out << '-';
+  for (unsigned n = 4; n < 6; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  out << '-';
+  for (unsigned n = 6; n < 8; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  out << '-';
+  for (unsigned n = 8; n < 10; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  out << '-';
+  for (unsigned n = 10; n < 16; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  std::string op = out.str();
+  return op;
+}

 namespace kiwix
 {
@@ -52,11 +86,6 @@ Reader::Reader(const string zimFilePath)
  srand(time(nullptr));
 }

-Reader::Reader(const std::shared_ptr<zim::Archive> archive)
-  : zimArchive(archive),
-    zimFilePath(archive->getFilename())
-  {}
-
 #ifndef _WIN32
 Reader::Reader(int fd)
  :  zimArchive(new zim::Archive(fd)),
@@ -82,7 +111,12 @@ zim::Archive* Reader::getZimArchive() const

 MimeCounterType Reader::parseCounterMetadata() const
 {
-  return kiwix::parseArchiveCounter(*zimArchive);
+  try {
+    auto counterContent = zimArchive->getMetadata("Counter");
+    return parseMimetypeCounter(counterContent);
+  } catch (zim::EntryNotFound& e) {
+    return {};
+  }
 }

 /* Get the count of articles which can be indexed/displayed */
@@ -104,7 +138,19 @@ unsigned int Reader::getArticleCount() const
 /* Get the count of medias content in the ZIM file */
 unsigned int Reader::getMediaCount() const
 {
-  return kiwix::getArchiveMediaCount(*zimArchive);
+  std::map<const std::string, unsigned int> counterMap
+      = this->parseCounterMetadata();
+  unsigned int counter = 0;
+
+  for (auto &pair:counterMap) {
+    if (startsWith(pair.first, "image/") ||
+        startsWith(pair.first, "video/") ||
+        startsWith(pair.first, "audio/")) {
+      counter += pair.second;
+    }
+  }
+
+  return counter;
 }

 /* Get the total of all items of a ZIM file, redirects included */
@@ -116,7 +162,9 @@ unsigned int Reader::getGlobalCount() const
 /* Return the UID of the ZIM file */
 string Reader::getId() const
 {
-  return kiwix::getArchiveId(*zimArchive);
+  std::ostringstream s;
+  s << zimArchive->getUuid();
+  return s.str();
 }

 Entry Reader::getRandomPage() const
@@ -135,7 +183,14 @@ Entry Reader::getMainPage() const

 bool Reader::getFavicon(string& content, string& mimeType) const
 {
-  return kiwix::getArchiveFavicon(*zimArchive, 48, content, mimeType);
+  try {
+    auto item = zimArchive->getIllustrationItem();
+    content = item.getData();
+    mimeType = item.getMimetype();
+    return true;
+  } catch(zim::EntryNotFound& e) {};
+
+  return false;
 }

 string Reader::getZimFilePath() const
@@ -157,32 +212,47 @@ bool Reader::getMetadata(const string& name, string& value) const

 string Reader::getName() const
 {
-  return kiwix::getMetaName(*zimArchive);
+  METADATA("Name")
 }

 string Reader::getTitle() const
 {
-  return kiwix::getArchiveTitle(*zimArchive);
+  string value = zimArchive->getMetadata("Title");
+  if (value.empty()) {
+    value = getLastPathElement(zimFilePath);
+    std::replace(value.begin(), value.end(), '_', ' ');
+    size_t pos = value.find(".zim");
+    value = value.substr(0, pos);
+  }
+  return value;
 }

 string Reader::getCreator() const
 {
-  return kiwix::getMetaCreator(*zimArchive);
+  METADATA("Creator")
 }

 string Reader::getPublisher() const
 {
-  return kiwix::getMetaPublisher(*zimArchive);
+  METADATA("Publisher")
 }

 string Reader::getDate() const
 {
-  return kiwix::getMetaDate(*zimArchive);
+  METADATA("Date")
 }

 string Reader::getDescription() const
 {
-  return kiwix::getMetaDescription(*zimArchive);
+  string value;
+  this->getMetadata("Description", value);
+
+  /* Mediawiki Collection tends to use the "Subtitle" name */
+  if (value.empty()) {
+    this->getMetadata("Subtitle", value);
+  }
+
+  return value;
 }

 string Reader::getLongDescription() const
@@ -192,7 +262,7 @@ string Reader::getLongDescription() const

 string Reader::getLanguage() const
 {
-  return kiwix::getMetaLanguage(*zimArchive);
+  METADATA("Language")
 }

 string Reader::getLicense() const
@@ -202,7 +272,13 @@ string Reader::getLicense() const

 string Reader::getTags(bool original) const
 {
-  return kiwix::getMetaTags(*zimArchive, original);
+  string tags_str;
+  getMetadata("Tags", tags_str);
+  if (original) {
+    return tags_str;
+  }
+  auto tags = convertTags(tags_str);
+  return join(tags, ";");
 }


@@ -225,7 +301,7 @@ string Reader::getRelation() const

 string Reader::getFlavour() const
 {
-  return kiwix::getMetaFlavour(*zimArchive);
+  METADATA("Flavour")
 }

 string Reader::getSource() const
@@ -239,10 +315,39 @@ string Reader::getScraper() const
 }
 #undef METADATA

+string Reader::getOrigId() const
+{
+  string value;
+  this->getMetadata("startfileuid", value);
+  if (value.empty()) {
+    return "";
+  }
+  std::string id = value;
+  std::string origID;
+  std::string temp = "";
+  unsigned int k = 0;
+  char tempArray[16] = "";
+  for (unsigned int i = 0; i < id.size(); i++) {
+    if (id[i] == '\n') {
+      tempArray[k] = atoi(temp.c_str());
+      temp = "";
+      k++;
+    } else {
+      temp += id[i];
+    }
+  }
+  origID = hexUUID(tempArray);
+  return origID;
+}
+
 Entry Reader::getEntryFromPath(const std::string& path) const
 {
+  if (path.empty() || path == "/") {
+    return getMainPage();
+  }
+
  try {
-    return kiwix::getEntryFromPath(*zimArchive, path);
+    return zimArchive->getEntryByPath(path);
  } catch (zim::EntryNotFound& e) {
    throw NoEntry();
  }
@@ -355,7 +460,12 @@ bool Reader::searchSuggestions(const string& prefix,
 std::vector<std::string> Reader::getTitleVariants(
    const std::string& title) const
 {
-  return kiwix::getTitleVariants(title);
+  std::vector<std::string> variants;
+  variants.push_back(title);
+  variants.push_back(kiwix::ucFirst(title));
+  variants.push_back(kiwix::lcFirst(title));
+  variants.push_back(kiwix::toTitle(title));
+  return variants;
 }


@@ -378,36 +488,35 @@ bool Reader::searchSuggestionsSmart(const string& prefix,
                                    SuggestionsList_t& results)
 {
  std::vector<std::string> variants = this->getTitleVariants(prefix);
+  bool retVal = false;

-  auto suggestionSearcher = zim::SuggestionSearcher(*zimArchive);
+  /* Try to search in the title using fulltext search database */

-  if (zimArchive->hasTitleIndex()) {
-    auto suggestionSearch = suggestionSearcher.suggest(prefix);
+  auto suggestionSearcher = zim::Searcher(*zimArchive);
+  zim::Query suggestionQuery;
+  suggestionQuery.setQuery(prefix, true);
+  auto suggestionSearch = suggestionSearcher.search(suggestionQuery);
+
+  if (suggestionSearch.getEstimatedMatches()) {
    const auto suggestions = suggestionSearch.getResults(0, suggestionsCount);
-    for (auto current : suggestions) {
+    for (auto current = suggestions.begin();
+         current != suggestions.end();
+         current++) {
      SuggestionItem suggestion(current.getTitle(), kiwix::normalize(current.getTitle()),
                                current.getPath(), current.getSnippet());
      results.push_back(suggestion);
    }
+    retVal = true;
  } else {
-    // Check some of the variants of the prefix
    for (std::vector<std::string>::iterator variantsItr = variants.begin();
         variantsItr != variants.end();
         variantsItr++) {
-      auto suggestionSearch = suggestionSearcher.suggest(*variantsItr);
-      for (auto current : suggestionSearch.getResults(0, suggestionsCount)) {
-        if (results.size() >= suggestionsCount) {
-          break;
-        }
-
-        SuggestionItem suggestion(current.getTitle(), kiwix::normalize(current.getTitle()),
-                                current.getPath(), current.getSnippet());
-        results.push_back(suggestion);
-      }
+      retVal = this->searchSuggestions(*variantsItr, suggestionsCount, results)
+               || retVal;
    }
  }

-  return results.size() > 0;
+  return retVal;
 }

 /* Get next suggestion */
@@ -466,7 +575,7 @@ bool Reader::isCorrupted() const
 /* Return the file size, works also for splitted files */
 unsigned int Reader::getFileSize() const
 {
-  return kiwix::getArchiveFileSize(*zimArchive);
+  return zimArchive->getFilesize() / 1024;
 }

 }
--- a/src/search_renderer.cpp
+++ b/src/search_renderer.cpp
@@ -30,29 +30,17 @@

 #include <mustache.hpp>
 #include "kiwixlib-resources.h"
-#include "tools/stringTools.h"
+

 namespace kiwix
 {

 /* Constructor */
 SearchRenderer::SearchRenderer(Searcher* searcher, NameMapper* mapper)
-    : m_srs(searcher->getSearchResultSet()),
+    : mp_searcher(searcher),
      mp_nameMapper(mapper),
      protocolPrefix("zim://"),
-      searchProtocolPrefix("search://?"),
-      estimatedResultCount(searcher->getEstimatedResultCount()),
-      resultStart(searcher->getResultStart())
-{}
-
-SearchRenderer::SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper,
-                      unsigned int start, unsigned int estimatedResultCount)
-    : m_srs(srs),
-      mp_nameMapper(mapper),
-      protocolPrefix("zim://"),
-      searchProtocolPrefix("search://?"),
-      estimatedResultCount(estimatedResultCount),
-      resultStart(start)
+      searchProtocolPrefix("search://?")
 {}

 /* Destructor */
@@ -82,26 +70,29 @@ std::string SearchRenderer::getHtml()
 {
  kainjow::mustache::data results{kainjow::mustache::data::type::list};

-  for (auto it = m_srs.begin(); it != m_srs.end(); it++) {
+  mp_searcher->restart_search();
+  Result* p_result = NULL;
+  while ((p_result = mp_searcher->getNextResult())) {
    kainjow::mustache::data result;
-    result.set("title", it.getTitle());
-    result.set("url", it.getPath());
-    result.set("snippet", it.getSnippet());
-    std::ostringstream s;
-    s << it.getZimId();
-    result.set("resultContentId", mp_nameMapper->getNameForId(s.str()));
+    result.set("title", p_result->get_title());
+    result.set("url", p_result->get_url());
+    result.set("snippet", p_result->get_snippet());
+    result.set("resultContentId", mp_nameMapper->getNameForId(p_result->get_zimId()));

-    if (it.getWordCount() >= 0) {
-      result.set("wordCount", kiwix::beautifyInteger(it.getWordCount()));
+    if (p_result->get_wordCount() >= 0) {
+      result.set("wordCount", kiwix::beautifyInteger(p_result->get_wordCount()));
    }

    results.push_back(result);
+    delete p_result;
  }

  // pages
  kainjow::mustache::data pages{kainjow::mustache::data::type::list};

+  auto resultStart = mp_searcher->getResultStart();
  auto resultEnd = 0U;
+  auto estimatedResultCount = mp_searcher->getEstimatedResultCount();
  auto currentPage = 0U;
  auto pageStart = 0U;
  auto pageEnd = 0U;
@@ -155,4 +146,4 @@ std::string SearchRenderer::getHtml()
  return ss.str();
 }

-}
+}
--- a/src/searcher.cpp
+++ b/src/searcher.cpp
@@ -18,16 +18,14 @@
 */


+#include <cmath>

 #include "searcher.h"
 #include "reader.h"

 #include <zim/search.h>
-#include <zim/suggestion.h>

 #include <mustache.hpp>
-#include <cmath>
-#include "tools/stringTools.h"
 #include "kiwixlib-resources.h"

 #define MAX_SEARCH_LEN 140
@@ -38,7 +36,6 @@ class _Result : public Result
 {
 public:
  _Result(zim::SearchResultSet::iterator iterator);
-  _Result(SuggestionItem suggestionItem);
  virtual ~_Result(){};

  virtual std::string get_url();
@@ -52,8 +49,6 @@ class _Result : public Result

 private:
  zim::SearchResultSet::iterator iterator;
-  SuggestionItem suggestionItem;
-  bool isSuggestion;
 };

 struct SearcherInternal : zim::SearchResultSet {
@@ -66,20 +61,12 @@ struct SearcherInternal : zim::SearchResultSet {
  zim::SearchResultSet::iterator current_iterator;
 };

-struct SuggestionInternal : zim::SuggestionResultSet {
-  explicit SuggestionInternal(const zim::SuggestionResultSet& srs)
-    : zim::SuggestionResultSet(srs),
-      currentIterator(srs.begin()) {}
-
-  zim::SuggestionResultSet::iterator currentIterator;
-};
-
 /* Constructor */
 Searcher::Searcher()
    : searchPattern(""),
      estimatedResultCount(0),
      resultStart(0),
-      maxResultCount(0)
+      resultEnd(0)
 {
  loadICUExternalTables();
 }
@@ -107,7 +94,7 @@ Reader* Searcher::get_reader(int readerIndex)
 /* Search strings in the database */
 void Searcher::search(const std::string& search,
                      unsigned int resultStart,
-                      unsigned int maxResultCount,
+                      unsigned int resultEnd,
                      const bool verbose)
 {
  this->reset();
@@ -118,9 +105,9 @@ void Searcher::search(const std::string& search,

  this->searchPattern = search;
  this->resultStart = resultStart;
-  this->maxResultCount = maxResultCount;
+  this->resultEnd = resultEnd;
  /* Try to find results */
-  if (maxResultCount != 0) {
+  if (resultStart != resultEnd) {
    /* Perform the search */
    string unaccentedSearch = removeAccents(search);
    std::vector<zim::Archive> archives;
@@ -131,11 +118,11 @@ void Searcher::search(const std::string& search,
      }
    }
    zim::Searcher searcher(archives);
-    searcher.setVerbose(verbose);
    zim::Query query;
-    query.setQuery(unaccentedSearch);
+    query.setQuery(unaccentedSearch, false);
+    query.setVerbose(verbose);
    zim::Search search = searcher.search(query);
-    internal.reset(new SearcherInternal(search.getResults(resultStart, maxResultCount)));
+    internal.reset(new SearcherInternal(search.getResults(resultStart, resultEnd)));
    this->estimatedResultCount = search.getEstimatedMatches();
  }

@@ -145,7 +132,7 @@ void Searcher::search(const std::string& search,

 void Searcher::geo_search(float latitude, float longitude, float distance,
                          unsigned int resultStart,
-                          unsigned int maxResultCount,
+                          unsigned int resultEnd,
                          const bool verbose)
 {
  this->reset();
@@ -159,10 +146,10 @@ void Searcher::geo_search(float latitude, float longitude, float distance,
  oss << "Articles located less than " << distance << " meters of " << latitude << ";" << longitude;
  this->searchPattern = oss.str();
  this->resultStart = resultStart;
-  this->maxResultCount = maxResultCount;
+  this->resultEnd = resultEnd;

  /* Try to find results */
-  if (maxResultCount == 0) {
+  if (resultStart == resultEnd) {
    return;
  }

@@ -172,12 +159,12 @@ void Searcher::geo_search(float latitude, float longitude, float distance,
    archives.push_back(*(*current)->getZimArchive());
  }
  zim::Searcher searcher(archives);
-  searcher.setVerbose(verbose);
  zim::Query query;
-  query.setQuery("");
+  query.setVerbose(verbose);
+  query.setQuery("", false);
  query.setGeorange(latitude, longitude, distance);
  zim::Search search = searcher.search(query);
-  internal.reset(new SearcherInternal(search.getResults(resultStart, maxResultCount)));
+  internal.reset(new SearcherInternal(search.getResults(resultStart, resultEnd)));
  this->estimatedResultCount = search.getEstimatedMatches();
 }

@@ -191,21 +178,11 @@ void Searcher::restart_search()

 Result* Searcher::getNextResult()
 {
-  if (internal.get() && internal->current_iterator != internal->end()) {
+  if (internal.get() &&
+             internal->current_iterator != internal->end()) {
    Result* result = new _Result(internal->current_iterator);
    internal->current_iterator++;
    return result;
-  } else if (suggestionInternal.get() &&
-             suggestionInternal->currentIterator != suggestionInternal->end()) {
-    SuggestionItem item(
-                        suggestionInternal->currentIterator->getTitle(),
-                        normalize(suggestionInternal->currentIterator->getTitle()),
-                        suggestionInternal->currentIterator->getPath(),
-                        suggestionInternal->currentIterator->getSnippet()
-                      );
-    Result* result = new _Result(item);
-    suggestionInternal->currentIterator++;
-    return result;
  }
  return NULL;
 }
@@ -228,15 +205,20 @@ void Searcher::suggestions(std::string& searchPattern, const bool verbose)

  this->searchPattern = searchPattern;
  this->resultStart = 0;
-  this->maxResultCount = 10;
+  this->resultEnd = 10;
  string unaccentedSearch = removeAccents(searchPattern);

-  // Multizim suggestion is not supported as of now! taking only one archive
-  zim::Archive archive = *(*this->readers.begin())->getZimArchive();
-  zim::SuggestionSearcher searcher(archive);
-  searcher.setVerbose(verbose);
-  zim::SuggestionSearch search = searcher.suggest(searchPattern);
-  suggestionInternal.reset(new SuggestionInternal(search.getResults(resultStart, maxResultCount)));
+  std::vector<zim::Archive> archives;
+  for (auto current = this->readers.begin(); current != this->readers.end();
+       current++) {
+    archives.push_back(*(*current)->getZimArchive());
+  }
+  zim::Searcher searcher(archives);
+  zim::Query query;
+  query.setVerbose(verbose);
+  query.setQuery(unaccentedSearch, true);
+  zim::Search search = searcher.search(query);
+  internal.reset(new SearcherInternal(search.getResults(resultStart, resultEnd)));
  this->estimatedResultCount = search.getEstimatedMatches();
 }

@@ -246,75 +228,41 @@ unsigned int Searcher::getEstimatedResultCount()
  return this->estimatedResultCount;
 }

-zim::SearchResultSet Searcher::getSearchResultSet()
-{
-  return *(this->internal);
-}
-
 _Result::_Result(zim::SearchResultSet::iterator iterator)
-    : iterator(iterator),
-      suggestionItem("", "", ""),
-      isSuggestion(false)
-{}
-
-_Result::_Result(SuggestionItem item)
-    : iterator(),
-      suggestionItem(item.getTitle(), item.getNormalizedTitle(), item.getPath(), item.getSnippet()),
-      isSuggestion(true)
-{}
+    : iterator(iterator)
+{
+}

 std::string _Result::get_url()
 {
-  if (isSuggestion) {
-    return suggestionItem.getPath();
-  }
  return iterator.getPath();
 }
 std::string _Result::get_title()
 {
-  if (isSuggestion) {
-    return suggestionItem.getTitle();
-  }
  return iterator.getTitle();
 }
 int _Result::get_score()
 {
-  if (isSuggestion) {
-    return 0;
-  }
  return iterator.getScore();
 }
 std::string _Result::get_snippet()
 {
-  if (isSuggestion) {
-    return suggestionItem.getSnippet();
-  }
  return iterator.getSnippet();
 }
 std::string _Result::get_content()
 {
-  if (isSuggestion) return "";
  return iterator->getItem(true).getData();
 }
 int _Result::get_size()
 {
-  if (isSuggestion) {
-    return 0;
-  }
  return iterator.getSize();
 }
 int _Result::get_wordCount()
 {
-  if (isSuggestion) {
-    return 0;
-  }
  return iterator.getWordCount();
 }
 std::string _Result::get_zimId()
 {
-  if (isSuggestion) {
-    return "";
-  }
  std::ostringstream s;
  s << iterator.getZimId();
  return s.str();
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -48,8 +48,7 @@ bool Server::start() {
    m_verbose,
    m_withTaskbar,
    m_withLibraryButton,
-    m_blockExternalLinks,
-    m_indexTemplateString));
+    m_blockExternalLinks));
  return mp_server->start();
 }

--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -43,11 +43,10 @@ extern "C" {
 #include "microhttpd_wrapper.h"
 }

-#include "tools.h"
+#include "tools/otherTools.h"
 #include "tools/pathTools.h"
 #include "tools/regexTools.h"
 #include "tools/stringTools.h"
-#include "tools/archiveTools.h"
 #include "library.h"
 #include "name_mapper.h"
 #include "entry.h"
@@ -56,11 +55,6 @@ extern "C" {
 #include "opds_dumper.h"

 #include <zim/uuid.h>
-#include <zim/error.h>
-#include <zim/search.h>
-#include <zim/suggestion.h>
-#include <zim/entry.h>
-#include <zim/item.h>

 #include <mustache.hpp>

@@ -95,16 +89,6 @@ inline std::string normalizeRootUrl(std::string rootUrl)
  return rootUrl.empty() ? rootUrl : "/" + rootUrl;
 }

-unsigned parseIllustration(const std::string& s)
-{
-  int nw(0), nh(0), nEnd(0);
-  long int w(-1), h(-1);
-  if ( sscanf(s.c_str(), "Illustration_%n%ldx%n%ld@1%n)", &nw, &w, &nh, &h, &nEnd) == 2
-     && nEnd == (int)s.size() && !isspace(s[nw]) && !isspace(s[nh]) && w == h && w >= 0) {
-    return w;
-  }
-  return 0;
-}
 } // unnamed namespace

 static IdNameMapper defaultNameMapper;
@@ -128,8 +112,7 @@ InternalServer::InternalServer(Library* library,
                               bool verbose,
                               bool withTaskbar,
                               bool withLibraryButton,
-                               bool blockExternalLinks,
-                               std::string indexTemplateString) :
+                               bool blockExternalLinks) :
  m_addr(addr),
  m_port(port),
  m_root(normalizeRootUrl(root)),
@@ -138,7 +121,6 @@ InternalServer::InternalServer(Library* library,
  m_withTaskbar(withTaskbar),
  m_withLibraryButton(withLibraryButton),
  m_blockExternalLinks(blockExternalLinks),
-  m_indexTemplateString(indexTemplateString.empty() ? RESOURCE::templates::index_html : indexTemplateString),
  mp_daemon(nullptr),
  mp_library(library),
  mp_nameMapper(nameMapper ? nameMapper : &defaultNameMapper)
@@ -338,66 +320,25 @@ InternalServer::get_matching_if_none_match_etag(const RequestContext& r) const

 std::unique_ptr<Response> InternalServer::build_homepage(const RequestContext& request)
 {
-  return ContentResponse::build(*this, m_indexTemplateString, get_default_data(), "text/html; charset=utf-8", true);
+  return ContentResponse::build(*this, RESOURCE::templates::index_html, get_default_data(), "text/html; charset=utf-8", true);
 }

-/**
- * Archive and Zim handlers begin
- **/
-
-// TODO: retrieve searcher from caching mechanism
-SuggestionsList_t getSuggestions(const zim::Archive* const archive,
-                  const std::string& queryString, int start, int suggestionCount)
-{
-  SuggestionsList_t suggestions;
-  auto searcher = zim::SuggestionSearcher(*archive);
-  if (archive->hasTitleIndex()) {
-    auto search = searcher.suggest(queryString);
-    auto srs = search.getResults(start, suggestionCount);
-
-    for (auto it : srs) {
-      SuggestionItem suggestion(it.getTitle(), kiwix::normalize(it.getTitle()),
-                                it.getPath(), it.getSnippet());
-      suggestions.push_back(suggestion);
-    }
-  } else {
-    // TODO: This case should be handled by libzim
-    std::vector<std::string> variants = getTitleVariants(queryString);
-    int currCount = 0;
-    for (auto it = variants.begin(); it != variants.end() && currCount < suggestionCount; it++) {
-      auto search = searcher.suggest(queryString);
-      auto srs = search.getResults(0, suggestionCount);
-      for (auto it : srs) {
-        SuggestionItem suggestion(it.getTitle(), kiwix::normalize(it.getTitle()),
-                                  it.getPath());
-        suggestions.push_back(suggestion);
-        currCount++;
-      }
-    }
-  }
-  return suggestions;
-}
-
-/**
- * Archive and Zim handlers end
- **/
-
 std::unique_ptr<Response> InternalServer::handle_meta(const RequestContext& request)
 {
  std::string bookName;
  std::string bookId;
  std::string meta_name;
-  std::shared_ptr<zim::Archive> archive;
+  std::shared_ptr<Reader> reader;
  try {
    bookName = request.get_argument("content");
    bookId = mp_nameMapper->getIdForName(bookName);
    meta_name = request.get_argument("name");
-    archive = mp_library->getArchiveById(bookId);
+    reader = mp_library->getReaderById(bookId);
  } catch (const std::out_of_range& e) {
    return Response::build_404(*this, request, bookName, "");
  }

-  if (archive == nullptr) {
+  if (reader == nullptr) {
    return Response::build_404(*this, request, bookName, "");
  }

@@ -405,25 +346,23 @@ std::unique_ptr<Response> InternalServer::handle_meta(const RequestContext& requ
  std::string mimeType = "text";

  if (meta_name == "title") {
-    content = getArchiveTitle(*archive);
+    content = reader->getTitle();
  } else if (meta_name == "description") {
-    content = getMetaDescription(*archive);
+    content = reader->getDescription();
  } else if (meta_name == "language") {
-    content = getMetaLanguage(*archive);
+    content = reader->getLanguage();
  } else if (meta_name == "name") {
-    content = getMetaName(*archive);
+    content = reader->getName();
  } else if (meta_name == "tags") {
-    content = getMetaTags(*archive);
+    content = reader->getTags();
  } else if (meta_name == "date") {
-    content = getMetaDate(*archive);
+    content = reader->getDate();
  } else if (meta_name == "creator") {
-    content = getMetaCreator(*archive);
+    content = reader->getCreator();
  } else if (meta_name == "publisher") {
-    content = getMetaPublisher(*archive);
+    content = reader->getPublisher();
  } else if (meta_name == "favicon") {
-    getArchiveFavicon(*archive, 48, content, mimeType);
-  } else if (const unsigned illustrationSize = parseIllustration(meta_name)) {
-    getArchiveFavicon(*archive, illustrationSize, content, mimeType);
+    reader->getFavicon(content, mimeType);
  } else {
    return Response::build_404(*this, request, bookName, "");
  }
@@ -441,70 +380,56 @@ std::unique_ptr<Response> InternalServer::handle_suggest(const RequestContext& r

  std::string content;
  std::string mimeType;
+  unsigned int maxSuggestionCount = 10;
+  unsigned int suggestionCount = 0;

  std::string bookName;
  std::string bookId;
-  std::string queryString;
-  std::shared_ptr<zim::Archive> archive;
+  std::string term;
+  std::shared_ptr<Reader> reader;
  try {
    bookName = request.get_argument("content");
    bookId = mp_nameMapper->getIdForName(bookName);
-    queryString = request.get_argument("term");
-    archive = mp_library->getArchiveById(bookId);
+    term = request.get_argument("term");
+    reader = mp_library->getReaderById(bookId);
  } catch (const std::out_of_range&) {
    return Response::build_404(*this, request, bookName, "");
  }

-  auto start = 0;
-  try {
-    start = request.get_argument<unsigned int>("start");
-  } catch (const std::exception&) {}
-
-  unsigned int count = 10;
-  try {
-    count = request.get_argument<unsigned int>("count");
-  } catch (const std::exception&) {}
-
-  if (count == 0) {
-    count = 10;
-  }
-
-  if (archive == nullptr) {
-    return Response::build_404(*this, request, bookName, "");
-  }
-
  if (m_verbose.load()) {
-    printf("Searching suggestions for: \"%s\"\n", queryString.c_str());
+    printf("Searching suggestions for: \"%s\"\n", term.c_str());
  }

  MustacheData results{MustacheData::type::list};

  bool first = true;
+  if (reader != nullptr) {
+    /* Get the suggestions */
+    SuggestionsList_t suggestions;
+    reader->searchSuggestionsSmart(term, maxSuggestionCount, suggestions);
+    for(auto& suggestion:suggestions) {
+      MustacheData result;
+      result.set("label", suggestion.getTitle());

-  /* Get the suggestions */
-  SuggestionsList_t suggestions = getSuggestions(archive.get(), queryString, start, count);
-  for(auto& suggestion:suggestions) {
-    MustacheData result;
-    result.set("label", suggestion.getTitle());
+      if (suggestion.hasSnippet()) {
+        result.set("label", suggestion.getSnippet());
+      }

-    if (suggestion.hasSnippet()) {
-      result.set("label", suggestion.getSnippet());
+      result.set("value", suggestion.getTitle());
+      result.set("kind", "path");
+      result.set("path", suggestion.getPath());
+      result.set("first", first);
+      first = false;
+      results.push_back(result);
+      suggestionCount++;
    }
-
-    result.set("value", suggestion.getTitle());
-    result.set("kind", "path");
-    result.set("path", suggestion.getPath());
-    result.set("first", first);
-    first = false;
-    results.push_back(result);
  }

-
  /* Propose the fulltext search if possible */
-  if (archive->hasFulltextIndex()) {
+  if (reader->hasFulltextIndex()) {
    MustacheData result;
-    result.set("label", "containing '" + queryString + "'...");
-    result.set("value", queryString + " ");
+    result.set("label", "containing '" + term + "'...");
+    result.set("value", term + " ");
    result.set("kind", "pattern");
    result.set("first", first);
    results.push_back(result);
@@ -567,34 +492,30 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
  } catch(const std::out_of_range&) {}
    catch(const std::invalid_argument&) {}

-  std::shared_ptr<zim::Archive> archive;
+  std::shared_ptr<Reader> reader(nullptr);
  try {
-    archive = mp_library->getArchiveById(bookId);
+    reader = mp_library->getReaderById(bookId);
  } catch (const std::out_of_range&) {}

  /* Make the search */
-  if ( (!archive && !bookName.empty())
+  if ( (!reader && !bookName.empty())
    || (patternString.empty() && ! has_geo_query) ) {
    auto data = get_default_data();
    data.set("pattern", encodeDiples(patternString));
    auto response = ContentResponse::build(*this, RESOURCE::templates::no_search_result_html, data, "text/html; charset=utf-8");
-    response->set_taskbar(bookName, archive ? getArchiveTitle(*archive) : "");
+    response->set_taskbar(bookName, reader ? reader->getTitle() : "");
    response->set_code(MHD_HTTP_NOT_FOUND);
    return std::move(response);
  }

-  std::shared_ptr<zim::Searcher> searcher;
-  if (archive) {
-    searcher = std::make_shared<zim::Searcher>(*archive);
+  Searcher searcher;
+  if (reader) {
+    searcher.add_reader(reader.get());
  } else {
    for (auto& bookId: mp_library->filter(kiwix::Filter().local(true).valid(true))) {
-      auto currentArchive = mp_library->getArchiveById(bookId);
-      if (currentArchive) {
-        if (! searcher) {
-          searcher = std::make_shared<zim::Searcher>(*currentArchive);
-        } else {
-          searcher->addArchive(*currentArchive);
-        }
+      auto currentReader = mp_library->getReaderById(bookId);
+      if (currentReader) {
+        searcher.add_reader(currentReader.get());
      }
    }
  }
@@ -615,37 +536,25 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
    pageLength = 25;
  }

+  auto end = start + pageLength;
+
  /* Get the results */
  try {
-    zim::Query query;
    if (patternString.empty()) {
-      // Execute geo-search
-      if (m_verbose.load()) {
-        cout << "Performing geo query `" << distance << "&(" << latitude << ";" << longitude << ")'" << endl;
-      }
-
-      query.setQuery("");
-      query.setGeorange(latitude, longitude, distance);
+      searcher.geo_search(latitude, longitude, distance,
+                           start, end, m_verbose.load());
    } else {
-      // Execute Ft search
-      if (m_verbose.load()) {
-          cout << "Performing query `" << patternString << "'" << endl;
-      }
-
-      std::string queryString = removeAccents(patternString);
-      query.setQuery(queryString);
+      searcher.search(patternString,
+                       start, end, m_verbose.load());
    }
-
-    zim::Search search = searcher->search(query);
-    SearchRenderer renderer(search.getResults(start, pageLength), mp_nameMapper, start,
-                            search.getEstimatedMatches());
+    SearchRenderer renderer(&searcher, mp_nameMapper);
    renderer.setSearchPattern(patternString);
    renderer.setSearchContent(bookName);
    renderer.setProtocolPrefix(m_root + "/");
    renderer.setSearchProtocolPrefix(m_root + "/search?");
    renderer.setPageLength(pageLength);
    auto response = ContentResponse::build(*this, renderer.getHtml(), "text/html; charset=utf-8");
-    response->set_taskbar(bookName, archive ? getArchiveTitle(*archive) : "");
+    response->set_taskbar(bookName, reader ? reader->getTitle() : "");

    return std::move(response);
  } catch (const std::exception& e) {
@@ -662,23 +571,23 @@ std::unique_ptr<Response> InternalServer::handle_random(const RequestContext& re

  std::string bookName;
  std::string bookId;
-  std::shared_ptr<zim::Archive> archive;
+  std::shared_ptr<Reader> reader;
  try {
    bookName = request.get_argument("content");
    bookId = mp_nameMapper->getIdForName(bookName);
-    archive = mp_library->getArchiveById(bookId);
+    reader = mp_library->getReaderById(bookId);
  } catch (const std::out_of_range&) {
    return Response::build_404(*this, request, bookName, "");
  }

-  if (archive == nullptr) {
+  if (reader == nullptr) {
    return Response::build_404(*this, request, bookName, "");
  }

  try {
-    auto entry = archive->getRandomEntry();
-    return build_redirect(bookName, getFinalItem(*archive, entry));
-  } catch(zim::EntryNotFound& e) {
+    auto entry = reader->getRandomPage();
+    return build_redirect(bookName, entry.getFinalEntry());
+  } catch(kiwix::NoEntry& e) {
    return Response::build_404(*this, request, bookName, "");
  }
 }
@@ -825,10 +734,22 @@ std::string searchSuggestionHTML(const std::string& searchURL, const std::string

 } // unnamed namespace

-std::unique_ptr<Response>
-InternalServer::build_redirect(const std::string& bookName, const zim::Item& item) const
+std::shared_ptr<Reader>
+InternalServer::get_reader(const std::string& bookName) const
 {
-  auto redirectUrl = m_root + "/" + bookName + "/" + kiwix::urlEncode(item.getPath());
+  std::shared_ptr<Reader> reader;
+  try {
+    const std::string bookId = mp_nameMapper->getIdForName(bookName);
+    reader = mp_library->getReaderById(bookId);
+  } catch (const std::out_of_range& e) {
+  }
+  return reader;
+}
+
+std::unique_ptr<Response>
+InternalServer::build_redirect(const std::string& bookName, const kiwix::Entry& entry) const
+{
+  auto redirectUrl = m_root + "/" + bookName + "/" + kiwix::urlEncode(entry.getPath());
  return Response::build_redirect(*this, redirectUrl);
 }

@@ -844,13 +765,8 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
  if (bookName.empty())
    return build_homepage(request);

-  std::shared_ptr<zim::Archive> archive;
-  try {
-    const std::string bookId = mp_nameMapper->getIdForName(bookName);
-    archive = mp_library->getArchiveById(bookId);
-  } catch (const std::out_of_range& e) {}
-
-  if (archive == nullptr) {
+  const std::shared_ptr<Reader> reader = get_reader(bookName);
+  if (reader == nullptr) {
    std::string searchURL = m_root+"/search?pattern="+pattern; // Make a full search on the entire library.
    const std::string details = searchSuggestionHTML(searchURL, kiwix::urlDecode(pattern));

@@ -863,31 +779,31 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
  }

  try {
-    auto entry = getEntryFromPath(*archive, urlStr);
+    auto entry = reader->getEntryFromPath(urlStr);
    if (entry.isRedirect() || urlStr.empty()) {
      // If urlStr is empty, we want to mainPage.
      // We must do a redirection to the real page.
-      return build_redirect(bookName, getFinalItem(*archive, entry));
+      return build_redirect(bookName, entry.getFinalEntry());
    }
-    auto response = ItemResponse::build(*this, request, entry.getItem());
+    auto response = ItemResponse::build(*this, request, entry.getZimEntry().getItem());
    try {
-      dynamic_cast<ContentResponse&>(*response).set_taskbar(bookName, getArchiveTitle(*archive));
+      dynamic_cast<ContentResponse&>(*response).set_taskbar(bookName, reader->getTitle());
    } catch (std::bad_cast& e) {}

    if (m_verbose.load()) {
      printf("Found %s\n", entry.getPath().c_str());
-      printf("mimeType: %s\n", entry.getItem(true).getMimetype().c_str());
+      printf("mimeType: %s\n", entry.getMimetype().c_str());
    }

    return response;
-  } catch(zim::EntryNotFound& e) {
+  } catch(kiwix::NoEntry& e) {
    if (m_verbose.load())
      printf("Failed to find %s\n", urlStr.c_str());

    std::string searchURL = m_root+"/search?content="+bookName+"&pattern="+pattern; // Make a search on this specific book only.
    const std::string details = searchSuggestionHTML(searchURL, kiwix::urlDecode(pattern));

-    return Response::build_404(*this, request, bookName, getArchiveTitle(*archive), details);
+    return Response::build_404(*this, request, bookName, reader->getTitle(), details);
  }
 }

--- a/src/server/internalServer.h
+++ b/src/server/internalServer.h
@@ -54,8 +54,7 @@ class InternalServer {
                   bool verbose,
                   bool withTaskbar,
                   bool withLibraryButton,
-                   bool blockExternalLinks,
-                   std::string indexTemplateString);
+                   bool blockExternalLinks);
    virtual ~InternalServer() = default;

    MHD_Result handlerCallback(struct MHD_Connection* connection,
@@ -70,16 +69,14 @@ class InternalServer {

  private: // functions
    std::unique_ptr<Response> handle_request(const RequestContext& request);
-    std::unique_ptr<Response> build_redirect(const std::string& bookName, const zim::Item& item) const;
+    std::unique_ptr<Response> build_redirect(const std::string& bookName, const kiwix::Entry& entry) const;
    std::unique_ptr<Response> build_homepage(const RequestContext& request);
    std::unique_ptr<Response> handle_skin(const RequestContext& request);
    std::unique_ptr<Response> handle_catalog(const RequestContext& request);
    std::unique_ptr<Response> handle_catalog_v2(const RequestContext& request);
    std::unique_ptr<Response> handle_catalog_v2_root(const RequestContext& request);
-    std::unique_ptr<Response> handle_catalog_v2_entries(const RequestContext& request, bool partial);
-    std::unique_ptr<Response> handle_catalog_v2_complete_entry(const RequestContext& request, const std::string& entryId);
+    std::unique_ptr<Response> handle_catalog_v2_entries(const RequestContext& request);
    std::unique_ptr<Response> handle_catalog_v2_categories(const RequestContext& request);
-    std::unique_ptr<Response> handle_catalog_v2_languages(const RequestContext& request);
    std::unique_ptr<Response> handle_meta(const RequestContext& request);
    std::unique_ptr<Response> handle_search(const RequestContext& request);
    std::unique_ptr<Response> handle_suggest(const RequestContext& request);
@@ -92,6 +89,7 @@ class InternalServer {

    MustacheData get_default_data() const;

+    std::shared_ptr<Reader> get_reader(const std::string& bookName) const;
    bool etag_not_needed(const RequestContext& r) const;
    ETag get_matching_if_none_match_etag(const RequestContext& request) const;

@@ -104,7 +102,6 @@ class InternalServer {
    bool m_withTaskbar;
    bool m_withLibraryButton;
    bool m_blockExternalLinks;
-    std::string m_indexTemplateString;
    struct MHD_Daemon* mp_daemon;

    Library* mp_library;
--- a/src/server/internalServer_catalog_v2.cpp
+++ b/src/server/internalServer_catalog_v2.cpp
@@ -55,17 +55,10 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2(const RequestContext
        kainjow::mustache::object({{"endpoint_root", endpoint_root}}),
        "application/opensearchdescription+xml"
    );
-  } else if (url == "entry") {
-    const std::string entryId  = request.get_url_part(3);
-    return handle_catalog_v2_complete_entry(request, entryId);
  } else if (url == "entries") {
-    return handle_catalog_v2_entries(request, /*partial=*/false);
-  } else if (url == "partial_entries") {
-    return handle_catalog_v2_entries(request, /*partial=*/true);
+    return handle_catalog_v2_entries(request);
  } else if (url == "categories") {
    return handle_catalog_v2_categories(request);
-  } else if (url == "languages") {
-    return handle_catalog_v2_languages(request);
  } else {
    return Response::build_404(*this, request, "", "");
  }
@@ -81,21 +74,19 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_root(const RequestCo
               {"endpoint_root", m_root + "/catalog/v2"},
               {"feed_id", gen_uuid(m_library_id)},
               {"all_entries_feed_id", gen_uuid(m_library_id + "/entries")},
-               {"partial_entries_feed_id", gen_uuid(m_library_id + "/partial_entries")},
-               {"category_list_feed_id", gen_uuid(m_library_id + "/categories")},
-               {"language_list_feed_id", gen_uuid(m_library_id + "/languages")}
+               {"category_list_feed_id", gen_uuid(m_library_id + "/categories")}
             },
             "application/atom+xml;profile=opds-catalog;kind=navigation"
  );
 }

-std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const RequestContext& request, bool partial)
+std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const RequestContext& request)
 {
  OPDSDumper opdsDumper(mp_library);
  opdsDumper.setRootLocation(m_root);
  opdsDumper.setLibraryId(m_library_id);
  const auto bookIds = search_catalog(request, opdsDumper);
-  const auto opdsFeed = opdsDumper.dumpOPDSFeedV2(bookIds, request.get_query(), partial);
+  const auto opdsFeed = opdsDumper.dumpOPDSFeedV2(bookIds, request.get_query());
  return ContentResponse::build(
             *this,
             opdsFeed,
@@ -103,25 +94,6 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const Reques
  );
 }

-std::unique_ptr<Response> InternalServer::handle_catalog_v2_complete_entry(const RequestContext& request, const std::string& entryId)
-{
-  try {
-    mp_library->getBookById(entryId);
-  } catch (const std::out_of_range&) {
-    return Response::build_404(*this, request, "", "");
-  }
-
-  OPDSDumper opdsDumper(mp_library);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(m_library_id);
-  const auto opdsFeed = opdsDumper.dumpOPDSCompleteEntry(entryId);
-  return ContentResponse::build(
-             *this,
-             opdsFeed,
-             "application/atom+xml;type=entry;profile=opds-catalog"
-  );
-}
-
 std::unique_ptr<Response> InternalServer::handle_catalog_v2_categories(const RequestContext& request)
 {
  OPDSDumper opdsDumper(mp_library);
@@ -129,19 +101,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_categories(const Req
  opdsDumper.setLibraryId(m_library_id);
  return ContentResponse::build(
             *this,
-             opdsDumper.categoriesOPDSFeed(),
-             "application/atom+xml;profile=opds-catalog;kind=navigation"
-  );
-}
-
-std::unique_ptr<Response> InternalServer::handle_catalog_v2_languages(const RequestContext& request)
-{
-  OPDSDumper opdsDumper(mp_library);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(m_library_id);
-  return ContentResponse::build(
-             *this,
-             opdsDumper.languagesOPDSFeed(),
+             opdsDumper.categoriesOPDSFeed(mp_library->getBooksCategories()),
             "application/atom+xml;profile=opds-catalog;kind=navigation"
  );
 }
--- a/src/tools/archiveTools.cpp
+++ b/src/tools/archiveTools.cpp
@@ -1,158 +0,0 @@
-/*
- * Copyright 2021 Maneesh P M <manu.pm55@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "archiveTools.h"
-
-#include "tools.h"
-#include "pathTools.h"
-#include "otherTools.h"
-#include "stringTools.h"
-
-#include <zim/error.h>
-#include <zim/item.h>
-
-namespace kiwix
-{
-std::string getMetadata(const zim::Archive& archive, const std::string& name) {
-    try {
-        return archive.getMetadata(name);
-    } catch (zim::EntryNotFound& e) {
-        return "";
-    }
-}
-
-std::string getArchiveTitle(const zim::Archive& archive) {
-  std::string value = getMetadata(archive, "Title");
-  if (value.empty()) {
-    value = getLastPathElement(archive.getFilename());
-    std::replace(value.begin(), value.end(), '_', ' ');
-    size_t pos = value.find(".zim");
-    value = value.substr(0, pos);
-  }
-  return value;
-}
-
-std::string getMetaDescription(const zim::Archive& archive) {
-  std::string value;
-  value = getMetadata(archive, "Description");
-
-  /* Mediawiki Collection tends to use the "Subtitle" name */
-  if (value.empty()) {
-    value = getMetadata(archive, "Subtitle");
-  }
-
-  return value;
-}
-
-std::string getMetaTags(const zim::Archive& archive, bool original) {
-  std::string tags_str = getMetadata(archive, "Tags");
-  if (original) {
-    return tags_str;
-  }
-  auto tags = convertTags(tags_str);
-  return join(tags, ";");
-}
-
-std::string getMetaLanguage(const zim::Archive& archive) {
-  return getMetadata(archive, "Language");
-}
-
-std::string getMetaName(const zim::Archive& archive) {
-  return getMetadata(archive, "Name");
-}
-
-std::string getMetaDate(const zim::Archive& archive) {
-  return getMetadata(archive, "Date");
-}
-
-std::string getMetaCreator(const zim::Archive& archive) {
-  return getMetadata(archive, "Creator");
-}
-
-std::string getMetaPublisher(const zim::Archive& archive) {
-  return getMetadata(archive, "Publisher");
-}
-
-std::string getMetaFlavour(const zim::Archive& archive) {
-  return getMetadata(archive, "Flavour");
-}
-
-std::string getArchiveId(const zim::Archive& archive) {
-  return (std::string) archive.getUuid();
-}
-
-bool getArchiveFavicon(const zim::Archive& archive, unsigned size,
-                           std::string& content, std::string& mimeType){
-  try {
-    auto item = archive.getIllustrationItem(size);
-    content = item.getData();
-    mimeType = item.getMimetype();
-    return true;
-  } catch(zim::EntryNotFound& e) {};
-
-  return false;
-}
-
-// should this be in libzim
-unsigned int getArchiveMediaCount(const zim::Archive& archive) {
-  std::map<const std::string, unsigned int> counterMap = parseArchiveCounter(archive);
-  unsigned int counter = 0;
-
-  for (auto &pair:counterMap) {
-    if (startsWith(pair.first, "image/") ||
-        startsWith(pair.first, "video/") ||
-        startsWith(pair.first, "audio/")) {
-      counter += pair.second;
-    }
-  }
-
-  return counter;
-}
-
-unsigned int getArchiveFileSize(const zim::Archive& archive) {
-  return archive.getFilesize() / 1024;
-}
-
-zim::Item getFinalItem(const zim::Archive& archive, const zim::Entry& entry)
-{
-  return entry.getItem(true);
-}
-
-zim::Entry getEntryFromPath(const zim::Archive& archive, const std::string& path)
-{
-  try {
-    return archive.getEntryByPath(path);
-  } catch (zim::EntryNotFound& e) {
-    if (path.empty() || path == "/") {
-      return archive.getMainEntry();
-    }
-  }
-  throw zim::EntryNotFound("Cannot find entry for non empty path");
-}
-
-MimeCounterType parseArchiveCounter(const zim::Archive& archive) {
-  try {
-    auto counterContent = archive.getMetadata("Counter");
-    return parseMimetypeCounter(counterContent);
-  } catch (zim::EntryNotFound& e) {
-    return {};
-  }
-}
-
-} // kiwix
--- a/src/tools/archiveTools.h
+++ b/src/tools/archiveTools.h
@@ -1,59 +0,0 @@
-/*
- * Copyright 2021 Maneesh P M <manu.pm55@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef KIWIX_ARCHIVETOOLS_H
-#define KIWIX_ARCHIVETOOLS_H
-
-#include <zim/archive.h>
-#include <tools/otherTools.h>
-
-/**
- * This file contains all the functions that would make handling data related to
- * an archive easier.
- **/
-
-namespace kiwix
-{
-    std::string getMetadata(const zim::Archive& archive, const std::string& name);
-    std::string getArchiveTitle(const zim::Archive& archive);
-    std::string getMetaDescription(const zim::Archive& archive);
-    std::string getMetaTags(const zim::Archive& archive, bool original = false);
-    std::string getMetaLanguage(const zim::Archive& archive);
-    std::string getMetaName(const zim::Archive& archive);
-    std::string getMetaDate(const zim::Archive& archive);
-    std::string getMetaCreator(const zim::Archive& archive);
-    std::string getMetaPublisher(const zim::Archive& archive);
-    std::string getMetaFlavour(const zim::Archive& archive);
-    std::string getArchiveId(const zim::Archive& archive);
-
-    bool getArchiveFavicon(const zim::Archive& archive, unsigned size,
-                           std::string& content, std::string& mimeType);
-
-    unsigned int getArchiveMediaCount(const zim::Archive& archive);
-    unsigned int getArchiveFileSize(const zim::Archive& archive);
-
-    zim::Item getFinalItem(const zim::Archive& archive, const zim::Entry& entry);
-
-    zim::Entry getEntryFromPath(const zim::Archive& archive, const std::string& path);
-
-    MimeCounterType parseArchiveCounter(const zim::Archive& archive);
-
-}
-
-#endif
--- a/src/tools/otherTools.cpp
+++ b/src/tools/otherTools.cpp
@@ -17,11 +17,7 @@
 * MA 02110-1301, USA.
 */

-// Implement function declared in tools.h and tools/otherTools.h
-#include "tools.h"
 #include "tools/otherTools.h"
-
-
 #include <algorithm>
 #include <iomanip>

--- a/src/tools/pathTools.cpp
+++ b/src/tools/pathTools.cpp
@@ -17,10 +17,7 @@
 * MA 02110-1301, USA.
 */

-// Implement method defined in <kiwix/tools.h> and "tools/pathTools.h"
-#include "tools.h"
 #include "tools/pathTools.h"
-
 #include <stdexcept>

 #ifdef __APPLE__
@@ -62,6 +59,7 @@
 #define PATH_MAX 1024
 #endif

+
 #ifdef _WIN32
 std::string WideToUtf8(const std::wstring& wstr)
 {
@@ -80,7 +78,7 @@ std::wstring Utf8ToWide(const std::string& str)
 }
 #endif

-bool kiwix::isRelativePath(const std::string& path)
+bool isRelativePath(const std::string& path)
 {
 #ifdef _WIN32
  if (path.size() < 3 ) {
@@ -175,7 +173,7 @@ std::vector<std::string> normalizeParts(std::vector<std::string>& parts, bool ab
  return ret;
 }

-std::string kiwix::computeRelativePath(const std::string& path, const std::string& absolutePath)
+std::string computeRelativePath(const std::string& path, const std::string& absolutePath)
 {
  auto parts = kiwix::split(path, SEPARATOR, false);
  auto pathParts = normalizeParts(parts, false);
@@ -200,11 +198,11 @@ std::string kiwix::computeRelativePath(const std::string& path, const std::strin
  return ret;
 }

-std::string kiwix::computeAbsolutePath(const std::string& path, const std::string& relativePath)
+std::string computeAbsolutePath(const std::string& path, const std::string& relativePath)
 {
  std::string absolutePath = path;
  if (path.empty()) {
-    absolutePath = kiwix::getCurrentDirectory();
+    absolutePath = getCurrentDirectory();
  }

  auto parts = kiwix::split(absolutePath, SEPARATOR, false);
@@ -217,7 +215,7 @@ std::string kiwix::computeAbsolutePath(const std::string& path, const std::strin
  return ret;
 }

-std::string kiwix::removeLastPathElement(const std::string& path)
+std::string removeLastPathElement(const std::string& path)
 {
  auto parts_ = kiwix::split(path, SEPARATOR, false);
  auto parts = normalizeParts(parts_, false);
@@ -228,7 +226,7 @@ std::string kiwix::removeLastPathElement(const std::string& path)
  return ret;
 }

-std::string kiwix::appendToDirectory(const std::string& directoryPath, const std::string& filename)
+std::string appendToDirectory(const std::string& directoryPath, const std::string& filename)
 {
  std::string newPath = directoryPath;
  if (!directoryPath.empty() && directoryPath.back() != SEPARATOR[0]) {
@@ -238,7 +236,7 @@ std::string kiwix::appendToDirectory(const std::string& directoryPath, const std
  return newPath;
 }

-std::string kiwix::getLastPathElement(const std::string& path)
+std::string getLastPathElement(const std::string& path)
 {
  auto parts_ = kiwix::split(path, SEPARATOR);
  auto parts = normalizeParts(parts_, false);
@@ -269,7 +267,7 @@ std::string getFileSizeAsString(const std::string& path)
  return convert.str();
 }

-std::string kiwix::getFileContent(const std::string& path)
+std::string getFileContent(const std::string& path)
 {
 #ifdef _WIN32
  auto wpath = Utf8ToWide(path);
@@ -302,7 +300,7 @@ std::string kiwix::getFileContent(const std::string& path)
  return content;
 }

-bool kiwix::fileExists(const std::string& path)
+bool fileExists(const std::string& path)
 {
 #ifdef _WIN32
  return PathFileExistsW(Utf8ToWide(path).c_str());
@@ -368,7 +366,7 @@ bool copyFile(const std::string& sourcePath, const std::string& destPath)
 #endif
 }

-std::string kiwix::getExecutablePath(bool realPathOnly)
+std::string getExecutablePath(bool realPathOnly)
 {
  if (!realPathOnly) {
    char* cAppImage = ::getenv("APPIMAGE");
@@ -422,7 +420,7 @@ bool writeTextFile(const std::string& path, const std::string& content)
  return true;
 }

-std::string kiwix::getCurrentDirectory()
+std::string getCurrentDirectory()
 {
 #ifdef _WIN32
  wchar_t* a_cwd = _wgetcwd(NULL, 0);
@@ -436,7 +434,7 @@ std::string kiwix::getCurrentDirectory()
  return ret;
 }

-std::string kiwix::getDataDirectory()
+std::string getDataDirectory()
 {
 // Try to get the dataDir from the `KIWIX_DATA_DIR` env var
 #ifdef _WIN32
@@ -505,7 +503,7 @@ static std::map<std::string, std::string> extMimeTypes = {
 };

 /* Try to get the mimeType from the file extension */
-std::string kiwix::getMimeTypeForFile(const std::string& filename)
+std::string getMimeTypeForFile(const std::string& filename)
 {
  std::string mimeType = "text/plain";
  auto pos = filename.find_last_of(".");
@@ -526,3 +524,4 @@ std::string kiwix::getMimeTypeForFile(const std::string& filename)

  return mimeType;
 }
+
--- a/src/tools/stringTools.cpp
+++ b/src/tools/stringTools.cpp
@@ -17,11 +17,9 @@
 * MA 02110-1301, USA.
 */

-// Implement function declared in tools.h and tools/stringTools.h
-#include "tools.h"
-#include "tools/stringTools.h"
+#include <tools/stringTools.h>

-#include "tools/pathTools.h"
+#include <tools/pathTools.h>
 #include <unicode/normlzr.h>
 #include <unicode/rep.h>
 #include <unicode/translit.h>
@@ -270,7 +268,7 @@ std::string kiwix::urlDecode(const std::string& value, bool component)
 /* Split string in a token array */
 std::vector<std::string> kiwix::split(const std::string& str,
                                      const std::string& delims,
-                                      bool dropEmpty,
+                                      bool trimEmpty,
                                      bool keepDelim)
 {
  std::string::size_type lastPos = 0;
@@ -279,7 +277,7 @@ std::vector<std::string> kiwix::split(const std::string& str,
  while( (pos = str.find_first_of(delims, lastPos)) < str.length() )
  {
    auto token = str.substr(lastPos, pos - lastPos);
-    if (!dropEmpty || !token.empty()) {
+    if (!trimEmpty || !token.empty()) {
      tokens.push_back(token);
    }
    if (keepDelim) {
@@ -289,7 +287,7 @@ std::vector<std::string> kiwix::split(const std::string& str,
  }

  auto token = str.substr(lastPos);
-  if (!dropEmpty || !token.empty()) {
+  if (!trimEmpty || !token.empty()) {
    tokens.push_back(token);
  }
  return tokens;
@@ -397,11 +395,3 @@ bool kiwix::startsWith(const std::string& base, const std::string& start)
        && std::equal(start.begin(), start.end(), base.begin());
 }

-std::vector<std::string> kiwix::getTitleVariants(const std::string& title) {
-  std::vector<std::string> variants;
-  variants.push_back(title);
-  variants.push_back(kiwix::ucFirst(title));
-  variants.push_back(kiwix::lcFirst(title));
-  variants.push_back(kiwix::toTitle(title));
-  return variants;
-}
--- a/static/resources_list.txt
+++ b/static/resources_list.txt
@@ -18,19 +18,13 @@ skin/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
 skin/jquery-ui/jquery-ui.theme.min.css
 skin/jquery-ui/jquery-ui.min.css
 skin/caret.png
-skin/bittorrent.png
-skin/magnet.png
-skin/download.png
-skin/hash.png
-skin/search-icon.svg
 skin/taskbar.js
+skin/langList.js
+skin/categoryList.js
 skin/iso6391To3.js
 skin/isotope.pkgd.min.js
 skin/index.js
 skin/taskbar.css
-skin/home.css
-skin/fonts/Poppins.ttf
-skin/fonts/Roboto.ttf
 skin/block_external.js
 templates/search_result.html
 templates/no_search_result.html
@@ -45,8 +39,6 @@ templates/captured_external.html
 templates/catalog_entries.xml
 templates/catalog_v2_root.xml
 templates/catalog_v2_entries.xml
-templates/catalog_v2_entry.xml
 templates/catalog_v2_categories.xml
-templates/catalog_v2_languages.xml
 opensearchdescription.xml
 catalog_v2_searchdescription.xml
--- a/static/skin/bittorrent.png
+++ b/static/skin/bittorrent.png
--- a/static/skin/categoryList.js
+++ b/static/skin/categoryList.js
@@ -0,0 +1,19 @@
+// eslint-disable-next-line no-unused-vars
+const categoryList = {
+  "other": "Other",
+  "gutenberg": "Gutenberg",
+  "mooc": "Mooc",
+  "phet": "Phet",
+  "psiram": "Psiram",
+  "stack_exchange": "Stack Exchange",
+  "ted": "Ted",
+  "vikidia": "Vikidia",
+  "wikibooks": "Wikibooks",
+  "wikinews": "Wikinews",
+  "wikipedia": "Wikipedia",
+  "wikiquote": "Wikiquote",
+  "wikisource": "Wikisource",
+  "wikiversity": "Wikiversity",
+  "wikivoyage": "Wikivoyage",
+  "wiktionary": "Wiktionary"
+}
--- a/static/skin/download.png
+++ b/static/skin/download.png
--- a/static/skin/fonts/Poppins.ttf
+++ b/static/skin/fonts/Poppins.ttf
--- a/static/skin/fonts/Roboto.ttf
+++ b/static/skin/fonts/Roboto.ttf
--- a/static/skin/hash.png
+++ b/static/skin/hash.png
--- a/static/skin/home.css
+++ b/static/skin/home.css
@@ -1,456 +0,0 @@
-*,
-*::after,
-*::before {
-  margin: 0;
-  padding: 0;
-  box-sizing: inherit;
-}
-
-html {
-    font-size: 62.5%;
-}
-
-body {
-    position: relative;
-    box-sizing: border-box;
-}
-
-::selection {
-    background-color: #00b4e4;
-    color: white;
-}
-
-.kiwixNav {
-    background-color: #f4f6f8;
-    width: 100%;
-    padding: 20px 11vw 25px;
-    height: 140px;
-}
-
-.kiwixHomeBody__results {
-    font-size: 1.6rem;
-    color: #333333;
-    font-family: poppins;
-    margin: 10px 0 -5px;
-    position: relative;
-    top: -10px;
-    left: 13px;
-}
-
-.kiwixNav__filters {
-    display: grid;
-    grid-gap: 20px;
-    grid-template-columns: 231px 231px;
-    margin: 10px 0;
-}
-
-.kiwixNav__kiwixFilter {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    -ms-appearance: none;
-    appearance: none;
-    outline: 0;
-    box-shadow: none;
-    border: 0 !important;
-    background: white;
-    background-image: none;
-    border-radius: 1px;
-    width: 195px;
-    height: 35px;
-    flex: 1;
-    color: black;
-    padding: 7px 10px 10px;
-    cursor: pointer;
- }
- 
- .kiwixNav__kiwixFilter:-ms-expand {
-    display: none;
- }
-
-.kiwixNav__select {
-    position: relative;
-    display: flex;
-    width: 231px;
-    height: 35px;
-    line-height: 3;
-    background: #909090;
-    overflow: hidden;
-    border-radius: 10px;
-    border: 1px solid #b5b2b2;
-}
-
-.kiwixNav__select::after {
-    content: '\25BC';
-    color: #fff;
-    background-color: #909090;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    right: 0;
-    padding: 0 1em;
-    cursor: pointer;
-    pointer-events: none;
-    -webkit-transition: .25s all ease;
-    -o-transition: .25s all ease;
-    transition: .25s all ease;
-}
-
-.kiwixNav__kiwixFilter option {
-    background-color: #fff;
-    color: #000;
-}
-
-.kiwixSearch {
-    height: 35px;
-    width: 229px;
-    border-radius: 10px;
-    border: solid 1px #b5b2b2;
-    padding: 10px;
-    background-image: url('./search-icon.svg');
-    background-repeat: no-repeat;
-    background-position: right center;
-    background-origin: content-box;
-    background-size: 15px;
-}
-
-.searchButton {
-    margin: 0 17px;
-    height: 35px;
-    width: 100px;
-    border-radius: 10px;
-    color: white;
-    background-color: #909090;
-    border: solid 1px #b5b2b2;
-}
-
-.searchButton:hover {
-    background-color: #858585;
-}
-
-.kiwixHomeBody {
-    padding: 20px 15vw;
-    min-height: calc(100vh - 170px);
-    position: relative;
-}
-
-.book__list {
-    position: relative;
-}
-
-.book {
-    border-color: #acacac;
-}
-
-.book__wrapper {
-    color: #444343;
-    height: 280px;
-    width: 250px;
-    margin: 15px;
-    background-color: #f7f7f7;
-    border: 1px solid #ececec;
-    border-radius: 3px;
-    display: grid;
-    grid-template-columns: 65px 1fr;
-    grid-template-rows: 70px 120px 1fr 1fr;
-    grid-gap: 5px;
-    transition: transform 0.25s;
-}
-
-.book__wrapper:hover {
-    transform: scale(1.07);
-}
-
-.book__icon {
-    display: flex;
-    align-items: center;
-    align-content: center;
-    justify-content: center;
-    margin: 10px 0 0 10px;
-}
-
-.book__icon--image {
-    max-width: 100%;
-    max-height: 100%;
-}
-
-.book__title {
-    display: grid;
-    font-family: poppins;
-    color: black;
-    padding: 12px 10px 0 2px;
-    width: 100%;
-    height: 100%;
-    align-items: center;
-    align-content: center;
-}
-
-#bookSize {
-    font-size: 1.1rem;
-    margin: 3px 0;
-}
-
-#bookTitle {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    font-size: 1.45rem;
-}
-
-.book__description {
-    grid-column: 1 / 3;
-    margin: 10px 10px 5px;
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-line-clamp: 7;
-    -webkit-box-orient: vertical;
-    font-family: roboto;
-    font-weight: 300;
-    font-size: 1.2rem;
-    color: #4d4d4d;
-    line-height: 1.25;
-}
-
-.book__languageTag {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    box-shadow: 0 0 2px #acacac;
-    background-color: #ffffff;
-    font-weight: bold;
-    font-family: roboto;
-    color: black;
-    height: 25px;
-    width: 25px;
-    margin: 10px auto 0 10px;
-    border-radius: 5px;
-    font-size: 0.85rem;
-}
-
-.book__tags {
-    display: flex;
-    text-align: end;
-    font-size: 1.1rem;
-    justify-content: flex-end;
-    color: #909090;
-    font-family: roboto;
-    margin-right: 10px;
-    margin-top: 10px;
-    overflow: hidden;
-}
-
-.book__tags--wrapper {
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-}
-
-.book__links {
-    display: flex;
-    text-align: end;
-    justify-content: flex-end;
-    grid-column: 2 / 3;
-    font-size: 1.1rem;
-    margin: 10px 4px;
-    color: #00b4e4;
-}
-
-.book__links > a, .book__links > span {
-    cursor: pointer;
-    text-decoration: none;
-    color: #00b4e4;
-    position: relative;
-    padding: 1px 6px 0;
-    font-family: roboto;
-}
-
-.book__links > a:hover, .book__links > span:hover {
-    background: #00b4e4;
-    color: white;
-}
-
-.modal-wrapper {
-    position: fixed;
-    z-index: 100;
-    top: 0;
-    left: 0;
-    width: 100vw;
-    height: 100vh;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    align-content: center;
-    background-color: rgba(0, 0, 0, 30%);
-}
-
-.modal {
-    color: #444343;
-    height: 280px;
-    width: 250px;
-    margin: 15px;
-    background-color: #f7f7f7;
-    border: 1px solid #ececec;
-    border-radius: 3px;
-}
-
-.modal-heading {
-    background-color: #f0f0f0;
-    height: 20%;
-    width: 100%;
-    border-bottom: 1px solid #ececec;
-    display: grid;
-    grid-template-columns: 3fr 1fr;
-}
-
-.modal-title {
-    display: flex;
-    font-size: 15px;
-    align-items: center;
-    padding-left: 20px;
-    font-family: poppins;
-}
-
-.modal-close-button {
-    cursor: pointer;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.modal-content {
-    padding: 20px;
-}
-
-.modal-content div {
-    width: 100%;
-    height: 40px;
-}
-
-.modal-content a {
-    text-decoration: none;
-}
-
-.modal-content a>div {
-    position: relative;
-    top: -28px;
-    left: 50px;
-    text-decoration: underline;
-    font-size: 13px;
-    font-family: poppins;
-    color: #444343;
-}
-
-.modal-content img {
-    display: inline-block;
-    margin: 0 10px;
-    height: 30px;
-}
-
-.fadeOut {
-    position: fixed;
-    display: none;
-    bottom: 0;
-    left: 0;
-    z-index: 1;
-    background: linear-gradient(180deg, rgba(232, 232, 232, 0) 0%, #ffffff 100%);
-    height: 80px;
-    width: 100%;
-}
-
-.noResults {
-    font-size: 1.6rem;
-    text-align: center;
-}
-
-.noResults > a {
-    color: #3498db;
-}
-
-.loader-spinner {
-    position: absolute;
-    top: -50%;
-    left: 50%;
-    border: 5px solid #f3f3f3;
-    border-radius: 50%;
-    border-top: 5px solid #3498db;
-    width: 40px;
-    height: 40px;
-    margin: auto;
-    -webkit-animation: spin 1s linear infinite; /* Safari */
-    animation: spin 1s linear infinite;
-    margin-top: 35px;
-    margin-bottom: -35px;
-    z-index: 2;
-}
-  /* Safari */
-@-webkit-keyframes spin {
-    0% { -webkit-transform: rotate(0deg); }
-    100% { -webkit-transform: rotate(360deg); }
-}
-
-@keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-
-.loader {
-    display: none;
-    position: relative;
-    height: 70px;
-    width: 100%;
-}
-
-.kiwixfooter {
-    display: flex;
-    width: 100%;
-    justify-content: center;
-    text-align: center;
-    font-size: 1.6rem;
-    height: 30px;
-}
-
-.kiwixfooter > a {
-    width: auto;
-}
-
-@media screen and (max-width: 1100px) {
-
-    .kiwixHomeBody {
-        padding: 20px 10vw;
-        min-height: calc(100vh - 170px);
-    }
-
-    .kiwixNav__filters {
-        grid-template-columns: repeat(4, 1fr);
-    }
-}
-
-@media screen and (max-width: 590px) {
-
-    .kiwixNav {
-        height: 257px;
-    }
-
-    .kiwixHomeBody {
-        min-height: calc(100vh - 287px);
-    }
-    
-    .kiwixSearch {
-        margin-top: 11px;
-    }
-    
-    .searchButton {
-        margin: 19px 0;
-        width: 229px;
-    }
-
-    .kiwixNav__filters {
-        grid-template-columns: 1fr;
-    }
-}
-
-@media screen and (max-width: 340px) {
-    .kiwixHomeBody {
-        padding: 20px 5vw;
-    }
-}
--- a/static/skin/index.js
+++ b/static/skin/index.js
@@ -4,10 +4,10 @@
        start: 0,
        count: viewPortToCount()
    };
+    const filterTypes = ['lang', 'category', 'q'];
    const bookOrderMap = new Map();
    const filterCookieName = 'filters';
    const oneDayDelta = 86400000;
-    let loader;
    let footer;
    let fadeOutDiv;
    let iso;
@@ -41,29 +41,12 @@
        return result;
    }

-    const humanFriendlySize = (fileSize) => {
-        if (fileSize === 0) {
-            return '';
-        }
-        const units = ['bytes', 'kB', 'MB', 'GB', 'TB'];
-        let quotient = Math.floor(Math.log10(fileSize) / 3);
-        quotient = quotient < units.length ? quotient : units.length - 1;
-        fileSize /= (1000 ** quotient);
-        return `${+fileSize.toFixed(2)} ${units[quotient]}`;
-    };
-    
-    const humanFriendlyTitle = (title) => {
-        title = title.replace(/_/g, ' ');
-        return htmlEncode(title[0].toUpperCase() + title.slice(1));
-    }
-
    function htmlEncode(str) {
        return str.replace(/[\u00A0-\u9999<>\&]/gim, (i) => `&#${i.charCodeAt(0)};`);
    }

    function viewPortToCount(){
-        const zoom = Math.floor((( window.outerWidth - 10 ) / window.innerWidth) * 100);
-        return Math.floor(window.innerHeight/(3*zoom) + 1)*(window.innerWidth/(2.5*zoom) + 1);
+        return Math.floor(window.innerHeight/100 + 1)*(window.innerWidth>1000 ? 3 : 2);
    }

    function getInnerHtml(node, query) {
@@ -71,48 +54,27 @@
    }

    function generateBookHtml(book, sort = false) {
-        const link = book.querySelector('link[type="text/html"]').getAttribute('href');
-        let iconUrl;
-        book.querySelectorAll('link[rel="http://opds-spec.org/image/thumbnail"]').forEach(link => {
-            if (link.getAttribute('type').split(';')[1] == 'width=48' && !iconUrl) {
-                iconUrl = link.getAttribute('href');
-            }
-        });
+        const link = book.querySelector('link').getAttribute('href');
        const title =  getInnerHtml(book, 'title');
        const description = getInnerHtml(book, 'summary');
        const id = getInnerHtml(book, 'id');
-        const language = getInnerHtml(book, 'language');
-        const tags = getInnerHtml(book, 'tags');
-        let tagHtml = tags.split(';').filter(tag => {return !(tag.split(':')[0].startsWith('_'))})
-            .map((tag) => {return tag.charAt(0).toUpperCase() + tag.slice(1)})
-            .join(' | ').replace(/_/g, ' ');
-        let downloadLink;
-        let zimSize = 0;
-        try {
-            const downloadBookLink = book.querySelector('link[type="application/x-zim"]')
-            zimSize = parseInt(downloadBookLink.getAttribute('length'));
-            downloadLink = downloadBookLink.getAttribute('href').split('.meta4')[0];
-        } catch {
-            downloadLink = '';
-        }
-        const humanFriendlyZimSize = humanFriendlySize(zimSize);
+        const iconUrl = getInnerHtml(book, 'icon');
+        const articleCount = getInnerHtml(book, 'articleCount');
+        const mediaCount = getInnerHtml(book, 'mediaCount');

-        const divTag = document.createElement('div');
-        divTag.setAttribute('class', 'book');
-        divTag.setAttribute('data-id', id);
+        const linkTag = document.createElement('a');
+        linkTag.setAttribute('class', 'book');
+        linkTag.setAttribute('data-id', id);
+        linkTag.setAttribute('href', link);
        if (sort) {
-            divTag.setAttribute('data-idx', bookOrderMap.get(id));
+            linkTag.setAttribute('data-idx', bookOrderMap.get(id));
        }
-        divTag.innerHTML = `<div class="book__wrapper"><div class='book__icon' ><img class="book__icon--image" src='${root}${iconUrl}'></div>
-            <div class='book__title' title='${title}'>
-                <div id="bookTitle">${title}</div>
-                ${humanFriendlyZimSize ? `<div id='bookSize'>${humanFriendlyZimSize}</div>`: ''}
-            </div>
+        linkTag.innerHTML = `<div class='book__background' style="background-image: url('${iconUrl}');">
+            <div class='book__title' title='${title}'>${title}</div>
            <div class='book__description' title='${description}'>${description}</div>
-            <div class='book__languageTag'>${language.substr(0, 2).toUpperCase()}</div>
-            <div class='book__tags'><div class="book__tags--wrapper">${tagHtml}</div></div>
-            <div class='book__links'> <a href="${root}${link}" data-hover="Preview">Preview</a>${downloadLink ? `&nbsp;|&nbsp;<span class="download" data-link=${downloadLink} class="modal-button">Download</span>` : ''} </div></div>`;
-        return divTag;
+            <div class='book__info'>${articleCount} articles, ${mediaCount} medias</div>
+        </div>`;
+        return linkTag;
    }

    function toggleFooter(show=false) {
@@ -124,71 +86,8 @@
        }
    }

-    function insertModal(button) {
-        const downloadLink = button.getAttribute('data-link');
-        button.addEventListener('click', () => {
-            document.body.insertAdjacentHTML('beforeend', `<div class="modal-wrapper">
-                <div class="modal">
-                    <div class="modal-heading">
-                        <div class="modal-title">
-                            <div>
-                                Download
-                            </div>
-                        </div>
-                        <div onclick="closeModal()" class="modal-close-button">
-                            <div>
-                                <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" fill="none">
-                                    <path fill-rule="evenodd" clip-rule="evenodd" d="M13.7071 1.70711C14.0976 1.31658 14.0976 
-                                    0.683417 13.7071 0.292893C13.3166 -0.0976311 12.6834 -0.0976311 12.2929 0.292893L7 5.58579L1.70711
-                                    0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417
-                                    -0.0976311 1.31658 0.292893 1.70711L5.58579 7L0.292893 12.2929C-0.0976311 12.6834
-                                    -0.0976311 13.3166 0.292893 13.7071C0.683417 14.0976 1.31658 14.0976 1.70711 13.7071L7
-                                    8.41421L12.2929 13.7071C12.6834 14.0976 13.3166 14.0976 13.7071 13.7071C14.0976 13.3166 
-                                    14.0976 12.6834 13.7071 12.2929L8.41421 7L13.7071 1.70711Z" fill="black" />
-                                </svg>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-content">
-                        <div class="modal-regular-download">
-                            <a href="${downloadLink}" download>
-                                <img src="../skin/download.png" alt="direct download" />
-                                <div>Direct</div>
-                            </a>
-                        </div>
-                        <div class="modal-regular-download">
-                            <a href="${downloadLink}.sha256" download>
-                                <img src="../skin/hash.png" alt="download hash" />
-                                <div>Sha256 hash</div>
-                            </a>
-                        </div>
-                        <div class="modal-regular-download">
-                            <a href="${downloadLink}.magnet" target="_blank">
-                                <img src="../skin/magnet.png" alt="download magnet" />
-                                <div>Magnet link</div>
-                            </a>
-                        </div>
-                        <div class="modal-regular-download">
-                            <a href="${downloadLink}.torrent" download>
-                                <img src="../skin/bittorrent.png" alt="download torrent" />
-                                <div>Torrent file</div>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>`);
-        })
-    }
-
-    async function getBookCount(query) {
-        const url = `${root}/catalog/search?${query}`;
-        return await fetch(url).then(async (resp) => {
-            const data = new window.DOMParser().parseFromString(await resp.text(), 'application/xml');
-            return parseInt(data.querySelector('totalResults').innerHTML);
-        });
-    }
-
    async function loadBooks() {
+        const loader = document.querySelector('.loader');
        loader.style.display = 'block';
        return await fetch(queryUrlBuilder()).then(async (resp) => {
            const data = new window.DOMParser().parseFromString(await resp.text(), 'application/xml');
@@ -197,78 +96,47 @@
                bookOrderMap.set(getInnerHtml(book, 'id'), idx);
            });
            incrementalLoadingParams.start += books.length;
-            const results = parseInt(data.querySelector('totalResults').innerHTML)
-            if (results === bookOrderMap.size) {
+            if (parseInt(data.querySelector('totalResults').innerHTML) === bookOrderMap.size) {
                incrementalLoadingParams.count = 0;
                toggleFooter(true);
            } else {
                toggleFooter();
            }
-            const kiwixResultText = document.querySelector('.kiwixHomeBody__results')
-            if (results) {
-                let resultText = `${results} books`;
-                if (results === 1) {
-                    resultText = `${results} book`;
-                }
-                kiwixResultText.innerHTML = resultText;
-            } else {
-                kiwixResultText.innerHTML = ``;
-            }
            loader.style.display = 'none';
            return books;
        });
    }

-    async function loadAndDisplayOptions(nodeQuery, query, valueEntryNode) {
-        await fetch(query).then(async (resp) => {
-            const data = new window.DOMParser().parseFromString(await resp.text(), 'application/xml');
-            let optionStr = '';
-            data.querySelectorAll('entry').forEach(entry => {
-                const title = getInnerHtml(entry, 'title');
-                const value = getInnerHtml(entry, valueEntryNode);
-                optionStr += `<option value='${value}'>${humanFriendlyTitle(title)}</option>`;
-            });
-            document.querySelector(nodeQuery).innerHTML += optionStr;
-        });
+    async function loadAndDisplayOptions(nodeQuery, query) {
+        // currently taking an object in place of query, will replace it with query while fetching data from backend later on.
+        document.querySelector(nodeQuery).innerHTML += Object.keys(query)
+            .map((option) => {return `<option value='${option}'>${htmlEncode(query[option])}</option>`})
+        .join('');
    }

    function checkAndInjectEmptyMessage() {
-        const kiwixHomeBody = document.querySelector('.kiwixHomeBody');
        if (!bookOrderMap.size) {
            if (!noResultInjected) {
                noResultInjected = true;
-                iso.remove(document.getElementsByClassName('book__list')[0].getElementsByTagName('div'));
+                iso.remove(document.getElementsByClassName('book__list')[0].getElementsByTagName('a'));
                iso.layout();
-                setTimeout(() => {
-                    const divTag = document.createElement('div');
-                    divTag.setAttribute('class', 'noResults');
-                    divTag.innerHTML = `No result. Would you like to <a href="/?lang=">reset filter</a>?`;
-                    kiwixHomeBody.append(divTag);
-                    kiwixHomeBody.setAttribute('style', 'display: flex; justify-content: center; align-items: center');
-                    divTag.getElementsByTagName('a')[0].onclick = (event) => {
-                        event.preventDefault();
-                        window.history.pushState({}, null, `${window.location.href.split('?')[0]}?lang=`);
-                        setCookie(filterCookieName, 'lang=');
-                        resetAndFilter();
-                        document.querySelectorAll('.filter').forEach(filter => {
-                            filter.value = params.get(filter.name) || '';
-                            if (filter.value) {
-                                filter.style = 'background-color: #858585; color: #fff';
-                            } else {
-                                filter.style = 'background-color: #ffffff; color: black';
-                            }
-                        })
-                    };
-                    loader.setAttribute('style', 'position: absolute; top: 50%');
-                }, 300);
+                const spanTag = document.createElement('span');
+                spanTag.setAttribute('class', 'noResults');
+                spanTag.innerHTML = `No result. Would you like to <a href="/?lang=">reset filter?</a>`;
+                document.querySelector('body').append(spanTag);
+                spanTag.getElementsByTagName('a')[0].onclick = (event) => {
+                    event.preventDefault();
+                    window.history.pushState({}, null, `${window.location.href.split('?')[0]}?lang=`);
+                    setCookie(filterCookieName, 'lang=');
+                    resetAndFilter();
+                    filterTypes.forEach(key => {document.getElementsByName(key)[0].value = params.get(key) || ''});
+                };
            }
            return true;
        } else if (noResultInjected) {
            noResultInjected = false;
            document.getElementsByClassName('noResults')[0].remove();
-            kiwixHomeBody.removeAttribute('style');
        }
-        loader.removeAttribute('style');
        return false;
    }

@@ -302,13 +170,7 @@
        });
        books = [...books].filter((book) => {return !booksToFilter.has(getInnerHtml(book, 'id'))});
        booksToDelete.forEach(book => {iso.remove(book);});
-        books.forEach((book) => {
-            iso.insert(generateBookHtml(book, sort))
-            const downloadButton = document.querySelector(`[data-id="${getInnerHtml(book, 'id')}"] .download`);
-            if (downloadButton) {
-                insertModal(downloadButton);
-            }
-        });
+        books.forEach((book) => {iso.insert(generateBookHtml(book, sort))});
    }

    async function resetAndFilter(filterType = '', filterValue = '') {
@@ -323,19 +185,12 @@
            window.history.pushState({}, null, `${window.location.href.split('?')[0]}?${params.toString()}`);
            setCookie(filterCookieName, params.toString());
        }
-        document.querySelectorAll('.filter').forEach(filter => {
-            if (filter.value) {
-                filter.style = 'background-color: #858585; color: #fff';
-            } else {
-                filter.style = 'background-color: #ffffff; color: black';
-            }
-        });
        await loadAndDisplayBooks(true);
    }

    window.addEventListener('popstate', async () => {
        await resetAndFilter();
-        document.querySelectorAll('.filter').forEach(filter => {filter.value = params.get(filter.name) || ''});
+        filterTypes.forEach(key => {document.getElementsByName(key)[0].value = params.get(key) || ''});
    });

    async function loadSubset() {
@@ -368,48 +223,28 @@
                    return index ? parseInt(index) : Infinity;
                }
            },
-            sortBy: 'weight',
-            layoutMode: 'cellsByRow',
-            cellsByRow: {
-                columnWidth: '.book',
-                rowHeight: '.book'
-            }
+            sortBy: 'weight'
        });
        footer = document.getElementById('kiwixfooter');
        fadeOutDiv = document.getElementById('fadeOut');
-        loader = document.querySelector('.loader');
        await loadAndDisplayBooks();
-        await loadAndDisplayOptions('#languageFilter', `${root}/catalog/v2/languages`, 'language');
-        await loadAndDisplayOptions('#categoryFilter', `${root}/catalog/v2/categories`, 'title');
-        document.querySelectorAll('.filter').forEach(filter => {
-            filter.addEventListener('change', () => {resetAndFilter(filter.name, filter.value)});
+        await loadAndDisplayOptions('#languageFilter', langList);
+        await loadAndDisplayOptions('#categoryFilter', categoryList);
+        filterTypes.forEach((filter) => {
+            const filterTag = document.getElementsByName(filter)[0];
+            filterTag.addEventListener('change', () => {resetAndFilter(filterTag.name, filterTag.value)});
        });
        if (filters) {
            window.history.pushState({}, null, `${window.location.href.split('?')[0]}?${params.toString()}`);
        }
-        params.forEach((value, key) => {
-            const selectBox = document.getElementsByName(key)[0];
-            if (selectBox) {
-                selectBox.value = value
-            }
-        });
+        params.forEach((value, key) => {document.getElementsByName(key)[0].value = value});
        document.getElementById('kiwixSearchForm').onsubmit = (event) => {event.preventDefault()};
        if (!window.location.search) {
            const browserLang = navigator.language.split('-')[0];
            const langFilter = document.getElementById('languageFilter');
-            const lang = browserLang.length === 3 ? browserLang : iso6391To3[browserLang];
-            if (await getBookCount(`lang=${lang}`)) {
-                langFilter.value = lang;
-                langFilter.dispatchEvent(new Event('change'));
-            }
+            langFilter.value = browserLang.length === 3 ? browserLang : iso6391To3[browserLang];
+            langFilter.dispatchEvent(new Event('change'));
        }
-        document.querySelectorAll('.filter').forEach(filter => {
-            if (filter.value) {
-                filter.style = 'background-color: #858585; color: #fff';
-            } else {
-                filter.style = 'background-color: #ffffff; color: black';
-            }
-        });
        setCookie(filterCookieName, params.toString());
    }
 })();
--- a/static/skin/isotope.pkgd.min.js
+++ b/static/skin/isotope.pkgd.min.js
--- a/static/skin/langList.js
+++ b/static/skin/langList.js
@@ -0,0 +1,124 @@
+// eslint-disable-next-line no-unused-vars
+const langList = {
+  "aar": "Afaraf",
+  "afr": "Afrikaans",
+  "aka": "Akan",
+  "amh": "አማርኛ",
+  "ara": "اللغة العربية",
+  "asm": "অসমীয়া",
+  "aze": "azərbaycan dili",
+  "bak": "башҡорт теле",
+  "bel": "беларуская мова",
+  "bul": "български език",
+  "bam": "bamanankan",
+  "ben": "বাংলা",
+  "bod": "བོད་ཡིག",
+  "bre": "brezhoneg",
+  "bos": "bosanski jezik",
+  "cat": "Català",
+  "che": "нохчийн мотт",
+  "cos": "corsu",
+  "ces": "čeština",
+  "chv": "чӑваш чӗлхи",
+  "cym": "Cymraeg",
+  "dan": "dansk",
+  "deu": "Deutsch",
+  "dzo": "རྫོང་ཁ",
+  "ewe": "Eʋegbe",
+  "eng": "English",
+  "spa": "Español",
+  "est": "eesti",
+  "eus": "euskara",
+  "fas": "فارسی",
+  "ful": "Fulfulde",
+  "fin": "suomi",
+  "fao": "føroyskt",
+  "fra": "Français",
+  "gle": "Gaeilge",
+  "glg": "galego",
+  "grn": "Avañe'ẽ",
+  "guj": "ગુજરાતી",
+  "glv": "Gaelg",
+  "hau": "هَوُسَ",
+  "heb": "עברית",
+  "hin": "हिन्दी",
+  "hrv": "hrvatski jezik",
+  "hun": "magyar",
+  "hye": "Հայերեն",
+  "ind": "Bahasa Indonesia",
+  "ibo": "Asụsụ Igbo",
+  "isl": "Íslenska",
+  "ita": "Italiano",
+  "iku": "ᐃᓄᒃᑎᑐᑦ",
+  "jpn": "日本語",
+  "jav": "basa Jawa",
+  "kat": "ქართული",
+  "kik": "Gĩkũyũ",
+  "kaz": "қазақ тілі",
+  "khm": "ខេមរភាសា",
+  "kan": "ಕನ್ನಡ",
+  "kor": "한국어",
+  "kas": "कश्मीरी",
+  "kur": "Kurdî",
+  "cor": "Kernewek",
+  "kir": "Кыргызча",
+  "ltz": "Lëtzebuergesch",
+  "lug": "Luganda",
+  "lin": "Lingála",
+  "lao": "ພາສາ",
+  "lit": "lietuvių kalba",
+  "lav": "latviešu valoda",
+  "mlg": "fiteny malagasy",
+  "mri": "te reo Māori",
+  "mkd": "македонски јазик",
+  "mal": "മലയാളം",
+  "mon": "Монгол хэл",
+  "mar": "मराठी",
+  "mlt": "Malti",
+  "mya": "ဗမာစာ",
+  "nld": "Nederlands",
+  "nya": "chiCheŵa",
+  "orm": "Afaan Oromoo",
+  "pol": "język polski",
+  "por": "Português",
+  "que": "Runa Simi",
+  "roh": "rumantsch grischun",
+  "run": "Ikirundi",
+  "ron": "Română",
+  "rus": "Русский",
+  "kin": "Ikinyarwanda",
+  "san": "संस्कृतम्",
+  "snd": "सिन्धी",
+  "sag": "yângâ tî sängö",
+  "sin": "සිංහල",
+  "slk": "slovenčina",
+  "slv": "slovenski jezik",
+  "sna": "chiShona",
+  "som": "Soomaaliga",
+  "sqi": "Shqip",
+  "srp": "српски језик",
+  "ssw": "SiSwati",
+  "swe": "svenska",
+  "tam": "தமிழ்",
+  "tel": "తెలుగు",
+  "tgk": "тоҷикӣ",
+  "tha": "ไทย",
+  "tir": "ትግርኛ",
+  "tuk": "Türkmen",
+  "tsn": "Setswana",
+  "tur": "Türkçe",
+  "tso": "Xitsonga",
+  "tat": "татар теле",
+  "uig": "ئۇيغۇرچە‎",
+  "ukr": "Українська",
+  "urd": "اردو",
+  "uzb": "Ўзбек",
+  "ven": "Tshivenḓa",
+  "vie": "Tiếng Việt",
+  "wln": "walon",
+  "wol": "Wollof",
+  "xho": "isiXhosa",
+  "yor": "Yorùbá",
+  "zho": "中文",
+  "zul": "isiZulu"
+}
--- a/static/skin/magnet.png
+++ b/static/skin/magnet.png
--- a/static/skin/search-icon.svg
+++ b/static/skin/search-icon.svg
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="512.000000" height="512.000000" preserveAspectRatio="xMidYMid meet" style=""><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none"/>
-
-
-<g class="currentLayer" style=""><title>Layer 1</title><g transform="translate(0,512) scale(0.10000000149011612,-0.10000000149011612) " fill="#484848" stroke="none" id="svg_1" class="selected" fill-opacity="1">
-<path d="M1858 5104 c-341 -50 -678 -192 -963 -408 -104 -78 -304 -278 -384 -384 -124 -164 -256 -409 -315 -583 -311 -929 47 -1926 877 -2442 662 -410 1535 -405 2188 14 l76 49 125 -128 c69 -70 352 -364 630 -653 574 -597 548 -575 688 -567 85 5 123 21 176 75 52 52 77 114 77 193 0 98 -24 142 -151 273 -420 434 -1132 1177 -1132 1182 0 3 22 33 49 68 164 209 291 471 362 746 159 614 28 1255 -363 1774 -78 104 -279 305 -386 386 -288 218 -618 355 -974 406 -130 19 -448 18 -580 -1z m502 -545 c308 -38 607 -184 844 -409 476 -455 606 -1146 327 -1745 -128 -273 -356 -519 -626 -674 -387 -222 -857 -259 -1282 -102 -626 231 -1040 879 -983 1540 13 146 33 241 77 371 214 634 830 1060 1493 1032 36 -1 103 -7 150 -13z" id="svg_2" fill="#484848" fill-opacity="1"/>
-</g></g></svg>
--- a/static/templates/catalog_entries.xml
+++ b/static/templates/catalog_entries.xml
@@ -9,4 +9,30 @@
 {{/filter}}
  <link rel="self" href="" type="application/atom+xml" />
  <link rel="search" type="application/opensearchdescription+xml" href="{{root}}/catalog/searchdescription.xml" />
-{{#books}}{{{entry}}}{{/books}}</feed>
+  {{#books}}
+  <entry>
+    <id>{{id}}</id>
+    <title>{{title}}</title>
+    <summary>{{description}}</summary>
+    <language>{{language}}</language>
+    <updated>{{updated}}</updated>
+    <name>{{name}}</name>
+    <flavour>{{flavour}}</flavour>
+    <category>{{category}}</category>
+    <tags>{{tags}}</tags>
+    <articleCount>{{article_count}}</articleCount>
+    <mediaCount>{{media_count}}</mediaCount>
+    <icon>/meta?name=favicon&amp;content={{{content_id}}}</icon>
+    <link type="text/html" href="/{{{content_id}}}" />
+    <author>
+      <name>{{author_name}}</name>
+    </author>
+    <publisher>
+      <name>{{publisher_name}}</name>
+    </publisher>
+    {{#url}}
+    <link rel="http://opds-spec.org/acquisition/open-access" type="application/x-zim" href="{{{url}}}" length="{{{size}}}" />
+    {{/url}}
+  </entry>
+  {{/books}}
+</feed>
--- a/static/templates/catalog_v2_entries.xml
+++ b/static/templates/catalog_v2_entries.xml
@@ -5,7 +5,7 @@
  <id>{{feed_id}}</id>

  <link rel="self"
-        href="{{endpoint_root}}/{{#dump_partial_entries}}partial_{{/dump_partial_entries}}entries{{{query}}}"
+        href="{{endpoint_root}}/entries{{{query}}}"
        type="application/atom+xml;profile=opds-catalog;kind=acquisition"/>
  <link rel="start"
        href="{{endpoint_root}}/root.xml"
@@ -21,4 +21,30 @@
  <startIndex>{{startIndex}}</startIndex>
  <itemsPerPage>{{itemsPerPage}}</itemsPerPage>
 {{/filter}}
-{{#books}}{{{entry}}}{{/books}}</feed>
+  {{#books}}
+  <entry>
+    <id>{{id}}</id>
+    <title>{{title}}</title>
+    <summary>{{description}}</summary>
+    <language>{{language}}</language>
+    <updated>{{updated}}</updated>
+    <name>{{name}}</name>
+    <flavour>{{flavour}}</flavour>
+    <category>{{category}}</category>
+    <tags>{{tags}}</tags>
+    <articleCount>{{article_count}}</articleCount>
+    <mediaCount>{{media_count}}</mediaCount>
+    <icon>/meta?name=favicon&amp;content={{{content_id}}}</icon>
+    <link type="text/html" href="/{{{content_id}}}" />
+    <author>
+      <name>{{author_name}}</name>
+    </author>
+    <publisher>
+      <name>{{publisher_name}}</name>
+    </publisher>
+    {{#url}}
+    <link rel="http://opds-spec.org/acquisition/open-access" type="application/x-zim" href="{{{url}}}" length="{{{size}}}" />
+    {{/url}}
+  </entry>
+  {{/books}}
+</feed>
--- a/static/templates/catalog_v2_entry.xml
+++ b/static/templates/catalog_v2_entry.xml
@@ -1,34 +0,0 @@
-{{#with_xml_header}}<?xml version="1.0" encoding="UTF-8"?>
-{{/with_xml_header}}  <entry>
-    <id>urn:uuid:{{id}}</id>
-    <title>{{title}}</title>
-    <updated>{{updated}}</updated>
-{{#dump_partial_entries}}
-    <link rel="alternate"
-          href="{{endpoint_root}}/entry/{{{id}}}"
-          type="application/atom+xml;type=entry;profile=opds-catalog"/>
-{{/dump_partial_entries}}{{^dump_partial_entries}}    <summary>{{description}}</summary>
-    <language>{{language}}</language>
-    <name>{{name}}</name>
-    <flavour>{{flavour}}</flavour>
-    <category>{{category}}</category>
-    <tags>{{tags}}</tags>
-    <articleCount>{{article_count}}</articleCount>
-    <mediaCount>{{media_count}}</mediaCount>
-    {{#icons}}
-    <link rel="http://opds-spec.org/image/thumbnail"
-          href="/meta?name=Illustration_{{icon_width}}x{{icon_height}}@{{icon_scale}}&amp;content={{{content_id}}}"
-          type="image/png;width={{icon_width}};height={{icon_height}};scale={{icon_scale}}"/>
-    {{/icons}}
-    <link type="text/html" href="/{{{content_id}}}" />
-    <author>
-      <name>{{author_name}}</name>
-    </author>
-    <publisher>
-      <name>{{publisher_name}}</name>
-    </publisher>
-    {{#url}}
-    <link rel="http://opds-spec.org/acquisition/open-access" type="application/x-zim" href="{{{url}}}" length="{{{size}}}" />
-    {{/url}}
-{{/dump_partial_entries}}
-  </entry>
--- a/static/templates/catalog_v2_languages.xml
+++ b/static/templates/catalog_v2_languages.xml
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:dc="http://purl.org/dc/terms/"
-      xmlns:opds="https://specs.opds.io/opds-1.2"
-      xmlns:thr="http://purl.org/syndication/thread/1.0">
-  <id>{{feed_id}}</id>
-  <link rel="self"
-        href="{{endpoint_root}}/languages"
-        type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-  <link rel="start"
-        href="{{endpoint_root}}/root.xml"
-        type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-  <title>List of languages</title>
-  <updated>{{date}}</updated>
-
-  {{#languages}}
-  <entry>
-    <title>{{lang_self_name}}</title>
-    <dc:language>{{{lang_code}}}</dc:language>
-    <thr:count>{{book_count}}</thr:count>
-    <link rel="subsection"
-          href="{{endpoint_root}}/entries?lang={{{lang_code}}}"
-          type="application/atom+xml;profile=opds-catalog;kind=acquisition"/>
-    <updated>{{updated}}</updated>
-    <id>{{id}}</id>
-  </entry>
-  {{/languages}}
-</feed>
--- a/static/templates/catalog_v2_root.xml
+++ b/static/templates/catalog_v2_root.xml
@@ -23,15 +23,6 @@
    <id>{{all_entries_feed_id}}</id>
    <content type="text">All entries from this catalog.</content>
  </entry>
-  <entry>
-    <title>All entries (partial)</title>
-    <link rel="subsection"
-          href="{{endpoint_root}}/partial_entries"
-          type="application/atom+xml;profile=opds-catalog;kind=acquisition"/>
-    <updated>{{date}}</updated>
-    <id>{{partial_entries_feed_id}}</id>
-    <content type="text">All entries from this catalog in partial format.</content>
-  </entry>
  <entry>
    <title>List of categories</title>
    <link rel="subsection"
@@ -41,13 +32,4 @@
    <id>{{category_list_feed_id}}</id>
    <content type="text">List of all categories in this catalog.</content>
  </entry>
-  <entry>
-    <title>List of languages</title>
-    <link rel="subsection"
-          href="{{endpoint_root}}/languages"
-          type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-    <updated>{{date}}</updated>
-    <id>{{language_list_feed_id}}</id>
-    <content type="text">List of all languages in this catalog.</content>
-  </entry>
 </feed>
--- a/static/templates/index.html
+++ b/static/templates/index.html
@@ -2,7 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
    <title>Welcome to Kiwix Server</title>
    <script
      type="text/javascript"
@@ -22,58 +21,186 @@
      href="{{root}}/skin/jquery-ui/jquery-ui.theme.min.css"
      rel="Stylesheet"
    />
-    <link
-      type="text/css"
-      href="{{root}}/skin/home.css"
-      rel="Stylesheet"
-    />
    <style>
-      @font-face {
-        font-family: "poppins";
-        src: url("{{root}}/skin/fonts/Poppins.ttf") format("truetype");
+      html {
+        min-height: 100%;
+        position: relative;
      }
-
-      @font-face {
-          font-family: "roboto";
-          src: url("{{root}}/skin/fonts/Roboto.ttf") format("truetype");
+      body {
+        background: radial-gradient(#eeeeee 15%, transparent 16%) 0 0,
+          radial-gradient(#eeeeee 15%, transparent 16%) 8px 8px,
+          radial-gradient(rgba(255, 255, 255, 0.1) 15%, transparent 20%) 0 1px,
+          radial-gradient(rgba(255, 255, 255, 0.1) 15%, transparent 20%) 8px 9px;
+        background-color: #e8e8e8;
+        background-size: 16px 16px;
+        margin-left: auto;
+        margin-right: auto;
+        max-width: 1100px;
+        min-height: 100%;
+      }
+      .book__list {
+        text-align: center;
+      }
+      .kiwixHomeBody {
+        position: relative;
+        text-align: center;
+        min-height: 100%;
+        margin: 0 0 15px;
+      }
+      .book {
+        display: inline-block;
+        vertical-align: bottom;
+        margin: 8px;
+        padding: 12px 15px;
+        width: 300px;
+        border: 1px solid #ccc;
+        border-radius: 8px;
+        text-align: left;
+        color: #000;
+        font-family: sans-serif;
+        font-size: 13px;
+        background-color: #f1f1f1;
+        box-shadow: 2px 2px 5px 0 #ccc;
+      }
+      #kiwixfooter {
+        text-align: center;
+        margin: 0.5em;
+        position: absolute;
+        bottom: 0;
+        left: 46%;
+      }
+      .kiwixHomeNavbar {
+        display: flex;
+        justify-content: center;
+      }
+      .kiwixFilter {
+        margin: 8px 10px;
+      }
+      .kiwixSearch, .searchButton {
+        margin: 0 13px 0 0;
+      }
+      .kiwixSearchForm {
+        margin: 8px 10px;
+        float: right;
+      }
+      @media (max-width: 1100px) {
+        .kiwixHomeBody {
+          padding: 0 125px;
+        }
+      }
+      .book:hover {
+        background-color: #f9f9f9;
+        box-shadow: none;
+      }
+      .book__background {
+        background-repeat: no-repeat;
+        background-size: 48px 48px;
+        background-position: top right;
+      }
+      .book__title {
+        padding: 0 55px 0 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 18px;
+        color: #0645ad;
+        line-height: 1em;
+      }
+      .book__description {
+        padding: 5px 55px 5px 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 15px;
+        line-height: 1em;
+      }
+      .book__info {
+        color: #777;
+        font-weight: bold;
+        font-size: 13px;
+        line-height: 1em;
+      }
+      a:link {
+        text-decoration: none;
+      }
+      a:visited {
+        text-decoration: none;
+      }
+      .noResults {
+        position: absolute;
+        top: 48%;
+        left: 42%;
+      }
+      .loader-spinner {
+        position: absolute;
+        top: -50%;
+        left: 50%;
+        border: 5px solid #f3f3f3;
+        border-radius: 50%;
+        border-top: 5px solid #3498db;
+        width: 40px;
+        height: 40px;
+        margin: auto;
+        -webkit-animation: spin 1s linear infinite; /* Safari */
+        animation: spin 1s linear infinite;
+        margin-top: 35px;
+        margin-bottom: -35px;
+        z-index: 2;
+      }
+      /* Safari */
+      @-webkit-keyframes spin {
+        0% { -webkit-transform: rotate(0deg); }
+        100% { -webkit-transform: rotate(360deg); }
+      }
+      @keyframes spin {
+        0% { transform: rotate(0deg); }
+        100% { transform: rotate(360deg); }
+      }
+      .loader {
+        position: relative;
+        height: 70px;
+        width: 100%;
+      }
+      .fadeOut {
+        position: fixed;
+        display: none;
+        bottom: 0;
+        left: 0;
+        z-index: 1;
+        background: linear-gradient(180deg, rgba(232, 232, 232, 0) 0%, rgb(232, 232, 232) 100%);
+        height: 80px;
+        width: 100%;
+      }
+      .spacer {
+        height: 20px;
+        background: transparent;
      }
    </style>
    <script src="{{root}}/skin/isotope.pkgd.min.js" defer></script>
+    <script src="{{root}}/skin/categoryList.js"></script>
+    <script src="{{root}}/skin/langList.js"></script>
    <script src="{{root}}/skin/iso6391To3.js"></script>
    <script type="text/javascript" src="{{root}}/skin/index.js" defer></script>
  </head>
-  <body>
-    <div class='kiwixNav'>
-      <div class="kiwixNav__filters">
-        <div class="kiwixNav__select">
-          <select name="lang" id="languageFilter" class='kiwixNav__kiwixFilter filter'>
-            <option value="" selected>All languages</option>
-          </select>
-        </div>
-        <div class="kiwixNav__select">
-          <select name="category" id="categoryFilter" class='kiwixNav__kiwixFilter filter'>
-            <option value="" selected>All categories</option>
-          </select>
-        </div>
-      </div>
-      <form id='kiwixSearchForm' class='kiwixNav__SearchForm'>
-        <input type="text" name="q" placeholder="Search" id="searchFilter" class='kiwixSearch filter'>
+  <body class="kiwix">
+    <div class='kiwixHomeNavbar'>
+      <select name="lang" id="languageFilter" class='kiwixFilter'>
+        <option value="" selected>All languages</option>
+      </select>
+      <select name="category" id="categoryFilter" class='kiwixFilter'>
+        <option value="" selected>All categories</option>
+      </select>
+      <form id='kiwixSearchForm' class='kiwixSearchForm'>
+        <input type="text" name="q" id="searchFilter" class='kiwixSearch'>
        <input type="submit" class="searchButton" value="Search"/>
      </form>
    </div>
    <div class="kiwixHomeBody">
-      <h3 class="kiwixHomeBody__results"></h3>
      <div class="book__list"></div>
      <div id="fadeOut" class="fadeOut"></div>
    </div>
-    <div class="loader" style="position: absolute; top: 50%"><div class="loader-spinner"></div></div>
-    <div id="kiwixfooter" class="kiwixfooter">Powered by&nbsp;<a href="https://kiwix.org">Kiwix</a></div>
+    <div class="loader"><div class="loader-spinner"></div></div>
+    <div class="spacer"></div>
+    <div id="kiwixfooter">Powered by <a href="https://kiwix.org">Kiwix</a></div>
  </body>
-  <script>
-    function closeModal() {
-      for(modal of document.getElementsByClassName('modal-wrapper')) {
-        modal.remove();
-      }
-    }
-  </script>
 </html>
--- a/test/data/library.xml
+++ b/test/data/library.xml
@@ -21,11 +21,11 @@
        url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim"
        title="Ray (uncategorized) Charles"
        description="No category is assigned to this library entry."
-        language="rus"
+        language="eng"
        creator="Wikipedia"
        publisher="Kiwix"
        date="2020-03-31"
-        name="wikipedia_ru_ray_charles"
+        name="wikipedia_en_ray_charles"
        tags="unittest;wikipedia;_pictures:no;_videos:no;_details:no"
        articleCount="284"
        mediaCount="2"
@@ -37,11 +37,11 @@
        url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim"
        title="Charles, Ray"
        description="Wikipedia articles about Ray Charles"
-        language="fra"
+        language="eng"
        creator="Wikipedia"
        publisher="Kiwix"
        date="2020-03-31"
-        name="wikipedia_fr_ray_charles"
+        name="wikipedia_en_ray_charles"
        tags="unittest;wikipedia;_category:jazz;_pictures:no;_videos:no;_details:no;_ftindex:yes"
        articleCount="284"
        mediaCount="2"
--- a/test/httplib.h
+++ b/test/httplib.h
--- a/test/library.cpp
+++ b/test/library.cpp
@@ -275,25 +275,9 @@ TEST_F(LibraryTest, getBookMarksTest)
 TEST_F(LibraryTest, sanityCheck)
 {
  EXPECT_EQ(lib.getBookCount(true, true), 12U);
-  EXPECT_EQ(lib.getBooksLanguages(),
-            std::vector<std::string>({"deu", "eng", "fra"})
-  );
-  EXPECT_EQ(lib.getBooksCreators(), std::vector<std::string>({
-      "Islam Stack Exchange",
-      "Movies & TV Stack Exchange",
-      "Mythology & Folklore Stack Exchange",
-      "TED",
-      "Tania Louis",
-      "Wiki",
-      "Wikibooks",
-      "Wikipedia",
-      "Wikiquote"
-  }));
-  EXPECT_EQ(lib.getBooksPublishers(), std::vector<std::string>({
-      "",
-      "Kiwix",
-      "Kiwix & Some Enthusiasts"
-  }));
+  EXPECT_EQ(lib.getBooksLanguages().size(), 3U);
+  EXPECT_EQ(lib.getBooksCreators().size(), 9U);
+  EXPECT_EQ(lib.getBooksPublishers().size(), 3U);
 }

 TEST_F(LibraryTest, categoryHandling)
--- a/test/manager.cpp
+++ b/test/manager.cpp
@@ -2,7 +2,6 @@
 #include "../include/manager.h"
 #include "../include/library.h"
 #include "../include/book.h"
-#include "../include/tools.h"
 #include <iostream>
 #include <fstream>

@@ -14,13 +13,13 @@ TEST(ManagerTest, addBookFromPathAndGetIdTest)
    auto bookId = manager.addBookFromPathAndGetId("./test/example.zim");
    ASSERT_NE(bookId, "");
    kiwix::Book book = lib.getBookById(bookId);
-    EXPECT_EQ(book.getPath(), kiwix::computeAbsolutePath("", "./test/example.zim"));
+    EXPECT_EQ(book.getPath(), computeAbsolutePath("", "./test/example.zim"));

    const std::string pathToSave = "./pathToSave";
    const std::string url = "url";
    bookId = manager.addBookFromPathAndGetId("./test/example.zim", pathToSave, url, true);
    book = lib.getBookById(bookId);
-    auto savedPath = kiwix::computeAbsolutePath(kiwix::removeLastPathElement(manager.writableLibraryPath), pathToSave);
+    auto savedPath = computeAbsolutePath(removeLastPathElement(manager.writableLibraryPath), pathToSave);
    EXPECT_EQ(book.getPath(), savedPath);
    EXPECT_EQ(book.getUrl(), url);
 }
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,9 +8,6 @@ tests = [
    'kiwixserve',
    'book',
    'manager',
-    'opds_catalog',
-    'reader',
-    'searcher'
 ]

 if build_machine.system() != 'windows'
--- a/test/opds_catalog.cpp
+++ b/test/opds_catalog.cpp
@@ -1,85 +0,0 @@
-/*
- * Copyright 2021 Veloman Yunkan <veloman.yunkan@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
- * NON-INFRINGEMENT.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- */
-
-#include "../include/opds_catalog.h"
-
-#include "gtest/gtest.h"
-
-using namespace kiwix;
-
-TEST(OpdsCatalog, getSearchUrl)
-{
-  #define EXPECT_SEARCH_URL(url) EXPECT_EQ(url, getSearchUrl(f))
-  {
-    Filter f;
-    EXPECT_SEARCH_URL("/catalog/v2/entries");
-  }
-  {
-    Filter f;
-    f.query("abc");
-    EXPECT_SEARCH_URL("/catalog/v2/entries?q=abc");
-  }
-  {
-    Filter f;
-    f.query("abc def");
-    EXPECT_SEARCH_URL("/catalog/v2/entries?q=abc%20def");
-  }
-  {
-    Filter f;
-    f.category("ted");
-    EXPECT_SEARCH_URL("/catalog/v2/entries?category=ted");
-  }
-  {
-    Filter f;
-    f.lang("eng");
-    EXPECT_SEARCH_URL("/catalog/v2/entries?lang=eng");
-  }
-  {
-    Filter f;
-    f.name("second");
-    EXPECT_SEARCH_URL("/catalog/v2/entries?name=second");
-  }
-  {
-    Filter f;
-    f.acceptTags({"paper", "plastic"});
-    EXPECT_SEARCH_URL("/catalog/v2/entries?tag=paper;plastic");
-  }
-  {
-    Filter f;
-    f.query("abc");
-    f.category("ted");
-    EXPECT_SEARCH_URL("/catalog/v2/entries?q=abc&category=ted");
-  }
-  {
-    Filter f;
-    f.category("ted");
-    f.query("abc");
-    EXPECT_SEARCH_URL("/catalog/v2/entries?q=abc&category=ted");
-  }
-  {
-    Filter f;
-    f.query("peru");
-    f.category("scifi");
-    f.lang("html");
-    f.name("edsonarantesdonascimento");
-    f.acceptTags({"body", "script"});
-    EXPECT_SEARCH_URL("/catalog/v2/entries?q=peru&category=scifi&lang=html&name=edsonarantesdonascimento&tag=body;script");
-  }
-  #undef EXPECT_SEARCH_URL
-}
--- a/test/pathTools.cpp
+++ b/test/pathTools.cpp
@@ -20,8 +20,7 @@
 #include "gtest/gtest.h"
 #include <string>
 #include <vector>
-#include "../include/tools.h"
-#include "../src/tools/pathTools.h"
+#include "../include/tools/pathTools.h"

 #ifdef _WIN32
 # define S "\\"
@@ -102,61 +101,61 @@ TEST(pathTools, normalizePartsRelative)

 TEST(pathTools, isRelativePath)
 {
-  ASSERT_TRUE(kiwix::isRelativePath("foo"));
-  ASSERT_TRUE(kiwix::isRelativePath(P2("foo","bar")));
-  ASSERT_TRUE(kiwix::isRelativePath(P3(".","foo","bar")));
-  ASSERT_TRUE(kiwix::isRelativePath(P2("..","foo")));
-  ASSERT_TRUE(kiwix::isRelativePath(P4("foo","","bar","")));
-  ASSERT_FALSE(kiwix::isRelativePath(A1("foo")));
-  ASSERT_FALSE(kiwix::isRelativePath(A2("foo", "bar")));
+  ASSERT_TRUE(isRelativePath("foo"));
+  ASSERT_TRUE(isRelativePath(P2("foo","bar")));
+  ASSERT_TRUE(isRelativePath(P3(".","foo","bar")));
+  ASSERT_TRUE(isRelativePath(P2("..","foo")));
+  ASSERT_TRUE(isRelativePath(P4("foo","","bar","")));
+  ASSERT_FALSE(isRelativePath(A1("foo")));
+  ASSERT_FALSE(isRelativePath(A2("foo", "bar")));
 #ifdef _WIN32
-  ASSERT_FALSE(kiwix::isRelativePath(P2(A_SAMBA, "foo")));
-  ASSERT_FALSE(kiwix::isRelativePath(P3(A_SAMBA, "foo", "bar")));
+  ASSERT_FALSE(isRelativePath(P2(A_SAMBA, "foo")));
+  ASSERT_FALSE(isRelativePath(P3(A_SAMBA, "foo", "bar")));
 #endif
 }

 TEST(pathTools, computeAbsolutePath)
 {
-  ASSERT_EQ(kiwix::computeAbsolutePath(A2("a","b"), "foo"),
+  ASSERT_EQ(computeAbsolutePath(A2("a","b"), "foo"),
            A3("a","b","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b",""), "foo"),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b",""), "foo"),
            A3("a","b","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A2("a","b"), P2(".","foo")),
+  ASSERT_EQ(computeAbsolutePath(A2("a","b"), P2(".","foo")),
            A3("a","b","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A2("a","b"), P2("..","foo")),
+  ASSERT_EQ(computeAbsolutePath(A2("a","b"), P2("..","foo")),
            A2("a","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b",""), P2("..","foo")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b",""), P2("..","foo")),
            A2("a","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A5("a","b","c","d","e"), P2("..","foo")),
+  ASSERT_EQ(computeAbsolutePath(A5("a","b","c","d","e"), P2("..","foo")),
            A5("a","b","c","d","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A5("a","b","c","d","e"), P5("..","..","..","g","foo")),
+  ASSERT_EQ(computeAbsolutePath(A5("a","b","c","d","e"), P5("..","..","..","g","foo")),
            A4("a","b","g","foo"));
 #ifdef _WIN32
-  ASSERT_EQ(kiwix::computeAbsolutePath(P4(A_SAMBA,"a","b",""), P2("..","foo")),
+  ASSERT_EQ(computeAbsolutePath(P4(A_SAMBA,"a","b",""), P2("..","foo")),
            P3(A_SAMBA,"a","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(P6(A_SAMBA,"a","b","c","d","e"), P5("..","..","..","g","foo")),
+  ASSERT_EQ(computeAbsolutePath(P6(A_SAMBA,"a","b","c","d","e"), P5("..","..","..","g","foo")),
            P5(A_SAMBA,"a","b","g","foo"));
 #endif
 }

 TEST(pathTools, computeRelativePath)
 {
-  ASSERT_EQ(kiwix::computeRelativePath(A2("a","b"), A3("a","b","foo")),
+  ASSERT_EQ(computeRelativePath(A2("a","b"), A3("a","b","foo")),
            "foo");
-  ASSERT_EQ(kiwix::computeRelativePath(A3("a","b",""), A3("a","b","foo")),
+  ASSERT_EQ(computeRelativePath(A3("a","b",""), A3("a","b","foo")),
            "foo");
-  ASSERT_EQ(kiwix::computeRelativePath(A2("a","b"), A2("a","foo")),
+  ASSERT_EQ(computeRelativePath(A2("a","b"), A2("a","foo")),
            P2("..","foo"));
-  ASSERT_EQ(kiwix::computeRelativePath(A3("a","b",""), A2("a","foo")),
+  ASSERT_EQ(computeRelativePath(A3("a","b",""), A2("a","foo")),
            P2("..","foo"));
-  ASSERT_EQ(kiwix::computeRelativePath(A5("a","b","c","d","e"), A5("a","b","c","d","foo")),
+  ASSERT_EQ(computeRelativePath(A5("a","b","c","d","e"), A5("a","b","c","d","foo")),
            P2("..","foo"));
-  ASSERT_EQ(kiwix::computeRelativePath(A5("a","b","c","d","e"), A4("a","b","g","foo")),
+  ASSERT_EQ(computeRelativePath(A5("a","b","c","d","e"), A4("a","b","g","foo")),
            P5("..","..","..","g","foo"));
 #ifdef _WIN32
-  ASSERT_EQ(kiwix::computeRelativePath(P3(A_SAMBA,"a","b"), P3(A_SAMBA,"a","foo")),
+  ASSERT_EQ(computeRelativePath(P3(A_SAMBA,"a","b"), P3(A_SAMBA,"a","foo")),
            P2("..","foo"));
-  ASSERT_EQ(kiwix::computeRelativePath(P6(A_SAMBA,"a","b","c","d","e"), P5(A_SAMBA,"a","b","g","foo")),
+  ASSERT_EQ(computeRelativePath(P6(A_SAMBA,"a","b","c","d","e"), P5(A_SAMBA,"a","b","g","foo")),
            P5("..","..","..","g","foo"));

 #endif
@@ -164,73 +163,73 @@ TEST(pathTools, computeRelativePath)

 TEST(pathTools, removeLastPathElement)
 {
-  ASSERT_EQ(kiwix::removeLastPathElement(P3("a","b","c")),
+  ASSERT_EQ(removeLastPathElement(P3("a","b","c")),
            P2("a","b"));
-  ASSERT_EQ(kiwix::removeLastPathElement(A3("a","b","c")),
+  ASSERT_EQ(removeLastPathElement(A3("a","b","c")),
            A2("a","b"));
-  ASSERT_EQ(kiwix::removeLastPathElement(P4("a","b","c","")),
+  ASSERT_EQ(removeLastPathElement(P4("a","b","c","")),
            P2("a","b"));
-  ASSERT_EQ(kiwix::removeLastPathElement(A4("a","b","c","")),
+  ASSERT_EQ(removeLastPathElement(A4("a","b","c","")),
            A2("a","b"));
 }

 TEST(pathTools, appendToDirectory)
 {
-  ASSERT_EQ(kiwix::appendToDirectory(P3("a","b","c"), "foo.xml"),
+  ASSERT_EQ(appendToDirectory(P3("a","b","c"), "foo.xml"),
            P4("a","b","c","foo.xml"));
-  ASSERT_EQ(kiwix::appendToDirectory(P4("a","b","c",""), "foo.xml"),
+  ASSERT_EQ(appendToDirectory(P4("a","b","c",""), "foo.xml"),
            P4("a","b","c","foo.xml"));
-  ASSERT_EQ(kiwix::appendToDirectory(P3("a","b","c"), P2("d","foo.xml")),
+  ASSERT_EQ(appendToDirectory(P3("a","b","c"), P2("d","foo.xml")),
            P5("a","b","c","d","foo.xml"));
-  ASSERT_EQ(kiwix::appendToDirectory(P4("a","b","c",""), P2("d","foo.xml")),
+  ASSERT_EQ(appendToDirectory(P4("a","b","c",""), P2("d","foo.xml")),
            P5("a","b","c","d","foo.xml"));
-  ASSERT_EQ(kiwix::appendToDirectory(P3("a","b","c"), P2(".","foo.xml")),
+  ASSERT_EQ(appendToDirectory(P3("a","b","c"), P2(".","foo.xml")),
            P5("a","b","c",".","foo.xml"));
-  ASSERT_EQ(kiwix::appendToDirectory(P4("a","b","c",""), P2(".","foo.xml")),
+  ASSERT_EQ(appendToDirectory(P4("a","b","c",""), P2(".","foo.xml")),
            P5("a","b","c",".","foo.xml"));
 }


 TEST(pathTools, goUp)
 {
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), ".."),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), ".."),
            A2("a", "b"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P2("..","..")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P2("..","..")),
            A1("a"));
 #ifdef _WIN32
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P3("..","..","..")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P3("..","..","..")),
            "c:");
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P4("..","..","..","..")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P4("..","..","..","..")),
            "c:");
-  ASSERT_EQ(kiwix::computeAbsolutePath(P4(A_SAMBA,"a","b","c"), ".."),
+  ASSERT_EQ(computeAbsolutePath(P4(A_SAMBA,"a","b","c"), ".."),
            P3(A_SAMBA,"a", "b"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P2("..","..")),
+  ASSERT_EQ(computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P2("..","..")),
            P2(A_SAMBA,"a"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P3("..","..","..")),
+  ASSERT_EQ(computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P3("..","..","..")),
            A_SAMBA);
-  ASSERT_EQ(kiwix::computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P4("..","..","..","..")),
+  ASSERT_EQ(computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P4("..","..","..","..")),
            A_SAMBA);

 #else
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P3("..","..","..")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P3("..","..","..")),
            "/");
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P4("..","..","..","..")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P4("..","..","..","..")),
            "/");
 #endif


-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P2("..", "foo")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P2("..", "foo")),
            A3("a", "b","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P3("..","..","foo")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P3("..","..","foo")),
            A2("a","foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P4("..","..","..","foo")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P4("..","..","..","foo")),
            A1("foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(A3("a","b","c"), P5("..","..","..","..","foo")),
+  ASSERT_EQ(computeAbsolutePath(A3("a","b","c"), P5("..","..","..","..","foo")),
            A1("foo"));
 #ifdef _WIN32
-  ASSERT_EQ(kiwix::computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P4("..","..","..","foo")),
+  ASSERT_EQ(computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P4("..","..","..","foo")),
            P2(A_SAMBA,"foo"));
-  ASSERT_EQ(kiwix::computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P5("..","..","..","..","foo")),
+  ASSERT_EQ(computeAbsolutePath(P4(A_SAMBA,"a","b","c"), P5("..","..","..","..","foo")),
            P2(A_SAMBA,"foo"));
 #endif
 }
@@ -242,20 +241,20 @@ TEST(pathTools, dirChange)
  std::string p1("c:\\a\\b\\c");
  std::string p2("d:\\d\\e\\foo.xml");
  {
-    std::string relative_path = kiwix::computeRelativePath(p1, p2);
+    std::string relative_path = computeRelativePath(p1, p2);
    ASSERT_EQ(relative_path, p2);
-    std::string abs_path = kiwix::computeAbsolutePath(p1, relative_path);
+    std::string abs_path = computeAbsolutePath(p1, relative_path);
    ASSERT_EQ(abs_path, p2);
-    ASSERT_EQ(kiwix::computeAbsolutePath(p1, "..\\..\\..\\..\\..\\d:\\d\\e\\foo.xml"), p2);
+    ASSERT_EQ(computeAbsolutePath(p1, "..\\..\\..\\..\\..\\d:\\d\\e\\foo.xml"), p2);
  }
  std::string ps("\\\\samba\\d\\e\\foo.xml");
  {
-    std::string relative_path = kiwix::computeRelativePath(p1, ps);
+    std::string relative_path = computeRelativePath(p1, ps);
    ASSERT_EQ(relative_path, ps);
-    std::string abs_path = kiwix::computeAbsolutePath(p1, relative_path);
+    std::string abs_path = computeAbsolutePath(p1, relative_path);
    ASSERT_EQ(abs_path, ps);
    // I'm not sure this test is valid on windows :/
-//    ASSERT_EQ(kiwix::computeAbsolutePath(p1, "..\\..\\..\\..\\..\\\\samba\\d\\e\\foo.xml"), ps);
+//    ASSERT_EQ(computeAbsolutePath(p1, "..\\..\\..\\..\\..\\\\samba\\d\\e\\foo.xml"), ps);
  }
 }

--- a/test/reader.cpp
+++ b/test/reader.cpp
@@ -1,62 +0,0 @@
-
-#include "gtest/gtest.h"
-#include "../include/reader.h"
-#include "zim/archive.h"
-
-namespace kiwix
-{
-  /**
-   * This test file is written primarily to demonstrate how Reader is simply a
-   * wrapper over an archive. We will be dropping this wrapper soon.
-   **/
-  TEST (Reader, archiveWrapper) {
-    Reader reader("./test/zimfile.zim");
-    zim::Archive archive = *reader.getZimArchive();
-
-    std::ostringstream s;
-    s << archive.getUuid();
-
-    ASSERT_EQ(reader.getId(), s.str());
-    ASSERT_EQ(reader.getGlobalCount(), archive.getEntryCount());
-    ASSERT_EQ(reader.getMainPage().getTitle(), archive.getMainEntry().getTitle());
-    ASSERT_EQ(reader.hasFulltextIndex(), archive.hasFulltextIndex());
-    ASSERT_NO_THROW(reader.getRandomPage());
-  }
-
-  TEST (Reader, getFunctions) {
-    zim::Archive archive("./test/zimfile.zim");
-    Reader reader("./test/zimfile.zim");
-
-    auto archiveEntry = archive.getRandomEntry();
-    ASSERT_TRUE(reader.pathExists(archiveEntry.getPath()));
-    auto readerEntry = reader.getEntryFromPath(archiveEntry.getPath());
-    ASSERT_EQ(readerEntry.getTitle(), archiveEntry.getTitle());
-
-    ASSERT_FALSE(reader.pathExists("invalidEntryPath"));
-    ASSERT_THROW(reader.getEntryFromPath("invalidEntryPath"), NoEntry);
-
-    readerEntry = reader.getEntryFromTitle(archiveEntry.getTitle());
-    ASSERT_EQ(readerEntry.getTitle(), archiveEntry.getTitle());
-  }
-
-  TEST (Reader, suggestions) {
-    Reader reader("./test/zimfile.zim");
-    SuggestionsList_t suggestions;
-    reader.searchSuggestionsSmart("The Genius", 4, suggestions);
-
-    std::vector<std::string> suggestionResult, expectedResult;
-    std::string suggestionTitle;
-    for (auto it = suggestions.begin(); it != suggestions.end(); it++) {
-      suggestionResult.push_back(it->getTitle());
-    }
-
-    expectedResult = {
-      "The Genius After Hours",
-      "The Genius Hits the Road",
-      "The Genius Sings the Blues",
-      "The Genius of Ray Charles"
-    };
-
-    ASSERT_EQ(suggestionResult, expectedResult);
-  }
-}
--- a/test/regex.cpp
+++ b/test/regex.cpp
@@ -21,7 +21,7 @@
 #include <string>


-#include "../src/tools/regexTools.h"
+#include "../include/tools/regexTools.h"

 namespace
 {
--- a/test/searcher.cpp
+++ b/test/searcher.cpp
@@ -1,67 +0,0 @@
-#include "gtest/gtest.h"
-#include "../include/searcher.h"
-#include "../include/reader.h"
-
-namespace kiwix
-{
-
-TEST(Searcher, search) {
-  Reader reader("./test/example.zim");
-
-  Searcher searcher;
-  searcher.add_reader(&reader);
-  ASSERT_EQ(searcher.get_reader(0)->getTitle(), reader.getTitle());
-
-  searcher.search("wiki", 0, 2);
-  searcher.restart_search();
-  ASSERT_EQ(searcher.getEstimatedResultCount(), (unsigned int)2);
-
-  auto result = searcher.getNextResult();
-  ASSERT_EQ(result->get_title(), "FreedomBox for Communities/Offline Wikipedia - Wikibooks, open books for an open world");
-  result = searcher.getNextResult();
-  ASSERT_EQ(result->get_title(), "Wikibooks");
-}
-
-TEST(Searcher, suggestion) {
-  Reader reader("./test/zimfile.zim");
-
-  Searcher searcher;
-  searcher.add_reader(&reader);
-  ASSERT_EQ(searcher.get_reader(0)->getTitle(), reader.getTitle());
-
-  std::string query = "ray";
-  searcher.suggestions(query, true);
-  searcher.restart_search();
-
-  auto result = searcher.getNextResult();
-  ASSERT_EQ(result->get_title(), "Charles, Ray");
-  ASSERT_EQ(result->get_url(), "A/Charles,_Ray");
-  ASSERT_EQ(result->get_snippet(), "Charles, <b>Ray</b>");
-  ASSERT_EQ(result->get_score(), 0);
-  ASSERT_EQ(result->get_content(), "");
-  ASSERT_EQ(result->get_size(), 0);
-  ASSERT_EQ(result->get_wordCount(), 0);
-  ASSERT_EQ(result->get_zimId(), "");
-
-  result = searcher.getNextResult();
-  ASSERT_EQ(result->get_title(), "Ray (film)");
-}
-
-TEST(Searcher, incrementalRange) {
-  // Attempt to get 50 results in steps of 5
-  zim::Archive archive("./test/zimfile.zim");
-  zim::Searcher ftsearcher(archive);
-  zim::Query query;
-  query.setQuery("ray");
-  auto search = ftsearcher.search(query);
-
-  int suggCount = 0;
-  for (int i = 0; i < 10; i++) {
-    auto srs = search.getResults(i*5, 5); // get 5 results
-    ASSERT_EQ(srs.size(), 5);
-    suggCount += srs.size();
-  }
-  ASSERT_EQ(suggCount, 50);
-}
-
-}
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -5,7 +5,7 @@
 #include "../include/manager.h"
 #include "../include/server.h"
 #include "../include/name_mapper.h"
-#include "../include/tools.h"
+

 using TestContextImpl = std::vector<std::pair<std::string, std::string> >;
 struct TestContext : TestContextImpl {
@@ -54,21 +54,21 @@ public: // types

 public: // functions
  ZimFileServer(int serverPort, std::string libraryFilePath);
-  ZimFileServer(int serverPort, const FilePathCollection& zimpaths, std::string indexTemplateString = "");
+  ZimFileServer(int serverPort, const FilePathCollection& zimpaths);
  ~ZimFileServer();

-  httplib::Result GET(const char* path, const Headers& headers = Headers())
+  Response GET(const char* path, const Headers& headers = Headers())
  {
    return client->Get(path, headers);
  }

-  httplib::Result HEAD(const char* path, const Headers& headers = Headers())
+  Response HEAD(const char* path, const Headers& headers = Headers())
  {
    return client->Head(path, headers);
  }

 private:
-  void run(int serverPort, std::string indexTemplateString = "");
+  void run(int serverPort);

 private: // data
  kiwix::Library library;
@@ -81,14 +81,14 @@ private: // data
 ZimFileServer::ZimFileServer(int serverPort, std::string libraryFilePath)
 : manager(&this->library)
 {
-  if ( kiwix::isRelativePath(libraryFilePath) )
-    libraryFilePath = kiwix::computeAbsolutePath(kiwix::getCurrentDirectory(), libraryFilePath);
+  if ( isRelativePath(libraryFilePath) )
+    libraryFilePath = computeAbsolutePath(getCurrentDirectory(), libraryFilePath);
  manager.readFile(libraryFilePath, true, true);

  run(serverPort);
 }

-ZimFileServer::ZimFileServer(int serverPort, const FilePathCollection& zimpaths, std::string indexTemplateString)
+ZimFileServer::ZimFileServer(int serverPort, const FilePathCollection& zimpaths)
 : manager(&this->library)
 {
  for ( const auto& zimpath : zimpaths ) {
@@ -96,10 +96,10 @@ ZimFileServer::ZimFileServer(int serverPort, const FilePathCollection& zimpaths,
      throw std::runtime_error("Unable to add the ZIM file '" + zimpath + "'");
  }

-  run(serverPort, indexTemplateString);
+  run(serverPort);
 }

-void ZimFileServer::run(int serverPort, std::string indexTemplateString)
+void ZimFileServer::run(int serverPort)
 {
  const std::string address = "127.0.0.1";
  nameMapper.reset(new kiwix::HumanReadableNameMapper(library, false));
@@ -108,9 +108,6 @@ void ZimFileServer::run(int serverPort, std::string indexTemplateString)
  server->setPort(serverPort);
  server->setNbThreads(2);
  server->setVerbose(false);
-  if (!indexTemplateString.empty()) {
-    server->setIndexTemplateString(indexTemplateString);
-  }

  if ( !server->start() )
    throw std::runtime_error("ZimFileServer failed to start");
@@ -200,7 +197,6 @@ const ResourceCollection resources200Uncompressible{
  { WITH_ETAG, "/meta?content=zimfile&name=creator" },
  { WITH_ETAG, "/meta?content=zimfile&name=publisher" },
  { WITH_ETAG, "/meta?content=zimfile&name=favicon" },
-  { WITH_ETAG, "/meta?content=zimfile&name=Illustration_48x48@1" },

  { WITH_ETAG, "/zimfile/I/m/Ray_Charles_classic_piano_pose.jpg" },

@@ -214,35 +210,6 @@ ResourceCollection all200Resources()
  return concat(resources200Compressible, resources200Uncompressible);
 }

-TEST(indexTemplateStringTest, emptyIndexTemplate) {
-  const int PORT = 8001;
-  const ZimFileServer::FilePathCollection ZIMFILES {
-    "./test/zimfile.zim",
-    "./test/corner_cases.zim"
-  };
-
-  ZimFileServer zfs(PORT, ZIMFILES, "");
-  EXPECT_EQ(200, zfs.GET("/")->status);
-}
-
-TEST(indexTemplateStringTest, indexTemplateCheck) {
-  const int PORT = 8001;
-  const ZimFileServer::FilePathCollection ZIMFILES {
-    "./test/zimfile.zim",
-    "./test/corner_cases.zim"
-  };
-
-  ZimFileServer zfs(PORT, ZIMFILES, "<!DOCTYPE html><head>"
-      "<title>Welcome to kiwix library</title>"
-    "</head>"
-  "</html>");
-  EXPECT_EQ("<!DOCTYPE html><head>"
-    "<title>Welcome to kiwix library</title>"
-    "<link type=\"root\" href=\"\">"
-    "</head>"
-  "</html>", zfs.GET("/")->body);
-}
-
 TEST_F(ServerTest, 200)
 {
  for ( const Resource& res : all200Resources() )
@@ -650,18 +617,16 @@ std::string maskVariableOPDSFeedData(std::string s)
    "  <entry>\n"                                                       \
    "    <id>urn:uuid:charlesray</id>\n"                                \
    "    <title>Charles, Ray</title>\n"                                 \
+    "    <summary>Wikipedia articles about Ray Charles</summary>\n"    \
+    "    <language>eng</language>\n"                                    \
    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
-    "    <summary>Wikipedia articles about Ray Charles</summary>\n"     \
-    "    <language>fra</language>\n"                                    \
-    "    <name>wikipedia_fr_ray_charles</name>\n"                       \
+    "    <name>wikipedia_en_ray_charles</name>\n"                       \
    "    <flavour></flavour>\n"                                         \
    "    <category>jazz</category>\n"                                   \
    "    <tags>unittest;wikipedia;_category:jazz;_pictures:no;_videos:no;_details:no;_ftindex:yes</tags>\n" \
    "    <articleCount>284</articleCount>\n"                            \
    "    <mediaCount>2</mediaCount>\n"                                  \
-    "    <link rel=\"http://opds-spec.org/image/thumbnail\"\n"          \
-    "          href=\"/meta?name=Illustration_48x48@1&amp;content=zimfile\"\n" \
-    "          type=\"image/png;width=48;height=48;scale=1\"/>\n"               \
+    "    <icon>/meta?name=favicon&amp;content=zimfile</icon>\n"         \
    "    <link type=\"text/html\" href=\"/zimfile\" />\n"               \
    "    <author>\n"                                                    \
    "      <name>Wikipedia</name>\n"                                    \
@@ -676,18 +641,16 @@ std::string maskVariableOPDSFeedData(std::string s)
    "  <entry>\n"                                                       \
    "    <id>urn:uuid:raycharles</id>\n"                                \
    "    <title>Ray Charles</title>\n"                                  \
-    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
    "    <summary>Wikipedia articles about Ray Charles</summary>\n"     \
    "    <language>eng</language>\n"                                    \
+    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
    "    <name>wikipedia_en_ray_charles</name>\n"                       \
    "    <flavour></flavour>\n"                                         \
    "    <category>wikipedia</category>\n"                              \
    "    <tags>unittest;wikipedia;_category:wikipedia;_pictures:no;_videos:no;_details:no;_ftindex:yes</tags>\n" \
    "    <articleCount>284</articleCount>\n"                            \
    "    <mediaCount>2</mediaCount>\n"                                  \
-    "    <link rel=\"http://opds-spec.org/image/thumbnail\"\n"          \
-    "          href=\"/meta?name=Illustration_48x48@1&amp;content=zimfile\"\n" \
-    "          type=\"image/png;width=48;height=48;scale=1\"/>\n"               \
+    "    <icon>/meta?name=favicon&amp;content=zimfile</icon>\n"         \
    "    <link type=\"text/html\" href=\"/zimfile\" />\n"               \
    "    <author>\n"                                                    \
    "      <name>Wikipedia</name>\n"                                    \
@@ -702,18 +665,16 @@ std::string maskVariableOPDSFeedData(std::string s)
    "  <entry>\n"                                                       \
    "    <id>urn:uuid:raycharles_uncategorized</id>\n"                  \
    "    <title>Ray (uncategorized) Charles</title>\n"                  \
-    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
    "    <summary>No category is assigned to this library entry.</summary>\n" \
-    "    <language>rus</language>\n"                                    \
-    "    <name>wikipedia_ru_ray_charles</name>\n"                       \
+    "    <language>eng</language>\n"                                    \
+    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
+    "    <name>wikipedia_en_ray_charles</name>\n"                       \
    "    <flavour></flavour>\n"                                         \
    "    <category></category>\n"                                \
    "    <tags>unittest;wikipedia;_pictures:no;_videos:no;_details:no</tags>\n" \
    "    <articleCount>284</articleCount>\n"                            \
    "    <mediaCount>2</mediaCount>\n"                                  \
-    "    <link rel=\"http://opds-spec.org/image/thumbnail\"\n"          \
-    "          href=\"/meta?name=Illustration_48x48@1&amp;content=zimfile\"\n" \
-    "          type=\"image/png;width=48;height=48;scale=1\"/>\n"               \
+    "    <icon>/meta?name=favicon&amp;content=zimfile</icon>\n"         \
    "    <link type=\"text/html\" href=\"/zimfile\" />\n"               \
    "    <author>\n"                                                    \
    "      <name>Wikipedia</name>\n"                                    \
@@ -937,6 +898,7 @@ TEST_F(LibraryServerTest, catalog_search_results_pagination)
      "  <startIndex>100</startIndex>\n"
      "  <itemsPerPage>0</itemsPerPage>\n"
      CATALOG_LINK_TAGS
+      "  \n"
      "</feed>\n"
    );
  }
@@ -971,15 +933,6 @@ TEST_F(LibraryServerTest, catalog_v2_root)
    <id>12345678-90ab-cdef-1234-567890abcdef</id>
    <content type="text">All entries from this catalog.</content>
  </entry>
-  <entry>
-    <title>All entries (partial)</title>
-    <link rel="subsection"
-          href="/catalog/v2/partial_entries"
-          type="application/atom+xml;profile=opds-catalog;kind=acquisition"/>
-    <updated>YYYY-MM-DDThh:mm:ssZ</updated>
-    <id>12345678-90ab-cdef-1234-567890abcdef</id>
-    <content type="text">All entries from this catalog in partial format.</content>
-  </entry>
  <entry>
    <title>List of categories</title>
    <link rel="subsection"
@@ -989,15 +942,6 @@ TEST_F(LibraryServerTest, catalog_v2_root)
    <id>12345678-90ab-cdef-1234-567890abcdef</id>
    <content type="text">List of all categories in this catalog.</content>
  </entry>
-  <entry>
-    <title>List of languages</title>
-    <link rel="subsection"
-          href="/catalog/v2/languages"
-          type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-    <updated>YYYY-MM-DDThh:mm:ssZ</updated>
-    <id>12345678-90ab-cdef-1234-567890abcdef</id>
-    <content type="text">List of all languages in this catalog.</content>
-  </entry>
 </feed>
 )";
  EXPECT_EQ(maskVariableOPDSFeedData(r->body), expected_output);
@@ -1061,61 +1005,7 @@ TEST_F(LibraryServerTest, catalog_v2_categories)
  EXPECT_EQ(maskVariableOPDSFeedData(r->body), expected_output);
 }

-TEST_F(LibraryServerTest, catalog_v2_languages)
-{
-  const auto r = zfs1_->GET("/catalog/v2/languages");
-  EXPECT_EQ(r->status, 200);
-  const char expected_output[] = R"(<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:dc="http://purl.org/dc/terms/"
-      xmlns:opds="https://specs.opds.io/opds-1.2"
-      xmlns:thr="http://purl.org/syndication/thread/1.0">
-  <id>12345678-90ab-cdef-1234-567890abcdef</id>
-  <link rel="self"
-        href="/catalog/v2/languages"
-        type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-  <link rel="start"
-        href="/catalog/v2/root.xml"
-        type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-  <title>List of languages</title>
-  <updated>YYYY-MM-DDThh:mm:ssZ</updated>
-
-  <entry>
-    <title>English</title>
-    <dc:language>eng</dc:language>
-    <thr:count>1</thr:count>
-    <link rel="subsection"
-          href="/catalog/v2/entries?lang=eng"
-          type="application/atom+xml;profile=opds-catalog;kind=acquisition"/>
-    <updated>YYYY-MM-DDThh:mm:ssZ</updated>
-    <id>12345678-90ab-cdef-1234-567890abcdef</id>
-  </entry>
-  <entry>
-    <title>français</title>
-    <dc:language>fra</dc:language>
-    <thr:count>1</thr:count>
-    <link rel="subsection"
-          href="/catalog/v2/entries?lang=fra"
-          type="application/atom+xml;profile=opds-catalog;kind=acquisition"/>
-    <updated>YYYY-MM-DDThh:mm:ssZ</updated>
-    <id>12345678-90ab-cdef-1234-567890abcdef</id>
-  </entry>
-  <entry>
-    <title>русский</title>
-    <dc:language>rus</dc:language>
-    <thr:count>1</thr:count>
-    <link rel="subsection"
-          href="/catalog/v2/entries?lang=rus"
-          type="application/atom+xml;profile=opds-catalog;kind=acquisition"/>
-    <updated>YYYY-MM-DDThh:mm:ssZ</updated>
-    <id>12345678-90ab-cdef-1234-567890abcdef</id>
-  </entry>
-</feed>
-)";
-  EXPECT_EQ(maskVariableOPDSFeedData(r->body), expected_output);
-}
-
-#define CATALOG_V2_ENTRIES_PREAMBLE0(x)                       \
+#define CATALOG_V2_ENTRIES_PREAMBLE(q)                        \
    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"            \
    "<feed xmlns=\"http://www.w3.org/2005/Atom\"\n"           \
    "      xmlns:opds=\"https://specs.opds.io/opds-1.2\"\n"   \
@@ -1123,7 +1013,7 @@ TEST_F(LibraryServerTest, catalog_v2_languages)
    "  <id>12345678-90ab-cdef-1234-567890abcdef</id>\n"       \
    "\n"                                                      \
    "  <link rel=\"self\"\n"                                  \
-    "        href=\"/catalog/v2/" x "\"\n"                    \
+    "        href=\"/catalog/v2/entries" q "\"\n"             \
    "        type=\"application/atom+xml;profile=opds-catalog;kind=acquisition\"/>\n" \
    "  <link rel=\"start\"\n"                                 \
    "        href=\"/catalog/v2/root.xml\"\n"              \
@@ -1133,11 +1023,6 @@ TEST_F(LibraryServerTest, catalog_v2_languages)
    "        type=\"application/atom+xml;profile=opds-catalog;kind=navigation\"/>\n" \
    "\n"                                                      \

-#define CATALOG_V2_ENTRIES_PREAMBLE(q) \
-            CATALOG_V2_ENTRIES_PREAMBLE0("entries" q)
-
-#define CATALOG_V2_PARTIAL_ENTRIES_PREAMBLE(q) \
-            CATALOG_V2_ENTRIES_PREAMBLE0("partial_entries" q)

 TEST_F(LibraryServerTest, catalog_v2_entries)
 {
@@ -1221,117 +1106,3 @@ TEST_F(LibraryServerTest, catalog_v2_entries_filtered_by_search_terms)
    "</feed>\n"
  );
 }
-
-TEST_F(LibraryServerTest, suggestions_in_range)
-{
-  /**
-   * Attempt to get 50 suggestions in steps of 5
-   * The suggestions are returned in the json format
-   * [{sugg1}, {sugg2}, ... , {suggN}, {suggest ft search}]
-   * Assuming the number of suggestions = (occurance of "{" - 1)
-   */
-  {
-    int suggCount = 0;
-    for (int i = 0; i < 10; i++) {
-      std::string url = "/suggest?content=zimfile&term=ray&start=" + std::to_string(i*5) + "&count=5";
-      const auto r = zfs1_->GET(url.c_str());
-      std::string body = r->body;
-      int currCount = std::count(body.begin(), body.end(), '{') - 1;
-      ASSERT_EQ(currCount, 5);
-      suggCount += currCount;
-    }
-    ASSERT_EQ(suggCount, 50);
-  }
-
-  // Attempt to get 10 suggestions in steps of 5 even though there are only 8
-  {
-    std::string url = "/suggest?content=zimfile&term=song+for+you&start=0&count=5";
-    const auto r1 = zfs1_->GET(url.c_str());
-    std::string body = r1->body;
-    int currCount = std::count(body.begin(), body.end(), '{') - 1;
-    ASSERT_EQ(currCount, 5);
-
-    url = "/suggest?content=zimfile&term=song+for+you&start=5&count=5";
-    const auto r2 = zfs1_->GET(url.c_str());
-    body = r2->body;
-    currCount = std::count(body.begin(), body.end(), '{') - 1;
-    ASSERT_EQ(currCount, 3);
-  }
-
-  // Attempt to get 10 suggestions even though there is only 1
-  {
-    std::string url = "/suggest?content=zimfile&term=strong&start=0&count=5";
-    const auto r = zfs1_->GET(url.c_str());
-    std::string body = r->body;
-    int currCount = std::count(body.begin(), body.end(), '{') - 1;
-    ASSERT_EQ(currCount, 1);
-  }
-
-  // No Suggestion
-  {
-    std::string url = "/suggest?content=zimfile&term=oops&start=0&count=5";
-    const auto r = zfs1_->GET(url.c_str());
-    std::string body = r->body;
-    int currCount = std::count(body.begin(), body.end(), '{') - 1;
-    ASSERT_EQ(currCount, 0);
-  }
-
-  // Out of bound value
-  {
-    std::string url = "/suggest?content=zimfile&term=ray&start=-2&count=-1";
-    const auto r = zfs1_->GET(url.c_str());
-    std::string body = r->body;
-    int currCount = std::count(body.begin(), body.end(), '{') - 1;
-    ASSERT_EQ(currCount, 0);
-  }
-}
-
-TEST_F(LibraryServerTest, catalog_v2_individual_entry_access)
-{
-  const auto r = zfs1_->GET("/catalog/v2/entry/raycharles");
-  EXPECT_EQ(r->status, 200);
-  EXPECT_EQ(maskVariableOPDSFeedData(r->body),
-    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-    RAY_CHARLES_CATALOG_ENTRY
-  );
-
-  const auto r1 = zfs1_->GET("/catalog/v2/entry/non-existent-entry");
-  EXPECT_EQ(r1->status, 404);
-}
-
-TEST_F(LibraryServerTest, catalog_v2_partial_entries)
-{
-  const auto r = zfs1_->GET("/catalog/v2/partial_entries");
-  EXPECT_EQ(r->status, 200);
-  EXPECT_EQ(maskVariableOPDSFeedData(r->body),
-    CATALOG_V2_PARTIAL_ENTRIES_PREAMBLE("")
-    "  <title>All Entries</title>\n"
-    "  <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"
-    "\n"
-    "  <entry>\n"
-    "    <id>urn:uuid:charlesray</id>\n"
-    "    <title>Charles, Ray</title>\n"
-    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"
-    "    <link rel=\"alternate\"\n"
-    "          href=\"/catalog/v2/entry/charlesray\"\n"
-    "          type=\"application/atom+xml;type=entry;profile=opds-catalog\"/>\n"
-    "  </entry>\n"
-    "  <entry>\n"
-    "    <id>urn:uuid:raycharles</id>\n"
-    "    <title>Ray Charles</title>\n"
-    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"
-    "    <link rel=\"alternate\"\n"
-    "          href=\"/catalog/v2/entry/raycharles\"\n"
-    "          type=\"application/atom+xml;type=entry;profile=opds-catalog\"/>\n"
-    "  </entry>\n"
-    "  <entry>\n"
-    "    <id>urn:uuid:raycharles_uncategorized</id>\n"
-    "    <title>Ray (uncategorized) Charles</title>\n"
-    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"
-    "    <link rel=\"alternate\"\n"
-    "          href=\"/catalog/v2/entry/raycharles_uncategorized\"\n"
-    "          type=\"application/atom+xml;type=entry;profile=opds-catalog\"/>\n"
-    "  </entry>\n"
-    "</feed>\n"
-  );
-}