diff --git a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/DoiMint.js b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/DoiMint.js
deleted file mode 100644
index e665008..0000000
--- a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/DoiMint.js
+++ /dev/null
@@ -1,203 +0,0 @@
-import React, { Component } from "react";
-import {
-  Button,
-  Card,
-  Icon,
-  Label,
-  Loader,
-  Dimmer,
-  Message,
-} from "semantic-ui-react";
-import { FieldArray } from "formik";
-
-import { FetchDoi, MapDatacite } from "datacite-rest";
-
-export class DoiMint extends Component {
-  constructor(props) {
-    super(props);
-    this.record = props.record || {};
-    this.configs = props.config || {};
-    this.metadata = this.record.metadata;
-    this.is_doi = false;
-    this.id_doi = "";
-
-    // check for existing identifiers
-    if (
-      typeof this.metadata.identifiers != "undefined" &&
-      this.metadata.identifiers != null &&
-      this.metadata.identifiers.length != null &&
-      this.metadata.identifiers.length > 0 &&
-      this.metadata.identifiers[0] != null
-    ) {
-      for(var identifier of this.metadata.identifiers){
-        if (identifier.scheme == "doi"){
-          this.is_doi = true;
-          this.id_doi = identifier.identifier;
-        }
-      }
-    }
-
-    // add metadata to the state
-    this.state = {
-      identifiers: [],
-      showLoader: false,
-      doi_id: "",
-      errorMsg: "",
-      isError: false,
-    };
-  }
-
-  render() {
-    // this should fetch a new doi
-    var pushDoi = (form) => {
-      // activate the loader
-      this.setState({
-        showLoader: true,
-      });
-
-      // get the prefix from backend
-      const prefix = this.configs.datacite_prefix;
-      const suffix = this.configs.datacite_suffix;
-      const host_url = this.configs.datacite_host_url
-
-      if (prefix !== null && suffix !== null) {
-        // get mapped DOI
-        const mapped = MapDatacite(this.metadata, this.record.id, prefix, suffix, host_url);
-
-        const _fetchdoi = new FetchDoi("/getdoi");
-
-        // Create a new DOI
-        _fetchdoi
-          .create(mapped)
-          .then((data) => {
-            // if there is an error
-            if (data.data.errors) {
-              this.setState({
-                showLoader: false,
-                isError: true,
-                errorMsg: data.data.errors[0].title,
-              });
-            }
-            // new doi is fetched
-            else {
-              // add new identifier
-              const _identifiers = [
-                {
-                  identifier: data.data.data.data.id,
-                  scheme: "doi",
-                },
-              ];
-              // submit the value to the form
-              this.setState({ identifiers: _identifiers });
-              form.setFieldValue(
-                "metadata.identifiers",
-                this.state.identifiers
-              );
-
-              this.is_doi = true;
-              // deactivate the loader
-              this.setState({
-                showLoader: false,
-                doi_id: this.state.identifiers[0].identifier,
-              });
-            }
-          })
-          .catch((error) => {
-            console.log("error", error);
-          });
-      } else {
-        this.setState({
-          showLoader: false,
-          isError: true,
-          errorMsg: "Not configured!",
-        });
-      }
-    };
-
-    // // get a link of dio
-    // var doiLink = (doiId) => {
-    //   window.open(`https://doi.org/${doiId}`, "_blank");
-    // };
-
-    return (
-      <Card className="actions">
-        <Card.Content>
-          <Card.Header>
-            <Icon name="certificate" />
-            Datacite DOI
-          </Card.Header>
-          <Card.Description>
-            <span style={{ color: "#B6B6B6" }}>
-              Record must be a <b>published</b> record to mint a DOI.
-            </span>
-          </Card.Description>
-
-          {this.state.isError && (
-            <Message negative>
-              <Message.Header>{this.state.errorMsg}</Message.Header>
-              <p>Please contact Repository supporters!</p>
-            </Message>
-          )}
-
-          {/* when the Component is rendered */}
-          {!this.is_doi && (
-            <FieldArray name="metadata.identifiers">
-              {(fieldArrayProps) => {
-                const { form } = fieldArrayProps;
-                return (
-                  <div
-                    style={{
-                      marginTop: "10px",
-                      textAlign: "center",
-                    }}
-                  >
-                    <Button
-                      compact
-                      className="save-button"
-                      disabled={!this.record.is_published}
-                      as={"label"}
-                      color="green"
-                      size="large"
-                      onClick={() => pushDoi(form)}
-                    >
-                      <Icon name="certificate" />
-                      Get DOI Now!
-                    </Button>
-                    {this.state.showLoader && (
-                      <Dimmer active inverted>
-                        <Loader inverted>Loading...</Loader>
-                      </Dimmer>
-                    )}
-                  </div>
-                );
-              }}
-            </FieldArray>
-          )}
-
-          {this.is_doi && (
-            <div
-              style={{
-                textAlign: "center",
-                marginTop: "10px",
-              }}
-            >
-              {this.state.doi_id && (
-                <Message positive>
-                  <Message.Header>A DOI is registered!</Message.Header>
-                  <p>Please save the deposit. </p>
-                </Message>
-              )}
-              <Label
-                size="large"
-                color="blue"
-              >
-                <strong>DOI: </strong>
-                <Label.Detail>{this.state.doi_id || this.id_doi}</Label.Detail>
-              </Label>
-            </div>
-          )}
-        </Card.Content>
-      </Card>
-    );
-  }
-}
diff --git a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/PublisherField.js b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/PublisherField.js
deleted file mode 100644
index 048ae2e..0000000
--- a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/PublisherField.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// This file is part of React-Invenio-Deposit
-// Copyright (C) 2020 CERN.
-// Copyright (C) 2020 Northwestern University.
-// Copyright (C) 2021 Graz University of Technology.
-//
-// React-Invenio-Deposit is free software; you can redistribute it and/or modify it
-// under the terms of the MIT License; see LICENSE file for more details.
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-import { FieldLabel, TextField } from 'react-invenio-forms';
-
-export class PublisherField extends Component {
-  render() {
-    const { fieldPath, label, labelIcon, placeholder, required } = this.props;
-
-    return (
-      <TextField
-        fieldPath={fieldPath}
-        helpText={
-          'The publisher is used to formulate the citation, if you are plannig to mint a new DOI this publisher will be cited.'
-        }
-        label={
-          <FieldLabel htmlFor={fieldPath} icon={labelIcon} label={label} />
-        }
-        placeholder={placeholder}
-        required={required}
-      />
-    );
-  }
-}
-
-PublisherField.propTypes = {
-  fieldPath: PropTypes.string.isRequired,
-  label: PropTypes.string,
-  labelIcon: PropTypes.string,
-  placeholder: PropTypes.string,
-  required: PropTypes.bool,
-};
-
-PublisherField.defaultProps = {
-  fieldPath: 'metadata.publisher',
-  label: 'Publisher',
-  labelIcon: 'building outline',
-  placeholder: 'Enter publisher name',
-};
diff --git a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/RDMDepositForm.js b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/RDMDepositForm.js
deleted file mode 100644
index 142640e..0000000
--- a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/RDMDepositForm.js
+++ /dev/null
@@ -1,522 +0,0 @@
-// This file is part of InvenioRDM
-// Copyright (C) 2020 CERN.
-// Copyright (C) 2020 Northwestern University.
-// Copyright (C) 2021 Graz University of Technology.
-//
-// Invenio App RDM is free software; you can redistribute it and/or modify it
-// under the terms of the MIT License; see LICENSE file for more details.
-
-import _get from "lodash/get";
-import React, { Component, createRef } from "react";
-import {
-  Button,
-  Card,
-  Container,
-  Grid,
-  Icon,
-  Ref,
-  Sticky,
-} from "semantic-ui-react";
-import {
-  AccessRightField,
-  ComingSoonField,
-  CreatibutorsField,
-  DatesField,
-  DepositFormApp,
-  FormFeedback,
-  DeleteButton,
-  DepositFormTitle,
-  DescriptionsField,
-  FileUploader,
-  FundingField,
-  IdentifiersField,
-  LanguagesField,
-  PublishButton,
-  PublicationDateField,
-  ResourceTypeField,
-  SaveButton,
-  SubjectsField,
-  TitlesField,
-  RelatedWorksField,
-  VersionField,
-  LicenseField,
-} from "react-invenio-deposit";
-import { AccordionField } from "react-invenio-forms";
-import { DoiMint } from "./DoiMint";
-import { PublisherField } from "./PublisherField";
-
-export class RDMDepositForm extends Component {
-  constructor(props) {
-    super(props);
-    this.config = props.config || {};
-    // TODO: retrieve from backend
-    this.config["canHaveMetadataOnlyRecords"] = true;
-
-    // TODO: Make ALL vocabulary be generated by backend.
-    // Currently, some vocabulary is generated by backend and some is
-    // generated by frontend here. Iteration is faster and abstractions can be
-    // discovered by generating vocabulary here. Once happy with vocabularies,
-    // then we can generate it in the backend.
-    this.vocabularies = {
-      metadata: {
-        ...this.config.vocabularies,
-
-        titles: {
-          ...this.config.vocabularies.titles,
-        },
-
-        descriptions: {
-          type: [
-            { text: "Abstract", value: "abstract" },
-            { text: "Methods", value: "methods" },
-            { text: "Series Information", value: "seriesinformation" },
-            { text: "Table of Contents", value: "tableofcontents" },
-            { text: "Technical Info", value: "technicalinfo" },
-            { text: "Other", value: "other" },
-          ],
-        },
-
-        creators: {
-          type: [
-            { text: "Person", value: "personal" },
-            { text: "Organization", value: "organizational" },
-          ],
-          role: [
-            { text: "Editor", value: "editor" },
-            { text: "Data Curator", value: "datacurator" },
-            { text: "Data Manager", value: "datamanager" },
-            { text: "Project Manager", value: "projectmanager" },
-          ],
-        },
-
-        contributors: {
-          type: [
-            { text: "Person", value: "personal" },
-            { text: "Organization", value: "organizational" },
-          ],
-          role: [
-            { text: "Editor", value: "editor" },
-            { text: "Data Curator", value: "datacurator" },
-            { text: "Data Manager", value: "datamanager" },
-            { text: "Project Manager", value: "projectmanager" },
-          ],
-        },
-
-        dates: {
-          type: [
-            { text: "Accepted", value: "accepted" },
-            { text: "Available", value: "available" },
-            { text: "Copyrighted", value: "copyrighted" },
-            { text: "Collected", value: "collected" },
-            { text: "Created", value: "created" },
-            { text: "Issued", value: "issued" },
-            { text: "Submitted", value: "submitted" },
-            { text: "Updated", value: "updated" },
-            { text: "Valid", value: "valid" },
-            { text: "Withdrawn", value: "withdrawn" },
-            { text: "Other", value: "other" },
-          ],
-        },
-
-        // TODO: Replace with an API backend
-        funding: {
-          funder: [
-            {
-              name: "National Institutes of Health (US)",
-              identifier: "funder1",
-              scheme: "funderScheme1",
-            },
-            {
-              name: "European Commission (EU)",
-              identifier: "funder2",
-              scheme: "funderScheme2",
-            },
-          ],
-          award: [
-            {
-              title: "CANCER &AIDS DRUGS--PRECLIN PHARMACOL/TOXICOLOGY",
-              number: "N01CM037835-016",
-              identifier: "awardA",
-              scheme: "awardSchemeA",
-              parentScheme: "funderScheme1",
-              parentIdentifier: "funder1",
-            },
-            {
-              title:
-                "Beyond the Standard Model at the LHC and with Atom Interferometers.",
-              number: "228169",
-              identifier: "awardB1",
-              scheme: "awardSchemeB",
-              parentScheme: "funderScheme2",
-              parentIdentifier: "funder2",
-            },
-            {
-              title: "ENvironmental COnditions in GLAucoma Patients",
-              number: "747441",
-              identifier: "awardB2",
-              scheme: "awardSchemeB",
-              parentScheme: "funderScheme2",
-              parentIdentifier: "funder2",
-            },
-          ],
-        },
-
-        related_identifiers: {
-          resource_type: this.config.vocabularies.resource_type,
-          scheme: [
-            { text: "ARK", value: "ark" },
-            { text: "ARXIV", value: "arxiv" },
-            { text: "BIBCODE", value: "bibcode" },
-            { text: "DOI", value: "doi" },
-            { text: "EAN13", value: "ean13" },
-            { text: "EISSN", value: "eissn" },
-            { text: "HANDLE", value: "handle" },
-            { text: "IGSN", value: "igsn" },
-            { text: "ISBN", value: "isbn" },
-            { text: "ISSN", value: "issn" },
-            { text: "ISTC", value: "istc" },
-            { text: "LISSN", value: "lissn" },
-            { text: "LSID", value: "lsid" },
-            { text: "PMID", value: "pmid" },
-            { text: "PURL", value: "purl" },
-            { text: "UPC", value: "upc" },
-            { text: "URL", value: "url" },
-            { text: "URN", value: "urn" },
-            { text: "W3ID", value: "w3id" },
-          ],
-          relations: [
-            { text: "Is cited by", value: "iscitedby" },
-            { text: "Cites", value: "cites" },
-            { text: "Is supplement to", value: "issupplementto" },
-            { text: "Is supplemented by", value: "issupplementedby" },
-            { text: "Is continued by", value: "iscontinuedby" },
-            { text: "Continues", value: "continues" },
-            { text: "Is described by", value: "isdescribedby" },
-            { text: "Describes", value: "describes" },
-            { text: "Has metadata", value: "hasmetadata" },
-            { text: "Is metadata for", value: "ismetadatafor" },
-            { text: "Has version", value: "hasversion" },
-            { text: "Is version of", value: "isversionof" },
-            { text: "Is new version of", value: "isnewversionof" },
-            { text: "Is previous version of", value: "ispreviousversionof" },
-            { text: "Is part of", value: "ispartof" },
-            { text: "Has part", value: "haspart" },
-            { text: "Is referenced by", value: "isreferencedby" },
-            { text: "References", value: "references" },
-            { text: "Is documented by", value: "isdocumentedby" },
-            { text: "Documents", value: "documents" },
-            { text: "Is compiled by", value: "iscompiledby" },
-            { text: "Compiles", value: "compiles" },
-            { text: "Is variant form of", value: "isvariantformof" },
-            { text: "Is original form of", value: "isoriginalformof" },
-            { text: "Is identical to", value: "isidenticalto" },
-            { text: "Is reviewed by", value: "isreviewedby" },
-            { text: "Reviews", value: "reviews" },
-            { text: "Is derived from", value: "isderivedfrom" },
-            { text: "Is source of", value: "issourceof" },
-            { text: "Is required by", value: "isrequiredby" },
-            { text: "Requires", value: "requires" },
-            { text: "Is obsoleted by", value: "isobsoletedby" },
-            { text: "Obsoletes", value: "obsoletes" },
-          ],
-        },
-        subjects: {
-          options: [
-            {
-              text: "Deep Learning",
-              value: {
-                subject: "Deep Learning",
-                scheme: "user",
-                identifier: "U1",
-              },
-            },
-            {
-              text: "MeSH: Cognitive Neuroscience",
-              value: {
-                subject: "Cognitive Neuroscience",
-                scheme: "mesh",
-                identifier: "D000066494",
-              },
-            },
-            {
-              text: "FAST: Glucagonoma",
-              value: {
-                subject: "Glucagonoma",
-                scheme: "fast",
-                identifier: "943672",
-              },
-            },
-          ],
-          limitToOptions: [
-            { text: "All", value: "all" },
-            { text: "MeSH", value: "mesh" },
-            { text: "FAST", value: "fast" },
-          ],
-        },
-      },
-    };
-
-    // check if files are present
-    this.noFiles = false;
-    if (
-      !Array.isArray(this.props.files.entries) ||
-      (!this.props.files.entries.length && this.props.record.is_published)
-    ) {
-      this.noFiles = true;
-    }
-  }
-
-  formFeedbackRef = createRef();
-  sidebarRef = createRef();
-
-  accordionStyle = {
-    header: { className: "inverted brand", style: { cursor: "pointer" } },
-  };
-
-  render() {
-    return (
-      <DepositFormApp
-        config={this.config}
-        record={this.props.record}
-        files={this.props.files}
-        permissions={this.props.permissions}
-      >
-        <FormFeedback fieldPath="message" />
-        <Container style={{ marginTop: "10px" }}>
-          <DepositFormTitle />
-          <Grid>
-            <Grid.Row>
-              <Grid.Column width={11}>
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={"Files"}
-                  ui={this.accordionStyle}
-                >
-                  {this.noFiles && this.props.record.is_published && (
-                    <p
-                      style={{
-                        textAlign: "center",
-                        opacity: "0.5",
-                        cursor: "default !important",
-                      }}
-                    >
-                      <em>The record has no files.</em>
-                    </p>
-                  )}
-                  <FileUploader
-                    isDraftRecord={!this.props.record.is_published}
-                    quota={{
-                      maxFiles: 100,
-                      maxStorage: 10 ** 10,
-                    }}
-                  />
-                </AccordionField>
-                {/**TODO: uncomment to use IdentifiersField*/}
-                {/* <AccordionField
-                fieldPath=""
-                active={true}
-                label={"Files"}
-                ui={this.accordionStyle}
-              >
-                <IdentifiersField />
-                <ComingSoonField
-                  fieldPath="metadata.identifiers"
-                  label="Identifier(s)"
-                  labelIcon="barcode"
-                />
-                <br />
-              </AccordionField> */}
-
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={"Basic Information"}
-                  ui={this.accordionStyle}
-                >
-                  <ResourceTypeField
-                    options={this.vocabularies.metadata.resource_type}
-                    required
-                  />
-                  <TitlesField
-                    options={this.vocabularies.metadata.titles}
-                    required
-                  />
-                  <PublicationDateField required />
-                  <CreatibutorsField
-                    label={"Creators"}
-                    labelIcon={"user"}
-                    fieldPath={"metadata.creators"}
-                    roleOptions={this.vocabularies.metadata.creators.role}
-                    schema="creators"
-                    required
-                  />
-                  <DescriptionsField
-                    options={this.vocabularies.metadata.descriptions}
-                    editorConfig={{
-                      removePlugins: [
-                        "Image",
-                        "ImageCaption",
-                        "ImageStyle",
-                        "ImageToolbar",
-                        "ImageUpload",
-                        "MediaEmbed",
-                        "Table",
-                        "TableToolbar",
-                        "TableProperties",
-                        "TableCellProperties",
-                      ],
-                    }}
-                  />
-                  <LicenseField
-                    fieldPath="metadata.rights"
-                    searchConfig={{
-                      searchApi: {
-                        axios: {
-                          headers: {
-                            Accept: "application/vnd.inveniordm.v1+json",
-                          },
-                          url: "/api/vocabularies/licenses",
-                          withCredentials: false,
-                        },
-                      },
-                      initialQueryState: {
-                        filters: [["tags", "recommended"]],
-                      },
-                    }}
-                    serializeLicenses={(result) => ({
-                      title: result.title_l10n,
-                      description: result.description_l10n,
-                      id: result.id,
-                      link: result.props.url,
-                    })}
-                  />
-                  <br />
-                </AccordionField>
-
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={"Recommended Information"}
-                  ui={this.accordionStyle}
-                >
-                  <CreatibutorsField
-                    addButtonLabel={"Add contributor"}
-                    label={"Contributors"}
-                    labelIcon={"user plus"}
-                    fieldPath={"metadata.contributors"}
-                    roleOptions={this.vocabularies.metadata.contributors.role}
-                    schema="contributors"
-                    modal={{
-                      addLabel: "Add contributor",
-                      editLabel: "Edit contributor",
-                    }}
-                  />
-                  {/**TODO: uncomment to use Subjects*/}
-                  {/* <SubjectsField
-                  initialOptions={_get(
-                    this.props.record,
-                    "metadata.subjects",
-                    null
-                  )}
-                  limitToOptions={
-                    this.vocabularies.metadata.subjects.limitToOptions
-                  }
-                />
-                <ComingSoonField
-                  fieldPath="metadata.subjects"
-                  label="Subjects"
-                  labelIcon="tag"
-                /> */}
-                  {/**TODO- enable once issue is solved:
-                   * https://github.com/inveniosoftware/invenio-app-rdm/issues/738
-                   */}
-                  {/* <LanguagesField
-                    initialOptions={_get(
-                      this.props.record,
-                      "ui.languages",
-                      []
-                    ).filter((lang) => lang !== null)} // needed because dumped empty record from backend gives [null]
-                    serializeSuggestions={(suggestions) =>
-                      suggestions.map((item) => ({
-                        text: item.title_l10n,
-                        value: item.id,
-                        key: item.id,
-                      }))
-                    }
-                  /> */}
-                  <DatesField options={this.vocabularies.metadata.dates} />
-                  <VersionField />
-                  <PublisherField required />
-                  <br />
-                </AccordionField>
-                {/**TODO: uncomment to use FundingField*/}
-                {/* <AccordionField
-                fieldPath=""
-                active={true}
-                label={"Funding"}
-                ui={this.accordionStyle}
-              >
-                <FundingField options={this.vocabularies.metadata.funding} />
-                <ComingSoonField
-                  fieldPath="metadata.funding"
-                  label="Awards"
-                  labelIcon="money bill alternate outline"
-                />
-
-                <br />
-              </AccordionField> */}
-
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={"Related works"}
-                  ui={this.accordionStyle}
-                >
-                  <RelatedWorksField
-                    options={this.vocabularies.metadata.related_identifiers}
-                  />
-                  <br />
-                </AccordionField>
-              </Grid.Column>
-              <Ref innerRef={this.sidebarRef}>
-                <Grid.Column width={5} className="deposit-sidebar">
-                  <Sticky context={this.sidebarRef} offset={50}>
-                    <Card className="actions">
-                      <Card.Content>
-                        <SaveButton fluid className="save-button" />
-                        <PublishButton fluid />
-                      </Card.Content>
-                    </Card>
-
-                    <Card className="actions">
-                      <Card.Content>
-                        <DeleteButton
-                          fluid
-                          // TODO: make is_published part of the API response
-                          //       so we don't have to do this
-                          isPublished={this.props.record.is_published}
-                        />
-                      </Card.Content>
-                    </Card>
-
-                    <AccessRightField
-                      label={"Protection"}
-                      labelIcon={"shield"}
-                    />
-                    {this.config.data_cite && (
-                      <DoiMint
-                        record={this.props.record}
-                        config={this.config.data_cite}
-                      />
-                    )}
-                  </Sticky>
-                </Grid.Column>
-              </Ref>
-            </Grid.Row>
-          </Grid>
-        </Container>
-      </DepositFormApp>
-    );
-  }
-}
diff --git a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/index.js b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/index.js
deleted file mode 100644
index 869d72b..0000000
--- a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// This file is part of InvenioRDM
-// Copyright (C) 2020 CERN.
-// Copyright (C) 2020 Northwestern University.
-//
-// Invenio App RDM is free software; you can redistribute it and/or modify it
-// under the terms of the MIT License; see LICENSE file for more details.
-
-import React from "react";
-import ReactDOM from "react-dom";
-import "semantic-ui-css/semantic.min.css";
-
-import { getInputFromDOM } from "react-invenio-deposit";
-import { RDMDepositForm } from "./RDMDepositForm";
-
-ReactDOM.render(
-  <RDMDepositForm
-    record={getInputFromDOM("deposits-record")}
-    files={getInputFromDOM("deposits-record-files")}
-    config={getInputFromDOM("deposits-config")}
-    permissions={getInputFromDOM("deposits-record-permissions")}
-  />,
-  document.getElementById("deposit-form")
-);
diff --git a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/components.js b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/components.js
deleted file mode 100644
index 5a35cde..0000000
--- a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/components.js
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (C) 2020 CERN.
- * Copyright (C) 2020 Northwestern University.
- * Copyright (C) 2020 Graz University of Technology
- *
- * 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.
- *
- * origin: invenio_app_rdm/search/components.js
- */
-
-import React, { useState } from "react";
-import { Card, Item, Input, Label, Button, Grid, Checkbox, List, } from "semantic-ui-react";
-import { BucketAggregation, Toggle } from "react-searchkit";
-import _ from "lodash";
-import _truncate from "lodash/truncate";
-import Overridable from "react-overridable";
-import { SearchBar } from "@js/invenio_search_ui/components";
-
-export const RDMRecordResultsListItem = ({ result, index }) => {
-  const description = _.get(result, "metadata.description", "No description");
-  const version = _.get(result, "metadata.version", "");
-  const creators = _.get(result, "metadata.creators", []);
-  const title = _.get(result, "metadata.title", "No title");
-  const subjects = _.get(result, "metadata.subjects", null);
-  const rights = _.get(result, "metadata.rights", null)
-
-  const publicationDate = _.get(result, "ui.publication_date_l10n_long", "No publication date found");
-  const createdDate = _.get(result, "ui.created_date_l10n_long", "No creation date found.");
-  const resourceType = _.get(result, "ui.resource_type", "No resource type");
-  const access = _.get(result, "ui.access_right.title", "No access rights");
-  const accessRightCategory = _.get(result, "ui.access_right.category", "closed");
-  const accessRightIcon = _.get(result, "ui.access_right.icon", "closed");
-  const accessRight = {type: access, category: accessRightCategory, icon: accessRightIcon, rights};
-
-  const href = `/records/${result.id}`;
-
-  return (
-    <Item key={index}>
-      <Item.Content>
-        <div className="badges">
-          <Label className="record-version">
-            {publicationDate} {version ? `(${version})` : null}
-          </Label>
-          <Label className="teal">
-            {resourceType}
-          </Label>
-        </div>
-        <Item.Header href={href}>{title}</Item.Header>
-        <Creators creators={creators}/>
-        <Item.Description href={href}>
-          {_truncate(description.replace(/(<([^>]+)>)/ig, ''), { length: 350 })}
-        </Item.Description>
-        <Footer subjects={subjects} createdDate={createdDate} accessRight={accessRight}/>
-      </Item.Content>
-    </Item>
-  );
-};
-
-const Creators = ({creators}) => {
-  const creatorTags = creators.map((creator, index) => {
-    return <Creator key={index} creator={creator}/>;
-  });
-
-  return (
-    <div className="creators">
-      {creatorTags}
-    </div>
-  );
-};
-
-const Identifiers = ({creator}) => {
-  return (
-    <div className="identifiers">
-      {_.isObject(creator.identifiers) && creator.identifiers.hasOwnProperty("orcid") &&
-       <Orcid creator={creator}/>
-      }
-    </div>
-  );
-};
-
-const Orcid = ({creator}) => {
-  const href = `https://orcid.org/${creator.identifiers.orcid}`
-
-  return (
-    <a href={href} target="_blank">
-      <img className="inline-orcid" src="/static/extra/orcid.png"/>
-    </a>
-  );
-};
-
-const Creator = ({creator}) => {
-  return (
-    <div className="creator">
-      <Identifiers creator={creator}/>
-      <span className="text-muted">{creator.person_or_org.name}</span>
-    </div>
-  );
-};
-
-const Footer = ({subjects, createdDate, accessRight}) => {
-  return (
-    <Item.Extra>
-      <div className="left floated column">
-        {subjects && subjects.map((subject, index) => (
-          <Label key={index} size="tiny">
-            {subject.subject}
-          </Label>
-        ))}
-        {createdDate && (
-          <div>
-            <small>
-              Uploaded on <span>{createdDate}</span>
-            </small>
-          </div>
-        )}
-      </div>
-      <div className="right floated column">
-        <span className={`ui access-right ${accessRight.category}`}>
-          <i className={`icon ${accessRight.icon}`}></i>
-          {accessRight.type} {accessRight.rights && accessRight.rights.map((right, index) => (
-            <a key={index} href={right.uri}>({right.identifier})</a>
-          ))}
-        </span>
-      </div>
-    </Item.Extra>
-  );
-};
-
-/**
- * ATTENTION:
- * The following classes are only here because it is not easily possible to
- * import it from the original module.
- * If there is in the future a possibility to import following classes from
- * invenio_app_rdm then this should be done!
- */
-export const RDMRecordResultsGridItem = ({ result, index }) => {
-  const description = _.get(result, "metadata.description", "No description");
-  return (
-    <Card fluid key={index} href={`/records/${result.pid}`}>
-      <Card.Content>
-        <Card.Header>{result.metadata.title}</Card.Header>
-        <Card.Description>
-          {_truncate(description, { length: 200 })}
-        </Card.Description>
-      </Card.Content>
-    </Card>
-  );
-};
-
-export const RDMRecordSearchBarContainer = () => {
-  return (
-    <Overridable id={"SearchApp.searchbar"}>
-      <SearchBar />
-    </Overridable>
-  );
-};
-
-export const RDMRecordSearchBarElement = ({
-  placeholder: passedPlaceholder,
-  queryString,
-  onInputChange,
-  executeSearch,
-}) => {
-  const placeholder = passedPlaceholder || "Search";
-  const onBtnSearchClick = () => {
-    executeSearch();
-  };
-  const onKeyPress = (event) => {
-    if (event.key === "Enter") {
-      executeSearch();
-    }
-  };
-  return (
-    <Input
-      action={{
-        icon: "search",
-        onClick: onBtnSearchClick,
-        className: "search",
-      }}
-      placeholder={placeholder}
-      onChange={(event, { value }) => {
-        onInputChange(value);
-      }}
-      value={queryString}
-      onKeyPress={onKeyPress}
-    />
-  );
-};
-
-export const RDMRecordFacetsValues = ({
-  bucket,
-  isSelected,
-  onFilterClicked,
-  getChildAggCmps,
-}) => {
-  const childAggCmps = getChildAggCmps(bucket);
-  const [isActive, setisActive] = useState(false);
-  const hasChildren = childAggCmps && childAggCmps.props.buckets.length > 0;
-  return (
-    <List.Item key={bucket.key}>
-      <div
-        className={`title ${hasChildren ? "" : "facet-subtitle"} ${
-          isActive ? "active" : ""
-        }`}
-      >
-        <List.Content floated="right">
-          <Label circular>{bucket.doc_count}</Label>
-        </List.Content>
-        {hasChildren ? (
-          <i
-            className={`angle ${isActive ? "down" : "right"} icon`}
-            onClick={() => setisActive(!isActive)}
-          ></i>
-        ) : null}
-        <Checkbox
-          label={bucket.label}
-          value={bucket.key}
-          onClick={() => onFilterClicked(bucket.key)}
-          checked={isSelected}
-        />
-      </div>
-      <div className={`content facet-content ${isActive ? "active" : ""}`}>
-        {childAggCmps}
-      </div>
-    </List.Item>
-  );
-};
-
-const SearchHelpLinks = () => {
-  return (
-    <Overridable id={"RdmSearch.SearchHelpLinks"}>
-      <Grid className="padded-small">
-        <Grid.Row className="no-padded">
-          <Grid.Column>
-            <Card className="borderless-facet">
-              <Card.Content>
-                <a>Advanced search</a>
-              </Card.Content>
-            </Card>
-          </Grid.Column>
-        </Grid.Row>
-        <Grid.Row className="no-padded">
-          <Grid.Column>
-            <Card className="borderless-facet">
-              <Card.Content>
-                <a>Search guide</a>
-              </Card.Content>
-            </Card>
-          </Grid.Column>
-        </Grid.Row>
-      </Grid>
-    </Overridable>
-  );
-};
-
-export const RDMRecordFacets = ({ aggs, currentResultsState }) => {
-  return (
-    <>
-      <Toggle
-        title="Versions"
-        label="View all versions"
-        filterValue={["all_versions", "true"]}
-      />
-      {aggs.map((agg) => {
-        return (
-          <div key={agg.title} className="ui accordion">
-            <BucketAggregation title={agg.title} agg={agg} />
-          </div>
-        );
-      })}
-      <SearchHelpLinks />
-    </>
-  );
-};
-
-export const RDMBucketAggregationElement = ({ title, containerCmp }) => {
-  return (
-    <Card className="borderless-facet">
-      <Card.Content>
-        <Card.Header>{title}</Card.Header>
-      </Card.Content>
-      <Card.Content>{containerCmp}</Card.Content>
-    </Card>
-  );
-};
-
-export const RDMToggleComponent = ({
-  updateQueryFilters,
-  userSelectionFilters,
-  filterValue,
-  label,
-  title,
-  isChecked,
-}) => {
-  const _isChecked = (userSelectionFilters) => {
-    const isFilterActive =
-      userSelectionFilters.filter((filter) => filter[0] === filterValue[0])
-        .length > 0;
-    return isFilterActive;
-  };
-
-  const onToggleClicked = () => {
-    updateQueryFilters(filterValue);
-  };
-
-  var isChecked = _isChecked(userSelectionFilters);
-  return (
-    <Card className="borderless-facet">
-      <Card.Content>
-        <Card.Header>{title}</Card.Header>
-      </Card.Content>
-      <Card.Content>
-        <Checkbox
-          toggle
-          label={label}
-          onClick={onToggleClicked}
-          checked={isChecked}
-        />
-      </Card.Content>
-    </Card>
-  );
-};
diff --git a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/index.js b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/index.js
deleted file mode 100644
index 78b6d1b..0000000
--- a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2020 Graz University of Technology
- *
- * 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.
- */
-
-
-import { defaultComponents, createSearchAppInit } from "@js/invenio_search_ui";
-import {
-  RDMRecordResultsListItem,
-  RDMBucketAggregationElement,
-  RDMRecordFacets,
-  RDMRecordFacetsValues,
-  RDMRecordResultsGridItem,
-  RDMRecordSearchBarContainer,
-  RDMRecordSearchBarElement,
-  RDMToggleComponent,
-} from "./components";
-
-const initSearchApp = createSearchAppInit({
-  "ResultsList.item": RDMRecordResultsListItem,
-  "BucketAggregation.element": RDMBucketAggregationElement,
-  "BucketAggregationValues.element": RDMRecordFacetsValues,
-  "ResultsGrid.item": RDMRecordResultsGridItem,
-  "SearchApp.facets": RDMRecordFacets,
-  "SearchApp.searchbarContainer": RDMRecordSearchBarContainer,
-  "SearchBar.element": RDMRecordSearchBarElement,
-  "SearchFilters.ToggleComponent": RDMToggleComponent,
-});
diff --git a/invenio_theme_tugraz/config.py b/invenio_theme_tugraz/config.py
index 1a49435..9a9b34f 100644
--- a/invenio_theme_tugraz/config.py
+++ b/invenio_theme_tugraz/config.py
@@ -122,14 +122,5 @@ TUG_ROUTES = {
     "guide": "/guide",
     "terms": "/terms",
     "gdpr": "/gdpr",
-    "deposit_create": "/uploads/new",
-    "deposit_edit": "/uploads/<pid_value>",
-    "getdoi": "/getdoi",
     "record_detail": "/records/<pid_value>",
 }
-
-# Datacite
-# INVENIO_DATACITE_URL = ""
-# INVENIO_DATACITE_UNAME = ""
-# INVENIO_DATACITE_PASS = "password"
-# INVENIO_DATACITE_PREFIX = ""
diff --git a/invenio_theme_tugraz/ext.py b/invenio_theme_tugraz/ext.py
index 1a8ad4d..c9a9de5 100644
--- a/invenio_theme_tugraz/ext.py
+++ b/invenio_theme_tugraz/ext.py
@@ -9,7 +9,7 @@
 """invenio module for TUGRAZ theme."""
 
 from . import config
-from .views import deposit_create, deposit_edit, index, record_detail
+from .views import index, record_detail
 
 
 class InvenioThemeTugraz(object):
@@ -25,8 +25,6 @@ class InvenioThemeTugraz(object):
         # add index route rule
         # https://flask.palletsprojects.com/en/1.1.x/api/#flask.Flask.add_url_rule
         app.add_url_rule("/", "index", index)
-        app.add_url_rule("/uploads/new", "deposit_create", deposit_create)
-        app.add_url_rule("/uploads/<pid_value>", "deposit_edit", deposit_edit)
         app.add_url_rule("/records/<pid_value>", "record_detail", record_detail)
         self.init_config(app)
         app.extensions["invenio-theme-tugraz"] = self
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/deposit/deposit.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/deposit/deposit.html
deleted file mode 100644
index 5b06cd2..0000000
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/deposit/deposit.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{#
-    Copyright (C) 2020 CERN.
-    Copyright (C) 2020 Northwestern University.
-    Copyright (C) 2021 Graz University of Technology.
-  
-    Invenio-them-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 config.BASE_TEMPLATE %}
-  
-  {%- block page_body %}
-  {%- if record %}
-  <input id="deposits-record" type="hidden" name="deposits-record" value='{{record | tojson }}'></input>
-  {%- endif %}
-  {%- if files %}
-  <input id="deposits-record-files" type="hidden" name="deposits-record-files" value='{{files | tojson }}'></input>
-  {%- endif %}
-  {%- if forms_config %}
-  <input type="hidden" name="deposits-config" value='{{forms_config | tojson }}'></input>
-  {%- endif %}
-  {%- if permissions %}
-  <input id="deposits-record-permissions" type="hidden" name="deposits-record-permissions" value='{{permissions | tojson }}'></input>
-  {%- endif %}
-  <div id="deposit-form"></div>
-{%- endblock page_body %}
-  
-  {%- block javascript %}
-      {{ super() }}
-      {{ webpack['invenio-theme-tugraz-rdm-deposit.js'] }}
-  {%- endblock %}
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/details/doi.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/details/doi.html
deleted file mode 100644
index c40cc43..0000000
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/details/doi.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{#
-  Copyright (C) 2020 CERN.
-  Copyright (C) 2020 Northwestern University.
-  Copyright (C) 2020 Graz University of Technology
-
-  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.
-
-  origin: invenio-rdm-records/doi.html
-#}
-
-{%- set id_doi = record.identifiers | doi_identifier %}
-
-<div>
-  <div class="get-badge"
-       data-toggle="tooltip"
-       data-placement="bottom"
-       style="cursor: pointer;"
-       title="Get the DOI badge!">
-    <img id="record-doi-badge"
-         data-target="[data-modal='{{ id_doi }}']"
-         src="{{ url_for('invenio_formatter_badges.badge', title='DOI', value=id_doi, ext='svg') }}"
-         alt="{{ id_doi }}">
-  </div>
-
-  <div id="doi-modal" class="ui modal fade badge-modal" data-modal="{{ id_doi }}">
-    <h2 class="header">
-      {{_ ("RDM DOI Badge")}}
-    </h2>
-
-    <div class="content">
-      <h4><small>{{_ ("DOI")}}</small></h4>
-
-      <h4><pre>{{ id_doi }}</pre></h4>
-
-      {% from "semantic-ui/invenio_formatter/macros/badges.html" import badges_formats_list %}
-      {{ badges_formats_list(url_for('invenio_formatter_badges.badge', title='DOI', value=id_doi, ext='svg',
-      _external=True, _scheme='https'), id_doi | pid_url(scheme='doi')) }}
-    </div>
-  </div>
-</div>
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
index 6d567be..6064fe0 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
@@ -40,17 +40,11 @@
               </span>
               </a>
             </div>
-            <!--TODO: uncomment this once translation is on place-->
-            <!-- {%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
+            {%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
             <div class="two wide column main-menu-entry">
-              <a href="{{ item.url }}">{{ item.text|safe }}</a>
-            </div>
-            {%- endfor %} -->
-
-            <!--TODO: remove this once above is uncommented-->
-            <div class="two wide column main-menu-entry">
-              <a href="{{url_for('invenio_app_rdm_records.deposit_search')}}" class="no-decoration">{{_ ("Uploads")}}</a>
+              <a href="{{ item.url }}" class="no-decoration">{{ item.text|safe }}</a>
             </div>
+            {%- endfor %}
           </div>
        
           <div id="margin-divider" class="ui divider main-menu-underline-line">
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/detail.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/detail.html
index 1fa6580..337f061 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/detail.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/detail.html
@@ -1,153 +1,205 @@
 {#
-    Copyright (C) 2020-2021 CERN.
-    Copyright (C) 2020 Northwestern University.
-    Copyright (C) 2021 TU Wien.
-    Copyright (C) 2021 Graz University of Technology.
-  
-    Invenio RDM Records is free software; you can redistribute it and/or modify
-    it under the terms of the MIT License; see LICENSE file for more details.
-  #}
+  Copyright (C) 2020-2021 CERN.
+  Copyright (C) 2020-2021 Northwestern University.
+  Copyright (C) 2021 TU Wien.
+  Copyright (C) 2021 Graz University of Technology.
 
-  {%- extends config.BASE_TEMPLATE %}
+  Invenio RDM Records is free software; you can redistribute it and/or modify
+  it under the terms of the MIT License; see LICENSE file for more details.
+#}
 
-  {%- from "invenio_app_rdm/records/macros/files.html" import file_list_box, preview_file_box %}
-  {%- from "invenio_app_rdm/records/macros/detail.html" import show_detail %}
-  
-  {%- set title = record.metadata.title -%}
-  {%- set metadata = record.metadata %}
-  
-  {%- block page_body %}
-  <div class="banners">
-    {% if permissions is defined and permissions.can_edit %}
-    <div class="ui warning flashed top-attached manage message">
-      <div class="ui container">
-        <div id="recordManagement" data-record='{{ record | tojson }}' data-permissions='{{ permissions | tojson }}'></div>
-      </div>
-    </div>
-    {% endif %}
-    {% if not record.versions.is_latest %}
-    <div class="ui warning flashed top-attached manage message">
-      <div class="ui container">
-        <div class="ui relaxed grid">
-          <div class="column">
-            <div class="row">
-              <p>
-              {% trans link_start=('<a href="' + record.links.latest_html + '"><b>')|safe, link_end='</b></a>'|safe %}
-              There is a {{ link_start }}newer version{{ link_end }} of the record available.
-              {% endtrans %}
-              </p>
+{%- extends config.BASE_TEMPLATE %}
+
+{%- from "invenio_app_rdm/records/macros/files.html" import file_list_box, preview_file_box %}
+{%- from "invenio_app_rdm/records/macros/detail.html" import show_detail %}
+
+{%- set title = record.metadata.title -%}
+{%- set metadata = record.metadata %}
+
+{%- block page_body %}
+<div class="banners">
+  {% if is_preview %}
+  <div class="ui info flashed top-attached manage message">
+    <div class="ui container">
+      <div class="ui relaxed grid">
+        <div class="column">
+          <div class="row">
+            <div class="header">
+              <i class="eye icon"></i> Preview
             </div>
+            <p>
+              {% if record.is_published %}
+                You are previewing changes that have not yet been published.
+              {% endif %}
+
+              {% if not record.is_published and record.versions.index == 1 %}
+                You are previewing a new record that has not yet been published.
+              {% endif %}
+
+              {% if not record.is_published and record.versions.index > 1 %}
+                You are previewing a new record version that has not yet been published.
+              {% endif %}
+            </p>
           </div>
         </div>
       </div>
     </div>
-    {% endif %}
   </div>
-  
-  
-  <div class="ui container">
-    <div class="ui relaxed grid">
-      <div class="two column row top-padded">
-        <div class="eleven wide column">
-          {%- block record_body -%}
-          {%- block record_header -%}
-          <div class="ui grid middle aligned">
-            <div class="two column row">
-              <div class="left floated left aligned column">
-                <span class="ui" title="Publication date">{{ record.ui.publication_date_l10n_long }}</span>
-                <span class="label text-muted"> | Version {{ record.ui.version }}</span>
-              </div>
-              <div class="right floated right aligned column">
-                <span class="ui label small grey">{{ record.ui.resource_type }}</span>
-                <!--TODO: Re-enable in next releases-->
-                <!-- <span class="ui label small access-right {{ 'unlock' }}">
-                  <i class="icon {{ 'unlock' }}"></i>{{ _("Open Access") }}</span> -->
-              </div>
-            </div>
+  {% endif %}
+  {% if permissions is defined and permissions.can_edit and not is_preview %}
+  <div class="ui warning flashed top-attached manage message">
+    <div class="ui container">
+      <div id="recordManagement" data-record='{{ record | tojson }}' data-permissions='{{ permissions | tojson }}'></div>
+    </div>
+  </div>
+  {% endif %}
+  {% if (not record.versions.is_latest and not is_preview) or (is_preview and not record.versions.is_latest_draft) %}
+  <div class="ui warning flashed top-attached manage message">
+    <div class="ui container">
+      <div class="ui relaxed grid">
+        <div class="column">
+          <div class="row">
+            <p>
+            {% trans link_start=('<a href="' + record.links.latest_html + '"><b>')|safe, link_end='</b></a>'|safe %}
+            There is a {{ link_start }}newer version{{ link_end }} of the record available.
+            {% endtrans %}
+            </p>
           </div>
-          {%- endblock record_header -%}
-          {%- block record_title -%}
-          <h1>{{ metadata.title }}</h1>
-          <p>{%- include "invenio_app_rdm/records/details/creators.html" %}</p>
-          {%- endblock record_title -%}
-          {%- block record_content -%}
-          <p>{%- include "invenio_app_rdm/records/details/contributors.html" %}</p>
-  
-          {%- include "invenio_app_rdm/records/details/subjects.html" %}
-          <div class="top-padded">
-          {%- include "invenio_app_rdm/records/details/description.html" %}
-          </div>
-          <div class="top-padded">
-          {%- include "invenio_app_rdm/records/details/licenses.html" %}
-          </div>
-          {%- endblock record_content -%}
-          {# files #}
-          {%- block record_files -%}
-          {%- if files is not none -%}
-            {%- if files.enabled and record|can_list_files %}
-              {%- set default_preview = files.default_preview %}
-              {%- set files = files|order_entries %}
-              {%- if files|has_previewable_files -%}
-                {%- set default_preview_file = files|select_preview_file(default_preview=default_preview) %}
-                {{ preview_file_box(default_preview_file, pid) }}
-              {%- endif -%}
-              {{ file_list_box(files, pid) }}
+        </div>
+      </div>
+    </div>
+  </div>
+  {% endif %}
+</div>
+
+
+<div class="ui container">
+  <div class="ui relaxed grid">
+    <div class="two column row top-padded">
+      <div class="eleven wide column">
+        {% if record.access.record == 'restricted' %}
+          <div class="ui {{ record.ui.access_status.message_class }} message">
+            <strong><i class="{{ record.ui.access_status.icon }} icon"></i>{{ record.ui.access_status.title_l10n }}</strong> {{ record.ui.access_status.description_l10n }}
+            {% if record.access.embargo.reason %}
+            <p>Reason: {{ record.access.embargo.reason }}</p>
             {% endif %}
-          {%- else -%}
-            {# TODO: come up with a proper display #}
-            <div>Sorry, the files are restricted!</div>
-          {%- endif -%}
-          {%- endblock record_files -%}
-          {%- block record_details -%}
-          {# More details #}
-          <div class="top-padded">
-          {%- include "invenio_app_rdm/records/details/details.html" %}
           </div>
-          {%- endblock record_details -%}
-          {%- block record_footer -%}
-          <div class="ui grid">
-            <div class="two column row top-bottom-padded font-small">
-              <div class="four wide column">
-                <p><b>Upload information</b></p>
-              </div>
-              <div class="twelve wide column">
-                <span class="label text-muted">
-                  <b>Created:</b> {{ record.ui.created_date_l10n_long }} | <b>Modified:</b> {{ record.ui.updated_date_l10n_long }}
-                </span>
+        {% endif %}
+        {%- block record_body -%}
+        {%- block record_header -%}
+        <div class="ui grid middle aligned">
+          <div class="two column row">
+            <div class="left floated left aligned column">
+              <span class="ui" title="Publication date">{{ record.ui.publication_date_l10n_long }}</span>
+              <span class="label text-muted"> | Version {{ record.ui.version }}</span>
+            </div>
+            <div class="right floated right aligned column">
+              <span class="ui label small grey">{{ record.ui.resource_type }}</span>
+              <span class="ui label small access-status {{ record.ui.access_status.id }}" data-tooltip="{{ record.ui.access_status.description_l10n }}" data-inverted="">
+                {% if record.ui.access_status.icon %}<i class="icon {{ record.ui.access_status.icon }}"></i>{% endif %}
+                {{ record.ui.access_status.title_l10n }}
+              </span>
+            </div>
+          </div>
+        </div>
+        {%- endblock record_header -%}
+        {%- block record_title -%}
+        <h1>{{ metadata.title }}</h1>
+        <p>{%- include "invenio_app_rdm/records/details/creators.html" %}</p>
+        {%- endblock record_title -%}
+        {%- block record_content -%}
+        <p>{%- include "invenio_app_rdm/records/details/contributors.html" %}</p>
+        <p>{%- include "invenio_app_rdm/records/details/doi.html" %}</p>
+        {%- include "invenio_app_rdm/records/details/subjects.html" %}
+        <div class="top-padded">
+        {%- include "invenio_app_rdm/records/details/description.html" %}
+        </div>
+        <div class="top-padded">
+        {%- include "invenio_app_rdm/records/details/licenses.html" %}
+        </div>
+        {%- endblock record_content -%}
+
+        {# files #}
+        {%- block record_files -%}
+        {%- if record.files.enabled -%}
+          {%- if permissions.can_read_files -%}
+            {# record has files AND user can see files #}
+            {%- set files = files|order_entries %}
+            {%- if files|has_previewable_files -%}
+              {%-set preview_file = files|select_preview_file(default_preview=record.files.default_preview) %}
+              {{ preview_file_box(preview_file, pid, is_preview, record) }}
+            {%- endif -%}
+            {{ file_list_box(files, pid, is_preview, record) }}
+          {% else %}
+            {# record has files BUT user cannot see files #}
+            <div class="panel-spacing">
+              <div class="ui accordion panel {{ record.ui.access_status.id }}" id="preview" href="#collapsablePreview">
+                <div class="active title panel-heading {{ record.ui.access_status.id }}">
+                  {{ _("Files") }}
+                  <i class="angle down icon"></i>
+                </div>
+                <div id="collapsablePreview" class="active content">
+                  <div class="ui {{ record.ui.access_status.message_class }} message file-box-message">
+                    <i class="ui {{ record.ui.access_status.icon }} icon"></i><b>{{ record.ui.access_status.title_l10n }}</b>
+                    <p>{{ record.ui.access_status.description_l10n }}</p>
+                    {% if record.access.embargo.reason %}
+                      <p>{{_("Reason")}}: {{record.access.embargo.reason}}</p>
+                    {% endif%}
+                  </div>
+                </div>
               </div>
             </div>
-          </div>
-          {%- endblock record_footer -%}
-          <!-- {%- block jump -%}
-          <div class="ui grid">
-            <div class="centered row" id="jump-btn">
-              <a style="cursor: pointer;">
-                <span class="ui button">
-                  <i class="arrow alternate circle up outline icon"></i>Jump up</span>
-              </a>
+          {%- endif %}
+        {%- endif %}
+        {%- endblock record_files -%}
+
+        {%- block record_details -%}
+        {# More details #}
+        <div class="top-padded">
+        {%- include "invenio_app_rdm/records/details/details.html" %}
+        </div>
+        {%- endblock record_details -%}
+        {%- block record_footer -%}
+        <div class="ui grid">
+          <div class="two column row top-bottom-padded font-small">
+            <div class="four wide column">
+              <p><b>Upload information</b></p>
+            </div>
+            <div class="twelve wide column">
+              <span class="label text-muted">
+                <b>Created:</b> {{ record.ui.created_date_l10n_long }} | <b>Modified:</b> {{ record.ui.updated_date_l10n_long }}
+              </span>
             </div>
           </div>
-          {%- endblock jump -%} -->
-          {%- endblock record_body %}
         </div>
-        <div class="five wide column">
-          {% block record_sidebar %}
-          {%- include "invenio_app_rdm/records/details/side_bar.html" %}
-          <div style="text-align: center;">
-            {%- include "invenio_theme_tugraz/landingpage/doi.html" %}
-            </div>
-          {% endblock record_sidebar %}
+        {%- endblock record_footer -%}
+        {%- block jump -%}
+        <div class="ui grid">
+          <div class="centered row" id="jump-btn">
+            <a style="cursor: pointer;">
+              <span class="ui button">
+                <i class="arrow alternate circle up outline icon"></i>Jump up</span>
+            </a>
+          </div>
         </div>
+        {%- endblock jump -%}
+        {%- endblock record_body %}
+      </div>
+      <div class="five wide column">
+        {% block record_sidebar %}
+        {%- include "invenio_app_rdm/records/details/side_bar.html" %}
+        {% endblock record_sidebar %}
       </div>
     </div>
   </div>
-  
-  {%- endblock page_body %}
-  
-  {%- block javascript %}
-  {{ super() }}
-  {{ webpack['invenio-app-rdm-landing-page.js'] }}
-  {# Communities management -- TODO include again when communities are ready #}
-  {# {{ webpack['invenio-communities-records.js'] }} #}
-  {{ webpack['previewer_theme.js'] }}
-  {%- endblock javascript %}
+</div>
+
+{%- endblock page_body %}
+
+{%- block javascript %}
+{{ super() }}
+{{ webpack['invenio-app-rdm-landing-page.js'] }}
+{# Communities management -- TODO include again when communities are ready #}
+{# {{ webpack['invenio-communities-records.js'] }} #}
+{{ webpack['previewer_theme.js'] }}
+{%- endblock javascript %}
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/doi.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/doi.html
deleted file mode 100644
index 16aef0b..0000000
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/doi.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{#
-    Copyright (C) 2020 CERN.
-    Copyright (C) 2020 Northwestern University.
-  
-    Invenio RDM Records is free software; you can redistribute it and/or modify
-    it under the terms of the MIT License; see LICENSE file for more details.
-  #}
-  
-  {% if metadata.identifiers %}
-  {% for identifier in metadata.identifiers %}
-  {% if identifier.scheme == 'doi' %}
-
-  
-  {%- set id_doi = identifier.identifier %}
-  <dd>
-  {% if id_doi %}
-    <span class="get-badge" data-toggle="tooltip" data-placement="bottom" style="cursor: pointer;"
-      title="Get the DOI badge!">
-      <img id="record-doi-badge" data-target="[data-modal='{{ id_doi }}']"
-        src="{{ url_for('invenio_formatter_badges.badge', title='DOI', value=id_doi, ext='svg') }}" alt="{{ id_doi }}">
-      </img>
-    </span>
-    <div id="doi-modal" class="ui modal fade badge-modal" data-modal="{{ id_doi }}">
-      <div class="header">RDM DOI Badge</div>
-      <div class="content">
-        <h4>
-          <small>DOI</small>
-        </h4>
-        <h4>
-          <pre>{{ id_doi }}</pre>
-        </h4>
-        {% from "semantic-ui/invenio_formatter/macros/badges.html" import badges_formats_list %}
-        {{ badges_formats_list(url_for('invenio_formatter_badges.badge', title='DOI', value=id_doi, ext='svg', _external=True, _scheme='https'), id_doi|pid_url(scheme='doi')) }}
-      </div>
-    </div>
-  {% else %}
-    {{ _("No minted DOI") }}
-  {% endif %}
-  </dd>
-  {% endif %}
-{% endfor %}
-
-  {% endif %}
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/record_landing_page.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/record_landing_page.html
deleted file mode 100644
index c57a092..0000000
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/record_landing_page.html
+++ /dev/null
@@ -1,107 +0,0 @@
-{#
-  Copyright (C) 2020 CERN.
-  Copyright (C) 2020 Northwestern University.
-  Copyright (C) 2020 Graz University of Technology
-
-  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.
-
-  origin: invenio-rdm-records/record_landing_page.html
-#}
-
-{%- extends config.BASE_TEMPLATE %}
-
-{%- block css %}
-{{ super() }}
-{%- endblock css %}
-
-{%- from "invenio_app_rdm/landing_page/macros/files.html" import file_list_box, preview_file_box %}
-{%- from "invenio_app_rdm/landing_page/macros/detail.html" import show_detail %}
-
-{%- set record = record|dereference_record|serialize_ui %}
-{%- set metadata = record.metadata %}
-
-{%- block page_body %}
-
-<div class="ui container">
-  <div class="ui padded relaxed grid">
-    <div class="two column row">
-      <div class="ten wide column">
-        {%- block record_body %}
-
-        <div class="badges">
-          <span class="ui label record-version" title="{{_('Publication date')}}">
-            {{ record.metadata.publication_date }} {{ '(' ~ record.metadata.version ~ ')' if record.metadata.version }}
-          </span>
-
-          <!--Resource type badge-->
-          <span class="ui label teal" title="{{_('Resource type')}}">
-            {{record.ui.resource_type }}
-          </span>
-        </div>
-
-        <h1 style="margin-top: -6px">{{ record.metadata.title }}</h1>
-        <p>{%- include "invenio_app_rdm/landing_page/details/creators.html" %}</p>
-        <p>{%- include "invenio_app_rdm/landing_page/details/contributors.html" %}</p>
-
-        <div class="ui grid" style="margin-bottom: 10px;">
-          <div class="two column row">
-            <div class="left floated column">
-              {%- for s in record.metadata.subjects %}
-              <div class="ui tiny label">{{s.subject}}</div>
-              {%- endfor %}
-              <div style="margin-top: 5px;">
-                <b>Created:</b> {{ record.ui.created_date_l10n_long }} | <b>Modified:</b> {{ record.ui.updated_date_l10n_long }}
-              </div>
-            </div>
-
-            <div class="right floated column">
-              <span class="ui label access-right">
-                <i class="icon lock open"></i>
-                {{ record.access.access_right | make_dict_like('access_right') | vocabulary_title('access_right') }}
-                {%- for right in record.metadata.rights %}
-                <a target="_blank" href="{{right.url}}">{{ '(' ~ right.identifier ~ ')' }}</a>
-                {%- endfor %}
-
-              </span>
-            </div>
-          </div>
-        </div>
-
-        {%- include "invenio_app_rdm/landing_page/details/description.html" %}
-
-
-        {# files #}
-        {%- if record.files and record | can_list_files %}
-          {%- set files = record.files | make_files_preview_compatible %}
-          {%- set default_preview_file = files | select_preview_file(default_preview=record.files.default_preview) %}
-          {{ preview_file_box(default_preview_file, pid) }}
-          {{ file_list_box(files, pid) }}
-        {% endif %}
-
-        {%- endblock record_body %}
-      </div>
-
-      <div class="six wide column">
-        <div id="recordManagement"
-             class="ui container"
-             data-recid='{{ record["id"] | tojson }}'>
-        </div>
-        {% block sidebar %}
-        {%- include "invenio_app_rdm/landing_page/details/side_bar.html" %}
-        {% endblock sidebar %}
-      </div>
-    </div>
-  </div>
-</div>
-
-{%- endblock page_body %}
-
-{%- block javascript %}
-{{ super() }}
-{{ webpack['invenio-app-rdm-records.js'] }}
-{# Communities management #}
-{{ webpack['invenio-communities-records.js'] }}
-{{ webpack['previewer_theme.js'] }}
-{{ webpack['invenio-app-rdm-record-management.js'] }}
-{%- endblock javascript %}
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/search.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/search.html
deleted file mode 100644
index d39a23c..0000000
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/search.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{#
-  Copyright (C) 2020 Graz University of Technology
-
-  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 config.BASE_TEMPLATE %}
-
-{%- block javascript %}
-    {{ super() }}
-    {{ webpack['invenio-theme-tugraz-search-app.js'] }}
-{%- endblock %}
-
-{%- block page_body %}
-
-<div data-invenio-search-config='{
-  "aggs": [
-    {
-      "aggName": "access_right",
-      "field": "access_right",
-      "title": "Access Right"
-    },
-    {
-      "aggName": "resource_type",
-      "field": "resource_type.type",
-      "title": "Resource Type",
-      "childAgg": {
-        "aggName": "subtype",
-        "field": "resource_type.subtype",
-        "title": "Resource Type"
-      }
-    }
-  ],
-  "appId": "rdm-search",
-  "initialQueryState": {
-    "hiddenParams": null,
-    "size": 10
-  },
-  "layoutOptions": {
-    "gridView": false,
-    "listView": true
-  },
-  "paginationOptions": {
-    "defaultValue": 10,
-    "resultsPerPage": [
-      {
-        "text": "10",
-        "value": 10
-      },
-      {
-        "text": "20",
-        "value": 20
-      },
-      {
-        "text": "50",
-        "value": 50
-      }
-    ]
-  },
-  "searchApi": {
-    "axios": {
-      "headers": {
-        "Accept": "application/vnd.inveniordm.v1+json"
-      },
-      "url": "/api/records",
-      "withCredentials": true
-    }
-  },
-  "sortOrderDisabled": true,
-  "sortOptions": [
-    {
-      "sortBy": "bestmatch",
-      "text": "Best match"
-    },
-    {
-      "sortBy": "newest",
-      "text": "Newest"
-    }
-  ]
-}'></div>
-
-{%- endblock page_body %}
diff --git a/invenio_theme_tugraz/views.py b/invenio_theme_tugraz/views.py
index 22d0386..94fef7a 100644
--- a/invenio_theme_tugraz/views.py
+++ b/invenio_theme_tugraz/views.py
@@ -19,20 +19,11 @@ from flask_babelex import get_locale
 from flask_login import login_required
 from flask_menu import current_menu
 from invenio_app_rdm.records_ui.views.decorators import (
-    pass_draft,
-    pass_record,
+    pass_is_preview,
     pass_record_files,
-    service,
+    pass_record_or_draft,
 )
-from invenio_app_rdm.records_ui.views.deposits import (
-    get_form_config,
-    get_search_url,
-    new_record,
-)
-from invenio_rdm_records.proxies import current_rdm_records
-from invenio_rdm_records.resources.config import RDMDraftFilesResourceConfig
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
-from invenio_rdm_records.services import RDMDraftFilesService
 
 from .search import FrontpageRecordsSearch
 
@@ -53,9 +44,7 @@ def ui_blueprint(app):
     blueprint.add_url_rule(routes["guide"], view_func=guide)
     blueprint.add_url_rule(routes["terms"], view_func=terms)
     blueprint.add_url_rule(routes["gdpr"], view_func=gdpr)
-    blueprint.add_url_rule(routes["deposit_create"], view_func=deposit_create)
     blueprint.add_url_rule(routes["record_detail"], view_func=record_detail)
-    blueprint.add_url_rule(routes["getdoi"], view_func=retrieve_doi, methods=["POST"])
 
     @blueprint.app_template_filter("make_dict_like")
     def make_dict_like(value: str, key: str) -> Dict[str, str]:
@@ -110,103 +99,19 @@ def gdpr():
                             _external=True))
 
 
-def get_datacite_details():
-    """Application credentials for DOI."""
-    prefix = environ.get("INVENIO_DATACITE_PREFIX")
-    suffix = environ.get("INVENIO_DATACITE_SUFFIX")
-    host_url = environ.get("INVENIO_SITE_HOSTNAME")
-
-    details = {
-        "datacite_prefix": prefix,
-        "datacite_suffix": suffix,
-        "datacite_host_url": host_url,
-    }
-    return details
-
-
-@login_required
-def retrieve_doi():
-    """Retrieve DOI from datacite API."""
-    doi_metadata = request.get_json()
-
-    url = environ.get("INVENIO_DATACITE_URL")
-    username = environ.get("INVENIO_DATACITE_UNAME")
-    password = environ.get("INVENIO_DATACITE_PASS")
-
-    doi_response = requests.post(
-        url,
-        auth=(username, password.encode('utf-8')),
-        json=doi_metadata,
-    )
-
-    response_data = {"code": doi_response.status_code}
-
-    try:
-        doi_response.raise_for_status()
-        response_data["data"] = doi_response.json()
-    except requests.exceptions.RequestException:
-        response_data["errors"] = doi_response.json()["errors"]
-
-    return response_data, response_data["code"]
-
-
-#
-# TODO: change this override behaviour once
-# PR is merged:
-# https://github.com/inveniosoftware/invenio-app-rdm/pull/638
-#
-
-
-@login_required
-def deposit_create():
-    """Create a new deposit."""
-    forms_config = get_form_config(createUrl=("/api/records"))
-    forms_config["data_cite"] = get_datacite_details()
-
-    return render_template(
-        "invenio_theme_tugraz/deposit/deposit.html",
-        forms_config=forms_config,
-        searchbar_config=dict(searchUrl=get_search_url()),
-        record=new_record(),
-        files=dict(default_preview=None, enabled=True, entries=[], links={}),
-    )
-
-
-@login_required
-@pass_draft
-def deposit_edit(draft=None, pid_value=None):
-    """Edit an existing deposit."""
-    files_list = current_rdm_records.draft_files_service.list_files(
-        id_=pid_value,
-        identity=g.identity,
-        links_config=RDMDraftFilesResourceConfig.links_config,
-    )
-
-    serializer = UIJSONSerializer()
-    record = serializer.serialize_object_to_dict(draft.to_dict())
-
-    forms_config = get_form_config(apiUrl=f"/api/records/{pid_value}/draft")
-    forms_config["data_cite"] = get_datacite_details()
-
-    return render_template(
-        "invenio_theme_tugraz/deposit/deposit.html",
-        forms_config=forms_config,
-        record=record,
-        files=files_list.to_dict(),
-        searchbar_config=dict(searchUrl=get_search_url()),
-        permissions=draft.has_permissions_to(['new_version'])
-    )
-
-
-@pass_record
+@pass_is_preview
+@pass_record_or_draft
 @pass_record_files
-def record_detail(record=None, files=None, pid_value=None):
+def record_detail(record=None, files=None, pid_value=None, is_preview=False):
     """Record detail page (aka landing page)."""
     files_dict = None if files is None else files.to_dict()
+
     return render_template(
         "invenio_theme_tugraz/landingpage/detail.html",
         record=UIJSONSerializer().serialize_object_to_dict(record.to_dict()),
         pid=pid_value,
         files=files_dict,
-        permissions=record.has_permissions_to(['edit', 'new_version']),
+        permissions=record.has_permissions_to(['edit', 'new_version', 'manage',
+                                               'update_draft', 'read_files']),
+        is_preview=is_preview,
     )
diff --git a/invenio_theme_tugraz/webpack.py b/invenio_theme_tugraz/webpack.py
index 70c92f7..4cc5fe9 100644
--- a/invenio_theme_tugraz/webpack.py
+++ b/invenio_theme_tugraz/webpack.py
@@ -17,31 +17,10 @@ theme = WebpackThemeBundle(
             entry={
                 "invenio-theme-tugraz-theme": "./less/invenio_theme_tugraz/theme.less",
                 "invenio-theme-tugraz-js": "./js/invenio_theme_tugraz/theme.js",
-                "invenio-theme-tugraz-search-app": "./js/invenio_theme_tugraz/search/index.js",
-                # overrides RDM deposit form
-                'invenio-theme-tugraz-rdm-deposit': './js/invenio_theme_tugraz/deposit/index.js',
+                # "invenio-theme-tugraz-search-app": "./js/invenio_theme_tugraz/search/index.js",
             },
             dependencies={
-
-                # required for RDM deposit form
-                # keep in sync
-                "@babel/runtime": "^7.9.0",
-                'formik': '^2.1.4',
-                'luxon': '^1.23.0',
-                'path': '^0.12.7',
-                'prop-types': '^15.7.2',
-                'react-dnd': '^11.1.3',
-                'react-dnd-html5-backend': '^11.1.3',
-                'react-invenio-deposit': '^0.12.0',
-                'react-invenio-forms': '^0.6.3',
-                'react-dropzone': "^11.0.3",
-                'yup': '^0.27.0',
-                '@ckeditor/ckeditor5-build-classic': '^16.0.0',
-                '@ckeditor/ckeditor5-react': '^2.1.0',
-
-                # datacite - rest api plugin
-                'datacite-rest': '^0.1.8',
-
+                # Add your dependencies
             },
         )
     },
diff --git a/setup.py b/setup.py
index 8bb310e..772e242 100644
--- a/setup.py
+++ b/setup.py
@@ -56,11 +56,7 @@ install_requires = [
     "Flask-WebpackExt>=1.0.0",
     "invenio-assets>=1.2.0",
     "invenio-i18n>=1.2.0",
-    "elasticsearch_dsl>=7.2.1",
-    "invenio_search>=1.4.0,<2.0.0",
-    "invenio_config_tugraz>=0.5.1,<0.5.8",
-    # keep this package updated.
-    "invenio_app_rdm==2.0.1",
+    "invenio_config_tugraz>=0.5.8",
 ]
 
 packages = find_packages()