diff --git a/invenio_theme_tugraz/config.py b/invenio_theme_tugraz/config.py
index a6feb08..812a7b2 100644
--- a/invenio_theme_tugraz/config.py
+++ b/invenio_theme_tugraz/config.py
@@ -16,29 +16,32 @@ INVENIO_THEME_TUGRAZ_DEFAULT_VALUE = 'foobar'
 INVENIO_THEME_TUGRAZ_BASE_TEMPLATE = 'invenio_theme_tugraz/base.html'
 """Default base template for the demo page."""
 
-
-# Theme Logo
 THEME_LOGO = 'images/tug_logo.png'
+"""TU Graz logo"""
 
-# Custom header.html
 THEME_HEADER_TEMPLATE = 'invenio_theme_tugraz/header.html'
+"""TU Graz header template"""
 
-# override frontpage.html
 THEME_FRONTPAGE_TEMPLATE = 'invenio_theme_tugraz/frontpage.html'
+"""Frontpage template"""
 
-# Login page
 SECURITY_LOGIN_USER_TEMPLATE = 'invenio_theme_tugraz/accounts/login.html'
+"""Login template"""
 
 THEME_HEADER_LOGIN_TEMPLATE = 'invenio_theme_tugraz/accounts/header_login.html'
+"""login page header"""
 
-# footer template
 THEME_FOOTER_TEMPLATE = 'invenio_theme_tugraz/footer.html'
+"""footer template"""
 
-# icon used in login page
 INVENIO_THEME_TUGRAZ_ICON = 'images/icon_use.png'
+"""icon used in login page"""
 
-# Frontpage title
 THEME_FRONTPAGE_TITLE = "RDM for TUGRAZ"
+"""Frontpage title."""
+
+THEME_SITENAME = _('Application Name')
+"""Site name."""
 
 # Invenio-I18N
 # ============
@@ -56,14 +59,5 @@ I18N_LANGUAGES = [
 SEARCH_UI_HEADER_TEMPLATE = 'invenio_theme_tugraz/header.html'
 """Search page's header template."""
 
-# SEARCH_UI_SEARCH_TEMPLATE = 'invenio_theme_tugraz/search/search.html'
-"""Search page's base template."""
-
-# DEPOSITS_FORMS_BASE_TEMPLATE = 'invenio_app_rdm/deposits/forms/deposits.html'
-"""Deposits form page's base template."""
-
 DEPOSITS_HEADER_TEMPLATE = 'invenio_theme_tugraz/header.html'
 """Deposits header page's template."""
-
-# DEPOSITS_UPLOADS_TEMPLATE = 'invenio_app_rdm/deposits/uploads.html'
-"""Deposits user's uploads page template."""
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/invenio_search_ui/header.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/invenio_search_ui/header.html
deleted file mode 100644
index 9efb8f0..0000000
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/invenio_search_ui/header.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{# -*- coding: utf-8 -*-
-
-    This file is part of Invenio.
-    Copyright (C) 2015-2020 CERN.
-  
-    Invenio is free software; you can redistribute it and/or modify it
-    under the terms of the MIT License; see LICENSE file for more details.
-  #}
-  
-  {% extends config.SEARCH_UI_HEADER_TEMPLATE %}
-  
-  {%- block navbar_search %}
-  <div id="header-search-bar" class="item">
-      
-    <form class="ui form" action="{{config.THEME_SEARCH_ENDPOINT}}" role="search">
-      <div class="ui action icon input">
-        <input type="text" name="q" placeholder="{{_('Search')}}">
-        <button type="submit" class="ui icon button orange"><i class="icon search"></i></button>
-      </div>
-    </form>
-   
-  </div>
-  {%- endblock navbar_search %}
\ No newline at end of file
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/invenio_search_ui/search.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/invenio_search_ui/search.html
deleted file mode 100644
index 2ca68e3..0000000
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/invenio_search_ui/search.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends config.SEARCH_UI_BASE_TEMPLATE %}
-
-{%- block page_header %}
-
-
-{%- include "invenio_theme_tugraz/search/invenio_search_ui/header.html" %}
-
-{%- endblock page_header %}
-
-{%- block javascript %}
-  {{ super() }}
-  {%- block javascript_searchapp_customization %}
-      {{ webpack['search_ui_app_customizations.js'] }}
-  {%- endblock javascript_searchapp_customization %}
-  {{ webpack['search_ui_app.js'] }}
-  <script type="text/javascript">
-    window.initSearchApp("search-ui-app", {{ config|format_config("recid")|tojson }});
-  </script>
-{%- endblock javascript %}
-
-{%- block page_body %}
-<div id="search-ui-app"></div>
-{%- endblock page_body -%}
\ No newline at end of file
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/search.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/search.html
deleted file mode 100644
index c5818c1..0000000
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/search/search.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{#
-    Copyright (C) 2020 TUGRAZ
-    Copyright (C) 2020 mojib wali.
-  
-    invenio-theme-tugraz is free software; you can redistribute it and/or
-    modify it under the terms of the MIT License; see LICENSE file for more
-    details.
-  #}
-
-
-  {%- extends "invenio_theme_tugraz/search/invenio_search_ui/search.html" %}
-
-  {% block javascript_searchapp_customization %}
-  {{ webpack['invenio-app-rdm-search-app-js.js'] }}
-  {% endblock javascript_searchapp_customization %}
\ No newline at end of file