diff --git a/.abapgit.xml b/.abapgit.xml
index 729fe535c..fd77f77a1 100644
--- a/.abapgit.xml
+++ b/.abapgit.xml
@@ -12,6 +12,7 @@
     <item>/README.md</item>
     <item>/package.json</item>
     <item>/changelog.txt</item>
+    <item>/.gitignore</item>
    </IGNORE>
   </DATA>
  </asx:values>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/.travis.yml b/.travis.yml
index c5f4c7caf..e14ecf6b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "6"
+  - "8"
 notifications:
   email: false
 deploy:
diff --git a/README.md b/README.md
index 05f1472e0..77b3d8ce7 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Works with: [GitHub](https://github.com/), [GitLab](https://gitlab.com/), [Assem
 
 ABAP Version: 702 or higher
 
-Latest build: [zabapgit.abap](http://larshp.github.io/abapGit/build/zabapgit.txt)
+Latest build: [zabapgit.abap](https://raw.githubusercontent.com/larshp/abapGit/build/zabapgit.abap)
 
 ## Design Goals ##
 - Easy installation
@@ -19,9 +19,9 @@ Latest build: [zabapgit.abap](http://larshp.github.io/abapGit/build/zabapgit.txt
 - Code readable in git repository
 
 ## Documentation/Guides ##
-See [Wiki](https://github.com/larshp/abapGit/wiki/)
+http://larshp.github.io/abapGit/
 
 ## FAQ ##
 For questions/comments/bugs/feature requests/wishes please create an [issue](https://github.com/larshp/abapGit/issues)
 
-![abapgit](https://github.com/larshp/abapGit/wiki/img/abapgit_1_17_17.png)
+![abapgit](https://github.com/larshp/abapGit/wiki/img/abapgit_1_33_3.png)
diff --git a/changelog.txt b/changelog.txt
index 9b1b30e73..fb6f3f255 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -8,6 +8,55 @@ Legend
 + : added
 - : removed
 
+2017-06-10 v1.37.2
+------------------
+* fixed unit tests
+* fixed dump when calling branch overview page
+
+2017-06-07 v1.37.1
+------------------
+* WDYN package popup
+* SHI3 diffs
+
+2017-06-03 v1.37.0
+------------------
++ FORM support
+* minor performance fixes
+! XML format changed, initial tables omitted
+
+2017-05-17 v1.36.1
+------------------
+* fixed problem regarding translated texts, PROG I18N_TPOOL
+
+2017-04-23 v1.36.0
+------------------
++ DCLS support
++ STYL support
+
+2017-04-23 v1.35.1
+------------------
+* DDLS jump
+* XLST jump
+* WAPA jump
+* WAPA extra XML fields
+! abapGit news announcements(only online)
+
+2017-04-20 v1.35.0
+------------------
++ SAMC support
++ SAPC support
+
+2017-04-15 v1.34.0
+------------------
++ WAPA support
++ display abapGit changelog in abapGit
+* bugfix nested namespace folders 
+
+2017-03-24 v1.33.3
+------------------
+* fix dump in transport to branch
+* fix dump in migration of .abapgit.xml to local state
+
 2017-03-23 v1.33.2
 ------------------
 * fix Microsoft TFS zlib decompression error
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 000000000..c0baf81dd
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,3 @@
+.jekyll-metadata
+_site
+Gemfile.lock
diff --git a/docs/404.md b/docs/404.md
new file mode 100644
index 000000000..ae6b88aa0
--- /dev/null
+++ b/docs/404.md
@@ -0,0 +1 @@
+404, not found, abapGit
diff --git a/docs/Gemfile b/docs/Gemfile
new file mode 100644
index 000000000..37f5eaa42
--- /dev/null
+++ b/docs/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'github-pages', group: :jekyll_plugins
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 000000000..6bb065971
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,9 @@
+title: abapGit Docs
+keep_files: [explore.html, repos.json]
+highlighter: rouge
+defaults:
+  -
+    scope:
+      path: "" # an empty string here means all files in the project
+    values:
+      layout: "default"
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
new file mode 100644
index 000000000..42b73ac53
--- /dev/null
+++ b/docs/_includes/footer.html
@@ -0,0 +1,8 @@
+<footer class="nav-footer wrap">
+	<div class="nav-refs">
+		<a href="https://github.com/larshp/abapGit">
+			<span class="mega-octicon octicon-mark-github"></span>
+		</a>
+	</div>
+<footer>
+
diff --git a/docs/_includes/head.html b/docs/_includes/head.html
new file mode 100644
index 000000000..806c0e18a
--- /dev/null
+++ b/docs/_includes/head.html
@@ -0,0 +1,7 @@
+<head>
+<meta charset="utf-8">
+<link rel="shortcut icon" type="image/png" href="favicon.png">
+<link rel="stylesheet" href="main.css">
+<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/font/octicons.min.css">
+<title>{% if page.title %}{{ site.title }} - {{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
+</head>
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
new file mode 100644
index 000000000..72b285bea
--- /dev/null
+++ b/docs/_includes/header.html
@@ -0,0 +1,5 @@
+<div class="page-head">
+	<div class="wrap">
+		<a href="./index.html"><img class="head-logo" src="img/logo.svg" height="40" alt="abapGit"></a><span class="head-title">abapGit documentation</span>
+	</div>
+</div>
diff --git a/docs/_includes/navigation.html b/docs/_includes/navigation.html
new file mode 100644
index 000000000..9a6783e00
--- /dev/null
+++ b/docs/_includes/navigation.html
@@ -0,0 +1,50 @@
+<!-- Navigation -->
+<h3>Getting Started</h3>
+<ul>
+    {% assign pages = site.pages | sort: 'order' %}
+    {% for doc in pages %}
+      {% if doc.category == "getting-started" %}
+        <li><a href=".{{ doc.url }}">{{ doc.title }}</a></li>
+      {% endif %}
+    {% endfor %}
+</ul>
+
+<h3>Online Projects</h3>
+<ul>
+    {% assign pages = site.pages | sort: 'order' %}
+    {% for doc in pages %}
+      {% if doc.category == "online projects" %}
+        <li><a href=".{{ doc.url }}">{{ doc.title }}</a></li>
+      {% endif %}
+    {% endfor %}
+</ul>
+
+<h3>Offline Projects</h3>
+<ul>
+    {% assign pages = site.pages | sort: 'order' %}
+    {% for doc in pages %}
+      {% if doc.category == "offline projects" %}
+        <li><a href=".{{ doc.url }}">{{ doc.title }}</a></li>
+      {% endif %}
+    {% endfor %}
+</ul>
+
+<h3>Reference</h3>
+<ul>
+    {% assign pages = site.pages | sort: 'order' %}
+    {% for doc in pages %}
+      {% if doc.category == "reference" %}
+        <li><a href=".{{ doc.url }}">{{ doc.title }}</a></li>
+      {% endif %}
+    {% endfor %}
+</ul>
+
+<h3>Other</h3>
+<ul>
+    {% assign pages = site.pages | sort: 'order' %}
+    {% for doc in pages %}
+      {% if doc.category == "other" %}
+        <li><a href=".{{ doc.url }}">{{ doc.title }}</a></li>
+      {% endif %}
+    {% endfor %}
+</ul>
\ No newline at end of file
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
new file mode 100644
index 000000000..8df461838
--- /dev/null
+++ b/docs/_layouts/default.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+{% include head.html %}
+<body>
+{% include header.html %}
+<div class="container wrap">
+  <div class="nav">
+  {% include navigation.html %}
+  </div>
+  <div class="content">
+  <h1>{{ page.title }}</h1>
+  {{ content }}
+  </div>
+</div>
+{% include footer.html %}
+</body>
+</html>
diff --git a/docs/explore.html b/docs/explore.html
new file mode 100644
index 000000000..9e675c290
--- /dev/null
+++ b/docs/explore.html
@@ -0,0 +1,100 @@
+<html>
+<head>
+<title>abapGit</title>
+<style type="text/css">
+body {
+  font-family: Arial,Helvetica,sans-serif;
+  background: #E8E8E8;
+}
+a, a:visited {
+  color:            #4078c0;
+  text-decoration:  none;
+}
+a:hover, a:active {
+  text-decoration:  underline;
+}
+div#header {
+  display:          block;
+  margin-top:       0.5em;
+  padding-bottom:   0.5em;
+  border-bottom:    3px double lightgrey;
+}
+div#toc {
+  display:          block;
+  background-color: #f2f2f2;
+  padding:          1em;
+}
+div#footer {
+  display:          block;
+  margin-bottom:    1em;
+  padding-top:      0.5em;
+  border-top:       3px double lightgrey;
+  color:            grey;
+  text-align:       center;
+}
+h1 {
+  display: inline;
+}
+h2 {
+  display: inline;
+}
+h3 {
+  display: inline;
+  color: grey;
+  font-weight:normal;
+  font-size: smaller;
+}
+</style>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script>
+function goBack() {
+    window.history.back();
+}
+
+function shuffle(sourceArray) {
+
+    for (var n = 0; n < sourceArray.length - 1; n++) {
+        var k = n + Math.floor(Math.random() * (sourceArray.length - n));
+
+        var temp = sourceArray[k];
+        sourceArray[k] = sourceArray[n];
+        sourceArray[n] = temp;
+    }
+}
+
+function run() {
+  /* global $ */
+  $.getJSON( "repos.json", function( data ) {
+  var items = [];
+
+  $.each( data, function( key, val ) {
+    items.push( "<h2>" +
+      val.title +
+      "</h2>&nbsp;<a href='sapevent:install?" +
+      key +
+      "'>Clone</a><br><h3>" +
+      key +
+      "</h3><br>" +
+      val.description );
+  });
+
+  shuffle(items);
+
+  $('#content').html( items.join("<br><br>") );
+
+  });
+}
+</script>
+</head>
+<body onload="run()">
+<div id="header">
+<h1>Explore</h1>
+</div>
+<div id="toc">
+<div id="content"></div>
+</div>
+<div id="footer">
+<h3>Add your project? Create an issue in the <a href="https://github.com/larshp/abapGit/issues">tracker</a></h3>
+</div>
+</body>
+</html>
diff --git a/docs/favicon.png b/docs/favicon.png
new file mode 100644
index 000000000..65d59d671
Binary files /dev/null and b/docs/favicon.png differ
diff --git a/docs/guide-contributing.md b/docs/guide-contributing.md
new file mode 100644
index 000000000..fbbc6ff83
--- /dev/null
+++ b/docs/guide-contributing.md
@@ -0,0 +1,13 @@
+---
+title: Contributing to a project
+category: online projects
+order: 60
+---
+
+* Fork the repository
+* Clone the forked repository into the SAP system
+* Do changes in SAP
+* Commit the changes to the forked repository
+* Submit pull request
+
+The forked repository can be deleted after the pull request has been closed.
\ No newline at end of file
diff --git a/docs/guide-export-zip.md b/docs/guide-export-zip.md
new file mode 100644
index 000000000..14a1dfde9
--- /dev/null
+++ b/docs/guide-export-zip.md
@@ -0,0 +1,15 @@
+---
+title: Export zip
+category: offline projects
+order: 20
+---
+
+Assuming the offline project has been created.
+
+a: Download zip file
+
+b: Unzip file to appropiate folder
+
+c: Use your favorite git client to add/update the files in the repository
+
+Do not rename the files or change folder locations of the files. This way an offline and online abapGit project will contain the same files, and both scenarios will work for all users.
\ No newline at end of file
diff --git a/docs/guide-first-project.md b/docs/guide-first-project.md
new file mode 100644
index 000000000..835757480
--- /dev/null
+++ b/docs/guide-first-project.md
@@ -0,0 +1,21 @@
+---
+title: First project
+category: online projects
+order: 40
+---
+
+## Repository Setup ##
+* Create the repsitory on github, make sure it contains someting eg. a README file
+* Start ZABAPGIT
+* Clone the repository into abapGit
+
+## Adding objects ##
+* Navigate to the repository, click the "add" link
+* It will ask for which object to add, select the object
+* The object will be commited to the repository
+
+## Modifying objects ##
+After modifying a object, a "commit" link will show up in abapGit, click this to commit the changes to the remote repository.
+
+## Modifying repository ##
+If something is changed in the repository, a "pull" link will show up in abapGit. The changes must be pulled before new objects can be changed or added.
\ No newline at end of file
diff --git a/docs/guide-import-zip.md b/docs/guide-import-zip.md
new file mode 100644
index 000000000..bd985afea
--- /dev/null
+++ b/docs/guide-import-zip.md
@@ -0,0 +1,25 @@
+---
+title: Import zip
+category: offline projects
+order: 10
+---
+
+1: Run report ZABAPGIT via SE38 or SA38
+
+2: Click "New Offline Repo"
+![](img/offline1.png)
+
+3: Enter project name eg. "abapOpenChecks", and an empty package eg. "$AOC"
+![](img/offline2.png)
+
+4: Download the zip archive containing the git files, eg. https://github.com/larshp/abapOpenChecks/archive/master.zip
+
+On github there is a link to download repository contents as zip:
+![](img/download_zip.png)
+
+5: Click "Import ZIP" in abapGit
+![](img/offline3.png)
+
+6: Choose file downloaded in step 4
+
+7: Activate. If prompted for package choose the package from step 3.
\ No newline at end of file
diff --git a/docs/guide-install.md b/docs/guide-install.md
new file mode 100644
index 000000000..a8990a300
--- /dev/null
+++ b/docs/guide-install.md
@@ -0,0 +1,57 @@
+---
+title: Installation
+category: getting-started
+order: 10
+---
+
+## ABAP Report ##
+Copy the [ABAP code](https://raw.githubusercontent.com/larshp/abapGit/build/zabapgit.abap) into new report via SE38 or SE80. To update abapGit to a newer version, replace the code in the report with the most recent.
+
+To use the online feature, SSL must be setup. Offline projects will work behind firewalls and without SSL.
+
+## STRUST/SSL setup(online projects only) ##
+
+##### Option A - Chrome #####
+
+1. On chrome, go to https://github.com
+2. Click on the locker near the address bar, then click on "Details"
+3. The developer tools will open at the Security tab. Click on "View certificate"
+4. Go to the "Details" tab and click on "Copy to file..." to export to a .CER file
+5. Open the "Certification path" tab and navigate to the parent node at the tree, do this until the root
+
+
+##### Option B - Firefox #####
+1. Use Firefox to go to https://github.com
+2. Click on the lock icon and then "More Information ..." and there "View Certificate"
+3. Switch to the Details Tab and choose the first certificate of the tree and click Export
+4. Do the same for the next certificate in the tree
+
+##### Option C #####
+1. Goto github, find the certificate that it is using
+2. Download certificate from https://www.digicert.com/digicert-root-certificates.htm
+
+##### Then continue here #####
+1. Install the certificates in STRUST transaction:
+* Click on the Change button
+* Open "SSL System Client SSL Client (Anonymous)" folder
+* In the third box, Certificate, click on the bottom-left button "Import certificate" and "Add to certificate list".
+* Upload all the downloaded certificates
+* Save
+
+![](img/strust1.png)
+
+Report [ZABAPGIT_TEST_SSL](https://github.com/larshp/abapGit/wiki/ZABAPGIT_TEST_SSL) can be used to verify that the connection works.
+
+Also see blogs
+* http://scn.sap.com/people/jens.gleichmann/blog/2008/10/31/calling-webservices-from-abap-via-httpsssl-with-pfx-certificates
+* http://scn.sap.com/people/thomas.jung/blog/2004/11/17/bsp-a-developers-journal-part-xiv--consuming-webservices-with-abap
+
+The certificate list should end up looking something like this:
+![](img/strust.png)
+
+## Proxy setup(online projects only) ##
+If your server is behind a proxy, it can be configured under Advanced -> Settings,
+![](img/proxy.png)
+
+## Done ##
+Run report
diff --git a/docs/guide-moving-package.md b/docs/guide-moving-package.md
new file mode 100644
index 000000000..3beb63312
--- /dev/null
+++ b/docs/guide-moving-package.md
@@ -0,0 +1,21 @@
+---
+title: Moving package into git
+category: online projects
+order: 50
+---
+
+You have an existing package in your system that you want to copy to a new git repository,
+
+![](img/existing_package.png)
+
+Initialize the git repository, make sure it is not emtpy,
+
+![](img/existing_repo.png)
+
+In abapGit, clone the repository,
+
+![](img/existing_clone.png)
+
+The existing objects will show up in the worklist making it possible to commit the objects to the git repository,
+
+![](img/existing_result.png)
diff --git a/docs/guide-online-install.md b/docs/guide-online-install.md
new file mode 100644
index 000000000..ab232ea1f
--- /dev/null
+++ b/docs/guide-online-install.md
@@ -0,0 +1,23 @@
+---
+title: Installing online repo
+category: online projects
+order: 10
+---
+
+* Start ZABAPGIT
+
+![](img/start.png)
+
+* Click the "Clone" link
+
+![](img/clone1.png)
+
+* Enter the url for the github project, eg https://github.com/larshp/Datamatrix.git along with a package name, eg. $DATAMATRIX
+
+![](img/clone2.png)
+
+* Click ok
+
+* It will now copy all objects from the git repository into the SAP system
+
+![](img/installed.png)
\ No newline at end of file
diff --git a/docs/guide-online-uninstall.md b/docs/guide-online-uninstall.md
new file mode 100644
index 000000000..8c4a821ef
--- /dev/null
+++ b/docs/guide-online-uninstall.md
@@ -0,0 +1,16 @@
+---
+title: Uninstall repository
+category: online projects
+order: 30
+---
+
+* Start ZABAPGIT
+* Navigate to the repository
+
+![](img/uninstall1.png)
+
+* Click the "uninstall" link
+
+![](img/uninstall2.png)
+
+* It will now delete all objects in the package specified when installing the repository
\ No newline at end of file
diff --git a/docs/guide-online-update.md b/docs/guide-online-update.md
new file mode 100644
index 000000000..52ab47b91
--- /dev/null
+++ b/docs/guide-online-update.md
@@ -0,0 +1,15 @@
+---
+title: Keeping code up to date
+category: online projects
+order: 20
+---
+
+* Start ZABAPGIT, it will automatically compare local and remote code. If code is updated in the remote repository a "pull" link will appear
+
+![](img/code_new.png)
+
+* Click the "pull" link and it will update the local code
+
+* After the update, no links should appear,
+
+![](img/code_no_new.png)
\ No newline at end of file
diff --git a/docs/guide-regular-backup.md b/docs/guide-regular-backup.md
new file mode 100644
index 000000000..732723ce8
--- /dev/null
+++ b/docs/guide-regular-backup.md
@@ -0,0 +1,33 @@
+---
+title: Regular backup
+category: other
+order: 10
+---
+
+Editing Using abapGit and abapGitServer for regular backup
+
+Steps:
+
+1. Install abapGit
+
+2. Use abapGit to install [abapGitServer](https://github.com/larshp/abapGitServer)
+
+3. Create repository in abapGitServer via the web interface
+
+4. Clone the repository using abapGit, into the package that should be backed up. abapGit will not delete any objects in the package
+
+5. [Enable write protection](ref-write-protect.html)
+
+6. Test backup by staging + commit + pushing from abapGit manually
+
+7. Configure "background mode" for repository, Advanced -> Background mode.
+
+7a. Set to "Automatic push",
+
+7b. Enter username and password(note: password will be stored in clear text). If abapGit and abapGitServer runs on the same ABAP server, then no password is required, as it will automatically use logon tickets.
+
+7c. Set commit author = "Automatic" this will find the user which last changed the objects and use these in the commits.
+
+8. On the background mode page: click "Run background logic" to test the setup works
+
+9. Configure ZABAPGIT to run as background job(SM36/SM37). Note: a dummy variant has to be created for the program, use SE38 to create the variant, values in the variant are not used for anything in background mode.
diff --git a/docs/guide-saplink.md b/docs/guide-saplink.md
new file mode 100644
index 000000000..6653138f9
--- /dev/null
+++ b/docs/guide-saplink.md
@@ -0,0 +1,9 @@
+---
+title: Migrating from SAPlink
+category: other
+order: 20
+---
+
+1: Install the slinkee/nuggets into the ABAP system using saplink
+
+2: Use abapGit to export the objects as normal, see https://github.com/larshp/abapGit/wiki/Moving-existing-package-contents-into-git
\ No newline at end of file
diff --git a/docs/guide-uninstall.md b/docs/guide-uninstall.md
new file mode 100644
index 000000000..e5d5ea5de
--- /dev/null
+++ b/docs/guide-uninstall.md
@@ -0,0 +1,11 @@
+---
+title: Uninstalling
+category: getting-started
+order: 30
+---
+
+* Delete ABAP reports ZABAPGIT* using SE38 or SE80
+* Delete EZABAPGIT enqueue object via SE11
+* Delete ZABAPGIT transparent table via SE11
+* Delete all standard texts named ZABAPGIT* via SO10 (only relevant for old versions of abapGit)
+* Delete mime objects ZABAPGIT_CSS_COMMON + ZABAPGIT_JS_COMMON in transaction SMW0
\ No newline at end of file
diff --git a/docs/guide-upgrade.md b/docs/guide-upgrade.md
new file mode 100644
index 000000000..2df6ab3e8
--- /dev/null
+++ b/docs/guide-upgrade.md
@@ -0,0 +1,16 @@
+---
+title: Upgrading
+category: getting-started
+order: 20
+---
+
+
+### Manually
+Copy the code from [zabapgit.abap](https://raw.githubusercontent.com/larshp/abapGit/build/zabapgit.abap) into the ZABAPGIT report
+
+### Online project
+If the abapGit report is installed in a separate package(eg. $ABAPGIT), a online project can be created. Which will help updating the abapGit code, a "pull" link will appear under the project when there are updates to abapGit.
+
+### Offline project
+If the abapGit report is installed in a separate package(eg. $ABAPGIT), a offline project can be created.
+Download the zip file from https://github.com/larshp/abapGit/archive/master.zip, and click "Import Zip" under the project.
\ No newline at end of file
diff --git a/docs/img/abapgit_1_16_1.png b/docs/img/abapgit_1_16_1.png
new file mode 100644
index 000000000..3aadec8f1
Binary files /dev/null and b/docs/img/abapgit_1_16_1.png differ
diff --git a/docs/img/abapgit_1_17_17.png b/docs/img/abapgit_1_17_17.png
new file mode 100644
index 000000000..c1abcf497
Binary files /dev/null and b/docs/img/abapgit_1_17_17.png differ
diff --git a/docs/img/abapgit_1_33_3.png b/docs/img/abapgit_1_33_3.png
new file mode 100644
index 000000000..6e9dd1e41
Binary files /dev/null and b/docs/img/abapgit_1_33_3.png differ
diff --git a/docs/img/abapgit_1_9_15.png b/docs/img/abapgit_1_9_15.png
new file mode 100644
index 000000000..ec641097a
Binary files /dev/null and b/docs/img/abapgit_1_9_15.png differ
diff --git a/docs/img/clone1.png b/docs/img/clone1.png
new file mode 100644
index 000000000..a53c349e8
Binary files /dev/null and b/docs/img/clone1.png differ
diff --git a/docs/img/clone2.png b/docs/img/clone2.png
new file mode 100644
index 000000000..660bf7624
Binary files /dev/null and b/docs/img/clone2.png differ
diff --git a/docs/img/code_new.png b/docs/img/code_new.png
new file mode 100644
index 000000000..fc5c42c6a
Binary files /dev/null and b/docs/img/code_new.png differ
diff --git a/docs/img/code_no_new.png b/docs/img/code_no_new.png
new file mode 100644
index 000000000..dabf4b1b7
Binary files /dev/null and b/docs/img/code_no_new.png differ
diff --git a/docs/img/download_zip.png b/docs/img/download_zip.png
new file mode 100644
index 000000000..7b7e0ba92
Binary files /dev/null and b/docs/img/download_zip.png differ
diff --git a/docs/img/existing_clone.png b/docs/img/existing_clone.png
new file mode 100644
index 000000000..082437025
Binary files /dev/null and b/docs/img/existing_clone.png differ
diff --git a/docs/img/existing_package.png b/docs/img/existing_package.png
new file mode 100644
index 000000000..42d601377
Binary files /dev/null and b/docs/img/existing_package.png differ
diff --git a/docs/img/existing_repo.png b/docs/img/existing_repo.png
new file mode 100644
index 000000000..8811170ca
Binary files /dev/null and b/docs/img/existing_repo.png differ
diff --git a/docs/img/existing_result.png b/docs/img/existing_result.png
new file mode 100644
index 000000000..3e518e4b7
Binary files /dev/null and b/docs/img/existing_result.png differ
diff --git a/docs/img/favicon.svg b/docs/img/favicon.svg
new file mode 100644
index 000000000..515142ef0
--- /dev/null
+++ b/docs/img/favicon.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="14.811mm" height="14.811mm" version="1.1" viewBox="0 0 14.810531 14.810531" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-149.08 -30.303)">
+  <rect x="149.08" y="30.303" width="14.811" height="14.811" ry="7.4053" fill="#f03c2e"/>
+  <g fill="#fff" stroke-width=".26458" style="font-feature-settings:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal" aria-label="ag">
+   <path d="m156.23 39.846v-0.83608l-0.508-0.08467c-0.15875-0.02117-0.16934-0.04233-0.16934-0.21167v-2.5718c0-1.4817-0.64558-1.9156-2.2542-1.9156-0.97366 0-2.2754 0.20108-2.2754 1.6298l1.4922 0.127c0-0.635 0.26458-0.70908 0.77258-0.70908 0.65617 0 0.70908 0.33867 0.70908 0.83608v0.58208l-1.2171 0.08467c-1.3229 0.08467-1.9791 0.5715-1.9791 1.6298 0 0.65617 0.21166 1.5663 1.5452 1.5663 0.84667 0 1.3758-0.3175 1.778-0.70908l0.0529 0.01058 0.10583 0.5715zm-2.2331-1.397c-0.24341 0.17992-0.60325 0.381-0.96308 0.381-0.34925 0-0.60325-0.15875-0.60325-0.58208s0.22225-0.58208 0.84667-0.62442l0.71966-0.05292z" style="font-feature-settings:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal"/>
+   <path d="m162.16 35.232v-0.89958h-2.0638c-0.24342-0.0635-0.51858-0.10583-0.97367-0.10583-1.6192 0-2.4236 0.83608-2.4236 2.0532 0 0.78317 0.39158 1.3335 0.91017 1.5875-0.254 0.23283-0.46567 0.43392-0.65617 0.635s-0.30692 0.41275-0.30692 0.64558c0 0.28575 0.11642 0.55033 0.46567 0.6985-0.37042 0.34925-0.58208 0.60325-0.58208 1.0795 0 0.83608 0.73025 1.3229 2.6458 1.3229 1.8415 0 2.9104-0.68792 2.9104-1.905 0-1.4076-1.0795-1.4605-2.9104-1.5769l-1.0372-0.0635 0.34925-0.56092c0.1905 0.05292 0.49742 0.09525 0.83609 0.09525 1.3335 0 2.2542-0.68792 2.2542-1.8627 0-0.48683-0.20109-0.8255-0.39159-1.0689zm-1.9791 0.99483c0 0.55033-0.40217 0.89958-0.99484 0.89958-0.6985 0-0.98425-0.35983-0.98425-0.87842 0-0.68792 0.43392-0.97367 1.016-0.97367 0.60325 0 0.96309 0.32808 0.96309 0.9525zm-0.58209 4.0111c0.508 0.03175 0.91017 0.05292 0.91017 0.39158 0 0.5715-0.83608 0.61383-1.4499 0.61383-0.74083 0-1.2806-0.127-1.2806-0.55033 0-0.21167 0.13758-0.39158 0.27517-0.56092z" style="font-feature-settings:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal"/>
+  </g>
+ </g>
+</svg>
diff --git a/docs/img/installed.png b/docs/img/installed.png
new file mode 100644
index 000000000..02bc1dddf
Binary files /dev/null and b/docs/img/installed.png differ
diff --git a/docs/img/logo.svg b/docs/img/logo.svg
new file mode 100644
index 000000000..abf101d20
--- /dev/null
+++ b/docs/img/logo.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="543.99414"
+   height="133.58577"
+   id="svg3046">
+  <defs
+     id="defs3048" />
+  <metadata
+     id="metadata3051">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-102.15709,-476.64789)"
+     id="layer1">
+    <path
+       d="m 214.93698,529.53539 -49.74501,-49.7389 c -2.8622,-2.8648 -7.5082,-2.8648 -10.374,0 l -10.329,10.33 13.102,13.102 c 3.0459,-1.0284 6.5371,-0.33888 8.9639,2.0884 2.4394,2.4424 3.124,5.9634 2.0698,9.0195 l 12.628,12.628 c 3.0551,-1.0528 6.58,-0.37262 9.0195,2.0712 3.4106,3.4096 3.4106,8.9345 0,12.345 -3.4111,3.4116 -8.936,3.4116 -12.349,0 -2.5645,-2.5665 -3.1988,-6.3345 -1.8999,-9.4942 l -11.777,-11.777 -0.001,30.991 c 0.8315,0.41162 1.6162,0.961 2.3091,1.6509 3.4096,3.4092 3.4096,8.9331 0,12.348 -3.4106,3.4091 -8.938,3.4091 -12.345,0 -3.4101,-3.4146 -3.4101,-8.9385 0,-12.348 0.84275,-0.84125 1.8179,-1.478 2.8584,-1.9048 v -31.279 c -1.041,-0.425 -2.015,-1.057 -2.859,-1.905 -2.583,-2.581 -3.2051,-6.372 -1.8804,-9.5439 l -12.916,-12.918 -34.106,34.105 c -2.8657,2.867 -2.8657,7.513 0,10.378 l 49.742,49.739 c 2.8638,2.8648 7.5082,2.8648 10.376,0 l 49.512,-49.504 c 2.86481,-2.8662 2.86481,-7.5136 0,-10.379"
+       id="path3006"
+       style="fill:#f03c2e" />
+    <g
+       id="text3008"
+       style="font-size:108.98693085px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#362701;fill-opacity:1;stroke:none;font-family:HelveticaNeueCyr;-inkscape-font-specification:HelveticaNeueCyr">
+      <path
+         d="m 294.80411,586.33795 0,-8.53189 -5.18393,-0.86399 c -0.7808,-0.0765 -1.27129,-0.24748 -1.47149,-0.51299 -0.2003,-0.26549 -0.2858,-0.81448 -0.25649,-1.64698 l 0,-26.24366 c 0.0675,-7.42936 -1.71453,-12.57729 -5.34593,-15.4438 -3.6315,-2.86641 -9.51742,-4.23439 -17.65778,-4.10395 -5.31445,-0.21819 -10.42638,0.7313 -15.3358,2.84846 -4.90945,2.11728 -7.53741,6.71171 -7.8839,13.78333 l 15.22781,1.29598 c 0.004,-3.13642 0.67047,-5.15239 1.99797,-6.04792 1.32746,-0.89545 3.28943,-1.29144 5.88593,-1.18799 3.23092,0.0383 5.27389,0.82579 6.12892,2.36247 0.85495,1.53678 1.22394,3.59325 1.10698,6.16942 l 0,5.93993 -12.41984,0.86398 c -6.74768,0.39603 -11.80111,1.92601 -15.1603,4.58994 -3.35922,2.66399 -5.03769,6.67794 -5.03544,12.04185 -0.1935,3.59546 0.73349,7.09641 2.78097,10.50286 2.04746,3.40646 6.3764,5.23344 12.98683,5.48093 4.27942,-0.0517 7.87037,-0.75824 10.77286,-2.11947 2.90243,-1.36123 5.3594,-3.06671 7.37091,-5.11643 l 0.53999,0.108 1.07998,5.83192 z M 272.0164,572.08214 c -1.26677,0.96525 -2.75625,1.84273 -4.46844,2.63246 -1.71226,0.78975 -3.49873,1.20824 -5.35943,1.25549 -1.81575,0.0225 -3.28723,-0.42749 -4.41444,-1.34999 -1.12726,-0.92248 -1.70775,-2.45245 -1.74148,-4.58994 -0.0383,-2.12845 0.60522,-3.67643 1.93047,-4.64394 1.32521,-0.96746 3.56168,-1.54346 6.70942,-1.72798 l 7.3439,-0.53999 z"
+         id="path2986"
+         style="font-size:108px;font-weight:bold;fill:#362701;font-family:Adelle Basic Rg;-inkscape-font-specification:Adelle Basic Rg Bold" />
+      <path
+         d="m 318.09377,586.33795 0.75599,-5.39993 0.53999,-0.108 c 1.68071,1.93723 3.85418,3.54371 6.52042,4.81944 2.66618,1.27573 5.78464,1.93722 9.35538,1.98447 6.75662,0.099 12.19704,-2.28597 16.32129,-7.1549 4.12414,-4.86893 6.24361,-12.81582 6.35842,-23.8407 -0.13956,-9.94033 -2.15553,-17.05923 -6.04792,-21.35672 -3.89251,-4.29739 -8.82444,-6.39436 -14.79581,-6.29092 -3.2715,0.007 -6.23246,0.5063 -8.88289,1.49848 -2.6505,0.99229 -5.12546,2.43677 -7.4249,4.33344 l -0.432,-0.10799 0,-29.91562 -22.24771,0 -1.18799,8.74789 5.93993,2.05197 c 0.53098,0.16207 0.89998,0.43207 1.10698,0.80999 0.20699,0.37807 0.30599,0.86406 0.297,1.45798 l 0,52.70332 c -0.0203,2.66848 -0.19576,5.35044 -0.52649,8.0459 -0.33076,2.69547 -0.69525,5.26944 -1.09349,7.7219 z m 2.37597,-40.82347 c 1.32746,-0.91345 2.91144,-1.75944 4.75194,-2.53797 1.84044,-0.77845 3.74842,-1.19244 5.72393,-1.24198 3.57966,0.13054 6.14012,1.70552 7.6814,4.72494 1.54118,3.01949 2.29267,6.70044 2.25447,11.04285 0.009,5.45396 -0.84604,9.7199 -2.56497,12.79784 -1.71902,3.07797 -4.35598,4.64395 -7.9109,4.69794 -1.91251,-0.0337 -3.73048,-0.45223 -5.45393,-1.25549 -1.7235,-0.80322 -3.21748,-1.78871 -4.48194,-2.95646 z"
+         id="path2988"
+         style="font-size:108px;font-weight:bold;fill:#362701;font-family:Adelle Basic Rg;-inkscape-font-specification:Adelle Basic Rg Bold" />
+      <path
+         d="m 420.7338,586.33795 0,-8.53189 -5.18394,-0.86399 c -0.78079,-0.0765 -1.27129,-0.24748 -1.47148,-0.51299 -0.2003,-0.26549 -0.2858,-0.81448 -0.25649,-1.64698 l 0,-26.24366 c 0.0674,-7.42936 -1.71453,-12.57729 -5.34594,-15.4438 -3.63149,-2.86641 -9.51741,-4.23439 -17.65777,-4.10395 -5.31445,-0.21819 -10.42638,0.7313 -15.3358,2.84846 -4.90945,2.11728 -7.53741,6.71171 -7.8839,13.78333 l 15.2278,1.29598 c 0.004,-3.13642 0.67047,-5.15239 1.99798,-6.04792 1.32746,-0.89545 3.28943,-1.29144 5.88592,-1.18799 3.23093,0.0383 5.2739,0.82579 6.12892,2.36247 0.85496,1.53678 1.22395,3.59325 1.10699,6.16942 l 0,5.93993 -12.41984,0.86398 c -6.74768,0.39603 -11.80111,1.92601 -15.16031,4.58994 -3.35921,2.66399 -5.03769,6.67794 -5.03543,12.04185 -0.1935,3.59546 0.73349,7.09641 2.78097,10.50286 2.04746,3.40646 6.3764,5.23344 12.98683,5.48093 4.27942,-0.0517 7.87037,-0.75824 10.77286,-2.11947 2.90243,-1.36123 5.3594,-3.06671 7.3709,-5.11643 l 0.54,0.108 1.07998,5.83192 z m -22.78771,-14.25581 c -1.26677,0.96525 -2.75625,1.84273 -4.46844,2.63246 -1.71226,0.78975 -3.49874,1.20824 -5.35943,1.25549 -1.81575,0.0225 -3.28723,-0.42749 -4.41445,-1.34999 -1.12725,-0.92248 -1.70775,-2.45245 -1.74147,-4.58994 -0.0383,-2.12845 0.60522,-3.67643 1.93047,-4.64394 1.32521,-0.96746 3.56168,-1.54346 6.70941,-1.72798 l 7.34391,-0.53999 z"
+         id="path2990"
+         style="font-size:108px;font-weight:bold;fill:#362701;font-family:Adelle Basic Rg;-inkscape-font-specification:Adelle Basic Rg Bold" />
+      <path
+         d="m 459.79126,609.23366 0,-8.53189 -11.23186,-0.97199 c -0.78077,-0.0293 -1.27126,-0.18676 -1.47148,-0.4725 -0.20028,-0.28576 -0.28577,-0.84825 -0.2565,-1.68747 l 0,-15.4438 c 2.27695,1.83597 4.71591,3.21295 7.31691,4.13094 2.60093,0.91799 5.30989,1.37698 8.12689,1.37698 5.88455,-0.14266 10.44715,-1.86131 13.68782,-5.15593 3.24057,-3.29462 5.49121,-7.30923 6.75192,-12.04385 1.26059,-4.73458 1.86324,-9.33318 1.80798,-13.79582 -0.10806,-9.94033 -2.05204,-17.05923 -5.83193,-21.35672 -3.78,-4.29739 -8.74793,-6.39436 -14.90381,-6.29092 -3.13425,0.0203 -6.3157,0.6278 -9.54438,1.82248 -3.22873,1.19479 -6.16719,2.85526 -8.81538,4.98143 l -0.53999,-0.21599 -0.97199,-5.50793 -19.00776,0 -1.18798,8.74788 5.72393,2.05198 c 0.53098,0.16204 0.89997,0.43203 1.10698,0.80999 0.20699,0.37803 0.30599,0.86403 0.297,1.45798 l 0,54.5393 c 0.0135,0.78972 -0.12151,1.34321 -0.405,1.66047 -0.2835,0.31724 -0.7965,0.51973 -1.53898,0.6075 l -4.31994,0.64799 0,8.63989 z m -12.74384,-63.50319 c 1.22396,-0.87069 2.82593,-1.72118 4.80594,-2.55147 1.97994,-0.83019 4.12191,-1.27568 6.42591,-1.33648 2.74493,-0.0427 4.9499,1.17678 6.61492,3.65846 1.66493,2.48175 2.51992,6.4822 2.56497,12.00134 0.0247,5.35946 -0.78079,9.5984 -2.41647,12.71684 -1.63577,3.11847 -4.25024,4.71145 -7.8434,4.77894 -2.02276,-0.0427 -3.91723,-0.47023 -5.68343,-1.28249 -1.76625,-0.81222 -3.25573,-1.75271 -4.46844,-2.82146 z"
+         id="path2992"
+         style="font-size:108px;font-weight:bold;fill:#362701;font-family:Adelle Basic Rg;-inkscape-font-specification:Adelle Basic Rg Bold" />
+      <path
+         d="m 565.33206,557.28633 0,-8.63989 -33.15557,0 -1.51198,9.71987 11.98785,0 0,14.14782 c 0.002,0.68175 -0.1373,1.15425 -0.4185,1.41748 -0.2813,0.26326 -0.71779,0.43876 -1.30948,0.52649 -1.27804,0.22051 -2.71802,0.40051 -4.31995,0.54 -1.60202,0.13951 -3.15,0.21151 -4.64394,0.21599 -7.71518,-0.0697 -13.4796,-2.5762 -17.29327,-7.5194 -3.81373,-4.94316 -5.7172,-11.90457 -5.71043,-20.88423 0.0562,-8.56559 2.0227,-15.275 5.89943,-20.12824 3.87667,-4.85313 9.32609,-7.32359 16.34828,-7.4114 1.70994,0.0113 3.44691,0.15081 5.21094,0.41849 1.76393,0.26781 3.3389,0.59631 4.72494,0.98549 0.47694,0.0901 0.84593,0.28806 1.10698,0.59399 0.26094,0.30606 0.46794,0.82805 0.62099,1.56598 l 1.61998,9.71987 11.98785,0.86399 0,-20.41173 c -3.41327,-2.1509 -7.33272,-3.73488 -11.75835,-4.75194 -4.42575,-1.01691 -8.64219,-1.52091 -12.64934,-1.51198 -13.59435,0.23407 -23.74621,4.05902 -30.45561,11.47485 -6.70942,7.41596 -10.05737,17.01883 -10.04387,28.80863 -0.19125,11.85062 2.72921,21.52099 8.76139,29.01112 6.03216,7.49016 16.32351,11.35561 30.8741,11.59635 4.57415,0.027 9.33058,-0.35099 14.26932,-1.13398 4.93862,-0.78299 9.50606,-2.13297 13.70232,-4.04995 l 0,-23.2197 c -0.009,-0.52872 0.11693,-0.90221 0.378,-1.12049 0.26092,-0.21822 0.71092,-0.34871 1.34998,-0.39149 z"
+         id="path2994"
+         style="font-size:108px;font-weight:bold;fill:#362701;font-family:Adelle Basic Rg;-inkscape-font-specification:Adelle Basic Rg Bold" />
+      <path
+         d="m 592.2956,511.71091 c -0.018,-3.08913 -0.87302,-5.4426 -2.56497,-7.06041 -1.692,-1.61765 -4.11297,-2.43213 -7.26291,-2.44347 -3.09822,0.0113 -5.48769,0.82583 -7.16841,2.44348 -1.68073,1.61781 -2.53122,3.97127 -2.55146,7.0604 0.0202,3.09828 0.87073,5.48775 2.55147,7.16841 1.68072,1.68079 4.07018,2.53128 7.1684,2.55147 3.14994,-0.0202 5.57091,-0.87068 7.26291,-2.55147 1.69195,-1.68066 2.54694,-4.07013 2.56497,-7.16841 z m 7.01991,74.62704 0,-8.53189 -5.50793,-0.75599 c -0.78077,-0.0765 -1.27126,-0.24749 -1.47149,-0.51299 -0.20027,-0.26549 -0.28577,-0.81448 -0.25649,-1.64698 l 0,-44.81942 -22.35571,0 -1.18799,8.74788 5.83193,2.05198 c 0.53098,0.16204 0.89998,0.43203 1.10698,0.80999 0.20699,0.37803 0.30599,0.86403 0.297,1.45798 l 0,31.75159 c 0.0225,0.78525 -0.0765,1.32074 -0.297,1.60648 -0.2205,0.28575 -0.6975,0.47025 -1.43098,0.55349 l -5.50793,0.75599 0,8.53189 z"
+         id="path2996"
+         style="font-size:108px;font-weight:bold;fill:#362701;font-family:Adelle Basic Rg;-inkscape-font-specification:Adelle Basic Rg Bold" />
+      <path
+         d="m 642.23527,573.81011 c -1.30952,0.49726 -2.7135,0.90675 -4.21195,1.22848 -1.49851,0.32176 -3.01049,0.48826 -4.53594,0.4995 -2.85749,0.0293 -4.81047,-0.65023 -5.85893,-2.03847 -1.04851,-1.38822 -1.5435,-3.66069 -1.48497,-6.81742 l 0,-25.81166 16.09179,0 0,-10.79986 -15.2278,0 c -0.41402,0.002 -0.66602,-0.0832 -0.756,-0.2565 -0.09,-0.17319 -0.12602,-0.44769 -0.10799,-0.82349 l 0,-15.3358 -10.25987,0 c -0.52876,5.81624 -1.90124,10.08668 -4.11745,12.81133 -2.21623,2.72477 -5.66768,4.32225 -10.35437,4.79244 l 0,9.61188 7.55991,0 c 0.41398,0.005 0.66598,0.10354 0.75599,0.29699 0.09,0.19355 0.12599,0.45454 0.108,0.78299 l 0,28.29564 c -0.0653,6.06368 1.28022,10.48712 4.03644,13.27033 2.7562,2.78321 7.31464,4.15569 13.67533,4.11744 3.13643,-0.0382 6.25938,-0.47474 9.36888,-1.30948 3.10942,-0.83474 5.85438,-1.83822 8.23489,-3.01046 z"
+         id="path2998"
+         style="font-size:108px;font-weight:bold;fill:#362701;font-family:Adelle Basic Rg;-inkscape-font-specification:Adelle Basic Rg Bold" />
+    </g>
+  </g>
+</svg>
diff --git a/docs/img/offline1.png b/docs/img/offline1.png
new file mode 100644
index 000000000..1f12d9bcc
Binary files /dev/null and b/docs/img/offline1.png differ
diff --git a/docs/img/offline2.png b/docs/img/offline2.png
new file mode 100644
index 000000000..eb7c143bd
Binary files /dev/null and b/docs/img/offline2.png differ
diff --git a/docs/img/offline3.png b/docs/img/offline3.png
new file mode 100644
index 000000000..ca37533af
Binary files /dev/null and b/docs/img/offline3.png differ
diff --git a/docs/img/proxy.png b/docs/img/proxy.png
new file mode 100644
index 000000000..511465d45
Binary files /dev/null and b/docs/img/proxy.png differ
diff --git a/docs/img/start.png b/docs/img/start.png
new file mode 100644
index 000000000..d94fc1ae8
Binary files /dev/null and b/docs/img/start.png differ
diff --git a/docs/img/strust.png b/docs/img/strust.png
new file mode 100644
index 000000000..22f7232f9
Binary files /dev/null and b/docs/img/strust.png differ
diff --git a/docs/img/strust1.png b/docs/img/strust1.png
new file mode 100644
index 000000000..d2c6cdcef
Binary files /dev/null and b/docs/img/strust1.png differ
diff --git a/docs/img/uninstall1.png b/docs/img/uninstall1.png
new file mode 100644
index 000000000..a8e6009db
Binary files /dev/null and b/docs/img/uninstall1.png differ
diff --git a/docs/img/uninstall2.png b/docs/img/uninstall2.png
new file mode 100644
index 000000000..57d0a05bd
Binary files /dev/null and b/docs/img/uninstall2.png differ
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 000000000..550a8c516
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,11 @@
+---
+title: Welcome
+---
+
+abapGit is a git client for ABAP developed in ABAP. It requires SAP BASIS version 702 or higher.
+
+Latest build: [zabapgit.abap](https://raw.githubusercontent.com/larshp/abapGit/build/zabapgit.abap)
+
+For questions/comments/bugs/feature requests/wishes please create an [issue](https://github.com/larshp/abapGit/issues)
+
+![](img/abapgit_1_33_3.png)
\ No newline at end of file
diff --git a/docs/main.css b/docs/main.css
new file mode 100644
index 000000000..4e0248aa9
--- /dev/null
+++ b/docs/main.css
@@ -0,0 +1,88 @@
+body {
+  font-family: Arial,Helvetica,sans-serif;
+  background:  #F8F8F8;
+  margin: auto;
+}
+
+a, a:visited {
+  color:            #4078c0;
+  text-decoration:  none;
+}
+
+a:hover, a:active {
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+h1, h2, h3 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  color: inherit;
+}
+
+.container {
+  padding-top: 1em;
+  padding-bottom: 1em;
+}
+
+.container:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.nav {
+  float: left;
+  width: 300px;
+  margin: 10px 0;
+}
+
+.content {
+  float: right;
+  width: 100%;
+  max-width: 650px;
+}
+
+.content img {
+  max-width: 100%;
+  max-height: 100%;
+}
+
+.page-head {
+  position: relative;
+  width: 100%;
+  background-color: #E8E8E8;
+  padding-top: 8px;
+  padding-bottom: 8px;
+}
+
+.head-title {
+  font-weight: bold;
+  font-size: 22pt;
+  color: #bbb;
+  padding-left: 0.4em;
+  position: absolute;
+  bottom: 12px;
+}
+
+.wrap {
+  max-width: 960px;
+  margin-left: auto;
+  margin-right: auto;
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+footer.nav-footer {
+  padding-top: 1em;
+  padding-bottom: 1em;
+}
+
+.nav-refs {
+  text-align: center;
+}
+
+.nav-refs a {
+  color: #808080;
+}
diff --git a/docs/other-articles-and-presentations.md b/docs/other-articles-and-presentations.md
new file mode 100644
index 000000000..8e3946e89
--- /dev/null
+++ b/docs/other-articles-and-presentations.md
@@ -0,0 +1,44 @@
+---
+title: Articles and Presentations
+category: other
+order: 30
+---
+
+### 2014
+
+[Git client for ABAP – alpha release](http://blogs.sap.com/2014/07/17/git-client-for-abap-alpha-release/)
+-Lars Hvam
+
+### 2016
+
+[How can I use Git and GitHub for SAP software development?](http://searchsap.techtarget.com/answer/How-can-I-use-Git-and-GitHub-for-SAP-software-development)
+-Ethan Jewett
+
+[Implementing modern practices in an ABAP development shop](http://searchsap.techtarget.com/tip/Implementing-modern-practices-in-an-ABAP-development-shop)
+-Ethan Jewett
+
+[SAP Inside Track Hamburg](https://larshp.github.io/sithh2016/)
+-Lars Hvam
+
+[SAP Teched Barcelona](https://larshp.github.io/teched-2016-emea/)
+-Lars Hvam
+
+### 2017
+
+[SAP d-kom Karlsruhe](https://larshp.github.io/dkom2017/)
+-Lars Hvam
+
+[First look at ABAPGit & ideas on a feature](https://themanmountain.github.io/2017/04/19/first_look_at_abapgit.html)
+-Alex Cook
+
+[SAP Inside Track Ballerup](https://larshp.github.io/sitbal2017/), May 6th
+-Lars Hvam
+
+[ABAP – Using git for safety and transparency](https://blogs.sap.com/2017/05/07/abap-using-git-for-safety-and-transparency/)
+-Lars Hvam
+
+Mastering SAP Technologies, Melbourne, May 23rd
+-Graham Robinson
+
+SAP Teched Las Vegas
+-Graham Robinson
\ No newline at end of file
diff --git a/docs/other-file-formats.md b/docs/other-file-formats.md
new file mode 100644
index 000000000..9184178c6
--- /dev/null
+++ b/docs/other-file-formats.md
@@ -0,0 +1,24 @@
+---
+title: Object File Formats
+category: other
+order: 40
+---
+
+# CLAS
+One ABAP file, corresponding to the editable parts in source based class builder or ABAP in Eclipse:
+
+* `zcl_example.clas.abap`
+* `zcl_example.clas.locals_def.abap`
+* `zcl_example.clas.locals_imp.abap`
+* `zcl_example.clas.testclasses.abap`
+* `zcl_example.clas.macros.abap`
+
+Files does not exist if empty
+
+One XML file `zcl_example.clas.xml` containing:
+
+* VSEOCLASS information
+* TPOOL information
+* SOTR information
+* LINES from DOKU
+* Descriptions from SEOCOMPOTX
\ No newline at end of file
diff --git a/docs/other-technical-links.md b/docs/other-technical-links.md
new file mode 100644
index 000000000..f7514daae
--- /dev/null
+++ b/docs/other-technical-links.md
@@ -0,0 +1,38 @@
+---
+title: Technical Links
+category: other
+order: 50
+---
+
+Collection of links to various git related documentation,
+
+[https://gist.github.com/schacon/6092633](https://gist.github.com/schacon/6092633)
+
+[https://github.com/git/git/blob/master/Documentation/technical/pack-protocol.txt](https://github.com/git/git/blob/master/Documentation/technical/pack-protocol.txt)
+
+[https://github.com/git/git/blob/master/Documentation/technical/http-protocol.txt](https://github.com/git/git/blob/master/Documentation/technical/http-protocol.txt)
+
+[https://github.com/git/git/blob/master/Documentation/technical/protocol-capabilities.txt](https://github.com/git/git/blob/master/Documentation/technical/protocol-capabilities.txt)
+
+[https://github.com/git/git/blob/master/Documentation/technical/pack-format.txt](https://github.com/git/git/blob/master/Documentation/technical/pack-format.txt)
+
+[https://github.com/git/git/tree/master/Documentation/technical](https://github.com/git/git/tree/master/Documentation/technical)
+
+[http://schacon.github.io/gitbook/7_the_packfile.html](http://schacon.github.io/gitbook/7_the_packfile.html)
+
+[http://alblue.bandlem.com/2011/08/git-tip-of-week-objects.html](http://alblue.bandlem.com/2011/08/git-tip-of-week-objects.html)
+
+[https://git-scm.herokuapp.com/book/en/Git-Internals-Transfer-Protocols](https://git-scm.herokuapp.com/book/en/Git-Internals-Transfer-Protocols)
+
+[https://github.com/git/git/blob/master/builtin/receive-pack.c](https://github.com/git/git/blob/master/builtin/receive-pack.c)
+
+[http://stefan.saasen.me/articles/git-clone-in-haskell-from-the-bottom-up/](http://stefan.saasen.me/articles/git-clone-in-haskell-from-the-bottom-up/)
+
+```bash
+set GIT_CURL_VERBOSE=1
+$env:GIT_CURL_VERBOSE=1
+$env:GIT_TRACE=1
+git config --global http.proxy %HTTP_PROXY%
+git config --global --unset http.proxy
+git config --global http.sslVerify false
+```
diff --git a/docs/other-test-ssl.md b/docs/other-test-ssl.md
new file mode 100644
index 000000000..5567489ce
--- /dev/null
+++ b/docs/other-test-ssl.md
@@ -0,0 +1,72 @@
+---
+title: ZABAPGIT_TEST_SSL
+category: other
+order: 60
+---
+
+Following report can be used to test SSL connection to github,
+
+```abap
+REPORT zabapgit_test_ssl.
+
+* See https://github.com/larshp/abapGit/
+
+PARAMETERS: p_url    TYPE swc_value DEFAULT 'https://github.com',
+            p_proxy  TYPE string,
+            p_pxport TYPE string.
+
+START-OF-SELECTION.
+  PERFORM run.
+
+FORM run.
+
+  DATA: lv_code          TYPE i,
+        lv_url           TYPE string,
+        li_client        TYPE REF TO if_http_client,
+        lv_error_message TYPE string.
+
+  lv_url = p_url.
+  cl_http_client=>create_by_url(
+    EXPORTING
+      url           = lv_url
+      ssl_id        = 'ANONYM'
+      proxy_host    = p_proxy
+      proxy_service = p_pxport
+    IMPORTING
+      client        = li_client ).
+
+* enter username and password for proxy authentication if needed
+*  li_client->authenticate(
+*    proxy_authentication = abap_true
+*    username             = ''
+*    password             = '' ).
+
+  li_client->send( ).
+  li_client->receive(
+    EXCEPTIONS
+      http_communication_failure = 1
+      http_invalid_state         = 2
+      http_processing_failed     = 3
+      OTHERS                     = 4 ).
+  IF sy-subrc <> 0.
+    WRITE: / 'Error Number', sy-subrc.
+    MESSAGE ID sy-msgid TYPE sy-msgty NUMBER sy-msgno WITH sy-msgv1 sy-msgv2 sy-msgv3 sy-msgv4.
+    li_client->get_last_error(
+      IMPORTING
+        message = lv_error_message ).
+    WRITE: / `Error message: ` && lv_error_message.
+    WRITE: / 'Also check transaction SMICM -> Goto -> Trace File -> Display End'.
+    RETURN.
+  ENDIF.
+
+  li_client->response->get_status(
+      IMPORTING
+        code = lv_code ).
+  IF lv_code = 200.
+    WRITE: / 'Success, it works'.
+  ELSE.
+    WRITE: / 'Error', lv_code.
+  ENDIF.
+
+ENDFORM.
+```
\ No newline at end of file
diff --git a/docs/other-xml-mismatch.md b/docs/other-xml-mismatch.md
new file mode 100644
index 000000000..9729a86ff
--- /dev/null
+++ b/docs/other-xml-mismatch.md
@@ -0,0 +1,32 @@
+---
+title: XML Mismatch
+category: other
+order: 70
+---
+
+### For end-users
+Make sure you have the latest version of abapGit installed, see [upgrading](guide-upgrade.html), after updating try again.
+
+If the error persists, submit an issue to the maintainer of the repository requesting to update to latest version of abapGit serialized files pointing to the guide below.
+
+Or alternatively install an old version of abapGit to allow for installing the files, see next section "For maintainers"
+
+### For maintainers
+If the latest version of abapGit is installed and the erorr message is shown, then the serialized files should be updated to the latest version.
+
+The steps are:
+
+1. Install old abapGit version, matching the serialized files
+
+2. Install objects into the ABAP system
+
+3. Install newest abapGit version
+
+4. Use the new abapGit to save the files to the git repository
+
+This will overwrite the files in the repository to have the latest format, compatible with the newest abapGit release.
+
+| abapGit       | Download | XML Serialization |
+| :------------- |:------------- |:-------------|
+| v1.0.0 to current | [Link](https://raw.githubusercontent.com/larshp/abapGit/build/zabapgit.abap) | v1.0.0 |
+| v0.0.0 to v0.113.0 | [Link](https://raw.githubusercontent.com/larshp/abapGit/v0.113.0/zabapgit.prog.abap) | v0.2-alpha |
diff --git a/docs/ref-dot-abapgit.md b/docs/ref-dot-abapgit.md
new file mode 100644
index 000000000..b0fdbf5ac
--- /dev/null
+++ b/docs/ref-dot-abapgit.md
@@ -0,0 +1,72 @@
+---
+title: .abapgit.xml
+category: reference
+order: 10
+---
+
+**.abapgit.xml** is a special abapGit file. It contains meta information of the abapGit project.
+
+Example: abapGit own .abapgit.xml
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+ <asx:values>
+  <DATA>
+   <MASTER_LANGUAGE>E</MASTER_LANGUAGE>
+   <STARTING_FOLDER>/src/</STARTING_FOLDER>
+   <FOLDER_LOGIC>PREFIX</FOLDER_LOGIC>
+   <IGNORE>
+    <item>/.travis.yml</item>
+    <item>/CONTRIBUTING.md</item>
+    <item>/LICENSE</item>
+    <item>/README.md</item>
+    <item>/package.json</item>
+    <item>/changelog.txt</item>
+   </IGNORE>
+  </DATA>
+ </asx:values>
+</asx:abap>
+```
+
+# Description
+
+## Master Language
+
+The language in which all documentation and dictionary elements texts will be created. Follows SAP `sy-langu` values.
+
+## Starting Folder
+
+The Git repository folder that defines the root folder where deserialization starts.
+
+## Folder Logic
+
+abapGit follows two folder logics: PREFIX and FULL
+
+### PREFIX
+
+A package name must contain its parent package name as a prefix. Examples:
+
+Valid prefix:
+* ZFOO
+  * **ZFOO**_BAR
+    * **ZFOO_BAR**_QUX
+
+will give folder structure /foo/bar/qux/
+
+Invalid prefix:
+* ZFOO
+  * ZBAR
+
+### FULL
+
+Any package name is accepted
+
+* ZSOMETHING
+  * ZHELLO
+
+will give folder structure /zsomething/zhello/
+
+## Ignore
+
+Files which abapGit will not download into your ABAP system.
\ No newline at end of file
diff --git a/docs/ref-supported.md b/docs/ref-supported.md
new file mode 100644
index 000000000..ad881886f
--- /dev/null
+++ b/docs/ref-supported.md
@@ -0,0 +1,80 @@
+---
+title: Supported object types
+category: reference
+order: 20
+---
+
+
+Type   | Description   | Supported
+:------------ | :------------ | ------------:
+ACID | Checkpoint Group | Yes
+AUTH | Authorization Check Fields | Yes
+BOBF | BOPF: Business Object Model | [Plugin](https://github.com/larshp/abapGit-Plugins)
+CLAS | Class (ABAP Objects) | Yes
+CMOD | Customer enhancement projects | [#151](https://github.com/larshp/abapGit/issues/151)
+DCLS | ABAP Data Control Language Sources | Yes
+DDLS | Data Definition Language Source | Yes
+DOCT | General Text | Yes
+DOCV | Documentation (Independent) | Yes
+DOMA | Domain | Yes
+DTEL | Data Element | Yes
+ECAT | eCATT Test Script | [#163](https://github.com/larshp/abapGit/issues/163)
+ECTD | eCATT Test Data Container | [#105](https://github.com/larshp/abapGit/issues/105)
+ENHC | Composite Enhancement Implementation | Yes
+ENHO | Enhancement Implementation | Partial [#113](https://github.com/larshp/abapGit/issues/113)
+ENHS | Enhancement Spot | Yes
+ENQU | Lock Object | Yes
+FORM | SAPscript form | Yes
+FUGR | Function Group | Yes
+IAMU | Language-Independent IAC Binary Data | [#81](https://github.com/larshp/abapGit/issues/81)
+IARP | Parameters of IAC Language Resource | Yes
+IASP | Parameters of an IAC service | Yes
+IATU | Language-Independent IAC Templates | Yes
+IWPR | Gateway Business Suite Enablement - Service Builder Project | [#75](https://github.com/larshp/abapGit/issues/75)
+LPDC | Launchpad short texts | [#107](https://github.com/larshp/abapGit/issues/107)
+MSAG | Message Class | Yes
+NROB | Number Range Objects | Yes
+PARA | SPA/GPA Parameters | Yes
+PDTS | Standard Task | [#153](https://github.com/larshp/abapGit/issues/153)
+PDWS | Workflow templates | [#154](https://github.com/larshp/abapGit/issues/154)
+PINF | Package interface | Yes
+PROG | Program | Yes
+SAMC | ABAP Messaging Channels | Yes
+SAPC | ABAP Push Channels | Yes
+SFBF | Business Function + Assignment | Yes
+SFBS | Business Function Set + Assignment | Yes
+SFSW | Switch + Assignment of Objects to the Switch | Yes
+SHI3 | General structure storage: Definition of a structure | Yes
+SHLP | Search Help | Yes
+SICF | ICF Service | Yes
+SPLO | Format Types | Yes
+SRFC | RFC Service | [#155](https://github.com/larshp/abapGit/issues/155)
+SSFO | SAP Smart Form | Yes
+SSST | SAP Smart Style | Yes
+SFPI | Form Object: Interface | Yes
+SFPF | Form Object: Form | Yes
+SHMA | Shared Objects: Defined Area Attributes | [#85](https://github.com/larshp/abapGit/issues/85)
+SMIM | Info Object from the MIME Repository | Yes
+SPRX | Proxy Object | [#87](https://github.com/larshp/abapGit/issues/87)
+STYL | SAPscript style | Yes
+SUSC | Authorization object class | Yes
+SUSO | Authorization object | Yes
+SXCI | Business Add-Ins - Implementations | [#156](https://github.com/larshp/abapGit/issues/156)
+TABL | Table | Yes
+TOBJ | Definition of a Maintenance and Transport Object | Yes
+TRAN | Transaction | Yes
+TTYP | Table Type | Yes
+TYPE | Type Group | Yes
+VCLS | View cluster | Yes
+VIEW | View | Yes
+W3HT | Web Reporting/Internet Transaction Server HTML Templates | Yes
+W3MI | Web Reporting/Internet Transaction Server MIME Types(binary | Yes
+WAPA | BSP (Business Server Pages) Application | Yes
+WDCA | Web Dynpro Application Configuration | [#79](https://github.com/larshp/abapGit/issues/79)
+WDCC | Web Dynpro Component Configuration | [#78](https://github.com/larshp/abapGit/issues/78)
+WDYA | Web Dynpro Application | Yes
+WDYN | Web Dynpro Component | Yes
+WEBI | Virtual End Point | Yes
+XSLT | Transformation | Yes
+
+Also see https://github.com/larshp/abapGit-Plugins
diff --git a/docs/ref-write-protect.md b/docs/ref-write-protect.md
new file mode 100644
index 000000000..5d700ea37
--- /dev/null
+++ b/docs/ref-write-protect.md
@@ -0,0 +1,19 @@
+---
+title: Write protect
+category: reference
+order: 30
+---
+
+The write protected repository feature will make sure users cannot overwrite objects in the SAP system with objects from the git repository. So it helps enforcing that data can only go from the SAP system to the Git repository.
+
+The feature disables pulls, uninstall of all objects, switching branches etc.
+
+To enable:
+
+1. from the abapGit main screen: Advanced -> Database util
+
+2. find the repository, click "Edit"
+
+3. find the value `<WRITE_PROTECT/>` and replace with `<WRITE_PROTECT>X</WRITE_PROTECT>`
+
+4. restart abapGit(just to make sure caches are cleared)
\ No newline at end of file
diff --git a/docs/repos.json b/docs/repos.json
new file mode 100644
index 000000000..7169fc7cc
--- /dev/null
+++ b/docs/repos.json
@@ -0,0 +1,77 @@
+{
+  "https://github.com/ivanfemia/abap2xlsx.git": 
+	{ 
+		"title": "abap2xlsx",
+		"description": "Generate your professional Excel spreadsheet from ABAP"
+	},
+  "https://github.com/larshp/abapCov.git":
+	{ 
+		"title": "abapCov",
+		"description": "Upload ABAP unit test code coverage to codecov.io"
+	},  
+  "https://github.com/flaiker/abap-log.git":
+	{ 
+		"title": "abap-log",
+		"description": "Logging library for ABAP"
+	},  	
+  "https://github.com/sbcgua/mockup_loader.git":
+	{ 
+		"title": "mockup_loader",
+		"description": "SAP ABAP tool for unit testing"
+	},  	
+  "https://github.com/koemaeda/abap-markdown.git": 
+	{ 
+		"title": "abap-markdown",
+		"description": "ABAP markdown parser"
+	},	
+  "https://github.com/RainerWinkler/Moose-FAMIX-SAP-Extractor.git": 
+	{ 
+		"title": "Moose-FAMIX-SAP-Extractor",
+		"description": "An project to extract model data from a SAP system with FAMIX and Moose"
+	},		
+  "https://github.com/larshp/abapOpenChecks.git": 
+	{ 
+		"title": "abapOpenChecks",
+		"description": "Open source checks for SAP Code Inspector / ABAP Test Cockpit"
+	},
+  "https://github.com/larshp/abapOrion.git": 
+	{ 
+		"title": "abapOrion",
+		"description": "Client implementation of Eclipse Orion protocol in ABAP for use with SAP HANA"
+	},	
+  "https://github.com/larshp/abapOpenReview.git": 
+	{ 
+		"title": "abapOpenReview",
+		"description": "ABAP Review Tool"
+	},		
+  "https://github.com/larshp/upDOWNci.git": 
+	{ 
+		"title": "upDOWNci",
+		"description": "Upload and download SAP Code Inspector variants in XML format"
+	},
+  "https://github.com/larshp/FORMfactor.git": 
+	{ 
+		"title": "FORMfactor",
+		"description": "Refactor FORMs to local classes"
+	},	
+  "https://github.com/gregorwolf/ebid-abap-client.git": 
+	{ 
+		"title": "ebid-abap-client",
+		"description": "ABAP Client for the http://www.unternehmensverzeichnis.org REST API"
+	},	
+  "https://github.com/Sumu-Ning/AES.git": 
+	{ 
+		"title": "AES",
+		"description": "ABAP Utilities for AES/Rijndael encryption, decryption"
+	},	
+  "https://github.com/fidley/falv.git": 
+	{ 
+		"title": "falv",
+		"description": "FALV - Fast ALV Grid"
+	},	
+  "https://github.com/larshp/Datamatrix.git": 
+	{ 
+		"title": "Datamatrix",
+		"description": "Datamatrix implemented in ABAP using smartforms"
+	}	
+}
diff --git a/src/zabapgit.prog.abap b/src/zabapgit.prog.abap
index 29fb467eb..fa7af4c0e 100644
--- a/src/zabapgit.prog.abap
+++ b/src/zabapgit.prog.abap
@@ -2,9 +2,6 @@ REPORT zabapgit LINE-SIZE 100.
 
 * See http://www.abapgit.org
 
-CONSTANTS: gc_xml_version  TYPE string VALUE 'v1.0.0',      "#EC NOTEXT
-           gc_abap_version TYPE string VALUE 'v1.33.2'.     "#EC NOTEXT
-
 ********************************************************************************
 * The MIT License (MIT)
 *
@@ -50,10 +47,12 @@ INCLUDE zabapgit_persistence.
 INCLUDE zabapgit_sap_package.
 INCLUDE zabapgit_folder_logic.
 INCLUDE zabapgit_requirements.
+INCLUDE zabapgit_authorizations.
 
 INCLUDE zabapgit_stage.
 INCLUDE zabapgit_git_helpers.
 INCLUDE zabapgit_repo.
+INCLUDE zabapgit_news.
 INCLUDE zabapgit_stage_logic.
 INCLUDE zabapgit_2fa.
 INCLUDE zabapgit_http.
diff --git a/src/zabapgit.prog.xml b/src/zabapgit.prog.xml
index b47a5359e..1f91d506d 100644
--- a/src/zabapgit.prog.xml
+++ b/src/zabapgit.prog.xml
@@ -12,7 +12,6 @@
     <LDBNAME>D$S</LDBNAME>
     <UCCHECK>X</UCCHECK>
    </PROGDIR>
-   <DYNPROS/>
    <TPOOL>
     <item>
      <ID>R</ID>
diff --git a/src/zabapgit_2fa.prog.abap b/src/zabapgit_2fa.prog.abap
index 5a2d5ab40..58b7bcf2a 100644
--- a/src/zabapgit_2fa.prog.abap
+++ b/src/zabapgit_2fa.prog.abap
@@ -50,13 +50,13 @@ CLASS lcx_2fa_auth_failed IMPLEMENTATION.
   ENDMETHOD.
 ENDCLASS.
 
-CLASS lcx_2fa_token_gen_failed DEFINITION INHERITING FROM lcx_2fa_error FINAL.
+CLASS lcx_2fa_gen_failed DEFINITION INHERITING FROM lcx_2fa_error FINAL.
   PROTECTED SECTION.
     METHODS:
       get_default_text REDEFINITION.
 ENDCLASS.
 
-CLASS lcx_2fa_token_gen_failed IMPLEMENTATION.
+CLASS lcx_2fa_gen_failed IMPLEMENTATION.
   METHOD get_default_text.
     rv_text = 'Two factor access token generation failed.' ##NO_TEXT.
   ENDMETHOD.
@@ -74,25 +74,25 @@ CLASS lcx_2fa_unsupported IMPLEMENTATION.
   ENDMETHOD.
 ENDCLASS.
 
-CLASS lcx_2fa_token_del_failed DEFINITION INHERITING FROM lcx_2fa_error FINAL.
+CLASS lcx_2fa_del_failed DEFINITION INHERITING FROM lcx_2fa_error FINAL.
   PROTECTED SECTION.
     METHODS:
       get_default_text REDEFINITION.
 ENDCLASS.
 
-CLASS lcx_2fa_token_del_failed IMPLEMENTATION.
+CLASS lcx_2fa_del_failed IMPLEMENTATION.
   METHOD get_default_text.
     rv_text = 'Deleting previous access tokens failed.' ##NO_TEXT.
   ENDMETHOD.
 ENDCLASS.
 
-CLASS lcx_2fa_communication_error DEFINITION INHERITING FROM lcx_2fa_error FINAL.
+CLASS lcx_2fa_comm_error DEFINITION INHERITING FROM lcx_2fa_error FINAL.
   PROTECTED SECTION.
     METHODS:
       get_default_text REDEFINITION.
 ENDCLASS.
 
-CLASS lcx_2fa_communication_error IMPLEMENTATION.
+CLASS lcx_2fa_comm_error IMPLEMENTATION.
   METHOD get_default_text.
     rv_text = 'Communication error.' ##NO_TEXT.
   ENDMETHOD.
@@ -143,8 +143,8 @@ INTERFACE lif_2fa_authenticator.
                            iv_2fa_token           TYPE string
                  RETURNING VALUE(rv_access_token) TYPE string
                  RAISING   lcx_2fa_auth_failed
-                           lcx_2fa_token_gen_failed
-                           lcx_2fa_communication_error,
+                           lcx_2fa_gen_failed
+                           lcx_2fa_comm_error,
     "! Check if this authenticator instance supports the give repository url
     "! @parameter iv_url | Repository url
     "! @parameter rv_supported | Is supported
@@ -166,7 +166,7 @@ INTERFACE lif_2fa_authenticator.
                               iv_username        TYPE string
                               iv_password        TYPE string
                     RETURNING VALUE(rv_required) TYPE abap_bool
-                    RAISING   lcx_2fa_communication_error,
+                    RAISING   lcx_2fa_comm_error,
     "! Delete all previously created access tokens for abapGit
     "! @parameter iv_url | Repository url
     "! @parameter iv_username | Username
@@ -178,8 +178,8 @@ INTERFACE lif_2fa_authenticator.
                                    iv_username  TYPE string
                                    iv_password  TYPE string
                                    iv_2fa_token TYPE string
-                         RAISING   lcx_2fa_token_del_failed
-                                   lcx_2fa_communication_error
+                         RAISING   lcx_2fa_del_failed
+                                   lcx_2fa_comm_error
                                    lcx_2fa_auth_failed,
     "! Begin an authenticator session that uses internal caching for authorizations
     "! @raising lcx_2fa_illegal_state | Session already started
@@ -190,7 +190,7 @@ INTERFACE lif_2fa_authenticator.
 ENDINTERFACE.
 
 "! Default <em>LIF_2FA-AUTHENTICATOR</em> implememtation
-CLASS lcl_2fa_authenticator_base DEFINITION
+CLASS lcl_2fa_auth_base DEFINITION
   ABSTRACT
   CREATE PUBLIC.
 
@@ -216,7 +216,7 @@ CLASS lcl_2fa_authenticator_base DEFINITION
       "! <p>
       "! <em>sy-msg...</em> must be set right before calling!
       "! </p>
-      raise_comm_error_from_sy RAISING lcx_2fa_communication_error.
+      raise_comm_error_from_sy RAISING lcx_2fa_comm_error.
     METHODS:
       "! @parameter rv_running | Internal session is currently active
       is_session_running RETURNING VALUE(rv_running) TYPE abap_bool.
@@ -226,7 +226,7 @@ CLASS lcl_2fa_authenticator_base DEFINITION
       mv_session_running TYPE abap_bool.
 ENDCLASS.
 
-CLASS lcl_2fa_authenticator_base IMPLEMENTATION.
+CLASS lcl_2fa_auth_base IMPLEMENTATION.
   METHOD constructor.
     CREATE OBJECT mo_url_regex
       EXPORTING
@@ -251,7 +251,7 @@ CLASS lcl_2fa_authenticator_base IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD delete_access_tokens.
-    RAISE EXCEPTION TYPE lcx_2fa_token_del_failed. " Needs to be overwritten in subclasses
+    RAISE EXCEPTION TYPE lcx_2fa_del_failed. " Needs to be overwritten in subclasses
   ENDMETHOD.
 
   METHOD raise_comm_error_from_sy.
@@ -260,7 +260,7 @@ CLASS lcl_2fa_authenticator_base IMPLEMENTATION.
     MESSAGE ID sy-msgid TYPE sy-msgty NUMBER sy-msgno
             WITH sy-msgv1 sy-msgv2 sy-msgv3 sy-msgv4
             INTO lv_error_msg.
-    RAISE EXCEPTION TYPE lcx_2fa_communication_error
+    RAISE EXCEPTION TYPE lcx_2fa_comm_error
       EXPORTING
         iv_error_text = |Communication error: { lv_error_msg }| ##NO_TEXT.
   ENDMETHOD.
@@ -286,10 +286,8 @@ CLASS lcl_2fa_authenticator_base IMPLEMENTATION.
   ENDMETHOD.
 ENDCLASS.
 
-CLASS lcl_2fa_github_authenticator DEFINITION
-  INHERITING FROM lcl_2fa_authenticator_base
-  FINAL
-  CREATE PUBLIC.
+CLASS lcl_2fa_github_auth DEFINITION INHERITING FROM lcl_2fa_auth_base
+    FINAL CREATE PUBLIC.
 
   PUBLIC SECTION.
     METHODS:
@@ -309,8 +307,6 @@ CLASS lcl_2fa_github_authenticator DEFINITION
       set_new_token_request IMPORTING ii_request   TYPE REF TO if_http_request,
       get_token_from_response IMPORTING ii_response     TYPE REF TO if_http_response
                               RETURNING VALUE(rv_token) TYPE string,
-      parse_repo_from_url IMPORTING iv_url              TYPE string
-                          RETURNING VALUE(rv_repo_name) TYPE string,
       set_list_token_request IMPORTING ii_request TYPE REF TO if_http_request,
       get_tobedel_tokens_from_resp IMPORTING ii_response   TYPE REF TO if_http_response
                                    RETURNING VALUE(rt_ids) TYPE stringtab,
@@ -322,12 +318,12 @@ CLASS lcl_2fa_github_authenticator DEFINITION
                                          iv_2fa_token     TYPE string
                                RETURNING VALUE(ri_client) TYPE REF TO if_http_client
                                RAISING   lcx_2fa_auth_failed
-                                         lcx_2fa_communication_error.
+                                         lcx_2fa_comm_error.
     DATA:
       mi_authenticated_session TYPE REF TO if_http_client.
 ENDCLASS.
 
-CLASS lcl_2fa_github_authenticator IMPLEMENTATION.
+CLASS lcl_2fa_github_auth IMPLEMENTATION.
   METHOD constructor.
     super->constructor( '^https?://(www\.)?github.com.*$' ).
   ENDMETHOD.
@@ -362,14 +358,14 @@ CLASS lcl_2fa_github_authenticator IMPLEMENTATION.
         code   = lv_http_code
         reason = lv_http_code_description ).
     IF lv_http_code <> 201.
-      RAISE EXCEPTION TYPE lcx_2fa_token_gen_failed
+      RAISE EXCEPTION TYPE lcx_2fa_gen_failed
         EXPORTING
           iv_error_text = |Token generation failed: { lv_http_code } { lv_http_code_description }|.
     ENDIF.
 
     rv_access_token = get_token_from_response( li_http_client->response ).
     IF rv_access_token IS INITIAL.
-      RAISE EXCEPTION TYPE lcx_2fa_token_gen_failed
+      RAISE EXCEPTION TYPE lcx_2fa_gen_failed
         EXPORTING
           iv_error_text = 'Token generation failed: parser error' ##NO_TEXT.
     ENDIF.
@@ -445,25 +441,6 @@ CLASS lcl_2fa_github_authenticator IMPLEMENTATION.
     ENDWHILE.
   ENDMETHOD.
 
-  METHOD parse_repo_from_url.
-* method not used?
-    ASSERT 0 = 1.
-*    CONSTANTS: lc_search_regex TYPE string VALUE 'https?:\/\/(www\.)?github.com\/(.*)$'.
-*    DATA: lo_regex   TYPE REF TO cl_abap_regex,
-*          lo_matcher TYPE REF TO cl_abap_matcher.
-*
-*    CREATE OBJECT lo_regex
-*      EXPORTING
-*        pattern = lc_search_regex.
-*
-*    lo_matcher = lo_regex->create_matcher( text = iv_url ).
-*    IF lo_matcher->match( ) = abap_true.
-*      rv_repo_name = lo_matcher->get_submatch( 1 ).
-*    ELSE.
-*      rv_repo_name = '???' ##NO_TEXT.
-*    ENDIF.
-  ENDMETHOD.
-
   METHOD get_service_id_from_url.
     rv_id = 'github'.
   ENDMETHOD.
@@ -546,7 +523,7 @@ CLASS lcl_2fa_github_authenticator IMPLEMENTATION.
         code   = lv_http_code
         reason = lv_http_code_description ).
     IF lv_http_code <> 200.
-      RAISE EXCEPTION TYPE lcx_2fa_token_del_failed
+      RAISE EXCEPTION TYPE lcx_2fa_del_failed
         EXPORTING
           iv_error_text = |Could not fetch current 2FA authorizations: | &&
                           |{ lv_http_code } { lv_http_code_description }|.
@@ -571,7 +548,7 @@ CLASS lcl_2fa_github_authenticator IMPLEMENTATION.
           code   = lv_http_code
           reason = lv_http_code_description ).
       IF lv_http_code <> 204.
-        RAISE EXCEPTION TYPE lcx_2fa_token_del_failed
+        RAISE EXCEPTION TYPE lcx_2fa_del_failed
           EXPORTING
             iv_error_text = |Could not delete token '{ <lv_id> }': | &&
                             |{ lv_http_code } { lv_http_code_description }|.
@@ -651,7 +628,7 @@ CLASS lcl_2fa_github_authenticator IMPLEMENTATION.
 ENDCLASS.
 
 "! Static registry class to find <em>LIF_2FA_AUTHENTICATOR</em> instances
-CLASS lcl_2fa_authenticator_registry DEFINITION
+CLASS lcl_2fa_auth_registry DEFINITION
   FINAL
   CREATE PRIVATE.
 
@@ -689,7 +666,6 @@ CLASS lcl_2fa_authenticator_registry DEFINITION
       "! All authenticators managed by the registry
       gt_registered_authenticators TYPE HASHED TABLE OF REF TO lif_2fa_authenticator
                                         WITH UNIQUE KEY table_line READ-ONLY.
-  PROTECTED SECTION.
   PRIVATE SECTION.
     CLASS-METHODS:
       popup_token
@@ -697,9 +673,9 @@ CLASS lcl_2fa_authenticator_registry DEFINITION
         RAISING   lcx_exception.
 ENDCLASS.
 
-CLASS lcl_2fa_authenticator_registry IMPLEMENTATION.
+CLASS lcl_2fa_auth_registry IMPLEMENTATION.
   METHOD class_constructor.
-    DEFINE register.
+    DEFINE _register.
       CREATE OBJECT li_authenticator TYPE &1.
       INSERT li_authenticator INTO TABLE gt_registered_authenticators.
     END-OF-DEFINITION.
@@ -709,7 +685,7 @@ CLASS lcl_2fa_authenticator_registry IMPLEMENTATION.
     " If there are new authenticators these need to be added here manually.
     " I do not think there is an equivalent to SEO_INTERFACE_IMPLEM_GET_ALL for local classes
     " without invoking the compiler directly.
-    register: lcl_2fa_github_authenticator.
+    _register: lcl_2fa_github_auth.
   ENDMETHOD.
 
   METHOD get_authenticator_for_url.
diff --git a/src/zabapgit_app.prog.abap b/src/zabapgit_app.prog.abap
index f6ea82515..cdfcd79fc 100644
--- a/src/zabapgit_app.prog.abap
+++ b/src/zabapgit_app.prog.abap
@@ -6,7 +6,7 @@ CLASS lcl_gui DEFINITION DEFERRED.
 CLASS lcl_persistence_user DEFINITION DEFERRED.
 CLASS lcl_repo_srv DEFINITION DEFERRED.
 CLASS lcl_persistence_db DEFINITION DEFERRED.
-CLASS lcl_persistence_settings DEFINITION DEFERRED.
+CLASS lcl_persist_settings DEFINITION DEFERRED.
 
 *----------------------------------------------------------------------*
 *       CLASS lcl_app DEFINITION
@@ -14,9 +14,6 @@ CLASS lcl_persistence_settings DEFINITION DEFERRED.
 CLASS lcl_app DEFINITION FINAL.
   PUBLIC SECTION.
 
-    CLASS-METHODS run
-      RAISING lcx_exception.
-
     CLASS-METHODS gui
       RETURNING VALUE(ro_gui) TYPE REF TO lcl_gui
       RAISING   lcx_exception.
@@ -33,13 +30,13 @@ CLASS lcl_app DEFINITION FINAL.
       RETURNING VALUE(ro_db) TYPE REF TO lcl_persistence_db.
 
     CLASS-METHODS settings
-      RETURNING VALUE(ro_settings) TYPE REF TO lcl_persistence_settings.
+      RETURNING VALUE(ro_settings) TYPE REF TO lcl_persist_settings.
 
   PRIVATE SECTION.
     CLASS-DATA: go_gui          TYPE REF TO lcl_gui,
                 go_current_user TYPE REF TO lcl_persistence_user,
                 go_db           TYPE REF TO lcl_persistence_db,
                 go_repo_srv     TYPE REF TO lcl_repo_srv,
-                go_settings     TYPE REF TO lcl_persistence_settings.
+                go_settings     TYPE REF TO lcl_persist_settings.
 
 ENDCLASS.   "lcl_app
diff --git a/src/zabapgit_app_impl.prog.abap b/src/zabapgit_app_impl.prog.abap
index f41691290..831819ced 100644
--- a/src/zabapgit_app_impl.prog.abap
+++ b/src/zabapgit_app_impl.prog.abap
@@ -7,17 +7,6 @@
 *----------------------------------------------------------------------*
 CLASS lcl_app IMPLEMENTATION.
 
-  METHOD run.
-
-    IF sy-batch = abap_true.
-      lcl_background=>run( ).
-    ELSE.
-      gui( )->go_home( ).
-      CALL SELECTION-SCREEN 1001. " trigger screen
-    ENDIF.
-
-  ENDMETHOD.      "run
-
   METHOD gui.
 
     IF go_gui IS NOT BOUND.
diff --git a/src/zabapgit_authorizations.prog.abap b/src/zabapgit_authorizations.prog.abap
new file mode 100644
index 000000000..b9cdce214
--- /dev/null
+++ b/src/zabapgit_authorizations.prog.abap
@@ -0,0 +1,52 @@
+*&---------------------------------------------------------------------*
+*&  Include           ZABAPGIT_AUTHORIZATIONS
+*&---------------------------------------------------------------------*
+
+INTERFACE lif_auth.
+  TYPES: ty_authorization TYPE string.
+
+  CONSTANTS: BEGIN OF gc_authorization,
+               uninstall TYPE ty_authorization VALUE 'UNINSTALL',
+             END OF gc_authorization.
+
+  METHODS:
+    is_allowed
+      IMPORTING iv_authorization  TYPE ty_authorization
+                iv_param          TYPE string OPTIONAL
+      RETURNING VALUE(rv_allowed) TYPE abap_bool.
+ENDINTERFACE.
+
+* implement class LCL_AUTH_EXIT implementing LIF_AUTH in following include,
+* place the include in a different package than ZABAPGIT
+INCLUDE zabapgit_authorizations_exit IF FOUND.
+
+*******************
+
+CLASS lcl_auth DEFINITION FINAL.
+
+  PUBLIC SECTION.
+    CLASS-METHODS:
+      is_allowed
+        IMPORTING iv_authorization  TYPE lif_auth=>ty_authorization
+                  iv_param          TYPE string OPTIONAL
+        RETURNING VALUE(rv_allowed) TYPE abap_bool.
+
+ENDCLASS.
+
+CLASS lcl_auth IMPLEMENTATION.
+
+  METHOD is_allowed.
+
+    DATA: li_auth TYPE REF TO lif_auth.
+
+    TRY.
+        CREATE OBJECT li_auth TYPE ('LCL_AUTH_EXIT').
+        rv_allowed = li_auth->is_allowed( iv_authorization = iv_authorization
+                                          iv_param         = iv_param ).
+      CATCH cx_sy_create_object_error.
+        rv_allowed = abap_true.
+    ENDTRY.
+
+  ENDMETHOD.
+
+ENDCLASS.
diff --git a/src/zabapgit_authorizations.prog.xml b/src/zabapgit_authorizations.prog.xml
new file mode 100644
index 000000000..b184950f7
--- /dev/null
+++ b/src/zabapgit_authorizations.prog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <PROGDIR>
+    <NAME>ZABAPGIT_AUTHORIZATIONS</NAME>
+    <STATE>A</STATE>
+    <VARCL>X</VARCL>
+    <SUBC>I</SUBC>
+    <RLOAD>E</RLOAD>
+    <UCCHECK>X</UCCHECK>
+   </PROGDIR>
+   <TPOOL>
+    <item>
+     <ID>R</ID>
+     <ENTRY>Include ZABAPGIT_AUTHORIZATIONS</ENTRY>
+     <LENGTH>31</LENGTH>
+    </item>
+   </TPOOL>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_background.prog.abap b/src/zabapgit_background.prog.abap
index 9cfa072b2..252883901 100644
--- a/src/zabapgit_background.prog.abap
+++ b/src/zabapgit_background.prog.abap
@@ -12,15 +12,15 @@ CLASS lcl_background DEFINITION FINAL.
   PRIVATE SECTION.
     CLASS-METHODS:
       build_comment
-        IMPORTING is_files          TYPE ty_stage_files
+        IMPORTING is_files          TYPE lif_defs=>ty_stage_files
         RETURNING VALUE(rv_comment) TYPE string,
       push
         IMPORTING io_repo     TYPE REF TO lcl_repo_online
-                  is_settings TYPE lcl_persistence_background=>ty_background
+                  is_settings TYPE lcl_persist_background=>ty_background
         RAISING   lcx_exception,
       push_fixed
         IMPORTING io_repo     TYPE REF TO lcl_repo_online
-                  is_settings TYPE lcl_persistence_background=>ty_background
+                  is_settings TYPE lcl_persist_background=>ty_background
         RAISING   lcx_exception,
       push_auto
         IMPORTING io_repo TYPE REF TO lcl_repo_online
@@ -38,10 +38,10 @@ CLASS lcl_background IMPLEMENTATION.
     ENDIF.
 
     CASE is_settings-amethod.
-      WHEN lcl_persistence_background=>c_amethod-fixed.
+      WHEN lcl_persist_background=>c_amethod-fixed.
         push_fixed( io_repo     = io_repo
                     is_settings = is_settings ).
-      WHEN lcl_persistence_background=>c_amethod-auto.
+      WHEN lcl_persist_background=>c_amethod-auto.
         push_auto( io_repo ).
       WHEN OTHERS.
         lcx_exception=>raise( 'unknown push method' ).
@@ -51,8 +51,8 @@ CLASS lcl_background IMPLEMENTATION.
 
   METHOD push_fixed.
 
-    DATA: ls_comment TYPE ty_comment,
-          ls_files   TYPE ty_stage_files,
+    DATA: ls_comment TYPE lif_defs=>ty_comment,
+          ls_files   TYPE lif_defs=>ty_stage_files,
           lo_stage   TYPE REF TO lcl_stage.
 
     FIELD-SYMBOLS: <ls_local> LIKE LINE OF ls_files-local.
@@ -105,7 +105,7 @@ CLASS lcl_background IMPLEMENTATION.
     ELSE.
       rv_comment = 'BG: Multiple objects'.
       LOOP AT lt_objects INTO lv_str.
-        CONCATENATE rv_comment gc_newline lv_str INTO rv_comment.
+        CONCATENATE rv_comment lif_defs=>gc_newline lv_str INTO rv_comment.
       ENDLOOP.
     ENDIF.
 
@@ -113,8 +113,8 @@ CLASS lcl_background IMPLEMENTATION.
 
   METHOD push_auto.
 
-    DATA: ls_comment    TYPE ty_comment,
-          ls_files      TYPE ty_stage_files,
+    DATA: ls_comment    TYPE lif_defs=>ty_comment,
+          ls_files      TYPE lif_defs=>ty_stage_files,
           ls_user_files LIKE ls_files,
           lo_stage      TYPE REF TO lcl_stage.
 
@@ -171,9 +171,9 @@ CLASS lcl_background IMPLEMENTATION.
 
     CONSTANTS: c_enq_type TYPE c LENGTH 12 VALUE 'BACKGROUND'.
 
-    DATA: lo_per       TYPE REF TO lcl_persistence_background,
+    DATA: lo_per       TYPE REF TO lcl_persist_background,
           lo_repo      TYPE REF TO lcl_repo_online,
-          lt_list      TYPE lcl_persistence_background=>tt_background,
+          lt_list      TYPE lcl_persist_background=>tt_background,
           lv_repo_name TYPE string.
 
     FIELD-SYMBOLS: <ls_list> LIKE LINE OF lt_list.
@@ -209,9 +209,9 @@ CLASS lcl_background IMPLEMENTATION.
         iv_password = <ls_list>-password ).
 
       CASE <ls_list>-method.
-        WHEN lcl_persistence_background=>c_method-pull.
+        WHEN lcl_persist_background=>c_method-pull.
           lo_repo->deserialize( ).
-        WHEN lcl_persistence_background=>c_method-push.
+        WHEN lcl_persist_background=>c_method-push.
           push( io_repo     = lo_repo
                 is_settings = <ls_list> ).
         WHEN OTHERS.
diff --git a/src/zabapgit_css_common.w3mi.data.css b/src/zabapgit_css_common.w3mi.data.css
index 032ee97f0..09d540e60 100644
--- a/src/zabapgit_css_common.w3mi.data.css
+++ b/src/zabapgit_css_common.w3mi.data.css
@@ -24,7 +24,7 @@ img               { border: 0px; vertical-align: middle; }
 table             { border-collapse: collapse; }
 pre               { display: inline; }
 sup {
-  vertical-align: baseline;
+  vertical-align: top;
   position: relative;
   top: -0.5em;
   font-size: 75%;
@@ -42,6 +42,7 @@ input:focus, textarea:focus {
 /* COLOR PALETTE */
 .grey             { color: lightgrey  !important; }
 .grey70           { color: #b3b3b3    !important; }
+.grey80           { color: #ccc       !important; }
 .bgorange         { background-color: orange; }
 .darkgrey         { color: #808080    !important; }
 .attention        { color: red        !important; }
@@ -49,6 +50,7 @@ input:focus, textarea:focus {
 .warning          { color: #efb301    !important; }
 .blue             { color: #5e8dc9    !important; }
 .red              { color: red        !important; }
+.white            { color: white      !important; }
 
 /* MODIFIERS */
 .emphasis         { font-weight: bold !important; }
@@ -62,6 +64,8 @@ input:focus, textarea:focus {
 .pad4px           { padding: 4px; }
 .w100             { width: 100%; }
 .w40              { width: 40%; }
+.float-right      { float: right; }
+.pad-right        { padding-right: 6px; }
 
 /* STRUCTURE DIVS, HEADER & FOOTER */
 div#header {
@@ -126,6 +130,7 @@ div.repo {
   margin-top:       3px;
   background-color: #f2f2f2;
   padding: 0.5em 1em 0.5em 1em;
+  position: relative;
 }
 .repo_name span.name {
   font-weight: bold;
@@ -532,8 +537,8 @@ table.db_tab th {
 }
 table.db_tab td {
   color: #333;
-  padding: 0.5em;
-  vertical-align: top;
+  padding: 4px 8px;
+  vertical-align: middle;
 }
 table.db_tab td.data {
   color: #888;
@@ -742,3 +747,70 @@ div.tutorial h2 {
 }
 .nav-container ul ul li.separator:first-child { border-top: none; }
 .nav-container ul ul li.separator:hover { background-color: inherit; }
+
+/* News Announcement */
+
+div.news { 
+  position: absolute;
+  z-index: 99;
+  top: 36px;
+  left: 50%;
+  width: 40em;
+  margin-left: -20em;
+  background-color: white;
+  box-shadow: 1px 1px 3px 2px #dcdcdc;
+}
+
+div.news div.headbar {
+  text-transform: uppercase;
+  font-size: small;
+  padding: 4px 6px;
+}
+
+div.news div.title {
+  color: #f8f8f8;
+  background-color: #888;
+}
+
+div.news div.title a.close-btn { 
+  color: #d8d8d8; 
+  padding-left: 12px; 
+  padding-right: 2px;
+  position: relative;
+  bottom: 1px;
+}
+
+div.news div.important { color: #aaa; }
+div.news div.newslist {
+  padding: 0.5em 0.7em;
+  color: #444;
+}
+
+div.news li {
+  padding-left: 10px;
+  list-style-type: none;
+}
+
+div.news h1:first-child { margin: auto; }
+div.news h1 { 
+  font-size: inherit;
+  padding: 6px 4px;
+  margin: 4px auto auto;
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+div.news .version-marker {
+  color: white;
+  display: inline-block;
+  margin-left: 20px;
+  border-radius: 3px;
+  padding: 0px 6px;
+  border: #c0c0c0 1px solid;
+  background-color: #ccc;
+}
+
+div.news .update {
+  border: #e8ba30 1px solid;
+  background-color: #f5c538;
+}
diff --git a/src/zabapgit_definitions.prog.abap b/src/zabapgit_definitions.prog.abap
index 9fbab5536..07bf82a56 100644
--- a/src/zabapgit_definitions.prog.abap
+++ b/src/zabapgit_definitions.prog.abap
@@ -4,247 +4,255 @@
 
 TYPE-POOLS seop.
 
-TYPES: ty_type    TYPE c LENGTH 6,
-       ty_bitbyte TYPE c LENGTH 8,
-       ty_sha1    TYPE c LENGTH 40.
+INTERFACE lif_defs.
 
-TYPES: BEGIN OF ty_file_signature,
-         path     TYPE string,
-         filename TYPE string,
-         sha1     TYPE ty_sha1,
-       END OF ty_file_signature.
+  CONSTANTS: gc_xml_version  TYPE string VALUE 'v1.0.0',    "#EC NOTEXT
+             gc_abap_version TYPE string VALUE 'v1.37.2'.   "#EC NOTEXT
 
-TYPES: ty_file_signatures_tt TYPE STANDARD TABLE OF
-         ty_file_signature WITH DEFAULT KEY.
+  TYPES: ty_type    TYPE c LENGTH 6,
+         ty_bitbyte TYPE c LENGTH 8,
+         ty_sha1    TYPE c LENGTH 40.
 
-TYPES: ty_file_signatures_ts TYPE SORTED TABLE OF
-         ty_file_signature WITH UNIQUE KEY path filename.
+  TYPES: BEGIN OF ty_file_signature,
+           path     TYPE string,
+           filename TYPE string,
+           sha1     TYPE lif_defs=>ty_sha1,
+         END OF ty_file_signature.
 
-TYPES: BEGIN OF ty_file.
-    INCLUDE TYPE ty_file_signature.
-TYPES: data TYPE xstring,
-       END OF ty_file.
-TYPES: ty_files_tt TYPE STANDARD TABLE OF ty_file WITH DEFAULT KEY.
+  TYPES: ty_file_signatures_tt TYPE STANDARD TABLE OF
+           ty_file_signature WITH DEFAULT KEY.
 
-TYPES: ty_string_tt TYPE STANDARD TABLE OF string WITH DEFAULT KEY.
+  TYPES: ty_file_signatures_ts TYPE SORTED TABLE OF
+           ty_file_signature WITH UNIQUE KEY path filename.
 
-TYPES:
-  BEGIN OF ty_git_user,
-    name  TYPE string,
-    email TYPE string,
-  END OF ty_git_user.
+  TYPES: BEGIN OF ty_file.
+      INCLUDE TYPE ty_file_signature.
+  TYPES: data TYPE xstring,
+         END OF ty_file.
+  TYPES: ty_files_tt TYPE STANDARD TABLE OF ty_file WITH DEFAULT KEY.
 
-TYPES:
-  BEGIN OF ty_comment,
-    committer TYPE ty_git_user,
-    author    TYPE ty_git_user,
-    comment   TYPE string,
-  END OF ty_comment.
+  TYPES: ty_string_tt TYPE STANDARD TABLE OF string WITH DEFAULT KEY.
 
-TYPES: BEGIN OF ty_item,
-         obj_type TYPE tadir-object,
-         obj_name TYPE tadir-obj_name,
-         devclass TYPE devclass,
-       END OF ty_item,
-       ty_items_tt TYPE STANDARD TABLE OF ty_item WITH DEFAULT KEY,
-       ty_items_ts TYPE SORTED TABLE OF ty_item WITH UNIQUE KEY obj_type obj_name.
+  TYPES:
+    BEGIN OF ty_git_user,
+      name  TYPE string,
+      email TYPE string,
+    END OF ty_git_user.
 
-TYPES: BEGIN OF ty_file_item,
-         file TYPE ty_file,
-         item TYPE ty_item,
-       END OF ty_file_item.
-TYPES: ty_files_item_tt TYPE STANDARD TABLE OF ty_file_item WITH DEFAULT KEY.
+  TYPES:
+    BEGIN OF ty_comment,
+      committer TYPE ty_git_user,
+      author    TYPE ty_git_user,
+      comment   TYPE string,
+    END OF ty_comment.
 
-TYPES: BEGIN OF ty_metadata,
-         class        TYPE string,
-         version      TYPE string,
-         late_deser   TYPE abap_bool,
-         delete_tadir TYPE abap_bool,
-         ddic         TYPE abap_bool,
-       END OF ty_metadata.
+  TYPES: BEGIN OF ty_item,
+           obj_type TYPE tadir-object,
+           obj_name TYPE tadir-obj_name,
+           devclass TYPE devclass,
+         END OF ty_item,
+         ty_items_tt TYPE STANDARD TABLE OF ty_item WITH DEFAULT KEY,
+         ty_items_ts TYPE SORTED TABLE OF ty_item WITH UNIQUE KEY obj_type obj_name.
 
-TYPES: BEGIN OF ty_web_asset,
-         url     TYPE w3url,
-         base64  TYPE string,
-         content TYPE xstring,
-       END OF ty_web_asset.
-TYPES  tt_web_assets TYPE STANDARD TABLE OF ty_web_asset WITH DEFAULT KEY.
+  TYPES: BEGIN OF ty_file_item,
+           file TYPE lif_defs=>ty_file,
+           item TYPE ty_item,
+         END OF ty_file_item.
+  TYPES: ty_files_item_tt TYPE STANDARD TABLE OF ty_file_item WITH DEFAULT KEY.
 
-TYPES: BEGIN OF ty_repo_file,
-         path       TYPE string,
-         filename   TYPE string,
-         is_changed TYPE abap_bool,
-         rstate     TYPE char1,
-         lstate     TYPE char1,
-       END OF ty_repo_file.
-TYPES  tt_repo_files TYPE STANDARD TABLE OF ty_repo_file WITH DEFAULT KEY.
+  TYPES: BEGIN OF ty_metadata,
+           class        TYPE string,
+           version      TYPE string,
+           late_deser   TYPE abap_bool,
+           delete_tadir TYPE abap_bool,
+           ddic         TYPE abap_bool,
+         END OF ty_metadata.
 
-TYPES: BEGIN OF ty_stage_files,
-         local  TYPE ty_files_item_tt,
-         remote TYPE ty_files_tt,
-       END OF ty_stage_files.
+  TYPES: BEGIN OF ty_web_asset,
+           url     TYPE w3url,
+           base64  TYPE string,
+           content TYPE xstring,
+         END OF ty_web_asset.
+  TYPES  tt_web_assets TYPE STANDARD TABLE OF ty_web_asset WITH DEFAULT KEY.
 
-CONSTANTS: BEGIN OF gc_type,
-             commit TYPE ty_type VALUE 'commit',            "#EC NOTEXT
-             tree   TYPE ty_type VALUE 'tree',              "#EC NOTEXT
-             ref_d  TYPE ty_type VALUE 'ref_d',             "#EC NOTEXT
-             blob   TYPE ty_type VALUE 'blob',              "#EC NOTEXT
-           END OF gc_type.
+  TYPES: BEGIN OF ty_repo_file,
+           path       TYPE string,
+           filename   TYPE string,
+           is_changed TYPE abap_bool,
+           rstate     TYPE char1,
+           lstate     TYPE char1,
+         END OF ty_repo_file.
+  TYPES  tt_repo_files TYPE STANDARD TABLE OF ty_repo_file WITH DEFAULT KEY.
 
-TYPES: ty_chmod TYPE c LENGTH 6.
+  TYPES: BEGIN OF ty_stage_files,
+           local  TYPE lif_defs=>ty_files_item_tt,
+           remote TYPE lif_defs=>ty_files_tt,
+         END OF ty_stage_files.
 
-TYPES: BEGIN OF ty_object,
-         sha1 TYPE ty_sha1,
-         type TYPE ty_type,
-         data TYPE xstring,
-       END OF ty_object.
-TYPES: ty_objects_tt TYPE STANDARD TABLE OF ty_object WITH DEFAULT KEY.
+  CONSTANTS: BEGIN OF gc_type,
+               commit TYPE lif_defs=>ty_type VALUE 'commit', "#EC NOTEXT
+               tree   TYPE lif_defs=>ty_type VALUE 'tree',  "#EC NOTEXT
+               ref_d  TYPE lif_defs=>ty_type VALUE 'ref_d', "#EC NOTEXT
+               blob   TYPE lif_defs=>ty_type VALUE 'blob',  "#EC NOTEXT
+             END OF gc_type.
 
-TYPES: BEGIN OF ty_tadir,
-         pgmid    TYPE tadir-pgmid,
-         object   TYPE tadir-object,
-         obj_name TYPE tadir-obj_name,
-         devclass TYPE tadir-devclass,
-         korrnum  TYPE tadir-korrnum,
-         path     TYPE string,
-       END OF ty_tadir.
-TYPES: ty_tadir_tt TYPE STANDARD TABLE OF ty_tadir WITH DEFAULT KEY.
+  TYPES: ty_chmod TYPE c LENGTH 6.
 
-TYPES: BEGIN OF ty_result,
-         obj_type TYPE tadir-object,
-         obj_name TYPE tadir-obj_name,
-         path     TYPE string,
-         filename TYPE string,
-         package  TYPE devclass,
-         match    TYPE sap_bool,
-         lstate   TYPE char1,
-         rstate   TYPE char1,
-       END OF ty_result.
-TYPES: ty_results_tt TYPE STANDARD TABLE OF ty_result WITH DEFAULT KEY.
+  TYPES: BEGIN OF ty_object,
+           sha1 TYPE lif_defs=>ty_sha1,
+           type TYPE lif_defs=>ty_type,
+           data TYPE xstring,
+         END OF ty_object.
+  TYPES: ty_objects_tt TYPE STANDARD TABLE OF ty_object WITH DEFAULT KEY.
 
-TYPES: ty_sval_tt TYPE STANDARD TABLE OF sval WITH DEFAULT KEY.
+  TYPES: BEGIN OF ty_tadir,
+           pgmid    TYPE tadir-pgmid,
+           object   TYPE tadir-object,
+           obj_name TYPE tadir-obj_name,
+           devclass TYPE tadir-devclass,
+           korrnum  TYPE tadir-korrnum,
+           path     TYPE string,
+         END OF ty_tadir.
+  TYPES: ty_tadir_tt TYPE STANDARD TABLE OF ty_tadir WITH DEFAULT KEY.
 
-TYPES: ty_seocompotx_tt TYPE STANDARD TABLE OF seocompotx WITH DEFAULT KEY.
+  TYPES: BEGIN OF ty_result,
+           obj_type TYPE tadir-object,
+           obj_name TYPE tadir-obj_name,
+           path     TYPE string,
+           filename TYPE string,
+           package  TYPE devclass,
+           match    TYPE sap_bool,
+           lstate   TYPE char1,
+           rstate   TYPE char1,
+         END OF ty_result.
+  TYPES: ty_results_tt TYPE STANDARD TABLE OF ty_result WITH DEFAULT KEY.
 
-TYPES: BEGIN OF ty_tpool.
-    INCLUDE TYPE textpool.
-TYPES:   split TYPE c LENGTH 8.
-TYPES: END OF ty_tpool.
+  TYPES: ty_sval_tt TYPE STANDARD TABLE OF sval WITH DEFAULT KEY.
 
-TYPES: ty_tpool_tt TYPE STANDARD TABLE OF ty_tpool WITH DEFAULT KEY.
+  TYPES: ty_seocompotx_tt TYPE STANDARD TABLE OF seocompotx WITH DEFAULT KEY.
 
-TYPES: BEGIN OF ty_sotr,
-         header  TYPE sotr_head,
-         entries TYPE sotr_text_tt,
-       END OF ty_sotr.
+  TYPES: BEGIN OF ty_tpool.
+      INCLUDE TYPE textpool.
+  TYPES:   split TYPE c LENGTH 8.
+  TYPES: END OF ty_tpool.
 
-TYPES: ty_sotr_tt TYPE STANDARD TABLE OF ty_sotr WITH DEFAULT KEY.
+  TYPES: ty_tpool_tt TYPE STANDARD TABLE OF ty_tpool WITH DEFAULT KEY.
 
-TYPES:
-  BEGIN OF ty_transport_to_branch,
-    branch_name TYPE string,
-    commit_text TYPE string,
-  END OF ty_transport_to_branch.
+  TYPES: BEGIN OF ty_sotr,
+           header  TYPE sotr_head,
+           entries TYPE sotr_text_tt,
+         END OF ty_sotr.
 
-CONSTANTS: BEGIN OF gc_state, " https://git-scm.com/docs/git-status
-             unchanged TYPE char1 VALUE '',
-             added     TYPE char1 VALUE 'A',
-             modified  TYPE char1 VALUE 'M',
-             deleted   TYPE char1 VALUE 'D', "For future use
-             mixed     TYPE char1 VALUE '*',
-           END OF gc_state.
+  TYPES: ty_sotr_tt TYPE STANDARD TABLE OF ty_sotr WITH DEFAULT KEY.
 
-CONSTANTS: BEGIN OF gc_chmod,
-             file       TYPE ty_chmod VALUE '100644',
-             executable TYPE ty_chmod VALUE '100755',
-             dir        TYPE ty_chmod VALUE '40000 ',
-           END OF gc_chmod.
+  TYPES:
+    BEGIN OF ty_transport_to_branch,
+      branch_name TYPE string,
+      commit_text TYPE string,
+    END OF ty_transport_to_branch.
 
-CONSTANTS: BEGIN OF gc_event_state,
-             not_handled         VALUE 0,
-             re_render           VALUE 1,
-             new_page            VALUE 2,
-             go_back             VALUE 3,
-             no_more_act         VALUE 4,
-             new_page_w_bookmark VALUE 5,
-             go_back_to_bookmark VALUE 6,
-             new_page_replacing  VALUE 7,
-           END OF gc_event_state.
+  CONSTANTS: BEGIN OF gc_state, " https://git-scm.com/docs/git-status
+               unchanged TYPE char1 VALUE '',
+               added     TYPE char1 VALUE 'A',
+               modified  TYPE char1 VALUE 'M',
+               deleted   TYPE char1 VALUE 'D', "For future use
+               mixed     TYPE char1 VALUE '*',
+             END OF gc_state.
 
-CONSTANTS: BEGIN OF gc_html_opt,
-             strong   TYPE c VALUE 'E',
-             cancel   TYPE c VALUE 'C',
-             crossout TYPE c VALUE 'X',
-           END OF gc_html_opt.
+  CONSTANTS: BEGIN OF gc_chmod,
+               file       TYPE ty_chmod VALUE '100644',
+               executable TYPE ty_chmod VALUE '100755',
+               dir        TYPE ty_chmod VALUE '40000 ',
+             END OF gc_chmod.
 
-CONSTANTS: BEGIN OF gc_action_type,
-             sapevent  TYPE c VALUE 'E',
-             url       TYPE c VALUE 'U',
-             onclick   TYPE c VALUE 'C',
-             separator TYPE c VALUE 'S',
-             dummy     TYPE c VALUE '_',
-           END OF gc_action_type.
+  CONSTANTS: BEGIN OF gc_event_state,
+               not_handled         VALUE 0,
+               re_render           VALUE 1,
+               new_page            VALUE 2,
+               go_back             VALUE 3,
+               no_more_act         VALUE 4,
+               new_page_w_bookmark VALUE 5,
+               go_back_to_bookmark VALUE 6,
+               new_page_replacing  VALUE 7,
+             END OF gc_event_state.
 
-CONSTANTS: gc_newline TYPE abap_char1 VALUE cl_abap_char_utilities=>newline.
+  CONSTANTS: BEGIN OF gc_html_opt,
+               strong   TYPE c VALUE 'E',
+               cancel   TYPE c VALUE 'C',
+               crossout TYPE c VALUE 'X',
+             END OF gc_html_opt.
 
-CONSTANTS: gc_english TYPE spras VALUE 'E'.
+  CONSTANTS: BEGIN OF gc_action_type,
+               sapevent  TYPE c VALUE 'E',
+               url       TYPE c VALUE 'U',
+               onclick   TYPE c VALUE 'C',
+               separator TYPE c VALUE 'S',
+               dummy     TYPE c VALUE '_',
+             END OF gc_action_type.
 
-CONSTANTS: gc_root_dir     TYPE string VALUE '/',
-           gc_dot_abapgit  TYPE string VALUE '.abapgit.xml' ##NO_TEXT,
-           gc_author_regex TYPE string VALUE '^([\w\s\.@\-_1-9]+) <(.*)> (\d{10}) .\d{4}$' ##NO_TEXT.
+  CONSTANTS: gc_crlf    TYPE abap_cr_lf VALUE cl_abap_char_utilities=>cr_lf.
+  CONSTANTS: gc_newline TYPE abap_char1 VALUE cl_abap_char_utilities=>newline.
 
-CONSTANTS: BEGIN OF gc_action,
-             repo_clone               TYPE string VALUE 'repo_clone',
-             repo_refresh             TYPE string VALUE 'repo_refresh',
-             repo_remove              TYPE string VALUE 'repo_remove',
-             repo_settings            TYPE string VALUE 'repo_settings',
-             repo_purge               TYPE string VALUE 'repo_purge',
-             repo_newoffline          TYPE string VALUE 'repo_newoffline',
-             repo_remote_attach       TYPE string VALUE 'repo_remote_attach',
-             repo_remote_detach       TYPE string VALUE 'repo_remote_detach',
-             repo_remote_change       TYPE string VALUE 'repo_remote_change',
-             repo_refresh_checksums   TYPE string VALUE 'repo_refresh_checksums',
-             repo_toggle_fav          TYPE string VALUE 'repo_toggle_fav',
-             repo_transport_to_branch TYPE string VALUE 'repo_transport_to_branch',
+  CONSTANTS: gc_english TYPE spras VALUE 'E'.
 
-             abapgit_home             TYPE string VALUE 'abapgit_home',
-             abapgit_wiki             TYPE string VALUE 'abapgit_wiki',
-             abapgit_install          TYPE string VALUE 'abapgit_install',
-             abapgit_install_pi       TYPE string VALUE 'abapgit_install_pi',
+  CONSTANTS: gc_root_dir     TYPE string VALUE '/',
+             gc_dot_abapgit  TYPE string VALUE '.abapgit.xml' ##NO_TEXT,
+             gc_author_regex TYPE string VALUE '^([\w\s\.@\-_1-9]+) <(.*)> (\d{10})\s?.\d{4}$' ##NO_TEXT.
 
-             zip_import               TYPE string VALUE 'zip_import',
-             zip_export               TYPE string VALUE 'zip_export',
-             zip_package              TYPE string VALUE 'zip_package',
-             zip_transport            TYPE string VALUE 'zip_transport',
-             zip_object               TYPE string VALUE 'zip_object',
+  CONSTANTS: BEGIN OF gc_action,
+               repo_clone               TYPE string VALUE 'repo_clone',
+               repo_refresh             TYPE string VALUE 'repo_refresh',
+               repo_remove              TYPE string VALUE 'repo_remove',
+               repo_settings            TYPE string VALUE 'repo_settings',
+               repo_purge               TYPE string VALUE 'repo_purge',
+               repo_newoffline          TYPE string VALUE 'repo_newoffline',
+               repo_remote_attach       TYPE string VALUE 'repo_remote_attach',
+               repo_remote_detach       TYPE string VALUE 'repo_remote_detach',
+               repo_remote_change       TYPE string VALUE 'repo_remote_change',
+               repo_refresh_checksums   TYPE string VALUE 'repo_refresh_checksums',
+               repo_toggle_fav          TYPE string VALUE 'repo_toggle_fav',
+               repo_transport_to_branch TYPE string VALUE 'repo_transport_to_branch',
 
-             git_pull                 TYPE string VALUE 'git_pull',
-             git_reset                TYPE string VALUE 'git_reset',
-             git_branch_create        TYPE string VALUE 'git_branch_create',
-             git_branch_switch        TYPE string VALUE 'git_branch_switch',
-             git_branch_delete        TYPE string VALUE 'git_branch_delete',
-             git_commit               TYPE string VALUE 'git_commit',
+               abapgit_home             TYPE string VALUE 'abapgit_home',
+               abapgit_wiki             TYPE string VALUE 'abapgit_wiki',
+               abapgit_install          TYPE string VALUE 'abapgit_install',
+               abapgit_install_pi       TYPE string VALUE 'abapgit_install_pi',
 
-             db_delete                TYPE string VALUE 'db_delete',
-             db_update                TYPE string VALUE 'db_update',
-             db_display               TYPE string VALUE 'db_display',
-             db_edit                  TYPE string VALUE 'db_edit',
-             bg_update                TYPE string VALUE 'bg_update',
+               zip_import               TYPE string VALUE 'zip_import',
+               zip_export               TYPE string VALUE 'zip_export',
+               zip_package              TYPE string VALUE 'zip_package',
+               zip_transport            TYPE string VALUE 'zip_transport',
+               zip_object               TYPE string VALUE 'zip_object',
 
-             go_main                  TYPE string VALUE 'go_main',
-             go_explore               TYPE string VALUE 'go_explore',
-             go_db                    TYPE string VALUE 'go_db',
-             go_background            TYPE string VALUE 'go_background',
-             go_background_run        TYPE string VALUE 'go_background_run',
-             go_diff                  TYPE string VALUE 'go_diff',
-             go_stage                 TYPE string VALUE 'go_stage',
-             go_commit                TYPE string VALUE 'go_commit',
-             go_branch_overview       TYPE string VALUE 'go_branch_overview',
-             go_playground            TYPE string VALUE 'go_playground',
-             go_debuginfo             TYPE string VALUE 'go_debuginfo',
-             go_settings              TYPE string VALUE 'go_settings',
-             go_tutorial              TYPE string VALUE 'go_tutorial',
+               git_pull                 TYPE string VALUE 'git_pull',
+               git_reset                TYPE string VALUE 'git_reset',
+               git_branch_create        TYPE string VALUE 'git_branch_create',
+               git_branch_switch        TYPE string VALUE 'git_branch_switch',
+               git_branch_delete        TYPE string VALUE 'git_branch_delete',
+               git_commit               TYPE string VALUE 'git_commit',
 
-             jump                     TYPE string VALUE 'jump',
-             jump_pkg                 TYPE string VALUE 'jump_pkg',
-           END OF gc_action.
+               db_delete                TYPE string VALUE 'db_delete',
+               db_update                TYPE string VALUE 'db_update',
+               db_display               TYPE string VALUE 'db_display',
+               db_edit                  TYPE string VALUE 'db_edit',
+               bg_update                TYPE string VALUE 'bg_update',
+
+               go_main                  TYPE string VALUE 'go_main',
+               go_explore               TYPE string VALUE 'go_explore',
+               go_db                    TYPE string VALUE 'go_db',
+               go_background            TYPE string VALUE 'go_background',
+               go_background_run        TYPE string VALUE 'go_background_run',
+               go_diff                  TYPE string VALUE 'go_diff',
+               go_stage                 TYPE string VALUE 'go_stage',
+               go_commit                TYPE string VALUE 'go_commit',
+               go_branch_overview       TYPE string VALUE 'go_branch_overview',
+               go_playground            TYPE string VALUE 'go_playground',
+               go_debuginfo             TYPE string VALUE 'go_debuginfo',
+               go_settings              TYPE string VALUE 'go_settings',
+               go_tutorial              TYPE string VALUE 'go_tutorial',
+
+               jump                     TYPE string VALUE 'jump',
+               jump_pkg                 TYPE string VALUE 'jump_pkg',
+             END OF gc_action.
+
+ENDINTERFACE.
diff --git a/src/zabapgit_dot_abapgit.prog.abap b/src/zabapgit_dot_abapgit.prog.abap
index 5588dfbfb..a56aeae0b 100644
--- a/src/zabapgit_dot_abapgit.prog.abap
+++ b/src/zabapgit_dot_abapgit.prog.abap
@@ -15,7 +15,7 @@ CLASS lcl_dot_abapgit DEFINITION FINAL FRIENDS ltcl_dot_abapgit.
     TYPES: BEGIN OF ty_requirement,
              component   TYPE dlvunit,
              min_release TYPE saprelease,
-             min_patch TYPE sappatchlv,
+             min_patch   TYPE sappatchlv,
            END OF ty_requirement,
            ty_requirement_tt TYPE STANDARD TABLE OF ty_requirement WITH DEFAULT KEY,
            BEGIN OF ty_dot_abapgit,
@@ -65,7 +65,7 @@ CLASS lcl_dot_abapgit DEFINITION FINAL FRIENDS ltcl_dot_abapgit.
 *      set_master_language
 *        IMPORTING iv_language TYPE spras,
       get_signature
-        RETURNING VALUE(rs_signature) TYPE ty_file_signature
+        RETURNING VALUE(rs_signature) TYPE lif_defs=>ty_file_signature
         RAISING   lcx_exception.
 
   PRIVATE SECTION.
@@ -199,14 +199,26 @@ CLASS lcl_dot_abapgit IMPLEMENTATION.
 
   METHOD is_ignored.
 
-    DATA: lv_name   TYPE string,
-          lv_ignore TYPE string.
+    DATA: lv_name     TYPE string,
+          lv_starting TYPE string,
+          lv_dot      TYPE string,
+          lv_count    TYPE i,
+          lv_ignore   TYPE string.
 
 
     lv_name = iv_path && iv_filename.
 
+    CONCATENATE ms_data-starting_folder '*' INTO lv_starting.
+    CONCATENATE '/' lif_defs=>gc_dot_abapgit INTO lv_dot.
+
     LOOP AT ms_data-ignore INTO lv_ignore.
-      IF lv_name CP lv_ignore.
+      FIND ALL OCCURRENCES OF '/' IN lv_name MATCH COUNT lv_count.
+
+      IF lv_name CP lv_ignore
+          OR ( ms_data-starting_folder <> '/'
+          AND lv_count > 1
+          AND NOT lv_name CP lv_starting
+          AND NOT lv_name = lv_dot ).
         rv_ignored = abap_true.
         RETURN.
       ENDIF.
@@ -245,15 +257,11 @@ CLASS lcl_dot_abapgit IMPLEMENTATION.
     rv_language = ms_data-master_language.
   ENDMETHOD.
 
-*  METHOD set_master_language.
-*    ms_data-master_language = iv_language.
-*  ENDMETHOD.
-
   METHOD get_signature.
 
-    rs_signature-path     = gc_root_dir.
-    rs_signature-filename = gc_dot_abapgit.
-    rs_signature-sha1     = lcl_hash=>sha1( iv_type = gc_type-blob
+    rs_signature-path     = lif_defs=>gc_root_dir.
+    rs_signature-filename = lif_defs=>gc_dot_abapgit.
+    rs_signature-sha1     = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-blob
                                             iv_data = serialize( ) ).
 
   ENDMETHOD. "get_signature
diff --git a/src/zabapgit_file_status.prog.abap b/src/zabapgit_file_status.prog.abap
index 032e16876..416b901d3 100644
--- a/src/zabapgit_file_status.prog.abap
+++ b/src/zabapgit_file_status.prog.abap
@@ -16,7 +16,7 @@ CLASS lcl_file_status DEFINITION FINAL
     CLASS-METHODS status
       IMPORTING io_repo           TYPE REF TO lcl_repo
                 io_log            TYPE REF TO lcl_log OPTIONAL
-      RETURNING VALUE(rt_results) TYPE ty_results_tt
+      RETURNING VALUE(rt_results) TYPE lif_defs=>ty_results_tt
       RAISING   lcx_exception.
 
   PRIVATE SECTION.
@@ -24,33 +24,33 @@ CLASS lcl_file_status DEFINITION FINAL
     CLASS-METHODS:
       calculate_status
         IMPORTING iv_devclass       TYPE devclass
-                  it_local          TYPE ty_files_item_tt
-                  it_remote         TYPE ty_files_tt
-                  it_cur_state      TYPE ty_file_signatures_tt
-        RETURNING VALUE(rt_results) TYPE ty_results_tt,
+                  it_local          TYPE lif_defs=>ty_files_item_tt
+                  it_remote         TYPE lif_defs=>ty_files_tt
+                  it_cur_state      TYPE lif_defs=>ty_file_signatures_tt
+        RETURNING VALUE(rt_results) TYPE lif_defs=>ty_results_tt,
       run_checks
         IMPORTING io_log     TYPE REF TO lcl_log
-                  it_results TYPE ty_results_tt
+                  it_results TYPE lif_defs=>ty_results_tt
                   io_dot     TYPE REF TO lcl_dot_abapgit
                   iv_top     TYPE devclass
         RAISING   lcx_exception,
       build_existing
-        IMPORTING is_local         TYPE ty_file_item
-                  is_remote        TYPE ty_file
-                  it_state         TYPE ty_file_signatures_ts
-        RETURNING VALUE(rs_result) TYPE ty_result,
+        IMPORTING is_local         TYPE lif_defs=>ty_file_item
+                  is_remote        TYPE lif_defs=>ty_file
+                  it_state         TYPE lif_defs=>ty_file_signatures_ts
+        RETURNING VALUE(rs_result) TYPE lif_defs=>ty_result,
       build_new_local
-        IMPORTING is_local         TYPE ty_file_item
-        RETURNING VALUE(rs_result) TYPE ty_result,
+        IMPORTING is_local         TYPE lif_defs=>ty_file_item
+        RETURNING VALUE(rs_result) TYPE lif_defs=>ty_result,
       build_new_remote
         IMPORTING iv_devclass      TYPE devclass
-                  is_remote        TYPE ty_file
-                  it_items         TYPE ty_items_ts
-                  it_state         TYPE ty_file_signatures_ts
-        RETURNING VALUE(rs_result) TYPE ty_result,
+                  is_remote        TYPE lif_defs=>ty_file
+                  it_items         TYPE lif_defs=>ty_items_ts
+                  it_state         TYPE lif_defs=>ty_file_signatures_ts
+        RETURNING VALUE(rs_result) TYPE lif_defs=>ty_result,
       identify_object
         IMPORTING iv_filename TYPE string
-        EXPORTING es_item     TYPE ty_item
+        EXPORTING es_item     TYPE lif_defs=>ty_item
                   ev_is_xml   TYPE abap_bool.
 
 ENDCLASS.                    "lcl_file_status DEFINITION
@@ -63,8 +63,8 @@ CLASS lcl_file_status IMPLEMENTATION.
   METHOD run_checks.
 
     DATA: lv_path     TYPE string,
-          ls_item     TYPE ty_item,
-          ls_file     TYPE ty_file_signature,
+          ls_item     TYPE lif_defs=>ty_item,
+          ls_file     TYPE lif_defs=>ty_file_signature,
           lt_res_sort LIKE it_results,
           lt_item_idx LIKE it_results.
 
@@ -99,8 +99,8 @@ CLASS lcl_file_status IMPLEMENTATION.
         BINARY SEARCH. " Sorted above
 
       IF sy-subrc <> 0 OR <ls_res1>-path <> <ls_res2>-path. " All paths are same
-        io_log->add( iv_msg = |Files for object { <ls_res1>-obj_type }{
-                       <ls_res1>-obj_name }are not placed in the same folder|
+        io_log->add( iv_msg = |Files for object { <ls_res1>-obj_type } {
+                       <ls_res1>-obj_name } are not placed in the same folder|
                      iv_type = 'W'
                      iv_rc    = '1' ) ##no_text.
       ENDIF.
@@ -179,11 +179,11 @@ CLASS lcl_file_status IMPLEMENTATION.
   METHOD calculate_status.
 
     DATA: lt_remote    LIKE it_remote,
-          lt_items     TYPE ty_items_tt,
+          lt_items     TYPE lif_defs=>ty_items_tt,
           ls_item      LIKE LINE OF lt_items,
           lv_is_xml    TYPE abap_bool,
-          lt_items_idx TYPE ty_items_ts,
-          lt_state_idx TYPE ty_file_signatures_ts. " Sorted by path+filename
+          lt_items_idx TYPE lif_defs=>ty_items_ts,
+          lt_state_idx TYPE lif_defs=>ty_file_signatures_ts. " Sorted by path+filename
 
     FIELD-SYMBOLS: <ls_remote> LIKE LINE OF it_remote,
                    <ls_result> LIKE LINE OF rt_results,
@@ -292,10 +292,10 @@ CLASS lcl_file_status IMPLEMENTATION.
 
     IF sy-subrc = 0.
       IF ls_file_sig-sha1 <> is_local-file-sha1.
-        rs_result-lstate = gc_state-modified.
+        rs_result-lstate = lif_defs=>gc_state-modified.
       ENDIF.
       IF ls_file_sig-sha1 <> is_remote-sha1.
-        rs_result-rstate = gc_state-modified.
+        rs_result-rstate = lif_defs=>gc_state-modified.
       ENDIF.
       rs_result-match = boolc( rs_result-lstate IS INITIAL
         AND rs_result-rstate IS INITIAL ).
@@ -306,8 +306,8 @@ CLASS lcl_file_status IMPLEMENTATION.
       " the user will presumably decide what to do after checking the actual diff
       rs_result-match = boolc( is_local-file-sha1 = is_remote-sha1 ).
       IF rs_result-match = abap_false.
-        rs_result-lstate = gc_state-modified.
-        rs_result-rstate = gc_state-modified.
+        rs_result-lstate = lif_defs=>gc_state-modified.
+        rs_result-rstate = lif_defs=>gc_state-modified.
       ENDIF.
     ENDIF.
 
@@ -326,7 +326,7 @@ CLASS lcl_file_status IMPLEMENTATION.
 
     " Match
     rs_result-match    = abap_false.
-    rs_result-lstate   = gc_state-added.
+    rs_result-lstate   = lif_defs=>gc_state-added.
 
   ENDMETHOD.  "build_new_local
 
@@ -339,7 +339,7 @@ CLASS lcl_file_status IMPLEMENTATION.
     rs_result-path     = is_remote-path.
     rs_result-filename = is_remote-filename.
     rs_result-match    = abap_false.
-    rs_result-rstate   = gc_state-added.
+    rs_result-rstate   = lif_defs=>gc_state-added.
 
     identify_object( EXPORTING iv_filename = is_remote-filename
                      IMPORTING es_item     = ls_item ).
@@ -367,14 +367,14 @@ CLASS lcl_file_status IMPLEMENTATION.
           rs_result-match = abap_true.
           CLEAR rs_result-rstate.
         ELSE.
-          rs_result-rstate = gc_state-modified.
+          rs_result-rstate = lif_defs=>gc_state-modified.
         ENDIF.
 
         " Item is in state and in cache but with no package - it was deleted
         " OR devclass is the same as repo package (see #532)
         IF ls_item-devclass IS INITIAL OR ls_item-devclass = iv_devclass.
           rs_result-match  = abap_false.
-          rs_result-lstate = gc_state-deleted.
+          rs_result-lstate = lif_defs=>gc_state-deleted.
         ENDIF.
       ENDIF.
 
diff --git a/src/zabapgit_folder_logic.prog.abap b/src/zabapgit_folder_logic.prog.abap
index 5303edf23..d0fc5516b 100644
--- a/src/zabapgit_folder_logic.prog.abap
+++ b/src/zabapgit_folder_logic.prog.abap
@@ -86,7 +86,7 @@ CLASS lcl_folder_logic IMPLEMENTATION.
       lv_parentcl = lcl_sap_package=>get( iv_package )->read_parent( ).
 
       IF lv_parentcl IS INITIAL.
-        lcx_exception=>raise( 'error, expected parent package' ).
+        lcx_exception=>raise( |error, expected parent package, { iv_package }| ).
       ELSE.
         CASE io_dot->get_folder_logic( ).
           WHEN lcl_dot_abapgit=>c_folder_logic-full.
@@ -274,7 +274,7 @@ CLASS ltcl_folder_logic IMPLEMENTATION.
           iv_package  = '$FOOBAR'
           iv_path     = '/src/' ).
         cl_abap_unit_assert=>fail( 'Error expected' ).
-      CATCH lcx_exception.
+      CATCH lcx_exception ##NO_HANDLER.
     ENDTRY.
   ENDMETHOD.
 
diff --git a/src/zabapgit_forms.prog.abap b/src/zabapgit_forms.prog.abap
index e3d9d95d1..3cae67f9c 100644
--- a/src/zabapgit_forms.prog.abap
+++ b/src/zabapgit_forms.prog.abap
@@ -22,13 +22,24 @@ FORM run.
 
   TRY.
       lcl_migrations=>run( ).
-      lcl_app=>run( ).
+      PERFORM open_gui.
     CATCH lcx_exception INTO lx_exception.
       MESSAGE lx_exception->mv_text TYPE 'E'.
   ENDTRY.
 
 ENDFORM.                    "run
 
+FORM open_gui RAISING lcx_exception.
+
+  IF sy-batch = abap_true.
+    lcl_background=>run( ).
+  ELSE.
+    lcl_app=>gui( )->go_home( ).
+    CALL SELECTION-SCREEN 1001. " trigger screen
+  ENDIF.
+
+ENDFORM.
+
 *&---------------------------------------------------------------------*
 *&      Form  branch_popup
 *&---------------------------------------------------------------------*
@@ -43,7 +54,7 @@ ENDFORM.                    "run
 *      -->##CALLED       text
 *      -->##NEEDED       text
 *----------------------------------------------------------------------*
-FORM branch_popup TABLES   tt_fields TYPE ty_sval_tt
+FORM branch_popup TABLES   tt_fields TYPE lif_defs=>ty_sval_tt
                   USING    pv_code TYPE clike
                   CHANGING cs_error TYPE svale
                            cv_show_popup TYPE c
@@ -105,7 +116,7 @@ FORM branch_popup TABLES   tt_fields TYPE ty_sval_tt
 
 ENDFORM.                    "branch_popup
 
-FORM package_popup TABLES   tt_fields TYPE ty_sval_tt
+FORM package_popup TABLES   tt_fields TYPE lif_defs=>ty_sval_tt
                    USING    pv_code TYPE clike
                    CHANGING cs_error TYPE svale
                             cv_show_popup TYPE c
diff --git a/src/zabapgit_git.prog.abap b/src/zabapgit_git.prog.abap
index e24c2292e..3075bba11 100644
--- a/src/zabapgit_git.prog.abap
+++ b/src/zabapgit_git.prog.abap
@@ -16,15 +16,15 @@ CLASS lcl_git_transport DEFINITION FINAL.
       IMPORTING io_repo     TYPE REF TO lcl_repo_online
                 iv_deepen   TYPE abap_bool DEFAULT abap_true
                 it_branches TYPE lcl_git_branch_list=>ty_git_branch_list_tt OPTIONAL
-      EXPORTING et_objects  TYPE ty_objects_tt
-                ev_branch   TYPE ty_sha1
+      EXPORTING et_objects  TYPE lif_defs=>ty_objects_tt
+                ev_branch   TYPE lif_defs=>ty_sha1
       RAISING   lcx_exception.
 
 * local to remote
     CLASS-METHODS receive_pack
       IMPORTING iv_url         TYPE string
-                iv_old         TYPE ty_sha1
-                iv_new         TYPE ty_sha1
+                iv_old         TYPE lif_defs=>ty_sha1
+                iv_new         TYPE lif_defs=>ty_sha1
                 iv_branch_name TYPE string
                 iv_pack        TYPE xstring
       RAISING   lcx_exception.
@@ -52,7 +52,7 @@ CLASS lcl_git_transport DEFINITION FINAL.
                 iv_service     TYPE string
                 iv_branch_name TYPE string
       EXPORTING eo_client      TYPE REF TO lcl_http_client
-                ev_branch      TYPE ty_sha1
+                ev_branch      TYPE lif_defs=>ty_sha1
       RAISING   lcx_exception.
 
     CLASS-METHODS parse
@@ -71,16 +71,16 @@ CLASS lcl_git_pack DEFINITION FINAL FRIENDS ltcl_git_pack.
 
   PUBLIC SECTION.
     TYPES: BEGIN OF ty_node,
-             chmod TYPE ty_chmod,
+             chmod TYPE lif_defs=>ty_chmod,
              name  TYPE string,
-             sha1  TYPE ty_sha1,
+             sha1  TYPE lif_defs=>ty_sha1,
            END OF ty_node.
     TYPES: ty_nodes_tt TYPE STANDARD TABLE OF ty_node WITH DEFAULT KEY.
 
     TYPES: BEGIN OF ty_commit,
-             tree      TYPE ty_sha1,
-             parent    TYPE ty_sha1,
-             parent2   TYPE ty_sha1,
+             tree      TYPE lif_defs=>ty_sha1,
+             parent    TYPE lif_defs=>ty_sha1,
+             parent2   TYPE lif_defs=>ty_sha1,
              author    TYPE string,
              committer TYPE string,
              body      TYPE string,
@@ -88,7 +88,7 @@ CLASS lcl_git_pack DEFINITION FINAL FRIENDS ltcl_git_pack.
 
     CLASS-METHODS decode
       IMPORTING iv_data           TYPE xstring
-      RETURNING VALUE(rt_objects) TYPE ty_objects_tt
+      RETURNING VALUE(rt_objects) TYPE lif_defs=>ty_objects_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS decode_tree
@@ -102,7 +102,7 @@ CLASS lcl_git_pack DEFINITION FINAL FRIENDS ltcl_git_pack.
       RAISING   lcx_exception.
 
     CLASS-METHODS encode
-      IMPORTING it_objects     TYPE ty_objects_tt
+      IMPORTING it_objects     TYPE lif_defs=>ty_objects_tt
       RETURNING VALUE(rv_data) TYPE xstring
       RAISING   lcx_exception.
 
@@ -121,17 +121,17 @@ CLASS lcl_git_pack DEFINITION FINAL FRIENDS ltcl_git_pack.
                c_version    TYPE x LENGTH 4 VALUE '00000002'.
 
     CLASS-METHODS decode_deltas
-      CHANGING ct_objects TYPE ty_objects_tt
+      CHANGING ct_objects TYPE lif_defs=>ty_objects_tt
       RAISING  lcx_exception.
 
     CLASS-METHODS type_and_length
-      IMPORTING is_object         TYPE ty_object
+      IMPORTING is_object         TYPE lif_defs=>ty_object
       RETURNING VALUE(rv_xstring) TYPE xstring
       RAISING   lcx_exception.
 
     CLASS-METHODS delta
-      IMPORTING is_object  TYPE ty_object
-      CHANGING  ct_objects TYPE ty_objects_tt
+      IMPORTING is_object  TYPE lif_defs=>ty_object
+      CHANGING  ct_objects TYPE lif_defs=>ty_objects_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS delta_header
@@ -144,7 +144,7 @@ CLASS lcl_git_pack DEFINITION FINAL FRIENDS ltcl_git_pack.
 
     CLASS-METHODS get_type
       IMPORTING iv_x           TYPE x
-      RETURNING VALUE(rv_type) TYPE ty_type
+      RETURNING VALUE(rv_type) TYPE lif_defs=>ty_type
       RAISING   lcx_exception.
 
     CLASS-METHODS get_length
@@ -251,7 +251,7 @@ CLASS lcl_git_transport IMPLEMENTATION.
               lcl_git_utils=>get_null( ) &&
               ` ` &&
               lv_cap_list &&
-              gc_newline.                                   "#EC NOTEXT
+              lif_defs=>gc_newline.                                   "#EC NOTEXT
     lv_cmd_pkt = lcl_git_utils=>pkt_string( lv_line ).
 
     lv_buffer = lv_cmd_pkt && '0000'.
@@ -347,22 +347,22 @@ CLASS lcl_git_transport IMPLEMENTATION.
         lv_capa = 'side-band-64k no-progress multi_ack agent='
           && lcl_http=>get_agent( ) ##NO_TEXT.
         lv_line = 'want' && ` ` && <ls_branch>-sha1
-          && ` ` && lv_capa && gc_newline.                  "#EC NOTEXT
+          && ` ` && lv_capa && lif_defs=>gc_newline.                  "#EC NOTEXT
       ELSE.
         lv_line = 'want' && ` ` && <ls_branch>-sha1
-          && gc_newline.                                    "#EC NOTEXT
+          && lif_defs=>gc_newline.                                    "#EC NOTEXT
       ENDIF.
       lv_buffer = lv_buffer && lcl_git_utils=>pkt_string( lv_line ).
     ENDLOOP.
 
     IF iv_deepen = abap_true.
       lv_buffer = lv_buffer && lcl_git_utils=>pkt_string( 'deepen 1'
-        && gc_newline ).                                    "#EC NOTEXT
+        && lif_defs=>gc_newline ).                                    "#EC NOTEXT
     ENDIF.
 
     lv_buffer = lv_buffer
              && '0000'
-             && '0009done' && gc_newline.
+             && '0009done' && lif_defs=>gc_newline.
 
     lv_xstring = lo_client->send_receive_close(
       lcl_convert=>string_to_xstring_utf8( lv_buffer ) ).
@@ -402,7 +402,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
     LOOP AT it_nodes ASSIGNING <ls_node>.
       APPEND INITIAL LINE TO lt_sort ASSIGNING <ls_sort>.
-      IF <ls_node>-chmod = gc_chmod-dir.
+      IF <ls_node>-chmod = lif_defs=>gc_chmod-dir.
         CONCATENATE <ls_node>-name '/' INTO <ls_sort>-sort.
       ELSE.
         <ls_sort>-sort = <ls_node>-name.
@@ -431,13 +431,13 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
 
     CASE is_object-type.
-      WHEN gc_type-commit.
+      WHEN lif_defs=>gc_type-commit.
         lv_type = '001'.
-      WHEN gc_type-tree.
+      WHEN lif_defs=>gc_type-tree.
         lv_type = '010'.
-      WHEN gc_type-blob.
+      WHEN lif_defs=>gc_type-blob.
         lv_type = '011'.
-      WHEN gc_type-ref_d.
+      WHEN lif_defs=>gc_type-ref_d.
         lv_type = '111'.
       WHEN OTHERS.
         lcx_exception=>raise( 'Unexpected object type while encoding pack' ).
@@ -487,7 +487,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
     DATA: lv_x           TYPE x,
           lv_length_bits TYPE string,
-          lv_bitbyte     TYPE ty_bitbyte.
+          lv_bitbyte     TYPE lif_defs=>ty_bitbyte.
 
 
     lv_x = cv_data(1).
@@ -549,7 +549,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
     lv_string = ''.
 
     CONCATENATE 'tree' lv_tree_lower INTO lv_tmp SEPARATED BY space. "#EC NOTEXT
-    CONCATENATE lv_string lv_tmp gc_newline INTO lv_string.
+    CONCATENATE lv_string lv_tmp lif_defs=>gc_newline INTO lv_string.
 
     IF NOT is_commit-parent IS INITIAL.
       lv_parent_lower = is_commit-parent.
@@ -557,7 +557,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
       CONCATENATE 'parent' lv_parent_lower
         INTO lv_tmp SEPARATED BY space.                     "#EC NOTEXT
-      CONCATENATE lv_string lv_tmp gc_newline INTO lv_string.
+      CONCATENATE lv_string lv_tmp lif_defs=>gc_newline INTO lv_string.
     ENDIF.
 
     IF NOT is_commit-parent2 IS INITIAL.
@@ -566,18 +566,18 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
       CONCATENATE 'parent' lv_parent_lower
         INTO lv_tmp SEPARATED BY space.                     "#EC NOTEXT
-      CONCATENATE lv_string lv_tmp gc_newline INTO lv_string.
+      CONCATENATE lv_string lv_tmp lif_defs=>gc_newline INTO lv_string.
     ENDIF.
 
     CONCATENATE 'author' is_commit-author
       INTO lv_tmp SEPARATED BY space.                       "#EC NOTEXT
-    CONCATENATE lv_string lv_tmp gc_newline INTO lv_string.
+    CONCATENATE lv_string lv_tmp lif_defs=>gc_newline INTO lv_string.
 
     CONCATENATE 'committer' is_commit-committer
       INTO lv_tmp SEPARATED BY space.                       "#EC NOTEXT
-    CONCATENATE lv_string lv_tmp gc_newline INTO lv_string.
+    CONCATENATE lv_string lv_tmp lif_defs=>gc_newline INTO lv_string.
 
-    CONCATENATE lv_string gc_newline is_commit-body INTO lv_string.
+    CONCATENATE lv_string lif_defs=>gc_newline is_commit-body INTO lv_string.
 
     rv_data = lcl_convert=>string_to_xstring_utf8( lv_string ).
 
@@ -586,7 +586,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
   METHOD get_type.
 
     DATA: lv_char3   TYPE c LENGTH 3,
-          lv_bitbyte TYPE ty_bitbyte.
+          lv_bitbyte TYPE lif_defs=>ty_bitbyte.
 
 
     lv_bitbyte = lcl_convert=>x_to_bitbyte( iv_x ).
@@ -594,13 +594,13 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
     CASE lv_char3.
       WHEN '001'.
-        rv_type = gc_type-commit.
+        rv_type = lif_defs=>gc_type-commit.
       WHEN '010'.
-        rv_type = gc_type-tree.
+        rv_type = lif_defs=>gc_type-tree.
       WHEN '011'.
-        rv_type = gc_type-blob.
+        rv_type = lif_defs=>gc_type-blob.
       WHEN '111'.
-        rv_type = gc_type-ref_d.
+        rv_type = lif_defs=>gc_type-ref_d.
       WHEN OTHERS.
         lcx_exception=>raise( 'Todo, unknown type' ).
     ENDCASE.
@@ -619,12 +619,12 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
     lv_string = lcl_convert=>xstring_to_string_utf8( iv_data ).
 
-    SPLIT lv_string AT gc_newline INTO TABLE lt_string.
+    SPLIT lv_string AT lif_defs=>gc_newline INTO TABLE lt_string.
 
     LOOP AT lt_string ASSIGNING <lv_string>.
       IF NOT rs_commit-committer IS INITIAL.
         CONCATENATE rs_commit-body <lv_string> INTO rs_commit-body
-          SEPARATED BY gc_newline.
+          SEPARATED BY lif_defs=>gc_newline.
       ELSE.
         SPLIT <lv_string> AT space INTO lv_word lv_trash.
         CASE lv_word.
@@ -661,7 +661,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
   METHOD delta_header.
 
-    DATA: lv_bitbyte TYPE ty_bitbyte,
+    DATA: lv_bitbyte TYPE lif_defs=>ty_bitbyte,
           lv_bits    TYPE string,
           lv_x       TYPE x.
 
@@ -685,82 +685,84 @@ CLASS lcl_git_pack IMPLEMENTATION.
     DATA: lv_delta   TYPE xstring,
           lv_base    TYPE xstring,
           lv_result  TYPE xstring,
-          lv_bitbyte TYPE ty_bitbyte,
+*          lv_bitbyte TYPE ty_bitbyte,
           lv_offset  TYPE i,
-          lv_message TYPE string,
-          lv_sha1    TYPE ty_sha1,
+          lv_sha1    TYPE lif_defs=>ty_sha1,
           ls_object  LIKE LINE OF ct_objects,
           lv_len     TYPE i,
+          lv_org     TYPE x,
+*          lv_i       TYPE i,
           lv_x       TYPE x.
 
     FIELD-SYMBOLS: <ls_object> LIKE LINE OF ct_objects.
 
+    DEFINE _eat_byte.
+      lv_x = lv_delta(1).
+      lv_delta = lv_delta+1.
+    END-OF-DEFINITION.
 
     lv_delta = is_object-data.
 
 * find base
     READ TABLE ct_objects ASSIGNING <ls_object> WITH KEY sha1 = is_object-sha1.
     IF sy-subrc <> 0.
-      CONCATENATE 'Base not found,' is_object-sha1 INTO lv_message
-        SEPARATED BY space.                                 "#EC NOTEXT
-      lcx_exception=>raise( lv_message ).
-    ELSE.
-      lv_base = <ls_object>-data.
-    ENDIF.
-
+      lcx_exception=>raise( |Base not found, { is_object-sha1 }| ).
+    ELSEIF <ls_object>-type = lif_defs=>gc_type-ref_d.
 * sanity check
-    IF <ls_object>-type = gc_type-ref_d.
       lcx_exception=>raise( 'Delta, base eq delta' ).
     ENDIF.
 
+    lv_base = <ls_object>-data.
+
 * skip the 2 headers
     delta_header( CHANGING cv_delta = lv_delta ).
     delta_header( CHANGING cv_delta = lv_delta ).
 
+    CONSTANTS: lc_1   TYPE x VALUE '01',
+               lc_2   TYPE x VALUE '02',
+               lc_4   TYPE x VALUE '04',
+               lc_8   TYPE x VALUE '08',
+               lc_16  TYPE x VALUE '10',
+               lc_32  TYPE x VALUE '20',
+               lc_64  TYPE x VALUE '40',
+               lc_128 TYPE x VALUE '80'.
+
     WHILE xstrlen( lv_delta ) > 0.
 
-      lv_x = lv_delta(1).
-      lv_delta = lv_delta+1.
-      lv_bitbyte = lcl_convert=>x_to_bitbyte( lv_x ).
+      _eat_byte.
+      lv_org = lv_x.
 
-      IF lv_bitbyte(1) = '1'. " MSB
+      IF lv_x BIT-AND lc_128 = lc_128. " MSB = 1
 
         lv_offset = 0.
-        IF lv_bitbyte+7(1) = '1'.
-          lv_x = lv_delta(1).
-          lv_delta = lv_delta+1.
+        IF lv_org BIT-AND lc_1 = lc_1.
+          _eat_byte.
           lv_offset = lv_x.
         ENDIF.
-        IF lv_bitbyte+6(1) = '1'.
-          lv_x = lv_delta(1).
-          lv_delta = lv_delta+1.
+        IF lv_org BIT-AND lc_2 = lc_2.
+          _eat_byte.
           lv_offset = lv_offset + lv_x * 256.
         ENDIF.
-        IF lv_bitbyte+5(1) = '1'.
-          lv_x = lv_delta(1).
-          lv_delta = lv_delta+1.
+        IF lv_org BIT-AND lc_4 = lc_4.
+          _eat_byte.
           lv_offset = lv_offset + lv_x * 65536.
         ENDIF.
-        IF lv_bitbyte+4(1) = '1'.
-          lv_x = lv_delta(1).
-          lv_delta = lv_delta+1.
+        IF lv_org BIT-AND lc_8 = lc_8.
+          _eat_byte.
           lv_offset = lv_offset + lv_x * 16777216. " hmm, overflow?
         ENDIF.
 
         lv_len = 0.
-        IF lv_bitbyte+3(1) = '1'.
-          lv_x = lv_delta(1).
-          lv_delta = lv_delta+1.
+        IF lv_org BIT-AND lc_16 = lc_16.
+          _eat_byte.
           lv_len = lv_x.
         ENDIF.
-        IF lv_bitbyte+2(1) = '1'.
-          lv_x = lv_delta(1).
-          lv_delta = lv_delta+1.
+        IF lv_org BIT-AND lc_32 = lc_32.
+          _eat_byte.
           lv_len = lv_len + lv_x * 256.
         ENDIF.
-        IF lv_bitbyte+1(1) = '1'.
-          lv_x = lv_delta(1).
-          lv_delta = lv_delta+1.
+        IF lv_org BIT-AND lc_64 = lc_64.
+          _eat_byte.
           lv_len = lv_len + lv_x * 65536.
         ENDIF.
 
@@ -795,7 +797,12 @@ CLASS lcl_git_pack IMPLEMENTATION.
           lt_deltas LIKE ct_objects.
 
 
-    LOOP AT ct_objects INTO ls_object WHERE type = gc_type-ref_d.
+    lcl_progress=>show( iv_key     = 'Decode'
+                        iv_current = 1
+                        iv_total   = 1
+                        iv_text    = 'Deltas' ) ##NO_TEXT.
+
+    LOOP AT ct_objects INTO ls_object WHERE type = lif_defs=>gc_type-ref_d.
       DELETE ct_objects INDEX sy-tabix.
       APPEND ls_object TO lt_deltas.
     ENDLOOP.
@@ -813,7 +820,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
                lc_null       TYPE x VALUE '00'.
 
     DATA: lv_xstring TYPE xstring,
-          lv_chmod   TYPE ty_chmod,
+          lv_chmod   TYPE lif_defs=>ty_chmod,
           lv_name    TYPE string,
           lv_string  TYPE string,
           lv_len     TYPE i,
@@ -839,9 +846,9 @@ CLASS lcl_git_pack IMPLEMENTATION.
 
         CLEAR ls_node.
         ls_node-chmod = lv_chmod.
-        IF ls_node-chmod <> gc_chmod-dir
-            AND ls_node-chmod <> gc_chmod-file
-            AND ls_node-chmod <> gc_chmod-executable.
+        IF ls_node-chmod <> lif_defs=>gc_chmod-dir
+            AND ls_node-chmod <> lif_defs=>gc_chmod-file
+            AND ls_node-chmod <> lif_defs=>gc_chmod-executable.
           lcx_exception=>raise( 'Unknown chmod' ).
         ENDIF.
 
@@ -896,8 +903,8 @@ CLASS lcl_git_pack IMPLEMENTATION.
           lv_zlib           TYPE x LENGTH 2,
           lv_objects        TYPE i,
           lv_len            TYPE i,
-          lv_sha1           TYPE ty_sha1,
-          lv_ref_delta      TYPE ty_sha1,
+          lv_sha1           TYPE lif_defs=>ty_sha1,
+          lv_ref_delta      TYPE lif_defs=>ty_sha1,
           lv_compressed_len TYPE i,
           lv_compressed     TYPE xstring,
           lv_decompressed   TYPE xstring,
@@ -935,7 +942,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
       get_length( IMPORTING ev_length = lv_expected
                   CHANGING cv_data = lv_data ).
 
-      IF lv_type = gc_type-ref_d.
+      IF lv_type = lif_defs=>gc_type-ref_d.
         lv_ref_delta = lv_data(20).
         lv_data = lv_data+20.
       ENDIF.
@@ -991,7 +998,7 @@ CLASS lcl_git_pack IMPLEMENTATION.
 *************************
 
       CLEAR ls_object.
-      IF lv_type = gc_type-ref_d.
+      IF lv_type = lif_defs=>gc_type-ref_d.
         ls_object-sha1 = lv_ref_delta.
         TRANSLATE ls_object-sha1 TO LOWER CASE.
       ELSE.
@@ -1074,31 +1081,31 @@ CLASS lcl_git_porcelain DEFINITION FINAL FRIENDS ltcl_git_porcelain.
     TYPES: BEGIN OF ty_expanded,
              path  TYPE string,
              name  TYPE string,
-             sha1  TYPE ty_sha1,
-             chmod TYPE ty_chmod,
+             sha1  TYPE lif_defs=>ty_sha1,
+             chmod TYPE lif_defs=>ty_chmod,
            END OF ty_expanded.
 
     TYPES: ty_expanded_tt TYPE STANDARD TABLE OF ty_expanded WITH DEFAULT KEY.
 
     CLASS-METHODS pull
       IMPORTING io_repo    TYPE REF TO lcl_repo_online
-      EXPORTING et_files   TYPE ty_files_tt
-                et_objects TYPE ty_objects_tt
-                ev_branch  TYPE ty_sha1
+      EXPORTING et_files   TYPE lif_defs=>ty_files_tt
+                et_objects TYPE lif_defs=>ty_objects_tt
+                ev_branch  TYPE lif_defs=>ty_sha1
       RAISING   lcx_exception.
 
     CLASS-METHODS push
       IMPORTING io_repo          TYPE REF TO lcl_repo_online
-                is_comment       TYPE ty_comment
+                is_comment       TYPE lif_defs=>ty_comment
                 io_stage         TYPE REF TO lcl_stage
-      EXPORTING ev_branch        TYPE ty_sha1
-                et_updated_files TYPE ty_file_signatures_tt
+      EXPORTING ev_branch        TYPE lif_defs=>ty_sha1
+                et_updated_files TYPE lif_defs=>ty_file_signatures_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS create_branch
       IMPORTING io_repo TYPE REF TO lcl_repo_online
                 iv_name TYPE string
-                iv_from TYPE ty_sha1
+                iv_from TYPE lif_defs=>ty_sha1
       RAISING   lcx_exception.
 
     CLASS-METHODS delete_branch
@@ -1107,8 +1114,8 @@ CLASS lcl_git_porcelain DEFINITION FINAL FRIENDS ltcl_git_porcelain.
       RAISING   lcx_exception.
 
     CLASS-METHODS full_tree
-      IMPORTING it_objects         TYPE ty_objects_tt
-                iv_branch          TYPE ty_sha1
+      IMPORTING it_objects         TYPE lif_defs=>ty_objects_tt
+                iv_branch          TYPE lif_defs=>ty_sha1
       RETURNING VALUE(rt_expanded) TYPE ty_expanded_tt
       RAISING   lcx_exception.
 
@@ -1117,7 +1124,7 @@ CLASS lcl_git_porcelain DEFINITION FINAL FRIENDS ltcl_git_porcelain.
     TYPES: BEGIN OF ty_tree,
              path TYPE string,
              data TYPE xstring,
-             sha1 TYPE ty_sha1,
+             sha1 TYPE lif_defs=>ty_sha1,
            END OF ty_tree.
 
     TYPES: ty_trees_tt TYPE STANDARD TABLE OF ty_tree WITH DEFAULT KEY.
@@ -1125,12 +1132,12 @@ CLASS lcl_git_porcelain DEFINITION FINAL FRIENDS ltcl_git_porcelain.
     TYPES: BEGIN OF ty_folder,
              path  TYPE string,
              count TYPE i,
-             sha1  TYPE ty_sha1,
+             sha1  TYPE lif_defs=>ty_sha1,
            END OF ty_folder.
 
     TYPES: ty_folders_tt TYPE STANDARD TABLE OF ty_folder WITH DEFAULT KEY.
 
-    CONSTANTS: c_zero TYPE ty_sha1 VALUE '0000000000000000000000000000000000000000'.
+    CONSTANTS: c_zero TYPE lif_defs=>ty_sha1 VALUE '0000000000000000000000000000000000000000'.
 
     CLASS-METHODS build_trees
       IMPORTING it_expanded     TYPE ty_expanded_tt
@@ -1142,26 +1149,26 @@ CLASS lcl_git_porcelain DEFINITION FINAL FRIENDS ltcl_git_porcelain.
       RETURNING VALUE(rt_folders) TYPE ty_folders_tt.
 
     CLASS-METHODS walk
-      IMPORTING it_objects TYPE ty_objects_tt
-                iv_sha1    TYPE ty_sha1
+      IMPORTING it_objects TYPE lif_defs=>ty_objects_tt
+                iv_sha1    TYPE lif_defs=>ty_sha1
                 iv_path    TYPE string
-      CHANGING  ct_files   TYPE ty_files_tt
+      CHANGING  ct_files   TYPE lif_defs=>ty_files_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS walk_tree
-      IMPORTING it_objects         TYPE ty_objects_tt
-                iv_tree            TYPE ty_sha1
+      IMPORTING it_objects         TYPE lif_defs=>ty_objects_tt
+                iv_tree            TYPE lif_defs=>ty_sha1
                 iv_base            TYPE string
       RETURNING VALUE(rt_expanded) TYPE ty_expanded_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS receive_pack
-      IMPORTING is_comment       TYPE ty_comment
+      IMPORTING is_comment       TYPE lif_defs=>ty_comment
                 io_repo          TYPE REF TO lcl_repo_online
                 it_trees         TYPE ty_trees_tt
-                it_blobs         TYPE ty_files_tt
+                it_blobs         TYPE lif_defs=>ty_files_tt
                 io_stage         TYPE REF TO lcl_stage
-      RETURNING VALUE(rv_branch) TYPE ty_sha1
+      RETURNING VALUE(rv_branch) TYPE lif_defs=>ty_sha1
       RAISING   lcx_exception.
 
 ENDCLASS.                    "lcl_porcelain DEFINITION
@@ -1177,7 +1184,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
 
     DATA: lv_time    TYPE lcl_time=>ty_unixtime,
           lv_commit  TYPE xstring,
-          lt_objects TYPE ty_objects_tt,
+          lt_objects TYPE lif_defs=>ty_objects_tt,
           lv_pack    TYPE xstring,
           ls_object  LIKE LINE OF lt_objects,
           ls_commit  TYPE lcl_git_pack=>ty_commit.
@@ -1208,31 +1215,31 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
     lv_commit = lcl_git_pack=>encode_commit( ls_commit ).
 
     CLEAR ls_object.
-    ls_object-sha1 = lcl_hash=>sha1( iv_type = gc_type-commit iv_data = lv_commit ).
-    ls_object-type = gc_type-commit.
+    ls_object-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-commit iv_data = lv_commit ).
+    ls_object-type = lif_defs=>gc_type-commit.
     ls_object-data = lv_commit.
     APPEND ls_object TO lt_objects.
 
     LOOP AT it_trees ASSIGNING <ls_tree>.
       CLEAR ls_object.
       ls_object-sha1 = <ls_tree>-sha1.
-      ls_object-type = gc_type-tree.
+      ls_object-type = lif_defs=>gc_type-tree.
       ls_object-data = <ls_tree>-data.
       APPEND ls_object TO lt_objects.
     ENDLOOP.
 
     LOOP AT it_blobs ASSIGNING <ls_blob>.
       CLEAR ls_object.
-      ls_object-sha1 = lcl_hash=>sha1( iv_type = gc_type-blob iv_data = <ls_blob>-data ).
+      ls_object-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-blob iv_data = <ls_blob>-data ).
 
-      READ TABLE lt_objects WITH KEY type = gc_type-blob sha1 = ls_object-sha1
+      READ TABLE lt_objects WITH KEY type = lif_defs=>gc_type-blob sha1 = ls_object-sha1
         TRANSPORTING NO FIELDS.
       IF sy-subrc = 0.
 * two identical files added at the same time, only add one blob to the pack
         CONTINUE.
       ENDIF.
 
-      ls_object-type = gc_type-blob.
+      ls_object-type = lif_defs=>gc_type-blob.
       ASSERT NOT <ls_blob>-data IS INITIAL.
       ls_object-data = <ls_blob>-data.
       APPEND ls_object TO lt_objects.
@@ -1241,7 +1248,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
     lv_pack = lcl_git_pack=>encode( lt_objects ).
 
     rv_branch = lcl_hash=>sha1(
-      iv_type = gc_type-commit
+      iv_type = lif_defs=>gc_type-commit
       iv_data = lv_commit ).
 
     lcl_git_transport=>receive_pack(
@@ -1255,7 +1262,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
 
   METHOD delete_branch.
 
-    DATA: lt_objects TYPE ty_objects_tt,
+    DATA: lt_objects TYPE lif_defs=>ty_objects_tt,
           lv_pack    TYPE xstring.
 
 
@@ -1274,7 +1281,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
 
   METHOD create_branch.
 
-    DATA: lt_objects TYPE ty_objects_tt,
+    DATA: lt_objects TYPE lif_defs=>ty_objects_tt,
           lv_pack    TYPE xstring.
 
     IF iv_name CS ` `.
@@ -1297,10 +1304,10 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
   METHOD push.
 
     DATA: lt_expanded TYPE ty_expanded_tt,
-          lt_blobs    TYPE ty_files_tt,
-          lv_sha1     TYPE ty_sha1,
+          lt_blobs    TYPE lif_defs=>ty_files_tt,
+          lv_sha1     TYPE lif_defs=>ty_sha1,
           lt_trees    TYPE ty_trees_tt,
-          lt_objects  TYPE ty_objects_tt,
+          lt_objects  TYPE lif_defs=>ty_objects_tt,
           lt_branches TYPE lcl_git_branch_list=>ty_git_branch_list_tt,
           lt_stage    TYPE lcl_stage=>ty_stage_tt.
 
@@ -1347,10 +1354,10 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
             APPEND INITIAL LINE TO lt_expanded ASSIGNING <ls_exp>.
             <ls_exp>-name  = <ls_stage>-file-filename.
             <ls_exp>-path  = <ls_stage>-file-path.
-            <ls_exp>-chmod = gc_chmod-file.
+            <ls_exp>-chmod = lif_defs=>gc_chmod-file.
           ENDIF.
 
-          lv_sha1 = lcl_hash=>sha1( iv_type = gc_type-blob
+          lv_sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-blob
                                     iv_data = <ls_stage>-file-data ).
           IF <ls_exp>-sha1 <> lv_sha1.
             <ls_exp>-sha1 = lv_sha1.
@@ -1393,7 +1400,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
 
     READ TABLE it_objects INTO ls_object
       WITH KEY sha1 = iv_tree
-      type = gc_type-tree.
+      type = lif_defs=>gc_type-tree.
     IF sy-subrc <> 0.
       lcx_exception=>raise( 'tree not found' ).
     ENDIF.
@@ -1401,14 +1408,14 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
 
     LOOP AT lt_nodes ASSIGNING <ls_node>.
       CASE <ls_node>-chmod.
-        WHEN gc_chmod-file
-            OR gc_chmod-executable.
+        WHEN lif_defs=>gc_chmod-file
+            OR lif_defs=>gc_chmod-executable.
           APPEND INITIAL LINE TO rt_expanded ASSIGNING <ls_exp>.
           <ls_exp>-path  = iv_base.
           <ls_exp>-name  = <ls_node>-name.
           <ls_exp>-sha1  = <ls_node>-sha1.
           <ls_exp>-chmod = <ls_node>-chmod.
-        WHEN gc_chmod-dir.
+        WHEN lif_defs=>gc_chmod-dir.
           lt_expanded = walk_tree(
             it_objects = it_objects
             iv_tree    = <ls_node>-sha1
@@ -1427,7 +1434,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
           ls_commit TYPE lcl_git_pack=>ty_commit.
 
 
-    READ TABLE it_objects INTO ls_object WITH KEY sha1 = iv_branch type = gc_type-commit.
+    READ TABLE it_objects INTO ls_object WITH KEY sha1 = iv_branch type = lif_defs=>gc_type-commit.
     IF sy-subrc <> 0.
       lcx_exception=>raise( 'commit not found' ).
     ENDIF.
@@ -1453,7 +1460,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
                                     IMPORTING et_objects = et_objects
                                               ev_branch = ev_branch ).
 
-    READ TABLE et_objects INTO ls_object WITH KEY sha1 = ev_branch type = gc_type-commit.
+    READ TABLE et_objects INTO ls_object WITH KEY sha1 = ev_branch type = lif_defs=>gc_type-commit.
     IF sy-subrc <> 0.
       lcx_exception=>raise( 'Commit/branch not found' ).
     ENDIF.
@@ -1510,7 +1517,6 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
 
     DATA: lt_nodes   TYPE lcl_git_pack=>ty_nodes_tt,
           ls_tree    LIKE LINE OF rt_trees,
-          lv_sub     TYPE string,
           lv_len     TYPE i,
           lt_folders TYPE ty_folders_tt.
 
@@ -1537,25 +1543,25 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
       ENDLOOP.
 
 * folders
-      lv_sub = <ls_folder>-path && '+*'.
-      LOOP AT lt_folders ASSIGNING <ls_sub>
-          WHERE count = <ls_folder>-count + 1 AND path CP lv_sub.
-        APPEND INITIAL LINE TO lt_nodes ASSIGNING <ls_node>.
-        <ls_node>-chmod = gc_chmod-dir.
+      LOOP AT lt_folders ASSIGNING <ls_sub> WHERE count = <ls_folder>-count + 1.
+        lv_len = strlen( <ls_folder>-path ).
+        IF strlen( <ls_sub>-path ) > lv_len AND <ls_sub>-path(lv_len) = <ls_folder>-path.
+          APPEND INITIAL LINE TO lt_nodes ASSIGNING <ls_node>.
+          <ls_node>-chmod = lif_defs=>gc_chmod-dir.
 
 * extract folder name, this can probably be done easier using regular expressions
-        lv_len = strlen( <ls_folder>-path ).
-        <ls_node>-name = <ls_sub>-path+lv_len.
-        lv_len = strlen( <ls_node>-name ) - 1.
-        <ls_node>-name = <ls_node>-name(lv_len).
+          <ls_node>-name = <ls_sub>-path+lv_len.
+          lv_len = strlen( <ls_node>-name ) - 1.
+          <ls_node>-name = <ls_node>-name(lv_len).
 
-        <ls_node>-sha1 = <ls_sub>-sha1.
+          <ls_node>-sha1 = <ls_sub>-sha1.
+        ENDIF.
       ENDLOOP.
 
       CLEAR ls_tree.
       ls_tree-path = <ls_folder>-path.
       ls_tree-data = lcl_git_pack=>encode_tree( lt_nodes ).
-      ls_tree-sha1 = lcl_hash=>sha1( iv_type = gc_type-tree iv_data = ls_tree-data ).
+      ls_tree-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-tree iv_data = ls_tree-data ).
       APPEND ls_tree TO rt_trees.
 
       <ls_folder>-sha1 = ls_tree-sha1.
@@ -1574,7 +1580,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
                    <ls_node> LIKE LINE OF lt_nodes.
 
 
-    READ TABLE it_objects ASSIGNING <ls_tree> WITH KEY sha1 = iv_sha1 type = gc_type-tree.
+    READ TABLE it_objects ASSIGNING <ls_tree> WITH KEY sha1 = iv_sha1 type = lif_defs=>gc_type-tree.
     IF sy-subrc <> 0.
       lcx_exception=>raise( 'Walk, tree not found' ).
     ENDIF.
@@ -1582,9 +1588,9 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
     lt_nodes = lcl_git_pack=>decode_tree( <ls_tree>-data ).
 
     LOOP AT lt_nodes ASSIGNING <ls_node>.
-      IF <ls_node>-chmod = gc_chmod-file.
+      IF <ls_node>-chmod = lif_defs=>gc_chmod-file.
         READ TABLE it_objects ASSIGNING <ls_blob>
-          WITH KEY sha1 = <ls_node>-sha1 type = gc_type-blob.
+          WITH KEY sha1 = <ls_node>-sha1 type = lif_defs=>gc_type-blob.
         IF sy-subrc <> 0.
           lcx_exception=>raise( 'Walk, blob not found' ).
         ENDIF.
@@ -1598,7 +1604,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
       ENDIF.
     ENDLOOP.
 
-    LOOP AT lt_nodes ASSIGNING <ls_node> WHERE chmod = gc_chmod-dir.
+    LOOP AT lt_nodes ASSIGNING <ls_node> WHERE chmod = lif_defs=>gc_chmod-dir.
       CONCATENATE iv_path <ls_node>-name '/' INTO lv_path.
       walk( EXPORTING it_objects = it_objects
                       iv_sha1 = <ls_node>-sha1
diff --git a/src/zabapgit_git_helpers.prog.abap b/src/zabapgit_git_helpers.prog.abap
index 3d7353882..65e20e3aa 100644
--- a/src/zabapgit_git_helpers.prog.abap
+++ b/src/zabapgit_git_helpers.prog.abap
@@ -98,7 +98,7 @@ CLASS lcl_git_branch_list DEFINITION FINAL.
   PUBLIC SECTION.
     TYPES: ty_git_branch_type TYPE char2.
     TYPES: BEGIN OF ty_git_branch,
-             sha1         TYPE ty_sha1,
+             sha1         TYPE lif_defs=>ty_sha1,
              name         TYPE string,
              type         TYPE ty_git_branch_type,
              is_head      TYPE abap_bool,
@@ -216,7 +216,7 @@ CLASS lcl_git_branch_list IMPLEMENTATION.
   METHOD parse_branch_list.
 
     DATA: lt_result      TYPE TABLE OF string,
-          lv_hash        TYPE ty_sha1,
+          lv_hash        TYPE lif_defs=>ty_sha1,
           lv_name        TYPE string,
           lv_head_params TYPE string,
           lv_char        TYPE c,
@@ -226,7 +226,7 @@ CLASS lcl_git_branch_list IMPLEMENTATION.
 
     CLEAR: et_list, ev_head_symref.
 
-    SPLIT iv_data AT gc_newline INTO TABLE lt_result.
+    SPLIT iv_data AT lif_defs=>gc_newline INTO TABLE lt_result.
 
     LOOP AT lt_result INTO lv_data.
       IF sy-tabix = 1.
diff --git a/src/zabapgit_gui.prog.abap b/src/zabapgit_gui.prog.abap
index a823ce468..efcbe2a22 100644
--- a/src/zabapgit_gui.prog.abap
+++ b/src/zabapgit_gui.prog.abap
@@ -115,19 +115,19 @@ CLASS lcl_gui IMPLEMENTATION.
         ENDIF.
 
         CASE lv_state.
-          WHEN gc_event_state-re_render.
+          WHEN lif_defs=>gc_event_state-re_render.
             render( ).
-          WHEN gc_event_state-new_page.
+          WHEN lif_defs=>gc_event_state-new_page.
             call_page( li_page ).
-          WHEN gc_event_state-new_page_w_bookmark.
+          WHEN lif_defs=>gc_event_state-new_page_w_bookmark.
             call_page( ii_page = li_page iv_with_bookmark = abap_true ).
-          WHEN gc_event_state-new_page_replacing.
+          WHEN lif_defs=>gc_event_state-new_page_replacing.
             call_page( ii_page = li_page iv_replacing = abap_true ).
-          WHEN gc_event_state-go_back.
+          WHEN lif_defs=>gc_event_state-go_back.
             back( ).
-          WHEN gc_event_state-go_back_to_bookmark.
+          WHEN lif_defs=>gc_event_state-go_back_to_bookmark.
             back( iv_to_bookmark = abap_true ).
-          WHEN gc_event_state-no_more_act.
+          WHEN lif_defs=>gc_event_state-no_more_act.
             " Do nothing, handling completed
           WHEN OTHERS.
             lcx_exception=>raise( |Unknown action: { action }| ).
@@ -186,7 +186,7 @@ CLASS lcl_gui IMPLEMENTATION.
 
   METHOD call_page.
 
-    DATA: ls_stack  TYPE ty_page_stack.
+    DATA: ls_stack TYPE ty_page_stack.
 
     IF iv_replacing = abap_false AND NOT mi_cur_page IS INITIAL.
       ls_stack-page     = mi_cur_page.
@@ -201,7 +201,7 @@ CLASS lcl_gui IMPLEMENTATION.
 
   METHOD go_home.
 
-    on_event( action = |{ gc_action-go_main }| ). " doesn't accept strings directly
+    on_event( action = |{ lif_defs=>gc_action-go_main }| ). " doesn't accept strings directly
 
   ENDMETHOD.                "go_home
 
@@ -209,7 +209,7 @@ CLASS lcl_gui IMPLEMENTATION.
 
     DATA: lt_events TYPE cntl_simple_events,
           ls_event  LIKE LINE OF lt_events,
-          lt_assets TYPE tt_web_assets.
+          lt_assets TYPE lif_defs=>tt_web_assets.
 
     FIELD-SYMBOLS <ls_asset> LIKE LINE OF lt_assets.
 
@@ -281,11 +281,11 @@ CLASS lcl_gui IMPLEMENTATION.
 
       CALL FUNCTION 'SCMS_STRING_TO_XSTRING'
         EXPORTING
-          text      = iv_text
+          text   = iv_text
         IMPORTING
-          buffer    = lv_xstr
+          buffer = lv_xstr
         EXCEPTIONS
-          OTHERS    = 1.
+          OTHERS = 1.
       ASSERT sy-subrc = 0.
 
     ELSE. " Raw input
diff --git a/src/zabapgit_gui_asset_manager.prog.abap b/src/zabapgit_gui_asset_manager.prog.abap
index 378824d08..e061f4b47 100644
--- a/src/zabapgit_gui_asset_manager.prog.abap
+++ b/src/zabapgit_gui_asset_manager.prog.abap
@@ -11,7 +11,7 @@ CLASS lcl_gui_asset_manager DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_gui.
       RAISING   lcx_exception.
 
     METHODS get_images
-      RETURNING VALUE(rt_images) TYPE tt_web_assets.
+      RETURNING VALUE(rt_images) TYPE lif_defs=>tt_web_assets.
 
     CLASS-METHODS get_webfont_link
       RETURNING VALUE(rv_link) TYPE string.
@@ -29,7 +29,7 @@ CLASS lcl_gui_asset_manager DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_gui.
       RAISING   lcx_exception.
 
     METHODS get_inline_images
-      RETURNING VALUE(rt_images) TYPE tt_web_assets.
+      RETURNING VALUE(rt_images) TYPE lif_defs=>tt_web_assets.
 
 ENDCLASS. "lcl_gui_asset_manager
 
@@ -136,13 +136,14 @@ CLASS lcl_gui_asset_manager IMPLEMENTATION.
 
   ENDMETHOD.  " get_images.
 
-  DEFINE _inline.
-    APPEND &1 TO lt_data.
-  END-OF-DEFINITION.
-
   METHOD get_inline_asset.
 
-    DATA: lt_data TYPE ty_string_tt,
+* used by abapmerge
+    DEFINE _inline.
+      APPEND &1 TO lt_data.
+    END-OF-DEFINITION.
+
+    DATA: lt_data TYPE lif_defs=>ty_string_tt,
           lv_str  TYPE string.
 
     CASE iv_asset_name.
@@ -154,7 +155,7 @@ CLASS lcl_gui_asset_manager IMPLEMENTATION.
         lcx_exception=>raise( |No inline resource: { iv_asset_name }| ).
     ENDCASE.
 
-    CONCATENATE LINES OF lt_data INTO lv_str SEPARATED BY gc_newline.
+    CONCATENATE LINES OF lt_data INTO lv_str SEPARATED BY lif_defs=>gc_newline.
 
     CALL FUNCTION 'SCMS_STRING_TO_XSTRING'
       EXPORTING
@@ -169,7 +170,7 @@ CLASS lcl_gui_asset_manager IMPLEMENTATION.
 
   METHOD get_inline_images.
 
-    DATA ls_image TYPE ty_web_asset.
+    DATA ls_image TYPE lif_defs=>ty_web_asset.
 
 * see https://github.com/larshp/abapGit/issues/201 for source SVG
     ls_image-url     = 'img/logo' ##NO_TEXT.
@@ -262,7 +263,7 @@ CLASS lcl_gui_asset_manager IMPLEMENTATION.
     rv_link = '<link rel="stylesheet"'
            && ' type="text/css" href="'
            && 'https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/font/octicons.min.css'
-           && '">'. "#EC NOTEXT
+           && '">'.                                         "#EC NOTEXT
 
   ENDMETHOD.  " get_webfont_link
 
diff --git a/src/zabapgit_gui_router.prog.abap b/src/zabapgit_gui_router.prog.abap
index 8d2c1cbc2..1c7a0b009 100644
--- a/src/zabapgit_gui_router.prog.abap
+++ b/src/zabapgit_gui_router.prog.abap
@@ -67,167 +67,174 @@ CLASS lcl_gui_router IMPLEMENTATION.
     DATA: lv_url  TYPE string,
           lv_key  TYPE lcl_persistence_repo=>ty_repo-key,
           ls_db   TYPE lcl_persistence_db=>ty_content,
-          ls_item TYPE ty_item.
+          ls_item TYPE lif_defs=>ty_item.
 
     lv_key = iv_getdata. " TODO refactor
     lv_url = iv_getdata. " TODO refactor
 
     CASE iv_action.
         " General PAGE routing
-      WHEN gc_action-go_main                          " Go Main page
-          OR gc_action-go_explore                     " Go Explore page
-          OR gc_action-go_db                          " Go DB util page
-          OR gc_action-go_background_run              " Go background run page
-          OR gc_action-go_debuginfo                   " Go debug info page
-          OR gc_action-go_settings.                   " Go settings page
+      WHEN lif_defs=>gc_action-go_main                          " Go Main page
+          OR lif_defs=>gc_action-go_explore                     " Go Explore page
+          OR lif_defs=>gc_action-go_db                          " Go DB util page
+          OR lif_defs=>gc_action-go_debuginfo                   " Go debug info page
+          OR lif_defs=>gc_action-go_settings.                   " Go settings page
         ei_page  = get_page_by_name( iv_action ).
-        ev_state = gc_event_state-new_page.
-      WHEN gc_action-go_background.                   " Go Background page
+        ev_state = lif_defs=>gc_event_state-new_page.
+      WHEN lif_defs=>gc_action-go_background_run.              " Go background run page
+        CREATE OBJECT ei_page TYPE lcl_gui_page_bkg_run.
+        ev_state = lif_defs=>gc_event_state-new_page.
+      WHEN lif_defs=>gc_action-go_background.                   " Go Background page
         ei_page  = get_page_background( lv_key ).
-        ev_state = gc_event_state-new_page.
-      WHEN gc_action-go_diff.                         " Go Diff page
+        ev_state = lif_defs=>gc_event_state-new_page.
+      WHEN lif_defs=>gc_action-go_diff.                         " Go Diff page
         ei_page  = get_page_diff(
           iv_getdata   = iv_getdata
           iv_prev_page = iv_prev_page ).
-        ev_state = gc_event_state-new_page_w_bookmark.
-      WHEN gc_action-go_stage.                        " Go Staging page
+        ev_state = lif_defs=>gc_event_state-new_page_w_bookmark.
+      WHEN lif_defs=>gc_action-go_stage.                        " Go Staging page
         ei_page  = get_page_stage( iv_getdata ).
         IF iv_prev_page = 'PAGE_DIFF'.
-          ev_state = gc_event_state-new_page.
+          ev_state = lif_defs=>gc_event_state-new_page.
         ELSE.
-          ev_state = gc_event_state-new_page_w_bookmark.
+          ev_state = lif_defs=>gc_event_state-new_page_w_bookmark.
         ENDIF.
-      WHEN gc_action-go_branch_overview.              " Go repo branch overview
+      WHEN lif_defs=>gc_action-go_branch_overview.              " Go repo branch overview
         ei_page  = get_page_branch_overview( iv_getdata ).
-        ev_state = gc_event_state-new_page.
-      WHEN gc_action-go_playground.                   " Create playground page
+        ev_state = lif_defs=>gc_event_state-new_page.
+      WHEN lif_defs=>gc_action-go_playground.                   " Create playground page
         ei_page  = get_page_playground( ).
-        ev_state = gc_event_state-new_page.
-      WHEN gc_action-go_tutorial.                     " Go to tutorial
+        ev_state = lif_defs=>gc_event_state-new_page.
+      WHEN lif_defs=>gc_action-go_tutorial.                     " Go to tutorial
         lcl_app=>user( )->set_repo_show( '' ).        " Clear show_id
-        ev_state = gc_event_state-re_render.          " Assume we are on main page
+        ev_state = lif_defs=>gc_event_state-re_render.          " Assume we are on main page
 
         " SAP GUI actions
-      WHEN gc_action-jump.                          " Open object editor
+      WHEN lif_defs=>gc_action-jump.                          " Open object editor
         lcl_html_action_utils=>jump_decode(
           EXPORTING iv_string   = iv_getdata
           IMPORTING ev_obj_type = ls_item-obj_type
                     ev_obj_name = ls_item-obj_name ).
         lcl_objects=>jump( ls_item ).
-        ev_state = gc_event_state-no_more_act.
-      WHEN gc_action-jump_pkg.                      " Open SE80
+        ev_state = lif_defs=>gc_event_state-no_more_act.
+      WHEN lif_defs=>gc_action-jump_pkg.                      " Open SE80
         lcl_services_repo=>open_se80( |{ iv_getdata }| ).
-        ev_state = gc_event_state-no_more_act.
+        ev_state = lif_defs=>gc_event_state-no_more_act.
 
         " DB actions
-      WHEN gc_action-db_display OR gc_action-db_edit. " DB Display/Edit
-        ei_page  = get_page_db_by_name( iv_name = iv_action  iv_getdata = iv_getdata ).
-        ev_state = gc_event_state-new_page.
-        IF iv_prev_page = 'PAGE_DB_DISPLAY'.
-          ev_state = gc_event_state-new_page_replacing.
+      WHEN lif_defs=>gc_action-db_edit.
+        ei_page = get_page_db_by_name( iv_name    = iv_action
+                                       iv_getdata = iv_getdata ).
+        ev_state = lif_defs=>gc_event_state-new_page.
+        IF iv_prev_page = 'PAGE_DB_DIS'.
+          ev_state = lif_defs=>gc_event_state-new_page_replacing.
         ENDIF.
-      WHEN gc_action-db_delete.                       " DB Delete
+      WHEN lif_defs=>gc_action-db_display.
+        ei_page = get_page_db_by_name( iv_name    = 'DB_DIS'
+                                       iv_getdata = iv_getdata ).
+        ev_state = lif_defs=>gc_event_state-new_page.
+      WHEN lif_defs=>gc_action-db_delete.                       " DB Delete
         ls_db = lcl_html_action_utils=>dbkey_decode( iv_getdata ).
         lcl_services_db=>delete( ls_db ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-db_update.                       " DB Update
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-db_update.                       " DB Update
         ls_db = lcl_html_action_utils=>dbcontent_decode( it_postdata ).
         lcl_services_db=>update( ls_db ).
-        ev_state = gc_event_state-go_back.
+        ev_state = lif_defs=>gc_event_state-go_back.
 
         " ABAPGIT services actions
-      WHEN gc_action-abapgit_home.                    " Go abapGit homepage
+      WHEN lif_defs=>gc_action-abapgit_home.                    " Go abapGit homepage
         lcl_services_abapgit=>open_abapgit_homepage( ).
-        ev_state = gc_event_state-no_more_act.
-      WHEN gc_action-abapgit_wiki.                    " Go abapGit wikipage
+        ev_state = lif_defs=>gc_event_state-no_more_act.
+      WHEN lif_defs=>gc_action-abapgit_wiki.                    " Go abapGit wikipage
         lcl_services_abapgit=>open_abapgit_wikipage( ).
-        ev_state = gc_event_state-no_more_act.
-      WHEN gc_action-abapgit_install.                 " Install abapGit
+        ev_state = lif_defs=>gc_event_state-no_more_act.
+      WHEN lif_defs=>gc_action-abapgit_install.                 " Install abapGit
         lcl_services_abapgit=>install_abapgit( ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-abapgit_install_pi.              " Install abapGit plugins
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-abapgit_install_pi.              " Install abapGit plugins
         lcl_services_abapgit=>install_abapgit_pi( ).
-        ev_state = gc_event_state-re_render.
+        ev_state = lif_defs=>gc_event_state-re_render.
 
         " REPOSITORY services actions
-      WHEN gc_action-repo_newoffline.                 " New offline repo
+      WHEN lif_defs=>gc_action-repo_newoffline.                 " New offline repo
         lcl_services_repo=>new_offline( ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_refresh.                    " Repo refresh
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_refresh.                    " Repo refresh
         lcl_services_repo=>refresh( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_purge.                      " Repo remove & purge all objects
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_purge.                      " Repo remove & purge all objects
         lcl_services_repo=>purge( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_remove.                     " Repo remove
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_remove.                     " Repo remove
         lcl_services_repo=>remove( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_clone OR 'install'.    " Repo clone, 'install' is for explore page
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_clone OR 'install'.    " Repo clone, 'install' is for explore page
         lcl_services_repo=>clone( lv_url ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_refresh_checksums.          " Rebuil local checksums
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_refresh_checksums.          " Rebuil local checksums
         lcl_services_repo=>refresh_local_checksums( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_toggle_fav.                 " Toggle repo as favorite
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_toggle_fav.                 " Toggle repo as favorite
         lcl_services_repo=>toggle_favorite( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_transport_to_branch.
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_transport_to_branch.
         lcl_services_repo=>transport_to_branch( iv_repository_key = lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_settings.
-        CREATE OBJECT ei_page TYPE lcl_gui_page_repo_settings
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_settings.
+        CREATE OBJECT ei_page TYPE lcl_gui_page_repo_sett
           EXPORTING
             io_repo = lcl_app=>repo_srv( )->get( lv_key ).
-        ev_state = gc_event_state-new_page.
+        ev_state = lif_defs=>gc_event_state-new_page.
 
         " ZIP services actions
-      WHEN gc_action-zip_import.                      " Import repo from ZIP
+      WHEN lif_defs=>gc_action-zip_import.                      " Import repo from ZIP
         lcl_zip=>import( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-zip_export.                      " Export repo as ZIP
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-zip_export.                      " Export repo as ZIP
         lcl_zip=>export( lcl_app=>repo_srv( )->get( lv_key ) ).
-        ev_state = gc_event_state-no_more_act.
-      WHEN gc_action-zip_package.                     " Export package as ZIP
+        ev_state = lif_defs=>gc_event_state-no_more_act.
+      WHEN lif_defs=>gc_action-zip_package.                     " Export package as ZIP
         lcl_zip=>export_package( ).
-        ev_state = gc_event_state-no_more_act.
-      WHEN gc_action-zip_transport.                   " Export transport as ZIP
+        ev_state = lif_defs=>gc_event_state-no_more_act.
+      WHEN lif_defs=>gc_action-zip_transport.                   " Export transport as ZIP
         lcl_transport=>zip( ).
-        ev_state = gc_event_state-no_more_act.
-      WHEN gc_action-zip_object.                      " Export object as ZIP
+        ev_state = lif_defs=>gc_event_state-no_more_act.
+      WHEN lif_defs=>gc_action-zip_object.                      " Export object as ZIP
         lcl_zip=>export_object( ).
-        ev_state = gc_event_state-no_more_act.
+        ev_state = lif_defs=>gc_event_state-no_more_act.
 
         " Remote ORIGIN manipulations
-      WHEN gc_action-repo_remote_attach.            " Remote attach
+      WHEN lif_defs=>gc_action-repo_remote_attach.            " Remote attach
         lcl_services_repo=>remote_attach( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_remote_detach.            " Remote detach
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_remote_detach.            " Remote detach
         lcl_services_repo=>remote_detach( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-repo_remote_change.            " Remote change
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-repo_remote_change.            " Remote change
         lcl_services_repo=>remote_change( lv_key ).
-        ev_state = gc_event_state-re_render.
+        ev_state = lif_defs=>gc_event_state-re_render.
 
         " GIT actions
-      WHEN gc_action-git_pull.                      " GIT Pull
+      WHEN lif_defs=>gc_action-git_pull.                      " GIT Pull
         lcl_services_git=>pull( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-git_reset.                     " GIT Reset
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-git_reset.                     " GIT Reset
         lcl_services_git=>reset( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-git_branch_create.             " GIT Create new branch
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-git_branch_create.             " GIT Create new branch
         lcl_services_git=>create_branch( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-git_branch_delete.             " GIT Delete remote branch
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-git_branch_delete.             " GIT Delete remote branch
         lcl_services_git=>delete_branch( lv_key ).
-        ev_state = gc_event_state-re_render.
-      WHEN gc_action-git_branch_switch.             " GIT Switch branch
+        ev_state = lif_defs=>gc_event_state-re_render.
+      WHEN lif_defs=>gc_action-git_branch_switch.             " GIT Switch branch
         lcl_services_git=>switch_branch( lv_key ).
-        ev_state = gc_event_state-re_render.
+        ev_state = lif_defs=>gc_event_state-re_render.
 
         "Others
       WHEN OTHERS.
-        ev_state = gc_event_state-not_handled.
+        ev_state = lif_defs=>gc_event_state-not_handled.
     ENDCASE.
 
   ENDMETHOD.        " on_event
@@ -273,7 +280,7 @@ CLASS lcl_gui_router IMPLEMENTATION.
   METHOD get_page_branch_overview.
 
     DATA: lo_repo TYPE REF TO lcl_repo_online,
-          lo_page TYPE REF TO lcl_gui_page_branch_overview,
+          lo_page TYPE REF TO lcl_gui_page_boverview,
           lv_key  TYPE lcl_persistence_repo=>ty_repo-key.
 
 
@@ -291,8 +298,8 @@ CLASS lcl_gui_router IMPLEMENTATION.
 
   METHOD get_page_diff.
 
-    DATA: ls_file   TYPE ty_file,
-          ls_object TYPE ty_item,
+    DATA: ls_file   TYPE lif_defs=>ty_file,
+          ls_object TYPE lif_defs=>ty_item,
           lo_page   TYPE REF TO lcl_gui_page_diff,
           lv_key    TYPE lcl_persistence_repo=>ty_repo-key.
 
@@ -346,7 +353,7 @@ CLASS lcl_gui_router IMPLEMENTATION.
 
   METHOD get_page_background.
 
-    CREATE OBJECT ri_page TYPE lcl_gui_page_background
+    CREATE OBJECT ri_page TYPE lcl_gui_page_bkg
       EXPORTING
         iv_key = iv_key.
 
diff --git a/src/zabapgit_html.prog.abap b/src/zabapgit_html.prog.abap
index f9b984e35..97802ee5a 100644
--- a/src/zabapgit_html.prog.abap
+++ b/src/zabapgit_html.prog.abap
@@ -2,10 +2,6 @@
 *&  Include           ZABAPGIT_HTML
 *&---------------------------------------------------------------------*
 
-DEFINE _add.
-  ro_html->add( &1 ) ##NO_TEXT.
-END-OF-DEFINITION.
-
 *----------------------------------------------------------------------*
 *       CLASS lcl_html DEFINITION
 *----------------------------------------------------------------------*
@@ -28,7 +24,7 @@ CLASS lcl_html DEFINITION FINAL.
       IMPORTING
         iv_txt   TYPE string
         iv_act   TYPE string
-        iv_typ   TYPE char1  DEFAULT gc_action_type-sapevent
+        iv_typ   TYPE char1  DEFAULT lif_defs=>gc_action_type-sapevent
         iv_opt   TYPE clike  OPTIONAL
         iv_class TYPE string OPTIONAL
         iv_id    TYPE string OPTIONAL
@@ -38,31 +34,30 @@ CLASS lcl_html DEFINITION FINAL.
       IMPORTING
         iv_name  TYPE string
         iv_hint  TYPE string OPTIONAL
-        iv_alt   TYPE string OPTIONAL
         iv_class TYPE string OPTIONAL.
 
     CLASS-METHODS a
       IMPORTING
-        iv_txt                TYPE string
-        iv_act                TYPE string
-        iv_typ                TYPE char1  DEFAULT gc_action_type-sapevent
-        iv_opt                TYPE clike  OPTIONAL
-        iv_class              TYPE string OPTIONAL
-        iv_id                 TYPE string OPTIONAL
-        iv_style              TYPE string OPTIONAL
+                iv_txt        TYPE string
+                iv_act        TYPE string
+                iv_typ        TYPE char1  DEFAULT lif_defs=>gc_action_type-sapevent
+                iv_opt        TYPE clike  OPTIONAL
+                iv_class      TYPE string OPTIONAL
+                iv_id         TYPE string OPTIONAL
+                iv_style      TYPE string OPTIONAL
       RETURNING VALUE(rv_str) TYPE string.
 
     CLASS-METHODS icon
       IMPORTING
-        iv_name               TYPE string
-        iv_hint               TYPE string OPTIONAL
-        iv_alt                TYPE string OPTIONAL
-        iv_class              TYPE string OPTIONAL
+                iv_name       TYPE string
+                iv_hint       TYPE string OPTIONAL
+                iv_class      TYPE string OPTIONAL
       RETURNING VALUE(rv_str) TYPE string.
 
   PRIVATE SECTION.
-    CLASS-DATA go_single_tags_re TYPE REF TO cl_abap_regex.
-    DATA       mt_buffer         TYPE string_table.
+    CLASS-DATA: go_single_tags_re TYPE REF TO cl_abap_regex.
+
+    DATA: mt_buffer TYPE string_table.
 
     TYPES:
       BEGIN OF ty_indent_context,
@@ -74,15 +69,15 @@ CLASS lcl_html DEFINITION FINAL.
       END OF ty_indent_context,
 
       BEGIN OF ty_study_result,
-        style_open    TYPE abap_bool,
-        style_close   TYPE abap_bool,
-        script_open   TYPE abap_bool,
-        script_close  TYPE abap_bool,
-        tag_close     TYPE abap_bool,
-        curly_close   TYPE abap_bool,
-        openings      TYPE i,
-        closings      TYPE i,
-        singles       TYPE i,
+        style_open   TYPE abap_bool,
+        style_close  TYPE abap_bool,
+        script_open  TYPE abap_bool,
+        script_close TYPE abap_bool,
+        tag_close    TYPE abap_bool,
+        curly_close  TYPE abap_bool,
+        openings     TYPE i,
+        closings     TYPE i,
+        singles      TYPE i,
       END OF ty_study_result.
 
     METHODS indent_line
@@ -91,9 +86,8 @@ CLASS lcl_html DEFINITION FINAL.
         cv_line    TYPE string.
 
     METHODS study_line
-      IMPORTING
-        iv_line                  TYPE string
-        is_context               TYPE ty_indent_context
+      IMPORTING iv_line          TYPE string
+                is_context       TYPE ty_indent_context
       RETURNING VALUE(rs_result) TYPE ty_study_result.
 
 ENDCLASS.                    "lcl_html DEFINITION
@@ -108,8 +102,7 @@ CLASS lcl_html IMPLEMENTATION.
     DATA: lv_type TYPE c,
           lo_html TYPE REF TO lcl_html.
 
-    FIELD-SYMBOLS: <tab> TYPE string_table,
-                   <str> LIKE LINE OF <tab>.
+    FIELD-SYMBOLS: <tab> TYPE string_table.
 
     DESCRIBE FIELD iv_chunk TYPE lv_type. " Describe is faster than RTTI classes
 
@@ -268,7 +261,7 @@ CLASS lcl_html IMPLEMENTATION.
       indent_line( CHANGING cs_context = ls_context cv_line = <line_c> ).
     ENDLOOP.
 
-    CONCATENATE LINES OF lt_temp INTO rv_html SEPARATED BY gc_newline.
+    CONCATENATE LINES OF lt_temp INTO rv_html SEPARATED BY lif_defs=>gc_newline.
 
   ENDMETHOD.                    "render
 
@@ -294,13 +287,13 @@ CLASS lcl_html IMPLEMENTATION.
 
     lv_class = iv_class.
 
-    IF iv_opt CA gc_html_opt-strong.
+    IF iv_opt CA lif_defs=>gc_html_opt-strong.
       lv_class = lv_class && ' emphasis' ##NO_TEXT.
     ENDIF.
-    IF iv_opt CA gc_html_opt-cancel.
+    IF iv_opt CA lif_defs=>gc_html_opt-cancel.
       lv_class = lv_class && ' attention' ##NO_TEXT.
     ENDIF.
-    IF iv_opt CA gc_html_opt-crossout.
+    IF iv_opt CA lif_defs=>gc_html_opt-crossout.
       lv_class = lv_class && ' crossout grey' ##NO_TEXT.
     ENDIF.
     IF lv_class IS NOT INITIAL.
@@ -309,16 +302,16 @@ CLASS lcl_html IMPLEMENTATION.
     ENDIF.
 
     lv_href  = ' href="#"'. " Default, dummy
-    IF iv_act IS NOT INITIAL OR iv_typ = gc_action_type-dummy.
+    IF iv_act IS NOT INITIAL OR iv_typ = lif_defs=>gc_action_type-dummy.
       CASE iv_typ.
-        WHEN gc_action_type-url.
+        WHEN lif_defs=>gc_action_type-url.
           lv_href  = | href="{ iv_act }"|.
-        WHEN gc_action_type-sapevent.
+        WHEN lif_defs=>gc_action_type-sapevent.
           lv_href  = | href="sapevent:{ iv_act }"|.
-        WHEN gc_action_type-onclick.
+        WHEN lif_defs=>gc_action_type-onclick.
           lv_href  = ' href="#"'.
           lv_click = | onclick="{ iv_act }"|.
-        WHEN gc_action_type-dummy.
+        WHEN lif_defs=>gc_action_type-dummy.
           lv_href  = ' href="#"'.
       ENDCASE.
     ENDIF.
@@ -339,7 +332,6 @@ CLASS lcl_html IMPLEMENTATION.
 
     add( icon( iv_name  = iv_name
                iv_class = iv_class
-               iv_alt   = iv_alt
                iv_hint  = iv_hint ) ).
 
   ENDMETHOD.                    "add_icon
@@ -383,7 +375,7 @@ CLASS lcl_html_toolbar DEFINITION FINAL.
         IMPORTING
           iv_txt TYPE string
           io_sub TYPE REF TO lcl_html_toolbar OPTIONAL
-          iv_typ TYPE c         DEFAULT gc_action_type-sapevent
+          iv_typ TYPE c         DEFAULT lif_defs=>gc_action_type-sapevent
           iv_act TYPE string    OPTIONAL
           iv_ico TYPE string    OPTIONAL
           iv_cur TYPE abap_bool OPTIONAL
@@ -395,18 +387,18 @@ CLASS lcl_html_toolbar DEFINITION FINAL.
         RETURNING VALUE(rv_count) TYPE i,
       render
         IMPORTING
-          iv_right                  TYPE abap_bool OPTIONAL
-          iv_sort                   TYPE abap_bool OPTIONAL
+          iv_right       TYPE abap_bool OPTIONAL
+          iv_sort        TYPE abap_bool OPTIONAL
         RETURNING
-          VALUE(ro_html)            TYPE REF TO lcl_html,
+          VALUE(ro_html) TYPE REF TO lcl_html,
       render_as_droplist
         IMPORTING
-          iv_label        TYPE string
-          iv_right        TYPE abap_bool OPTIONAL
-          iv_sort         TYPE abap_bool OPTIONAL
-          iv_corner       TYPE abap_bool OPTIONAL
+          iv_label       TYPE string
+          iv_right       TYPE abap_bool OPTIONAL
+          iv_sort        TYPE abap_bool OPTIONAL
+          iv_corner      TYPE abap_bool OPTIONAL
         RETURNING
-          VALUE(ro_html)  TYPE REF TO lcl_html.
+          VALUE(ro_html) TYPE REF TO lcl_html.
 
   PRIVATE SECTION.
     TYPES:
@@ -431,9 +423,9 @@ CLASS lcl_html_toolbar DEFINITION FINAL.
     METHODS:
       render_items
         IMPORTING
-          iv_sort                   TYPE abap_bool OPTIONAL
+          iv_sort        TYPE abap_bool OPTIONAL
         RETURNING
-          VALUE(ro_html)            TYPE REF TO lcl_html.
+          VALUE(ro_html) TYPE REF TO lcl_html.
 
 ENDCLASS. "lcl_html_toolbar DEFINITION
 
@@ -453,9 +445,9 @@ CLASS lcl_html_toolbar IMPLEMENTATION.
   METHOD add.
     DATA ls_item TYPE ty_item.
 
-    ASSERT iv_typ = gc_action_type-separator  " sep doesn't have action
-      OR iv_typ = gc_action_type-onclick      " click may have no action (assigned in JS)
-      OR iv_typ = gc_action_type-dummy        " dummy may have no action
+    ASSERT iv_typ = lif_defs=>gc_action_type-separator  " sep doesn't have action
+      OR iv_typ = lif_defs=>gc_action_type-onclick      " click may have no action (assigned in JS)
+      OR iv_typ = lif_defs=>gc_action_type-dummy        " dummy may have no action
       OR iv_act IS INITIAL AND io_sub IS NOT INITIAL
       OR iv_act IS NOT INITIAL AND io_sub IS INITIAL. " Only one supplied
 
@@ -510,7 +502,7 @@ CLASS lcl_html_toolbar IMPLEMENTATION.
     ro_html->add( |<div class="{ lv_class }">| ).
     ro_html->add( '<ul><li>' ).
     ro_html->add_a( iv_txt = iv_label
-                    iv_typ = gc_action_type-dummy
+                    iv_typ = lif_defs=>gc_action_type-dummy
                     iv_act = '' ).
     ro_html->add( '<div class="minizone"></div>' ).
     ro_html->add( render_items( iv_sort = iv_sort ) ).
@@ -553,7 +545,7 @@ CLASS lcl_html_toolbar IMPLEMENTATION.
     LOOP AT mt_items ASSIGNING <item>.
       CLEAR: lv_class, lv_icon.
 
-      IF <item>-typ = gc_action_type-separator.
+      IF <item>-typ = lif_defs=>gc_action_type-separator.
         ro_html->add( |<li class="separator">{ <item>-txt }</li>| ).
         CONTINUE.
       ENDIF.
@@ -587,7 +579,7 @@ CLASS lcl_html_toolbar IMPLEMENTATION.
                         iv_opt   = <item>-opt ).
       ELSE.
         ro_html->add_a( iv_txt   = lv_icon && <item>-txt
-                        iv_typ   = gc_action_type-dummy
+                        iv_typ   = lif_defs=>gc_action_type-dummy
                         iv_act   = ''
                         iv_id    = <item>-id
                         iv_opt   = <item>-opt ).
diff --git a/src/zabapgit_html_action_utils.prog.abap b/src/zabapgit_html_action_utils.prog.abap
index f560272e3..905fb4b15 100644
--- a/src/zabapgit_html_action_utils.prog.abap
+++ b/src/zabapgit_html_action_utils.prog.abap
@@ -80,7 +80,7 @@ CLASS lcl_html_action_utils DEFINITION FINAL.
 
     CLASS-METHODS decode_bg_update
       IMPORTING iv_getdata       TYPE clike
-      RETURNING VALUE(rs_fields) TYPE lcl_persistence_background=>ty_background.
+      RETURNING VALUE(rs_fields) TYPE lcl_persist_background=>ty_background.
 
     CLASS-METHODS stage_decode
       IMPORTING iv_getdata TYPE clike
@@ -302,7 +302,8 @@ CLASS lcl_html_action_utils IMPLEMENTATION.
     CLEAR es_fields.
 
     CONCATENATE LINES OF it_postdata INTO lv_string.
-    REPLACE ALL OCCURRENCES OF gc_newline IN lv_string WITH lc_replace.
+    REPLACE ALL OCCURRENCES OF lif_defs=>gc_crlf    IN lv_string WITH lc_replace.
+    REPLACE ALL OCCURRENCES OF lif_defs=>gc_newline IN lv_string WITH lc_replace.
     lt_fields = parse_fields( lv_string ).
 
     get_field( EXPORTING name = 'COMMITTER_NAME'  it = lt_fields CHANGING cv = es_fields ).
@@ -314,7 +315,7 @@ CLASS lcl_html_action_utils IMPLEMENTATION.
 
     ASSIGN COMPONENT 'BODY' OF STRUCTURE es_fields TO <body>.
     ASSERT <body> IS ASSIGNED.
-    REPLACE ALL OCCURRENCES OF lc_replace IN <body> WITH gc_newline.
+    REPLACE ALL OCCURRENCES OF lc_replace IN <body> WITH lif_defs=>gc_newline.
 
     ASSERT es_fields IS NOT INITIAL.
 
diff --git a/src/zabapgit_html_chunks.prog.abap b/src/zabapgit_html_chunks.prog.abap
index de94e6cca..bae2b2983 100644
--- a/src/zabapgit_html_chunks.prog.abap
+++ b/src/zabapgit_html_chunks.prog.abap
@@ -7,9 +7,9 @@ CLASS lcl_gui_chunk_lib DEFINITION FINAL.
   PUBLIC SECTION.
 
     CLASS-METHODS render_error
-        IMPORTING ix_error       TYPE REF TO lcx_exception OPTIONAL
-                  iv_error       TYPE string OPTIONAL
-        RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
+        IMPORTING ix_error            TYPE REF TO lcx_exception OPTIONAL
+                  iv_error            TYPE string OPTIONAL
+        RETURNING VALUE(ro_html)      TYPE REF TO lcl_html.
 
     CLASS-METHODS render_repo_top
       IMPORTING io_repo               TYPE REF TO lcl_repo
@@ -17,13 +17,14 @@ CLASS lcl_gui_chunk_lib DEFINITION FINAL.
                 iv_show_branch        TYPE abap_bool DEFAULT abap_true
                 iv_interactive_branch TYPE abap_bool DEFAULT abap_false
                 iv_branch             TYPE string OPTIONAL
+                io_news               TYPE REF TO lcl_news OPTIONAL
       RETURNING VALUE(ro_html)        TYPE REF TO lcl_html
       RAISING   lcx_exception.
 
     CLASS-METHODS render_item_state
-        IMPORTING iv1            TYPE char1
-                  iv2            TYPE char1
-        RETURNING VALUE(rv_html) TYPE string.
+        IMPORTING iv1                 TYPE char1
+                  iv2                 TYPE char1
+        RETURNING VALUE(rv_html)      TYPE string.
 
     CLASS-METHODS render_branch_span
       IMPORTING iv_branch             TYPE string
@@ -36,6 +37,12 @@ CLASS lcl_gui_chunk_lib DEFINITION FINAL.
       RETURNING VALUE(ro_html)        TYPE REF TO lcl_html
       RAISING   lcx_exception.
 
+    CLASS-METHODS render_news
+      IMPORTING
+                io_news               TYPE REF TO lcl_news
+      RETURNING VALUE(ro_html)        TYPE REF TO lcl_html
+      RAISING   lcx_exception.
+
 ENDCLASS. "lcl_gui_chunk_lib
 
 CLASS lcl_gui_chunk_lib IMPLEMENTATION.
@@ -43,7 +50,7 @@ CLASS lcl_gui_chunk_lib IMPLEMENTATION.
   METHOD render_repo_top.
 
     DATA: lo_repo_online TYPE REF TO lcl_repo_online,
-          lo_pback       TYPE REF TO lcl_persistence_background,
+          lo_pback       TYPE REF TO lcl_persist_background,
           lv_hint        TYPE string,
           lv_icon        TYPE string.
 
@@ -62,34 +69,54 @@ CLASS lcl_gui_chunk_lib IMPLEMENTATION.
     ro_html->add( '<table class="w100"><tr>' ).
 
     ro_html->add( '<td class="repo_name">' ).
+
+    " Repo type and name
     ro_html->add_icon( iv_name = lv_icon  iv_hint = lv_hint ).
     ro_html->add( |<span class="name">{ io_repo->get_name( ) }</span>| ).
     IF io_repo->is_offline( ) = abap_false.
       lo_repo_online ?= io_repo.
       ro_html->add( |<span class="url">{ lo_repo_online->get_url( ) }</span>| ).
     ENDIF.
+
+    " News
+    IF io_news IS BOUND AND io_news->has_news( ) = abap_true.
+      IF io_news->has_updates( ) = abap_true.
+        lv_icon = 'arrow-up/warning'.
+      ELSE.
+        lv_icon = 'arrow-up/grey80'.
+      ENDIF.
+      ro_html->add_a( iv_act = 'displayNews()'
+                      iv_typ = lif_defs=>gc_action_type-onclick
+                      iv_txt = lcl_html=>icon( iv_name  = lv_icon
+                                               iv_class = 'pad-sides'
+                                               iv_hint  = 'Display changelog' ) ).
+    ENDIF.
     ro_html->add( '</td>' ).
 
     ro_html->add( '<td class="repo_attr right">' ).
 
+    " Fav
     IF abap_true = lcl_app=>user( )->is_favorite_repo( io_repo->get_key( ) ).
       lv_icon = 'star/blue' ##NO_TEXT.
     ELSE.
       lv_icon = 'star/grey' ##NO_TEXT.
     ENDIF.
-    ro_html->add_a( iv_act = |{ gc_action-repo_toggle_fav }?{ io_repo->get_key( ) }|
+    ro_html->add_a( iv_act = |{ lif_defs=>gc_action-repo_toggle_fav }?{ io_repo->get_key( ) }|
                     iv_txt = lcl_html=>icon( iv_name  = lv_icon
                                              iv_class = 'pad-sides'
                                              iv_hint  = 'Click to toggle favorite' ) ).
 
+    " BG
     IF lo_pback->exists( io_repo->get_key( ) ) = abap_true.
       ro_html->add( '<span class="bg_marker" title="background">BG</span>' ).
     ENDIF.
 
+    " Write protect
     IF io_repo->is_write_protected( ) = abap_true.
       ro_html->add_icon( iv_name = 'lock/darkgrey' iv_hint = 'Locked from pulls' ).
     ENDIF.
 
+    " Branch
     IF io_repo->is_offline( ) = abap_false.
       lo_repo_online ?= io_repo.
       IF iv_show_branch = abap_true.
@@ -105,11 +132,12 @@ CLASS lcl_gui_chunk_lib IMPLEMENTATION.
       ENDIF.
     ENDIF.
 
+    " Package
     IF iv_show_package = abap_true.
       ro_html->add_icon( iv_name = 'package/darkgrey' iv_hint = 'SAP package' ).
       ro_html->add( '<span>' ).
       ro_html->add_a( iv_txt = io_repo->get_package( )
-                      iv_act = |{ gc_action-jump_pkg }?{ io_repo->get_package( ) }| ).
+                      iv_act = |{ lif_defs=>gc_action-jump_pkg }?{ io_repo->get_package( ) }| ).
       ro_html->add( '</span>' ).
     ENDIF.
 
@@ -138,19 +166,19 @@ CLASS lcl_gui_chunk_lib IMPLEMENTATION.
       ENDCASE.
 
       CASE <state>.
-        WHEN gc_state-unchanged.  "None or unchanged
-          IF iv1 = gc_state-added OR iv2 = gc_state-added.
+        WHEN lif_defs=>gc_state-unchanged.  "None or unchanged
+          IF iv1 = lif_defs=>gc_state-added OR iv2 = lif_defs=>gc_state-added.
             rv_html = rv_html && |<span class="none" title="{ lv_system } Not exists">X</span>|.
           ELSE.
             rv_html = rv_html && |<span class="none" title="{ lv_system } No changes">&nbsp;</span>|.
           ENDIF.
-        WHEN gc_state-modified.   "Changed
+        WHEN lif_defs=>gc_state-modified.   "Changed
           rv_html = rv_html && |<span class="changed" title="{ lv_system } Modified">M</span>|.
-        WHEN gc_state-added.      "Added new
+        WHEN lif_defs=>gc_state-added.      "Added new
           rv_html = rv_html && |<span class="added" title="{ lv_system } Added new">A</span>|.
-        WHEN gc_state-mixed.      "Multiple changes (multifile)
+        WHEN lif_defs=>gc_state-mixed.      "Multiple changes (multifile)
           rv_html = rv_html && |<span class="mixed" title="{ lv_system } Multiple changes">&#x25A0;</span>|.
-        WHEN gc_state-deleted.    "Deleted
+        WHEN lif_defs=>gc_state-deleted.    "Deleted
           rv_html = rv_html && |<span class="deleted" title="{ lv_system } Deleted">D</span>|.
       ENDCASE.
     ENDDO.
@@ -179,7 +207,7 @@ CLASS lcl_gui_chunk_lib IMPLEMENTATION.
     ro_html->add( |<span class="{ lv_class }">| ).
     ro_html->add_icon( iv_name = 'git-branch/darkgrey' iv_hint = 'Current branch' ).
     IF iv_interactive = abap_true.
-      ro_html->add_a( iv_act = |{ gc_action-git_branch_switch }?{ io_repo->get_key( ) }|
+      ro_html->add_a( iv_act = |{ lif_defs=>gc_action-git_branch_switch }?{ io_repo->get_key( ) }|
                       iv_txt = lv_text ).
     ELSE.
       ro_html->add( lv_text ).
@@ -215,4 +243,64 @@ CLASS lcl_gui_chunk_lib IMPLEMENTATION.
     ro_html->add( '</div>' ).
   ENDMETHOD. "render_js_error_stub
 
+  METHOD render_news.
+
+    DATA: lv_text    TYPE string,
+          lv_display TYPE string,
+          lt_log     TYPE lcl_news=>tt_log.
+
+    FIELD-SYMBOLS: <line> LIKE LINE OF lt_log.
+
+    CREATE OBJECT ro_html.
+
+    IF io_news IS NOT BOUND OR io_news->has_news( ) = abap_false.
+      RETURN.
+    ENDIF.
+
+    lt_log = io_news->get_log( ).
+
+    IF io_news->has_unseen( ) = abap_false.
+      lv_display = 'display:none'.
+    ENDIF.
+
+    ro_html->add( |<div id="news" class="news" style="{ lv_display }">| ).
+
+    ro_html->add( '<div class="headbar title">Announcement of the latest changes'
+               && '<div class="float-right">'
+               && lcl_html=>a(
+                    iv_txt   = '&#x274c;'
+                    iv_typ   = lif_defs=>gc_action_type-onclick
+                    iv_act   = 'displayNews()'
+                    iv_class = 'close-btn' )
+               && '</div></div>' ).
+
+    IF io_news->has_important( ) = abap_true.
+      ro_html->add( '<div class="headbar important">'
+        && lcl_html=>icon( iv_name = 'alert' iv_class = 'pad-right' )
+        && 'Please note changes marked with "!"'
+        && '</div>' ).
+    ENDIF.
+
+    " Generate news
+    ro_html->add( |<div class="newslist">| ).
+    LOOP AT lt_log ASSIGNING <line>.
+      IF <line>-is_header = abap_true.
+        IF <line>-pos_to_cur > 0.
+          lv_text = <line>-text && '<span class="version-marker update">update</span>'.
+        ELSEIF <line>-pos_to_cur = 0.
+          lv_text = <line>-text && '<span class="version-marker">current</span>'.
+        ELSE. " < 0
+          lv_text = <line>-text.
+        ENDIF.
+        ro_html->add( |<h1>{ lv_text }</h1>| ).
+      ELSE.
+        ro_html->add( |<li>{ <line>-text }</li>| ).
+      ENDIF.
+    ENDLOOP.
+    ro_html->add( '</div>' ).
+
+    ro_html->add( '</div>' ).
+
+  ENDMETHOD. "render_news
+
 ENDCLASS. "lcl_gui_chunk_lib
diff --git a/src/zabapgit_http.prog.abap b/src/zabapgit_http.prog.abap
index 9cfaba173..72d64fc30 100644
--- a/src/zabapgit_http.prog.abap
+++ b/src/zabapgit_http.prog.abap
@@ -2,20 +2,68 @@
 *&  Include           ZABAPGIT_HTTP
 *&---------------------------------------------------------------------*
 
+CLASS lcl_proxy_auth DEFINITION FINAL.
+
+  PUBLIC SECTION.
+    CLASS-METHODS:
+      run
+        IMPORTING ii_client TYPE REF TO if_http_client
+        RAISING   lcx_exception.
+
+  PRIVATE SECTION.
+    CLASS-DATA: gv_username TYPE string,
+                gv_password TYPE string.
+
+    CLASS-METHODS: enter RAISING lcx_exception.
+
+ENDCLASS.
+
+CLASS lcl_proxy_auth IMPLEMENTATION.
+
+  METHOD run.
+
+    IF gv_username IS INITIAL OR gv_password IS INITIAL.
+      enter( ).
+    ENDIF.
+
+    ii_client->authenticate(
+      proxy_authentication = abap_true
+      username             = gv_username
+      password             = gv_password ).
+
+  ENDMETHOD.
+
+  METHOD enter.
+
+    lcl_password_dialog=>popup(
+      EXPORTING
+        iv_repo_url = 'Proxy Authentication'
+      CHANGING
+        cv_user     = gv_username
+        cv_pass     = gv_password ).
+
+    IF gv_username IS INITIAL OR gv_password IS INITIAL.
+      lcx_exception=>raise( 'Proxy auth failed' ).
+    ENDIF.
+
+  ENDMETHOD.
+
+ENDCLASS.
+
 CLASS lcl_http_digest DEFINITION FINAL.
 
   PUBLIC SECTION.
     METHODS:
       constructor
         IMPORTING
-          ii_client TYPE REF TO if_http_client
-          iv_username TYPE string
-          iv_password TYPE string
-        RAISING lcx_exception,
+                  ii_client   TYPE REF TO if_http_client
+                  iv_username TYPE string
+                  iv_password TYPE string
+        RAISING   lcx_exception,
       run
         IMPORTING
-          ii_client TYPE REF TO if_http_client
-        RAISING lcx_exception.
+                  ii_client TYPE REF TO if_http_client
+        RAISING   lcx_exception.
 
   PRIVATE SECTION.
     DATA: mv_ha1      TYPE string,
@@ -29,22 +77,22 @@ CLASS lcl_http_digest DEFINITION FINAL.
     CLASS-METHODS:
       md5
         IMPORTING
-          iv_data        TYPE string
+                  iv_data        TYPE string
         RETURNING
-          VALUE(rv_hash) TYPE string
-        RAISING lcx_exception.
+                  VALUE(rv_hash) TYPE string
+        RAISING   lcx_exception.
 
     METHODS:
       hash
         IMPORTING
-          iv_qop             TYPE string
-          iv_nonce           TYPE string
-          iv_uri             TYPE string
-          iv_method          TYPE string
-          iv_cnonse          TYPE string
+                  iv_qop             TYPE string
+                  iv_nonce           TYPE string
+                  iv_uri             TYPE string
+                  iv_method          TYPE string
+                  iv_cnonse          TYPE string
         RETURNING
-          VALUE(rv_response) TYPE string
-        RAISING lcx_exception,
+                  VALUE(rv_response) TYPE string
+        RAISING   lcx_exception,
       parse
         IMPORTING
           ii_client TYPE REF TO if_http_client.
@@ -63,16 +111,16 @@ CLASS lcl_http_client DEFINITION FINAL.
         IMPORTING io_digest TYPE REF TO lcl_http_digest,
       send_receive_close
         IMPORTING
-          iv_data TYPE xstring
+                  iv_data        TYPE xstring
         RETURNING
-          VALUE(rv_data) TYPE xstring
-        RAISING lcx_exception,
+                  VALUE(rv_data) TYPE xstring
+        RAISING   lcx_exception,
       get_cdata
         RETURNING VALUE(rv_value) TYPE string,
       check_http_200
-        RAISING   lcx_exception,
+        RAISING lcx_exception,
       send_receive
-        RAISING   lcx_exception,
+        RAISING lcx_exception,
       set_headers
         IMPORTING iv_url     TYPE string
                   iv_service TYPE string
@@ -347,9 +395,9 @@ CLASS lcl_http DEFINITION FINAL.
         IMPORTING iv_url         TYPE string
         RETURNING VALUE(rv_bool) TYPE abap_bool,
       acquire_login_details
-        IMPORTING ii_client TYPE REF TO if_http_client
-                  io_client TYPE REF TO lcl_http_client
-                  iv_url    TYPE string
+        IMPORTING ii_client        TYPE REF TO if_http_client
+                  io_client        TYPE REF TO lcl_http_client
+                  iv_url           TYPE string
         RETURNING VALUE(rv_scheme) TYPE string
         RAISING   lcx_exception.
 
@@ -360,7 +408,7 @@ CLASS lcl_http IMPLEMENTATION.
   METHOD get_agent.
 
 * bitbucket require agent prefix = "git/"
-    rv_agent = 'git/abapGit-' && gc_abap_version.
+    rv_agent = 'git/abapGit-' && lif_defs=>gc_abap_version.
 
   ENDMETHOD.
 
@@ -369,7 +417,8 @@ CLASS lcl_http IMPLEMENTATION.
     DATA: lv_uri      TYPE string,
           lv_scheme   TYPE string,
           li_client   TYPE REF TO if_http_client,
-          lo_settings TYPE REF TO lcl_settings.
+          lo_settings TYPE REF TO lcl_settings,
+          lv_text     TYPE string.
 
 
     lo_settings = lcl_app=>settings( )->read( ).
@@ -381,7 +430,28 @@ CLASS lcl_http IMPLEMENTATION.
         proxy_host    = lo_settings->get_proxy_url( )
         proxy_service = lo_settings->get_proxy_port( )
       IMPORTING
-        client        = li_client ).
+        client        = li_client
+      EXCEPTIONS
+        argument_not_found = 1
+        plugin_not_active = 2
+        internal_error = 3
+        OTHERS = 4 ).
+    IF sy-subrc <> 0.
+      CASE sy-subrc.
+        WHEN 1.
+          " make sure:
+          " a) SSL is setup properly in STRUST
+          lv_text = 'HTTPS ARGUMENT_NOT_FOUND | STRUST/SSL Setup correct?'.
+        WHEN OTHERS.
+          lv_text = 'While creating HTTP Client'.           "#EC NOTEXT
+
+      ENDCASE.
+      lcx_exception=>raise( lv_text ).
+    ENDIF.
+
+    IF lo_settings->get_proxy_authentication( ) = abap_true.
+      lcl_proxy_auth=>run( li_client ).
+    ENDIF.
 
     CREATE OBJECT ro_client
       EXPORTING
@@ -469,10 +539,10 @@ CLASS lcl_http IMPLEMENTATION.
 
   METHOD acquire_login_details.
 
-    DATA: lv_default_user  TYPE string,
-          lv_user          TYPE string,
-          lv_pass          TYPE string,
-          lo_digest        TYPE REF TO lcl_http_digest.
+    DATA: lv_default_user TYPE string,
+          lv_user         TYPE string,
+          lv_pass         TYPE string,
+          lo_digest       TYPE REF TO lcl_http_digest.
 
 
     lv_default_user = lcl_app=>user( )->get_repo_login( iv_url ).
@@ -495,7 +565,7 @@ CLASS lcl_http IMPLEMENTATION.
     ENDIF.
 
     " Offer two factor authentication if it is available and required
-    lcl_2fa_authenticator_registry=>use_2fa_if_required(
+    lcl_2fa_auth_registry=>use_2fa_if_required(
       EXPORTING
         iv_url      = iv_url
       CHANGING
diff --git a/src/zabapgit_js_common.w3mi.data.js b/src/zabapgit_js_common.w3mi.data.js
index 4e227e2c5..15adca589 100644
--- a/src/zabapgit_js_common.w3mi.data.js
+++ b/src/zabapgit_js_common.w3mi.data.js
@@ -499,3 +499,13 @@ DiffHelper.prototype.highlightButton = function(state) {
     this.dom.filterButton.classList.remove("bgorange");
   }
 };
+
+/**********************************************************
+ * Other functions
+ **********************************************************/
+
+// News announcement
+function displayNews() {
+  var div = document.getElementById("news"); 
+  div.style.display = (div.style.display)?'':'none';  
+}
diff --git a/src/zabapgit_macros.prog.abap b/src/zabapgit_macros.prog.abap
index ddb8c245e..cf9f033a1 100644
--- a/src/zabapgit_macros.prog.abap
+++ b/src/zabapgit_macros.prog.abap
@@ -1,23 +1,3 @@
 *&---------------------------------------------------------------------*
 *&  Include           ZABAPGIT_MACROS
 *&---------------------------------------------------------------------*
-
-* Macros
-
-DEFINE _object_check_timestamp.
-  IF sy-subrc = 0 AND &1 IS NOT INITIAL AND &2 IS NOT INITIAL.
-    cl_abap_tstmp=>systemtstmp_syst2utc(
-      EXPORTING syst_date = &1
-                syst_time = &2
-      IMPORTING utc_tstmp = lv_ts ).
-    IF lv_ts < iv_timestamp.
-      rv_changed = abap_false. " Unchanged
-    ELSE.
-      rv_changed = abap_true.
-      RETURN.
-    ENDIF.
-  ELSE. " Not found? => changed
-    rv_changed = abap_true.
-    RETURN.
-  ENDIF.
-END-OF-DEFINITION.
diff --git a/src/zabapgit_migrations.prog.abap b/src/zabapgit_migrations.prog.abap
index 7c311bc7b..fe556d302 100644
--- a/src/zabapgit_migrations.prog.abap
+++ b/src/zabapgit_migrations.prog.abap
@@ -21,7 +21,7 @@ CLASS lcl_migrations IMPLEMENTATION.
   METHOD run.
 
     " Migrate STDTEXT to TABLE
-    lcl_persistence_migrate=>run( ).
+    lcl_persist_migrate=>run( ).
 
     " Rebuild local file checksums
     rebuild_local_checksums_161112( ).
@@ -34,8 +34,10 @@ CLASS lcl_migrations IMPLEMENTATION.
   METHOD local_dot_abapgit.
 
     DATA: lt_repos       TYPE lcl_repo_srv=>ty_repo_tt,
+          lv_msg         TYPE string,
           lv_shown       TYPE abap_bool,
-          lo_dot_abapgit TYPE REF TO lcl_dot_abapgit.
+          lo_dot_abapgit TYPE REF TO lcl_dot_abapgit,
+          lx_exception   TYPE REF TO lcx_exception.
 
     FIELD-SYMBOLS: <lo_repo> LIKE LINE OF lt_repos.
 
@@ -56,8 +58,28 @@ CLASS lcl_migrations IMPLEMENTATION.
                 txt2  = 'Login to remote repositories if needed'.
             lv_shown = abap_true.
           ENDIF.
-          <lo_repo>->refresh( ).
+
+          " Skip repos that cannot be fetched.
+          " Particuarly useful on systems where users do not allow
+          " everybody to fetch their repos.
+          TRY.
+              <lo_repo>->refresh( ).
+            CATCH lcx_exception INTO lx_exception.
+              lv_msg = |Please do not use the "{ <lo_repo>->get_name( ) }" repository until migrated|.
+              CALL FUNCTION 'POPUP_TO_INFORM'
+                EXPORTING
+                  titel = 'Migration has failed'
+                  txt1  = lx_exception->mv_text
+                  txt2  = lv_msg
+                  txt3  = 'You will be prompted to migrate the repository every time you run abapGit.'
+                  txt4  = 'You can safely remove the repository in its ''Advanced -> Remove'' menu.'.
+              CONTINUE.
+          ENDTRY.
+
           lo_dot_abapgit = <lo_repo>->find_remote_dot_abapgit( ).
+          IF lo_dot_abapgit IS INITIAL. " .abapgit.xml is not in the remote repo yet
+            lo_dot_abapgit = lcl_dot_abapgit=>build_default( ).
+          ENDIF.
         ENDIF.
         <lo_repo>->set_dot_abapgit( lo_dot_abapgit ).
       ENDIF.
diff --git a/src/zabapgit_news.prog.abap b/src/zabapgit_news.prog.abap
new file mode 100644
index 000000000..7a6f5a7d6
--- /dev/null
+++ b/src/zabapgit_news.prog.abap
@@ -0,0 +1,529 @@
+*&---------------------------------------------------------------------*
+*&  Include           ZABAPGIT_NEWS
+*&---------------------------------------------------------------------*
+CLASS ltcl_news DEFINITION DEFERRED.
+
+*&---------------------------------------------------------------------*
+*&       Class lcl_news
+*&---------------------------------------------------------------------*
+* Class responsible for preparation of data for news announcements
+*----------------------------------------------------------------------*
+CLASS lcl_news DEFINITION CREATE PRIVATE FRIENDS ltcl_news.
+
+  PUBLIC SECTION.
+
+    CONSTANTS: c_tail_length TYPE i VALUE 5. " Number of versions to display if no updates
+
+    TYPES:
+      BEGIN OF ty_log,
+        version      TYPE string,
+        pos_to_cur   TYPE i,
+        is_header    TYPE abap_bool,
+        is_important TYPE abap_bool,
+        text         TYPE string,
+      END OF ty_log,
+      tt_log TYPE STANDARD TABLE OF ty_log WITH DEFAULT KEY.
+
+    CLASS-METHODS:
+      create " TODO REFACTOR
+        IMPORTING io_repo            TYPE REF TO lcl_repo
+        RETURNING VALUE(ro_instance) TYPE REF TO lcl_news
+        RAISING   lcx_exception.
+
+    METHODS:
+      get_log
+        RETURNING VALUE(rt_log) TYPE tt_log,
+      latest_version
+        RETURNING VALUE(rv_version) TYPE string,
+      has_news
+        RETURNING VALUE(rv_boolean) TYPE abap_bool,
+      has_important
+        RETURNING VALUE(rv_boolean) TYPE abap_bool,
+      has_updates
+        RETURNING VALUE(rv_boolean) TYPE abap_bool,
+      has_unseen
+        RETURNING VALUE(rv_boolean) TYPE abap_bool.
+
+  PRIVATE SECTION.
+    DATA: mt_log              TYPE tt_log,
+          mv_current_version  TYPE string,
+          mv_lastseen_version TYPE string,
+          mv_latest_version   TYPE string.
+
+    METHODS:
+      constructor
+        IMPORTING iv_rawdata          TYPE xstring
+                  iv_lastseen_version TYPE string
+                  iv_current_version  TYPE string.
+
+    CLASS-METHODS:
+      version_to_numeric
+        IMPORTING iv_version        TYPE string
+        RETURNING VALUE(rv_version) TYPE i,
+      normalize_version
+        IMPORTING iv_version        TYPE string
+        RETURNING VALUE(rv_version) TYPE string,
+      compare_versions
+        IMPORTING iv_a             TYPE string
+                  iv_b             TYPE string
+        RETURNING VALUE(rv_result) TYPE i,
+      parse_line
+        IMPORTING iv_line            TYPE string
+                  iv_current_version TYPE string
+        RETURNING VALUE(rs_log)      TYPE ty_log,
+      parse
+        IMPORTING it_lines           TYPE string_table
+                  iv_current_version TYPE string
+        RETURNING VALUE(rt_log)      TYPE tt_log.
+
+ENDCLASS.               "lcl_news
+
+*----------------------------------------------------------------------*
+*       CLASS lcl_news IMPLEMENTATION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+CLASS lcl_news IMPLEMENTATION.
+
+  METHOD create. " TODO REFACTOR !
+
+    CONSTANTS: " TODO refactor
+      lc_log_path     TYPE string VALUE '/',
+      lc_log_filename TYPE string VALUE 'changelog.txt'.
+
+    DATA: lt_remote      TYPE lif_defs=>ty_files_tt,
+          lv_last_seen   TYPE string,
+          lv_url         TYPE string,
+          lo_repo_online TYPE REF TO lcl_repo_online.
+
+    FIELD-SYMBOLS <file> LIKE LINE OF lt_remote.
+
+    IF io_repo->is_offline( ) = abap_true.
+      RETURN.
+    ENDIF.
+
+    lo_repo_online ?= io_repo.
+    lv_url          = lo_repo_online->get_url( ).
+
+    " News announcement temporary restricted to abapGit only
+    IF lv_url NS '/abapGit.git'. " TODO refactor
+      RETURN.
+    ENDIF.
+
+    lv_last_seen = lcl_app=>user( )->get_repo_last_change_seen( lv_url ).
+
+    " Find changelog
+    lt_remote = io_repo->get_files_remote( ).
+    READ TABLE lt_remote ASSIGNING <file>
+      WITH KEY path = lc_log_path filename = lc_log_filename.
+
+    IF sy-subrc = 0.
+      CREATE OBJECT ro_instance
+        EXPORTING
+          iv_rawdata          = <file>-data
+          iv_current_version  = lif_defs=>gc_abap_version " TODO refactor
+          iv_lastseen_version = normalize_version( lv_last_seen ).
+    ENDIF.
+
+    IF ro_instance IS BOUND.
+      lcl_app=>user( )->set_repo_last_change_seen(
+        iv_url     = lv_url
+        iv_version = ro_instance->latest_version( ) ).
+    ENDIF.
+
+  ENDMETHOD.                    "create
+
+  METHOD constructor.
+
+    DATA: lt_lines    TYPE string_table,
+          lv_string   TYPE string,
+          ls_log_line LIKE LINE OF mt_log.
+
+    " Validate params
+    mv_current_version  = normalize_version( iv_current_version ).
+    mv_lastseen_version = normalize_version( iv_lastseen_version ).
+    IF mv_current_version IS INITIAL.
+      RETURN. " Internal format of program version is not correct -> abort parsing
+    ENDIF.
+
+    lv_string = lcl_convert=>xstring_to_string_utf8( iv_rawdata ).
+    lt_lines  = lcl_convert=>split_string( lv_string ).
+    mt_log    = parse( it_lines = lt_lines iv_current_version = mv_current_version ).
+
+    READ TABLE mt_log INTO ls_log_line INDEX 1.
+    mv_latest_version = ls_log_line-version. " Empty if not found
+
+  ENDMETHOD.                    "constructor
+
+  METHOD parse.
+
+    DATA: lv_tail                TYPE i,
+          lv_first_version_found TYPE abap_bool,
+          lv_version             TYPE string,
+          ls_log                 LIKE LINE OF rt_log.
+
+    FIELD-SYMBOLS: <line> LIKE LINE OF it_lines.
+
+    LOOP AT it_lines ASSIGNING <line>.
+      ls_log = parse_line( iv_line = <line> iv_current_version = iv_current_version ).
+
+      " Skip until first version head and Skip empty lines
+      CHECK ls_log IS NOT INITIAL AND
+            ( lv_first_version_found = abap_true OR ls_log-version IS NOT INITIAL ).
+
+      IF lv_first_version_found = abap_false.
+        lv_first_version_found = abap_true.
+        IF compare_versions( iv_a = ls_log-version iv_b = iv_current_version ) <= 0.
+          lv_tail = c_tail_length. " Display some last versions if no updates
+        ENDIF.
+      ENDIF.
+
+      IF ls_log-is_header = abap_true.
+        "Skip everything below current version or show tail news
+        IF compare_versions( iv_a = ls_log-version iv_b = iv_current_version ) <= 0.
+          IF lv_tail > 0.
+            lv_tail = lv_tail - 1.
+          ELSE.
+            EXIT.
+          ENDIF.
+        ENDIF.
+        lv_version = ls_log-version. " Save to fill news lines
+      ELSE.
+        ls_log-version = lv_version.
+      ENDIF.
+
+      APPEND ls_log TO rt_log.
+    ENDLOOP.
+
+  ENDMETHOD.                    "parse
+
+  METHOD parse_line.
+
+    CONSTANTS: lc_header_pattern TYPE string
+        VALUE '^\d{4}-\d{2}-\d{2}\s+v(\d{1,3}\.\d{1,3}\.\d{1,3})\s*$'.
+
+    DATA: lv_version TYPE string.
+
+    IF iv_line IS INITIAL OR iv_line CO ' -='.
+      RETURN. " Skip empty and markup lines
+    ENDIF.
+
+    " Check if line is a header line
+    FIND FIRST OCCURRENCE OF REGEX lc_header_pattern IN iv_line SUBMATCHES lv_version.
+    IF sy-subrc IS INITIAL.
+      lv_version        = normalize_version( lv_version ).
+      rs_log-version    = lv_version.
+      rs_log-is_header  = abap_true.
+      rs_log-pos_to_cur = compare_versions( iv_a = lv_version iv_b = iv_current_version ).
+    ELSE.
+      FIND FIRST OCCURRENCE OF REGEX '^\s*!' IN iv_line.
+      rs_log-is_important = boolc( sy-subrc IS INITIAL ). " Change is important
+    ENDIF.
+
+    rs_log-text = iv_line.
+
+  ENDMETHOD.                    "parse_line
+
+  METHOD get_log.
+    rt_log = me->mt_log.
+  ENDMETHOD.                    "get_log
+
+  METHOD latest_version.
+    rv_version = me->mv_latest_version.
+  ENDMETHOD.                    "latest_version
+
+  METHOD has_news.
+    rv_boolean = boolc( lines( mt_log ) > 0 ).
+  ENDMETHOD.                    "has_news
+
+  METHOD has_important.
+    READ TABLE mt_log WITH KEY is_important = abap_true TRANSPORTING NO FIELDS.
+    rv_boolean = boolc( sy-subrc IS INITIAL ).
+  ENDMETHOD.                    "has_important_news
+
+  METHOD has_updates.
+    rv_boolean = boolc( compare_versions(
+      iv_a = mv_latest_version
+      iv_b = mv_current_version ) > 0 ).
+  ENDMETHOD.                    "has_updates
+
+  METHOD has_unseen.
+    rv_boolean = boolc( compare_versions(
+      iv_a = mv_latest_version
+      iv_b = mv_lastseen_version ) > 0 ).
+  ENDMETHOD.                    "has_unseen
+
+  METHOD compare_versions.
+
+    DATA: lv_version_a TYPE i,
+          lv_version_b TYPE i.
+
+    " Convert versions to numeric
+    lv_version_a = version_to_numeric( iv_a ).
+    lv_version_b = version_to_numeric( iv_b ).
+
+    " Compare versions
+    IF lv_version_a > lv_version_b.
+      rv_result = 1.
+    ELSEIF lv_version_a < lv_version_b.
+      rv_result = -1.
+    ELSE.
+      rv_result = 0.
+    ENDIF.
+
+  ENDMETHOD.                    "compare_versions
+
+  METHOD normalize_version.
+
+    " Internal program version should be in format "XXX.XXX.XXX" or "vXXX.XXX.XXX"
+    CONSTANTS: lc_version_pattern TYPE string VALUE '^v?(\d{1,3}\.\d{1,3}\.\d{1,3})\s*$'.
+
+    FIND FIRST OCCURRENCE OF REGEX lc_version_pattern
+      IN iv_version SUBMATCHES rv_version.
+
+  ENDMETHOD.                    "normalize_version
+
+  METHOD version_to_numeric.
+
+    DATA: lv_major   TYPE numc4,
+          lv_minor   TYPE numc4,
+          lv_release TYPE numc4.
+
+    SPLIT iv_version AT '.' INTO lv_major lv_minor lv_release.
+
+    " Calculated value of version number, empty version will become 0 which is OK
+    rv_version = lv_major * 1000000 + lv_minor * 1000 + lv_release.
+
+  ENDMETHOD.                    "convert_version_to_numeric
+
+ENDCLASS.               "lcl_news
+
+*----------------------------------------------------------------------*
+*       CLASS ltcl_news DEFINITION
+*----------------------------------------------------------------------*
+* Definition of test class for news announcement
+*----------------------------------------------------------------------*
+CLASS ltcl_news DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS DURATION SHORT.
+
+  PRIVATE SECTION.
+
+    METHODS:
+      version_to_numeric FOR TESTING,
+      compare_versions   FOR TESTING,
+      normalize_version  FOR TESTING,
+      parse_line         FOR TESTING,
+      parse              FOR TESTING.
+
+ENDCLASS.                    "ltcl_news DEFINITION
+
+*----------------------------------------------------------------------*
+*       CLASS ltcl_news IMPLEMENTATION
+*----------------------------------------------------------------------*
+* Implementation of test class for news announcement
+*----------------------------------------------------------------------*
+CLASS ltcl_news IMPLEMENTATION.
+
+  METHOD version_to_numeric.
+
+    DATA: lv_version_exp TYPE i VALUE 1023010,
+          lv_version_act TYPE i.
+
+    lv_version_act = lcl_news=>version_to_numeric( '1.23.10' ).
+
+    cl_abap_unit_assert=>assert_equals( exp = lv_version_exp
+                                        act = lv_version_act
+                                        msg = ' Error during conversion of version to numeric value' ).
+
+  ENDMETHOD.                    "convert_version_to_numeric
+
+  METHOD compare_versions.
+
+    DATA lv_result TYPE i.
+
+    " Case 1: version A > version B
+    lv_result = lcl_news=>compare_versions( iv_a = '1.28.10' iv_b = '1.23.10' ).
+
+    cl_abap_unit_assert=>assert_equals( exp = 1
+                                        act = lv_result
+                                        msg = ' Error during comparison of versions. Case: A > B' ).
+
+    CLEAR: lv_result.
+
+    " Case 2: version A < version B
+    lv_result = lcl_news=>compare_versions( iv_a = '1.28.10' iv_b = '2.23.10' ).
+
+    cl_abap_unit_assert=>assert_equals( exp = -1
+                                        act = lv_result
+                                        msg = ' Error during comparison of versions. Case: A < B' ).
+
+    CLEAR: lv_result.
+
+    " Case 3: version A = version B
+    lv_result = lcl_news=>compare_versions( iv_a = '1.28.10' iv_b = '1.28.10' ).
+
+    cl_abap_unit_assert=>assert_equals( exp = 0
+                                        act = lv_result
+                                        msg = ' Error during comparison of versions. Case: A = B' ).
+
+  ENDMETHOD.                    "compare_versions
+
+  METHOD normalize_version.
+
+    cl_abap_unit_assert=>assert_equals(
+      act = lcl_news=>normalize_version( '1.28.10' )
+      exp = '1.28.10' ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = lcl_news=>normalize_version( 'v1.28.10' )
+      exp = '1.28.10' ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = lcl_news=>normalize_version( 'b1.28.10' )
+      exp = '' ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = lcl_news=>normalize_version( 'x.y.z' )
+      exp = '' ).
+
+  ENDMETHOD.                    "normalize_version
+
+  METHOD parse_line.
+
+    DATA: ls_log TYPE lcl_news=>ty_log.
+
+    ls_log = lcl_news=>parse_line(
+      iv_line            = '======'
+      iv_current_version = '1.26.01' ).
+    cl_abap_unit_assert=>assert_initial( ls_log ).
+
+    ls_log = lcl_news=>parse_line(
+      iv_line            = ''
+      iv_current_version = '1.26.01' ).
+    cl_abap_unit_assert=>assert_initial( ls_log ).
+
+    ls_log = lcl_news=>parse_line(
+      iv_line            = '------'
+      iv_current_version = '1.26.01' ).
+    cl_abap_unit_assert=>assert_initial( ls_log ).
+
+    CLEAR ls_log.
+    ls_log = lcl_news=>parse_line(
+      iv_line            = '2017-02-13 v1.28.0'
+      iv_current_version = '1.26.01' ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-version    exp = '1.28.0' ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-is_header  exp = abap_true ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-pos_to_cur exp = 1 ).
+
+    CLEAR ls_log.
+    ls_log = lcl_news=>parse_line(
+      iv_line            = '2017-02-13 v1.26.0'
+      iv_current_version = '1.26.01' ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-version    exp = '1.26.0' ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-is_header  exp = abap_true ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-pos_to_cur exp = -1 ).
+
+    CLEAR ls_log.
+    ls_log = lcl_news=>parse_line(
+      iv_line            = 'news'
+      iv_current_version = '1.26.01' ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-version      exp = '' ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-is_header    exp = abap_false ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-pos_to_cur   exp = 0 ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-is_important exp = abap_false ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-text         exp = 'news' ).
+
+    CLEAR ls_log.
+    ls_log = lcl_news=>parse_line(
+      iv_line            = ' ! important news'
+      iv_current_version = '1.26.01' ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-version      exp = '' ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-is_header    exp = abap_false ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-pos_to_cur   exp = 0 ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-is_important exp = abap_true ).
+    cl_abap_unit_assert=>assert_equals( act = ls_log-text         exp = ' ! important news' ).
+
+  ENDMETHOD.                    "parse_line
+
+  METHOD parse.
+
+    DEFINE _add_news_log_entry.
+      CLEAR: ls_log.
+      ls_log-version      = &1.
+      ls_log-is_header    = &2.
+      ls_log-is_important = &3.
+      ls_log-pos_to_cur   = &4.
+      ls_log-text         = &5.
+      APPEND ls_log TO lt_log_exp.
+    END-OF-DEFINITION.
+
+    DEFINE _add_news_txt_entry.
+      APPEND &1 TO lt_lines.
+    END-OF-DEFINITION.
+
+    DATA: lt_log_exp TYPE lcl_news=>tt_log,
+          lt_log_act TYPE lcl_news=>tt_log,
+          ls_log     LIKE LINE OF lt_log_exp,
+          lt_lines   TYPE string_table.
+
+    " Generate test data
+    _add_news_txt_entry '======'.
+    _add_news_txt_entry '------'.
+    _add_news_txt_entry `      `.
+    _add_news_txt_entry 'abapGit changelog'.
+    _add_news_txt_entry '2017-02-13 v1.28.0'.
+    _add_news_txt_entry '------------------'.
+    _add_news_txt_entry '+ Staging page redesigned'.
+    _add_news_txt_entry '! Support for core data services'.
+    _add_news_txt_entry `      `.
+    _add_news_txt_entry '2017-01-25 v1.27.0'.
+    _add_news_txt_entry '------------------'.
+    _add_news_txt_entry '+ Two factor authentication with github.com'.
+    _add_news_txt_entry '2017-01-25 v1.26.0'.
+
+    " Case 1
+    " Generate expected results
+    "                   VERSION  HEAD IMP POS TEXT
+    _add_news_log_entry '1.28.0' 'X'  ''  1   '2017-02-13 v1.28.0'.
+    _add_news_log_entry '1.28.0' ''   ''  0   '+ Staging page redesigned'.
+    _add_news_log_entry '1.28.0' ''   'X' 0   '! Support for core data services'.
+    _add_news_log_entry '1.27.0' 'X'  ''  1   '2017-01-25 v1.27.0'.
+    _add_news_log_entry '1.27.0' ''   ''  0   '+ Two factor authentication with github.com'.
+
+    lt_log_act = lcl_news=>parse( it_lines = lt_lines iv_current_version = '1.26.01' ).
+    cl_abap_unit_assert=>assert_equals( exp = lt_log_exp
+                                        act = lt_log_act
+                                        msg = ' Error during parsing: Case 1.' ).
+
+
+    " Case 2 (exect version match)
+    CLEAR lt_log_exp.
+    "                   VERSION  HEAD IMP UPD TEXT
+    _add_news_log_entry '1.28.0' 'X'  ''  1   '2017-02-13 v1.28.0'.
+    _add_news_log_entry '1.28.0' ''   ''  0   '+ Staging page redesigned'.
+    _add_news_log_entry '1.28.0' ''   'X' 0   '! Support for core data services'.
+
+    " Case 1. Test parsing of data
+    lt_log_act = lcl_news=>parse( it_lines = lt_lines iv_current_version = '1.27.00' ).
+    cl_abap_unit_assert=>assert_equals( exp = lt_log_exp
+                                        act = lt_log_act
+                                        msg = ' Error during parsing: Case 2.' ).
+
+    " Case 3 (display tail)
+    CLEAR lt_log_exp.
+    "                   VERSION  HEAD IMP UPD TEXT
+    _add_news_log_entry '1.28.0' 'X'  ''  0   '2017-02-13 v1.28.0'.
+    _add_news_log_entry '1.28.0' ''   ''  0   '+ Staging page redesigned'.
+    _add_news_log_entry '1.28.0' ''   'X' 0   '! Support for core data services'.
+    _add_news_log_entry '1.27.0' 'X'  ''  -1  '2017-01-25 v1.27.0'.
+    _add_news_log_entry '1.27.0' ''   ''  0   '+ Two factor authentication with github.com'.
+    _add_news_log_entry '1.26.0' 'X'  ''  -1  '2017-01-25 v1.26.0'.
+
+    " Case 1. Test parsing of data
+    lt_log_act = lcl_news=>parse( it_lines = lt_lines iv_current_version = '1.28.00' ).
+    cl_abap_unit_assert=>assert_equals( exp = lt_log_exp
+                                        act = lt_log_act
+                                        msg = ' Error during parsing: Case 3.' ).
+
+  ENDMETHOD.                    "parse
+
+ENDCLASS.                    "ltcl_news IMPLEMENTATION
diff --git a/src/zabapgit_news.prog.xml b/src/zabapgit_news.prog.xml
new file mode 100644
index 000000000..753deeb21
--- /dev/null
+++ b/src/zabapgit_news.prog.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <PROGDIR>
+    <NAME>ZABAPGIT_NEWS</NAME>
+    <STATE>A</STATE>
+    <VARCL>X</VARCL>
+    <SUBC>I</SUBC>
+    <RSTAT>K</RSTAT>
+    <RLOAD>E</RLOAD>
+    <UCCHECK>X</UCCHECK>
+   </PROGDIR>
+   <TPOOL>
+    <item>
+     <ID>R</ID>
+     <ENTRY>Include ZABAPGIT_NEWS</ENTRY>
+     <LENGTH>21</LENGTH>
+    </item>
+   </TPOOL>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_object_acid.prog.abap b/src/zabapgit_object_acid.prog.abap
index a63bd5a94..2e339f2b8 100644
--- a/src/zabapgit_object_acid.prog.abap
+++ b/src/zabapgit_object_acid.prog.abap
@@ -150,7 +150,7 @@ CLASS lcl_object_acid IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_acid IMPLEMENTATION
diff --git a/src/zabapgit_object_auth.prog.abap b/src/zabapgit_object_auth.prog.abap
index 92b7a294f..8cfe21e0b 100644
--- a/src/zabapgit_object_auth.prog.abap
+++ b/src/zabapgit_object_auth.prog.abap
@@ -115,12 +115,19 @@ CLASS lcl_object_auth IMPLEMENTATION.
 
   METHOD lif_object~jump.
 
-    lcx_exception=>raise( 'todo, AUTH jump' ).
+    DATA: field TYPE fieldname.
+
+    field = ms_item-obj_name.
+
+    CALL FUNCTION 'SU20_MAINTAIN_SNGL'
+      EXPORTING
+        id_field    = field
+        id_wbo_mode = abap_false.
 
   ENDMETHOD.                    "lif_object~jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_auth IMPLEMENTATION
diff --git a/src/zabapgit_object_clas.prog.abap b/src/zabapgit_object_clas.prog.abap
index 033e8b4d1..0f58fa619 100644
--- a/src/zabapgit_object_clas.prog.abap
+++ b/src/zabapgit_object_clas.prog.abap
@@ -14,7 +14,7 @@ CLASS lcl_object_clas DEFINITION INHERITING FROM lcl_objects_program.
     ALIASES mo_files FOR lif_object~mo_files.
     METHODS constructor
       IMPORTING
-        is_item     TYPE ty_item
+        is_item     TYPE lif_defs=>ty_item
         iv_language TYPE spras.
 
   PROTECTED SECTION.
@@ -26,7 +26,7 @@ CLASS lcl_object_clas DEFINITION INHERITING FROM lcl_objects_program.
     METHODS deserialize_docu
       IMPORTING io_xml TYPE REF TO lcl_xml_input
       RAISING   lcx_exception.
-    DATA mo_object_oriented_object_fct TYPE REF TO lif_object_oriented_object_fnc.
+    DATA mo_object_oriented_object_fct TYPE REF TO lif_oo_object_fnc.
   PRIVATE SECTION.
     DATA mv_skip_testclass TYPE abap_bool.
 
@@ -202,9 +202,9 @@ CLASS lcl_object_clas IMPLEMENTATION.
 
     DATA: ls_vseoclass    TYPE vseoclass,
           lt_tpool        TYPE textpool_table,
-          lt_descriptions TYPE ty_seocompotx_tt,
+          lt_descriptions TYPE lif_defs=>ty_seocompotx_tt,
           ls_clskey       TYPE seoclskey,
-          lt_sotr         TYPE ty_sotr_tt,
+          lt_sotr         TYPE lif_defs=>ty_sotr_tt,
           lt_lines        TYPE tlinetab.
 
 
@@ -272,7 +272,7 @@ CLASS lcl_object_clas IMPLEMENTATION.
 
   METHOD deserialize_sotr.
     "OTR stands for Online Text Repository
-    DATA: lt_sotr    TYPE ty_sotr_tt.
+    DATA: lt_sotr    TYPE lif_defs=>ty_sotr_tt.
 
     io_xml->read( EXPORTING iv_name = 'SOTR'
                   CHANGING cg_data = lt_sotr ).
@@ -309,7 +309,7 @@ CLASS lcl_object_clas IMPLEMENTATION.
   METHOD deserialize_tpool.
 
     DATA: lv_clsname   TYPE seoclsname,
-          lt_tpool_ext TYPE ty_tpool_tt,
+          lt_tpool_ext TYPE lif_defs=>ty_tpool_tt,
           lt_tpool     TYPE textpool_table.
 
 
@@ -338,7 +338,7 @@ CLASS lcl_object_clas IMPLEMENTATION.
           lt_local_implementations TYPE seop_source_string,
           lt_local_macros          TYPE seop_source_string,
           lt_test_classes          TYPE seop_source_string,
-          lt_descriptions          TYPE ty_seocompotx_tt,
+          lt_descriptions          TYPE lif_defs=>ty_seocompotx_tt,
           ls_class_key             TYPE seoclskey.
 
 
@@ -389,36 +389,36 @@ CLASS lcl_object_clas IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
   METHOD constructor.
     super->constructor(
       is_item     = is_item
       iv_language = iv_language ).
-    mo_object_oriented_object_fct = lcl_object_oriented_factory=>make( iv_object_type = ms_item-obj_type ).
+    mo_object_oriented_object_fct = lcl_oo_factory=>make( iv_object_type = ms_item-obj_type ).
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_CLAS IMPLEMENTATION
 
+CLASS lcl_oo_class DEFINITION INHERITING FROM lcl_oo_base.
 
-CLASS lcl_object_oriented_class DEFINITION
-  INHERITING FROM lcl_object_oriented_base.
   PUBLIC SECTION.
     METHODS:
-      lif_object_oriented_object_fnc~create REDEFINITION,
-      lif_object_oriented_object_fnc~generate_locals REDEFINITION,
-      lif_object_oriented_object_fnc~insert_text_pool REDEFINITION,
-      lif_object_oriented_object_fnc~create_sotr REDEFINITION,
-      lif_object_oriented_object_fnc~get_includes REDEFINITION,
-      lif_object_oriented_object_fnc~get_class_properties REDEFINITION,
-      lif_object_oriented_object_fnc~read_text_pool REDEFINITION,
-      lif_object_oriented_object_fnc~read_sotr REDEFINITION,
-      lif_object_oriented_object_fnc~delete REDEFINITION.
+      lif_oo_object_fnc~create REDEFINITION,
+      lif_oo_object_fnc~generate_locals REDEFINITION,
+      lif_oo_object_fnc~insert_text_pool REDEFINITION,
+      lif_oo_object_fnc~create_sotr REDEFINITION,
+      lif_oo_object_fnc~get_includes REDEFINITION,
+      lif_oo_object_fnc~get_class_properties REDEFINITION,
+      lif_oo_object_fnc~read_text_pool REDEFINITION,
+      lif_oo_object_fnc~read_sotr REDEFINITION,
+      lif_oo_object_fnc~delete REDEFINITION.
 
 ENDCLASS.
-CLASS lcl_object_oriented_class IMPLEMENTATION.
-  METHOD lif_object_oriented_object_fnc~create.
+
+CLASS lcl_oo_class IMPLEMENTATION.
+  METHOD lif_oo_object_fnc~create.
     CALL FUNCTION 'SEO_CLASS_CREATE_COMPLETE'
       EXPORTING
         devclass        = iv_package
@@ -437,7 +437,8 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
       lcx_exception=>raise( 'error from SEO_CLASS_CREATE_COMPLETE' ).
     ENDIF.
   ENDMETHOD.
-  METHOD lif_object_oriented_object_fnc~generate_locals.
+
+  METHOD lif_oo_object_fnc~generate_locals.
     CALL FUNCTION 'SEO_CLASS_GENERATE_LOCALS'
       EXPORTING
         clskey                 = is_key
@@ -456,7 +457,7 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
       lcx_exception=>raise( 'error from generate_locals' ).
     ENDIF.
   ENDMETHOD.
-  METHOD lif_object_oriented_object_fnc~insert_text_pool.
+  METHOD lif_oo_object_fnc~insert_text_pool.
     DATA: lv_cp        TYPE program.
 
     lv_cp = cl_oo_classname_service=>get_classpool_name( iv_class_name ).
@@ -473,8 +474,8 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
                                  iv_name = lv_cp ).
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~create_sotr.
-    DATA: lt_sotr    TYPE ty_sotr_tt,
+  METHOD lif_oo_object_fnc~create_sotr.
+    DATA: lt_sotr    TYPE lif_defs=>ty_sotr_tt,
           lt_objects TYPE sotr_objects,
           ls_paket   TYPE sotr_pack,
           lv_object  LIKE LINE OF lt_objects.
@@ -533,7 +534,7 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
     ENDLOOP.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_includes.
+  METHOD lif_oo_object_fnc~get_includes.
 * note: includes returned might not exist
 * method cl_oo_classname_service=>GET_ALL_CLASS_INCLUDES does not exist in 702
 
@@ -566,7 +567,7 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
 
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_class_properties.
+  METHOD lif_oo_object_fnc~get_class_properties.
     CALL FUNCTION 'SEO_CLIF_GET'
       EXPORTING
         cifkey       = is_class_key
@@ -585,7 +586,7 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
     ENDIF.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_text_pool.
+  METHOD lif_oo_object_fnc~read_text_pool.
     DATA:
      lv_cp TYPE program.
 
@@ -593,7 +594,7 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
     READ TEXTPOOL lv_cp INTO rt_text_pool LANGUAGE iv_language. "#EC CI_READ_REP
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_sotr.
+  METHOD lif_oo_object_fnc~read_sotr.
     DATA: lv_concept    TYPE sotr_head-concept,
           lt_seocompodf TYPE STANDARD TABLE OF seocompodf WITH DEFAULT KEY,
           ls_header     TYPE sotr_head,
@@ -611,7 +612,7 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
       AND exposure = '2'
       AND attdecltyp = '2'
       AND type = 'SOTR_CONC'
-      ORDER BY PRIMARY KEY.
+      ORDER BY PRIMARY KEY.                               "#EC CI_SUBRC
 
     LOOP AT lt_seocompodf ASSIGNING <ls_seocompodf>.
 
@@ -652,7 +653,7 @@ CLASS lcl_object_oriented_class IMPLEMENTATION.
     ENDLOOP.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~delete.
+  METHOD lif_oo_object_fnc~delete.
     CALL FUNCTION 'SEO_CLASS_DELETE_COMPLETE'
       EXPORTING
         clskey       = is_deletion_key
diff --git a/src/zabapgit_object_dcls.prog.abap b/src/zabapgit_object_dcls.prog.abap
new file mode 100644
index 000000000..9fda374ee
--- /dev/null
+++ b/src/zabapgit_object_dcls.prog.abap
@@ -0,0 +1,189 @@
+*&---------------------------------------------------------------------*
+*&  Include  zabapgit_object_dcls
+*&---------------------------------------------------------------------*
+
+CLASS lcl_object_dcls DEFINITION INHERITING FROM lcl_objects_super FINAL.
+
+  PUBLIC SECTION.
+    INTERFACES lif_object.
+    ALIASES mo_files FOR lif_object~mo_files.
+
+ENDCLASS.
+
+CLASS lcl_object_dcls IMPLEMENTATION.
+
+  METHOD lif_object~has_changed_since.
+    rv_changed = abap_true.
+  ENDMETHOD.
+
+  METHOD lif_object~changed_by.
+    rv_user = c_user_unknown.
+  ENDMETHOD.
+
+  METHOD lif_object~get_metadata.
+    rs_metadata = get_metadata( ).
+
+    rs_metadata-ddic         = abap_true.
+    rs_metadata-delete_tadir = abap_true.
+  ENDMETHOD.
+
+  METHOD lif_object~exists.
+
+    DATA: li_dcl TYPE REF TO object.
+
+    TRY.
+        CALL METHOD ('CL_ACM_DCL_HANDLER_FACTORY')=>('CREATE')
+          RECEIVING
+            ro_handler = li_dcl.
+
+        CALL METHOD li_dcl->('CHECK_EXISTENCE')
+          EXPORTING
+            iv_objectname = ms_item-obj_name
+          RECEIVING
+            rv_exists     = rv_bool.
+
+      CATCH cx_root.
+        rv_bool = abap_false.
+    ENDTRY.
+
+  ENDMETHOD.
+
+  METHOD lif_object~jump.
+
+    TRY.
+
+        jump_adt( i_obj_name = ms_item-obj_name
+                  i_obj_type = ms_item-obj_type ).
+
+      CATCH lcx_exception.
+        lcx_exception=>raise( 'DCLS Jump Error' ).
+    ENDTRY.
+
+  ENDMETHOD.
+
+  METHOD lif_object~delete.
+
+    DATA: li_dcl TYPE REF TO object.
+
+    TRY.
+        CALL METHOD ('CL_ACM_DCL_HANDLER_FACTORY')=>('CREATE')
+          RECEIVING
+            ro_handler = li_dcl.
+
+        CALL METHOD li_dcl->('DELETE')
+          EXPORTING
+            iv_dclname = ms_item-obj_name.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'DCLS error' ).
+    ENDTRY.
+
+  ENDMETHOD.
+
+  METHOD lif_object~serialize.
+
+    DATA: lr_data TYPE REF TO data,
+          li_dcl  TYPE REF TO object.
+
+    FIELD-SYMBOLS: <ls_data> TYPE any,
+                   <field>   TYPE any.
+
+    CREATE DATA lr_data TYPE ('ACM_S_DCLSRC').
+    ASSIGN lr_data->* TO <ls_data>.
+
+    TRY.
+        CALL METHOD ('CL_ACM_DCL_HANDLER_FACTORY')=>('CREATE')
+          RECEIVING
+            ro_handler = li_dcl.
+
+        CALL METHOD li_dcl->('READ')
+          EXPORTING
+            iv_dclname = ms_item-obj_name
+          IMPORTING
+            es_dclsrc  = <ls_data>.
+
+        ASSIGN COMPONENT 'AS4USER' OF STRUCTURE <ls_data> TO <field>.
+        ASSERT sy-subrc = 0.
+        CLEAR <field>.
+
+        ASSIGN COMPONENT 'AS4DATE' OF STRUCTURE <ls_data> TO <field>.
+        ASSERT sy-subrc = 0.
+        CLEAR <field>.
+
+        ASSIGN COMPONENT 'AS4TIME' OF STRUCTURE <ls_data> TO <field>.
+        ASSERT sy-subrc = 0.
+        CLEAR <field>.
+
+        ASSIGN COMPONENT 'CREATED_BY' OF STRUCTURE <ls_data> TO <field>.
+        ASSERT sy-subrc = 0.
+        CLEAR <field>.
+
+        ASSIGN COMPONENT 'CREATED_DATE' OF STRUCTURE <ls_data> TO <field>.
+        ASSERT sy-subrc = 0.
+        CLEAR <field>.
+
+        ASSIGN COMPONENT 'SOURCE' OF STRUCTURE <ls_data> TO <field>.
+        ASSERT sy-subrc = 0.
+
+        mo_files->add_string( iv_ext = 'asdcls'  iv_string = <field> ).
+
+        CLEAR <field>.
+
+        io_xml->add( iv_name = 'DCLS'
+                     ig_data = <ls_data> ).
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'DCLS error' ).
+    ENDTRY.
+
+  ENDMETHOD.
+
+  METHOD lif_object~deserialize.
+
+    DATA: lr_data TYPE REF TO data,
+          li_dcl  TYPE REF TO object.
+
+    FIELD-SYMBOLS: <ls_data> TYPE any,
+                   <field>   TYPE any.
+
+    CREATE DATA lr_data TYPE ('ACM_S_DCLSRC').
+    ASSIGN lr_data->* TO <ls_data>.
+
+    io_xml->read(
+      EXPORTING
+        iv_name = 'DCLS'
+      CHANGING
+        cg_data = <ls_data> ).
+
+    ASSIGN COMPONENT 'SOURCE' OF STRUCTURE <ls_data> TO <field>.
+    ASSERT sy-subrc = 0.
+    <field> = mo_files->read_string( 'asdcls' ).
+
+    TRY.
+        CALL METHOD ('CL_ACM_DCL_HANDLER_FACTORY')=>('CREATE')
+          RECEIVING
+            ro_handler = li_dcl.
+
+        CALL METHOD li_dcl->('SAVE')
+          EXPORTING
+            iv_dclname     = ms_item-obj_name
+            iv_put_state   = 'A'
+            is_dclsrc      = <ls_data>
+            iv_devclass    = iv_package
+            iv_access_mode = 'INSERT'.
+
+        tadir_insert( iv_package ).
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'DCLS error' ).
+    ENDTRY.
+
+    lcl_objects_activation=>add_item( ms_item ).
+
+  ENDMETHOD.
+
+  METHOD lif_object~compare_to_remote_version.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
+  ENDMETHOD.
+
+ENDCLASS.
diff --git a/src/zabapgit_object_dcls.prog.xml b/src/zabapgit_object_dcls.prog.xml
new file mode 100644
index 000000000..b362e25f5
--- /dev/null
+++ b/src/zabapgit_object_dcls.prog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <PROGDIR>
+    <NAME>ZABAPGIT_OBJECT_DCLS</NAME>
+    <STATE>A</STATE>
+    <VARCL>X</VARCL>
+    <SUBC>I</SUBC>
+    <RLOAD>E</RLOAD>
+    <UCCHECK>X</UCCHECK>
+   </PROGDIR>
+   <TPOOL>
+    <item>
+     <ID>R</ID>
+     <ENTRY>Include ZABAPGIT_OBJECT_DCLS</ENTRY>
+     <LENGTH>28</LENGTH>
+    </item>
+   </TPOOL>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_object_ddls.prog.abap b/src/zabapgit_object_ddls.prog.abap
index 6fc72a498..fcf760998 100644
--- a/src/zabapgit_object_ddls.prog.abap
+++ b/src/zabapgit_object_ddls.prog.abap
@@ -13,6 +13,11 @@ CLASS lcl_object_ddls DEFINITION INHERITING FROM lcl_objects_super FINAL.
     INTERFACES lif_object.
     ALIASES mo_files FOR lif_object~mo_files.
 
+  PROTECTED SECTION.
+    METHODS open_adt_stob
+      IMPORTING iv_ddls_name TYPE tadir-obj_name
+      RAISING   lcx_exception.
+
 ENDCLASS.                    "lcl_object_dtel DEFINITION
 
 *----------------------------------------------------------------------*
@@ -67,7 +72,26 @@ CLASS lcl_object_ddls IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~exists
 
   METHOD lif_object~jump.
-    lcx_exception=>raise( 'todo, DDLS jump' ).
+
+    DATA: lv_typename   TYPE typename.
+    DATA: lv_ddtypekind TYPE ddtypekind.
+
+    lv_typename = ms_item-obj_name.
+
+    CALL FUNCTION 'DDIF_TYPEINFO_GET'
+      EXPORTING
+        typename = lv_typename
+      IMPORTING
+        typekind = lv_ddtypekind.
+
+    CASE lv_ddtypekind.
+      WHEN 'STOB'.
+
+        me->open_adt_stob( iv_ddls_name = ms_item-obj_name ).
+      WHEN OTHERS.
+        lcx_exception=>raise( 'DDLS Jump Error' ).
+    ENDCASE.
+
   ENDMETHOD.                    "jump
 
   METHOD lif_object~delete.
@@ -91,8 +115,8 @@ CLASS lcl_object_ddls IMPLEMENTATION.
 
   METHOD lif_object~serialize.
 
-    DATA: li_ddl    TYPE REF TO object,
-          lr_data   TYPE REF TO data.
+    DATA: li_ddl  TYPE REF TO object,
+          lr_data TYPE REF TO data.
 
     FIELD-SYMBOLS: <ls_data>  TYPE any,
                    <lv_field> TYPE any.
@@ -183,7 +207,61 @@ CLASS lcl_object_ddls IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.                    "lif_object~compare_to_remote_version
 
+  METHOD open_adt_stob.
+
+    DATA: lr_data                   TYPE REF TO data.
+    DATA: li_ddl                    TYPE REF TO object.
+    FIELD-SYMBOLS: <lt_ddnames>     TYPE STANDARD TABLE.
+    FIELD-SYMBOLS: <lt_entity_view> TYPE STANDARD TABLE.
+    FIELD-SYMBOLS: <ls_ddnames>     TYPE any.
+    FIELD-SYMBOLS: <ls_entity_view> TYPE any.
+    FIELD-SYMBOLS: <lv_ddname>      TYPE any.
+    FIELD-SYMBOLS: <lv_ddlname>     TYPE any.
+    TRY.
+
+        CREATE DATA lr_data TYPE ('IF_DD_DDL_TYPES=>TY_T_DDOBJ').
+        ASSIGN lr_data->* TO <lt_ddnames>.
+
+        CREATE DATA lr_data LIKE LINE OF <lt_ddnames>.
+        ASSIGN lr_data->* TO <ls_ddnames>.
+
+        CREATE DATA lr_data TYPE ('IF_DD_DDL_TYPES=>TY_T_ENTITY_OF_VIEW').
+        ASSIGN lr_data->* TO <lt_entity_view>.
+
+        CREATE DATA lr_data LIKE LINE OF <lt_entity_view>.
+        ASSIGN lr_data->* TO <ls_entity_view>.
+
+        CLEAR <lt_ddnames>.
+        ASSIGN COMPONENT 'NAME' OF STRUCTURE <ls_ddnames> TO <lv_ddname>.
+        <lv_ddname> = iv_ddls_name.
+        INSERT <ls_ddnames> INTO TABLE <lt_ddnames>.
+
+        CALL METHOD ('CL_DD_DDL_HANDLER_FACTORY')=>('CREATE')
+          RECEIVING
+            handler = li_ddl.
+
+        CALL METHOD li_ddl->('IF_DD_DDL_HANDLER~GET_VIEWNAME_FROM_ENTITYNAME')
+          EXPORTING
+            ddnames        = <lt_ddnames>
+          IMPORTING
+            view_of_entity = <lt_entity_view>.
+
+        READ TABLE <lt_entity_view> ASSIGNING <ls_entity_view> INDEX 1.
+        IF sy-subrc = 0.
+          ASSIGN COMPONENT 'DDLNAME' OF STRUCTURE <ls_entity_view> TO <lv_ddlname>.
+
+          jump_adt( i_obj_name = <lv_ddlname>
+                    i_obj_type = 'DDLS' ).
+
+        ENDIF.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'DDLS Jump Error' ).
+    ENDTRY.
+
+  ENDMETHOD.                    "open_adt_stob
+
 ENDCLASS.                    "lcl_object_view IMPLEMENTATION
diff --git a/src/zabapgit_object_doct.prog.abap b/src/zabapgit_object_doct.prog.abap
index 250730cd6..6700ab155 100644
--- a/src/zabapgit_object_doct.prog.abap
+++ b/src/zabapgit_object_doct.prog.abap
@@ -152,7 +152,7 @@ CLASS lcl_object_doct IMPLEMENTATION.
   ENDMETHOD.                    "serialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_msag IMPLEMENTATION
diff --git a/src/zabapgit_object_docv.prog.abap b/src/zabapgit_object_docv.prog.abap
index ef3374284..da0aaaeea 100644
--- a/src/zabapgit_object_docv.prog.abap
+++ b/src/zabapgit_object_docv.prog.abap
@@ -156,7 +156,7 @@ CLASS lcl_object_docv IMPLEMENTATION.
   ENDMETHOD.                    "serialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_msag IMPLEMENTATION
diff --git a/src/zabapgit_object_doma.prog.abap b/src/zabapgit_object_doma.prog.abap
index de12805ee..bd8194ce9 100644
--- a/src/zabapgit_object_doma.prog.abap
+++ b/src/zabapgit_object_doma.prog.abap
@@ -53,8 +53,7 @@ CLASS lcl_object_doma IMPLEMENTATION.
   METHOD lif_object~has_changed_since.
 
     DATA: lv_date TYPE dats,
-          lv_time TYPE tims,
-          lv_ts   TYPE timestamp.
+          lv_time TYPE tims.
 
     SELECT SINGLE as4date as4time FROM dd01l
       INTO (lv_date, lv_time)
@@ -62,7 +61,10 @@ CLASS lcl_object_doma IMPLEMENTATION.
       AND as4local = 'A'
       AND as4vers  = '0000'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
 
   ENDMETHOD.  "lif_object~has_changed_since
 
@@ -239,11 +241,11 @@ CLASS lcl_object_doma IMPLEMENTATION.
 
     lv_name = ms_item-obj_name.
 
-    " Collect additional languages
+    " Collect additional languages, skip master lang - it was serialized already
     SELECT DISTINCT ddlanguage AS langu INTO TABLE lt_i18n_langs
       FROM dd01v
       WHERE domname = lv_name
-      AND   ddlanguage <> mv_language. " Skip master lang - it was serialized already
+      AND   ddlanguage <> mv_language.                    "#EC CI_SUBRC
 
     LOOP AT lt_i18n_langs ASSIGNING <lang>.
       lv_index = sy-tabix.
@@ -360,7 +362,7 @@ CLASS lcl_object_doma IMPLEMENTATION.
   ENDMETHOD.  "deserialize_texts
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_doma IMPLEMENTATION
diff --git a/src/zabapgit_object_dtel.prog.abap b/src/zabapgit_object_dtel.prog.abap
index bb8cf957f..cb2bac785 100644
--- a/src/zabapgit_object_dtel.prog.abap
+++ b/src/zabapgit_object_dtel.prog.abap
@@ -46,8 +46,7 @@ CLASS lcl_object_dtel IMPLEMENTATION.
   METHOD lif_object~has_changed_since.
 
     DATA: lv_date TYPE dats,
-          lv_time TYPE tims,
-          lv_ts   TYPE timestamp.
+          lv_time TYPE tims.
 
     SELECT SINGLE as4date as4time FROM dd04l
       INTO (lv_date, lv_time)
@@ -55,7 +54,10 @@ CLASS lcl_object_dtel IMPLEMENTATION.
       AND as4local = 'A'
       AND as4vers = '0000'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
 
   ENDMETHOD.  "lif_object~has_changed_since
 
@@ -120,6 +122,8 @@ CLASS lcl_object_dtel IMPLEMENTATION.
   ENDMETHOD.                    "delete
 
   METHOD lif_object~serialize.
+* fm DDIF_DTEL_GET bypasses buffer, so SELECTs are
+* done directly from here
 
     DATA: lv_name  TYPE ddobjname,
           ls_dd04v TYPE dd04v,
@@ -128,18 +132,29 @@ CLASS lcl_object_dtel IMPLEMENTATION.
     lv_name = ms_item-obj_name.
 
 
-    CALL FUNCTION 'DDIF_DTEL_GET'
-      EXPORTING
-        name          = lv_name
-        langu         = mv_language
-      IMPORTING
-        dd04v_wa      = ls_dd04v
-        tpara_wa      = ls_tpara
-      EXCEPTIONS
-        illegal_input = 1
-        OTHERS        = 2.
+    SELECT SINGLE * FROM dd04l
+      INTO CORRESPONDING FIELDS OF ls_dd04v
+      WHERE rollname = lv_name
+      AND as4local = 'A'
+      AND as4vers = '0000'.
     IF sy-subrc <> 0 OR ls_dd04v IS INITIAL.
-      lcx_exception=>raise( 'Error from DDIF_DTEL_GET' ).
+      lcx_exception=>raise( 'Not found in DD04L' ).
+    ENDIF.
+
+    SELECT SINGLE * FROM dd04t
+      INTO CORRESPONDING FIELDS OF ls_dd04v
+      WHERE rollname = lv_name
+      AND ddlanguage = mv_language
+      AND as4local = 'A'
+      AND as4vers = '0000'.
+
+    IF NOT ls_dd04v-memoryid IS INITIAL.
+      SELECT SINGLE tpara~paramid tparat~partext
+        FROM tpara LEFT JOIN tparat
+        ON tparat~paramid = tpara~paramid AND
+        tparat~sprache = mv_language
+        INTO ls_tpara
+        WHERE tpara~paramid = ls_dd04v-memoryid.
     ENDIF.
 
     CLEAR: ls_dd04v-as4user,
@@ -227,11 +242,11 @@ CLASS lcl_object_dtel IMPLEMENTATION.
 
     lv_name = ms_item-obj_name.
 
-    " Collect additional languages
+    " Collect additional languages, skip master lang - it was serialized already
     SELECT DISTINCT ddlanguage AS langu INTO TABLE lt_i18n_langs
       FROM dd04v
       WHERE rollname = lv_name
-      AND   ddlanguage <> mv_language. " Skip master lang - it was serialized already
+      AND   ddlanguage <> mv_language.                    "#EC CI_SUBRC
 
     LOOP AT lt_i18n_langs ASSIGNING <lang>.
       lv_index = sy-tabix.
@@ -241,7 +256,6 @@ CLASS lcl_object_dtel IMPLEMENTATION.
           langu         = <lang>
         IMPORTING
           dd04v_wa      = ls_dd04v
-*         tpara_wa      = ls_tpara
         EXCEPTIONS
           illegal_input = 1
           OTHERS        = 2.
@@ -316,7 +330,7 @@ CLASS lcl_object_dtel IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_dtel IMPLEMENTATION
diff --git a/src/zabapgit_object_enho.prog.abap b/src/zabapgit_object_enho.prog.abap
index 9990e63cb..176963fd5 100644
--- a/src/zabapgit_object_enho.prog.abap
+++ b/src/zabapgit_object_enho.prog.abap
@@ -23,17 +23,17 @@ ENDINTERFACE.                    "lif_object_enho
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS lcl_object_enho_wdyconf DEFINITION.
+CLASS lcl_object_enho_wdyc DEFINITION.
 
   PUBLIC SECTION.
     METHODS: constructor
       IMPORTING
-        is_item  TYPE ty_item
+        is_item  TYPE lif_defs=>ty_item
         io_files TYPE REF TO lcl_objects_files.
     INTERFACES: lif_object_enho.
 
   PRIVATE SECTION.
-    DATA: ms_item  TYPE ty_item,
+    DATA: ms_item  TYPE lif_defs=>ty_item,
           mo_files TYPE REF TO lcl_objects_files.
 
 ENDCLASS.                    "lcl_object_enho_wdyconf DEFINITION
@@ -43,7 +43,7 @@ ENDCLASS.                    "lcl_object_enho_wdyconf DEFINITION
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS lcl_object_enho_wdyconf IMPLEMENTATION.
+CLASS lcl_object_enho_wdyc IMPLEMENTATION.
 
   METHOD constructor.
     ms_item = is_item.
@@ -262,7 +262,7 @@ CLASS lcl_object_enho_clif IMPLEMENTATION.
     io_xml->read( EXPORTING iv_name = 'TAB_METHODS'
                   CHANGING cg_data = lt_tab_methods ).
 
-    io_clif->set_enhattributes( tab_attributes = lt_tab_attributes ).
+    io_clif->set_enhattributes( lt_tab_attributes ).
 
 * todo: deserialize includes
 
@@ -308,12 +308,12 @@ CLASS lcl_object_enho_badi DEFINITION.
   PUBLIC SECTION.
     METHODS: constructor
       IMPORTING
-        is_item  TYPE ty_item
+        is_item  TYPE lif_defs=>ty_item
         io_files TYPE REF TO lcl_objects_files.
     INTERFACES: lif_object_enho.
 
   PRIVATE SECTION.
-    DATA: ms_item  TYPE ty_item,
+    DATA: ms_item  TYPE lif_defs=>ty_item,
           mo_files TYPE REF TO lcl_objects_files.
 
 ENDCLASS.                    "lcl_object_enho_badi DEFINITION
@@ -431,7 +431,7 @@ CLASS lcl_object_enho_hook DEFINITION.
   PUBLIC SECTION.
     METHODS: constructor
       IMPORTING
-        is_item  TYPE ty_item
+        is_item  TYPE lif_defs=>ty_item
         io_files TYPE REF TO lcl_objects_files.
 
     INTERFACES: lif_object_enho.
@@ -444,7 +444,7 @@ CLASS lcl_object_enho_hook DEFINITION.
 
     TYPES: ty_spaces_tt TYPE STANDARD TABLE OF ty_spaces WITH DEFAULT KEY.
 
-    DATA: ms_item TYPE ty_item.
+    DATA: ms_item TYPE lif_defs=>ty_item.
     DATA: mo_files TYPE REF TO lcl_objects_files.
 
     METHODS hook_impl_deserialize
@@ -633,18 +633,18 @@ ENDCLASS.                    "lcl_object_enho_hook IMPLEMENTATION
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS lcl_object_enho_interface DEFINITION.
+CLASS lcl_object_enho_intf DEFINITION.
 
   PUBLIC SECTION.
     METHODS:
       constructor
         IMPORTING
-          is_item  TYPE ty_item
+          is_item  TYPE lif_defs=>ty_item
           io_files TYPE REF TO lcl_objects_files.
     INTERFACES: lif_object_enho.
 
   PRIVATE SECTION.
-    DATA: ms_item  TYPE ty_item,
+    DATA: ms_item  TYPE lif_defs=>ty_item,
           mo_files TYPE REF TO lcl_objects_files.
 
 ENDCLASS.                    "lcl_object_enho_interface DEFINITION
@@ -654,7 +654,7 @@ ENDCLASS.                    "lcl_object_enho_interface DEFINITION
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS lcl_object_enho_interface IMPLEMENTATION.
+CLASS lcl_object_enho_intf IMPLEMENTATION.
 
   METHOD constructor.
     ms_item  = is_item.
@@ -744,12 +744,12 @@ CLASS lcl_object_enho_class DEFINITION.
     METHODS:
       constructor
         IMPORTING
-          is_item  TYPE ty_item
+          is_item  TYPE lif_defs=>ty_item
           io_files TYPE REF TO lcl_objects_files.
     INTERFACES: lif_object_enho.
 
   PRIVATE SECTION.
-    DATA: ms_item TYPE ty_item.
+    DATA: ms_item TYPE lif_defs=>ty_item.
     DATA: mo_files TYPE REF TO lcl_objects_files.
 
 ENDCLASS.                    "lcl_object_enho_class DEFINITION
@@ -979,12 +979,12 @@ CLASS lcl_object_enho IMPLEMENTATION.
             is_item  = ms_item
             io_files = mo_files.
       WHEN cl_enh_tool_intf=>tooltype.
-        CREATE OBJECT ri_enho TYPE lcl_object_enho_interface
+        CREATE OBJECT ri_enho TYPE lcl_object_enho_intf
           EXPORTING
             is_item  = ms_item
             io_files = mo_files.
       WHEN cl_wdr_cfg_enhancement=>tooltype.
-        CREATE OBJECT ri_enho TYPE lcl_object_enho_wdyconf
+        CREATE OBJECT ri_enho TYPE lcl_object_enho_wdyc
           EXPORTING
             is_item  = ms_item
             io_files = mo_files.
@@ -1051,7 +1051,7 @@ CLASS lcl_object_enho IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.                    "lif_object~compare_to_remote_version
 
 ENDCLASS.                    "lcl_object_enho IMPLEMENTATION
diff --git a/src/zabapgit_object_enhs.prog.abap b/src/zabapgit_object_enhs.prog.abap
index 623d4dbbd..c15baca28 100644
--- a/src/zabapgit_object_enhs.prog.abap
+++ b/src/zabapgit_object_enhs.prog.abap
@@ -212,7 +212,7 @@ CLASS lcl_object_enhs IMPLEMENTATION.
   ENDMETHOD.  "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS. "lcl_object_enhs
diff --git a/src/zabapgit_object_enqu.prog.abap b/src/zabapgit_object_enqu.prog.abap
index 0daf862d9..e0127a955 100644
--- a/src/zabapgit_object_enqu.prog.abap
+++ b/src/zabapgit_object_enqu.prog.abap
@@ -25,8 +25,7 @@ CLASS lcl_object_enqu IMPLEMENTATION.
   METHOD lif_object~has_changed_since.
 
     DATA: lv_date TYPE dats,
-          lv_time TYPE tims,
-          lv_ts   TYPE timestamp.
+          lv_time TYPE tims.
 
     SELECT SINGLE as4date as4time FROM dd25l
       INTO (lv_date, lv_time)
@@ -34,7 +33,10 @@ CLASS lcl_object_enqu IMPLEMENTATION.
       AND as4local = 'A'
       AND as4vers  = '0000'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
 
   ENDMETHOD.  "lif_object~has_changed_since
 
@@ -184,7 +186,7 @@ CLASS lcl_object_enqu IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_enqu IMPLEMENTATION
diff --git a/src/zabapgit_object_ensc.prog.abap b/src/zabapgit_object_ensc.prog.abap
index c7bdc0a8b..5b5ba51c5 100644
--- a/src/zabapgit_object_ensc.prog.abap
+++ b/src/zabapgit_object_ensc.prog.abap
@@ -191,7 +191,7 @@ CLASS lcl_object_ensc IMPLEMENTATION.
   ENDMETHOD.  "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS. "lcl_object_ensc
diff --git a/src/zabapgit_object_form.prog.abap b/src/zabapgit_object_form.prog.abap
new file mode 100644
index 000000000..63b5a6c32
--- /dev/null
+++ b/src/zabapgit_object_form.prog.abap
@@ -0,0 +1,419 @@
+*&---------------------------------------------------------------------*
+*&  Include           ZABAPGIT_OBJECT_FORM
+*&---------------------------------------------------------------------*
+*----------------------------------------------------------------------*
+*       CLASS lcl_object_form DEFINITION
+*----------------------------------------------------------------------*
+CLASS lcl_object_form DEFINITION INHERITING FROM lcl_objects_super FINAL.
+
+  PUBLIC SECTION.
+    INTERFACES lif_object.
+    ALIASES mo_files FOR lif_object~mo_files.
+
+  PRIVATE SECTION.
+    CONSTANTS: c_objectname_form    TYPE thead-tdobject VALUE 'FORM' ##NO_TEXT.
+    CONSTANTS: c_objectname_tdlines TYPE thead-tdobject VALUE 'TDLINES' ##NO_TEXT.
+    CONSTANTS: c_extension_xml      TYPE string         VALUE 'xml' ##NO_TEXT.
+
+    TYPES: BEGIN OF tys_form_data,
+             form_header   TYPE itcta,
+             text_header   TYPE thead,
+             orig_language TYPE sy-langu,
+             pages         TYPE STANDARD TABLE OF itctg WITH DEFAULT KEY,
+             page_windows  TYPE STANDARD TABLE OF itcth WITH DEFAULT KEY,
+             paragraphs    TYPE STANDARD TABLE OF itcdp WITH DEFAULT KEY,
+             strings       TYPE STANDARD TABLE OF itcds WITH DEFAULT KEY,
+             tabs          TYPE STANDARD TABLE OF itcdq WITH DEFAULT KEY,
+             windows       TYPE STANDARD TABLE OF itctw WITH DEFAULT KEY,
+           END OF tys_form_data,
+           tyt_form_data   TYPE STANDARD TABLE OF tys_form_data WITH DEFAULT KEY,
+           tyt_form_header TYPE STANDARD TABLE OF itcta WITH DEFAULT KEY,
+           tys_form_header TYPE LINE OF tyt_form_header,
+           tyt_text_header TYPE STANDARD TABLE OF thead WITH DEFAULT KEY,
+           tys_text_header TYPE LINE OF tyt_text_header,
+           tyt_lines       TYPE tline_tab.
+
+    METHODS _get_last_changes
+      IMPORTING
+        iv_form_name           TYPE lif_defs=>ty_item-obj_name
+      RETURNING
+        VALUE(es_last_changed) TYPE tys_form_header.
+
+    METHODS _build_extra_from_header
+      IMPORTING
+        ls_header       TYPE tys_form_header
+      RETURNING
+        VALUE(r_result) TYPE string.
+
+    METHODS _save_form
+      IMPORTING
+        it_lines     TYPE lcl_object_form=>tyt_lines
+      CHANGING
+        cs_form_data TYPE lcl_object_form=>tys_form_data.
+
+    METHODS _extract_tdlines
+      IMPORTING
+        is_form_data    TYPE lcl_object_form=>tys_form_data
+      RETURNING
+        VALUE(et_lines) TYPE lcl_object_form=>tyt_lines
+      RAISING
+        lcx_exception.
+
+    METHODS _clear_changed_fields
+      CHANGING
+        cs_form_data TYPE lcl_object_form=>tys_form_data.
+
+    METHODS _compress_lines
+      IMPORTING
+        is_form_data TYPE lcl_object_form=>tys_form_data
+        it_lines     TYPE lcl_object_form=>tyt_lines
+      RAISING
+        lcx_exception.
+
+    METHODS _find_form
+      IMPORTING
+        iv_object_name        TYPE lif_defs=>ty_item-obj_name
+      RETURNING
+        VALUE(et_text_header) TYPE lcl_object_form=>tyt_text_header.
+
+    METHODS _read_form
+      IMPORTING
+        is_text_header TYPE lcl_object_form=>tys_text_header
+      EXPORTING
+        ev_form_found  TYPE flag
+        es_form_data   TYPE lcl_object_form=>tys_form_data
+        et_lines       TYPE lcl_object_form=>tyt_lines.
+
+ENDCLASS.
+
+*----------------------------------------------------------------------*
+*       CLASS lcl_object_form IMPLEMENTATION
+*----------------------------------------------------------------------*
+CLASS lcl_object_form IMPLEMENTATION.
+
+  METHOD lif_object~has_changed_since.
+
+    DATA: ls_last_changed    TYPE tys_form_header.
+    DATA: lv_last_changed_ts TYPE timestamp.
+
+    ls_last_changed = _get_last_changes( ms_item-obj_name ).
+
+    CONVERT DATE ls_last_changed-tdldate TIME ls_last_changed-tdltime
+            INTO TIME STAMP lv_last_changed_ts TIME ZONE sy-zonlo.
+
+    rv_changed = boolc( sy-subrc <> 0 OR lv_last_changed_ts > iv_timestamp ).
+
+  ENDMETHOD.
+
+  METHOD lif_object~changed_by.
+
+    DATA: ls_last_changed TYPE tys_form_header.
+
+    ls_last_changed = _get_last_changes( ms_item-obj_name ).
+
+    IF ls_last_changed-tdluser IS NOT INITIAL.
+      rv_user = ls_last_changed-tdluser.
+    ELSE.
+      rv_user = c_user_unknown.
+    ENDIF.
+
+  ENDMETHOD.
+
+  METHOD lif_object~get_metadata.
+
+    rs_metadata = get_metadata( ).
+    rs_metadata-delete_tadir = abap_true.
+
+  ENDMETHOD.
+
+  METHOD lif_object~exists.
+
+    DATA: lv_form_name TYPE thead-tdform.
+
+    lv_form_name = ms_item-obj_name.
+
+    CALL FUNCTION 'READ_FORM'
+      EXPORTING
+        form             = lv_form_name
+        read_only_header = abap_true
+      IMPORTING
+        found            = rv_bool.
+
+  ENDMETHOD.
+
+  METHOD lif_object~jump.
+
+    DATA: lt_bdcdata TYPE TABLE OF bdcdata.
+
+    FIELD-SYMBOLS: <ls_bdcdata> LIKE LINE OF lt_bdcdata.
+
+    APPEND INITIAL LINE TO lt_bdcdata ASSIGNING <ls_bdcdata>.
+    <ls_bdcdata>-program  = 'SAPMSSCF' ##NO_TEXT.
+    <ls_bdcdata>-dynpro   = '1102' ##NO_TEXT.
+    <ls_bdcdata>-dynbegin = abap_true.
+
+    APPEND INITIAL LINE TO lt_bdcdata ASSIGNING <ls_bdcdata>.
+    <ls_bdcdata>-fnam = 'BDC_OKCODE' ##NO_TEXT.
+    <ls_bdcdata>-fval = '=SHOW' ##NO_TEXT.
+
+    APPEND INITIAL LINE TO lt_bdcdata ASSIGNING <ls_bdcdata>.
+    <ls_bdcdata>-fnam = 'RSSCF-TDFORM' ##NO_TEXT.
+    <ls_bdcdata>-fval = ms_item-obj_name.
+
+    CALL FUNCTION 'ABAP4_CALL_TRANSACTION'
+      STARTING NEW TASK 'GIT'
+      EXPORTING
+        tcode     = 'SE71'
+        mode_val  = 'E'
+      TABLES
+        using_tab = lt_bdcdata
+      EXCEPTIONS
+        OTHERS    = 1
+        ##fm_subrc_ok.                                                   "#EC CI_SUBRC
+
+  ENDMETHOD.
+
+  METHOD lif_object~delete.
+
+    DATA: lv_name TYPE itcta-tdform.
+
+    lv_name = ms_item-obj_name.
+
+    CALL FUNCTION 'DELETE_FORM'
+      EXPORTING
+        form     = lv_name
+        language = '*'.
+
+  ENDMETHOD.
+
+  METHOD lif_object~serialize.
+
+    DATA: lt_form_data              TYPE tyt_form_data.
+    DATA: ls_form_data              TYPE tys_form_data.
+    DATA: lt_text_header            TYPE tyt_text_header.
+    DATA: lt_lines                  TYPE tyt_lines.
+    DATA: lo_xml                    TYPE REF TO lcl_xml_output.
+    DATA: lv_form_found             TYPE flag.
+    FIELD-SYMBOLS: <ls_text_header> LIKE LINE OF lt_text_header.
+
+    lt_text_header = _find_form( ms_item-obj_name ).
+
+    LOOP AT lt_text_header ASSIGNING <ls_text_header>.
+      CLEAR lt_lines.
+      CLEAR ls_form_data.
+      FREE lo_xml.
+
+      _read_form( EXPORTING is_text_header = <ls_text_header>
+                  IMPORTING ev_form_found = lv_form_found
+                            es_form_data  = ls_form_data
+                            et_lines      = lt_lines ).
+
+      IF lv_form_found = abap_true.
+
+        _clear_changed_fields( CHANGING cs_form_data = ls_form_data ).
+
+        _compress_lines( is_form_data = ls_form_data
+                         it_lines     = lt_lines ).
+
+        INSERT ls_form_data INTO TABLE lt_form_data.
+
+      ENDIF.
+
+    ENDLOOP.
+
+    IF lt_form_data IS NOT INITIAL.
+
+      io_xml->add( iv_name = c_objectname_form
+                   ig_data = lt_form_data ).
+
+    ENDIF.
+
+  ENDMETHOD.
+
+  METHOD lif_object~deserialize.
+
+    DATA: lt_form_data            TYPE tyt_form_data.
+    DATA: lt_lines                TYPE tyt_lines.
+    FIELD-SYMBOLS: <ls_form_data> TYPE LINE OF tyt_form_data.
+
+    io_xml->read( EXPORTING iv_name = c_objectname_form
+                  CHANGING  cg_data = lt_form_data ).
+
+    LOOP AT lt_form_data ASSIGNING <ls_form_data>.
+
+      lt_lines = _extract_tdlines( <ls_form_data> ).
+
+
+      _save_form( EXPORTING it_lines     = lt_lines
+                  CHANGING  cs_form_data = <ls_form_data> ).
+
+    ENDLOOP.
+
+    CALL FUNCTION 'SAPSCRIPT_DELETE_LOAD'
+      EXPORTING
+        delete = abap_true
+        form   = '*'
+        write  = space.
+
+    tadir_insert( iv_package ).
+
+  ENDMETHOD.
+
+  METHOD lif_object~compare_to_remote_version.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
+  ENDMETHOD.
+
+  METHOD _build_extra_from_header.
+    r_result = c_objectname_tdlines && '_' && ls_header-tdspras.
+  ENDMETHOD.
+
+  METHOD _get_last_changes.
+
+    DATA: lv_form_name         TYPE thead-tdform.
+
+    CLEAR es_last_changed.
+
+    lv_form_name = iv_form_name.
+
+    CALL FUNCTION 'READ_FORM'
+      EXPORTING
+        form             = lv_form_name
+        read_only_header = abap_true
+      IMPORTING
+        form_header      = es_last_changed.
+
+  ENDMETHOD.
+
+
+  METHOD _save_form.
+
+    CALL FUNCTION 'SAVE_FORM'
+      EXPORTING
+        form_header  = cs_form_data-form_header
+      TABLES
+        form_lines   = it_lines
+        pages        = cs_form_data-pages
+        page_windows = cs_form_data-page_windows
+        paragraphs   = cs_form_data-paragraphs
+        strings      = cs_form_data-strings
+        tabs         = cs_form_data-tabs
+        windows      = cs_form_data-windows.
+
+    CALL FUNCTION 'SAPSCRIPT_CHANGE_OLANGUAGE'
+      EXPORTING
+        forced    = abap_true
+        name      = cs_form_data-text_header-tdname
+        object    = cs_form_data-text_header-tdobject
+        olanguage = cs_form_data-orig_language
+      EXCEPTIONS
+        OTHERS    = 1
+        ##fm_subrc_ok.                                                   "#EC CI_SUBRC
+
+  ENDMETHOD.
+
+
+  METHOD _extract_tdlines.
+
+    DATA lv_string TYPE string.
+    DATA lo_xml TYPE REF TO lcl_xml_input.
+
+    lv_string = mo_files->read_string( iv_extra =
+                               _build_extra_from_header( is_form_data-form_header )
+                                       iv_ext   = c_extension_xml ).
+
+    CREATE OBJECT lo_xml EXPORTING iv_xml = lv_string.
+    lo_xml->read( EXPORTING iv_name = c_objectname_tdlines
+                  CHANGING  cg_data = et_lines ).
+
+  ENDMETHOD.
+
+
+  METHOD _clear_changed_fields.
+
+    CLEAR: cs_form_data-form_header-tdfuser,
+           cs_form_data-form_header-tdfdate,
+           cs_form_data-form_header-tdftime,
+           cs_form_data-form_header-tdfreles,
+           cs_form_data-form_header-tdluser,
+           cs_form_data-form_header-tdldate,
+           cs_form_data-form_header-tdltime,
+           cs_form_data-form_header-tdlreles.
+    CLEAR: cs_form_data-text_header-tdfuser,
+           cs_form_data-text_header-tdfdate,
+           cs_form_data-text_header-tdftime,
+           cs_form_data-text_header-tdfreles,
+           cs_form_data-text_header-tdluser,
+           cs_form_data-text_header-tdldate,
+           cs_form_data-text_header-tdltime,
+           cs_form_data-text_header-tdlreles.
+
+  ENDMETHOD.
+
+
+  METHOD _compress_lines.
+
+    DATA lv_string TYPE string.
+    DATA lo_xml TYPE REF TO lcl_xml_output.
+
+    CREATE OBJECT lo_xml.
+    lo_xml->add( iv_name = c_objectname_tdlines
+                 ig_data = it_lines ).
+    lv_string = lo_xml->render( ).
+    IF lv_string IS NOT INITIAL.
+      mo_files->add_string( iv_extra  =
+                    _build_extra_from_header( is_form_data-form_header )
+                            iv_ext    = c_extension_xml
+                            iv_string = lv_string ).
+    ENDIF.
+
+  ENDMETHOD.
+
+
+  METHOD _find_form.
+
+    DATA: lv_text_name TYPE thead-tdname.
+
+    lv_text_name = iv_object_name.
+
+    CALL FUNCTION 'SELECT_TEXT'
+      EXPORTING
+        database_only = abap_true
+        id            = 'TXT'
+        language      = '*'
+        name          = lv_text_name
+        object        = c_objectname_form
+      TABLES
+        selections    = et_text_header
+      EXCEPTIONS
+        OTHERS        = 1
+        ##fm_subrc_ok ##NO_TEXT.  "#EC CI_SUBRC
+
+  ENDMETHOD.
+
+
+  METHOD _read_form.
+
+    CLEAR es_form_data.
+
+    CALL FUNCTION 'READ_FORM'
+      EXPORTING
+        form         = is_text_header-tdform
+        language     = is_text_header-tdspras
+        status       = ' '
+      IMPORTING
+        form_header  = es_form_data-form_header
+        found        = ev_form_found
+        header       = es_form_data-text_header
+        olanguage    = es_form_data-orig_language
+      TABLES
+        form_lines   = et_lines
+        pages        = es_form_data-pages
+        page_windows = es_form_data-page_windows
+        paragraphs   = es_form_data-paragraphs
+        strings      = es_form_data-strings
+        tabs         = es_form_data-tabs
+        windows      = es_form_data-windows.
+
+  ENDMETHOD.
+
+ENDCLASS.                    "lcl_object_FORM IMPLEMENTATION
diff --git a/src/zabapgit_object_form.prog.xml b/src/zabapgit_object_form.prog.xml
new file mode 100644
index 000000000..de397ec78
--- /dev/null
+++ b/src/zabapgit_object_form.prog.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <PROGDIR>
+    <NAME>ZABAPGIT_OBJECT_FORM</NAME>
+    <STATE>A</STATE>
+    <VARCL>X</VARCL>
+    <DBAPL>S</DBAPL>
+    <DBNA>D$</DBNA>
+    <SUBC>I</SUBC>
+    <FIXPT>X</FIXPT>
+    <LDBNAME>D$S</LDBNAME>
+    <UCCHECK>X</UCCHECK>
+   </PROGDIR>
+   <TPOOL>
+    <item>
+     <ID>R</ID>
+     <ENTRY>ZABAPGIT_OBJECT_FORM</ENTRY>
+     <LENGTH>20</LENGTH>
+    </item>
+   </TPOOL>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_object_fugr.prog.abap b/src/zabapgit_object_fugr.prog.abap
index 750976cc8..3fd94c39f 100644
--- a/src/zabapgit_object_fugr.prog.abap
+++ b/src/zabapgit_object_fugr.prog.abap
@@ -86,10 +86,6 @@ ENDCLASS.                    "lcl_object_fugr DEFINITION
 *----------------------------------------------------------------------*
 CLASS lcl_object_fugr IMPLEMENTATION.
 
-* function group SEUF
-* function group SIFP
-* function group SUNI
-
   METHOD lif_object~has_changed_since.
 
     DATA: lt_functab  TYPE ty_rs38l_incl_tt,
@@ -156,19 +152,19 @@ CLASS lcl_object_fugr IMPLEMENTATION.
     SELECT unam AS user udat AS date utime AS time FROM reposrc
       APPENDING CORRESPONDING FIELDS OF TABLE lt_stamps
       WHERE progname = lv_program
-      AND   r3state = 'A'.
+      AND   r3state = 'A'.                                "#EC CI_SUBRC
 
     LOOP AT lt_includes ASSIGNING <lv_include>.
       SELECT unam AS user udat AS date utime AS time FROM reposrc
         APPENDING CORRESPONDING FIELDS OF TABLE lt_stamps
         WHERE progname = <lv_include>
-        AND   r3state = 'A'.
+        AND   r3state = 'A'.                              "#EC CI_SUBRC
     ENDLOOP.
 
     SELECT unam AS user udat AS date utime AS time FROM repotext " Program text pool
       APPENDING CORRESPONDING FIELDS OF TABLE lt_stamps
       WHERE progname = lv_program
-      AND   r3state = 'A'.
+      AND   r3state = 'A'.                                "#EC CI_SUBRC
 
     SELECT vautor AS user vdatum AS date vzeit AS time FROM eudb         " GUI
       APPENDING CORRESPONDING FIELDS OF TABLE lt_stamps
@@ -293,7 +289,7 @@ CLASS lcl_object_fugr IMPLEMENTATION.
           ls_progdir   TYPE ty_progdir,
           lt_includes  TYPE rso_t_objnm,
           lt_tpool     TYPE textpool_table,
-          lt_tpool_ext TYPE ty_tpool_tt,
+          lt_tpool_ext TYPE lif_defs=>ty_tpool_tt,
           lt_source    TYPE TABLE OF abaptxt255.
 
     FIELD-SYMBOLS: <lv_include> LIKE LINE OF lt_includes.
@@ -395,8 +391,7 @@ CLASS lcl_object_fugr IMPLEMENTATION.
 
   METHOD serialize_xml.
 
-    DATA: lt_functab  TYPE ty_rs38l_incl_tt,
-          lt_includes TYPE rso_t_objnm,
+    DATA: lt_includes TYPE rso_t_objnm,
           lv_areat    TYPE tlibt-areat.
 
 
@@ -405,7 +400,6 @@ CLASS lcl_object_fugr IMPLEMENTATION.
       WHERE spras = mv_language
       AND area = ms_item-obj_name.        "#EC CI_GENBUFF "#EC CI_SUBRC
 
-    lt_functab = functions( ).
     lt_includes = includes( ).
 
     io_xml->add( iv_name = 'AREAT'
@@ -417,8 +411,14 @@ CLASS lcl_object_fugr IMPLEMENTATION.
 
   METHOD includes.
 
-    DATA: lv_program TYPE program,
-          lv_cnam    TYPE reposrc-cnam,
+    TYPES: BEGIN OF ty_reposrc,
+             progname TYPE reposrc-progname,
+             cnam     TYPE reposrc-cnam,
+           END OF ty_reposrc.
+
+    DATA: lt_reposrc TYPE STANDARD TABLE OF ty_reposrc WITH DEFAULT KEY,
+          ls_reposrc LIKE LINE OF lt_reposrc,
+          lv_program TYPE program,
           lv_tabix   LIKE sy-tabix,
           lt_functab TYPE ty_rs38l_incl_tt.
 
@@ -452,26 +452,25 @@ CLASS lcl_object_fugr IMPLEMENTATION.
     APPEND INITIAL LINE TO rt_includes ASSIGNING <lv_include>.
     <lv_include> = |L{ ms_item-obj_name }T00|.
 
+    IF lines( rt_includes ) > 0.
+      SELECT progname cnam FROM reposrc
+        INTO TABLE lt_reposrc
+        FOR ALL ENTRIES IN rt_includes
+        WHERE progname = rt_includes-table_line
+        AND r3state = 'A'.
+      SORT lt_reposrc BY progname ASCENDING.
+    ENDIF.
+
     LOOP AT rt_includes ASSIGNING <lv_include>.
       lv_tabix = sy-tabix.
 
-* skip SAP standard includes
-      SELECT SINGLE cnam FROM reposrc INTO lv_cnam
-        WHERE progname = <lv_include>
-        AND r3state = 'A'
-        AND cnam = 'SAP'.
-      IF sy-subrc = 0.
+* skip SAP standard includes and also make sure the include exists
+      READ TABLE lt_reposrc INTO ls_reposrc
+        WITH KEY progname = <lv_include> BINARY SEARCH.
+      IF sy-subrc <> 0 OR ls_reposrc-cnam = 'SAP'.
         DELETE rt_includes INDEX lv_tabix.
-        CONTINUE.
       ENDIF.
 
-* also make sure the include exists
-      SELECT SINGLE cnam FROM reposrc INTO lv_cnam
-        WHERE progname = <lv_include>
-        AND r3state = 'A'.
-      IF sy-subrc <> 0.
-        DELETE rt_includes INDEX lv_tabix.
-      ENDIF.
     ENDLOOP.
 
     APPEND lv_program TO rt_includes.
@@ -544,7 +543,7 @@ CLASS lcl_object_fugr IMPLEMENTATION.
       lt_source     TYPE TABLE OF rssource,
       lt_functab    TYPE ty_rs38l_incl_tt,
       lt_new_source TYPE rsfb_source,
-      ls_function        LIKE LINE OF rt_functions.
+      ls_function   LIKE LINE OF rt_functions.
 
     FIELD-SYMBOLS: <ls_func> LIKE LINE OF lt_functab.
 
@@ -658,6 +657,10 @@ CLASS lcl_object_fugr IMPLEMENTATION.
 
   METHOD lif_object~serialize.
 
+* function group SEUF
+* function group SIFP
+* function group SUNI
+
     DATA: lt_functions    TYPE ty_function_tt,
           ls_progdir      TYPE ty_progdir,
           lv_program_name TYPE programm,
@@ -765,7 +768,7 @@ CLASS lcl_object_fugr IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_fugr IMPLEMENTATION
diff --git a/src/zabapgit_object_iarp.prog.abap b/src/zabapgit_object_iarp.prog.abap
index ecf2118d5..ff3cd15b0 100644
--- a/src/zabapgit_object_iarp.prog.abap
+++ b/src/zabapgit_object_iarp.prog.abap
@@ -189,7 +189,7 @@ CLASS lcl_object_iarp IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_iarp IMPLEMENTATION
diff --git a/src/zabapgit_object_iasp.prog.abap b/src/zabapgit_object_iasp.prog.abap
index ae8338707..74c24d2a1 100644
--- a/src/zabapgit_object_iasp.prog.abap
+++ b/src/zabapgit_object_iasp.prog.abap
@@ -189,7 +189,7 @@ CLASS lcl_object_iasp IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_iasp IMPLEMENTATION
diff --git a/src/zabapgit_object_iatu.prog.abap b/src/zabapgit_object_iatu.prog.abap
index 57321b2cb..e589eaff8 100644
--- a/src/zabapgit_object_iatu.prog.abap
+++ b/src/zabapgit_object_iatu.prog.abap
@@ -206,7 +206,7 @@ CLASS lcl_object_iatu IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_iatu IMPLEMENTATION
diff --git a/src/zabapgit_object_intf.prog.abap b/src/zabapgit_object_intf.prog.abap
index 761fee5b6..2cfd0ec6f 100644
--- a/src/zabapgit_object_intf.prog.abap
+++ b/src/zabapgit_object_intf.prog.abap
@@ -13,7 +13,7 @@ CLASS lcl_object_intf DEFINITION FINAL INHERITING FROM lcl_objects_program.
     ALIASES mo_files FOR lif_object~mo_files.
     METHODS constructor
       IMPORTING
-        is_item     TYPE ty_item
+        is_item     TYPE lif_defs=>ty_item
         iv_language TYPE spras.
   PROTECTED SECTION.
     METHODS deserialize_abap
@@ -26,7 +26,7 @@ CLASS lcl_object_intf DEFINITION FINAL INHERITING FROM lcl_objects_program.
       RAISING   lcx_exception.
 
   PRIVATE SECTION.
-    DATA mo_object_oriented_object_fct TYPE REF TO lif_object_oriented_object_fnc.
+    DATA mo_object_oriented_object_fct TYPE REF TO lif_oo_object_fnc.
 
     METHODS serialize_xml
       IMPORTING io_xml TYPE REF TO lcl_xml_output
@@ -40,23 +40,25 @@ CLASS lcl_object_intf IMPLEMENTATION.
     super->constructor(
       is_item     = is_item
       iv_language = iv_language ).
-    mo_object_oriented_object_fct = lcl_object_oriented_factory=>make( iv_object_type = ms_item-obj_type ).
+    mo_object_oriented_object_fct = lcl_oo_factory=>make( iv_object_type = ms_item-obj_type ).
   ENDMETHOD.
+
   METHOD lif_object~deserialize.
     deserialize_abap( io_xml     = io_xml
                       iv_package = iv_package ).
 
     deserialize_docu( io_xml ).
   ENDMETHOD.
+
   METHOD deserialize_abap.
     DATA: ls_vseointerf   TYPE vseointerf,
           lt_source       TYPE seop_source_string,
-          lt_descriptions TYPE ty_seocompotx_tt,
+          lt_descriptions TYPE lif_defs=>ty_seocompotx_tt,
           ls_clskey       TYPE seoclskey.
+
+
     ls_clskey-clsname = ms_item-obj_name.
-
     lt_source = mo_files->read_abap( ).
-
     io_xml->read( EXPORTING iv_name = 'VSEOINTERF'
                   CHANGING cg_data = ls_vseointerf ).
 
@@ -143,7 +145,7 @@ CLASS lcl_object_intf IMPLEMENTATION.
 
   METHOD serialize_xml.
     DATA:
-      lt_descriptions TYPE ty_seocompotx_tt,
+      lt_descriptions TYPE lif_defs=>ty_seocompotx_tt,
       ls_vseointerf   TYPE vseointerf,
       ls_clskey       TYPE seoclskey,
       lt_lines        TYPE tlinetab.
@@ -212,7 +214,7 @@ CLASS lcl_object_intf IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
   METHOD lif_object~delete.
@@ -259,18 +261,18 @@ CLASS lcl_object_intf IMPLEMENTATION.
 ENDCLASS.
 
 
-CLASS lcl_object_oriented_interface DEFINITION
-  INHERITING FROM lcl_object_oriented_base.
+CLASS lcl_oo_interface DEFINITION
+  INHERITING FROM lcl_oo_base.
   PUBLIC SECTION.
     METHODS:
-      lif_object_oriented_object_fnc~create REDEFINITION,
-      lif_object_oriented_object_fnc~get_includes REDEFINITION,
-      lif_object_oriented_object_fnc~get_interface_properties REDEFINITION,
-      lif_object_oriented_object_fnc~delete REDEFINITION.
+      lif_oo_object_fnc~create REDEFINITION,
+      lif_oo_object_fnc~get_includes REDEFINITION,
+      lif_oo_object_fnc~get_interface_properties REDEFINITION,
+      lif_oo_object_fnc~delete REDEFINITION.
 ENDCLASS.
 
-CLASS lcl_object_oriented_interface IMPLEMENTATION.
-  METHOD lif_object_oriented_object_fnc~create.
+CLASS lcl_oo_interface IMPLEMENTATION.
+  METHOD lif_oo_object_fnc~create.
     CALL FUNCTION 'SEO_INTERFACE_CREATE_COMPLETE'
       EXPORTING
         devclass        = iv_package
@@ -289,13 +291,14 @@ CLASS lcl_object_oriented_interface IMPLEMENTATION.
       lcx_exception=>raise( 'Error from SEO_INTERFACE_CREATE_COMPLETE' ).
     ENDIF.
   ENDMETHOD.
-  METHOD lif_object_oriented_object_fnc~get_includes.
+
+  METHOD lif_oo_object_fnc~get_includes.
     DATA lv_interface_name TYPE seoclsname.
     lv_interface_name = iv_object_name.
     APPEND cl_oo_classname_service=>get_interfacepool_name( lv_interface_name ) TO rt_includes.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_interface_properties.
+  METHOD lif_oo_object_fnc~get_interface_properties.
     CALL FUNCTION 'SEO_CLIF_GET'
       EXPORTING
         cifkey       = is_interface_key
@@ -314,7 +317,7 @@ CLASS lcl_object_oriented_interface IMPLEMENTATION.
     ENDIF.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~delete.
+  METHOD lif_oo_object_fnc~delete.
     CALL FUNCTION 'SEO_INTERFACE_DELETE_COMPLETE'
       EXPORTING
         intkey       = is_deletion_key
diff --git a/src/zabapgit_object_msag.prog.abap b/src/zabapgit_object_msag.prog.abap
index 447502686..a152f2093 100644
--- a/src/zabapgit_object_msag.prog.abap
+++ b/src/zabapgit_object_msag.prog.abap
@@ -15,18 +15,18 @@ CLASS lcl_object_msag DEFINITION INHERITING FROM lcl_objects_super FINAL.
 
   PRIVATE SECTION.
     TYPES: BEGIN OF ty_t100_texts,
-           sprsl TYPE t100-sprsl,
-           msgnr TYPE t100-msgnr,
-           text  TYPE t100-text,
+             sprsl TYPE t100-sprsl,
+             msgnr TYPE t100-msgnr,
+             text  TYPE t100-text,
            END OF ty_t100_texts,
-           tt_t100_texts  TYPE STANDARD TABLE OF ty_t100_texts.
+           tt_t100_texts TYPE STANDARD TABLE OF ty_t100_texts.
 
     METHODS:
       serialize_texts
         IMPORTING io_xml TYPE REF TO lcl_xml_output
         RAISING   lcx_exception,
       deserialize_texts
-        IMPORTING io_xml        TYPE REF TO lcl_xml_input
+        IMPORTING io_xml TYPE REF TO lcl_xml_input
         RAISING   lcx_exception.
 
 
@@ -47,7 +47,8 @@ CLASS lcl_object_msag IMPLEMENTATION.
 
     SELECT SINGLE lastuser FROM t100a INTO rv_user
       WHERE arbgb = ms_item-obj_name.                   "#EC CI_GENBUFF
-    IF sy-subrc <> 0.
+    IF sy-subrc <> 0 OR
+       rv_user EQ ''.
       rv_user = c_user_unknown.
     ENDIF.
 
@@ -167,13 +168,15 @@ CLASS lcl_object_msag IMPLEMENTATION.
     ENDIF.
 
     LOOP AT lt_before INTO ls_t100u.
-      DELETE FROM t100 WHERE arbgb = ls_t100u-arbgb AND msgnr = ls_t100u-msgnr.
-      DELETE FROM t100u WHERE arbgb = ls_t100u-arbgb AND msgnr = ls_t100u-msgnr.
+      DELETE FROM t100 WHERE arbgb = ls_t100u-arbgb
+        AND msgnr = ls_t100u-msgnr.                       "#EC CI_SUBRC
+
+      DELETE FROM t100u WHERE arbgb = ls_t100u-arbgb
+        AND msgnr = ls_t100u-msgnr.                       "#EC CI_SUBRC
     ENDLOOP.
 
     deserialize_texts( io_xml = io_xml ).
 
-
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~serialize.
@@ -195,7 +198,7 @@ CLASS lcl_object_msag IMPLEMENTATION.
     SELECT * FROM t100 INTO TABLE lt_source
       WHERE sprsl = mv_language
       AND arbgb = lv_msg_id
-      ORDER BY PRIMARY KEY.      "#EC CI_SUBRC "#EC CI_GENBUFF
+      ORDER BY PRIMARY KEY.               "#EC CI_SUBRC "#EC CI_GENBUFF
 
     CLEAR: ls_inf-lastuser,
            ls_inf-ldate,
@@ -214,7 +217,7 @@ CLASS lcl_object_msag IMPLEMENTATION.
 
     DATA: lv_msg_id     TYPE rglif-message_id,
           lt_t100_texts TYPE tt_t100_texts,
-          lt_t100t      TYPE table of t100t,
+          lt_t100t      TYPE TABLE OF t100t,
           lt_i18n_langs TYPE TABLE OF langu.
 
     lv_msg_id = ms_item-obj_name.
@@ -224,21 +227,21 @@ CLASS lcl_object_msag IMPLEMENTATION.
     SELECT DISTINCT sprsl AS langu INTO TABLE lt_i18n_langs
       FROM t100t
       WHERE arbgb = lv_msg_id
-      AND   sprsl <> mv_language. "#EC CI_BYPASS "#EC CI_GENBUFF.
+      AND   sprsl <> mv_language.       "#EC CI_BYPASS "#EC CI_GENBUFF.
 
     SORT lt_i18n_langs ASCENDING.
 
-    IF LINES( lt_i18n_langs ) > 0.
+    IF lines( lt_i18n_langs ) > 0.
 
       SELECT * FROM t100t INTO CORRESPONDING FIELDS OF TABLE lt_t100t
         WHERE sprsl <> mv_language
-        AND arbgb = lv_msg_id.  "#EC CI_GENBUFF
+        AND arbgb = lv_msg_id.                          "#EC CI_GENBUFF
 
       SELECT * FROM t100 INTO CORRESPONDING FIELDS OF TABLE lt_t100_texts
         FOR ALL ENTRIES IN lt_i18n_langs
         WHERE sprsl = lt_i18n_langs-table_line
         AND arbgb = lv_msg_id
-        ORDER BY PRIMARY KEY.               "#EC CI_SUBRC "#EC CI_GENBUFF
+        ORDER BY PRIMARY KEY.             "#EC CI_SUBRC "#EC CI_GENBUFF
 
       SORT lt_t100t BY sprsl ASCENDING.
       SORT lt_t100_texts BY sprsl msgnr ASCENDING.
@@ -260,7 +263,7 @@ CLASS lcl_object_msag IMPLEMENTATION.
 
     DATA: lv_msg_id     TYPE rglif-message_id,
           ls_t100       TYPE t100,
-          lt_t100t      TYPE table of t100t,
+          lt_t100t      TYPE TABLE OF t100t,
           lt_t100_texts TYPE tt_t100_texts,
           lt_t100u      TYPE TABLE OF t100u.
 
@@ -270,7 +273,7 @@ CLASS lcl_object_msag IMPLEMENTATION.
     lv_msg_id = ms_item-obj_name.
 
     SELECT * FROM t100u INTO TABLE lt_t100u
-      WHERE arbgb = lv_msg_id ORDER BY PRIMARY KEY. "#EC CI_GENBUFF
+      WHERE arbgb = lv_msg_id ORDER BY PRIMARY KEY.     "#EC CI_GENBUFF
 
     io_xml->read( EXPORTING iv_name = 'T100_TEXTS'
                   CHANGING  cg_data = lt_t100_texts ).
@@ -278,7 +281,7 @@ CLASS lcl_object_msag IMPLEMENTATION.
     io_xml->read( EXPORTING iv_name = 'T100T'
                   CHANGING  cg_data = lt_t100t ).
 
-    MODIFY t100t FROM TABLE lt_t100t.                    "#EC CI_SUBRC
+    MODIFY t100t FROM TABLE lt_t100t.                     "#EC CI_SUBRC
 
     LOOP AT lt_t100_texts ASSIGNING <ls_t100_text>.
       "check if message exists
@@ -288,7 +291,7 @@ CLASS lcl_object_msag IMPLEMENTATION.
 
       MOVE-CORRESPONDING <ls_t100_text> TO ls_t100.
       ls_t100-arbgb = lv_msg_id.
-      MODIFY t100 FROM ls_t100.                         "#EC CI_SUBRC
+      MODIFY t100 FROM ls_t100.                           "#EC CI_SUBRC
       IF sy-subrc <> 0.
         lcx_exception=>raise( 'MSAG: Table T100 modify failed' ).
       ENDIF.
@@ -297,7 +300,7 @@ CLASS lcl_object_msag IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_msag IMPLEMENTATION
diff --git a/src/zabapgit_object_nrob.prog.abap b/src/zabapgit_object_nrob.prog.abap
index 489db90f5..1e4fa6e63 100644
--- a/src/zabapgit_object_nrob.prog.abap
+++ b/src/zabapgit_object_nrob.prog.abap
@@ -255,7 +255,7 @@ CLASS lcl_object_nrob IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_nrob IMPLEMENTATION
diff --git a/src/zabapgit_object_oo_factory.prog.abap b/src/zabapgit_object_oo_factory.prog.abap
index 9668924b1..b825492ea 100644
--- a/src/zabapgit_object_oo_factory.prog.abap
+++ b/src/zabapgit_object_oo_factory.prog.abap
@@ -1,29 +1,30 @@
 *&---------------------------------------------------------------------*
 *&  Include  zabapgit_object_oo_factory
 *&---------------------------------------------------------------------*
-CLASS lcl_object_oriented_factory IMPLEMENTATION.
+CLASS lcl_oo_factory IMPLEMENTATION.
   METHOD make.
     IF go_object_oriented_object IS BOUND.
       ro_object_oriented_object = go_object_oriented_object.
       RETURN.
     ENDIF.
     IF iv_object_type = 'CLAS'.
-      CREATE OBJECT ro_object_oriented_object TYPE lcl_object_oriented_class.
+      CREATE OBJECT ro_object_oriented_object TYPE lcl_oo_class.
     ELSEIF iv_object_type = 'INTF'.
-      CREATE OBJECT ro_object_oriented_object TYPE lcl_object_oriented_interface.
+      CREATE OBJECT ro_object_oriented_object TYPE lcl_oo_interface.
     ENDIF.
   ENDMETHOD.
 ENDCLASS.
 
-CLASS lth_oo_factory_injector DEFINITION FOR TESTING.
+CLASS ltcl_oo_factory_injector DEFINITION FOR TESTING.
   PUBLIC SECTION.
     CLASS-METHODS:
       inject
         IMPORTING
-          io_object_oriented_object TYPE REF TO lif_object_oriented_object_fnc.
+          io_object_oriented_object TYPE REF TO lif_oo_object_fnc.
 ENDCLASS.
-CLASS lth_oo_factory_injector IMPLEMENTATION.
+
+CLASS ltcl_oo_factory_injector IMPLEMENTATION.
   METHOD inject.
-    lcl_object_oriented_factory=>go_object_oriented_object = io_object_oriented_object.
+    lcl_oo_factory=>go_object_oriented_object = io_object_oriented_object.
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/zabapgit_object_oo_functions.prog.abap b/src/zabapgit_object_oo_functions.prog.abap
index f6fe9be8f..fe6c1da0b 100644
--- a/src/zabapgit_object_oo_functions.prog.abap
+++ b/src/zabapgit_object_oo_functions.prog.abap
@@ -1,6 +1,6 @@
 "This interface contains SAP object oriented functions that can't be put under test
 "(i.e. creating a Class in the system)
-INTERFACE lif_object_oriented_object_fnc.
+INTERFACE lif_oo_object_fnc.
   TYPES: BEGIN OF ty_includes,
            programm TYPE programm,
          END OF ty_includes,
@@ -28,7 +28,7 @@ INTERFACE lif_object_oriented_object_fnc.
     deserialize_source
       IMPORTING
         is_key    TYPE seoclskey
-        it_source TYPE ty_string_tt
+        it_source TYPE lif_defs=>ty_string_tt
       RAISING
         lcx_exception
         cx_sy_dyn_call_error,
@@ -42,16 +42,16 @@ INTERFACE lif_object_oriented_object_fnc.
     update_descriptions
       IMPORTING
         is_key          TYPE seoclskey
-        it_descriptions TYPE ty_seocompotx_tt,
+        it_descriptions TYPE lif_defs=>ty_seocompotx_tt,
     add_to_activation_list
       IMPORTING
-        is_item TYPE ty_item
+        is_item TYPE lif_defs=>ty_item
       RAISING
         lcx_exception,
     create_sotr
       IMPORTING
         iv_package TYPE devclass
-        it_sotr    TYPE ty_sotr_tt
+        it_sotr    TYPE lif_defs=>ty_sotr_tt
       RAISING
         lcx_exception,
     create_documentation
@@ -76,7 +76,7 @@ INTERFACE lif_object_oriented_object_fnc.
         is_class_key     TYPE seoclskey
         iv_type          TYPE seop_include_ext_app OPTIONAL
       RETURNING
-        VALUE(rt_source) TYPE ty_string_tt
+        VALUE(rt_source) TYPE lif_defs=>ty_string_tt
       RAISING
         lcx_exception
         cx_sy_dyn_call_error,
@@ -113,14 +113,14 @@ INTERFACE lif_object_oriented_object_fnc.
       IMPORTING
         iv_object_name TYPE sobj_name
       RETURNING
-        VALUE(rt_sotr) TYPE ty_sotr_tt
+        VALUE(rt_sotr) TYPE lif_defs=>ty_sotr_tt
       RAISING
         lcx_exception,
     read_descriptions
       IMPORTING
         iv_obejct_name         TYPE seoclsname
       RETURNING
-        VALUE(rt_descriptions) TYPE ty_seocompotx_tt,
+        VALUE(rt_descriptions) TYPE lif_defs=>ty_seocompotx_tt,
     delete
       IMPORTING
         is_deletion_key TYPE seoclskey
@@ -128,16 +128,15 @@ INTERFACE lif_object_oriented_object_fnc.
         lcx_exception.
 ENDINTERFACE.
 
-CLASS lcl_oo_object_serializer DEFINITION.
+CLASS lcl_oo_serializer DEFINITION.
   PUBLIC SECTION.
 
     METHODS:
       serialize_abap_clif_source
         IMPORTING
           is_class_key     TYPE seoclskey
-          iv_type          TYPE seop_include_ext_app OPTIONAL
         RETURNING
-          VALUE(rt_source) TYPE ty_string_tt
+          VALUE(rt_source) TYPE lif_defs=>ty_string_tt
         RAISING
           lcx_exception
           cx_sy_dyn_call_error,
@@ -146,37 +145,37 @@ CLASS lcl_oo_object_serializer DEFINITION.
           VALUE(rv_return) TYPE abap_bool.
     METHODS serialize_locals_imp
       IMPORTING is_clskey        TYPE seoclskey
-      RETURNING VALUE(rt_source) TYPE ty_string_tt
+      RETURNING VALUE(rt_source) TYPE lif_defs=>ty_string_tt
       RAISING   lcx_exception.
 
     METHODS serialize_locals_def
       IMPORTING is_clskey        TYPE seoclskey
-      RETURNING VALUE(rt_source) TYPE ty_string_tt
+      RETURNING VALUE(rt_source) TYPE lif_defs=>ty_string_tt
       RAISING   lcx_exception.
     METHODS serialize_testclasses
       IMPORTING
                 is_clskey        TYPE seoclskey
-      RETURNING VALUE(rt_source) TYPE ty_string_tt
+      RETURNING VALUE(rt_source) TYPE lif_defs=>ty_string_tt
       RAISING   lcx_exception.
 
     METHODS serialize_macros
       IMPORTING is_clskey        TYPE seoclskey
-      RETURNING VALUE(rt_source) TYPE ty_string_tt
+      RETURNING VALUE(rt_source) TYPE lif_defs=>ty_string_tt
       RAISING   lcx_exception.
   PRIVATE SECTION.
     DATA mv_skip_testclass TYPE abap_bool.
     METHODS serialize_abap_old
       IMPORTING is_clskey        TYPE seoclskey
-      RETURNING VALUE(rt_source) TYPE ty_string_tt
+      RETURNING VALUE(rt_source) TYPE lif_defs=>ty_string_tt
       RAISING   lcx_exception.
 
     METHODS serialize_abap_new
       IMPORTING is_clskey        TYPE seoclskey
-      RETURNING VALUE(rt_source) TYPE ty_string_tt
+      RETURNING VALUE(rt_source) TYPE lif_defs=>ty_string_tt
       RAISING   lcx_exception
                 cx_sy_dyn_call_error.
     METHODS remove_signatures
-      CHANGING ct_source TYPE ty_string_tt.
+      CHANGING ct_source TYPE lif_defs=>ty_string_tt.
 
     METHODS read_include
       IMPORTING is_clskey        TYPE seoclskey
@@ -185,10 +184,10 @@ CLASS lcl_oo_object_serializer DEFINITION.
 
 
     METHODS reduce
-      CHANGING ct_source TYPE ty_string_tt.
+      CHANGING ct_source TYPE lif_defs=>ty_string_tt.
 ENDCLASS.
 
-CLASS lcl_oo_object_serializer IMPLEMENTATION.
+CLASS lcl_oo_serializer IMPLEMENTATION.
   METHOD serialize_abap_clif_source.
     TRY.
         rt_source = serialize_abap_new( is_class_key ).
@@ -196,6 +195,7 @@ CLASS lcl_oo_object_serializer IMPLEMENTATION.
         rt_source = serialize_abap_old( is_class_key ).
     ENDTRY.
   ENDMETHOD.
+
   METHOD serialize_abap_old.
 * for old ABAP AS versions
     DATA: lo_source TYPE REF TO cl_oo_source.
@@ -384,30 +384,32 @@ CLASS lcl_oo_object_serializer IMPLEMENTATION.
 
 ENDCLASS.
 
-CLASS lcl_object_oriented_base DEFINITION ABSTRACT.
+CLASS lcl_oo_base DEFINITION ABSTRACT.
   PUBLIC SECTION.
-    INTERFACES: lif_object_oriented_object_fnc.
+    INTERFACES: lif_oo_object_fnc.
+
   PRIVATE SECTION.
     DATA mv_skip_test_classes TYPE abap_bool.
+
     METHODS deserialize_abap_source_old
       IMPORTING is_clskey TYPE seoclskey
-                it_source TYPE ty_string_tt
+                it_source TYPE lif_defs=>ty_string_tt
       RAISING   lcx_exception.
 
     METHODS deserialize_abap_source_new
       IMPORTING is_clskey TYPE seoclskey
-                it_source TYPE ty_string_tt
+                it_source TYPE lif_defs=>ty_string_tt
       RAISING   lcx_exception
                 cx_sy_dyn_call_error.
 ENDCLASS.
 
-CLASS lcl_object_oriented_base IMPLEMENTATION.
+CLASS lcl_oo_base IMPLEMENTATION.
 
-  METHOD lif_object_oriented_object_fnc~create.
+  METHOD lif_oo_object_fnc~create.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~deserialize_source.
+  METHOD lif_oo_object_fnc~deserialize_source.
     TRY.
         deserialize_abap_source_new(
           is_clskey = is_key
@@ -419,7 +421,7 @@ CLASS lcl_object_oriented_base IMPLEMENTATION.
     ENDTRY.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~generate_locals.
+  METHOD lif_oo_object_fnc~generate_locals.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
@@ -480,24 +482,25 @@ CLASS lcl_object_oriented_base IMPLEMENTATION.
     CALL METHOD lo_source->('IF_OO_CLIF_SOURCE~UNLOCK').
 
   ENDMETHOD.
-  METHOD lif_object_oriented_object_fnc~add_to_activation_list.
+
+  METHOD lif_oo_object_fnc~add_to_activation_list.
     lcl_objects_activation=>add_item( is_item ).
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~update_descriptions.
-    DELETE FROM seocompotx WHERE clsname = is_key-clsname.
-    INSERT seocompotx FROM TABLE it_descriptions.
+  METHOD lif_oo_object_fnc~update_descriptions.
+    DELETE FROM seocompotx WHERE clsname = is_key-clsname. "#EC CI_SUBRC
+    INSERT seocompotx FROM TABLE it_descriptions.         "#EC CI_SUBRC
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~insert_text_pool.
+  METHOD lif_oo_object_fnc~insert_text_pool.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~create_sotr.
+  METHOD lif_oo_object_fnc~create_sotr.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~create_documentation.
+  METHOD lif_oo_object_fnc~create_documentation.
     CALL FUNCTION 'DOCU_UPD'
       EXPORTING
         id       = 'CL'
@@ -513,11 +516,11 @@ CLASS lcl_object_oriented_base IMPLEMENTATION.
     ENDIF.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_includes.
+  METHOD lif_oo_object_fnc~get_includes.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~exists.
+  METHOD lif_oo_object_fnc~exists.
     CALL FUNCTION 'SEO_CLASS_EXISTENCE_CHECK'
       EXPORTING
         clskey        = iv_object_name
@@ -531,8 +534,8 @@ CLASS lcl_object_oriented_base IMPLEMENTATION.
     rv_exists = boolc( sy-subrc <> 2 ).
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~serialize_abap.
-    DATA lo_oo_serializer TYPE REF TO lcl_oo_object_serializer.
+  METHOD lif_oo_object_fnc~serialize_abap.
+    DATA lo_oo_serializer TYPE REF TO lcl_oo_serializer.
     CREATE OBJECT lo_oo_serializer.
     CASE iv_type.
       WHEN seop_ext_class_locals_def.
@@ -548,30 +551,31 @@ CLASS lcl_object_oriented_base IMPLEMENTATION.
         rt_source = lo_oo_serializer->serialize_abap_clif_source( is_class_key ).
     ENDCASE.
   ENDMETHOD.
-  METHOD lif_object_oriented_object_fnc~get_skip_test_classes.
+
+  METHOD lif_oo_object_fnc~get_skip_test_classes.
     rv_skip = mv_skip_test_classes.
   ENDMETHOD.
-  METHOD lif_object_oriented_object_fnc~get_class_properties.
+
+  METHOD lif_oo_object_fnc~get_class_properties.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_interface_properties.
+  METHOD lif_oo_object_fnc~get_interface_properties.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_text_pool.
+  METHOD lif_oo_object_fnc~read_text_pool.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_sotr.
+  METHOD lif_oo_object_fnc~read_sotr.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_documentation.
-    DATA:
-      lv_state  TYPE dokstate,
-      lv_object TYPE dokhl-object,
-      lt_lines  TYPE tlinetab.
+  METHOD lif_oo_object_fnc~read_documentation.
+    DATA: lv_state  TYPE dokstate,
+          lv_object TYPE dokhl-object,
+          lt_lines  TYPE tlinetab.
 
     lv_object = iv_class_name.
 
@@ -597,33 +601,34 @@ CLASS lcl_object_oriented_base IMPLEMENTATION.
     ENDIF.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_descriptions.
+  METHOD lif_oo_object_fnc~read_descriptions.
     SELECT * FROM seocompotx INTO TABLE rt_descriptions
-      WHERE clsname = iv_obejct_name.
+      WHERE clsname = iv_obejct_name.                     "#EC CI_SUBRC
     DELETE rt_descriptions WHERE descript IS INITIAL.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~delete.
+  METHOD lif_oo_object_fnc~delete.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
 
 ENDCLASS.
 
 "Backdoor injection for test purposes
-CLASS lth_oo_factory_injector DEFINITION DEFERRED.
+CLASS ltcl_oo_factory_injector DEFINITION DEFERRED.
+
+CLASS lcl_oo_factory DEFINITION
+  FRIENDS ltcl_oo_factory_injector.
 
-CLASS lcl_object_oriented_factory DEFINITION
-  FRIENDS lth_oo_factory_injector.
   PUBLIC SECTION.
     CLASS-METHODS:
       make
         IMPORTING
           iv_object_type                   TYPE tadir-object
         RETURNING
-          VALUE(ro_object_oriented_object) TYPE REF TO lif_object_oriented_object_fnc.
+          VALUE(ro_object_oriented_object) TYPE REF TO lif_oo_object_fnc.
   PRIVATE SECTION.
     CLASS-DATA:
-        go_object_oriented_object TYPE REF TO lif_object_oriented_object_fnc.
+        go_object_oriented_object TYPE REF TO lif_oo_object_fnc.
 ENDCLASS.
 "lcl_object_oriented_factory implementation is in include ZABAPGIT_OBJECT_OO_FACTORY.
 "Reason: In this way, clas and intf specific OO functions implementations can be done
diff --git a/src/zabapgit_object_para.prog.abap b/src/zabapgit_object_para.prog.abap
index c3ad3e5b8..be4d3613b 100644
--- a/src/zabapgit_object_para.prog.abap
+++ b/src/zabapgit_object_para.prog.abap
@@ -145,7 +145,7 @@ CLASS lcl_object_para IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_para IMPLEMENTATION
diff --git a/src/zabapgit_object_pinf.prog.abap b/src/zabapgit_object_pinf.prog.abap
index 887be21e3..810d7696e 100644
--- a/src/zabapgit_object_pinf.prog.abap
+++ b/src/zabapgit_object_pinf.prog.abap
@@ -356,7 +356,7 @@ CLASS lcl_object_pinf IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_PINF IMPLEMENTATION
diff --git a/src/zabapgit_object_prog.prog.abap b/src/zabapgit_object_prog.prog.abap
index 8c0d9dab7..76867444d 100644
--- a/src/zabapgit_object_prog.prog.abap
+++ b/src/zabapgit_object_prog.prog.abap
@@ -14,19 +14,19 @@ CLASS lcl_object_prog DEFINITION INHERITING FROM lcl_objects_program FINAL.
     ALIASES mo_files FOR lif_object~mo_files.
 
   PRIVATE SECTION.
-    TYPES:  BEGIN OF ty_tpool_i18n,
-              language TYPE langu,
-              textpool TYPE textpool_table,
-            END OF ty_tpool_i18n,
-            tt_tpool_i18n TYPE STANDARD TABLE OF ty_tpool_i18n.
+    TYPES: BEGIN OF ty_tpool_i18n,
+             language TYPE langu,
+             textpool TYPE lif_defs=>ty_tpool_tt,
+           END OF ty_tpool_i18n,
+           tt_tpool_i18n TYPE STANDARD TABLE OF ty_tpool_i18n.
 
     METHODS:
-    serialize_texts
-      IMPORTING io_xml TYPE REF TO lcl_xml_output
-      RAISING lcx_exception,
-    deserialize_texts
-      IMPORTING io_xml TYPE REF TO lcl_xml_input
-      RAISING lcx_exception.
+      serialize_texts
+        IMPORTING io_xml TYPE REF TO lcl_xml_output
+        RAISING   lcx_exception,
+      deserialize_texts
+        IMPORTING io_xml TYPE REF TO lcl_xml_input
+        RAISING   lcx_exception.
 
 ENDCLASS.                    "lcl_object_prog DEFINITION
 
@@ -120,7 +120,7 @@ CLASS lcl_object_prog IMPLEMENTATION.
           ls_progdir      TYPE ty_progdir,
           lt_tpool        TYPE textpool_table,
           lt_dynpros      TYPE ty_dynpro_tt,
-          lt_tpool_ext    TYPE ty_tpool_tt,
+          lt_tpool_ext    TYPE lif_defs=>ty_tpool_tt,
           ls_cua          TYPE ty_cua,
           lt_source       TYPE abaptxt255_tab.
 
@@ -158,12 +158,13 @@ CLASS lcl_object_prog IMPLEMENTATION.
   ENDMETHOD.                    "lif_serialize~deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.                    "lif_object~compare_to_remote_version
 
   METHOD serialize_texts.
 
-    DATA  lt_tpool_i18n TYPE tt_tpool_i18n.
+    DATA: lt_tpool_i18n TYPE tt_tpool_i18n,
+          lt_tpool      TYPE textpool_table.
 
     FIELD-SYMBOLS <tpool> LIKE LINE OF lt_tpool_i18n.
 
@@ -181,7 +182,8 @@ CLASS lcl_object_prog IMPLEMENTATION.
     LOOP AT lt_tpool_i18n ASSIGNING <tpool>.
       READ TEXTPOOL ms_item-obj_name
         LANGUAGE <tpool>-language
-        INTO <tpool>-textpool.
+        INTO lt_tpool.
+      <tpool>-textpool = add_tpool( lt_tpool ).
     ENDLOOP.
 
     IF lines( lt_tpool_i18n ) > 0.
@@ -193,16 +195,19 @@ CLASS lcl_object_prog IMPLEMENTATION.
 
   METHOD deserialize_texts.
 
-    DATA lt_tpool_i18n  TYPE tt_tpool_i18n.
+    DATA: lt_tpool_i18n TYPE tt_tpool_i18n,
+          lt_tpool      TYPE textpool_table.
+
     FIELD-SYMBOLS <tpool> LIKE LINE OF lt_tpool_i18n.
 
     io_xml->read( EXPORTING iv_name = 'I18N_TPOOL'
                   CHANGING  cg_data = lt_tpool_i18n ).
 
     LOOP AT lt_tpool_i18n ASSIGNING <tpool>.
+      lt_tpool = read_tpool( <tpool>-textpool ).
       deserialize_textpool( iv_program  = ms_item-obj_name
                             iv_language = <tpool>-language
-                            it_tpool    = <tpool>-textpool ).
+                            it_tpool    = lt_tpool ).
     ENDLOOP.
 
   ENDMETHOD.                    "deserialize_texts
diff --git a/src/zabapgit_object_samc.prog.abap b/src/zabapgit_object_samc.prog.abap
new file mode 100644
index 000000000..166d48a1c
--- /dev/null
+++ b/src/zabapgit_object_samc.prog.abap
@@ -0,0 +1,365 @@
+*&---------------------------------------------------------------------*
+*&  Include           ZABAPGIT_OBJECT_SAMC
+*&---------------------------------------------------------------------*
+
+CLASS lcl_object_samc DEFINITION INHERITING FROM lcl_objects_super FINAL.
+
+  PUBLIC SECTION.
+    INTERFACES lif_object.
+
+  PRIVATE SECTION.
+    DATA: mo_persistence       TYPE REF TO if_wb_object_persist,
+          mo_amc_appl_obj_data TYPE REF TO if_wb_object_data_model.
+
+    METHODS:
+      get_data_object
+        RETURNING
+          VALUE(ro_amc_appl_obj_data) TYPE REF TO if_wb_object_data_model
+        RAISING
+          lcx_exception,
+
+      get_persistence
+        RETURNING
+          VALUE(ro_persistence) TYPE REF TO if_wb_object_persist
+        RAISING
+          lcx_exception,
+
+      get_data
+        EXPORTING
+          p_data TYPE any
+        RAISING
+          lcx_exception,
+
+      lock
+        RAISING
+          lcx_exception,
+
+      unlock
+        RAISING
+          lcx_exception.
+
+ENDCLASS.                    "lcl_object_samc DEFINITION
+
+*----------------------------------------------------------------------*
+*       CLASS lcl_object_samc IMPLEMENTATION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+CLASS lcl_object_samc IMPLEMENTATION.
+
+  METHOD lif_object~has_changed_since.
+    rv_changed = abap_true.
+  ENDMETHOD.  "lif_object~has_changed_since
+
+  METHOD lif_object~changed_by.
+
+    DATA: lr_data TYPE REF TO data.
+    FIELD-SYMBOLS: <ls_data>    TYPE any,
+                   <ls_header>  TYPE any,
+                   <changed_by> TYPE any.
+
+    TRY.
+        CREATE DATA lr_data TYPE ('AMC_APPLICATION_COMPLETE').
+        ASSIGN lr_data->* TO <ls_data>.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'SAMC not supported' ).
+    ENDTRY.
+
+    get_data(
+      IMPORTING
+        p_data = <ls_data> ).
+
+    ASSIGN COMPONENT 'HEADER' OF STRUCTURE <ls_data> TO <ls_header>.
+    ASSERT sy-subrc = 0.
+    ASSIGN COMPONENT 'CHANGED_BY' OF STRUCTURE <ls_header> TO <changed_by>.
+    ASSERT sy-subrc = 0.
+
+    rv_user = <changed_by>.
+
+  ENDMETHOD.
+
+  METHOD lif_object~get_metadata.
+    rs_metadata = get_metadata( ).
+    rs_metadata-delete_tadir = abap_true.
+  ENDMETHOD.                    "lif_object~get_metadata.
+
+  METHOD lif_object~exists.
+
+    DATA: ls_tadir TYPE tadir.
+
+    ls_tadir = lcl_tadir=>read_single(
+      iv_object   = ms_item-obj_type
+      iv_obj_name = ms_item-obj_name ).
+    IF ls_tadir IS INITIAL.
+      RETURN.
+    ENDIF.
+
+    TRY.
+        get_data_object( ).
+
+      CATCH lcx_exception.
+        RETURN.
+    ENDTRY.
+
+    rv_bool = abap_true.
+
+  ENDMETHOD.                    "lif_object~exists
+
+  METHOD lif_object~serialize.
+
+    DATA: lr_data   TYPE REF TO data.
+
+    FIELD-SYMBOLS: <ls_data>   TYPE any,
+                   <ls_header> TYPE any,
+                   <field>     TYPE any.
+
+    TRY.
+        CREATE DATA lr_data TYPE ('AMC_APPLICATION_COMPLETE').
+        ASSIGN lr_data->* TO <ls_data>.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'SAMC not supported' ).
+    ENDTRY.
+
+    get_data(
+      IMPORTING
+        p_data = <ls_data> ).
+
+    ASSIGN COMPONENT 'HEADER' OF STRUCTURE <ls_data> TO <ls_header>.
+    ASSERT sy-subrc = 0.
+
+    ASSIGN COMPONENT 'CHANGED_ON' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CHANGED_BY' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CHANGED_AT' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CHANGED_CLNT' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CREATED_ON' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CREATED_BY' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CREATED_AT' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CREATED_CLNT' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    io_xml->add( iv_name = 'SAMC'
+                 ig_data = <ls_data> ).
+
+  ENDMETHOD.                    "serialize
+
+  METHOD lif_object~deserialize.
+
+    DATA: li_appl_obj_data TYPE REF TO if_wb_object_data_model,
+          lr_data          TYPE REF TO data.
+
+    FIELD-SYMBOLS: <ls_data> TYPE any.
+
+    TRY.
+        CREATE DATA lr_data TYPE ('AMC_APPLICATION_COMPLETE').
+        ASSIGN lr_data->* TO <ls_data>.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'SAMC not supported' ).
+    ENDTRY.
+
+    io_xml->read(
+      EXPORTING
+        iv_name = 'SAMC'
+      CHANGING
+        cg_data = <ls_data> ).
+
+    IF lif_object~exists( ) = abap_true.
+      lif_object~delete( ).
+    ENDIF.
+
+    li_appl_obj_data = get_data_object( ).
+
+    TRY.
+        lock( ).
+
+        CALL FUNCTION 'RS_CORR_INSERT'
+          EXPORTING
+            object              = ms_item-obj_name
+            object_class        = 'SAMC'
+            mode                = 'I'
+            global_lock         = abap_true
+            devclass            = iv_package
+            master_language     = mv_language
+          EXCEPTIONS
+            cancelled           = 1
+            permission_failure  = 2
+            unknown_objectclass = 3
+            OTHERS              = 4.
+
+        IF sy-subrc <> 0.
+          lcx_exception=>raise( 'Error occured while creating SAMC' ).
+        ENDIF.
+
+        li_appl_obj_data->set_data( <ls_data> ).
+
+        get_persistence( )->save( p_object_data = li_appl_obj_data ).
+
+        unlock( ).
+
+      CATCH cx_swb_exception.
+        lcx_exception=>raise( 'Error occured while creating SAMC' ).
+    ENDTRY.
+
+  ENDMETHOD.                    "deserialize
+
+  METHOD lif_object~delete.
+
+    DATA: object_key TYPE seu_objkey.
+
+    object_key = ms_item-obj_name.
+
+    TRY.
+        lock( ).
+
+        get_persistence( )->delete( p_object_key = object_key ).
+
+        unlock( ).
+
+      CATCH cx_swb_exception.
+        lcx_exception=>raise( 'Error occured while deleting SAMC' ).
+    ENDTRY.
+
+  ENDMETHOD.                    "delete
+
+  METHOD lif_object~jump.
+
+    CALL FUNCTION 'RS_TOOL_ACCESS'
+      EXPORTING
+        operation   = 'SHOW'
+        object_name = ms_item-obj_name
+        object_type = ms_item-obj_type.
+
+  ENDMETHOD.                    "jump
+
+  METHOD lif_object~compare_to_remote_version.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
+  ENDMETHOD.
+
+  METHOD get_data_object.
+
+    IF mo_amc_appl_obj_data IS NOT BOUND.
+
+      TRY.
+          CREATE OBJECT mo_amc_appl_obj_data TYPE ('CL_AMC_APPLICATION_OBJ_DATA').
+
+        CATCH cx_root.
+          lcx_exception=>raise( 'SAMC not supported' ).
+      ENDTRY.
+
+    ENDIF.
+
+    ro_amc_appl_obj_data = mo_amc_appl_obj_data.
+
+  ENDMETHOD.
+
+
+  METHOD get_persistence.
+
+    IF mo_persistence IS NOT BOUND.
+
+      TRY.
+          CREATE OBJECT mo_persistence TYPE ('CL_AMC_APPLICATION_OBJ_PERS').
+
+        CATCH cx_root.
+          lcx_exception=>raise( 'SAMC not supported' ).
+      ENDTRY.
+
+    ENDIF.
+
+    ro_persistence = mo_persistence.
+
+  ENDMETHOD.
+
+
+  METHOD lock.
+
+    DATA: objname    TYPE trobj_name,
+          object_key TYPE seu_objkey,
+          objtype    TYPE trobjtype.
+
+    objname    = ms_item-obj_name.
+    object_key = ms_item-obj_name.
+    objtype    = ms_item-obj_type.
+
+    get_persistence( )->lock(
+      EXPORTING
+        p_objname_tr   = objname
+        p_object_key   = object_key
+        p_objtype_tr   = objtype
+      EXCEPTIONS
+        foreign_lock   = 1
+        error_occurred = 2
+        OTHERS         = 3 ).
+
+    IF sy-subrc <> 0.
+      lcx_exception=>raise( `Error occured while locking SAMC ` && objname ).
+    ENDIF.
+
+  ENDMETHOD.
+
+  METHOD unlock.
+
+    DATA: objname    TYPE trobj_name,
+          object_key TYPE seu_objkey,
+          objtype    TYPE trobjtype.
+
+    objname    = ms_item-obj_name.
+    object_key = ms_item-obj_name.
+    objtype    = ms_item-obj_type.
+
+    get_persistence( )->unlock( p_objname_tr = objname
+                                p_object_key = object_key
+                                p_objtype_tr = objtype ).
+
+  ENDMETHOD.
+
+  METHOD get_data.
+
+    DATA:  object_key  TYPE seu_objkey.
+
+    object_key = ms_item-obj_name.
+
+    TRY.
+        get_persistence( )->get(
+          EXPORTING
+            p_object_key  = object_key
+            p_version     = 'A'
+          CHANGING
+            p_object_data = mo_amc_appl_obj_data ).
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'SAMC error' ).
+    ENDTRY.
+
+    mo_amc_appl_obj_data->get_data(
+      IMPORTING
+        p_data = p_data ).
+
+  ENDMETHOD.
+
+
+ENDCLASS.                    "lcl_object_samc IMPLEMENTATION
diff --git a/src/zabapgit_object_samc.prog.xml b/src/zabapgit_object_samc.prog.xml
new file mode 100644
index 000000000..861bd3b6b
--- /dev/null
+++ b/src/zabapgit_object_samc.prog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <PROGDIR>
+    <NAME>ZABAPGIT_OBJECT_SAMC</NAME>
+    <STATE>A</STATE>
+    <VARCL>X</VARCL>
+    <SUBC>I</SUBC>
+    <RLOAD>E</RLOAD>
+    <UCCHECK>X</UCCHECK>
+   </PROGDIR>
+   <TPOOL>
+    <item>
+     <ID>R</ID>
+     <ENTRY>Include ZABAPGIT_OBJECT_SAMC</ENTRY>
+     <LENGTH>28</LENGTH>
+    </item>
+   </TPOOL>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_object_sapc.prog.abap b/src/zabapgit_object_sapc.prog.abap
new file mode 100644
index 000000000..f05010fa7
--- /dev/null
+++ b/src/zabapgit_object_sapc.prog.abap
@@ -0,0 +1,365 @@
+*&---------------------------------------------------------------------*
+*&  Include           ZABAPGIT_OBJECT_SAPC
+*&---------------------------------------------------------------------*
+
+CLASS lcl_object_sapc DEFINITION INHERITING FROM lcl_objects_super FINAL.
+
+  PUBLIC SECTION.
+    INTERFACES lif_object.
+
+  PRIVATE SECTION.
+    DATA: mo_persistence       TYPE REF TO if_wb_object_persist,
+          mo_apc_appl_obj_data TYPE REF TO if_wb_object_data_model.
+
+    METHODS:
+      get_data_object
+        RETURNING
+          VALUE(ro_apc_appl_obj_data) TYPE REF TO if_wb_object_data_model
+        RAISING
+          lcx_exception,
+
+      get_persistence
+        RETURNING
+          VALUE(ro_persistence) TYPE REF TO if_wb_object_persist
+        RAISING
+          lcx_exception,
+
+      get_data
+        EXPORTING
+          p_data TYPE any
+        RAISING
+          lcx_exception,
+
+      lock
+        RAISING
+          lcx_exception,
+
+      unlock
+        RAISING
+          lcx_exception.
+
+ENDCLASS.                    "lcl_object_sAPC DEFINITION
+
+*----------------------------------------------------------------------*
+*       CLASS lcl_object_sapc IMPLEMENTATION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+CLASS lcl_object_sapc IMPLEMENTATION.
+
+  METHOD lif_object~has_changed_since.
+    rv_changed = abap_true.
+  ENDMETHOD.  "lif_object~has_changed_since
+
+  METHOD lif_object~changed_by.
+
+    DATA: lr_data TYPE REF TO data.
+    FIELD-SYMBOLS: <ls_data>    TYPE any,
+                   <ls_header>  TYPE any,
+                   <changed_by> TYPE any.
+
+    TRY.
+        CREATE DATA lr_data TYPE ('APC_APPLICATION_COMPLETE').
+        ASSIGN lr_data->* TO <ls_data>.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'SAPC not supported' ).
+    ENDTRY.
+
+    get_data(
+      IMPORTING
+        p_data = <ls_data> ).
+
+    ASSIGN COMPONENT 'HEADER' OF STRUCTURE <ls_data> TO <ls_header>.
+    ASSERT sy-subrc = 0.
+    ASSIGN COMPONENT 'CHANGED_BY' OF STRUCTURE <ls_header> TO <changed_by>.
+    ASSERT sy-subrc = 0.
+
+    rv_user = <changed_by>.
+
+  ENDMETHOD.
+
+  METHOD lif_object~get_metadata.
+    rs_metadata = get_metadata( ).
+    rs_metadata-delete_tadir = abap_true.
+  ENDMETHOD.                    "lif_object~get_metadata.
+
+  METHOD lif_object~exists.
+
+    DATA: ls_tadir TYPE tadir.
+
+    ls_tadir = lcl_tadir=>read_single(
+      iv_object   = ms_item-obj_type
+      iv_obj_name = ms_item-obj_name ).
+    IF ls_tadir IS INITIAL.
+      RETURN.
+    ENDIF.
+
+    TRY.
+        get_data_object( ).
+
+      CATCH lcx_exception.
+        RETURN.
+    ENDTRY.
+
+    rv_bool = abap_true.
+
+  ENDMETHOD.                    "lif_object~exists
+
+  METHOD lif_object~serialize.
+
+    DATA: lr_data TYPE REF TO data.
+
+    FIELD-SYMBOLS: <ls_data>   TYPE any,
+                   <ls_header> TYPE any,
+                   <field>     TYPE any.
+
+    TRY.
+        CREATE DATA lr_data TYPE ('APC_APPLICATION_COMPLETE').
+        ASSIGN lr_data->* TO <ls_data>.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'SAPC not supported' ).
+    ENDTRY.
+
+    get_data(
+      IMPORTING
+        p_data = <ls_data> ).
+
+    ASSIGN COMPONENT 'HEADER' OF STRUCTURE <ls_data> TO <ls_header>.
+    ASSERT sy-subrc = 0.
+
+    ASSIGN COMPONENT 'CHANGED_ON' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CHANGED_BY' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CHANGED_AT' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CHANGED_CLNT' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CREATED_ON' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CREATED_BY' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CREATED_AT' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    ASSIGN COMPONENT 'CREATED_CLNT' OF STRUCTURE <ls_header> TO <field>.
+    ASSERT sy-subrc = 0.
+    CLEAR <field>.
+
+    io_xml->add( iv_name = 'SAPC'
+                 ig_data = <ls_data> ).
+
+  ENDMETHOD.                    "serialize
+
+  METHOD lif_object~deserialize.
+
+    DATA: appl_obj_data TYPE REF TO if_wb_object_data_model,
+          lr_data       TYPE REF TO data.
+
+    FIELD-SYMBOLS: <ls_data> TYPE any.
+
+    TRY.
+        CREATE DATA lr_data TYPE ('APC_APPLICATION_COMPLETE').
+        ASSIGN lr_data->* TO <ls_data>.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'SAPC not supported' ).
+    ENDTRY.
+
+    io_xml->read(
+      EXPORTING
+        iv_name = 'SAPC'
+      CHANGING
+        cg_data = <ls_data> ).
+
+    IF lif_object~exists( ) = abap_true.
+      lif_object~delete( ).
+    ENDIF.
+
+    appl_obj_data = get_data_object( ).
+
+    TRY.
+        lock( ).
+
+        CALL FUNCTION 'RS_CORR_INSERT'
+          EXPORTING
+            object              = ms_item-obj_name
+            object_class        = 'SAPC'
+            mode                = 'I'
+            global_lock         = abap_true
+            devclass            = iv_package
+            master_language     = mv_language
+          EXCEPTIONS
+            cancelled           = 1
+            permission_failure  = 2
+            unknown_objectclass = 3
+            OTHERS              = 4.
+
+        IF sy-subrc <> 0.
+          lcx_exception=>raise( 'Error occured while creating SAPC' ).
+        ENDIF.
+
+        appl_obj_data->set_data( <ls_data> ).
+
+        get_persistence( )->save( p_object_data = appl_obj_data ).
+
+        unlock( ).
+
+      CATCH cx_swb_exception.
+        lcx_exception=>raise( 'Error occured while creating SAPC' ).
+    ENDTRY.
+
+  ENDMETHOD.                    "deserialize
+
+  METHOD lif_object~delete.
+
+    DATA: object_key TYPE seu_objkey.
+
+    object_key = ms_item-obj_name.
+
+    TRY.
+        lock( ).
+
+        get_persistence( )->delete( p_object_key = object_key ).
+
+        unlock( ).
+
+      CATCH cx_swb_exception.
+        lcx_exception=>raise( 'Error occured while deleting SAPC' ).
+    ENDTRY.
+
+  ENDMETHOD.                    "delete
+
+  METHOD lif_object~jump.
+
+    CALL FUNCTION 'RS_TOOL_ACCESS'
+      EXPORTING
+        operation   = 'SHOW'
+        object_name = ms_item-obj_name
+        object_type = ms_item-obj_type.
+
+  ENDMETHOD.                    "jump
+
+  METHOD lif_object~compare_to_remote_version.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
+  ENDMETHOD.
+
+  METHOD get_data_object.
+
+    IF mo_apc_appl_obj_data IS NOT BOUND.
+
+      TRY.
+          CREATE OBJECT mo_apc_appl_obj_data TYPE ('CL_APC_APPLICATION_OBJ_DATA').
+
+        CATCH cx_root.
+          lcx_exception=>raise( 'SAPC not supported' ).
+      ENDTRY.
+
+    ENDIF.
+
+    ro_apc_appl_obj_data = mo_apc_appl_obj_data.
+
+  ENDMETHOD.
+
+
+  METHOD get_persistence.
+
+    IF mo_persistence IS NOT BOUND.
+
+      TRY.
+          CREATE OBJECT mo_persistence TYPE ('CL_APC_APPLICATION_OBJ_PERS').
+
+        CATCH cx_root.
+          lcx_exception=>raise( 'SAPC not supported' ).
+      ENDTRY.
+
+    ENDIF.
+
+    ro_persistence = mo_persistence.
+
+  ENDMETHOD.
+
+
+  METHOD lock.
+
+    DATA: objname    TYPE trobj_name,
+          object_key TYPE seu_objkey,
+          objtype    TYPE trobjtype.
+
+    objname    = ms_item-obj_name.
+    object_key = ms_item-obj_name.
+    objtype    = ms_item-obj_type.
+
+    get_persistence( )->lock(
+      EXPORTING
+        p_objname_tr   = objname
+        p_object_key   = object_key
+        p_objtype_tr   = objtype
+      EXCEPTIONS
+        foreign_lock   = 1
+        error_occurred = 2
+        OTHERS         = 3 ).
+
+    IF sy-subrc <> 0.
+      lcx_exception=>raise( `Error occured while locking SAPC ` && objname ).
+    ENDIF.
+
+  ENDMETHOD.
+
+  METHOD unlock.
+
+    DATA: objname    TYPE trobj_name,
+          object_key TYPE seu_objkey,
+          objtype    TYPE trobjtype.
+
+    objname    = ms_item-obj_name.
+    object_key = ms_item-obj_name.
+    objtype    = ms_item-obj_type.
+
+    get_persistence( )->unlock( p_objname_tr = objname
+                                p_object_key = object_key
+                                p_objtype_tr = objtype ).
+
+  ENDMETHOD.
+
+  METHOD get_data.
+
+    DATA:  object_key  TYPE seu_objkey.
+
+    object_key = ms_item-obj_name.
+
+    TRY.
+        get_persistence( )->get(
+          EXPORTING
+            p_object_key  = object_key
+            p_version     = 'A'
+          CHANGING
+            p_object_data = mo_apc_appl_obj_data ).
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'SAPC error' ).
+    ENDTRY.
+
+    mo_apc_appl_obj_data->get_data(
+      IMPORTING
+        p_data = p_data ).
+
+  ENDMETHOD.
+
+
+ENDCLASS.                    "lcl_object_sAPC IMPLEMENTATION
diff --git a/src/zabapgit_object_sapc.prog.xml b/src/zabapgit_object_sapc.prog.xml
new file mode 100644
index 000000000..061aed07b
--- /dev/null
+++ b/src/zabapgit_object_sapc.prog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <PROGDIR>
+    <NAME>ZABAPGIT_OBJECT_SAPC</NAME>
+    <STATE>A</STATE>
+    <VARCL>X</VARCL>
+    <SUBC>I</SUBC>
+    <RLOAD>E</RLOAD>
+    <UCCHECK>X</UCCHECK>
+   </PROGDIR>
+   <TPOOL>
+    <item>
+     <ID>R</ID>
+     <ENTRY>Include ZABAPGIT_OBJECT_SAPC</ENTRY>
+     <LENGTH>28</LENGTH>
+    </item>
+   </TPOOL>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_object_serializing.prog.abap b/src/zabapgit_object_serializing.prog.abap
index f8153fd7d..786367e50 100644
--- a/src/zabapgit_object_serializing.prog.abap
+++ b/src/zabapgit_object_serializing.prog.abap
@@ -8,6 +8,7 @@ INCLUDE zabapgit_object_acid.
 INCLUDE zabapgit_object_auth.
 INCLUDE zabapgit_object_oo_functions.
 INCLUDE zabapgit_object_clas.
+INCLUDE zabapgit_object_dcls.
 INCLUDE zabapgit_object_ddls.
 INCLUDE zabapgit_object_doct.
 INCLUDE zabapgit_object_docv.
@@ -17,6 +18,7 @@ INCLUDE zabapgit_object_enho.
 INCLUDE zabapgit_object_enhs.
 INCLUDE zabapgit_object_enqu.
 INCLUDE zabapgit_object_ensc.
+INCLUDE zabapgit_object_form.
 INCLUDE zabapgit_object_fugr.
 INCLUDE zabapgit_object_iarp.
 INCLUDE zabapgit_object_iasp.
@@ -27,6 +29,8 @@ INCLUDE zabapgit_object_nrob.
 INCLUDE zabapgit_object_para.
 INCLUDE zabapgit_object_pinf.
 INCLUDE zabapgit_object_prog.
+INCLUDE zabapgit_object_samc.
+INCLUDE zabapgit_object_sapc.
 INCLUDE zabapgit_object_sfbf.
 INCLUDE zabapgit_object_sfbs.
 INCLUDE zabapgit_object_sfpf.
@@ -39,6 +43,7 @@ INCLUDE zabapgit_object_smim.
 INCLUDE zabapgit_object_splo.
 INCLUDE zabapgit_object_ssfo.
 INCLUDE zabapgit_object_ssst.
+INCLUDE zabapgit_object_styl.
 INCLUDE zabapgit_object_susc.
 INCLUDE zabapgit_object_suso.
 INCLUDE zabapgit_object_tabl_valid.
@@ -50,6 +55,7 @@ INCLUDE zabapgit_object_type.
 INCLUDE zabapgit_object_vcls.
 INCLUDE zabapgit_object_view.
 INCLUDE zabapgit_object_w3xx.
+INCLUDE zabapgit_object_wapa.
 INCLUDE zabapgit_object_wdya.
 INCLUDE zabapgit_object_wdyn.
 INCLUDE zabapgit_object_webi.
diff --git a/src/zabapgit_object_sfbf.prog.abap b/src/zabapgit_object_sfbf.prog.abap
index 83a73b3ad..c9b1147d4 100644
--- a/src/zabapgit_object_sfbf.prog.abap
+++ b/src/zabapgit_object_sfbf.prog.abap
@@ -249,7 +249,7 @@ CLASS lcl_object_sfbf IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_SFBF IMPLEMENTATION
diff --git a/src/zabapgit_object_sfbs.prog.abap b/src/zabapgit_object_sfbs.prog.abap
index bef654d9c..10d8a8737 100644
--- a/src/zabapgit_object_sfbs.prog.abap
+++ b/src/zabapgit_object_sfbs.prog.abap
@@ -223,7 +223,7 @@ CLASS lcl_object_sfbs IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_SFBS IMPLEMENTATION
diff --git a/src/zabapgit_object_sfpf.prog.abap b/src/zabapgit_object_sfpf.prog.abap
index 1210ece1d..b8da5dc5b 100644
--- a/src/zabapgit_object_sfpf.prog.abap
+++ b/src/zabapgit_object_sfpf.prog.abap
@@ -216,7 +216,7 @@ CLASS lcl_object_sfpf IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_doma IMPLEMENTATION
diff --git a/src/zabapgit_object_sfpi.prog.abap b/src/zabapgit_object_sfpi.prog.abap
index 1e9a75873..9ba05f810 100644
--- a/src/zabapgit_object_sfpi.prog.abap
+++ b/src/zabapgit_object_sfpi.prog.abap
@@ -162,7 +162,7 @@ CLASS lcl_object_sfpi IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_doma IMPLEMENTATION
diff --git a/src/zabapgit_object_sfsw.prog.abap b/src/zabapgit_object_sfsw.prog.abap
index 0892f359c..b6ca85aef 100644
--- a/src/zabapgit_object_sfsw.prog.abap
+++ b/src/zabapgit_object_sfsw.prog.abap
@@ -215,7 +215,7 @@ CLASS lcl_object_sfsw IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_sfsw IMPLEMENTATION
diff --git a/src/zabapgit_object_shi3.prog.abap b/src/zabapgit_object_shi3.prog.abap
index baf26fb0f..7faadf630 100644
--- a/src/zabapgit_object_shi3.prog.abap
+++ b/src/zabapgit_object_shi3.prog.abap
@@ -13,40 +13,20 @@ CLASS lcl_object_shi3 DEFINITION INHERITING FROM lcl_objects_super FINAL.
 
     METHODS constructor
       IMPORTING
-        is_item     TYPE ty_item
+        is_item     TYPE lif_defs=>ty_item
         iv_language TYPE spras.
 
 
   PRIVATE SECTION.
-
-    TYPES: BEGIN OF ty_id_map,
-             old TYPE ttree-id,
-             new TYPE ttree-id,
-           END OF ty_id_map.
-    TYPES  tt_id_map TYPE STANDARD TABLE OF ty_id_map.
-    TYPES  ts_id_map TYPE SORTED TABLE OF ty_id_map WITH UNIQUE KEY old.
-
-    DATA: mv_tree_id TYPE ttree-id,
-          mt_map     TYPE ts_id_map. " SORTED !
+    DATA: mv_tree_id TYPE ttree-id.
 
     METHODS jump_se43
       RAISING lcx_exception.
 
-    METHODS strip_stamps
+    METHODS clear_fields
       CHANGING cs_head  TYPE ttree
                ct_nodes TYPE hier_iface_t.
 
-    METHODS regenerate_ids
-      CHANGING ct_nodes TYPE hier_iface_t
-               ct_refs  TYPE hier_ref_t
-               ct_texts TYPE hier_texts_t
-      RAISING  lcx_exception.
-
-    METHODS replace_id
-      IMPORTING iv_id            TYPE clike
-      RETURNING VALUE(rv_new_id) TYPE ttree-id
-      RAISING   lcx_exception.
-
 ENDCLASS.                    "lcl_object_shi3 DEFINITION
 
 *----------------------------------------------------------------------*
@@ -59,7 +39,17 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
   ENDMETHOD.  "lif_object~has_changed_since
 
   METHOD lif_object~changed_by.
-    rv_user = c_user_unknown. " todo
+
+    DATA: ls_head TYPE ttree.
+
+    CALL FUNCTION 'STREE_STRUCTURE_READ'
+      EXPORTING
+        structure_id     = mv_tree_id
+      IMPORTING
+        structure_header = ls_head.
+
+    rv_user = ls_head-luser.
+
   ENDMETHOD.
 
   METHOD constructor.
@@ -142,7 +132,6 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
         no_authority       = 2
         canceled           = 3
         OTHERS             = 4.
-
     IF sy-subrc <> 0.
       lcx_exception=>raise( 'error from BMENU_DELETE_TREE, SHI3' ).
     ENDIF.
@@ -180,7 +169,7 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
         list_of_references = lt_refs
         list_of_texts      = lt_texts.
 
-    strip_stamps( CHANGING cs_head  = ls_head
+    clear_fields( CHANGING cs_head  = ls_head
                            ct_nodes = lt_nodes ).
 
     io_xml->add( iv_name = 'TREE_HEAD'
@@ -196,82 +185,23 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
 
   ENDMETHOD.                    "serialize
 
-  METHOD strip_stamps.
+  METHOD clear_fields.
 
     FIELD-SYMBOLS <ls_node> LIKE LINE OF ct_nodes.
 
     CLEAR: cs_head-luser, cs_head-ldate, cs_head-ltime.
     CLEAR: cs_head-fuser, cs_head-fdate, cs_head-ftime.
+    CLEAR: cs_head-frelease, cs_head-lrelease.
     CLEAR: cs_head-responsibl.
 
     LOOP AT ct_nodes ASSIGNING <ls_node>.
       CLEAR: <ls_node>-luser, <ls_node>-ldate, <ls_node>-ltime.
       CLEAR: <ls_node>-fuser, <ls_node>-fdate, <ls_node>-ftime.
+      CLEAR: <ls_node>-frelease, <ls_node>-lrelease.
     ENDLOOP.
 
   ENDMETHOD.                    "strip_stamps
 
-  METHOD regenerate_ids.
-
-    DATA: ls_uid TYPE sys_uid,
-          lt_map TYPE tt_id_map.
-
-    FIELD-SYMBOLS: <ls_node> LIKE LINE OF ct_nodes,
-                   <ls_ref>  LIKE LINE OF ct_refs,
-                   <ls_text> LIKE LINE OF ct_texts,
-                   <ls_map>  LIKE LINE OF mt_map.
-
-    "Build map
-    LOOP AT ct_nodes ASSIGNING <ls_node>.
-      APPEND INITIAL LINE TO lt_map ASSIGNING <ls_map>.
-      IF <ls_node>-parent_id IS INITIAL.
-        <ls_map>-old = <ls_node>-node_id.
-        <ls_map>-new = <ls_node>-node_id. "Root node
-      ELSE.
-        CALL FUNCTION 'STREE_GET_UNIQUE_ID'
-          IMPORTING
-            unique_id = ls_uid.
-
-        <ls_map>-old = <ls_node>-node_id.
-        <ls_map>-new = ls_uid-id.
-      ENDIF.
-      <ls_node>-node_id = <ls_map>-new. "Replace id
-    ENDLOOP.
-
-    mt_map = lt_map. "Sort
-
-    LOOP AT ct_nodes ASSIGNING <ls_node>.
-      <ls_node>-parent_id  = replace_id( <ls_node>-parent_id ).
-      <ls_node>-brother_id = replace_id( <ls_node>-brother_id ).
-    ENDLOOP.
-
-    LOOP AT ct_refs ASSIGNING <ls_ref>.
-      <ls_ref>-node_id = replace_id( <ls_ref>-node_id ).
-    ENDLOOP.
-
-    LOOP AT ct_texts ASSIGNING <ls_text>.
-      <ls_text>-node_id = replace_id( <ls_text>-node_id ).
-    ENDLOOP.
-
-  ENDMETHOD.                    "regenerate_ids
-
-  METHOD replace_id.
-
-    DATA ls_map LIKE LINE OF mt_map.
-
-    IF iv_id IS INITIAL.
-      RETURN. "No substitution for empty values
-    ENDIF.
-
-    READ TABLE mt_map WITH TABLE KEY old = iv_id INTO ls_map.
-    IF sy-subrc <> 0.
-      lcx_exception=>raise( 'Cannot replace id, SHI3' ).
-    ENDIF.
-
-    rv_new_id = ls_map-new.
-
-  ENDMETHOD.                    "replace_id
-
   METHOD lif_object~deserialize.
 
     DATA: ls_msg    TYPE hier_mess,
@@ -292,10 +222,6 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
     io_xml->read( EXPORTING iv_name = 'TREE_TEXTS'
                   CHANGING  cg_data = lt_texts ).
 
-    regenerate_ids( CHANGING ct_nodes = lt_nodes
-                             ct_refs  = lt_refs
-                             ct_texts = lt_texts ).
-
     IF lif_object~exists( ) = abap_true.
       lif_object~delete( ).
     ENDIF.
@@ -325,7 +251,7 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_shi3 IMPLEMENTATION
diff --git a/src/zabapgit_object_shlp.prog.abap b/src/zabapgit_object_shlp.prog.abap
index 604d6f897..3373ada0a 100644
--- a/src/zabapgit_object_shlp.prog.abap
+++ b/src/zabapgit_object_shlp.prog.abap
@@ -25,15 +25,17 @@ CLASS lcl_object_shlp IMPLEMENTATION.
   METHOD lif_object~has_changed_since.
 
     DATA: lv_date TYPE dats,
-          lv_time TYPE tims,
-          lv_ts   TYPE timestamp.
+          lv_time TYPE tims.
 
     SELECT SINGLE as4date as4time FROM dd30l
-      INTO (lv_date, lv_time)
-      WHERE shlpname = ms_item-obj_name
-      AND as4local = 'A'.
+       INTO (lv_date, lv_time)
+       WHERE shlpname = ms_item-obj_name
+       AND as4local = 'A'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+     iv_timestamp = iv_timestamp
+     iv_date      = lv_date
+     iv_time      = lv_time ).
 
   ENDMETHOD.  "lif_object~has_changed_since
 
@@ -205,7 +207,7 @@ CLASS lcl_object_shlp IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_shlp IMPLEMENTATION
diff --git a/src/zabapgit_object_sicf.prog.abap b/src/zabapgit_object_sicf.prog.abap
index c495a443c..8fa11f59f 100644
--- a/src/zabapgit_object_sicf.prog.abap
+++ b/src/zabapgit_object_sicf.prog.abap
@@ -168,7 +168,7 @@ CLASS lcl_object_sicf IMPLEMENTATION.
         no_authority      = 4
         OTHERS            = 5 ).
     IF sy-subrc <> 0.
-      lcx_exception=>raise( 'error from get_info_from_serv' ).
+      lcx_exception=>raise( 'SICF - error from get_info_from_serv' ).
     ENDIF.
 
     ASSERT lines( lt_serv_info ) = 1.
@@ -255,7 +255,7 @@ CLASS lcl_object_sicf IMPLEMENTATION.
         no_authority          = 5
         OTHERS                = 6 ).
     IF sy-subrc <> 0.
-      lcx_exception=>raise( 'error from service_from_url' ).
+      lcx_exception=>raise( 'SICF - error from service_from_url' ).
     ENDIF.
 
   ENDMETHOD.                    "find_parent
@@ -316,7 +316,7 @@ CLASS lcl_object_sicf IMPLEMENTATION.
         no_authority              = 26
         OTHERS                    = 27 ).
     IF sy-subrc <> 0.
-      lcx_exception=>raise( 'error from insert_node' ).
+      lcx_exception=>raise( |SICF - error from insert_node: { sy-subrc }| ).
     ENDIF.
 
   ENDMETHOD.                    "insert_sicf
@@ -382,7 +382,7 @@ CLASS lcl_object_sicf IMPLEMENTATION.
         no_authority              = 26
         OTHERS                    = 27 ).
     IF sy-subrc <> 0.
-      lcx_exception=>raise( 'error from change_node' ).
+      lcx_exception=>raise( 'SICF - error from change_node' ).
     ENDIF.
 
   ENDMETHOD.                    "change_sicf
@@ -413,7 +413,7 @@ CLASS lcl_object_sicf IMPLEMENTATION.
         no_authority                = 11
         OTHERS                      = 12 ).
     IF sy-subrc <> 0.
-      lcx_exception=>raise( 'error from delete_node' ).
+      lcx_exception=>raise( 'SICF - error from delete_node' ).
     ENDIF.
 
   ENDMETHOD.                    "delete
@@ -423,7 +423,7 @@ CLASS lcl_object_sicf IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_sicf IMPLEMENTATION
diff --git a/src/zabapgit_object_smim.prog.abap b/src/zabapgit_object_smim.prog.abap
index 8fadeeb3b..4f13dda9e 100644
--- a/src/zabapgit_object_smim.prog.abap
+++ b/src/zabapgit_object_smim.prog.abap
@@ -125,7 +125,7 @@ CLASS lcl_object_smim IMPLEMENTATION.
   METHOD find_content.
 
     DATA: lv_filename TYPE string,
-          lt_files    TYPE ty_files_tt.
+          lt_files    TYPE lif_defs=>ty_files_tt.
 
     FIELD-SYMBOLS: <ls_file> LIKE LINE OF lt_files.
 
@@ -165,7 +165,7 @@ CLASS lcl_object_smim IMPLEMENTATION.
           lv_folder   TYPE abap_bool,
           lv_filename TYPE string,
           lv_class    TYPE smimloio-lo_class,
-          ls_file     TYPE ty_file,
+          ls_file     TYPE lif_defs=>ty_file,
           lv_content  TYPE xstring,
           li_api      TYPE REF TO if_mr_api,
           lv_loio     TYPE sdok_docid.
@@ -332,7 +332,7 @@ CLASS lcl_object_smim IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_smim IMPLEMENTATION
diff --git a/src/zabapgit_object_splo.prog.abap b/src/zabapgit_object_splo.prog.abap
index a50b721b5..af0407f6c 100644
--- a/src/zabapgit_object_splo.prog.abap
+++ b/src/zabapgit_object_splo.prog.abap
@@ -120,7 +120,7 @@ CLASS lcl_object_splo IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_splo IMPLEMENTATION
diff --git a/src/zabapgit_object_ssfo.prog.abap b/src/zabapgit_object_ssfo.prog.abap
index 671881b61..dfdd4aa39 100644
--- a/src/zabapgit_object_ssfo.prog.abap
+++ b/src/zabapgit_object_ssfo.prog.abap
@@ -240,7 +240,7 @@ CLASS lcl_object_ssfo IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_ssfo IMPLEMENTATION
diff --git a/src/zabapgit_object_ssst.prog.abap b/src/zabapgit_object_ssst.prog.abap
index def3c24af..70bb33c9e 100644
--- a/src/zabapgit_object_ssst.prog.abap
+++ b/src/zabapgit_object_ssst.prog.abap
@@ -204,7 +204,7 @@ CLASS lcl_object_ssst IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_ssst IMPLEMENTATION
diff --git a/src/zabapgit_object_styl.prog.abap b/src/zabapgit_object_styl.prog.abap
new file mode 100644
index 000000000..3e6537cb8
--- /dev/null
+++ b/src/zabapgit_object_styl.prog.abap
@@ -0,0 +1,163 @@
+*&---------------------------------------------------------------------*
+*&  Include           ZABAPGIT_OBJECT_STYL
+*&---------------------------------------------------------------------*
+
+*----------------------------------------------------------------------*
+*       CLASS lcl_object_styl DEFINITION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+CLASS lcl_object_styl DEFINITION INHERITING FROM lcl_objects_super FINAL.
+
+  PUBLIC SECTION.
+    INTERFACES lif_object.
+    ALIASES mo_files FOR lif_object~mo_files.
+
+  PRIVATE SECTION.
+    TYPES: BEGIN OF ty_style,
+             header     TYPE itcda,
+             paragraphs TYPE STANDARD TABLE OF itcdp WITH DEFAULT KEY,
+             strings    TYPE STANDARD TABLE OF itcds WITH DEFAULT KEY,
+             tabs       TYPE STANDARD TABLE OF itcdq WITH DEFAULT KEY,
+           END OF ty_style.
+
+ENDCLASS.                    "lcl_object_styl DEFINITION
+
+*----------------------------------------------------------------------*
+*       CLASS lcl_object_styl IMPLEMENTATION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+CLASS lcl_object_styl IMPLEMENTATION.
+
+  METHOD lif_object~has_changed_since.
+    rv_changed = abap_true.
+  ENDMETHOD.  "lif_object~has_changed_since
+
+  METHOD lif_object~changed_by.
+
+    DATA: ls_style TYPE ty_style,
+          lv_name  TYPE itcda-tdstyle.
+
+
+    lv_name = ms_item-obj_name.
+
+    CALL FUNCTION 'READ_STYLE'
+      EXPORTING
+        style        = lv_name
+      IMPORTING
+        style_header = ls_style-header
+      TABLES
+        paragraphs   = ls_style-paragraphs
+        strings      = ls_style-strings
+        tabs         = ls_style-tabs.
+
+    rv_user = ls_style-header-tdluser.
+
+  ENDMETHOD.
+
+  METHOD lif_object~get_metadata.
+    rs_metadata = get_metadata( ).
+    rs_metadata-delete_tadir = abap_true.
+  ENDMETHOD.                    "lif_object~get_metadata
+
+  METHOD lif_object~exists.
+
+    DATA: ls_style TYPE ty_style,
+          lv_name  TYPE itcda-tdstyle,
+          lv_found TYPE abap_bool.
+
+
+    lv_name = ms_item-obj_name.
+
+    CALL FUNCTION 'READ_STYLE'
+      EXPORTING
+        style      = lv_name
+      IMPORTING
+        found      = lv_found
+      TABLES
+        paragraphs = ls_style-paragraphs
+        strings    = ls_style-strings
+        tabs       = ls_style-tabs.
+
+    rv_bool = boolc( lv_found = abap_true ).
+
+  ENDMETHOD.                    "lif_object~exists
+
+  METHOD lif_object~jump.
+
+    lcx_exception=>raise( 'todo, STYL jump' ).
+
+  ENDMETHOD.                    "jump
+
+  METHOD lif_object~delete.
+
+    DATA: lv_style TYPE itcda-tdstyle.
+
+
+    lv_style = ms_item-obj_name.
+
+    CALL FUNCTION 'DELETE_STYLE'
+      EXPORTING
+        style    = lv_style
+        language = '*'.
+
+  ENDMETHOD.                    "delete
+
+  METHOD lif_object~deserialize.
+
+    DATA: ls_style TYPE ty_style.
+
+
+    io_xml->read( EXPORTING iv_name = 'STYLE'
+                  CHANGING cg_data = ls_style ).
+
+    CALL FUNCTION 'SAVE_STYLE'
+      EXPORTING
+        style_header = ls_style-header
+      TABLES
+        paragraphs   = ls_style-paragraphs
+        strings      = ls_style-strings
+        tabs         = ls_style-tabs.
+
+    tadir_insert( iv_package ).
+
+  ENDMETHOD.                    "deserialize
+
+  METHOD lif_object~serialize.
+
+    DATA: ls_style TYPE ty_style,
+          lv_name  TYPE itcda-tdstyle.
+
+
+    lv_name = ms_item-obj_name.
+
+    CALL FUNCTION 'READ_STYLE'
+      EXPORTING
+        style        = lv_name
+      IMPORTING
+        style_header = ls_style-header
+      TABLES
+        paragraphs   = ls_style-paragraphs
+        strings      = ls_style-strings
+        tabs         = ls_style-tabs.
+
+    CLEAR: ls_style-header-tdfuser,
+           ls_style-header-tdfdate,
+           ls_style-header-tdftime,
+           ls_style-header-tdfreles,
+           ls_style-header-tdluser,
+           ls_style-header-tdldate,
+           ls_style-header-tdltime,
+           ls_style-header-tdlreles.
+
+    io_xml->add( iv_name = 'STYLE'
+                 ig_data = ls_style ).
+
+  ENDMETHOD.                    "serialize
+
+  METHOD lif_object~compare_to_remote_version.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
+  ENDMETHOD.
+
+ENDCLASS.                    "lcl_object_styl IMPLEMENTATION
diff --git a/src/zabapgit_object_styl.prog.xml b/src/zabapgit_object_styl.prog.xml
new file mode 100644
index 000000000..e3ea43fdf
--- /dev/null
+++ b/src/zabapgit_object_styl.prog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <PROGDIR>
+    <NAME>ZABAPGIT_OBJECT_STYL</NAME>
+    <STATE>A</STATE>
+    <VARCL>X</VARCL>
+    <SUBC>I</SUBC>
+    <RLOAD>E</RLOAD>
+    <UCCHECK>X</UCCHECK>
+   </PROGDIR>
+   <TPOOL>
+    <item>
+     <ID>R</ID>
+     <ENTRY>Include ZABAPGIT_OBJECT_STYL</ENTRY>
+     <LENGTH>28</LENGTH>
+    </item>
+   </TPOOL>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_object_susc.prog.abap b/src/zabapgit_object_susc.prog.abap
index 3c6b3d706..e29eed257 100644
--- a/src/zabapgit_object_susc.prog.abap
+++ b/src/zabapgit_object_susc.prog.abap
@@ -122,7 +122,7 @@ CLASS lcl_object_susc IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_susc IMPLEMENTATION
diff --git a/src/zabapgit_object_suso.prog.abap b/src/zabapgit_object_suso.prog.abap
index c17f5251d..eeaa5d49f 100644
--- a/src/zabapgit_object_suso.prog.abap
+++ b/src/zabapgit_object_suso.prog.abap
@@ -172,7 +172,7 @@ CLASS lcl_object_suso IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_suso IMPLEMENTATION
diff --git a/src/zabapgit_object_tabl.prog.abap b/src/zabapgit_object_tabl.prog.abap
index de2f10201..a8d4a2ab5 100644
--- a/src/zabapgit_object_tabl.prog.abap
+++ b/src/zabapgit_object_tabl.prog.abap
@@ -27,7 +27,6 @@ CLASS lcl_object_tabl IMPLEMENTATION.
 
     DATA: lv_date    TYPE dats,
           lv_time    TYPE tims,
-          lv_ts      TYPE timestamp,
           lt_indexes TYPE STANDARD TABLE OF dd09l.
 
     FIELD-SYMBOLS <ls_index> LIKE LINE OF lt_indexes.
@@ -38,7 +37,13 @@ CLASS lcl_object_tabl IMPLEMENTATION.
       AND as4local = 'A'
       AND as4vers  = '0000'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
+    IF rv_changed = abap_true.
+      RETURN.
+    ENDIF.
 
     SELECT SINGLE as4date as4time FROM dd09l " Table tech settings
       INTO (lv_date, lv_time)
@@ -46,7 +51,13 @@ CLASS lcl_object_tabl IMPLEMENTATION.
       AND as4local = 'A'
       AND as4vers  = '0000'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
+    IF rv_changed = abap_true.
+      RETURN.
+    ENDIF.
 
     SELECT as4date as4time FROM dd12l " Table tech settings
       INTO CORRESPONDING FIELDS OF TABLE lt_indexes
@@ -55,7 +66,13 @@ CLASS lcl_object_tabl IMPLEMENTATION.
       AND as4vers  = '0000' ##TOO_MANY_ITAB_FIELDS.
 
     LOOP AT lt_indexes ASSIGNING <ls_index>.
-      _object_check_timestamp <ls_index>-as4date <ls_index>-as4time.
+      rv_changed = check_timestamp(
+        iv_timestamp = iv_timestamp
+        iv_date      = <ls_index>-as4date
+        iv_time      = <ls_index>-as4time ).
+      IF rv_changed = abap_true.
+        RETURN.
+      ENDIF.
     ENDLOOP.
 
   ENDMETHOD.  "lif_object~has_changed_since
@@ -99,14 +116,34 @@ CLASS lcl_object_tabl IMPLEMENTATION.
 
   METHOD lif_object~delete.
 
-    DATA: lv_objname TYPE rsedd0-ddobjname.
+    DATA: lv_objname  TYPE rsedd0-ddobjname,
+          lv_tabclass TYPE dd02l-tabclass,
+          lv_no_ask   TYPE abap_bool,
+          lr_data     TYPE REF TO data.
+
+    FIELD-SYMBOLS: <ls_data>  TYPE any.
 
 
     lv_objname = ms_item-obj_name.
 
+    lv_no_ask = abap_true.
+    SELECT SINGLE tabclass FROM dd02l INTO lv_tabclass
+      WHERE tabname = ms_item-obj_name
+      AND as4local = 'A'
+      AND as4vers = '0000'.
+    IF sy-subrc = 0 AND lv_tabclass = 'TRANSP'.
+* it cannot delete table with table wihtout asking
+      CREATE DATA lr_data TYPE (lv_objname).
+      ASSIGN lr_data->* TO <ls_data>.
+      SELECT SINGLE * FROM (lv_objname) INTO <ls_data>.
+      IF sy-subrc = 0.
+        lv_no_ask = abap_false.
+      ENDIF.
+    ENDIF.
+
     CALL FUNCTION 'RS_DD_DELETE_OBJ'
       EXPORTING
-        no_ask               = abap_true
+        no_ask               = lv_no_ask
         objname              = lv_objname
         objtype              = 'T'
       EXCEPTIONS
@@ -406,7 +443,7 @@ CLASS lcl_object_tabl IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    DATA: lo_table_validation     TYPE REF TO lcl_object_tabl_validation,
+    DATA: lo_table_validation     TYPE REF TO lcl_object_tabl_valid,
           lo_local_version_output TYPE REF TO lcl_xml_output,
           lo_local_version_input  TYPE REF TO lcl_xml_input,
           lv_validation_text      TYPE string.
@@ -425,11 +462,11 @@ CLASS lcl_object_tabl IMPLEMENTATION.
       io_local_version  = lo_local_version_input ).
     IF lv_validation_text IS NOT INITIAL.
       lv_validation_text = |Database Table { ms_item-obj_name }: { lv_validation_text }|.
-      CREATE OBJECT ro_comparison_result TYPE lcl_tabl_validation_dialog
+      CREATE OBJECT ro_comparison_result TYPE lcl_tabl_valid_dialog
         EXPORTING
           iv_message = lv_validation_text.
     ELSE.
-      CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+      CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
     ENDIF.
   ENDMETHOD.
 
diff --git a/src/zabapgit_object_tabl_valid.prog.abap b/src/zabapgit_object_tabl_valid.prog.abap
index 6c33de4a5..19d7887f3 100644
--- a/src/zabapgit_object_tabl_valid.prog.abap
+++ b/src/zabapgit_object_tabl_valid.prog.abap
@@ -2,7 +2,7 @@
 *&  Include  zabapgit_object_tabl_valid
 *&---------------------------------------------------------------------*
 
-CLASS lcl_object_tabl_validation DEFINITION FINAL.
+CLASS lcl_object_tabl_valid DEFINITION FINAL.
   PUBLIC SECTION.
     METHODS validate
       IMPORTING
@@ -14,20 +14,20 @@ CLASS lcl_object_tabl_validation DEFINITION FINAL.
         lcx_exception.
 ENDCLASS.
 
-CLASS lcl_tabl_validation_dialog DEFINITION FINAL.
+CLASS lcl_tabl_valid_dialog DEFINITION FINAL.
   PUBLIC SECTION.
     METHODS:
       constructor
         IMPORTING
           iv_message TYPE string.
-    INTERFACES: lif_object_comparison_result.
+    INTERFACES: lif_comparison_result.
+
   PRIVATE SECTION.
     DATA mv_message TYPE string.
     DATA mv_halt TYPE string.
-
 ENDCLASS.
 
-CLASS lcl_object_tabl_validation IMPLEMENTATION.
+CLASS lcl_object_tabl_valid IMPLEMENTATION.
 
   METHOD validate.
     DATA: lt_previous_table_fields TYPE TABLE OF dd03p,
@@ -60,15 +60,16 @@ CLASS lcl_object_tabl_validation IMPLEMENTATION.
 
 ENDCLASS.
 
-CLASS lcl_tabl_validation_dialog IMPLEMENTATION.
+CLASS lcl_tabl_valid_dialog IMPLEMENTATION.
   METHOD constructor.
     mv_message = iv_message.
   ENDMETHOD.
-  METHOD lif_object_comparison_result~is_result_complete_halt.
+
+  METHOD lif_comparison_result~is_result_complete_halt.
     rv_response = mv_halt.
   ENDMETHOD.
 
-  METHOD lif_object_comparison_result~show_confirmation_dialog.
+  METHOD lif_comparison_result~show_confirmation_dialog.
     DATA lv_answer TYPE string.
     TRY.
         lv_answer = lcl_popups=>popup_to_confirm(
@@ -102,7 +103,8 @@ CLASS lct_table_validation DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION S
       create_xmls
         RAISING
           lcx_exception.
-    DATA: mo_table_validator            TYPE REF TO lcl_object_tabl_validation,
+
+    DATA: mo_table_validator            TYPE REF TO lcl_object_tabl_valid,
           mo_previous_version_out_xml   TYPE REF TO lcl_xml_output,
           mo_previous_version_input_xml TYPE REF TO lcl_xml_input,
           mo_current_version_out_xml    TYPE REF TO lcl_xml_output,
diff --git a/src/zabapgit_object_tobj.prog.abap b/src/zabapgit_object_tobj.prog.abap
index 63e83801b..3e1f83f49 100644
--- a/src/zabapgit_object_tobj.prog.abap
+++ b/src/zabapgit_object_tobj.prog.abap
@@ -195,7 +195,7 @@ CLASS lcl_object_tobj IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_tobj IMPLEMENTATION
diff --git a/src/zabapgit_object_tran.prog.abap b/src/zabapgit_object_tran.prog.abap
index bde7cd698..6e742dd2d 100644
--- a/src/zabapgit_object_tran.prog.abap
+++ b/src/zabapgit_object_tran.prog.abap
@@ -430,7 +430,7 @@ CLASS lcl_object_tran IMPLEMENTATION.
   ENDMETHOD.                    "serialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
   METHOD serialize_texts.
diff --git a/src/zabapgit_object_ttyp.prog.abap b/src/zabapgit_object_ttyp.prog.abap
index a621527ca..a8031cc0e 100644
--- a/src/zabapgit_object_ttyp.prog.abap
+++ b/src/zabapgit_object_ttyp.prog.abap
@@ -25,15 +25,17 @@ CLASS lcl_object_ttyp IMPLEMENTATION.
   METHOD lif_object~has_changed_since.
 
     DATA: lv_date TYPE dats,
-          lv_time TYPE tims,
-          lv_ts   TYPE timestamp.
+          lv_time TYPE tims.
 
     SELECT SINGLE as4date as4time FROM dd40l
       INTO (lv_date, lv_time)
       WHERE typename = ms_item-obj_name
       AND as4local = 'A'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
 
   ENDMETHOD.  "lif_object~has_changed_since
 
@@ -184,7 +186,7 @@ CLASS lcl_object_ttyp IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_ttyp IMPLEMENTATION
diff --git a/src/zabapgit_object_type.prog.abap b/src/zabapgit_object_type.prog.abap
index 1908b94e0..562b057d7 100644
--- a/src/zabapgit_object_type.prog.abap
+++ b/src/zabapgit_object_type.prog.abap
@@ -199,14 +199,12 @@ CLASS lcl_object_type IMPLEMENTATION.
   ENDMETHOD.                    "delete
 
   METHOD lif_object~jump.
-
     jump_se11( iv_radio = 'RSRD1-TYMA'
                iv_field = 'RSRD1-TYMA_VAL' ).
-
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_type IMPLEMENTATION
diff --git a/src/zabapgit_object_vcls.prog.abap b/src/zabapgit_object_vcls.prog.abap
index 4b4952620..b6afa441b 100644
--- a/src/zabapgit_object_vcls.prog.abap
+++ b/src/zabapgit_object_vcls.prog.abap
@@ -196,7 +196,7 @@ CLASS lcl_object_vcls IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_vcls IMPLEMENTATION
diff --git a/src/zabapgit_object_view.prog.abap b/src/zabapgit_object_view.prog.abap
index da3799483..bee07aff5 100644
--- a/src/zabapgit_object_view.prog.abap
+++ b/src/zabapgit_object_view.prog.abap
@@ -25,24 +25,35 @@ CLASS lcl_object_view IMPLEMENTATION.
   METHOD lif_object~has_changed_since.
 
     DATA: lv_date TYPE dats,
-          lv_time TYPE tims,
-          lv_ts   TYPE timestamp.
+          lv_time TYPE tims.
 
-    SELECT SINGLE as4date as4time FROM dd25l " View
+    SELECT SINGLE as4date as4time FROM dd25l
       INTO (lv_date, lv_time)
       WHERE viewname = ms_item-obj_name
       AND as4local = 'A'
       AND as4vers  = '0000'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
+    IF rv_changed = abap_true.
+      RETURN.
+    ENDIF.
 
-    SELECT SINGLE as4date as4time FROM dd09l " Table tech settings
+    SELECT SINGLE as4date as4time FROM dd09l
       INTO (lv_date, lv_time)
       WHERE tabname = ms_item-obj_name
       AND as4local = 'A'
       AND as4vers  = '0000'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
+    IF rv_changed = abap_true.
+      RETURN.
+    ENDIF.
 
   ENDMETHOD.  "lif_object~has_changed_since
 
@@ -86,7 +97,7 @@ CLASS lcl_object_view IMPLEMENTATION.
           IF lv_ddl_view = abap_true.
             rv_bool = abap_false.
           ENDIF.
-        CATCH cx_root.
+        CATCH cx_root ##NO_HANDLER.
       ENDTRY.
     ENDIF.
 
@@ -261,7 +272,7 @@ CLASS lcl_object_view IMPLEMENTATION.
   ENDMETHOD.                    "deserialize
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.                    "lif_object~compare_to_remote_version
 
 ENDCLASS.                    "lcl_object_view IMPLEMENTATION
diff --git a/src/zabapgit_object_w3xx.prog.abap b/src/zabapgit_object_w3xx.prog.abap
index 26e19791b..a61ea31ee 100644
--- a/src/zabapgit_object_w3xx.prog.abap
+++ b/src/zabapgit_object_w3xx.prog.abap
@@ -24,7 +24,7 @@ CLASS lcl_object_w3super DEFINITION INHERITING FROM lcl_objects_super ABSTRACT.
 
     METHODS constructor
       IMPORTING
-        is_item     TYPE ty_item
+        is_item     TYPE lif_defs=>ty_item
         iv_language TYPE spras.
 
   PROTECTED SECTION.
@@ -36,7 +36,7 @@ CLASS lcl_object_w3super DEFINITION INHERITING FROM lcl_objects_super ABSTRACT.
     DATA ms_key TYPE wwwdatatab.
 
     METHODS get_ext
-      IMPORTING it_params TYPE ty_wwwparams_tt
+      IMPORTING it_params     TYPE ty_wwwparams_tt
       RETURNING VALUE(rv_ext) TYPE string
       RAISING   lcx_exception.
 
@@ -46,12 +46,12 @@ CLASS lcl_object_w3super DEFINITION INHERITING FROM lcl_objects_super ABSTRACT.
       RAISING   lcx_exception.
 
     METHODS strip_params
-      CHANGING  ct_params TYPE ty_wwwparams_tt
-      RAISING   lcx_exception.
+      CHANGING ct_params TYPE ty_wwwparams_tt
+      RAISING  lcx_exception.
 
     METHODS find_param
-      IMPORTING it_params TYPE ty_wwwparams_tt
-                iv_name   TYPE w3_name
+      IMPORTING it_params       TYPE ty_wwwparams_tt
+                iv_name         TYPE w3_name
       RETURNING VALUE(rv_value) TYPE string
       RAISING   lcx_exception.
 
@@ -75,7 +75,17 @@ CLASS lcl_object_w3super IMPLEMENTATION.
   ENDMETHOD.  "lif_object~has_changed_since
 
   METHOD lif_object~changed_by.
-    rv_user = c_user_unknown. " todo
+
+    SELECT SINGLE chname INTO rv_user
+      FROM wwwdata
+      WHERE relid = ms_key-relid
+      AND   objid = ms_key-objid
+      AND   srtf2 = 0.
+
+    IF sy-subrc IS NOT INITIAL OR rv_user IS INITIAL.
+      rv_user = c_user_unknown.
+    ENDIF.
+
   ENDMETHOD.
 
   METHOD lif_object~jump.
@@ -424,7 +434,7 @@ CLASS lcl_object_w3super IMPLEMENTATION.
   ENDMETHOD.  " find_param.
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS. "lcl_object_W3SUPER IMPLEMENTATION
@@ -437,6 +447,9 @@ ENDCLASS. "lcl_object_W3SUPER IMPLEMENTATION
 CLASS lcl_object_w3mi DEFINITION INHERITING FROM lcl_object_w3super FINAL.
 ENDCLASS.                    "lcl_object_W3MI DEFINITION
 
+CLASS lcl_object_w3mi IMPLEMENTATION.
+ENDCLASS.
+
 *----------------------------------------------------------------------*
 *       CLASS lcl_object_W3HT DEFINITION
 *----------------------------------------------------------------------*
@@ -444,3 +457,6 @@ ENDCLASS.                    "lcl_object_W3MI DEFINITION
 *----------------------------------------------------------------------*
 CLASS lcl_object_w3ht DEFINITION INHERITING FROM lcl_object_w3super FINAL.
 ENDCLASS.                    "lcl_object_W3HT DEFINITION
+
+CLASS lcl_object_w3ht IMPLEMENTATION.
+ENDCLASS.
diff --git a/src/zabapgit_object_wapa.prog.abap b/src/zabapgit_object_wapa.prog.abap
new file mode 100644
index 000000000..303ff239d
--- /dev/null
+++ b/src/zabapgit_object_wapa.prog.abap
@@ -0,0 +1,428 @@
+*&---------------------------------------------------------------------*
+*&  Include           ZABAPGIT_OBJECT_WAPA
+*&---------------------------------------------------------------------*
+
+*----------------------------------------------------------------------*
+*       CLASS lcl_object_wapa DEFINITION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+CLASS lcl_object_wapa DEFINITION INHERITING FROM lcl_objects_super FINAL.
+
+  PUBLIC SECTION.
+    INTERFACES lif_object.
+    ALIASES mo_files FOR lif_object~mo_files.
+
+  PRIVATE SECTION.
+    TYPES: BEGIN OF ty_page,
+             attributes     TYPE o2pagattr,
+             event_handlers TYPE o2pagevh_tabletype,
+             parameters     TYPE o2pagpar_tabletype,
+             types          TYPE rswsourcet,
+           END OF ty_page.
+
+    TYPES: ty_pages_tt TYPE STANDARD TABLE OF ty_page WITH DEFAULT KEY.
+
+    CONSTANTS: c_active TYPE so2_version VALUE 'A'.
+
+    METHODS:
+      get_page_content
+        IMPORTING io_page           TYPE REF TO cl_o2_api_pages
+        RETURNING VALUE(rv_content) TYPE xstring,
+      to_page_content
+        IMPORTING iv_content        TYPE xstring
+        RETURNING VALUE(rt_content) TYPE o2pageline_table,
+      read_page
+        IMPORTING is_page        TYPE o2pagattr
+        RETURNING VALUE(rs_page) TYPE ty_page
+        RAISING   lcx_exception.
+
+ENDCLASS.                    "lcl_object_TRAN DEFINITION
+
+*----------------------------------------------------------------------*
+*       CLASS lcl_object_wapa IMPLEMENTATION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+CLASS lcl_object_wapa IMPLEMENTATION.
+
+  METHOD lif_object~has_changed_since.
+    rv_changed = abap_true.
+  ENDMETHOD.  "lif_object~has_changed_since
+
+  METHOD lif_object~changed_by.
+
+    DATA: lv_name   TYPE o2applname,
+          lt_pages  TYPE STANDARD TABLE OF o2pagdir WITH DEFAULT KEY,
+          ls_latest LIKE LINE OF lt_pages.
+
+
+    lv_name = ms_item-obj_name.
+
+    SELECT * FROM o2pagdir INTO TABLE lt_pages WHERE applname = lv_name.
+    IF sy-subrc <> 0.
+      rv_user = c_user_unknown.
+      RETURN.
+    ENDIF.
+
+    SORT lt_pages BY changedon DESCENDING changetime DESCENDING.
+
+    READ TABLE lt_pages INDEX 1 INTO ls_latest.
+    ASSERT sy-subrc = 0.
+
+    rv_user = ls_latest-changedby.
+
+  ENDMETHOD.
+
+  METHOD lif_object~get_metadata.
+    rs_metadata = get_metadata( ).
+  ENDMETHOD.                    "lif_object~get_metadata
+
+  METHOD lif_object~exists.
+
+    DATA: lv_name TYPE o2applname.
+
+
+    lv_name = ms_item-obj_name.
+
+    cl_o2_api_application=>load(
+      EXPORTING
+        p_application_name  = lv_name
+      EXCEPTIONS
+        object_not_existing = 1
+        permission_failure  = 2
+        error_occured       = 3 ).
+    rv_bool = boolc( sy-subrc = 0 ).
+
+  ENDMETHOD.                    "lif_object~exists
+
+  METHOD lif_object~jump.
+
+    CALL FUNCTION 'RS_TOOL_ACCESS'
+      EXPORTING
+        operation     = 'SHOW'
+        object_name   = ms_item-obj_name
+        object_type   = ms_item-obj_type
+        in_new_window = abap_true.
+
+  ENDMETHOD.                    "jump
+
+  METHOD lif_object~delete.
+
+    DATA: lv_name    TYPE o2applname,
+          lo_bsp     TYPE REF TO cl_o2_api_application,
+          ls_pagekey TYPE o2pagkey,
+          lv_object  TYPE seu_objkey,
+          lt_pages   TYPE o2pagelist.
+
+    FIELD-SYMBOLS: <ls_page> LIKE LINE OF lt_pages.
+
+
+    lv_name = ms_item-obj_name.
+
+    cl_o2_api_application=>load(
+      EXPORTING
+        p_application_name  = lv_name
+      IMPORTING
+        p_application       = lo_bsp
+      EXCEPTIONS
+        object_not_existing = 1
+        permission_failure  = 2
+        error_occured       = 3 ).
+    ASSERT sy-subrc = 0.
+
+    lo_bsp->set_changeable(
+      p_changeable           = abap_true
+      p_complete_application = abap_true ).
+
+    cl_o2_api_pages=>get_all_pages(
+      EXPORTING
+        p_applname = lv_name
+        p_version  = c_active
+      IMPORTING
+        p_pages    = lt_pages ).
+
+    LOOP AT lt_pages ASSIGNING <ls_page>.
+      CLEAR ls_pagekey.
+      ls_pagekey-applname = lv_name.
+      ls_pagekey-pagekey  = <ls_page>-pagekey.
+
+      cl_o2_page=>delete_page_for_application(
+        EXPORTING
+          p_pagekey           = ls_pagekey
+        EXCEPTIONS
+          object_not_existing = 1
+          error_occured       = 2 ).
+      ASSERT sy-subrc = 0.
+    ENDLOOP.
+
+    lo_bsp->delete( ).
+
+* release lock
+    lv_object = lv_name.
+    cl_o2_api_application=>call_access_permission(
+      p_mode                 = 'FREE'
+      p_object               = lv_object
+      p_complete_application = abap_true ).
+
+  ENDMETHOD.                    "delete
+
+  METHOD lif_object~deserialize.
+
+    DATA: lo_bsp        TYPE REF TO cl_o2_api_application,
+          ls_attributes TYPE o2applattr,
+          lt_nodes      TYPE o2applnode_table,
+          lt_navgraph   TYPE o2applgrap_table,
+          lv_objkey     TYPE seu_objkey,
+          ls_item       LIKE ms_item,
+          lv_extra      TYPE string,
+          lv_content    TYPE xstring,
+          lv_ext        TYPE string,
+          lo_page       TYPE REF TO cl_o2_api_pages,
+          lt_pages_info TYPE ty_pages_tt.
+
+    FIELD-SYMBOLS: <ls_page> LIKE LINE OF lt_pages_info.
+
+
+    io_xml->read( EXPORTING iv_name = 'ATTRIBUTES'
+                  CHANGING cg_data = ls_attributes ).
+    io_xml->read( EXPORTING iv_name = 'NAVGRAPH'
+                  CHANGING cg_data = lt_navgraph ).
+    io_xml->read( EXPORTING iv_name = 'PAGES'
+                  CHANGING cg_data = lt_pages_info ).
+
+    ls_attributes-devclass = iv_package.
+
+* todo: overwrite existing
+    cl_o2_api_application=>create_new(
+      EXPORTING
+        p_application_data      = ls_attributes
+        p_nodes                 = lt_nodes
+        p_navgraph              = lt_navgraph
+      IMPORTING
+        p_application           = lo_bsp
+      EXCEPTIONS
+        object_already_existing = 1
+        object_just_created     = 2
+        not_authorized          = 3
+        undefined_name          = 4
+        author_not_existing     = 5
+        action_cancelled        = 6
+        error_occured           = 7
+        invalid_parameter       = 8 ).
+    IF sy-subrc <> 0.
+      lcx_exception=>raise( |WAPA - error from create_new: { sy-subrc }| ).
+    ENDIF.
+
+    lo_bsp->save( ).
+
+    lo_bsp->set_changeable(
+      p_changeable           = abap_false
+      p_complete_application = abap_true ).
+
+    ls_item-obj_type = 'WAPD'.
+    ls_item-obj_name = ms_item-obj_name.
+    lcl_objects_activation=>add_item( ls_item ).
+
+    lv_objkey = ls_item-obj_name.
+* todo, hmm, the WAPD is not added to the worklist during activation
+    cl_o2_api_application=>activate( lv_objkey ).
+
+    LOOP AT lt_pages_info ASSIGNING <ls_page>.
+      cl_o2_api_pages=>create_new_page(
+        EXPORTING
+          p_pageattrs = <ls_page>-attributes
+        IMPORTING
+          p_page      = lo_page ).
+
+      SPLIT <ls_page>-attributes-pagename AT '.' INTO lv_extra lv_ext.
+      REPLACE ALL OCCURRENCES OF '_-' IN lv_extra WITH '/'.
+      lv_content = mo_files->read_raw( iv_extra = lv_extra
+                                       iv_ext   = lv_ext ).
+      lo_page->set_page( to_page_content( lv_content ) ).
+
+      lo_page->set_event_handlers( <ls_page>-event_handlers ).
+      lo_page->set_parameters( <ls_page>-parameters ).
+      lo_page->set_type_source( <ls_page>-types ).
+
+      lo_page->save( p_with_all_texts = abap_true ).
+
+      ls_item-obj_type = 'WAPP'.
+      ls_item-obj_name = cl_wb_object_type=>get_concatenated_key_from_id(
+        p_key_component1 = <ls_page>-attributes-applname
+        p_key_component2 = <ls_page>-attributes-pagekey
+        p_external_id    = 'WG ' ).
+      lcl_objects_activation=>add_item( ls_item ).
+    ENDLOOP.
+
+  ENDMETHOD.                    "deserialize
+
+  METHOD lif_object~serialize.
+
+    DATA: lv_name       TYPE o2applname,
+          ls_attributes TYPE o2applattr,
+          lt_navgraph   TYPE o2applgrap_table,
+          lt_pages      TYPE o2pagelist,
+          lt_pages_info TYPE ty_pages_tt,
+          lo_bsp        TYPE REF TO cl_o2_api_application.
+
+    FIELD-SYMBOLS: <ls_page> LIKE LINE OF lt_pages.
+
+
+    lv_name = ms_item-obj_name.
+
+    cl_o2_api_application=>load(
+      EXPORTING
+        p_application_name  = lv_name
+      IMPORTING
+        p_application       = lo_bsp
+      EXCEPTIONS
+        object_not_existing = 1
+        permission_failure  = 2
+        error_occured       = 3 ).
+    IF sy-subrc <> 0.
+      RETURN.
+    ENDIF.
+
+    lo_bsp->get_attributes(
+      EXPORTING
+        p_version    = c_active
+      IMPORTING
+        p_attributes = ls_attributes ).
+
+    CLEAR: ls_attributes-author,
+           ls_attributes-createdon,
+           ls_attributes-changedby,
+           ls_attributes-changedon,
+           ls_attributes-devclass.
+
+    io_xml->add( iv_name = 'ATTRIBUTES'
+                 ig_data = ls_attributes ).
+
+    lo_bsp->get_navgraph(
+      EXPORTING
+        p_version  = c_active
+      IMPORTING
+        p_navgraph = lt_navgraph ).
+
+    io_xml->add( iv_name = 'NAVGRAPH'
+                 ig_data = lt_navgraph ).
+
+    cl_o2_api_pages=>get_all_pages(
+      EXPORTING
+        p_applname = lv_name
+        p_version  = c_active
+      IMPORTING
+        p_pages    = lt_pages ).
+
+    LOOP AT lt_pages ASSIGNING <ls_page>.
+      APPEND read_page( <ls_page> ) TO lt_pages_info.
+    ENDLOOP.
+
+    io_xml->add( iv_name = 'PAGES'
+                 ig_data = lt_pages_info ).
+
+  ENDMETHOD.                    "serialize
+
+  METHOD read_page.
+
+    DATA: lv_name    TYPE o2applname,
+          ls_pagekey TYPE o2pagkey,
+          lv_content TYPE xstring,
+          lv_extra   TYPE string,
+          lv_ext     TYPE string,
+          lo_page    TYPE REF TO cl_o2_api_pages.
+
+
+    lv_name = ms_item-obj_name.
+
+    ls_pagekey-applname = lv_name.
+    ls_pagekey-pagekey = is_page-pagekey.
+
+    cl_o2_api_pages=>load(
+      EXPORTING
+        p_pagekey = ls_pagekey
+      IMPORTING
+        p_page    = lo_page ).
+
+    lo_page->get_event_handlers(
+      IMPORTING
+        p_ev_handler = rs_page-event_handlers
+      EXCEPTIONS
+        page_deleted = 1
+        invalid_call = 2 ).
+    ASSERT sy-subrc = 0.
+
+    lo_page->get_parameters(
+      IMPORTING
+        p_parameters = rs_page-parameters
+      EXCEPTIONS
+        page_deleted = 1
+        invalid_call = 2
+        OTHERS       = 3 ).
+    ASSERT sy-subrc = 0.
+
+    lo_page->get_type_source(
+      IMPORTING
+        p_source     = rs_page-types
+      EXCEPTIONS
+        page_deleted = 1
+        invalid_call = 2
+        OTHERS       = 3 ).
+    ASSERT sy-subrc = 0.
+
+    lv_content = get_page_content( lo_page ).
+    SPLIT is_page-pagename AT '.' INTO lv_extra lv_ext.
+    REPLACE ALL OCCURRENCES OF '/' IN lv_extra WITH '_-'.
+    mo_files->add_raw(
+      iv_extra = lv_extra
+      iv_ext   = lv_ext
+      iv_data  = lv_content ).
+
+    lo_page->get_attrs(
+      IMPORTING
+        p_attrs = rs_page-attributes ).
+
+    CLEAR: rs_page-attributes-author,
+           rs_page-attributes-createdon,
+           rs_page-attributes-changedby,
+           rs_page-attributes-changedon,
+           rs_page-attributes-changetime,
+           rs_page-attributes-implclass,
+           rs_page-attributes-gendate,
+           rs_page-attributes-gentime,
+           rs_page-attributes-devclass.
+
+  ENDMETHOD.
+
+  METHOD to_page_content.
+
+    DATA: lv_string TYPE string.
+
+
+    lv_string = lcl_convert=>xstring_to_string_utf8( iv_content ).
+
+    SPLIT lv_string AT lif_defs=>gc_newline INTO TABLE rt_content.
+
+  ENDMETHOD.
+
+  METHOD get_page_content.
+
+    DATA: lt_content TYPE o2pageline_table,
+          lv_string  TYPE string.
+
+    io_page->get_page(
+      IMPORTING
+        p_content = lt_content ).
+
+    CONCATENATE LINES OF lt_content INTO lv_string SEPARATED BY lif_defs=>gc_newline RESPECTING BLANKS.
+
+    rv_content = lcl_convert=>string_to_xstring_utf8( lv_string ).
+
+  ENDMETHOD.
+
+  METHOD lif_object~compare_to_remote_version.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
+  ENDMETHOD.
+
+ENDCLASS.                    "lcl_object_tran IMPLEMENTATION
diff --git a/src/zabapgit_object_wapa.prog.xml b/src/zabapgit_object_wapa.prog.xml
new file mode 100644
index 000000000..edd9ae545
--- /dev/null
+++ b/src/zabapgit_object_wapa.prog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <PROGDIR>
+    <NAME>ZABAPGIT_OBJECT_WAPA</NAME>
+    <STATE>A</STATE>
+    <VARCL>X</VARCL>
+    <SUBC>I</SUBC>
+    <RLOAD>E</RLOAD>
+    <UCCHECK>X</UCCHECK>
+   </PROGDIR>
+   <TPOOL>
+    <item>
+     <ID>R</ID>
+     <ENTRY>Include ZABAPGIT_OBJECT_TRAN</ENTRY>
+     <LENGTH>28</LENGTH>
+    </item>
+   </TPOOL>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/zabapgit_object_wdya.prog.abap b/src/zabapgit_object_wdya.prog.abap
index 074a30ffa..867396b44 100644
--- a/src/zabapgit_object_wdya.prog.abap
+++ b/src/zabapgit_object_wdya.prog.abap
@@ -39,7 +39,29 @@ CLASS lcl_object_wdya IMPLEMENTATION.
   ENDMETHOD.  "lif_object~has_changed_since
 
   METHOD lif_object~changed_by.
-    rv_user = c_user_unknown. " todo
+
+    DATA: li_app  TYPE REF TO if_wdy_md_application,
+          ls_app  TYPE wdy_application,
+          lv_name TYPE wdy_application_name.
+
+
+    lv_name = ms_item-obj_name.
+    TRY.
+        li_app = cl_wdy_md_application=>get_object_by_key(
+                   name    = lv_name
+                   version = 'A' ).
+
+        li_app->if_wdy_md_object~get_definition( IMPORTING definition = ls_app ).
+
+        IF ls_app-changedby IS INITIAL.
+          rv_user = ls_app-author.
+        ELSE.
+          rv_user = ls_app-changedby.
+        ENDIF.
+      CATCH cx_root.
+        rv_user = c_user_unknown.
+    ENDTRY.
+
   ENDMETHOD.
 
   METHOD lif_object~get_metadata.
@@ -214,7 +236,7 @@ CLASS lcl_object_wdya IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_wdya IMPLEMENTATION
diff --git a/src/zabapgit_object_wdyn.prog.abap b/src/zabapgit_object_wdyn.prog.abap
index 959d9bcd3..ad1cfcf86 100644
--- a/src/zabapgit_object_wdyn.prog.abap
+++ b/src/zabapgit_object_wdyn.prog.abap
@@ -42,6 +42,7 @@ CLASS lcl_object_wdyn DEFINITION INHERITING FROM lcl_objects_super FINAL.
         RAISING   lcx_exception,
       recover_definition
         IMPORTING is_definition TYPE wdy_md_component_meta_data
+                  iv_package    TYPE devclass
         RAISING   lcx_exception,
       recover_view
         IMPORTING is_view TYPE wdy_md_view_meta_data
@@ -51,8 +52,9 @@ CLASS lcl_object_wdyn DEFINITION INHERITING FROM lcl_objects_super FINAL.
         RETURNING VALUE(rs_delta) TYPE svrs2_xversionable_object
         RAISING   lcx_exception,
       delta_definition
-        IMPORTING is_definition   TYPE wdy_md_component_meta_data
-        RETURNING VALUE(rs_delta) TYPE svrs2_xversionable_object
+        IMPORTING is_definition     TYPE wdy_md_component_meta_data
+                  VALUE(iv_package) TYPE devclass
+        RETURNING VALUE(rs_delta)   TYPE svrs2_xversionable_object
         RAISING   lcx_exception,
       delta_view
         IMPORTING is_view         TYPE wdy_md_view_meta_data
@@ -123,7 +125,9 @@ CLASS lcl_object_wdyn IMPLEMENTATION.
             EXPORTING
               name      = ls_key-component_name
             IMPORTING
-              component = li_component ).
+              component = li_component
+            CHANGING
+              devclass  = iv_package ).
           li_component->save_to_database( ).
           li_component->unlock( ).
         CATCH cx_wdy_md_exception.
@@ -333,7 +337,10 @@ CLASS lcl_object_wdyn IMPLEMENTATION.
           ls_delta  TYPE svrs2_xversionable_object.
 
 
-    ls_delta = delta_definition( is_definition ).
+    ls_delta = delta_definition(
+      is_definition = is_definition
+      iv_package    = iv_package ).
+
     ls_key-component_name = is_definition-definition-component_name.
 
     cl_wdy_md_component=>recover_version(
@@ -745,11 +752,12 @@ CLASS lcl_object_wdyn IMPLEMENTATION.
     io_xml->read( EXPORTING iv_name  = 'SOURCES'
                   CHANGING cg_data = mt_sources ).
 
-    tadir_insert( iv_package ).
+*    tadir_insert( iv_package ).
 
     ls_component-comp_metadata-definition-author = sy-uname.
     ls_component-comp_metadata-definition-createdon = sy-datum.
-    recover_definition( ls_component-comp_metadata ).
+    recover_definition( is_definition = ls_component-comp_metadata
+                        iv_package    = iv_package ).
 
     LOOP AT ls_component-ctlr_metadata ASSIGNING <ls_controller>.
       <ls_controller>-definition-author = sy-uname.
@@ -801,7 +809,7 @@ CLASS lcl_object_wdyn IMPLEMENTATION.
   ENDMETHOD.                    "jump
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.                    "lif_object~compare_to_remote_version
 
 ENDCLASS.                    "lcl_object_wdyn IMPLEMENTATION
diff --git a/src/zabapgit_object_webi.prog.abap b/src/zabapgit_object_webi.prog.abap
index d2c5a9110..65189e3c9 100644
--- a/src/zabapgit_object_webi.prog.abap
+++ b/src/zabapgit_object_webi.prog.abap
@@ -444,7 +444,7 @@ CLASS lcl_object_webi IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~get_metadata
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_webi IMPLEMENTATION
diff --git a/src/zabapgit_object_xslt.prog.abap b/src/zabapgit_object_xslt.prog.abap
index 6fb2babf5..21cddb4f2 100644
--- a/src/zabapgit_object_xslt.prog.abap
+++ b/src/zabapgit_object_xslt.prog.abap
@@ -185,7 +185,13 @@ CLASS lcl_object_xslt IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~exists
 
   METHOD lif_object~jump.
-    lcx_exception=>raise( 'XSLT, jump, todo' ).
+
+    CALL FUNCTION 'RS_TOOL_ACCESS'
+      EXPORTING
+        operation   = 'SHOW'
+        object_name = ms_item-obj_name
+        object_type = ms_item-obj_type.
+
   ENDMETHOD.                    "lif_object~jump
 
   METHOD lif_object~get_metadata.
@@ -193,7 +199,7 @@ CLASS lcl_object_xslt IMPLEMENTATION.
   ENDMETHOD.                    "lif_object~get_metadata
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_object_xslt IMPLEMENTATION
diff --git a/src/zabapgit_objects.prog.abap b/src/zabapgit_objects.prog.abap
index df19c0932..8b2907a56 100644
--- a/src/zabapgit_objects.prog.abap
+++ b/src/zabapgit_objects.prog.abap
@@ -16,7 +16,7 @@ CLASS lcl_objects_activation DEFINITION FINAL.
       RAISING   lcx_exception.
 
     CLASS-METHODS add_item
-      IMPORTING is_item TYPE ty_item
+      IMPORTING is_item TYPE lif_defs=>ty_item
       RAISING   lcx_exception.
 
     CLASS-METHODS activate
@@ -161,7 +161,7 @@ CLASS lcl_objects_files DEFINITION.
   PUBLIC SECTION.
     METHODS:
       constructor
-        IMPORTING is_item TYPE ty_item,
+        IMPORTING is_item TYPE lif_defs=>ty_item,
       add_string
         IMPORTING iv_extra  TYPE clike OPTIONAL
                   iv_ext    TYPE string
@@ -176,7 +176,7 @@ CLASS lcl_objects_files DEFINITION.
         IMPORTING iv_extra     TYPE clike OPTIONAL
                   io_xml       TYPE REF TO lcl_xml_output
                   iv_normalize TYPE sap_bool DEFAULT abap_true
-                  is_metadata  TYPE ty_metadata OPTIONAL
+                  is_metadata  TYPE lif_defs=>ty_metadata OPTIONAL
         RAISING   lcx_exception,
 * needed since type-check during dynamic call fails even if the object is compatible
       add_xml_from_plugin
@@ -198,7 +198,7 @@ CLASS lcl_objects_files DEFINITION.
                   it_abap  TYPE STANDARD TABLE
         RAISING   lcx_exception,
       add
-        IMPORTING is_file TYPE ty_file,
+        IMPORTING is_file TYPE lif_defs=>ty_file,
       add_raw
         IMPORTING iv_extra TYPE clike OPTIONAL
                   iv_ext   TYPE string
@@ -210,16 +210,16 @@ CLASS lcl_objects_files DEFINITION.
         RETURNING VALUE(rv_data) TYPE xstring
         RAISING   lcx_exception,
       get_files
-        RETURNING VALUE(rt_files) TYPE ty_files_tt,
+        RETURNING VALUE(rt_files) TYPE lif_defs=>ty_files_tt,
       set_files
-        IMPORTING it_files TYPE ty_files_tt,
+        IMPORTING it_files TYPE lif_defs=>ty_files_tt,
       get_accessed_files
-        RETURNING VALUE(rt_files) TYPE ty_file_signatures_tt.
+        RETURNING VALUE(rt_files) TYPE lif_defs=>ty_file_signatures_tt.
 
   PRIVATE SECTION.
-    DATA: ms_item           TYPE ty_item,
-          mt_accessed_files TYPE ty_file_signatures_tt,
-          mt_files          TYPE ty_files_tt.
+    DATA: ms_item           TYPE lif_defs=>ty_item,
+          mt_accessed_files TYPE lif_defs=>ty_file_signatures_tt,
+          mt_files          TYPE lif_defs=>ty_files_tt.
 
     METHODS:
       read_file
@@ -234,26 +234,26 @@ CLASS lcl_objects_files DEFINITION.
 
 ENDCLASS.                    "lcl_objects_files DEFINITION
 
-INTERFACE lif_object_comparison_result.
+INTERFACE lif_comparison_result.
   METHODS:
     show_confirmation_dialog,
     is_result_complete_halt
       RETURNING VALUE(rv_response) TYPE abap_bool.
-
 ENDINTERFACE.
 
 "Null Object Pattern
-CLASS lcl_null_comparison_result DEFINITION FINAL.
+CLASS lcl_comparison_null DEFINITION FINAL.
   PUBLIC SECTION.
-    INTERFACES lif_object_comparison_result.
+    INTERFACES lif_comparison_result.
 ENDCLASS.
-CLASS lcl_null_comparison_result IMPLEMENTATION.
 
-  METHOD lif_object_comparison_result~is_result_complete_halt.
+CLASS lcl_comparison_null IMPLEMENTATION.
+
+  METHOD lif_comparison_result~is_result_complete_halt.
     rv_response = abap_false.
   ENDMETHOD.
 
-  METHOD lif_object_comparison_result~show_confirmation_dialog.
+  METHOD lif_comparison_result~show_confirmation_dialog.
     RETURN.
   ENDMETHOD.
 
@@ -285,7 +285,7 @@ INTERFACE lif_object.
     jump
       RAISING lcx_exception,
     get_metadata
-      RETURNING VALUE(rs_metadata) TYPE ty_metadata,
+      RETURNING VALUE(rs_metadata) TYPE lif_defs=>ty_metadata,
     has_changed_since
       IMPORTING iv_timestamp      TYPE timestamp
       RETURNING VALUE(rv_changed) TYPE abap_bool
@@ -293,7 +293,7 @@ INTERFACE lif_object.
   METHODS:
     compare_to_remote_version
       IMPORTING io_remote_version_xml       TYPE REF TO lcl_xml_input
-      RETURNING VALUE(ro_comparison_result) TYPE REF TO lif_object_comparison_result
+      RETURNING VALUE(ro_comparison_result) TYPE REF TO lif_comparison_result
       RAISING   lcx_exception.
 
   DATA: mo_files TYPE REF TO lcl_objects_files.
@@ -362,19 +362,19 @@ CLASS lcl_objects_files IMPLEMENTATION.
 
     lv_abap = lcl_convert=>xstring_to_string_utf8( lv_data ).
 
-    SPLIT lv_abap AT gc_newline INTO TABLE rt_abap.
+    SPLIT lv_abap AT lif_defs=>gc_newline INTO TABLE rt_abap.
 
   ENDMETHOD.                    "read_abap
 
   METHOD add_abap.
 
     DATA: lv_source TYPE string,
-          ls_file   TYPE ty_file.
+          ls_file   TYPE lif_defs=>ty_file.
 
 
-    CONCATENATE LINES OF it_abap INTO lv_source SEPARATED BY gc_newline.
+    CONCATENATE LINES OF it_abap INTO lv_source SEPARATED BY lif_defs=>gc_newline.
 * when editing files via eg. GitHub web interface it adds a newline at end of file
-    lv_source = lv_source && gc_newline.
+    lv_source = lv_source && lif_defs=>gc_newline.
 
     ls_file-path = '/'.
     ls_file-filename = filename( iv_extra = iv_extra
@@ -387,7 +387,7 @@ CLASS lcl_objects_files IMPLEMENTATION.
 
   METHOD add_string.
 
-    DATA: ls_file TYPE ty_file.
+    DATA: ls_file TYPE lif_defs=>ty_file.
 
 
     ls_file-path = '/'.
@@ -402,7 +402,7 @@ CLASS lcl_objects_files IMPLEMENTATION.
   METHOD add_xml.
 
     DATA: lv_xml  TYPE string,
-          ls_file TYPE ty_file.
+          ls_file TYPE lif_defs=>ty_file.
 
 
     lv_xml = io_xml->render( iv_normalize = iv_normalize
@@ -517,7 +517,7 @@ CLASS lcl_objects_files IMPLEMENTATION.
 
   METHOD add_raw.
 
-    DATA: ls_file TYPE ty_file.
+    DATA: ls_file TYPE lif_defs=>ty_file.
 
     ls_file-path     = '/'.
     ls_file-data     = iv_data.
@@ -554,19 +554,32 @@ CLASS lcl_objects_super DEFINITION ABSTRACT.
     METHODS:
       constructor
         IMPORTING
-          is_item     TYPE ty_item
+          is_item     TYPE lif_defs=>ty_item
           iv_language TYPE spras.
 
+    CLASS-METHODS:
+      jump_adt
+        IMPORTING i_obj_name TYPE lif_defs=>ty_item-obj_name
+                  i_obj_type TYPE lif_defs=>ty_item-obj_type
+        RAISING   lcx_exception.
+
     CONSTANTS: c_user_unknown TYPE xubname VALUE 'UNKNOWN'.
 
   PROTECTED SECTION.
 
-    DATA: ms_item     TYPE ty_item,
+    DATA: ms_item     TYPE lif_defs=>ty_item,
           mv_language TYPE spras.
 
     METHODS:
+      check_timestamp
+        IMPORTING
+          iv_timestamp      TYPE timestamp
+          iv_date           TYPE datum
+          iv_time           TYPE uzeit
+        RETURNING
+          VALUE(rv_changed) TYPE abap_bool,
       get_metadata
-        RETURNING VALUE(rs_metadata) TYPE ty_metadata,
+        RETURNING VALUE(rs_metadata) TYPE lif_defs=>ty_metadata,
       corr_insert
         IMPORTING iv_package TYPE devclass
         RAISING   lcx_exception,
@@ -578,6 +591,15 @@ CLASS lcl_objects_super DEFINITION ABSTRACT.
                   iv_field TYPE string
         RAISING   lcx_exception.
 
+  PRIVATE SECTION.
+
+    CLASS-METHODS:
+      is_adt_jump_possible
+        IMPORTING io_object                     TYPE REF TO cl_wb_object
+                  io_adt                        TYPE REF TO object
+        RETURNING VALUE(r_is_adt_jump_possible) TYPE abap_bool
+        RAISING   lcx_exception.
+
 ENDCLASS.                    "lcl_objects_super DEFINITION
 
 **********************************************************************
@@ -590,7 +612,7 @@ CLASS lcl_objects_bridge DEFINITION INHERITING FROM lcl_objects_super FINAL.
     CLASS-METHODS class_constructor.
 
     METHODS constructor
-      IMPORTING is_item TYPE ty_item
+      IMPORTING is_item TYPE lif_defs=>ty_item
       RAISING   cx_sy_create_object_error.
 
     INTERFACES lif_object.
@@ -637,7 +659,7 @@ CLASS lcl_objects_bridge IMPLEMENTATION.
     DATA ls_objtype_map LIKE LINE OF gt_objtype_map.
 
     super->constructor( is_item = is_item
-                        iv_language = gc_english ).
+                        iv_language = lif_defs=>gc_english ).
 
 *    determine the responsible plugin
     READ TABLE gt_objtype_map INTO ls_objtype_map
@@ -770,7 +792,7 @@ CLASS lcl_objects_bridge IMPLEMENTATION.
   ENDMETHOD.                    "class_constructor
 
   METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+    CREATE OBJECT ro_comparison_result TYPE lcl_comparison_null.
   ENDMETHOD.
 
 ENDCLASS.                    "lcl_objects_bridge IMPLEMENTATION
@@ -815,7 +837,7 @@ CLASS lcl_objects_program DEFINITION INHERITING FROM lcl_objects_super.
 
     METHODS serialize_program
       IMPORTING io_xml     TYPE REF TO lcl_xml_output OPTIONAL
-                is_item    TYPE ty_item
+                is_item    TYPE lif_defs=>ty_item
                 io_files   TYPE REF TO lcl_objects_files
                 iv_program TYPE programm OPTIONAL
                 iv_extra   TYPE clike OPTIONAL
@@ -895,10 +917,10 @@ CLASS lcl_objects_program DEFINITION INHERITING FROM lcl_objects_super.
     CLASS-METHODS:
       add_tpool
         IMPORTING it_tpool        TYPE textpool_table
-        RETURNING VALUE(rt_tpool) TYPE ty_tpool_tt,
+        RETURNING VALUE(rt_tpool) TYPE lif_defs=>ty_tpool_tt,
       read_tpool
-        IMPORTING it_tpool        TYPE ty_tpool_tt
-        RETURNING VALUE(rt_tpool) TYPE ty_tpool_tt.
+        IMPORTING it_tpool        TYPE lif_defs=>ty_tpool_tt
+        RETURNING VALUE(rt_tpool) TYPE lif_defs=>ty_tpool_tt.
 
   PRIVATE SECTION.
     METHODS:
@@ -1007,7 +1029,7 @@ CLASS lcl_objects_program IMPLEMENTATION.
 
     lo_xml->add( iv_name = 'PROGDIR'
                  ig_data = ls_progdir ).
-    IF ls_progdir-subc = '1'.
+    IF ls_progdir-subc = '1' OR ls_progdir-subc = 'M'.
       lt_dynpros = serialize_dynpros( lv_program_name ).
       lo_xml->add( iv_name = 'DYNPROS'
                    ig_data = lt_dynpros ).
@@ -1189,7 +1211,7 @@ CLASS lcl_objects_program IMPLEMENTATION.
 * function module UPDATE_PROGDIR does not update VARCL
       UPDATE progdir SET varcl = is_progdir-varcl
         WHERE name = ls_progdir_new-name
-        AND state = ls_progdir_new-state.
+        AND state = ls_progdir_new-state.                 "#EC CI_SUBRC
     ENDIF.
 
     lcl_objects_activation=>add( iv_type = 'REPS'
@@ -1429,7 +1451,8 @@ CLASS lcl_objects_program IMPLEMENTATION.
 
     INSERT TEXTPOOL iv_program
       FROM it_tpool
-      LANGUAGE lv_language.
+      LANGUAGE lv_language
+      STATE 'I'.
     IF sy-subrc <> 0.
       lcx_exception=>raise( 'error from INSERT TEXTPOOL' ).
     ENDIF.
@@ -1498,6 +1521,7 @@ CLASS lcl_objects_program IMPLEMENTATION.
         not_found = 1
         OTHERS    = 2.
     IF sy-subrc <> 0.
+* if moving code from SAPlink, see https://github.com/larshp/abapGit/issues/562
       lcx_exception=>raise( 'error from RS_CUA_INTERNAL_WRITE' ).
     ENDIF.
 
@@ -1510,7 +1534,6 @@ CLASS lcl_objects_program IMPLEMENTATION.
 
     DATA: lv_date    TYPE dats,
           lv_time    TYPE tims,
-          lv_ts      TYPE timestamp,
           lt_screens TYPE STANDARD TABLE OF d020s,
           lt_eudb    TYPE STANDARD TABLE OF eudb.
 
@@ -1522,7 +1545,13 @@ CLASS lcl_objects_program IMPLEMENTATION.
       WHERE progname = iv_program
       AND   r3state = 'A'.
 
-    _object_check_timestamp lv_date lv_time.
+    rv_changed = check_timestamp(
+      iv_timestamp = iv_timestamp
+      iv_date      = lv_date
+      iv_time      = lv_time ).
+    IF rv_changed = abap_true.
+      RETURN.
+    ENDIF.
 
     SELECT SINGLE udat utime FROM repotext " Program text pool
       INTO (lv_date, lv_time)
@@ -1530,7 +1559,13 @@ CLASS lcl_objects_program IMPLEMENTATION.
       AND   r3state = 'A'.
 
     IF sy-subrc = 0. " Text not found ? Assuming no changes, see #404
-      _object_check_timestamp lv_date lv_time.
+      rv_changed = check_timestamp(
+        iv_timestamp = iv_timestamp
+        iv_date      = lv_date
+        iv_time      = lv_time ).
+      IF rv_changed = abap_true.
+        RETURN.
+      ENDIF.
     ENDIF.
 
     IF iv_skip_gui = abap_true.
@@ -1539,20 +1574,32 @@ CLASS lcl_objects_program IMPLEMENTATION.
 
     SELECT dgen tgen FROM d020s           " Screens
       INTO CORRESPONDING FIELDS OF TABLE lt_screens
-      WHERE prog = iv_program ##TOO_MANY_ITAB_FIELDS.
+      WHERE prog = iv_program ##TOO_MANY_ITAB_FIELDS.     "#EC CI_SUBRC
 
     LOOP AT lt_screens ASSIGNING <ls_screen>.
-      _object_check_timestamp <ls_screen>-dgen <ls_screen>-tgen.
+      rv_changed = check_timestamp(
+        iv_timestamp = iv_timestamp
+        iv_date      = <ls_screen>-dgen
+        iv_time      = <ls_screen>-tgen ).
+      IF rv_changed = abap_true.
+        RETURN.
+      ENDIF.
     ENDLOOP.
 
     SELECT vdatum vzeit FROM eudb         " GUI
       INTO CORRESPONDING FIELDS OF TABLE lt_eudb
       WHERE relid = 'CU'
       AND   name  = iv_program
-      AND   srtf2 = 0 ##TOO_MANY_ITAB_FIELDS.
+      AND   srtf2 = 0 ##TOO_MANY_ITAB_FIELDS.             "#EC CI_SUBRC
 
     LOOP AT lt_eudb ASSIGNING <ls_eudb>.
-      _object_check_timestamp <ls_eudb>-vdatum <ls_eudb>-vzeit.
+      rv_changed = check_timestamp(
+        iv_timestamp = iv_timestamp
+        iv_date      = <ls_eudb>-vdatum
+        iv_time      = <ls_eudb>-vzeit ).
+      IF rv_changed = abap_true.
+        RETURN.
+      ENDIF.
     ENDLOOP.
 
   ENDMETHOD.  "check_prog_changed_since
@@ -1613,6 +1660,86 @@ CLASS lcl_objects_super IMPLEMENTATION.
 
   ENDMETHOD.                                                "jump_se11
 
+  METHOD jump_adt.
+
+    DATA: adt_link          TYPE string,
+          obj_type          TYPE trobjtype,
+          obj_name          TYPE trobj_name,
+          li_object         TYPE REF TO cl_wb_object,
+          li_adt            TYPE REF TO object,
+          li_adt_uri_mapper TYPE REF TO object,
+          li_adt_objref     TYPE REF TO object.
+
+    FIELD-SYMBOLS: <uri> TYPE string.
+
+    obj_name = i_obj_name.
+    obj_type = i_obj_type.
+
+    TRY.
+        cl_wb_object=>create_from_transport_key( EXPORTING  p_object = obj_type p_obj_name = obj_name
+                                                 RECEIVING  p_wb_object = li_object
+                                                 EXCEPTIONS OTHERS   = 1 ).
+        IF sy-subrc <> 0.
+          lcx_exception=>raise( 'ADT Jump Error' ).
+        ENDIF.
+
+        CALL METHOD ('CL_ADT_TOOLS_CORE_FACTORY')=>('GET_INSTANCE')
+          RECEIVING
+            result = li_adt.
+
+        IF is_adt_jump_possible( io_object = li_object
+                                 io_adt    = li_adt ) = abap_false.
+          lcx_exception=>raise( 'ADT Jump Error' ).
+        ENDIF.
+
+        CALL METHOD li_adt->('IF_ADT_TOOLS_CORE_FACTORY~GET_URI_MAPPER')
+          RECEIVING
+            result = li_adt_uri_mapper.
+
+        CALL METHOD li_adt_uri_mapper->('IF_ADT_URI_MAPPER~MAP_WB_OBJECT_TO_OBJREF')
+          EXPORTING
+            wb_object = li_object
+          RECEIVING
+            result    = li_adt_objref.
+
+        ASSIGN ('li_adt_objref->ref_data-uri') TO <uri>.
+        ASSERT sy-subrc = 0.
+
+        CONCATENATE 'adt://' sy-sysid <uri> INTO adt_link.
+
+        cl_gui_frontend_services=>execute( EXPORTING  document = adt_link
+                                           EXCEPTIONS OTHERS   = 1 ).
+
+        IF sy-subrc <> 0.
+          lcx_exception=>raise( 'ADT Jump Error' ).
+        ENDIF.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'ADT Jump Error' ).
+    ENDTRY.
+
+  ENDMETHOD.
+
+  METHOD check_timestamp.
+
+    DATA: lv_ts TYPE timestamp.
+
+    IF sy-subrc = 0 AND iv_date IS NOT INITIAL AND iv_time IS NOT INITIAL.
+      cl_abap_tstmp=>systemtstmp_syst2utc(
+        EXPORTING syst_date = iv_date
+                  syst_time = iv_time
+        IMPORTING utc_tstmp = lv_ts ).
+      IF lv_ts < iv_timestamp.
+        rv_changed = abap_false. " Unchanged
+      ELSE.
+        rv_changed = abap_true.
+      ENDIF.
+    ELSE. " Not found? => changed
+      rv_changed = abap_true.
+    ENDIF.
+
+  ENDMETHOD.
+
   METHOD get_metadata.
     rs_metadata-class =
       cl_abap_classdescr=>describe_by_object_ref( me )->get_relative_name( ).
@@ -1667,6 +1794,62 @@ CLASS lcl_objects_super IMPLEMENTATION.
 
   ENDMETHOD.                    "corr_insert
 
+
+  METHOD is_adt_jump_possible.
+
+    DATA: li_wb_manager         TYPE REF TO if_wb_manager,
+          li_wb_request         TYPE REF TO cl_wb_request,
+          li_adt_uri_mapper_vit TYPE REF TO object,
+          is_vit_wb_request     TYPE abap_bool.
+
+    cl_wb_manager=>get_instance(
+      IMPORTING
+        p_instance              = li_wb_manager
+      EXCEPTIONS
+        no_instance             = 1
+        OTHERS                  = 2 ).
+
+    IF sy-subrc <> 0.
+      lcx_exception=>raise( 'ADT Jump Error' ).
+    ENDIF.
+
+    cl_wb_request=>create_from_object_ref(
+      EXPORTING
+        p_wb_object       = io_object
+      RECEIVING
+        p_wb_request      = li_wb_request
+      EXCEPTIONS
+        illegal_operation = 1
+        cancelled         = 2
+        OTHERS            = 3 ).
+
+    IF sy-subrc <> 0.
+      lcx_exception=>raise( 'ADT Jump Error' ).
+    ENDIF.
+
+    TRY.
+        CALL METHOD io_adt->('IF_ADT_TOOLS_CORE_FACTORY~GET_URI_MAPPER_VIT')
+          RECEIVING
+            result = li_adt_uri_mapper_vit.
+
+        CALL METHOD li_adt_uri_mapper_vit->('IF_ADT_URI_MAPPER_VIT~IS_VIT_WB_REQUEST')
+          EXPORTING
+            wb_request = li_wb_request
+          RECEIVING
+            result     = is_vit_wb_request.
+
+        IF is_vit_wb_request = abap_true.
+          r_is_adt_jump_possible = abap_false.
+        ELSE.
+          r_is_adt_jump_possible = abap_true.
+        ENDIF.
+
+      CATCH cx_root.
+        lcx_exception=>raise( 'ADT Jump Error' ).
+    ENDTRY.
+
+  ENDMETHOD.
+
 ENDCLASS.                    "lcl_objects_super IMPLEMENTATION
 
 *----------------------------------------------------------------------*
@@ -1683,49 +1866,49 @@ CLASS lcl_objects DEFINITION FINAL.
              obj     TYPE REF TO lif_object,
              xml     TYPE REF TO lcl_xml_input,
              package TYPE devclass,
-             item    TYPE ty_item,
+             item    TYPE lif_defs=>ty_item,
            END OF ty_deserialization.
 
     TYPES: ty_deserialization_tt TYPE STANDARD TABLE OF ty_deserialization WITH DEFAULT KEY.
 
     CLASS-METHODS serialize
-      IMPORTING is_item         TYPE ty_item
+      IMPORTING is_item         TYPE lif_defs=>ty_item
                 iv_language     TYPE spras
                 io_log          TYPE REF TO lcl_log OPTIONAL
-      RETURNING VALUE(rt_files) TYPE ty_files_tt
+      RETURNING VALUE(rt_files) TYPE lif_defs=>ty_files_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS deserialize
       IMPORTING io_repo                  TYPE REF TO lcl_repo
-      RETURNING VALUE(rt_accessed_files) TYPE ty_file_signatures_tt
+      RETURNING VALUE(rt_accessed_files) TYPE lif_defs=>ty_file_signatures_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS delete
-      IMPORTING it_tadir TYPE ty_tadir_tt
+      IMPORTING it_tadir TYPE lif_defs=>ty_tadir_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS jump
-      IMPORTING is_item TYPE ty_item
+      IMPORTING is_item TYPE lif_defs=>ty_item
       RAISING   lcx_exception.
 
     CLASS-METHODS changed_by
-      IMPORTING is_item        TYPE ty_item
+      IMPORTING is_item        TYPE lif_defs=>ty_item
       RETURNING VALUE(rv_user) TYPE xubname
       RAISING   lcx_exception.
 
     CLASS-METHODS has_changed_since
-      IMPORTING is_item           TYPE ty_item
+      IMPORTING is_item           TYPE lif_defs=>ty_item
                 iv_timestamp      TYPE timestamp
       RETURNING VALUE(rv_changed) TYPE abap_bool
       RAISING   lcx_exception.
 
     CLASS-METHODS is_supported
-      IMPORTING is_item        TYPE ty_item
+      IMPORTING is_item        TYPE lif_defs=>ty_item
                 iv_native_only TYPE abap_bool DEFAULT abap_false
       RETURNING VALUE(rv_bool) TYPE abap_bool.
 
     CLASS-METHODS exists
-      IMPORTING is_item        TYPE ty_item
+      IMPORTING is_item        TYPE lif_defs=>ty_item
       RETURNING VALUE(rv_bool) TYPE abap_bool.
 
     CLASS-METHODS supported_list
@@ -1734,36 +1917,36 @@ CLASS lcl_objects DEFINITION FINAL.
   PRIVATE SECTION.
 
     CLASS-METHODS check_duplicates
-      IMPORTING it_files TYPE ty_files_tt
+      IMPORTING it_files TYPE lif_defs=>ty_files_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS create_object
-      IMPORTING is_item        TYPE ty_item
+      IMPORTING is_item        TYPE lif_defs=>ty_item
                 iv_language    TYPE spras
-                is_metadata    TYPE ty_metadata OPTIONAL
+                is_metadata    TYPE lif_defs=>ty_metadata OPTIONAL
                 iv_native_only TYPE abap_bool DEFAULT abap_false
       RETURNING VALUE(ri_obj)  TYPE REF TO lif_object
       RAISING   lcx_exception.
 
     CLASS-METHODS
       prioritize_deser
-        IMPORTING it_results        TYPE ty_results_tt
-        RETURNING VALUE(rt_results) TYPE ty_results_tt.
+        IMPORTING it_results        TYPE lif_defs=>ty_results_tt
+        RETURNING VALUE(rt_results) TYPE lif_defs=>ty_results_tt.
 
     CLASS-METHODS class_name
-      IMPORTING is_item              TYPE ty_item
+      IMPORTING is_item              TYPE lif_defs=>ty_item
       RETURNING VALUE(rv_class_name) TYPE string.
 
     CLASS-METHODS resolve_ddic
-      CHANGING ct_tadir TYPE ty_tadir_tt
+      CHANGING ct_tadir TYPE lif_defs=>ty_tadir_tt
       RAISING  lcx_exception.
 
     CLASS-METHODS warning_overwrite
-      CHANGING ct_results TYPE ty_results_tt
+      CHANGING ct_results TYPE lif_defs=>ty_results_tt
       RAISING  lcx_exception.
 
     CLASS-METHODS warning_package
-      IMPORTING is_item          TYPE ty_item
+      IMPORTING is_item          TYPE lif_defs=>ty_item
                 iv_package       TYPE devclass
       RETURNING VALUE(rv_cancel) TYPE abap_bool
       RAISING   lcx_exception.
@@ -1772,14 +1955,14 @@ CLASS lcl_objects DEFINITION FINAL.
       IMPORTING iv_package TYPE devclass.
 
     CLASS-METHODS delete_obj
-      IMPORTING is_item TYPE ty_item
+      IMPORTING is_item TYPE lif_defs=>ty_item
       RAISING   lcx_exception.
 
     CLASS-METHODS compare_remote_to_local
       IMPORTING
         io_object TYPE REF TO lif_object
-        it_remote TYPE ty_files_tt
-        is_result TYPE ty_result
+        it_remote TYPE lif_defs=>ty_files_tt
+        is_result TYPE lif_defs=>ty_result
       RAISING
         lcx_exception.
 
@@ -1787,7 +1970,7 @@ CLASS lcl_objects DEFINITION FINAL.
       IMPORTING it_objects TYPE ty_deserialization_tt
                 iv_ddic    TYPE abap_bool DEFAULT abap_false
                 iv_descr   TYPE string
-      CHANGING  ct_files   TYPE ty_file_signatures_tt
+      CHANGING  ct_files   TYPE lif_defs=>ty_file_signatures_tt
       RAISING   lcx_exception.
 
 ENDCLASS.                    "lcl_object DEFINITION
diff --git a/src/zabapgit_objects_impl.prog.abap b/src/zabapgit_objects_impl.prog.abap
index 2e3ba26b3..2fba5ea1e 100644
--- a/src/zabapgit_objects_impl.prog.abap
+++ b/src/zabapgit_objects_impl.prog.abap
@@ -24,8 +24,8 @@ CLASS lcl_objects IMPLEMENTATION.
       lv_index = sy-tabix.
 
       IF <ls_result>-lstate IS NOT INITIAL
-          AND <ls_result>-lstate <> gc_state-deleted
-          AND NOT ( <ls_result>-lstate = gc_state-added
+          AND <ls_result>-lstate <> lif_defs=>gc_state-deleted
+          AND NOT ( <ls_result>-lstate = lif_defs=>gc_state-added
           AND <ls_result>-rstate IS INITIAL ).
         lv_question = |It looks like object {
           <ls_result>-obj_type } { <ls_result>-obj_name
@@ -164,7 +164,7 @@ CLASS lcl_objects IMPLEMENTATION.
 
     rv_changed = create_object(
       is_item     = is_item
-      iv_language = gc_english )->has_changed_since( iv_timestamp ).
+      iv_language = lif_defs=>gc_english )->has_changed_since( iv_timestamp ).
 
   ENDMETHOD.  "has_changed_since
 
@@ -172,7 +172,7 @@ CLASS lcl_objects IMPLEMENTATION.
 
     TRY.
         create_object( is_item        = is_item
-                       iv_language    = gc_english
+                       iv_language    = lif_defs=>gc_english
                        iv_native_only = iv_native_only ).
         rv_bool = abap_true.
       CATCH lcx_exception.
@@ -214,7 +214,7 @@ CLASS lcl_objects IMPLEMENTATION.
 
     TRY.
         li_obj = create_object( is_item = is_item
-                                iv_language = gc_english ).
+                                iv_language = lif_defs=>gc_english ).
         rv_bool = li_obj->exists( ).
       CATCH lcx_exception.
 * ignore all errors and assume the object exists
@@ -231,13 +231,31 @@ CLASS lcl_objects IMPLEMENTATION.
 
   METHOD jump.
 
-    DATA: li_obj TYPE REF TO lif_object.
-
+    DATA: li_obj           TYPE REF TO lif_object,
+          adt_jump_enabled TYPE abap_bool.
 
     li_obj = create_object( is_item     = is_item
-                            iv_language = gc_english ).
+                            iv_language = lif_defs=>gc_english ).
 
-    li_obj->jump( ).
+    adt_jump_enabled = lcl_app=>settings( )->read( )->get_adt_jump_enabled( ).
+
+    IF adt_jump_enabled = abap_true.
+
+      TRY.
+          lcl_objects_super=>jump_adt( i_obj_name = is_item-obj_name
+                                       i_obj_type = is_item-obj_type ).
+
+        CATCH lcx_exception.
+
+          li_obj->jump( ).
+
+      ENDTRY.
+
+    ELSE.
+
+      li_obj->jump( ).
+
+    ENDIF.
 
   ENDMETHOD.                    "jump
 
@@ -251,7 +269,7 @@ CLASS lcl_objects IMPLEMENTATION.
       rv_user = lcl_objects_super=>c_user_unknown.
     ELSE.
       li_obj = create_object( is_item     = is_item
-                              iv_language = gc_english ).
+                              iv_language = lif_defs=>gc_english ).
       rv_user = li_obj->changed_by( ).
     ENDIF.
 
@@ -263,7 +281,7 @@ CLASS lcl_objects IMPLEMENTATION.
 
   METHOD delete.
 
-    DATA: ls_item     TYPE ty_item,
+    DATA: ls_item     TYPE lif_defs=>ty_item,
           lv_tabclass TYPE dd02l-tabclass,
           lt_tadir    LIKE it_tadir.
 
@@ -339,11 +357,11 @@ CLASS lcl_objects IMPLEMENTATION.
 * in case they have dependencies with .INCLUDE
 
     TYPES: BEGIN OF ty_edge,
-             from TYPE ty_item,
-             to   TYPE ty_item,
+             from TYPE lif_defs=>ty_item,
+             to   TYPE lif_defs=>ty_item,
            END OF ty_edge.
 
-    DATA: lt_nodes        TYPE TABLE OF ty_item,
+    DATA: lt_nodes        TYPE TABLE OF lif_defs=>ty_item,
           lt_edges        TYPE TABLE OF ty_edge,
           lt_findstrings  TYPE TABLE OF rsfind,
           lv_plus         TYPE i VALUE 1,
@@ -455,7 +473,7 @@ CLASS lcl_objects IMPLEMENTATION.
 
     IF is_supported( is_item ) = abap_true.
       li_obj = create_object( is_item     = is_item
-                              iv_language = gc_english ).
+                              iv_language = lif_defs=>gc_english ).
 
       li_obj->delete( ).
 
@@ -508,7 +526,7 @@ CLASS lcl_objects IMPLEMENTATION.
 
   METHOD check_duplicates.
 
-    DATA: lt_files TYPE ty_files_tt.
+    DATA: lt_files TYPE lif_defs=>ty_files_tt.
 
 
     lt_files[] = it_files[].
@@ -550,19 +568,19 @@ CLASS lcl_objects IMPLEMENTATION.
 
   METHOD deserialize.
 
-    DATA: ls_item    TYPE ty_item,
+    DATA: ls_item    TYPE lif_defs=>ty_item,
           lv_cancel  TYPE abap_bool,
           li_obj     TYPE REF TO lif_object,
-          lt_remote  TYPE ty_files_tt,
+          lt_remote  TYPE lif_defs=>ty_files_tt,
           lv_package TYPE devclass,
           lo_files   TYPE REF TO lcl_objects_files,
           lo_xml     TYPE REF TO lcl_xml_input,
-          lt_results TYPE ty_results_tt,
+          lt_results TYPE lif_defs=>ty_results_tt,
           lt_ddic    TYPE TABLE OF ty_deserialization,
           lt_rest    TYPE TABLE OF ty_deserialization,
           lt_late    TYPE TABLE OF ty_deserialization.
 
-    FIELD-SYMBOLS: <ls_result> TYPE ty_result,
+    FIELD-SYMBOLS: <ls_result> TYPE lif_defs=>ty_result,
                    <ls_deser>  LIKE LINE OF lt_late.
 
 
@@ -582,7 +600,7 @@ CLASS lcl_objects IMPLEMENTATION.
     warning_overwrite( CHANGING ct_results = lt_results ).
 
     LOOP AT lt_results ASSIGNING <ls_result> WHERE obj_type IS NOT INITIAL
-        AND NOT ( lstate = gc_state-added AND rstate IS INITIAL ).
+        AND NOT ( lstate = lif_defs=>gc_state-added AND rstate IS INITIAL ).
       lcl_progress=>show( iv_key     = 'Deserialize'
                           iv_current = sy-tabix
                           iv_total   = lines( lt_results )
@@ -682,9 +700,9 @@ CLASS lcl_objects IMPLEMENTATION.
 
   METHOD compare_remote_to_local.
 
-    DATA: ls_remote_file       TYPE ty_file,
+    DATA: ls_remote_file       TYPE lif_defs=>ty_file,
           lo_remote_version    TYPE REF TO lcl_xml_input,
-          lo_comparison_result TYPE REF TO lif_object_comparison_result.
+          lo_comparison_result TYPE REF TO lif_comparison_result.
 
 
     IF is_result-filename CS '.XML'.
diff --git a/src/zabapgit_page.prog.abap b/src/zabapgit_page.prog.abap
index 79070db39..d791b710a 100644
--- a/src/zabapgit_page.prog.abap
+++ b/src/zabapgit_page.prog.abap
@@ -47,14 +47,14 @@ CLASS lcl_gui_page DEFINITION ABSTRACT.
   PRIVATE SECTION.
 
     METHODS html_head
-      RETURNING VALUE(ro_html)   TYPE REF TO lcl_html.
+      RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
 
     METHODS title
       RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
 
 
     METHODS footer
-      RETURNING VALUE(ro_html)    TYPE REF TO lcl_html.
+      RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
 
     METHODS redirect
       RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
@@ -91,7 +91,7 @@ CLASS lcl_gui_page IMPLEMENTATION.
 
     ro_html->add( |<td class="logo">{
                   lcl_html=>a( iv_txt = '<img src="img/logo" alt="logo">'
-                               iv_act = gc_action-abapgit_home )
+                               iv_act = lif_defs=>gc_action-abapgit_home )
                   }</td>| ).                                "#EC NOTEXT
 
     ro_html->add( |<td><span class="page_title"> &#x25BA; {
@@ -119,7 +119,7 @@ CLASS lcl_gui_page IMPLEMENTATION.
     ro_html->add( '<table class="w100"><tr>' ).             "#EC NOTEXT
 
     ro_html->add( '<td class="w40"></td>' ).                "#EC NOTEXT
-    ro_html->add( |<td><span class="version">{ gc_abap_version }</span></td>| ). "#EC NOTEXT
+    ro_html->add( |<td><span class="version">{ lif_defs=>gc_abap_version }</span></td>| ). "#EC NOTEXT
     ro_html->add( '<td id="debug-output" class="w40"></td>' ). "#EC NOTEXT
 
     ro_html->add( '</tr></table>' ).                        "#EC NOTEXT
@@ -131,13 +131,13 @@ CLASS lcl_gui_page IMPLEMENTATION.
 
     CREATE OBJECT ro_html.
 
-    ro_html->add( '<!DOCTYPE html>' ).                "#EC NOTEXT
-    ro_html->add( '<html>' ).                         "#EC NOTEXT
-    ro_html->add( '<head>' ).                         "#EC NOTEXT
+    ro_html->add( '<!DOCTYPE html>' ).                      "#EC NOTEXT
+    ro_html->add( '<html>' ).                               "#EC NOTEXT
+    ro_html->add( '<head>' ).                               "#EC NOTEXT
     ro_html->add( |<meta http-equiv="refresh" content="0; url={
-                  ms_control-redirect_url }">| ). "#EC NOTEXT
-    ro_html->add( '</head>').                         "#EC NOTEXT
-    ro_html->add( '</html>').                         "#EC NOTEXT
+                  ms_control-redirect_url }">| ).           "#EC NOTEXT
+    ro_html->add( '</head>' ).                              "#EC NOTEXT
+    ro_html->add( '</html>' ).                              "#EC NOTEXT
 
   ENDMETHOD.
 
@@ -146,7 +146,7 @@ CLASS lcl_gui_page IMPLEMENTATION.
   ENDMETHOD. "scripts
 
   METHOD lif_gui_page~on_event.
-    ev_state = gc_event_state-not_handled.
+    ev_state = lif_defs=>gc_event_state-not_handled.
   ENDMETHOD. "lif_gui_page~on_event
 
   METHOD lif_gui_page~render.
@@ -180,7 +180,7 @@ CLASS lcl_gui_page IMPLEMENTATION.
       ro_html->add( '</script>' ).
     ENDIF.
 
-    ro_html->add( '</html>').                               "#EC NOTEXT
+    ro_html->add( '</html>' ).                              "#EC NOTEXT
 
   ENDMETHOD.  " lif_gui_page~render.
 
diff --git a/src/zabapgit_page_background.prog.abap b/src/zabapgit_page_background.prog.abap
index 1ffa6cc60..707c83174 100644
--- a/src/zabapgit_page_background.prog.abap
+++ b/src/zabapgit_page_background.prog.abap
@@ -2,7 +2,7 @@
 *&  Include           ZABAPGIT_PAGE_BACKGROUND
 *&---------------------------------------------------------------------*
 
-CLASS lcl_gui_page_background_run DEFINITION FINAL
+CLASS lcl_gui_page_bkg_run DEFINITION FINAL
     INHERITING FROM lcl_gui_page.
 
   PUBLIC SECTION.
@@ -19,7 +19,7 @@ CLASS lcl_gui_page_background_run DEFINITION FINAL
 
 ENDCLASS.
 
-CLASS lcl_gui_page_background_run IMPLEMENTATION.
+CLASS lcl_gui_page_bkg_run IMPLEMENTATION.
 
   METHOD constructor.
     super->constructor( ).
@@ -72,16 +72,16 @@ CLASS lcl_gui_page_background_run IMPLEMENTATION.
 
 ENDCLASS.
 
-CLASS lcl_gui_page_background DEFINITION FINAL
+CLASS lcl_gui_page_bkg DEFINITION FINAL
     INHERITING FROM lcl_gui_page.
 
   PUBLIC SECTION.
     METHODS:
-      constructor IMPORTING  iv_key TYPE lcl_persistence_repo=>ty_repo-key,
+      constructor IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key,
       lif_gui_page~on_event REDEFINITION.
 
   PROTECTED SECTION.
-    METHODS render_content        REDEFINITION.
+    METHODS render_content REDEFINITION.
 
   PRIVATE SECTION.
     DATA:
@@ -96,7 +96,7 @@ CLASS lcl_gui_page_background DEFINITION FINAL
 
 ENDCLASS.
 
-CLASS lcl_gui_page_background IMPLEMENTATION.
+CLASS lcl_gui_page_bkg IMPLEMENTATION.
 
   METHOD constructor.
 
@@ -111,19 +111,19 @@ CLASS lcl_gui_page_background IMPLEMENTATION.
   METHOD build_menu.
     CREATE OBJECT ro_menu.
     ro_menu->add( iv_txt = 'Run background logic'
-                  iv_act = gc_action-go_background_run ) ##NO_TEXT.
+                  iv_act = lif_defs=>gc_action-go_background_run ) ##NO_TEXT.
   ENDMETHOD. "build_menu
 
   METHOD lif_gui_page~on_event.
 
-    DATA ls_bg_task     TYPE lcl_persistence_background=>ty_background.
+    DATA ls_bg_task TYPE lcl_persist_background=>ty_background.
 
     CASE iv_action.
-      WHEN gc_action-bg_update.
+      WHEN lif_defs=>gc_action-bg_update.
         ls_bg_task     = lcl_html_action_utils=>decode_bg_update( iv_getdata ).
         ls_bg_task-key = mv_key.
-        lcl_services_background=>update_task( ls_bg_task ).
-        ev_state = gc_event_state-re_render.
+        lcl_services_bkg=>update_task( ls_bg_task ).
+        ev_state = lif_defs=>gc_event_state-re_render.
     ENDCASE.
 
   ENDMETHOD.
@@ -131,8 +131,8 @@ CLASS lcl_gui_page_background IMPLEMENTATION.
   METHOD render_data.
 
     DATA: lo_repo    TYPE REF TO lcl_repo_online,
-          lo_per     TYPE REF TO lcl_persistence_background,
-          lt_per     TYPE lcl_persistence_background=>tt_background,
+          lo_per     TYPE REF TO lcl_persist_background,
+          lt_per     TYPE lcl_persist_background=>tt_background,
           ls_per     LIKE LINE OF lt_per,
           lv_nothing TYPE string,
           lv_push    TYPE string,
@@ -163,16 +163,16 @@ CLASS lcl_gui_page_background IMPLEMENTATION.
     ENDIF.
 
     CASE ls_per-method.
-      WHEN lcl_persistence_background=>c_method-push.
+      WHEN lcl_persist_background=>c_method-push.
         lv_push = ' checked' ##NO_TEXT.
-      WHEN lcl_persistence_background=>c_method-pull.
+      WHEN lcl_persist_background=>c_method-pull.
         lv_pull = ' checked' ##NO_TEXT.
       WHEN OTHERS.
         lv_nothing = ' checked' ##NO_TEXT.
     ENDCASE.
 
     CASE ls_per-amethod.
-      WHEN lcl_persistence_background=>c_amethod-auto.
+      WHEN lcl_persist_background=>c_amethod-auto.
         lv_aauto = ' checked' ##NO_TEXT.
       WHEN OTHERS.
         lv_afixed = ' checked' ##NO_TEXT.
@@ -181,18 +181,18 @@ CLASS lcl_gui_page_background IMPLEMENTATION.
     ro_html->add( lcl_gui_chunk_lib=>render_repo_top( lo_repo ) ).
     ro_html->add( '<br>' ).
 
-    ro_html->add( '<u>Method</u><br>' )  ##NO_TEXT.
-    ro_html->add( |<form method="get" action="sapevent:{ gc_action-bg_update }">| ).
+    ro_html->add( '<u>Method</u><br>' ) ##NO_TEXT.
+    ro_html->add( |<form method="get" action="sapevent:{ lif_defs=>gc_action-bg_update }">| ).
     ro_html->add( '<input type="radio" name="method" value="nothing"' &&
-      lv_nothing && '>Do nothing<br>' )  ##NO_TEXT.
+      lv_nothing && '>Do nothing<br>' ) ##NO_TEXT.
     ro_html->add( '<input type="radio" name="method" value="push"' &&
-      lv_push && '>Automatic push<br>' )  ##NO_TEXT.
+      lv_push && '>Automatic push<br>' ) ##NO_TEXT.
     ro_html->add( '<input type="radio" name="method" value="pull"' &&
-      lv_pull && '>Automatic pull<br>' )  ##NO_TEXT.
+      lv_pull && '>Automatic pull<br>' ) ##NO_TEXT.
     ro_html->add( '<br>' ).
 
-    ro_html->add( '<u>HTTP Authentication, optional</u><br>' )  ##NO_TEXT.
-    ro_html->add( '(password will be saved in clear text)<br>' )  ##NO_TEXT.
+    ro_html->add( '<u>HTTP Authentication, optional</u><br>' ) ##NO_TEXT.
+    ro_html->add( '(password will be saved in clear text)<br>' ) ##NO_TEXT.
     ro_html->add( '<table>' ).
     ro_html->add( '<tr>' ).
     ro_html->add( '<td>Username:</td>' ).
@@ -210,9 +210,9 @@ CLASS lcl_gui_page_background IMPLEMENTATION.
 
     ro_html->add( '<u>Commit author</u><br>' ).
     ro_html->add( '<input type="radio" name="amethod" value="fixed"' &&
-      lv_afixed && '>Fixed<br>' )  ##NO_TEXT.
+      lv_afixed && '>Fixed<br>' ) ##NO_TEXT.
     ro_html->add( '<input type="radio" name="amethod" value="auto"' &&
-      lv_aauto && '>Automatic<br>' )  ##NO_TEXT.
+      lv_aauto && '>Automatic<br>' ) ##NO_TEXT.
     ro_html->add( '<br>' ).
 
     ro_html->add( '<table>' ).
diff --git a/src/zabapgit_page_branch_overview.prog.abap b/src/zabapgit_page_branch_overview.prog.abap
index e67b5d96e..6850e845f 100644
--- a/src/zabapgit_page_branch_overview.prog.abap
+++ b/src/zabapgit_page_branch_overview.prog.abap
@@ -11,9 +11,9 @@ CLASS lcl_branch_overview DEFINITION FINAL.
            END OF ty_create.
 
     TYPES: BEGIN OF ty_commit,
-             sha1       TYPE ty_sha1,
-             parent1    TYPE ty_sha1,
-             parent2    TYPE ty_sha1,
+             sha1       TYPE lif_defs=>ty_sha1,
+             parent1    TYPE lif_defs=>ty_sha1,
+             parent2    TYPE lif_defs=>ty_sha1,
              author     TYPE string,
              email      TYPE string,
              time       TYPE string,
@@ -43,7 +43,7 @@ CLASS lcl_branch_overview DEFINITION FINAL.
 
     CLASS-METHODS:
       parse_commits
-        IMPORTING it_objects TYPE ty_objects_tt
+        IMPORTING it_objects TYPE lif_defs=>ty_objects_tt
         RAISING   lcx_exception,
       determine_branch
         RAISING lcx_exception,
@@ -53,7 +53,7 @@ CLASS lcl_branch_overview DEFINITION FINAL.
         RAISING lcx_exception,
       get_git_objects
         IMPORTING io_repo           TYPE REF TO lcl_repo_online
-        RETURNING VALUE(rt_objects) TYPE ty_objects_tt
+        RETURNING VALUE(rt_objects) TYPE lif_defs=>ty_objects_tt
         RAISING   lcx_exception.
 
     CLASS-DATA:
@@ -131,7 +131,7 @@ CLASS lcl_branch_overview IMPLEMENTATION.
 
   METHOD run.
 
-    DATA: lt_objects TYPE ty_objects_tt.
+    DATA: lt_objects TYPE lif_defs=>ty_objects_tt.
 
 
     CLEAR gt_branches.
@@ -169,7 +169,7 @@ CLASS lcl_branch_overview IMPLEMENTATION.
                                               it_branches = gt_branches
                                     IMPORTING et_objects = rt_objects ).
 
-    DELETE rt_objects WHERE type = gc_type-blob.
+    DELETE rt_objects WHERE type = lif_defs=>gc_type-blob.
 
   ENDMETHOD.
 
@@ -182,7 +182,7 @@ CLASS lcl_branch_overview IMPLEMENTATION.
     FIELD-SYMBOLS: <ls_object> LIKE LINE OF it_objects.
 
 
-    LOOP AT it_objects ASSIGNING <ls_object> WHERE type = gc_type-commit.
+    LOOP AT it_objects ASSIGNING <ls_object> WHERE type = lif_defs=>gc_type-commit.
       ls_raw = lcl_git_pack=>decode_commit( <ls_object>-data ).
 
       CLEAR ls_commit.
@@ -190,10 +190,10 @@ CLASS lcl_branch_overview IMPLEMENTATION.
       ls_commit-parent1 = ls_raw-parent.
       ls_commit-parent2 = ls_raw-parent2.
 
-      SPLIT ls_raw-body AT gc_newline INTO ls_commit-message lv_trash.
+      SPLIT ls_raw-body AT lif_defs=>gc_newline INTO ls_commit-message lv_trash.
 
 * unix time stamps are in same time zone, so ignore the zone,
-      FIND REGEX gc_author_regex IN ls_raw-author
+      FIND REGEX lif_defs=>gc_author_regex IN ls_raw-author
         SUBMATCHES
         ls_commit-author
         ls_commit-email
@@ -302,7 +302,7 @@ ENDCLASS.
 
 ***********************
 
-CLASS lcl_gui_page_branch_overview DEFINITION FINAL INHERITING FROM lcl_gui_page.
+CLASS lcl_gui_page_boverview DEFINITION FINAL INHERITING FROM lcl_gui_page.
 
   PUBLIC SECTION.
     METHODS:
@@ -358,7 +358,7 @@ CLASS lcl_gui_page_branch_overview DEFINITION FINAL INHERITING FROM lcl_gui_page
 
 ENDCLASS.                       "lcl_gui_page_explore DEFINITION
 
-CLASS lcl_gui_page_branch_overview IMPLEMENTATION.
+CLASS lcl_gui_page_boverview IMPLEMENTATION.
 
   METHOD constructor.
     super->constructor( ).
@@ -432,30 +432,30 @@ CLASS lcl_gui_page_branch_overview IMPLEMENTATION.
     ro_html->add( build_menu( )->render( ) ).
 
 * see http://stackoverflow.com/questions/6081483/maximum-size-of-a-canvas-element
-    _add '<canvas id="gitGraph"></canvas>'.
+    ro_html->add( '<canvas id="gitGraph"></canvas>' ).
 
     ro_html->add( '<script type="text/javascript" src="https://cdnjs.' &&
       'cloudflare.com/ajax/libs/gitgraph.js/1.2.3/gitgraph.min.js">' &&
       '</script>' ) ##NO_TEXT.
 
-    _add '<script type="text/javascript">'.
-    _add 'var myTemplateConfig = {'.
+    ro_html->add( '<script type="text/javascript">' ).
+    ro_html->add( 'var myTemplateConfig = {' ).
     ro_html->add( 'colors: [ "#979797", "#008fb5", "#f1c109", "'
       && '#095256", "#087F8C", "#5AAA95", "#86A873", "#BB9F06" ],' ) ##NO_TEXT.
-    _add 'branch: {'.
-    _add '  lineWidth: 8,'.
-    _add '  spacingX: 50'.
-    _add '},'.
-    _add 'commit: {'.
-    _add '  spacingY: -40,'.
-    _add '  dot: { size: 12 },'.
-    _add '  message: { font: "normal 14pt Arial" }'.
-    _add '}'.
-    _add '};'.
-    _add 'var gitgraph = new GitGraph({'.
-    _add '  template: myTemplateConfig,'.
-    _add '  orientation: "vertical-reverse"'.
-    _add '});'.
+    ro_html->add( 'branch: {' ).
+    ro_html->add( '  lineWidth: 8,' ).
+    ro_html->add( '  spacingX: 50' ).
+    ro_html->add( '},' ).
+    ro_html->add( 'commit: {' ).
+    ro_html->add( '  spacingY: -40,' ).
+    ro_html->add( '  dot: { size: 12 },' ).
+    ro_html->add( '  message: { font: "normal 14pt Arial" }' ).
+    ro_html->add( '}' ).
+    ro_html->add( '};' ).
+    ro_html->add( 'var gitgraph = new GitGraph({' ).
+    ro_html->add( '  template: myTemplateConfig,' ).
+    ro_html->add( '  orientation: "vertical-reverse"' ).
+    ro_html->add( '});' ).
 
     LOOP AT mt_commits ASSIGNING <ls_commit>.
       IF sy-tabix = 1.
@@ -490,7 +490,7 @@ CLASS lcl_gui_page_branch_overview IMPLEMENTATION.
 
     ENDLOOP.
 
-    _add '</script>'.
+    ro_html->add( '</script>' ).
 
   ENDMETHOD.
 
@@ -561,15 +561,15 @@ CLASS lcl_gui_page_branch_overview IMPLEMENTATION.
     CASE iv_action.
       WHEN c_actions-refresh.
         refresh( ).
-        ev_state = gc_event_state-re_render.
+        ev_state = lif_defs=>gc_event_state-re_render.
       WHEN c_actions-uncompress.
         mv_compress = abap_false.
         refresh( ).
-        ev_state = gc_event_state-re_render.
+        ev_state = lif_defs=>gc_event_state-re_render.
       WHEN c_actions-compress.
         mv_compress = abap_true.
         refresh( ).
-        ev_state = gc_event_state-re_render.
+        ev_state = lif_defs=>gc_event_state-re_render.
       WHEN c_actions-merge.
         ls_merge = decode_merge( it_postdata ).
         CREATE OBJECT lo_merge
@@ -578,7 +578,7 @@ CLASS lcl_gui_page_branch_overview IMPLEMENTATION.
             iv_source = ls_merge-source
             iv_target = ls_merge-target.
         ei_page = lo_merge.
-        ev_state = gc_event_state-new_page.
+        ev_state = lif_defs=>gc_event_state-new_page.
     ENDCASE.
 
   ENDMETHOD.
diff --git a/src/zabapgit_page_commit.prog.abap b/src/zabapgit_page_commit.prog.abap
index e34a2c293..0fb42609f 100644
--- a/src/zabapgit_page_commit.prog.abap
+++ b/src/zabapgit_page_commit.prog.abap
@@ -72,10 +72,10 @@ CLASS lcl_gui_page_commit IMPLEMENTATION.
                                   io_repo     = mo_repo
                                   io_stage    = mo_stage ).
 
-        ev_state = gc_event_state-go_back_to_bookmark.
+        ev_state = lif_defs=>gc_event_state-go_back_to_bookmark.
 
       WHEN c_action-commit_cancel.
-        ev_state = gc_event_state-go_back.
+        ev_state = lif_defs=>gc_event_state-go_back.
     ENDCASE.
 
   ENDMETHOD.
@@ -155,17 +155,20 @@ CLASS lcl_gui_page_commit IMPLEMENTATION.
 
   METHOD render_form.
 
-    DATA: lo_user  TYPE REF TO lcl_persistence_user,
-          lv_user  TYPE string,
-          lv_key   TYPE lcl_persistence_db=>ty_value,
-          lv_email TYPE string.
+    CONSTANTS: lc_body_col_max TYPE i VALUE 150.
+
+    DATA: lo_user      TYPE REF TO lcl_persistence_user.
+    DATA: lv_user      TYPE string.
+    DATA: lv_email     TYPE string.
+    DATA: lv_s_param   TYPE string.
+    DATA: lo_settings  TYPE REF TO lcl_settings.
+    data: lv_body_size type i.
 
 * see https://git-scm.com/book/ch5-2.html
 * commit messages should be max 50 characters
 * body should wrap at 72 characters
 
     lo_user  = lcl_app=>user( ).
-    lv_key   = mo_repo->get_key( ).
 
     lv_user  = lo_user->get_repo_git_user_name( mo_repo->get_url( ) ).
     IF lv_user IS INITIAL.
@@ -191,13 +194,24 @@ CLASS lcl_gui_page_commit IMPLEMENTATION.
                                      iv_label = 'committer e-mail'
                                      iv_value = lv_email ) ).
 
+    lo_settings = lcl_app=>settings( )->read( ).
+
+    lv_s_param = lo_settings->get_commitmsg_comment_length( ).
+
     ro_html->add( render_text_input( iv_name       = 'comment'
                                      iv_label      = 'comment'
-                                     iv_max_length = '72' ) ).
+                                     iv_max_length = lv_s_param ) ).
 
     ro_html->add( '<div class="row">' ).
     ro_html->add( '<label for="c-body">body</label>' ).
-    ro_html->add( '<textarea id="c-body" name="body" rows="10" cols="50"></textarea>' ).
+
+    lv_body_size = lo_settings->get_commitmsg_body_size( ).
+    IF lv_body_size > lc_body_col_max.
+      lv_body_size = lc_body_col_max.
+    ENDIF.
+    ro_html->add( |<textarea id="c-body" name="body" rows="10" cols="| &&
+                  |{ lv_body_size }"></textarea>| ).
+
     ro_html->add( '<input type="submit" class="hidden-submit">' ).
     ro_html->add( '</div>' ).
 
@@ -227,12 +241,12 @@ CLASS lcl_gui_page_commit IMPLEMENTATION.
 
     lo_toolbar->add( iv_act = 'submitFormById(''commit_form'');'
                      iv_txt = 'Commit'
-                     iv_typ = gc_action_type-onclick
-                     iv_opt = gc_html_opt-strong ) ##NO_TEXT.
+                     iv_typ = lif_defs=>gc_action_type-onclick
+                     iv_opt = lif_defs=>gc_html_opt-strong ) ##NO_TEXT.
 
     lo_toolbar->add( iv_act = c_action-commit_cancel
                      iv_txt = 'Cancel'
-                     iv_opt = gc_html_opt-cancel ) ##NO_TEXT.
+                     iv_opt = lif_defs=>gc_html_opt-cancel ) ##NO_TEXT.
 
     ro_html->add( '<div class="paddings">' ).
     ro_html->add( lo_toolbar->render( ) ).
@@ -243,7 +257,7 @@ CLASS lcl_gui_page_commit IMPLEMENTATION.
   METHOD scripts.
 
     CREATE OBJECT ro_html.
-    _add 'setInitialFocus("comment");'.
+    ro_html->add( 'setInitialFocus("comment");' ).
 
   ENDMETHOD.    "scripts
 
diff --git a/src/zabapgit_page_db.prog.abap b/src/zabapgit_page_db.prog.abap
index f4ba4850b..ef8183605 100644
--- a/src/zabapgit_page_db.prog.abap
+++ b/src/zabapgit_page_db.prog.abap
@@ -2,7 +2,7 @@
 *&  Include           ZABAPGIT_PAGE_DB
 *&---------------------------------------------------------------------*
 
-CLASS lcl_gui_page_db_display DEFINITION FINAL INHERITING FROM lcl_gui_page.
+CLASS lcl_gui_page_db_dis DEFINITION FINAL INHERITING FROM lcl_gui_page.
 
   PUBLIC SECTION.
     METHODS: constructor
@@ -20,7 +20,7 @@ CLASS lcl_gui_page_db_display DEFINITION FINAL INHERITING FROM lcl_gui_page.
 
 ENDCLASS.
 
-CLASS lcl_gui_page_db_display IMPLEMENTATION.
+CLASS lcl_gui_page_db_dis IMPLEMENTATION.
 
   METHOD constructor.
     super->constructor( ).
@@ -31,7 +31,7 @@ CLASS lcl_gui_page_db_display IMPLEMENTATION.
   METHOD render_record_banner.
     rv_html = |<table class="tag"><tr><td class="label">Type:</td>|
            && | <td>{ is_key-type }</td></tr></table>|
-           && gc_newline
+           && lif_defs=>gc_newline
            && |<table class="tag"><tr><td class="label">Key:</td>|
            && |  <td>{ is_key-value }</td></tr></table>|.
   ENDMETHOD. "render_record_banner
@@ -62,7 +62,7 @@ CLASS lcl_gui_page_db_display IMPLEMENTATION.
 
     CREATE OBJECT ro_html.
     CREATE OBJECT lo_toolbar.
-    lo_toolbar->add( iv_act = |{ gc_action-db_edit }?{ lv_action }|
+    lo_toolbar->add( iv_act = |{ lif_defs=>gc_action-db_edit }?{ lv_action }|
                      iv_txt = 'Edit' ) ##NO_TEXT.
 
     ro_html->add( '<div class="db_entry">' ).
@@ -124,20 +124,20 @@ CLASS lcl_gui_page_db_edit IMPLEMENTATION.
     CREATE OBJECT lo_toolbar.
     lo_toolbar->add( iv_act = 'submitFormById(''db_form'');'
                      iv_txt = 'Save'
-                     iv_typ = gc_action_type-onclick
-                     iv_opt = gc_html_opt-strong ) ##NO_TEXT.
+                     iv_typ = lif_defs=>gc_action_type-onclick
+                     iv_opt = lif_defs=>gc_html_opt-strong ) ##NO_TEXT.
 
     ro_html->add( '<div class="db_entry">' ).
 
     " Banners & Toolbar
     ro_html->add( '<table class="toolbar"><tr><td>' ).
-    ro_html->add( lcl_gui_page_db_display=>render_record_banner( ms_key ) ).
+    ro_html->add( lcl_gui_page_db_dis=>render_record_banner( ms_key ) ).
     ro_html->add( '</td><td>' ).
     ro_html->add( lo_toolbar->render( iv_right = abap_true ) ).
     ro_html->add( '</td></tr></table>' ).
 
     " Form
-    ro_html->add( |<form id="db_form" method="post" action="sapevent:{ gc_action-db_update }">| ).
+    ro_html->add( |<form id="db_form" method="post" action="sapevent:{ lif_defs=>gc_action-db_update }">| ).
     ro_html->add( |<input type="hidden" name="type" value="{ ms_key-type }">| ).
     ro_html->add( |<input type="hidden" name="value" value="{ ms_key-value }">| ).
     ro_html->add( |<textarea rows="20" cols="100" name="xmldata">{ lv_data }</textarea>| ).
@@ -210,9 +210,9 @@ CLASS lcl_gui_page_db IMPLEMENTATION.
       lv_action  = lcl_html_action_utils=>dbkey_encode( <ls_data> ).
 
       CREATE OBJECT lo_toolbar.
-      lo_toolbar->add( iv_txt = 'Display' iv_act = |{ gc_action-db_display }?{ lv_action }| ).
-      lo_toolbar->add( iv_txt = 'Edit'    iv_act = |{ gc_action-db_edit }?{ lv_action }| ).
-      lo_toolbar->add( iv_txt = 'Delete'  iv_act = |{ gc_action-db_delete }?{ lv_action }| ).
+      lo_toolbar->add( iv_txt = 'Display' iv_act = |{ lif_defs=>gc_action-db_display }?{ lv_action }| ).
+      lo_toolbar->add( iv_txt = 'Edit'    iv_act = |{ lif_defs=>gc_action-db_edit }?{ lv_action }| ).
+      lo_toolbar->add( iv_txt = 'Delete'  iv_act = |{ lif_defs=>gc_action-db_delete }?{ lv_action }| ).
 
       ro_html->add( |<tr{ lv_trclass }>| ).
       ro_html->add( |<td>{ <ls_data>-type }</td>| ).
diff --git a/src/zabapgit_page_debug.prog.abap b/src/zabapgit_page_debug.prog.abap
index 263c22cdb..12d5b841f 100644
--- a/src/zabapgit_page_debug.prog.abap
+++ b/src/zabapgit_page_debug.prog.abap
@@ -55,8 +55,8 @@ CLASS lcl_gui_page_debuginfo IMPLEMENTATION.
 
     CREATE OBJECT ro_html.
 
-    ro_html->add( |<p>abapGit version: { gc_abap_version }</p>| ).
-    ro_html->add( |<p>XML version:     { gc_xml_version }</p>| ).
+    ro_html->add( |<p>abapGit version: { lif_defs=>gc_abap_version }</p>| ).
+    ro_html->add( |<p>XML version:     { lif_defs=>gc_xml_version }</p>| ).
     ro_html->add( |<p>GUI version:     { lv_gui_version }</p>| ).
     ro_html->add( |<p>LCL_TIME:        { lcl_time=>get( ) }</p>| ).
     ro_html->add( |<p>SY time:         { sy-datum } { sy-uzeit } { sy-tzone }</p>| ).
@@ -67,7 +67,7 @@ CLASS lcl_gui_page_debuginfo IMPLEMENTATION.
 
     DATA: lt_objects TYPE STANDARD TABLE OF ko100,
           lv_list    TYPE string,
-          ls_item    TYPE ty_item.
+          ls_item    TYPE lif_defs=>ty_item.
 
     FIELD-SYMBOLS <object> LIKE LINE OF lt_objects.
 
diff --git a/src/zabapgit_page_diff.prog.abap b/src/zabapgit_page_diff.prog.abap
index c0d33c715..d2f8de46e 100644
--- a/src/zabapgit_page_diff.prog.abap
+++ b/src/zabapgit_page_diff.prog.abap
@@ -28,8 +28,8 @@ CLASS lcl_gui_page_diff DEFINITION FINAL INHERITING FROM lcl_gui_page.
     METHODS:
       constructor
         IMPORTING iv_key           TYPE lcl_persistence_repo=>ty_repo-key
-                  is_file          TYPE ty_file OPTIONAL
-                  is_object        TYPE ty_item OPTIONAL
+                  is_file          TYPE lif_defs=>ty_file OPTIONAL
+                  is_object        TYPE lif_defs=>ty_item OPTIONAL
                   iv_supress_stage TYPE abap_bool DEFAULT abap_false
         RAISING   lcx_exception,
       lif_gui_page~on_event REDEFINITION.
@@ -73,9 +73,9 @@ CLASS lcl_gui_page_diff DEFINITION FINAL INHERITING FROM lcl_gui_page.
       IMPORTING is_diff_line   TYPE lcl_diff=>ty_diff OPTIONAL
       RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
     METHODS append_diff
-      IMPORTING it_remote TYPE ty_files_tt
-                it_local  TYPE ty_files_item_tt
-                is_status TYPE ty_result
+      IMPORTING it_remote TYPE lif_defs=>ty_files_tt
+                it_local  TYPE lif_defs=>ty_files_item_tt
+                is_status TYPE lif_defs=>ty_result
       RAISING   lcx_exception.
     METHODS build_menu
       IMPORTING iv_supress_stage TYPE abap_bool
@@ -91,9 +91,9 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
   METHOD constructor.
 
-    DATA: lt_remote TYPE ty_files_tt,
-          lt_local  TYPE ty_files_item_tt,
-          lt_status TYPE ty_results_tt,
+    DATA: lt_remote TYPE lif_defs=>ty_files_tt,
+          lt_local  TYPE lif_defs=>ty_files_item_tt,
+          lt_status TYPE lif_defs=>ty_results_tt,
           lo_repo   TYPE REF TO lcl_repo_online,
           lv_ts     TYPE timestamp.
 
@@ -295,9 +295,9 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
     IF iv_supress_stage = abap_false.
       ro_menu->add( iv_txt = 'Stage'
-                    iv_act = |{ gc_action-go_stage }?{ mv_repo_key }|
+                    iv_act = |{ lif_defs=>gc_action-go_stage }?{ mv_repo_key }|
                     iv_id  = 'stage-button'
-                    iv_opt = gc_html_opt-strong ).
+                    iv_opt = lif_defs=>gc_html_opt-strong ).
     ENDIF.
 
     IF lines( lt_types ) > 1 OR lines( lt_users ) > 1.
@@ -305,10 +305,10 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
       " File types
       IF lines( lt_types ) > 1.
-        lo_sub->add( iv_txt = 'TYPE' iv_typ = gc_action_type-separator ).
+        lo_sub->add( iv_txt = 'TYPE' iv_typ = lif_defs=>gc_action_type-separator ).
         LOOP AT lt_types ASSIGNING <i>.
           lo_sub->add( iv_txt = <i>
-                       iv_typ = gc_action_type-onclick
+                       iv_typ = lif_defs=>gc_action_type-onclick
                        iv_aux = 'type'
                        iv_chk = abap_true ).
         ENDLOOP.
@@ -316,10 +316,10 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
       " Changed by
       IF lines( lt_users ) > 1.
-        lo_sub->add( iv_txt = 'CHANGED BY' iv_typ = gc_action_type-separator ).
+        lo_sub->add( iv_txt = 'CHANGED BY' iv_typ = lif_defs=>gc_action_type-separator ).
         LOOP AT lt_users ASSIGNING <i>.
           lo_sub->add( iv_txt = <i>
-                       iv_typ = gc_action_type-onclick
+                       iv_typ = lif_defs=>gc_action_type-onclick
                        iv_aux = 'changed-by'
                        iv_chk = abap_true ).
         ENDLOOP.
@@ -334,24 +334,16 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
   ENDMETHOD.  " build_menu.
 
-**********************************************************************
-* EVENT HANDLING
-**********************************************************************
-
   METHOD lif_gui_page~on_event.
 
     CASE iv_action.
       WHEN c_actions-toggle_unified. " Toggle file diplay
         mv_unified = lcl_app=>user( )->toggle_diff_unified( ).
-        ev_state   = gc_event_state-re_render.
+        ev_state   = lif_defs=>gc_event_state-re_render.
     ENDCASE.
 
   ENDMETHOD. "lif_gui_page~on_event
 
-**********************************************************************
-* RENDER LOGIC
-**********************************************************************
-
   METHOD render_content.
 
     DATA ls_diff_file LIKE LINE OF mt_diff_files.
@@ -400,10 +392,6 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
   ENDMETHOD.  " render_diff
 
-**********************************************************************
-* CHUNKS
-**********************************************************************
-
   METHOD render_diff_head.
 
     DATA: ls_stats TYPE lcl_diff=>ty_count.
@@ -645,7 +633,7 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
     ro_html->add( 'var gHelper = new DiffHelper({' ).
     ro_html->add( |  seed:        "{ mv_seed }",| ).
-    ro_html->add( |  stageAction: "{ gc_action-go_stage }",| ).
+    ro_html->add( |  stageAction: "{ lif_defs=>gc_action-go_stage }",| ).
     ro_html->add( '  ids: {' ).
     ro_html->add( '    diffList:    "diff-list",' ).
     ro_html->add( '    filterMenu:  "diff-filter",' ).
diff --git a/src/zabapgit_page_main.prog.abap b/src/zabapgit_page_main.prog.abap
index 73c9720ed..3dfa00104 100644
--- a/src/zabapgit_page_main.prog.abap
+++ b/src/zabapgit_page_main.prog.abap
@@ -20,7 +20,7 @@ CLASS lcl_gui_page_main DEFINITION FINAL INHERITING FROM lcl_gui_page.
                END OF c_actions.
 
     DATA: mv_show         TYPE lcl_persistence_db=>ty_value,
-          mo_repo_content TYPE REF TO lcl_gui_view_repo_content.
+          mo_repo_content TYPE REF TO lcl_gui_view_repo.
 
     METHODS:
       test_changed_by
@@ -65,7 +65,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
           ei_page      = ei_page
           ev_state     = ev_state ).
 
-      IF ev_state <> gc_event_state-not_handled.
+      IF ev_state <> lif_defs=>gc_event_state-not_handled.
         RETURN.
       ENDIF.
     ENDIF.
@@ -80,10 +80,10 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
           CATCH lcx_exception ##NO_HANDLER.
         ENDTRY.
 
-        ev_state = gc_event_state-re_render.
+        ev_state = lif_defs=>gc_event_state-re_render.
       WHEN c_actions-changed_by.
         test_changed_by( ).
-        ev_state = gc_event_state-no_more_act.
+        ev_state = lif_defs=>gc_event_state-no_more_act.
     ENDCASE.
 
   ENDMETHOD.  "on_event
@@ -92,7 +92,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
     DATA: ls_tadir TYPE tadir,
           lv_user  TYPE xubname,
-          ls_item  TYPE ty_item.
+          ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_tadir = lcl_popups=>popup_object( ).
@@ -109,10 +109,6 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
   ENDMETHOD.
 
-**********************************************************************
-* RENDERING
-**********************************************************************
-
   METHOD render_content.
 
     DATA: lt_repos    TYPE lcl_repo_srv=>ty_repo_tt,
@@ -145,12 +141,10 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
   METHOD retrieve_active_repo.
 
-    DATA: lt_repos    TYPE lcl_repo_srv=>ty_repo_tt,
-          lo_repo     LIKE LINE OF lt_repos,
-          lv_show_old LIKE mv_show.
+    DATA: lv_show_old LIKE mv_show.
 
     TRY.
-        lt_repos = lcl_app=>repo_srv( )->list( ).
+        lcl_app=>repo_srv( )->list( ).
       CATCH lcx_exception.
         RETURN.
     ENDTRY.
@@ -160,7 +154,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
     IF mv_show IS NOT INITIAL.
       TRY. " verify the key exists
-          lo_repo = lcl_app=>repo_srv( )->get( mv_show ).
+          lcl_app=>repo_srv( )->get( mv_show ).
         CATCH lcx_exception.
           CLEAR mv_show.
           lcl_app=>user( )->set_repo_show( mv_show ).
@@ -185,21 +179,21 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
     CREATE OBJECT lo_advsub.
     CREATE OBJECT lo_helpsub.
 
-    lo_advsub->add( iv_txt = 'Database util'    iv_act = gc_action-go_db ) ##NO_TEXT.
-    lo_advsub->add( iv_txt = 'Package to zip'   iv_act = gc_action-zip_package ) ##NO_TEXT.
-    lo_advsub->add( iv_txt = 'Transport to zip' iv_act = gc_action-zip_transport ) ##NO_TEXT.
-    lo_advsub->add( iv_txt = 'Object to files'  iv_act = gc_action-zip_object ) ##NO_TEXT.
+    lo_advsub->add( iv_txt = 'Database util'    iv_act = lif_defs=>gc_action-go_db ) ##NO_TEXT.
+    lo_advsub->add( iv_txt = 'Package to zip'   iv_act = lif_defs=>gc_action-zip_package ) ##NO_TEXT.
+    lo_advsub->add( iv_txt = 'Transport to zip' iv_act = lif_defs=>gc_action-zip_transport ) ##NO_TEXT.
+    lo_advsub->add( iv_txt = 'Object to files'  iv_act = lif_defs=>gc_action-zip_object ) ##NO_TEXT.
     lo_advsub->add( iv_txt = 'Test changed by'  iv_act = c_actions-changed_by ) ##NO_TEXT.
-    lo_advsub->add( iv_txt = 'Page playground'  iv_act = gc_action-go_playground ) ##NO_TEXT.
-    lo_advsub->add( iv_txt = 'Debug info'       iv_act = gc_action-go_debuginfo ) ##NO_TEXT.
-    lo_advsub->add( iv_txt = 'Settings'         iv_act = gc_action-go_settings ) ##NO_TEXT.
+    lo_advsub->add( iv_txt = 'Page playground'  iv_act = lif_defs=>gc_action-go_playground ) ##NO_TEXT.
+    lo_advsub->add( iv_txt = 'Debug info'       iv_act = lif_defs=>gc_action-go_debuginfo ) ##NO_TEXT.
+    lo_advsub->add( iv_txt = 'Settings'         iv_act = lif_defs=>gc_action-go_settings ) ##NO_TEXT.
 
-    lo_helpsub->add( iv_txt = 'Tutorial'        iv_act = gc_action-go_tutorial ) ##NO_TEXT.
-    lo_helpsub->add( iv_txt = 'abapGit wiki'    iv_act = gc_action-abapgit_wiki ) ##NO_TEXT.
+    lo_helpsub->add( iv_txt = 'Tutorial'        iv_act = lif_defs=>gc_action-go_tutorial ) ##NO_TEXT.
+    lo_helpsub->add( iv_txt = 'abapGit wiki'    iv_act = lif_defs=>gc_action-abapgit_wiki ) ##NO_TEXT.
 
-    ro_menu->add( iv_txt = '+ Clone'            iv_act = gc_action-repo_clone ) ##NO_TEXT.
-    ro_menu->add( iv_txt = '+ Offline'          iv_act = gc_action-repo_newoffline ) ##NO_TEXT.
-    ro_menu->add( iv_txt = 'Explore'            iv_act = gc_action-go_explore ) ##NO_TEXT.
+    ro_menu->add( iv_txt = '+ Clone'            iv_act = lif_defs=>gc_action-repo_clone ) ##NO_TEXT.
+    ro_menu->add( iv_txt = '+ Offline'          iv_act = lif_defs=>gc_action-repo_newoffline ) ##NO_TEXT.
+    ro_menu->add( iv_txt = 'Explore'            iv_act = lif_defs=>gc_action-go_explore ) ##NO_TEXT.
 
     ro_menu->add( iv_txt = 'Advanced'           io_sub = lo_advsub ) ##NO_TEXT.
     ro_menu->add( iv_txt = 'Help'               io_sub = lo_helpsub ) ##NO_TEXT.
@@ -208,7 +202,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
   METHOD render_toc.
 
-    DATA: lo_pback      TYPE REF TO lcl_persistence_background,
+    DATA: lo_pback      TYPE REF TO lcl_persist_background,
           lv_current    TYPE abap_bool,
           lv_key        TYPE lcl_persistence_repo=>ty_repo-key,
           lv_icon       TYPE string,
@@ -274,7 +268,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
     ro_html->add( '<table class="w100"><tr>' ).
     ro_html->add( |<td class="pad-sides">{
-                  lcl_html=>icon( iv_name = 'star/blue' iv_alt = 'Favs' iv_hint = 'Favorites' )
+                  lcl_html=>icon( iv_name = 'star/blue' iv_hint = 'Favorites' )
                   }</td>| ).
 
     ro_html->add( '<td class="pad-sides w100 favorites">' ). " Maximize width
@@ -282,7 +276,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
       ro_html->add( lo_favbar->render( iv_sort = abap_true ) ).
     ELSE.
       ro_html->add( |<span class="grey">No favorites so far. For more info please check {
-                    lcl_html=>a( iv_txt = 'tutorial' iv_act = gc_action-go_tutorial )
+                    lcl_html=>a( iv_txt = 'tutorial' iv_act = lif_defs=>gc_action-go_tutorial )
                     }</span>| ).
     ENDIF.
     ro_html->add( '</td>' ).
@@ -305,11 +299,20 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
   METHOD render_repo.
 
+    DATA lo_news TYPE REF TO lcl_news.
+
     CREATE OBJECT ro_html.
 
+    lo_news = lcl_news=>create( io_repo ).
+
     ro_html->add( |<div class="repo" id="repo{ io_repo->get_key( ) }">| ).
-    ro_html->add( lcl_gui_chunk_lib=>render_repo_top( io_repo               = io_repo
-                                                      iv_interactive_branch = abap_true ) ).
+    ro_html->add( lcl_gui_chunk_lib=>render_repo_top(
+      io_repo               = io_repo
+      io_news               = lo_news
+      iv_interactive_branch = abap_true ) ).
+
+    ro_html->add( lcl_gui_chunk_lib=>render_news( io_news = lo_news ) ).
+
     ro_html->add( mo_repo_content->render( ) ).
     ro_html->add( '</div>' ).
 
diff --git a/src/zabapgit_page_merge.prog.abap b/src/zabapgit_page_merge.prog.abap
index f55542f18..7a94693c9 100644
--- a/src/zabapgit_page_merge.prog.abap
+++ b/src/zabapgit_page_merge.prog.abap
@@ -6,8 +6,8 @@ CLASS lcl_merge DEFINITION FINAL.
 
   PUBLIC SECTION.
     TYPES: BEGIN OF ty_ancestor,
-             commit TYPE ty_sha1,
-             tree   TYPE ty_sha1,
+             commit TYPE lif_defs=>ty_sha1,
+             tree   TYPE lif_defs=>ty_sha1,
              time   TYPE string,
              body   TYPE string,
            END OF ty_ancestor.
@@ -35,7 +35,7 @@ CLASS lcl_merge DEFINITION FINAL.
 
   PRIVATE SECTION.
     CLASS-DATA: gs_merge   TYPE ty_merge,
-                gt_objects TYPE ty_objects_tt.
+                gt_objects TYPE lif_defs=>ty_objects_tt.
 
     TYPES: ty_ancestor_tt TYPE STANDARD TABLE OF ty_ancestor WITH DEFAULT KEY.
 
@@ -45,7 +45,7 @@ CLASS lcl_merge DEFINITION FINAL.
       calculate_result
         RAISING lcx_exception,
       find_ancestors
-        IMPORTING iv_commit           TYPE ty_sha1
+        IMPORTING iv_commit           TYPE lif_defs=>ty_sha1
         RETURNING VALUE(rt_ancestors) TYPE ty_ancestor_tt
         RAISING   lcx_exception,
       find_first_common
@@ -115,7 +115,7 @@ CLASS lcl_merge IMPLEMENTATION.
 
     DEFINE _from_source.
       READ TABLE gt_objects ASSIGNING <ls_object>
-        WITH KEY type = gc_type-blob
+        WITH KEY type = lif_defs=>gc_type-blob
         sha1 = <ls_source>-sha1.
       ASSERT sy-subrc = 0.
 
@@ -260,7 +260,7 @@ CLASS lcl_merge IMPLEMENTATION.
     END-OF-DEFINITION.
 
     DATA: ls_commit TYPE lcl_git_pack=>ty_commit,
-          lt_visit  TYPE STANDARD TABLE OF ty_sha1,
+          lt_visit  TYPE STANDARD TABLE OF lif_defs=>ty_sha1,
           lv_commit LIKE LINE OF lt_visit.
 
     FIELD-SYMBOLS: <ls_ancestor> LIKE LINE OF rt_ancestors,
@@ -271,7 +271,7 @@ CLASS lcl_merge IMPLEMENTATION.
 
     LOOP AT lt_visit INTO lv_commit.
       READ TABLE gt_objects ASSIGNING <ls_object>
-        WITH KEY type = gc_type-commit sha1 = lv_commit.
+        WITH KEY type = lif_defs=>gc_type-commit sha1 = lv_commit.
       ASSERT sy-subrc = 0.
 
       ls_commit = lcl_git_pack=>decode_commit( <ls_object>-data ).
@@ -283,7 +283,7 @@ CLASS lcl_merge IMPLEMENTATION.
       <ls_ancestor>-commit = lv_commit.
       <ls_ancestor>-tree = ls_commit-tree.
       <ls_ancestor>-body = ls_commit-body.
-      FIND REGEX gc_author_regex IN ls_commit-author
+      FIND REGEX lif_defs=>gc_author_regex IN ls_commit-author
         SUBMATCHES <ls_ancestor>-time ##NO_TEXT.
       ASSERT sy-subrc = 0.
     ENDLOOP.
@@ -372,7 +372,7 @@ CLASS lcl_gui_page_merge IMPLEMENTATION.
           EXPORTING
             io_repo  = mo_repo
             io_stage = ms_merge-stage.
-        ev_state = gc_event_state-new_page.
+        ev_state = lif_defs=>gc_event_state-new_page.
     ENDCASE.
 
   ENDMETHOD.
@@ -420,25 +420,25 @@ CLASS lcl_gui_page_merge IMPLEMENTATION.
       iv_show_package = abap_false
       iv_show_branch  = abap_false ) ).
 
-    _add '<table>'.
-    _add '<tr>'.
-    _add '<td>Source:</td>'.
-    _add '<td>'.
-    _add ms_merge-source-name.
-    _add '</td></tr>'.
-    _add '<tr>'.
-    _add '<td>Target:</td>'.
-    _add '<td>'.
-    _add ms_merge-target-name.
-    _add '</td></tr>'.
-    _add '<tr>'.
-    _add '<td>Ancestor:</td>'.
-    _add '<td>'.
-    _add ms_merge-common-commit.
-    _add '</td></tr>'.
-    _add '</table>'.
+    ro_html->add( '<table>' ).
+    ro_html->add( '<tr>' ).
+    ro_html->add( '<td>Source:</td>' ).
+    ro_html->add( '<td>' ).
+    ro_html->add( ms_merge-source-name ).
+    ro_html->add( '</td></tr>' ).
+    ro_html->add( '<tr>' ).
+    ro_html->add( '<td>Target:</td>' ).
+    ro_html->add( '<td>' ).
+    ro_html->add( ms_merge-target-name ).
+    ro_html->add( '</td></tr>' ).
+    ro_html->add( '<tr>' ).
+    ro_html->add( '<td>Ancestor:</td>' ).
+    ro_html->add( '<td>' ).
+    ro_html->add( ms_merge-common-commit ).
+    ro_html->add( '</td></tr>' ).
+    ro_html->add( '</table>' ).
 
-    _add '<br>'.
+    ro_html->add( '<br>' ).
 
     APPEND LINES OF ms_merge-stree TO lt_files.
     APPEND LINES OF ms_merge-ttree TO lt_files.
diff --git a/src/zabapgit_page_repo_settings.prog.abap b/src/zabapgit_page_repo_settings.prog.abap
index 7f8b4fff5..0b135fb55 100644
--- a/src/zabapgit_page_repo_settings.prog.abap
+++ b/src/zabapgit_page_repo_settings.prog.abap
@@ -2,7 +2,7 @@
 *&  Include           ZABAPGIT_PAGE_REPO_SETTINGS
 *&---------------------------------------------------------------------*
 
-CLASS lcl_gui_page_repo_settings DEFINITION FINAL INHERITING FROM lcl_gui_page.
+CLASS lcl_gui_page_repo_sett DEFINITION FINAL INHERITING FROM lcl_gui_page.
   PUBLIC SECTION.
     METHODS:
       constructor
@@ -25,9 +25,9 @@ CLASS lcl_gui_page_repo_settings DEFINITION FINAL INHERITING FROM lcl_gui_page.
         RETURNING
           VALUE(rt_post_fields) TYPE tihttpnvp.
 
-ENDCLASS.                       "lcl_gui_page_debuginfo
+ENDCLASS.
 
-CLASS lcl_gui_page_repo_settings IMPLEMENTATION.
+CLASS lcl_gui_page_repo_sett IMPLEMENTATION.
 
   METHOD constructor.
     super->constructor( ).
@@ -59,6 +59,9 @@ CLASS lcl_gui_page_repo_settings IMPLEMENTATION.
     ro_html->add( 'Folder logic: <input name="folder_logic" type="text" size="10" value="' &&
       ls_dot-folder_logic && '">' ).
     ro_html->add( '<br>' ).
+    ro_html->add( 'Starting folder: <input name="starting_folder" type="text" size="10" value="' &&
+      ls_dot-starting_folder && '">' ).
+    ro_html->add( '<br>' ).
     ro_html->add( '<input type="submit" value="Save" class="submit">' ).
     ro_html->add( '</form>' ).
     ro_html->add( '</div>' ).
@@ -76,14 +79,20 @@ CLASS lcl_gui_page_repo_settings IMPLEMENTATION.
       WHEN c_action-save_settings.
         lt_post_fields = parse_post( it_postdata ).
 
+        lo_dot = mo_repo->get_dot_abapgit( ).
+
         READ TABLE lt_post_fields INTO ls_post_field WITH KEY name = 'folder_logic'.
         ASSERT sy-subrc = 0.
-
-        lo_dot = mo_repo->get_dot_abapgit( ).
         lo_dot->set_folder_logic( ls_post_field-value ).
-        mo_repo->set_dot_abapgit( lo_dot ).
 
-        ev_state = gc_event_state-go_back.
+        READ TABLE lt_post_fields INTO ls_post_field WITH KEY name = 'starting_folder'.
+        ASSERT sy-subrc = 0.
+        lo_dot->set_starting_folder( ls_post_field-value ).
+
+        mo_repo->set_dot_abapgit( lo_dot ).
+        mo_repo->refresh( ).
+
+        ev_state = lif_defs=>gc_event_state-go_back.
     ENDCASE.
 
   ENDMETHOD.
diff --git a/src/zabapgit_page_settings.prog.abap b/src/zabapgit_page_settings.prog.abap
index 075ecedc6..687ba4b68 100644
--- a/src/zabapgit_page_settings.prog.abap
+++ b/src/zabapgit_page_settings.prog.abap
@@ -32,6 +32,10 @@ CLASS lcl_gui_page_settings DEFINITION FINAL INHERITING FROM lcl_gui_page.
       RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
     METHODS render_max_lines
       RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
+    METHODS render_adt_jump_enabled
+      RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
+    METHODS render_commit_msg
+      RETURNING VALUE(ro_html) TYPE REF TO lcl_html.
     METHODS build_settings
       IMPORTING
         it_post_fields TYPE tihttpnvp.
@@ -64,9 +68,13 @@ CLASS lcl_gui_page_settings IMPLEMENTATION.
     ro_html->add( render_form_begin( ) ).
     ro_html->add( render_proxy( ) ).
     ro_html->add( |<hr>| ).
-    ro_html->add( render_development_internals( ) ).
-    ro_html->add( |<hr>| ).
     ro_html->add( render_max_lines( ) ).
+    ro_html->add( |<hr>| ).
+    ro_html->add( render_adt_jump_enabled( ) ).
+    ro_html->add( |<hr>| ).
+    ro_html->add( render_commit_msg( ) ).
+    ro_html->add( |<hr>| ).
+    ro_html->add( render_development_internals( ) ).
     ro_html->add( render_form_end( ) ).
 
   ENDMETHOD.  "render_content
@@ -78,17 +86,28 @@ CLASS lcl_gui_page_settings IMPLEMENTATION.
     ro_html->add( |<h2>Proxy</h2>| ).
     ro_html->add( |<label for="proxy_url">Proxy URL</label>| ).
     ro_html->add( |<br>| ).
-    ro_html->add( `<input name="proxy_url" type="text" size="50" value="` && mo_settings->get_proxy_url( ) && `">` ).
+    ro_html->add( `<input name="proxy_url" type="text" size="50" value="` &&
+      mo_settings->get_proxy_url( ) && `">` ).
     ro_html->add( |<br>| ).
     ro_html->add( |<label for="proxy_port">Proxy Port</label>| ).
     ro_html->add( |<br>| ).
-    ro_html->add( `<input name="proxy_port" type="text" size="5" value="` && mo_settings->get_proxy_port( ) && `">` ).
+    ro_html->add( `<input name="proxy_port" type="text" size="5" value="` &&
+      mo_settings->get_proxy_port( ) && `">` ).
     ro_html->add( |<br>| ).
+    ro_html->add( |<label for="proxy_auth">Proxy Authentication</label>| ).
+    IF mo_settings->get_proxy_authentication( ) = abap_true.
+      ro_html->add( `<input name="proxy_auth" type="checkbox" checked>` ).
+    ELSE.
+      ro_html->add( `<input name="proxy_auth" type="checkbox">` ).
+    ENDIF.
+    ro_html->add( |<br>| ).
+
     ro_html->add( |<br>| ).
 
   ENDMETHOD.
 
   METHOD lif_gui_page~on_event.
+* todo, check input values eg INT
 
     DATA:
       lt_post_fields TYPE tihttpnvp.
@@ -106,7 +125,7 @@ CLASS lcl_gui_page_settings IMPLEMENTATION.
           persist_settings( ).
         ENDIF.
 
-        ev_state = gc_event_state-go_back.
+        ev_state = lif_defs=>gc_event_state-go_back.
     ENDCASE.
 
   ENDMETHOD.
@@ -114,37 +133,74 @@ CLASS lcl_gui_page_settings IMPLEMENTATION.
 
   METHOD build_settings.
 
-    DATA: ls_post_field           TYPE ihttpnvp,
-          lv_max_lines_as_integer TYPE i.
+    DATA: lv_i_param_value         TYPE i.
+    FIELD-SYMBOLS: <ls_post_field> TYPE ihttpnvp.
+
 
     CREATE OBJECT mo_settings.
-    READ TABLE it_post_fields INTO ls_post_field WITH KEY name = 'proxy_url'.
+    READ TABLE it_post_fields ASSIGNING <ls_post_field> WITH KEY name = 'proxy_url'.
     IF sy-subrc <> 0.
       mv_error = abap_true.
     ENDIF.
-    mo_settings->set_proxy_url( ls_post_field-value ).
+    mo_settings->set_proxy_url( <ls_post_field>-value ).
 
-    READ TABLE it_post_fields INTO ls_post_field WITH KEY name = 'proxy_port'.
+    READ TABLE it_post_fields ASSIGNING <ls_post_field> WITH KEY name = 'proxy_port'.
     IF sy-subrc <> 0.
       mv_error = abap_true.
     ENDIF.
-    mo_settings->set_proxy_port( ls_post_field-value ).
+    mo_settings->set_proxy_port( <ls_post_field>-value ).
 
-    READ TABLE it_post_fields INTO ls_post_field WITH KEY name = 'critical_tests'.
+    READ TABLE it_post_fields ASSIGNING <ls_post_field> WITH KEY name = 'proxy_auth'.
+    IF sy-subrc = 0.
+      mo_settings->set_proxy_authentication( abap_true ).
+    ELSE.
+      mo_settings->set_proxy_authentication( abap_false ).
+    ENDIF.
+
+    READ TABLE it_post_fields ASSIGNING <ls_post_field> WITH KEY name = 'critical_tests'.
     IF sy-subrc = 0.
       mo_settings->set_run_critical_tests( abap_true ).
     ELSE.
       mo_settings->set_run_critical_tests( abap_false ).
     ENDIF.
 
-    READ TABLE it_post_fields INTO ls_post_field WITH KEY name = 'max_lines'.
+    READ TABLE it_post_fields ASSIGNING <ls_post_field> WITH KEY name = 'max_lines'.
     IF sy-subrc = 0.
-      lv_max_lines_as_integer = ls_post_field-value.
-      mo_settings->set_max_lines( lv_max_lines_as_integer ).
+      lv_i_param_value = <ls_post_field>-value.
+      mo_settings->set_max_lines( lv_i_param_value ).
     ELSE.
       mo_settings->set_max_lines( 0 ).
     ENDIF.
 
+    READ TABLE it_post_fields ASSIGNING <ls_post_field> WITH KEY name = 'adt_jump_enabled'.
+    IF sy-subrc = 0.
+      mo_settings->set_adt_jump_enanbled( abap_true ).
+    ELSE.
+      mo_settings->set_adt_jump_enanbled( abap_false ).
+    ENDIF.
+
+    READ TABLE it_post_fields ASSIGNING <ls_post_field> WITH KEY name = 'comment_length'.
+    IF sy-subrc = 0.
+      lv_i_param_value = <ls_post_field>-value.
+      IF lv_i_param_value < lcl_settings=>c_commitmsg_comment_length_dft.
+        lv_i_param_value = lcl_settings=>c_commitmsg_comment_length_dft.
+      ENDIF.
+      mo_settings->set_commitmsg_comment_length( lv_i_param_value ).
+    ELSE.
+      mo_settings->set_commitmsg_comment_length( lcl_settings=>c_commitmsg_comment_length_dft ).
+    ENDIF.
+
+    READ TABLE it_post_fields ASSIGNING <ls_post_field> WITH KEY name = 'body_size'.
+    IF sy-subrc = 0.
+      lv_i_param_value = <ls_post_field>-value.
+      IF lv_i_param_value < lcl_settings=>c_commitmsg_body_size_dft.
+        lv_i_param_value = lcl_settings=>c_commitmsg_body_size_dft.
+      ENDIF.
+      mo_settings->set_commitmsg_body_size( lv_i_param_value ).
+    ELSE.
+      mo_settings->set_commitmsg_body_size( lcl_settings=>c_commitmsg_body_size_dft ).
+    ENDIF.
+
   ENDMETHOD.
 
 
@@ -170,7 +226,7 @@ CLASS lcl_gui_page_settings IMPLEMENTATION.
 
   METHOD persist_settings.
 
-    DATA lo_settings_persistence TYPE REF TO lcl_persistence_settings.
+    DATA lo_settings_persistence TYPE REF TO lcl_persist_settings.
 
     lo_settings_persistence = lcl_app=>settings( ).
     lo_settings_persistence->modify( mo_settings ).
@@ -198,7 +254,7 @@ CLASS lcl_gui_page_settings IMPLEMENTATION.
 
   METHOD read_settings.
 
-    DATA lo_settings_persistence TYPE REF TO lcl_persistence_settings.
+    DATA lo_settings_persistence TYPE REF TO lcl_persist_settings.
 
     lo_settings_persistence = lcl_app=>settings( ).
     mo_settings = lo_settings_persistence->read( ).
@@ -233,4 +289,37 @@ CLASS lcl_gui_page_settings IMPLEMENTATION.
     ro_html->add( |<br>| ).
   ENDMETHOD.
 
+  METHOD render_adt_jump_enabled.
+
+    DATA lv_checked TYPE string.
+
+    IF mo_settings->get_adt_jump_enabled( ) = abap_true.
+      lv_checked = 'checked'.
+    ENDIF.
+
+    CREATE OBJECT ro_html.
+    ro_html->add( |<h2>ABAP Development Tools (ADT)</h2>| ).
+    ro_html->add( `<input type="checkbox" name="adt_jump_enabled" value="X" `
+                   && lv_checked && ` > Enable jump to ADT first` ).
+    ro_html->add( |<br>| ).
+    ro_html->add( |<br>| ).
+  ENDMETHOD.
+
+  METHOD render_commit_msg.
+    CREATE OBJECT ro_html.
+
+    ro_html->add( |<h2>Commit Message</h2>| ).
+    ro_html->add( |<label for="comment_length">Max. length of comment (recommendation 50)</label>| ).
+    ro_html->add( |<br>| ).
+    ro_html->add( |<input name="comment_length" type="number" step="10" size="3" maxlength="3" min="50"| &&
+                  | value="{ mo_settings->get_commitmsg_comment_length( ) }">| ).
+    ro_html->add( |<br>| ).
+    ro_html->add( |<label for="body_size">Max. line size of body (recommendation 72)</label>| ).
+    ro_html->add( |<br>| ).
+    ro_html->add( |<input name="body_size" type="number" size="3" maxlength="3" min="50"| &&
+                  | value="{ mo_settings->get_commitmsg_body_size( ) }">| ).
+    ro_html->add( |<br>| ).
+    ro_html->add( |<br>| ).
+  ENDMETHOD.
+
 ENDCLASS.
diff --git a/src/zabapgit_page_stage.prog.abap b/src/zabapgit_page_stage.prog.abap
index 8394e2056..3a207cb33 100644
--- a/src/zabapgit_page_stage.prog.abap
+++ b/src/zabapgit_page_stage.prog.abap
@@ -13,8 +13,8 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page.
     METHODS:
       constructor
         IMPORTING
-          io_repo TYPE REF TO lcl_repo_online
-          iv_seed TYPE string OPTIONAL
+                  io_repo TYPE REF TO lcl_repo_online
+                  iv_seed TYPE string OPTIONAL
         RAISING   lcx_exception,
       lif_gui_page~on_event REDEFINITION.
 
@@ -25,7 +25,7 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page.
 
   PRIVATE SECTION.
     DATA: mo_repo  TYPE REF TO lcl_repo_online,
-          ms_files TYPE ty_stage_files,
+          ms_files TYPE lif_defs=>ty_stage_files,
           mv_seed  TYPE string. " Unique page id to bind JS sessionStorage
 
     METHODS:
@@ -34,15 +34,15 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page.
 
       render_file
         IMPORTING iv_context     TYPE string
-                  is_file        TYPE ty_file
-                  is_item        TYPE ty_item OPTIONAL
+                  is_file        TYPE lif_defs=>ty_file
+                  is_item        TYPE lif_defs=>ty_item OPTIONAL
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html,
 
       render_actions
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html,
 
       read_last_changed_by
-        IMPORTING is_file        TYPE ty_file
+        IMPORTING is_file        TYPE lif_defs=>ty_file
         RETURNING VALUE(rv_user) TYPE xubname,
 
       process_stage_list
@@ -83,7 +83,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
 
     IF lines( ms_files-local ) > 0.
       ro_menu->add( iv_txt = |All diffs|
-                    iv_act = |{ gc_action-go_diff }?key={ mo_repo->get_key( ) }| ).
+                    iv_act = |{ lif_defs=>gc_action-go_diff }?key={ mo_repo->get_key( ) }| ).
     ENDIF.
 
   ENDMETHOD. "build_menu
@@ -117,7 +117,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
         io_repo  = mo_repo
         io_stage = lo_stage.
 
-    ev_state = gc_event_state-new_page.
+    ev_state = lif_defs=>gc_event_state-new_page.
 
   ENDMETHOD.
 
@@ -125,7 +125,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
 
     DATA: lv_string TYPE string,
           lt_fields TYPE tihttpnvp,
-          ls_file   TYPE ty_file.
+          ls_file   TYPE lif_defs=>ty_file.
 
     FIELD-SYMBOLS: <ls_file> LIKE LINE OF ms_files-local,
                    <ls_item> LIKE LINE OF lt_fields.
@@ -243,7 +243,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
         lv_param    = lcl_html_action_utils=>file_encode( iv_key  = mo_repo->get_key( )
                                                           ig_file = is_file ).
         lv_filename = lcl_html=>a( iv_txt = lv_filename
-                                   iv_act = |{ gc_action-go_diff }?{ lv_param }| ).
+                                   iv_act = |{ lif_defs=>gc_action-go_diff }?{ lv_param }| ).
         ro_html->add( |<td class="type">{ is_item-obj_type }</td>| ).
         ro_html->add( |<td class="name">{ lv_filename }</td>| ).
         ro_html->add( |<td class="user">{ read_last_changed_by( is_file ) }</td>| ).
@@ -293,11 +293,11 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
     " Action buttons
     ro_html->add( '<td class="indent5em">' ).
     ro_html->add_a( iv_act   = 'errorStub(event)' " Will be reinit by JS
-                    iv_typ   = gc_action_type-onclick
+                    iv_typ   = lif_defs=>gc_action_type-onclick
                     iv_id    = 'commitButton'
                     iv_style = 'display: none'
                     iv_txt   = 'Commit (<span id="fileCounter"></span>)'
-                    iv_opt   = gc_html_opt-strong ) ##NO_TEXT.
+                    iv_opt   = lif_defs=>gc_html_opt-strong ) ##NO_TEXT.
     ro_html->add_a( iv_act = |{ c_action-stage_all }|
                     iv_id  = 'commitAllButton'
                     iv_txt = lv_add_all_txt ) ##NO_TEXT.
@@ -335,8 +335,8 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
   ENDMETHOD.  "scripts
 
   METHOD read_last_changed_by.
-    DATA: ls_local_file TYPE ty_file_item,
-          lt_files_local type ty_files_item_tt.
+    DATA: ls_local_file  TYPE lif_defs=>ty_file_item,
+          lt_files_local TYPE lif_defs=>ty_files_item_tt.
     TRY.
         lt_files_local = mo_repo->get_files_local( ).
         READ TABLE lt_files_local INTO ls_local_file WITH KEY file = is_file.
diff --git a/src/zabapgit_persistence.prog.abap b/src/zabapgit_persistence.prog.abap
index 2acae64cc..a01d44b84 100644
--- a/src/zabapgit_persistence.prog.abap
+++ b/src/zabapgit_persistence.prog.abap
@@ -2,7 +2,7 @@
 *&  Include           ZABAPGIT_PERSISTENCE
 *&---------------------------------------------------------------------*
 
-CLASS lcl_persistence_migrate DEFINITION FINAL.
+CLASS lcl_persist_migrate DEFINITION FINAL.
 
   PUBLIC SECTION.
     CLASS-METHODS: run RAISING lcx_exception.
@@ -92,8 +92,8 @@ CLASS lcl_persistence_repo DEFINITION FINAL.
 
   PUBLIC SECTION.
     TYPES: BEGIN OF ty_local_checksum,
-             item  TYPE ty_item,
-             files TYPE ty_file_signatures_tt,
+             item  TYPE lif_defs=>ty_item,
+             files TYPE lif_defs=>ty_file_signatures_tt,
            END OF ty_local_checksum.
 
     TYPES: ty_local_checksum_tt TYPE STANDARD TABLE OF ty_local_checksum WITH DEFAULT KEY.
@@ -101,7 +101,7 @@ CLASS lcl_persistence_repo DEFINITION FINAL.
     TYPES: BEGIN OF ty_repo_xml,
              url                TYPE string,
              branch_name        TYPE string,
-             sha1               TYPE ty_sha1,
+             sha1               TYPE lif_defs=>ty_sha1,
              package            TYPE devclass,
              offline            TYPE sap_bool,
              local_checksums    TYPE ty_local_checksum_tt,
@@ -113,7 +113,7 @@ CLASS lcl_persistence_repo DEFINITION FINAL.
 
     TYPES: BEGIN OF ty_repo,
              key TYPE lcl_persistence_db=>ty_value.
-            INCLUDE TYPE ty_repo_xml.
+        INCLUDE TYPE ty_repo_xml.
     TYPES: END OF ty_repo.
     TYPES: tt_repo TYPE STANDARD TABLE OF ty_repo WITH DEFAULT KEY.
     TYPES: tt_repo_keys TYPE STANDARD TABLE OF ty_repo-key WITH DEFAULT KEY.
@@ -162,7 +162,7 @@ CLASS lcl_persistence_repo DEFINITION FINAL.
     METHODS add
       IMPORTING iv_url         TYPE string
                 iv_branch_name TYPE string
-                iv_branch      TYPE ty_sha1 OPTIONAL
+                iv_branch      TYPE lif_defs=>ty_sha1 OPTIONAL
                 iv_package     TYPE devclass
                 iv_offline     TYPE sap_bool DEFAULT abap_false
                 is_dot_abapgit TYPE lcl_dot_abapgit=>ty_dot_abapgit
@@ -204,7 +204,7 @@ CLASS lcl_persistence_repo DEFINITION FINAL.
 
 ENDCLASS.
 
-CLASS lcl_persistence_background DEFINITION FINAL.
+CLASS lcl_persist_background DEFINITION FINAL.
 
   PUBLIC SECTION.
 
@@ -230,7 +230,7 @@ CLASS lcl_persistence_background DEFINITION FINAL.
 
     TYPES: BEGIN OF ty_background,
              key TYPE lcl_persistence_db=>ty_value.
-            INCLUDE TYPE ty_xml.
+        INCLUDE TYPE ty_xml.
     TYPES: END OF ty_background.
     TYPES: tt_background TYPE STANDARD TABLE OF ty_background WITH DEFAULT KEY.
 
@@ -270,7 +270,7 @@ CLASS lcl_persistence_background DEFINITION FINAL.
 
 ENDCLASS.     "lcl_persistence_background DEFINITION
 
-CLASS lcl_persistence_background IMPLEMENTATION.
+CLASS lcl_persist_background IMPLEMENTATION.
 
   METHOD constructor.
     mo_db = lcl_app=>db( ).
@@ -424,6 +424,16 @@ CLASS lcl_persistence_user DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app.
       RETURNING VALUE(rv_email) TYPE string
       RAISING   lcx_exception.
 
+    METHODS set_repo_last_change_seen
+      IMPORTING iv_url     TYPE lcl_persistence_repo=>ty_repo-url
+                iv_version TYPE string
+      RAISING   lcx_exception.
+
+    METHODS get_repo_last_change_seen
+      IMPORTING iv_url            TYPE lcl_persistence_repo=>ty_repo-url
+      RETURNING VALUE(rv_version) TYPE string
+      RAISING   lcx_exception.
+
     METHODS toggle_hide_files
       RETURNING VALUE(rv_hide) TYPE abap_bool
       RAISING   lcx_exception.
@@ -468,22 +478,23 @@ CLASS lcl_persistence_user DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app.
 
     TYPES:
       BEGIN OF ty_repo_config,
-        url      TYPE lcl_persistence_repo=>ty_repo-url,
-        login    TYPE string,
-        git_user TYPE ty_git_user,
+        url              TYPE lcl_persistence_repo=>ty_repo-url,
+        login            TYPE string,
+        git_user         TYPE lif_defs=>ty_git_user,
+        last_change_seen TYPE string,
       END OF ty_repo_config.
 
     TYPES: ty_repo_config_tt TYPE STANDARD TABLE OF ty_repo_config WITH DEFAULT KEY.
 
     TYPES:
       BEGIN OF ty_user,
-        default_git_user TYPE ty_git_user,
+        default_git_user TYPE lif_defs=>ty_git_user,
         repo_show        TYPE lcl_persistence_repo=>ty_repo-key,
-        repo_config      TYPE ty_repo_config_tt,
         hide_files       TYPE abap_bool,
         changes_only     TYPE abap_bool,
         diff_unified     TYPE abap_bool,
         favorites        TYPE tt_favorites,
+        repo_config      TYPE ty_repo_config_tt,
       END OF ty_user.
 
     METHODS constructor
@@ -657,6 +668,8 @@ CLASS lcl_persistence_user IMPLEMENTATION.
 
     update( ls_user ).
 
+    COMMIT WORK AND WAIT.
+
   ENDMETHOD.  "update_repo_config
 
   METHOD set_repo_git_user_name.
@@ -707,6 +720,22 @@ CLASS lcl_persistence_user IMPLEMENTATION.
 
   ENDMETHOD.  "get_repo_email
 
+  METHOD set_repo_last_change_seen.
+
+    DATA: ls_repo_config TYPE ty_repo_config.
+
+    ls_repo_config                  = read_repo_config( iv_url ).
+    ls_repo_config-last_change_seen = iv_version.
+    update_repo_config( iv_url = iv_url is_repo_config = ls_repo_config ).
+
+  ENDMETHOD.  "set_last_change_seen
+
+  METHOD get_repo_last_change_seen.
+
+    rv_version = read_repo_config( iv_url )-last_change_seen.
+
+  ENDMETHOD.  "get_last_change_seen
+
   METHOD toggle_hide_files.
 
     DATA ls_user TYPE ty_user.
@@ -981,7 +1010,7 @@ CLASS lcl_persistence_repo IMPLEMENTATION.
 
   METHOD delete.
 
-    DATA: lo_background TYPE REF TO lcl_persistence_background.
+    DATA: lo_background TYPE REF TO lcl_persist_background.
 
     CREATE OBJECT lo_background.
     lo_background->delete( iv_key ).
@@ -1242,7 +1271,7 @@ CLASS lcl_persistence_repo IMPLEMENTATION.
 
 ENDCLASS.
 
-CLASS lcl_persistence_migrate IMPLEMENTATION.
+CLASS lcl_persist_migrate IMPLEMENTATION.
 
   METHOD run.
 
@@ -1324,7 +1353,7 @@ CLASS lcl_persistence_migrate IMPLEMENTATION.
     ls_dd25v-viewname   = lcl_persistence_db=>c_lock.
     ls_dd25v-aggtype    = 'E'.
     ls_dd25v-roottab    = lcl_persistence_db=>c_tabname.
-    ls_dd25v-ddlanguage = gc_english.
+    ls_dd25v-ddlanguage = lif_defs=>gc_english.
     ls_dd25v-ddtext     = c_text.
 
     APPEND INITIAL LINE TO lt_dd26e ASSIGNING <ls_dd26e>.
@@ -1417,7 +1446,7 @@ CLASS lcl_persistence_migrate IMPLEMENTATION.
     FIELD-SYMBOLS: <ls_dd03p> LIKE LINE OF lt_dd03p.
 
     ls_dd02v-tabname    = lcl_persistence_db=>c_tabname.
-    ls_dd02v-ddlanguage = gc_english.
+    ls_dd02v-ddlanguage = lif_defs=>gc_english.
     ls_dd02v-tabclass   = 'TRANSP'.
     ls_dd02v-ddtext     = c_text.
     ls_dd02v-contflag   = 'A'.
@@ -1505,18 +1534,27 @@ ENDCLASS.
 CLASS lcl_settings DEFINITION FINAL.
 
   PUBLIC SECTION.
+    CONSTANTS: c_commitmsg_comment_length_dft TYPE i VALUE 50.
+    CONSTANTS: c_commitmsg_body_size_dft      TYPE i VALUE 72.
+
     METHODS set_proxy_url
       IMPORTING
         iv_url TYPE string.
     METHODS set_proxy_port
       IMPORTING
         iv_port TYPE string.
+    METHODS set_proxy_authentication
+      IMPORTING
+        iv_auth TYPE abap_bool.
     METHODS get_proxy_url
       RETURNING
         VALUE(rv_proxy_url) TYPE string.
     METHODS get_proxy_port
       RETURNING
         VALUE(rv_port) TYPE string.
+    METHODS get_proxy_authentication
+      RETURNING
+        VALUE(rv_auth) TYPE abap_bool.
     METHODS set_run_critical_tests
       IMPORTING
         iv_run TYPE abap_bool.
@@ -1528,17 +1566,43 @@ CLASS lcl_settings DEFINITION FINAL.
     METHODS get_max_lines
       RETURNING
         VALUE(rv_lines) TYPE i.
+    METHODS set_adt_jump_enanbled
+      IMPORTING iv_adt_jump_enabled TYPE abap_bool.
+    METHODS get_adt_jump_enabled
+      RETURNING
+        VALUE(rv_adt_jump_enabled) TYPE abap_bool.
+    METHODS set_commitmsg_comment_length
+      IMPORTING iv_length TYPE i.
+    METHODS get_commitmsg_comment_length
+      RETURNING
+        VALUE(rv_length) TYPE i.
+    METHODS set_commitmsg_body_size
+      IMPORTING iv_length TYPE i.
+    METHODS get_commitmsg_body_size
+      RETURNING
+        VALUE(rv_length) TYPE i.
 
   PRIVATE SECTION.
-    DATA mv_proxy_url TYPE string.
-    DATA mv_proxy_port TYPE string.
-    DATA mv_run_critical_tests TYPE abap_bool.
-    DATA mv_lines TYPE i.
+    DATA: mv_proxy_url                TYPE string,
+          mv_proxy_port               TYPE string,
+          mv_proxy_auth               TYPE string,
+          mv_run_critical_tests       TYPE abap_bool,
+          mv_lines                    TYPE i,
+          mv_adt_jump_enabled         TYPE abap_bool,
+          mv_commitmsg_comment_length TYPE i,
+          mv_commitmsg_body_size      TYPE i.
 
 ENDCLASS.
 
 CLASS lcl_settings IMPLEMENTATION.
 
+  METHOD set_proxy_authentication.
+    mv_proxy_auth = iv_auth.
+  ENDMETHOD.
+
+  METHOD get_proxy_authentication.
+    rv_auth = mv_proxy_auth.
+  ENDMETHOD.
 
   METHOD set_proxy_url.
     mv_proxy_url = iv_url.
@@ -1572,10 +1636,33 @@ CLASS lcl_settings IMPLEMENTATION.
     mv_lines = iv_lines.
   ENDMETHOD.
 
+  METHOD get_adt_jump_enabled.
+    rv_adt_jump_enabled = mv_adt_jump_enabled.
+  ENDMETHOD.
+
+  METHOD set_adt_jump_enanbled.
+    mv_adt_jump_enabled = iv_adt_jump_enabled.
+  ENDMETHOD.
+
+  METHOD get_commitmsg_comment_length.
+    rv_length = mv_commitmsg_comment_length.
+  ENDMETHOD.
+
+  METHOD set_commitmsg_comment_length.
+    mv_commitmsg_comment_length = iv_length.
+  ENDMETHOD.
+
+  METHOD get_commitmsg_body_size.
+    rv_length = mv_commitmsg_body_size.
+  ENDMETHOD.
+
+  METHOD set_commitmsg_body_size.
+    mv_commitmsg_body_size = iv_length.
+  ENDMETHOD.
+
 ENDCLASS.
 
-
-CLASS lcl_persistence_settings DEFINITION FINAL.
+CLASS lcl_persist_settings DEFINITION FINAL.
 
   PUBLIC SECTION.
     METHODS modify
@@ -1589,10 +1676,12 @@ CLASS lcl_persistence_settings DEFINITION FINAL.
 
 ENDCLASS.
 
-CLASS lcl_persistence_settings IMPLEMENTATION.
-
+CLASS lcl_persist_settings IMPLEMENTATION.
 
   METHOD modify.
+
+* todo, refactor this class to use XML and only 1 row in the database?
+
     lcl_app=>db( )->modify(
       iv_type       = 'SETTINGS'
       iv_value      = 'PROXY_URL'
@@ -1603,6 +1692,11 @@ CLASS lcl_persistence_settings IMPLEMENTATION.
       iv_value      = 'PROXY_PORT'
       iv_data       = io_settings->get_proxy_port( ) ).
 
+    lcl_app=>db( )->modify(
+      iv_type       = 'SETTINGS'
+      iv_value      = 'PROXY_AUTH'
+      iv_data       = io_settings->get_proxy_authentication( ) ).
+
     lcl_app=>db( )->modify(
       iv_type       = 'SETTINGS'
       iv_value      = 'CRIT_TESTS'
@@ -1613,16 +1707,38 @@ CLASS lcl_persistence_settings IMPLEMENTATION.
       iv_value      = 'MAX_LINES'
       iv_data       = |{ io_settings->get_max_lines( ) }| ).
 
+    lcl_app=>db( )->modify(
+      iv_type       = 'SETTINGS'
+      iv_value      = 'ADT_JUMP'
+      iv_data       = io_settings->get_adt_jump_enabled( ) ).
+
+    lcl_app=>db( )->modify(
+      iv_type       = 'SETTINGS'
+      iv_value      = 'COMMENT_LEN'
+      iv_data       = |{ io_settings->get_commitmsg_comment_length( ) }| ).
+
+    lcl_app=>db( )->modify(
+      iv_type       = 'SETTINGS'
+      iv_value      = 'BODY_SIZE'
+      iv_data       = |{ io_settings->get_commitmsg_body_size( ) }| ).
+
   ENDMETHOD.
 
-
   METHOD read.
-    DATA: lv_critical_tests_as_string  TYPE string,
-          lv_critical_tests_as_boolean TYPE abap_bool,
-          lv_max_lines_as_string       TYPE string,
-          lv_max_lines_as_integer      TYPE i.
+
+    DATA: lv_critical_tests_as_string    TYPE string,
+          lv_critical_tests_as_boolean   TYPE abap_bool,
+          lv_max_lines_as_string         TYPE string,
+          lv_flag                        TYPE abap_bool,
+          lv_max_lines_as_integer        TYPE i,
+          lv_s_param_value               TYPE string,
+          lv_i_param_value               TYPE i,
+          lv_adt_jump_enabled_as_string  TYPE string,
+          lv_adt_jump_enabled_as_boolean TYPE abap_bool.
+
 
     CREATE OBJECT ro_settings.
+
     TRY.
         ro_settings->set_proxy_url(
           lcl_app=>db( )->read(
@@ -1631,6 +1747,7 @@ CLASS lcl_persistence_settings IMPLEMENTATION.
       CATCH lcx_not_found.
         ro_settings->set_proxy_url( '' ).
     ENDTRY.
+
     TRY.
         ro_settings->set_proxy_port(
           lcl_app=>db( )->read(
@@ -1639,6 +1756,16 @@ CLASS lcl_persistence_settings IMPLEMENTATION.
       CATCH lcx_not_found.
         ro_settings->set_proxy_port( '' ).
     ENDTRY.
+
+    TRY.
+        lv_flag = lcl_app=>db( )->read(
+          iv_type  = 'SETTINGS'
+          iv_value = 'PROXY_AUTH' ).
+        ro_settings->set_proxy_authentication( lv_flag ).
+      CATCH lcx_not_found.
+        ro_settings->set_proxy_authentication( abap_false ).
+    ENDTRY.
+
     TRY.
         lv_critical_tests_as_string = lcl_app=>db( )->read(
            iv_type  = 'SETTINGS'
@@ -1648,15 +1775,47 @@ CLASS lcl_persistence_settings IMPLEMENTATION.
       CATCH lcx_not_found.
         ro_settings->set_run_critical_tests( abap_false ).
     ENDTRY.
+
     TRY.
         lv_max_lines_as_string = lcl_app=>db( )->read(
            iv_type  = 'SETTINGS'
            iv_value = 'MAX_LINES' ).
         lv_max_lines_as_integer = lv_max_lines_as_string.
         ro_settings->set_max_lines( lv_max_lines_as_integer ).
-      CATCH lcx_not_found.
+      CATCH lcx_not_found cx_sy_conversion_no_number.
         ro_settings->set_max_lines( 500 ). " default
     ENDTRY.
+
+    TRY.
+        lv_adt_jump_enabled_as_string = lcl_app=>db( )->read(
+           iv_type  = 'SETTINGS'
+           iv_value = 'ADT_JUMP' ).
+        lv_adt_jump_enabled_as_boolean = lv_adt_jump_enabled_as_string.
+        ro_settings->set_adt_jump_enanbled( lv_adt_jump_enabled_as_boolean ).
+      CATCH lcx_not_found.
+        ro_settings->set_adt_jump_enanbled( abap_false ).
+    ENDTRY.
+
+    TRY.
+        lv_s_param_value = lcl_app=>db( )->read(
+           iv_type  = 'SETTINGS'
+           iv_value = 'COMMENT_LEN' ).
+        lv_i_param_value = lv_s_param_value.
+        ro_settings->set_commitmsg_comment_length( lv_i_param_value ).
+      CATCH lcx_not_found cx_sy_conversion_no_number.
+        ro_settings->set_commitmsg_comment_length( lcl_settings=>c_commitmsg_comment_length_dft ). " default
+    ENDTRY.
+
+    TRY.
+        lv_s_param_value = lcl_app=>db( )->read(
+           iv_type  = 'SETTINGS'
+           iv_value = 'BODY_SIZE' ).
+        lv_i_param_value = lv_s_param_value.
+        ro_settings->set_commitmsg_body_size( lv_i_param_value ).
+      CATCH lcx_not_found cx_sy_conversion_no_number.
+        ro_settings->set_commitmsg_body_size( lcl_settings=>c_commitmsg_body_size_dft ). " default
+    ENDTRY.
+
   ENDMETHOD.
 
 ENDCLASS.
diff --git a/src/zabapgit_persistence_old.prog.abap b/src/zabapgit_persistence_old.prog.abap
index a30b6ae36..7c870c7c9 100644
--- a/src/zabapgit_persistence_old.prog.abap
+++ b/src/zabapgit_persistence_old.prog.abap
@@ -2,14 +2,14 @@
 *&  Include           ZABAPGIT_PERSISTENCE_OLD
 *&---------------------------------------------------------------------*
 
-CLASS lcl_persistence_migrate DEFINITION DEFERRED.
+CLASS lcl_persist_migrate DEFINITION DEFERRED.
 
 *----------------------------------------------------------------------*
 *       CLASS lcl_persistence DEFINITION
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS lcl_persistence DEFINITION FINAL FRIENDS lcl_persistence_migrate.
+CLASS lcl_persistence DEFINITION FINAL FRIENDS lcl_persist_migrate.
 
 * this class is obsolete, use LCL_PERSISTENCE_REPO instead
 
@@ -17,7 +17,7 @@ CLASS lcl_persistence DEFINITION FINAL FRIENDS lcl_persistence_migrate.
     TYPES: BEGIN OF ty_repo_persi,
              url         TYPE string,
              branch_name TYPE string,
-             sha1        TYPE ty_sha1,
+             sha1        TYPE lif_defs=>ty_sha1,
              package     TYPE devclass,
              offline     TYPE sap_bool,
            END OF ty_repo_persi.
@@ -30,13 +30,13 @@ CLASS lcl_persistence DEFINITION FINAL FRIENDS lcl_persistence_migrate.
     METHODS update
       IMPORTING iv_url         TYPE ty_repo_persi-url
                 iv_branch_name TYPE ty_repo_persi-branch_name
-                iv_branch      TYPE ty_sha1
+                iv_branch      TYPE lif_defs=>ty_sha1
       RAISING   lcx_exception.
 
     METHODS add
       IMPORTING iv_url         TYPE string
                 iv_branch_name TYPE string
-                iv_branch      TYPE ty_sha1 OPTIONAL
+                iv_branch      TYPE lif_defs=>ty_sha1 OPTIONAL
                 iv_package     TYPE devclass
                 iv_offline     TYPE sap_bool DEFAULT abap_false
       RAISING   lcx_exception.
@@ -109,14 +109,14 @@ CLASS lcl_persistence IMPLEMENTATION.
 
   METHOD header_online.
     rs_header-tdid     = 'ST'.
-    rs_header-tdspras  = gc_english.
+    rs_header-tdspras  = lif_defs=>gc_english.
     rs_header-tdname   = 'ZABAPGIT'.
     rs_header-tdobject = 'TEXT'.
   ENDMETHOD.                    "header
 
   METHOD header_offline.
     rs_header-tdid     = 'ST'.
-    rs_header-tdspras  = gc_english.
+    rs_header-tdspras  = lif_defs=>gc_english.
     rs_header-tdname   = 'ZABAPGIT_OFFLINE'.
     rs_header-tdobject = 'TEXT'.
   ENDMETHOD.                    "header_offline
@@ -370,7 +370,7 @@ ENDCLASS.                    "lcl_persistence IMPLEMENTATION
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS lcl_user DEFINITION FINAL FRIENDS lcl_persistence_migrate.
+CLASS lcl_user DEFINITION FINAL FRIENDS lcl_persist_migrate.
 
 * this class is obsolete, use LCL_PERSISTENCE_USER instead
 
@@ -426,10 +426,10 @@ ENDCLASS.                    "lcl_user DEFINITION
 *----------------------------------------------------------------------*
 CLASS lcl_user IMPLEMENTATION.
 
-* this class is obsolete, use LCL_PERSISTENCE_USER instead
-
   METHOD read.
 
+* this class is obsolete, use LCL_PERSISTENCE_USER instead
+
     DATA: lt_lines TYPE TABLE OF tline,
           ls_line  LIKE LINE OF lt_lines.
 
@@ -437,7 +437,7 @@ CLASS lcl_user IMPLEMENTATION.
     CALL FUNCTION 'READ_TEXT'
       EXPORTING
         id                      = 'ST'
-        language                = gc_english
+        language                = lif_defs=>gc_english
         name                    = iv_name
         object                  = 'TEXT'
       TABLES
@@ -474,7 +474,7 @@ CLASS lcl_user IMPLEMENTATION.
     APPEND ls_line TO lt_lines.
 
     ls_header-tdid       = 'ST'.
-    ls_header-tdspras    = gc_english.
+    ls_header-tdspras    = lif_defs=>gc_english.
     ls_header-tdname     = iv_name.
     ls_header-tdobject   = 'TEXT'.
 
@@ -543,7 +543,7 @@ CLASS lcl_user IMPLEMENTATION.
 
     SELECT * FROM stxh INTO TABLE lt_stxh
       WHERE tdobject = 'TEXT'
-      AND tdname LIKE 'ZABAPGIT_USERNAME_%'.
+      AND tdname LIKE 'ZABAPGIT_USERNAME_%'.              "#EC CI_SUBRC
 
     LOOP AT lt_stxh ASSIGNING <ls_stxh>.
       APPEND INITIAL LINE TO rt_data ASSIGNING <ls_output>.
diff --git a/src/zabapgit_popups.prog.abap b/src/zabapgit_popups.prog.abap
index 5f19b86ee..5a3ebd202 100644
--- a/src/zabapgit_popups.prog.abap
+++ b/src/zabapgit_popups.prog.abap
@@ -17,7 +17,8 @@ CLASS lcl_popups DEFINITION FINAL.
 
     CLASS-METHODS:
       popup_package_export
-        RETURNING VALUE(rv_package) TYPE devclass
+        EXPORTING ev_package      TYPE devclass
+                  ev_folder_logic TYPE string
         RAISING   lcx_exception,
       popup_object
         RETURNING VALUE(rs_tadir) TYPE tadir
@@ -71,28 +72,39 @@ CLASS lcl_popups DEFINITION FINAL.
         RAISING   lcx_exception,
       popup_to_create_transp_branch
         IMPORTING it_transport_headers       TYPE trwbo_request_headers
-                  it_transport_objects       TYPE scts_tadir
-        RETURNING VALUE(rs_transport_branch) TYPE ty_transport_to_branch
+        RETURNING VALUE(rs_transport_branch) TYPE lif_defs=>ty_transport_to_branch
         RAISING   lcx_exception
                   lcx_cancel,
       popup_to_select_transports
         RETURNING VALUE(rt_trkorr) TYPE trwbo_request_headers.
-  PRIVATE SECTION.
 
+  PRIVATE SECTION.
+    TYPES: ty_sval_tt TYPE STANDARD TABLE OF sval WITH DEFAULT KEY.
+
+    CLASS-METHODS: add_field
+      IMPORTING iv_tabname    TYPE sval-tabname
+                iv_fieldname  TYPE sval-fieldname
+                iv_fieldtext  TYPE sval-fieldtext
+                iv_value      TYPE clike DEFAULT ''
+                iv_field_attr TYPE sval-field_attr DEFAULT ''
+      CHANGING  ct_fields     TYPE ty_sval_tt.
 
 ENDCLASS.
 
 CLASS lcl_popups IMPLEMENTATION.
 
-  DEFINE _add_dialog_fld.
-    APPEND INITIAL LINE TO lt_fields ASSIGNING <ls_field>.
-    <ls_field>-tabname    = &1.                             "#EC NOTEXT
-    <ls_field>-fieldname  = &2.                             "#EC NOTEXT
-    <ls_field>-fieldtext  = &3.                             "#EC NOTEXT
-    <ls_field>-value      = &4.                             "#EC NOTEXT
-    <ls_field>-field_attr = &5.                             "#EC NOTEXT
-  END-OF-DEFINITION.
+  METHOD add_field.
 
+    FIELD-SYMBOLS: <ls_field> LIKE LINE OF ct_fields.
+
+    APPEND INITIAL LINE TO ct_fields ASSIGNING <ls_field>.
+    <ls_field>-tabname    = iv_tabname.
+    <ls_field>-fieldname  = iv_fieldname.
+    <ls_field>-fieldtext  = iv_fieldtext.
+    <ls_field>-value      = iv_value.
+    <ls_field>-field_attr = iv_field_attr.
+
+  ENDMETHOD.
 
   METHOD popup_object.
 
@@ -101,9 +113,16 @@ CLASS lcl_popups IMPLEMENTATION.
 
     FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
 
-    "               TAB           FLD       LABEL     DEF                 ATTR
-    _add_dialog_fld 'TADIR'      'OBJECT'   'Type'    ''                  ''.
-    _add_dialog_fld 'TADIR'      'OBJ_NAME' 'Name'    ''                  ''.
+
+    add_field( EXPORTING iv_tabname   = 'TADIR'
+                         iv_fieldname = 'OBJECT'
+                         iv_fieldtext = 'Type'
+               CHANGING ct_fields     = lt_fields ).
+
+    add_field( EXPORTING iv_tabname   = 'TADIR'
+                         iv_fieldname = 'OBJ_NAME'
+                         iv_fieldtext = 'Name'
+               CHANGING ct_fields     = lt_fields ).
 
     CALL FUNCTION 'POPUP_GET_VALUES'
       EXPORTING
@@ -146,8 +165,17 @@ CLASS lcl_popups IMPLEMENTATION.
 
     FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
 
-    "               TAB           FLD       LABEL     DEF                 ATTR
-    _add_dialog_fld 'TDEVC'      'DEVCLASS' 'Package' ''                  ''.
+
+    add_field( EXPORTING iv_tabname   = 'TDEVC'
+                         iv_fieldname = 'DEVCLASS'
+                         iv_fieldtext = 'Package'
+               CHANGING ct_fields     = lt_fields ).
+
+    add_field( EXPORTING iv_tabname   = 'TDEVC'
+                         iv_fieldname = 'INTSYS'
+                         iv_fieldtext = 'Folder logic'
+                         iv_value     = 'PREFIX'
+               CHANGING ct_fields     = lt_fields ).
 
     CALL FUNCTION 'POPUP_GET_VALUES'
       EXPORTING
@@ -171,8 +199,12 @@ CLASS lcl_popups IMPLEMENTATION.
     READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
     ASSERT sy-subrc = 0.
     TRANSLATE <ls_field>-value TO UPPER CASE.
+    ev_package = <ls_field>-value.
 
-    rv_package = <ls_field>-value.
+    READ TABLE lt_fields INDEX 2 ASSIGNING <ls_field>.
+    ASSERT sy-subrc = 0.
+    TRANSLATE <ls_field>-value TO UPPER CASE.
+    ev_folder_logic = <ls_field>-value.
 
   ENDMETHOD.                    "popup_package_export
 
@@ -186,8 +218,11 @@ CLASS lcl_popups IMPLEMENTATION.
 
     CLEAR: ev_name, ev_cancel.
 
-*                   TAB     FLD   LABEL   DEF                       ATTR
-    _add_dialog_fld 'TEXTL' 'LINE' 'Name' 'new-branch-name'         ''.
+    add_field( EXPORTING iv_tabname   = 'TEXTL'
+                         iv_fieldname = 'LINE'
+                         iv_fieldtext = 'Name'
+                         iv_value     = 'new-branch-name'
+               CHANGING ct_fields     = lt_fields ).
 
     CALL FUNCTION 'POPUP_GET_VALUES'
       EXPORTING
@@ -224,8 +259,11 @@ CLASS lcl_popups IMPLEMENTATION.
 
     CLEAR: ev_name, ev_cancel.
 
-*                   TAB     FLD   LABEL   DEF                       ATTR
-    _add_dialog_fld 'TEXTL' 'LINE' 'Name' 'lcl_gui_page_'          ''.
+    add_field( EXPORTING iv_tabname   = 'TEXTL'
+                         iv_fieldname = 'LINE'
+                         iv_fieldtext = 'Name'
+                         iv_value     = 'lcl_gui_page_'
+               CHANGING ct_fields     = lt_fields ).
 
     CALL FUNCTION 'POPUP_GET_VALUES'
       EXPORTING
@@ -262,9 +300,15 @@ CLASS lcl_popups IMPLEMENTATION.
     FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
 
 
-    "               TAB           FLD       LABEL     DEF                 ATTR
-    _add_dialog_fld 'ABAPTXT255' 'LINE'     'Name'    ''                  ''.
-    _add_dialog_fld 'TDEVC'      'DEVCLASS' 'Package' ''                  ''.
+    add_field( EXPORTING iv_tabname   = 'ABAPTXT255'
+                         iv_fieldname = 'LINE'
+                         iv_fieldtext = 'Name'
+               CHANGING ct_fields     = lt_fields ).
+
+    add_field( EXPORTING iv_tabname   = 'TDEVC'
+                         iv_fieldname = 'DEVCLASS'
+                         iv_fieldtext = 'Package'
+               CHANGING ct_fields     = lt_fields ).
 
     lv_icon_ok  = icon_okay.
     lv_button1 = 'Create package' ##NO_TEXT.
@@ -439,10 +483,26 @@ CLASS lcl_popups IMPLEMENTATION.
       lv_icon2   = icon_folder.
     ENDIF.
 
-*                   TAB           FLD       LABEL            DEF        ATTR
-    _add_dialog_fld 'ABAPTXT255' 'LINE'     'Git clone URL'  iv_url     lv_uattr.
-    _add_dialog_fld 'TDEVC'      'DEVCLASS' 'Target package' iv_package lv_pattr.
-    _add_dialog_fld 'TEXTL'      'LINE'     'Branch'         iv_branch  '05'.
+    add_field( EXPORTING iv_tabname    = 'ABAPTXT255'
+                         iv_fieldname  = 'LINE'
+                         iv_fieldtext  = 'Git clone URL'
+                         iv_value      = iv_url
+                         iv_field_attr = lv_uattr
+               CHANGING ct_fields      = lt_fields ).
+
+    add_field( EXPORTING iv_tabname    = 'TDEVC'
+                         iv_fieldname  = 'DEVCLASS'
+                         iv_fieldtext  = 'Target package'
+                         iv_value      = iv_package
+                         iv_field_attr = lv_pattr
+               CHANGING ct_fields      = lt_fields ).
+
+    add_field( EXPORTING iv_tabname    = 'TEXTL'
+                         iv_fieldname  = 'LINE'
+                         iv_fieldtext  = 'Branch'
+                         iv_value      = iv_branch
+                         iv_field_attr = '05'
+               CHANGING ct_fields      = lt_fields ).
 
     lv_icon_ok  = icon_okay.
     lv_icon_br  = icon_workflow_fork.
@@ -564,7 +624,7 @@ CLASS lcl_popups IMPLEMENTATION.
     lv_types = 'KWTCOEMPDRSXQFG'.
     lrs_trfunction-sign   = 'I'.
     lrs_trfunction-option = 'EQ'.
-    WHILE lv_types NE space.
+    WHILE lv_types <> space.
       lrs_trfunction-low = lv_types(1).
       APPEND lrs_trfunction TO ls_ranges-request_funcs.
       SHIFT lv_types.
@@ -584,17 +644,12 @@ CLASS lcl_popups IMPLEMENTATION.
       EXCEPTIONS
         action_aborted_by_user = 1
         OTHERS                 = 2.
-    IF sy-subrc <> 0.
-      RETURN.
-    ENDIF.
+
   ENDMETHOD.
 
   METHOD popup_to_create_transp_branch.
     DATA: lv_returncode         TYPE c,
           lt_fields             TYPE TABLE OF sval,
-          lv_icon_ok            TYPE icon-name,
-          lv_button_transport   TYPE svalbutton-buttontext,
-          lv_icon_transport     TYPE icon-name,
           lv_transports_as_text TYPE string,
           ls_transport_header   LIKE LINE OF it_transport_headers.
 
@@ -605,24 +660,25 @@ CLASS lcl_popups IMPLEMENTATION.
       CONCATENATE lv_transports_as_text '_' ls_transport_header-trkorr INTO lv_transports_as_text.
     ENDLOOP.
 
-    "               TAB           FLD     LABEL          DEF  ATTR
-    _add_dialog_fld 'TEXTL'      'LINE'  'Branch name'   lv_transports_as_text  ''.
-    _add_dialog_fld 'ABAPTXT255' 'LINE'  'Commit text'   lv_transports_as_text  ''.
+    add_field( EXPORTING iv_tabname   = 'TEXTL'
+                         iv_fieldname = 'LINE'
+                         iv_fieldtext = 'Branch name'
+                         iv_value     = lv_transports_as_text
+               CHANGING ct_fields     = lt_fields ).
 
-    lv_icon_ok          = icon_okay.
-    lv_button_transport = 'Transport(s)->Branch' ##NO_TEXT.
-    lv_icon_transport   = icon_import_all_requests.
+    add_field( EXPORTING iv_tabname   = 'ABAPTXT255'
+                         iv_fieldname = 'LINE'
+                         iv_fieldtext = 'Commit text'
+                         iv_value     = lv_transports_as_text
+               CHANGING ct_fields     = lt_fields ).
 
     CALL FUNCTION 'POPUP_GET_VALUES'
       EXPORTING
-*       no_value_check  = SPACE    " Deactivates data type check
         popup_title     = 'Transport to new Branch'
-*       start_column    = '5'    " Start column of the dialog box
-*       start_row       = '5'    " Start line of the dialog box
       IMPORTING
         returncode      = lv_returncode
       TABLES
-        fields          = lt_fields  " Table fields, values and attributes
+        fields          = lt_fields
       EXCEPTIONS
         error_in_fields = 1
         OTHERS          = 2.
diff --git a/src/zabapgit_repo.prog.abap b/src/zabapgit_repo.prog.abap
index b6590bb16..131144ca6 100644
--- a/src/zabapgit_repo.prog.abap
+++ b/src/zabapgit_repo.prog.abap
@@ -19,14 +19,14 @@ CLASS lcl_repo DEFINITION ABSTRACT FRIENDS lcl_repo_srv.
       get_files_local
         IMPORTING io_log          TYPE REF TO lcl_log OPTIONAL
                   it_filter       TYPE scts_tadir OPTIONAL
-        RETURNING VALUE(rt_files) TYPE ty_files_item_tt
+        RETURNING VALUE(rt_files) TYPE lif_defs=>ty_files_item_tt
         RAISING   lcx_exception,
       get_local_checksums
         RETURNING VALUE(rt_checksums) TYPE lcl_persistence_repo=>ty_local_checksum_tt,
       get_local_checksums_per_file
-        RETURNING VALUE(rt_checksums) TYPE ty_file_signatures_tt,
+        RETURNING VALUE(rt_checksums) TYPE lif_defs=>ty_file_signatures_tt,
       get_files_remote
-        RETURNING VALUE(rt_files) TYPE ty_files_tt
+        RETURNING VALUE(rt_files) TYPE lif_defs=>ty_files_tt
         RAISING   lcx_exception,
       get_package
         RETURNING VALUE(rv_package) TYPE lcl_persistence_repo=>ty_repo-package,
@@ -50,7 +50,7 @@ CLASS lcl_repo DEFINITION ABSTRACT FRIENDS lcl_repo_srv.
         RAISING lcx_exception,
       refresh_local, " For testing purposes, maybe removed later
       update_local_checksums
-        IMPORTING it_files TYPE ty_file_signatures_tt
+        IMPORTING it_files TYPE lif_defs=>ty_file_signatures_tt
         RAISING   lcx_exception,
       rebuild_local_checksums
         RAISING   lcx_exception,
@@ -62,15 +62,15 @@ CLASS lcl_repo DEFINITION ABSTRACT FRIENDS lcl_repo_srv.
         RAISING   lcx_exception.
 
   PROTECTED SECTION.
-    DATA: mt_local              TYPE ty_files_item_tt,
-          mt_remote             TYPE ty_files_tt,
+    DATA: mt_local              TYPE lif_defs=>ty_files_item_tt,
+          mt_remote             TYPE lif_defs=>ty_files_tt,
           mv_do_local_refresh   TYPE abap_bool,
           mv_last_serialization TYPE timestamp,
           ms_data               TYPE lcl_persistence_repo=>ty_repo.
 
     METHODS:
       set
-        IMPORTING iv_sha1        TYPE ty_sha1 OPTIONAL
+        IMPORTING iv_sha1        TYPE lif_defs=>ty_sha1 OPTIONAL
                   it_checksums   TYPE lcl_persistence_repo=>ty_local_checksum_tt OPTIONAL
                   iv_url         TYPE lcl_persistence_repo=>ty_repo-url OPTIONAL
                   iv_branch_name TYPE lcl_persistence_repo=>ty_repo-branch_name OPTIONAL
@@ -118,27 +118,27 @@ CLASS lcl_repo_online DEFINITION INHERITING FROM lcl_repo FINAL.
         RAISING   lcx_exception,
       get_files_remote REDEFINITION,
       get_objects
-        RETURNING VALUE(rt_objects) TYPE ty_objects_tt
+        RETURNING VALUE(rt_objects) TYPE lif_defs=>ty_objects_tt
         RAISING   lcx_exception,
       deserialize REDEFINITION,
       status
         IMPORTING io_log            TYPE REF TO lcl_log OPTIONAL
-        RETURNING VALUE(rt_results) TYPE ty_results_tt
+        RETURNING VALUE(rt_results) TYPE lif_defs=>ty_results_tt
         RAISING   lcx_exception,
       reset_status,
       rebuild_local_checksums REDEFINITION,
       push
-        IMPORTING is_comment TYPE ty_comment
+        IMPORTING is_comment TYPE lif_defs=>ty_comment
                   io_stage   TYPE REF TO lcl_stage
         RAISING   lcx_exception.
 
   PRIVATE SECTION.
     DATA:
-      mt_objects     TYPE ty_objects_tt,
-      mv_branch      TYPE ty_sha1,
+      mt_objects     TYPE lif_defs=>ty_objects_tt,
+      mv_branch      TYPE lif_defs=>ty_sha1,
       mv_initialized TYPE abap_bool,
       mo_branches    TYPE REF TO lcl_git_branch_list,
-      mt_status      TYPE ty_results_tt.
+      mt_status      TYPE lif_defs=>ty_results_tt.
 
     METHODS:
       handle_stage_ignore
@@ -147,6 +147,9 @@ CLASS lcl_repo_online DEFINITION INHERITING FROM lcl_repo FINAL.
       initialize
         RAISING lcx_exception,
       actualize_head_branch
+        RAISING lcx_exception,
+      delete_initial_online_repo
+        importing iv_commit type flag
         RAISING lcx_exception.
 
 ENDCLASS.                    "lcl_repo_online DEFINITION
@@ -159,7 +162,7 @@ CLASS lcl_repo_offline DEFINITION INHERITING FROM lcl_repo FINAL.
   PUBLIC SECTION.
     METHODS:
       set_files_remote
-        IMPORTING it_files TYPE ty_files_tt
+        IMPORTING it_files TYPE lif_defs=>ty_files_tt
         RAISING   lcx_exception.
 
 ENDCLASS.                    "lcl_repo_offline DEFINITION
diff --git a/src/zabapgit_repo_browser_util.prog.abap b/src/zabapgit_repo_browser_util.prog.abap
index c66a01f66..eb0fbab85 100644
--- a/src/zabapgit_repo_browser_util.prog.abap
+++ b/src/zabapgit_repo_browser_util.prog.abap
@@ -2,7 +2,7 @@
 *&  Include           ZABAPGIT_REPO_BROWSER_UTIL
 *&---------------------------------------------------------------------*
 
-CLASS lcl_repo_content_browser DEFINITION FINAL.
+CLASS lcl_repo_content_list DEFINITION FINAL.
 
   PUBLIC SECTION.
 
@@ -23,7 +23,7 @@ CLASS lcl_repo_content_browser DEFINITION FINAL.
              changes  TYPE i,
              lstate   TYPE char1,
              rstate   TYPE char1,
-             files    TYPE tt_repo_files,
+             files    TYPE lif_defs=>tt_repo_files,
            END OF ty_repo_item.
     TYPES tt_repo_items TYPE STANDARD TABLE OF ty_repo_item WITH DEFAULT KEY.
 
@@ -62,18 +62,7 @@ CLASS lcl_repo_content_browser DEFINITION FINAL.
 
 ENDCLASS. "lcl_repo_content_browser
 
-DEFINE _reduce_state.
-  " &1 - prev, &2 - cur
-  IF &1 = &2 OR &2 IS INITIAL.
-    ASSERT 1 = 1. " No change
-  ELSEIF &1 IS INITIAL.
-    &1 = &2.
-  ELSE.
-    &1 = gc_state-mixed.
-  ENDIF.
-END-OF-DEFINITION.
-
-CLASS lcl_repo_content_browser IMPLEMENTATION.
+CLASS lcl_repo_content_list IMPLEMENTATION.
 
   METHOD constructor.
     mo_repo = io_repo.
@@ -146,8 +135,11 @@ CLASS lcl_repo_content_browser IMPLEMENTATION.
       ENDAT.
 
       ls_folder-changes = ls_folder-changes + <item>-changes.
-      _reduce_state ls_folder-lstate <item>-lstate.
-      _reduce_state ls_folder-rstate <item>-rstate.
+
+      lcl_state=>reduce( EXPORTING iv_cur = <item>-lstate
+                         CHANGING cv_prev = ls_folder-lstate ).
+      lcl_state=>reduce( EXPORTING iv_cur = <item>-rstate
+                         CHANGING cv_prev = ls_folder-rstate ).
 
       AT END OF path.
         APPEND ls_folder TO ct_repo_items.
@@ -175,7 +167,7 @@ CLASS lcl_repo_content_browser IMPLEMENTATION.
 
   METHOD build_repo_items_offline.
 
-    DATA: lt_tadir TYPE ty_tadir_tt.
+    DATA: lt_tadir TYPE lif_defs=>ty_tadir_tt.
 
     FIELD-SYMBOLS: <ls_repo_item> LIKE LINE OF rt_repo_items,
                    <ls_tadir>     LIKE LINE OF lt_tadir.
@@ -198,8 +190,8 @@ CLASS lcl_repo_content_browser IMPLEMENTATION.
   METHOD build_repo_items_online.
 
     DATA: lo_repo_online TYPE REF TO lcl_repo_online,
-          ls_file        TYPE ty_repo_file,
-          lt_status      TYPE ty_results_tt.
+          ls_file        TYPE lif_defs=>ty_repo_file,
+          lt_status      TYPE lif_defs=>ty_results_tt.
 
     FIELD-SYMBOLS: <status>       LIKE LINE OF lt_status,
                    <ls_repo_item> LIKE LINE OF rt_repo_items.
@@ -219,18 +211,21 @@ CLASS lcl_repo_content_browser IMPLEMENTATION.
       ENDAT.
 
       IF <status>-filename IS NOT INITIAL.
-        ls_file-path        = <status>-path.
-        ls_file-filename    = <status>-filename.
-        ls_file-is_changed  = boolc( <status>-match = abap_false ). " TODO refactor
-        ls_file-rstate      = <status>-rstate.
-        ls_file-lstate      = <status>-lstate.
+        ls_file-path       = <status>-path.
+        ls_file-filename   = <status>-filename.
+        ls_file-is_changed = boolc( <status>-match = abap_false ). " TODO refactor
+        ls_file-rstate     = <status>-rstate.
+        ls_file-lstate     = <status>-lstate.
         APPEND ls_file TO <ls_repo_item>-files.
 
         IF ls_file-is_changed = abap_true.
           <ls_repo_item>-sortkey = c_sortkey-changed. " Changed files
           <ls_repo_item>-changes = <ls_repo_item>-changes + 1.
-          _reduce_state <ls_repo_item>-lstate ls_file-lstate.
-          _reduce_state <ls_repo_item>-rstate ls_file-rstate.
+
+          lcl_state=>reduce( EXPORTING iv_cur = ls_file-lstate
+                             CHANGING cv_prev = <ls_repo_item>-lstate ).
+          lcl_state=>reduce( EXPORTING iv_cur = ls_file-rstate
+                             CHANGING cv_prev = <ls_repo_item>-rstate ).
         ENDIF.
       ENDIF.
 
diff --git a/src/zabapgit_repo_impl.prog.abap b/src/zabapgit_repo_impl.prog.abap
index 0e106dc63..eaedd802a 100644
--- a/src/zabapgit_repo_impl.prog.abap
+++ b/src/zabapgit_repo_impl.prog.abap
@@ -72,6 +72,8 @@ CLASS lcl_repo_online IMPLEMENTATION.
 
   METHOD refresh.
 
+    DATA: lx_exception TYPE REF TO lcx_exception.
+
     super->refresh( iv_drop_cache ).
     reset_status( ).
 
@@ -80,10 +82,20 @@ CLASS lcl_repo_online IMPLEMENTATION.
                         iv_total   = 1
                         iv_text    = 'Remote files' ) ##NO_TEXT.
 
-    lcl_git_porcelain=>pull( EXPORTING io_repo    = me
-                             IMPORTING et_files   = mt_remote
-                                       et_objects = mt_objects
-                                       ev_branch  = mv_branch ).
+    TRY.
+
+        lcl_git_porcelain=>pull( EXPORTING io_repo    = me
+                                 IMPORTING et_files   = mt_remote
+                                           et_objects = mt_objects
+                                           ev_branch  = mv_branch ).
+
+      CATCH lcx_exception INTO lx_exception.
+
+        delete_initial_online_repo( abap_true ).
+
+        RAISE EXCEPTION lx_exception.
+
+    ENDTRY.
 
     mo_branches = lcl_git_transport=>branches( get_url( ) ).
     actualize_head_branch( ).
@@ -181,8 +193,8 @@ CLASS lcl_repo_online IMPLEMENTATION.
 
   METHOD push.
 
-    DATA: lv_branch        TYPE ty_sha1,
-          lt_updated_files TYPE ty_file_signatures_tt.
+    DATA: lv_branch        TYPE lif_defs=>ty_sha1,
+          lt_updated_files TYPE lif_defs=>ty_file_signatures_tt.
 
 
     handle_stage_ignore( io_stage ).
@@ -234,8 +246,8 @@ CLASS lcl_repo_online IMPLEMENTATION.
 
     IF lv_add = abap_true.
       io_stage->add(
-        iv_path     = gc_root_dir
-        iv_filename = gc_dot_abapgit
+        iv_path     = lif_defs=>gc_root_dir
+        iv_filename = lif_defs=>gc_dot_abapgit
         iv_data     = lo_dot_abapgit->serialize( ) ).
 
       set_dot_abapgit( lo_dot_abapgit ).
@@ -245,9 +257,9 @@ CLASS lcl_repo_online IMPLEMENTATION.
 
   METHOD rebuild_local_checksums. "REMOTE
 
-    DATA: lt_remote       TYPE ty_files_tt,
-          lt_local        TYPE ty_files_item_tt,
-          ls_last_item    TYPE ty_item,
+    DATA: lt_remote       TYPE lif_defs=>ty_files_tt,
+          lt_local        TYPE lif_defs=>ty_files_item_tt,
+          ls_last_item    TYPE lif_defs=>ty_item,
           lv_branch_equal TYPE abap_bool,
           lt_checksums    TYPE lcl_persistence_repo=>ty_local_checksum_tt.
 
@@ -262,7 +274,7 @@ CLASS lcl_repo_online IMPLEMENTATION.
 
     DELETE lt_local " Remove non-code related files except .abapgit
       WHERE item IS INITIAL
-      AND NOT ( file-path = gc_root_dir AND file-filename = gc_dot_abapgit ).
+      AND NOT ( file-path = lif_defs=>gc_root_dir AND file-filename = lif_defs=>gc_dot_abapgit ).
 
     SORT lt_local BY item.
     SORT lt_remote BY path filename.
@@ -295,6 +307,20 @@ CLASS lcl_repo_online IMPLEMENTATION.
 
   ENDMETHOD.  " rebuild_local_checksums.
 
+  METHOD delete_initial_online_repo.
+
+    IF me->is_offline( ) = abap_false AND me->get_sha1_local( ) IS INITIAL.
+
+      lcl_app=>repo_srv( )->delete( me ).
+
+      IF iv_commit = abap_true.
+        COMMIT WORK.
+      ENDIF.
+
+    ENDIF.
+
+  ENDMETHOD.  " delete_initial_online_repo
+
 ENDCLASS.                    "lcl_repo_online IMPLEMENTATION
 
 *----------------------------------------------------------------------*
@@ -318,8 +344,8 @@ CLASS lcl_repo IMPLEMENTATION.
 
 
     READ TABLE mt_remote ASSIGNING <ls_remote>
-      WITH KEY path = gc_root_dir
-      filename = gc_dot_abapgit.
+      WITH KEY path = lif_defs=>gc_root_dir
+      filename = lif_defs=>gc_dot_abapgit.
     IF sy-subrc = 0.
       ro_dot = lcl_dot_abapgit=>deserialize( <ls_remote>-data ).
     ENDIF.
@@ -403,8 +429,8 @@ CLASS lcl_repo IMPLEMENTATION.
     " If this is not true that there is an error somewhere but not here
 
     DATA: lt_checksums TYPE lcl_persistence_repo=>ty_local_checksum_tt,
-          lt_files_idx TYPE ty_file_signatures_tt,
-          lt_local     TYPE ty_files_item_tt,
+          lt_files_idx TYPE lif_defs=>ty_file_signatures_tt,
+          lt_local     TYPE lif_defs=>ty_files_item_tt,
           lv_chks_row  TYPE i,
           lv_file_row  TYPE i.
 
@@ -476,7 +502,7 @@ CLASS lcl_repo IMPLEMENTATION.
 
   METHOD deserialize.
 
-    DATA: lt_updated_files TYPE ty_file_signatures_tt,
+    DATA: lt_updated_files TYPE lif_defs=>ty_file_signatures_tt,
           lo_dot_abapgit   TYPE REF TO lcl_dot_abapgit,
           lt_requirements  TYPE STANDARD TABLE OF lcl_dot_abapgit=>ty_requirement.
 
@@ -522,10 +548,10 @@ CLASS lcl_repo IMPLEMENTATION.
 
   METHOD get_files_local.
 
-    DATA: lt_tadir TYPE ty_tadir_tt,
-          ls_item  TYPE ty_item,
-          lt_files TYPE ty_files_tt,
-          lt_cache TYPE SORTED TABLE OF ty_file_item
+    DATA: lt_tadir TYPE lif_defs=>ty_tadir_tt,
+          ls_item  TYPE lif_defs=>ty_item,
+          lt_files TYPE lif_defs=>ty_files_tt,
+          lt_cache TYPE SORTED TABLE OF lif_defs=>ty_file_item
                    WITH NON-UNIQUE KEY item.
 
     DATA: lt_filter       TYPE SORTED TABLE OF tadir
@@ -545,10 +571,10 @@ CLASS lcl_repo IMPLEMENTATION.
     ENDIF.
 
     APPEND INITIAL LINE TO rt_files ASSIGNING <ls_return>.
-    <ls_return>-file-path     = gc_root_dir.
-    <ls_return>-file-filename = gc_dot_abapgit.
+    <ls_return>-file-path     = lif_defs=>gc_root_dir.
+    <ls_return>-file-filename = lif_defs=>gc_dot_abapgit.
     <ls_return>-file-data     = get_dot_abapgit( )->serialize( ).
-    <ls_return>-file-sha1     = lcl_hash=>sha1( iv_type = gc_type-blob
+    <ls_return>-file-sha1     = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-blob
                                                 iv_data = <ls_return>-file-data ).
 
     lt_cache = mt_local.
@@ -558,7 +584,7 @@ CLASS lcl_repo IMPLEMENTATION.
       io_dot                = get_dot_abapgit( ) ).
 
     lt_filter = it_filter.
-    lv_filter_exist = boolc( lines( lt_filter ) > 0 ) .
+    lv_filter_exist = boolc( lines( lt_filter ) > 0 ).
 
     LOOP AT lt_tadir ASSIGNING <ls_tadir>.
       IF lv_filter_exist = abap_true.
@@ -601,7 +627,7 @@ CLASS lcl_repo IMPLEMENTATION.
         io_log      = io_log ).
       LOOP AT lt_files ASSIGNING <ls_file>.
         <ls_file>-path = <ls_tadir>-path.
-        <ls_file>-sha1 = lcl_hash=>sha1( iv_type = gc_type-blob iv_data = <ls_file>-data ).
+        <ls_file>-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-blob iv_data = <ls_file>-data ).
 
         APPEND INITIAL LINE TO rt_files ASSIGNING <ls_return>.
         <ls_return>-file = <ls_file>.
@@ -687,8 +713,8 @@ CLASS lcl_repo IMPLEMENTATION.
 
   METHOD rebuild_local_checksums. "LOCAL (BASE)
 
-    DATA: lt_local     TYPE ty_files_item_tt,
-          ls_last_item TYPE ty_item,
+    DATA: lt_local     TYPE lif_defs=>ty_files_item_tt,
+          ls_last_item TYPE lif_defs=>ty_item,
           lt_checksums TYPE lcl_persistence_repo=>ty_local_checksum_tt.
 
     FIELD-SYMBOLS: <ls_checksum> LIKE LINE OF lt_checksums,
@@ -700,7 +726,7 @@ CLASS lcl_repo IMPLEMENTATION.
 
     DELETE lt_local " Remove non-code related files except .abapgit
       WHERE item IS INITIAL
-      AND NOT ( file-path = gc_root_dir AND file-filename = gc_dot_abapgit ).
+      AND NOT ( file-path = lif_defs=>gc_root_dir AND file-filename = lif_defs=>gc_dot_abapgit ).
 
     SORT lt_local BY item.
 
diff --git a/src/zabapgit_requirements.prog.abap b/src/zabapgit_requirements.prog.abap
index b692c0a27..234410825 100644
--- a/src/zabapgit_requirements.prog.abap
+++ b/src/zabapgit_requirements.prog.abap
@@ -2,7 +2,6 @@
 *&  Include  zabapgit_requirements
 *&---------------------------------------------------------------------*
 
-"! Helper class for checking requirements / dependencies
 *----------------------------------------------------------------------*
 *       CLASS lcl_requirement_helper DEFINITION
 *----------------------------------------------------------------------*
@@ -40,7 +39,6 @@ CLASS lcl_requirement_helper DEFINITION FINAL.
       get_requirement_met_status IMPORTING it_requirements  TYPE lcl_dot_abapgit=>ty_requirement_tt
                                  RETURNING value(rt_status) TYPE ty_requirement_status_tt
                                  RAISING   lcx_exception.
-  PROTECTED SECTION.
   PRIVATE SECTION.
     CLASS-METHODS:
       show_requirement_popup IMPORTING it_requirements TYPE ty_requirement_status_tt
@@ -122,7 +120,7 @@ CLASS lcl_requirement_helper IMPLEMENTATION.
   ENDMETHOD.                    "get_requirement_met_status
 
   METHOD version_greater_or_equal.
-    DATA: lv_number TYPE numc4.
+    DATA: lv_number TYPE numc4 ##NEEDED.
 
     TRY.
         MOVE EXACT: is_status-installed_release TO lv_number,
diff --git a/src/zabapgit_sap_package.prog.abap b/src/zabapgit_sap_package.prog.abap
index b5b6b4d68..800195585 100644
--- a/src/zabapgit_sap_package.prog.abap
+++ b/src/zabapgit_sap_package.prog.abap
@@ -37,7 +37,7 @@ CLASS lcl_sap_package DEFINITION FINAL CREATE PRIVATE
   PUBLIC SECTION.
     CLASS-METHODS:
       get
-        IMPORTING iv_package TYPE devclass
+        IMPORTING iv_package        TYPE devclass
         RETURNING VALUE(ri_package) TYPE REF TO lif_sap_package,
       create
         IMPORTING is_package TYPE scompkdtln
@@ -242,7 +242,7 @@ CLASS lcl_sap_package IMPLEMENTATION.
     APPEND mv_package TO rt_list.
 
     SELECT SINGLE parentcl INTO lv_parent
-      FROM tdevc WHERE devclass = mv_package.           "#EC CI_GENBUFF
+      FROM tdevc WHERE devclass = mv_package. "#EC CI_GENBUFF "#EC CI_SUBRC
 
     IF NOT lv_parent IS INITIAL.
       APPEND lv_parent TO rt_list.
@@ -259,7 +259,7 @@ CLASS lcl_sap_package IMPLEMENTATION.
 
 
     SELECT devclass INTO TABLE rt_list
-      FROM tdevc WHERE parentcl = mv_package.           "#EC CI_GENBUFF
+      FROM tdevc WHERE parentcl = mv_package. "#EC CI_GENBUFF "#EC CI_SUBRC
 
 * note the recursion, since packages are added to the list
     LOOP AT rt_list INTO lv_devclass.
diff --git a/src/zabapgit_services_background.prog.abap b/src/zabapgit_services_background.prog.abap
index 4e372ddc2..40a38dc2e 100644
--- a/src/zabapgit_services_background.prog.abap
+++ b/src/zabapgit_services_background.prog.abap
@@ -2,25 +2,25 @@
 *&  Include           ZABAPGIT_SERVICES_BACKGROUND
 *&---------------------------------------------------------------------*
 
-CLASS lcl_services_background DEFINITION FINAL.
+CLASS lcl_services_bkg DEFINITION FINAL.
 
   PUBLIC SECTION.
 
     CLASS-METHODS update_task
-      IMPORTING is_bg_task TYPE lcl_persistence_background=>ty_background
+      IMPORTING is_bg_task TYPE lcl_persist_background=>ty_background
       RAISING   lcx_exception.
 
 ENDCLASS. "lcl_services_background
 
-CLASS lcl_services_background IMPLEMENTATION.
+CLASS lcl_services_bkg IMPLEMENTATION.
 
   METHOD update_task.
 
-    DATA lo_persistence TYPE REF TO lcl_persistence_background.
+    DATA lo_persistence TYPE REF TO lcl_persist_background.
 
     CREATE OBJECT lo_persistence.
 
-    IF is_bg_task-method = lcl_persistence_background=>c_method-nothing.
+    IF is_bg_task-method = lcl_persist_background=>c_method-nothing.
       lo_persistence->delete( is_bg_task-key ).
     ELSE.
       lo_persistence->modify( is_bg_task ).
diff --git a/src/zabapgit_services_git.prog.abap b/src/zabapgit_services_git.prog.abap
index fcc5041b7..29eb0ded3 100644
--- a/src/zabapgit_services_git.prog.abap
+++ b/src/zabapgit_services_git.prog.abap
@@ -181,7 +181,7 @@ CLASS lcl_services_git IMPLEMENTATION.
 
   METHOD commit.
 
-    DATA: ls_comment TYPE ty_comment,
+    DATA: ls_comment TYPE lif_defs=>ty_comment,
           lo_user    TYPE REF TO lcl_persistence_user.
 
     lo_user = lcl_app=>user( ).
@@ -208,7 +208,7 @@ CLASS lcl_services_git IMPLEMENTATION.
 
     IF NOT is_commit-body IS INITIAL.
       CONCATENATE ls_comment-comment '' is_commit-body
-        INTO ls_comment-comment SEPARATED BY gc_newline.
+        INTO ls_comment-comment SEPARATED BY lif_defs=>gc_newline.
     ENDIF.
 
     io_repo->push( is_comment = ls_comment
diff --git a/src/zabapgit_services_repo.prog.abap b/src/zabapgit_services_repo.prog.abap
index 0df11ba5e..4f5b1234e 100644
--- a/src/zabapgit_services_repo.prog.abap
+++ b/src/zabapgit_services_repo.prog.abap
@@ -123,7 +123,7 @@ CLASS lcl_services_repo IMPLEMENTATION.
 
   METHOD purge.
 
-    DATA: lt_tadir    TYPE ty_tadir_tt,
+    DATA: lt_tadir    TYPE lif_defs=>ty_tadir_tt,
           lv_answer   TYPE c LENGTH 1,
           lo_repo     TYPE REF TO lcl_repo,
           lv_package  TYPE devclass,
@@ -311,21 +311,20 @@ CLASS lcl_services_repo IMPLEMENTATION.
     CALL FUNCTION 'RS_TOOL_ACCESS'
       EXPORTING
         operation       = 'SHOW'
-        in_new_window   = 'X'
+        in_new_window   = abap_true
         object_name     = iv_package
         object_type     = 'DEVC'
-        with_objectlist = 'X'.
+        with_objectlist = abap_true.
 
   ENDMETHOD.  " open_se80.
 
-
   METHOD transport_to_branch.
     DATA:
       lo_repository          TYPE REF TO lcl_repo_online,
-      lo_transport_to_branch TYPE REF TO lcl_transport_to_branch,
+      lo_transport_to_branch TYPE REF TO lcl_transport_2_branch,
       lt_transport_headers   TYPE trwbo_request_headers,
-      lt_transport_objects               TYPE scts_tadir,
-      ls_transport_to_branch TYPE ty_transport_to_branch.
+      lt_transport_objects   TYPE scts_tadir,
+      ls_transport_to_branch TYPE lif_defs=>ty_transport_to_branch.
 
     lo_repository ?= lcl_app=>repo_srv( )->get( iv_repository_key ).
 
@@ -334,9 +333,9 @@ CLASS lcl_services_repo IMPLEMENTATION.
     IF lt_transport_objects IS INITIAL.
       lcx_exception=>raise( 'Canceled or List of objects is empty ' ).
     ENDIF.
+
     ls_transport_to_branch = lcl_popups=>popup_to_create_transp_branch(
-      it_transport_headers = lt_transport_headers
-      it_transport_objects = lt_transport_objects ).
+      lt_transport_headers ).
 
     CREATE OBJECT lo_transport_to_branch.
     lo_transport_to_branch->create(
diff --git a/src/zabapgit_stage.prog.abap b/src/zabapgit_stage.prog.abap
index bbd75d976..04dbdda3a 100644
--- a/src/zabapgit_stage.prog.abap
+++ b/src/zabapgit_stage.prog.abap
@@ -16,7 +16,7 @@ CLASS lcl_stage DEFINITION FINAL.
                END OF c_method.
 
     TYPES: BEGIN OF ty_stage,
-             file   TYPE ty_file,
+             file   TYPE lif_defs=>ty_file,
              method TYPE ty_method,
            END OF ty_stage.
 
@@ -31,37 +31,37 @@ CLASS lcl_stage DEFINITION FINAL.
     METHODS:
       constructor
         IMPORTING iv_branch_name  TYPE string
-                  iv_branch_sha1  TYPE ty_sha1
-                  iv_merge_source TYPE ty_sha1 OPTIONAL,
+                  iv_branch_sha1  TYPE lif_defs=>ty_sha1
+                  iv_merge_source TYPE lif_defs=>ty_sha1 OPTIONAL,
       get_branch_name
         RETURNING VALUE(rv_branch) TYPE string,
       get_branch_sha1
-        RETURNING VALUE(rv_branch) TYPE ty_sha1,
+        RETURNING VALUE(rv_branch) TYPE lif_defs=>ty_sha1,
       add
-        IMPORTING iv_path     TYPE ty_file-path
-                  iv_filename TYPE ty_file-filename
+        IMPORTING iv_path     TYPE lif_defs=>ty_file-path
+                  iv_filename TYPE lif_defs=>ty_file-filename
                   iv_data     TYPE xstring
         RAISING   lcx_exception,
       reset
-        IMPORTING iv_path     TYPE ty_file-path
-                  iv_filename TYPE ty_file-filename
+        IMPORTING iv_path     TYPE lif_defs=>ty_file-path
+                  iv_filename TYPE lif_defs=>ty_file-filename
         RAISING   lcx_exception,
       reset_all
         RAISING   lcx_exception,
       rm
-        IMPORTING iv_path     TYPE ty_file-path
-                  iv_filename TYPE ty_file-filename
+        IMPORTING iv_path     TYPE lif_defs=>ty_file-path
+                  iv_filename TYPE lif_defs=>ty_file-filename
         RAISING   lcx_exception,
       ignore
-        IMPORTING iv_path     TYPE ty_file-path
-                  iv_filename TYPE ty_file-filename
+        IMPORTING iv_path     TYPE lif_defs=>ty_file-path
+                  iv_filename TYPE lif_defs=>ty_file-filename
         RAISING   lcx_exception,
       lookup
-        IMPORTING iv_path          TYPE ty_file-path
-                  iv_filename      TYPE ty_file-filename
+        IMPORTING iv_path          TYPE lif_defs=>ty_file-path
+                  iv_filename      TYPE lif_defs=>ty_file-filename
         RETURNING VALUE(rv_method) TYPE ty_method,
       get_merge_source
-        RETURNING VALUE(rv_source) TYPE ty_sha1,
+        RETURNING VALUE(rv_source) TYPE lif_defs=>ty_sha1,
       count
         RETURNING VALUE(rv_count) TYPE i,
       get_all
@@ -70,13 +70,13 @@ CLASS lcl_stage DEFINITION FINAL.
   PRIVATE SECTION.
     DATA: mt_stage        TYPE ty_stage_tt,
           mv_branch_name  TYPE string,
-          mv_branch_sha1  TYPE ty_sha1,
-          mv_merge_source TYPE ty_sha1.
+          mv_branch_sha1  TYPE lif_defs=>ty_sha1,
+          mv_merge_source TYPE lif_defs=>ty_sha1.
 
     METHODS:
       append
-        IMPORTING iv_path     TYPE ty_file-path
-                  iv_filename TYPE ty_file-filename
+        IMPORTING iv_path     TYPE lif_defs=>ty_file-path
+                  iv_filename TYPE lif_defs=>ty_file-filename
                   iv_method   TYPE ty_method
                   iv_data     TYPE xstring OPTIONAL
         RAISING   lcx_exception.
diff --git a/src/zabapgit_stage_logic.prog.abap b/src/zabapgit_stage_logic.prog.abap
index 14e05763d..124bc04fb 100644
--- a/src/zabapgit_stage_logic.prog.abap
+++ b/src/zabapgit_stage_logic.prog.abap
@@ -10,7 +10,7 @@ CLASS lcl_stage_logic DEFINITION FINAL.
     CLASS-METHODS:
       get
         IMPORTING io_repo         TYPE REF TO lcl_repo_online
-        RETURNING VALUE(rs_files) TYPE ty_stage_files
+        RETURNING VALUE(rs_files) TYPE lif_defs=>ty_stage_files
         RAISING   lcx_exception,
       count
         IMPORTING io_repo         TYPE REF TO lcl_repo_online
@@ -21,9 +21,9 @@ CLASS lcl_stage_logic DEFINITION FINAL.
     CLASS-METHODS:
       remove_ignored
         IMPORTING io_repo  TYPE REF TO lcl_repo_online
-        CHANGING  cs_files TYPE ty_stage_files,
+        CHANGING  cs_files TYPE lif_defs=>ty_stage_files,
       remove_identical
-        CHANGING cs_files TYPE ty_stage_files.
+        CHANGING cs_files TYPE lif_defs=>ty_stage_files.
 
 ENDCLASS.
 
@@ -41,7 +41,7 @@ CLASS lcl_stage_logic IMPLEMENTATION.
 
   METHOD count.
 
-    DATA: ls_files TYPE ty_stage_files.
+    DATA: ls_files TYPE lif_defs=>ty_stage_files.
 
     ls_files = get( io_repo ).
 
@@ -63,7 +63,7 @@ CLASS lcl_stage_logic IMPLEMENTATION.
           iv_path     = <ls_remote>-path
           iv_filename = <ls_remote>-filename ) = abap_true.
         DELETE cs_files-remote INDEX lv_index.
-      ELSEIF <ls_remote>-path = gc_root_dir AND <ls_remote>-filename = gc_dot_abapgit.
+      ELSEIF <ls_remote>-path = lif_defs=>gc_root_dir AND <ls_remote>-filename = lif_defs=>gc_dot_abapgit.
         " Remove .abapgit from remotes - it cannot be removed or ignored
         DELETE cs_files-remote INDEX lv_index.
       ENDIF.
diff --git a/src/zabapgit_syntax_highlighter.prog.abap b/src/zabapgit_syntax_highlighter.prog.abap
index cb1e391d3..27c883e37 100644
--- a/src/zabapgit_syntax_highlighter.prog.abap
+++ b/src/zabapgit_syntax_highlighter.prog.abap
@@ -17,12 +17,12 @@ CLASS lcl_syntax_highlighter DEFINITION ABSTRACT
   PUBLIC SECTION.
 
     CLASS-METHODS create
-      IMPORTING iv_filename TYPE string
+      IMPORTING iv_filename        TYPE string
       RETURNING VALUE(ro_instance) TYPE REF TO lcl_syntax_highlighter.
 
     METHODS process_line
-        IMPORTING iv_line        TYPE string
-        RETURNING VALUE(rv_line) TYPE string.
+      IMPORTING iv_line        TYPE string
+      RETURNING VALUE(rv_line) TYPE string.
 
   PROTECTED SECTION.
 
@@ -39,15 +39,21 @@ CLASS lcl_syntax_highlighter DEFINITION ABSTRACT
 
     TYPES:
       BEGIN OF ty_rule,
-        regex     TYPE REF TO cl_abap_regex,
-        token     TYPE char1,
-        style     TYPE string,
+        regex TYPE REF TO cl_abap_regex,
+        token TYPE char1,
+        style TYPE string,
       END OF ty_rule.
 
     CONSTANTS c_token_none TYPE c VALUE '.'.
 
     DATA mt_rules TYPE STANDARD TABLE OF ty_rule.
 
+    METHODS add_rule
+      IMPORTING
+        iv_regex TYPE string
+        iv_token TYPE c
+        iv_style TYPE string.
+
     METHODS parse_line
       IMPORTING iv_line    TYPE string
       EXPORTING et_matches TYPE ty_match_tt.
@@ -84,21 +90,21 @@ CLASS lcl_syntax_abap DEFINITION INHERITING FROM lcl_syntax_highlighter FINAL.
 
     CONSTANTS:
       BEGIN OF c_css,
-        keyword  TYPE string VALUE 'keyword',                "#EC NOTEXT
-        text     TYPE string VALUE 'text',                   "#EC NOTEXT
-        comment  TYPE string VALUE 'comment',                "#EC NOTEXT
+        keyword TYPE string VALUE 'keyword',                "#EC NOTEXT
+        text    TYPE string VALUE 'text',                   "#EC NOTEXT
+        comment TYPE string VALUE 'comment',                "#EC NOTEXT
       END OF c_css,
 
       BEGIN OF c_token,
-        keyword  TYPE c VALUE 'K',                           "#EC NOTEXT
-        text     TYPE c VALUE 'T',                           "#EC NOTEXT
-        comment  TYPE c VALUE 'C',                           "#EC NOTEXT
+        keyword TYPE c VALUE 'K',                           "#EC NOTEXT
+        text    TYPE c VALUE 'T',                           "#EC NOTEXT
+        comment TYPE c VALUE 'C',                           "#EC NOTEXT
       END OF c_token,
 
       BEGIN OF c_regex,
-        comment  TYPE string VALUE '##|"|^\*',
-        text     TYPE string VALUE '`|''|\||\{|\}',
-        keyword  TYPE string VALUE '&&|\b[-_a-z0-9]+\b',
+        comment TYPE string VALUE '##|"|^\*',
+        text    TYPE string VALUE '`|''|\||\{|\}',
+        keyword TYPE string VALUE '&&|\b[-_a-z0-9]+\b',
       END OF c_regex.
 
   PROTECTED SECTION.
@@ -126,21 +132,21 @@ CLASS lcl_syntax_xml DEFINITION INHERITING FROM lcl_syntax_highlighter FINAL.
 
     CONSTANTS:
       BEGIN OF c_css,
-        xml_tag  TYPE string VALUE 'xml_tag',                "#EC NOTEXT
-        attr     TYPE string VALUE 'attr',                   "#EC NOTEXT
-        attr_val TYPE string VALUE 'attr_val',               "#EC NOTEXT
+        xml_tag  TYPE string VALUE 'xml_tag',               "#EC NOTEXT
+        attr     TYPE string VALUE 'attr',                  "#EC NOTEXT
+        attr_val TYPE string VALUE 'attr_val',              "#EC NOTEXT
       END OF c_css,
 
       BEGIN OF c_token,
-        xml_tag  TYPE c VALUE 'X',                           "#EC NOTEXT
-        attr     TYPE c VALUE 'A',                           "#EC NOTEXT
-        attr_val TYPE c VALUE 'V',                           "#EC NOTEXT
+        xml_tag  TYPE c VALUE 'X',                          "#EC NOTEXT
+        attr     TYPE c VALUE 'A',                          "#EC NOTEXT
+        attr_val TYPE c VALUE 'V',                          "#EC NOTEXT
       END OF c_token,
 
       BEGIN OF c_regex,
-        xml_tag  TYPE string VALUE '[<>]',                   "#EC NOTEXT
+        xml_tag  TYPE string VALUE '[<>]',                  "#EC NOTEXT
         attr     TYPE string VALUE '\s[-a-z:_0-9]+\s*(?==)', "#EC NOTEXT
-        attr_val TYPE string VALUE '["''][^''"]+[''"]',      "#EC NOTEXT
+        attr_val TYPE string VALUE '["''][^''"]+[''"]',     "#EC NOTEXT
       END OF c_regex.
 
   PROTECTED SECTION.
@@ -149,23 +155,6 @@ CLASS lcl_syntax_xml DEFINITION INHERITING FROM lcl_syntax_highlighter FINAL.
 
 ENDCLASS.                       " lcl_syntax_xml DEFINITION
 
-*----------------------------------------------------------------------*
-* Macros to fill table with a regular expressions to be parsed
-*----------------------------------------------------------------------*
-
-DEFINE _add_rule.
-
-  CREATE OBJECT ls_rule-regex
-    EXPORTING
-      pattern     = c_regex-&1
-      ignore_case = abap_true.
-
-  ls_rule-token = c_token-&1.
-  ls_rule-style = c_css-&1.
-  APPEND ls_rule TO mt_rules.
-
-END-OF-DEFINITION.           " _add_rule
-
 *----------------------------------------------------------------------*
 *       CLASS lcl_syntax_highlighter IMPLEMENTATION
 *----------------------------------------------------------------------*
@@ -187,6 +176,21 @@ CLASS lcl_syntax_highlighter IMPLEMENTATION.
 
   ENDMETHOD.                    " create.
 
+  METHOD add_rule.
+
+    DATA ls_rule LIKE LINE OF mt_rules.
+
+    CREATE OBJECT ls_rule-regex
+      EXPORTING
+        pattern     = iv_regex
+        ignore_case = abap_true.
+
+    ls_rule-token = iv_token.
+    ls_rule-style = iv_style.
+    APPEND ls_rule TO mt_rules.
+
+  ENDMETHOD.
+
   METHOD parse_line.
 
     DATA:
@@ -222,10 +226,10 @@ CLASS lcl_syntax_highlighter IMPLEMENTATION.
   METHOD extend_matches.
 
     DATA:
-      lv_line_len   TYPE i,
-      lv_last_pos   TYPE i VALUE 0,
-      lv_length     TYPE i,
-      ls_match      TYPE ty_match.
+      lv_line_len TYPE i,
+      lv_last_pos TYPE i VALUE 0,
+      lv_length   TYPE i,
+      ls_match    TYPE ty_match.
 
     FIELD-SYMBOLS <match> TYPE ty_match.
 
@@ -259,8 +263,8 @@ CLASS lcl_syntax_highlighter IMPLEMENTATION.
   METHOD format_line.
 
     DATA:
-      lv_chunk  TYPE string,
-      ls_rule   LIKE LINE OF mt_rules.
+      lv_chunk TYPE string,
+      ls_rule  LIKE LINE OF mt_rules.
 
     FIELD-SYMBOLS <match> TYPE ty_match.
 
@@ -341,14 +345,21 @@ CLASS lcl_syntax_abap IMPLEMENTATION.
 
   METHOD constructor.
 
-    DATA ls_rule LIKE LINE OF mt_rules.
-
     super->constructor( ).
 
     " Initialize instances of regular expression
-    _add_rule keyword.
-    _add_rule comment.
-    _add_rule text.
+
+    add_rule( iv_regex = c_regex-keyword
+              iv_token = c_token-keyword
+              iv_style = c_css-keyword ).
+
+    add_rule( iv_regex = c_regex-comment
+              iv_token = c_token-comment
+              iv_style = c_css-comment ).
+
+    add_rule( iv_regex = c_regex-text
+              iv_token = c_token-text
+              iv_style = c_css-text ).
 
   ENDMETHOD.                    " constructor
 
@@ -562,14 +573,21 @@ CLASS lcl_syntax_xml IMPLEMENTATION.
 
   METHOD constructor.
 
-    DATA ls_rule LIKE LINE OF mt_rules.
-
     super->constructor( ).
 
     " Initialize instances of regular expressions
-    _add_rule xml_tag.
-    _add_rule attr.
-    _add_rule attr_val.
+
+    add_rule( iv_regex = c_regex-xml_tag
+              iv_token = c_token-xml_tag
+              iv_style = c_css-xml_tag ).
+
+    add_rule( iv_regex = c_regex-attr
+              iv_token = c_token-attr
+              iv_style = c_css-attr ).
+
+    add_rule( iv_regex = c_regex-attr_val
+              iv_token = c_token-attr_val
+              iv_style = c_css-attr_val ).
 
   ENDMETHOD.
 
@@ -577,7 +595,6 @@ CLASS lcl_syntax_xml IMPLEMENTATION.
 
     DATA:
       lv_index      TYPE sy-tabix,
-      lv_line_len   TYPE i,
       lv_prev_token TYPE c,
       lv_state      TYPE c VALUE 'O'. " O - for open tag; C - for closed tag;
 
@@ -585,9 +602,8 @@ CLASS lcl_syntax_xml IMPLEMENTATION.
       <prev>  TYPE ty_match,
       <match> TYPE ty_match.
 
-    SORT ct_matches BY offset.
 
-    lv_line_len = strlen( iv_line ).
+    SORT ct_matches BY offset.
 
     LOOP AT ct_matches ASSIGNING <match>.
       lv_index = sy-tabix.
@@ -605,7 +621,7 @@ CLASS lcl_syntax_xml IMPLEMENTATION.
             DELETE ct_matches INDEX lv_index.
             CONTINUE.
 
-          " Adjust length and offset of closing tag
+            " Adjust length and offset of closing tag
           ELSEIF <match>-text_tag = '>' AND lv_prev_token <> c_token-xml_tag.
             lv_state = 'C'.
             <match>-length = <match>-offset - <prev>-offset - <prev>-length + <match>-length.
@@ -637,8 +653,8 @@ ENDCLASS.                       " lcl_syntax_xml IMPLEMENTATION
 *----------------------------------------------------------------------*
 *       CLASS ltcl_syntax_cases definition
 *----------------------------------------------------------------------*
-CLASS ltcl_syntax_cases DEFINITION FINAL
-  FOR TESTING RISK LEVEL HARMLESS DURATION SHORT.
+CLASS ltcl_syntax_cases DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS
+    DURATION SHORT.
 
   PRIVATE SECTION.
 
@@ -675,7 +691,7 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
     ms_match-token    = &1.
     ms_match-offset   = &2.
     ms_match-length   = &3.
-    append ms_match to mt_after_parse.
+    APPEND ms_match TO mt_after_parse.
   END-OF-DEFINITION.           " _generate_parse
 
   DEFINE _generate_order.
@@ -683,7 +699,7 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
     ms_match-offset   = &2.
     ms_match-length   = &3.
     ms_match-text_tag = &4.
-    append ms_match to mt_after_order.
+    APPEND ms_match TO mt_after_order.
   END-OF-DEFINITION.           " _generate_order
 
   DEFINE _generate_extend.
@@ -691,7 +707,7 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
     ms_match-offset   = &2.
     ms_match-length   = &3.
     ms_match-text_tag = &4.
-    append ms_match to mt_after_extend.
+    APPEND ms_match TO mt_after_extend.
   END-OF-DEFINITION.           " _generate_extend
 
   METHOD do_test.
@@ -1004,7 +1020,7 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
 
     DATA lv_line TYPE string.
 
-    lv_line = '<tag>Text</tag>'.    "#EC NOTEXT
+    lv_line = '<tag>Text</tag>'.                            "#EC NOTEXT
 
     " Generate table with expected values after parsing
     _generate_parse 'X' 0  1.
@@ -1029,7 +1045,7 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
 
     DATA lv_line TYPE string.
 
-    lv_line = '<tag/>'.    "#EC NOTEXT
+    lv_line = '<tag/>'.                                     "#EC NOTEXT
 
     " Generate table with expected values after parsing
     _generate_parse 'X' 0  1.
@@ -1049,7 +1065,7 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
 
     DATA lv_line TYPE string.
 
-    lv_line = '<tag attribute="value"/>'.    "#EC NOTEXT
+    lv_line = '<tag attribute="value"/>'.                   "#EC NOTEXT
 
     " Generate table with expected values after parsing
     _generate_parse 'X' 0  1.
@@ -1078,7 +1094,7 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
 
     DATA lv_line TYPE string.
 
-    lv_line = '<?xml version="1.0"?>'.    "#EC NOTEXT
+    lv_line = '<?xml version="1.0"?>'.                      "#EC NOTEXT
 
     " Generate table with expected values after parsing
     _generate_parse 'X' 0  1.
@@ -1107,7 +1123,7 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
 
     DATA lv_line TYPE string.
 
-    lv_line = '<ns:tag ns:a1="v1" ns:a2=''v2''>"text"</ns:tag>'.    "#EC NOTEXT
+    lv_line = '<ns:tag ns:a1="v1" ns:a2=''v2''>"text"</ns:tag>'. "#EC NOTEXT
 
     " Generate table with expected values after parsing
     _generate_parse 'X' 0  1.
@@ -1152,8 +1168,8 @@ ENDCLASS.                       " ltcl_syntax_cases IMPLEMENTATION
 *----------------------------------------------------------------------*
 *
 *----------------------------------------------------------------------*
-CLASS ltcl_syntax_basic_logic DEFINITION FINAL
-  FOR TESTING RISK LEVEL HARMLESS DURATION SHORT.
+CLASS ltcl_syntax_basic_logic DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS
+    DURATION SHORT.
 
   PRIVATE SECTION.
 
@@ -1209,8 +1225,8 @@ CLASS ltcl_syntax_basic_logic IMPLEMENTATION.
 
     cl_abap_unit_assert=>assert_equals(
       act = lv_line_act
-      exp = '<span class="keyword">CALL FUNCTION</span>' "#EC NOTEXT
-      msg = 'Failure during applying of style.' ). "#EC NOTEXT
+      exp = '<span class="keyword">CALL FUNCTION</span>'    "#EC NOTEXT
+      msg = 'Failure during applying of style.' ).          "#EC NOTEXT
 
   ENDMETHOD.                    " apply_style
 
@@ -1224,15 +1240,15 @@ CLASS ltcl_syntax_basic_logic IMPLEMENTATION.
     cl_abap_unit_assert=>assert_equals(
       act = lv_line_act
       exp = ''
-      msg = 'Failure in method process_line.' ). "#EC NOTEXT
+      msg = 'Failure in method process_line.' ).            "#EC NOTEXT
 
     " Call the method with non-empty line and compare results
     lv_line_act = mo->process_line( iv_line  = '* CALL FUNCTION' ). "#EC NOTEXT
 
     cl_abap_unit_assert=>assert_equals(
       act = lv_line_act
-      exp = '<span class="comment">* CALL FUNCTION</span>' "#EC NOTEXT
-      msg = 'Failure in method process_line.' ). "#EC NOTEXT
+      exp = '<span class="comment">* CALL FUNCTION</span>'  "#EC NOTEXT
+      msg = 'Failure in method process_line.' ).            "#EC NOTEXT
 
   ENDMETHOD.                    " process_line
 
diff --git a/src/zabapgit_tadir.prog.abap b/src/zabapgit_tadir.prog.abap
index f6239b0d1..8b678d823 100644
--- a/src/zabapgit_tadir.prog.abap
+++ b/src/zabapgit_tadir.prog.abap
@@ -15,7 +15,7 @@ CLASS lcl_tadir DEFINITION FINAL.
         IMPORTING iv_package            TYPE tadir-devclass
                   iv_ignore_subpackages TYPE abap_bool DEFAULT abap_false
                   io_dot                TYPE REF TO lcl_dot_abapgit OPTIONAL
-        RETURNING VALUE(rt_tadir)       TYPE ty_tadir_tt
+        RETURNING VALUE(rt_tadir)       TYPE lif_defs=>ty_tadir_tt
         RAISING   lcx_exception,
       read_single
         IMPORTING iv_pgmid        TYPE tadir-pgmid DEFAULT 'R3TR'
@@ -31,15 +31,15 @@ CLASS lcl_tadir DEFINITION FINAL.
   PRIVATE SECTION.
     CLASS-METHODS:
       check_exists
-        IMPORTING it_tadir        TYPE ty_tadir_tt
-        RETURNING VALUE(rt_tadir) TYPE ty_tadir_tt
+        IMPORTING it_tadir        TYPE lif_defs=>ty_tadir_tt
+        RETURNING VALUE(rt_tadir) TYPE lif_defs=>ty_tadir_tt
         RAISING   lcx_exception,
       build
         IMPORTING iv_package            TYPE tadir-devclass
                   iv_top                TYPE tadir-devclass
                   io_dot                TYPE REF TO lcl_dot_abapgit
                   iv_ignore_subpackages TYPE abap_bool DEFAULT abap_false
-        RETURNING VALUE(rt_tadir)       TYPE ty_tadir_tt
+        RETURNING VALUE(rt_tadir)       TYPE lif_defs=>ty_tadir_tt
         RAISING   lcx_exception.
 
 ENDCLASS.                    "lcl_tadir DEFINITION
@@ -88,7 +88,7 @@ CLASS lcl_tadir IMPLEMENTATION.
   METHOD check_exists.
 
     DATA: lv_exists TYPE abap_bool,
-          ls_item   TYPE ty_item.
+          ls_item   TYPE lif_defs=>ty_item.
 
     FIELD-SYMBOLS: <ls_tadir> LIKE LINE OF it_tadir.
 
@@ -126,8 +126,7 @@ CLASS lcl_tadir IMPLEMENTATION.
 
   METHOD build.
 
-    DATA: lv_index    TYPE i,
-          lt_tadir    TYPE ty_tadir_tt,
+    DATA: lt_tadir    TYPE lif_defs=>ty_tadir_tt,
           lt_tdevc    TYPE STANDARD TABLE OF tdevc,
           lv_path     TYPE string.
 
@@ -154,8 +153,6 @@ CLASS lcl_tadir IMPLEMENTATION.
     ENDIF.
 
     LOOP AT rt_tadir ASSIGNING <ls_tadir>.
-      lv_index = sy-tabix.
-
       <ls_tadir>-path = lv_path.
 
       CASE <ls_tadir>-object.
diff --git a/src/zabapgit_transport.prog.abap b/src/zabapgit_transport.prog.abap
index 74ddeadc5..b2e9badd2 100644
--- a/src/zabapgit_transport.prog.abap
+++ b/src/zabapgit_transport.prog.abap
@@ -185,8 +185,8 @@ CLASS lcl_transport_objects DEFINITION.
     METHODS to_stage
       IMPORTING
         io_stage           TYPE REF TO lcl_stage
-        is_stage_objects   TYPE ty_stage_files
-        it_object_statuses TYPE ty_results_tt
+        is_stage_objects   TYPE lif_defs=>ty_stage_files
+        it_object_statuses TYPE lif_defs=>ty_results_tt
       RAISING
         lcx_exception.
   PRIVATE SECTION.
@@ -200,16 +200,17 @@ CLASS lcl_transport_objects IMPLEMENTATION.
 
   METHOD to_stage.
     DATA: ls_transport_object TYPE tadir,
-          ls_local_file       TYPE ty_file_item,
-          ls_object_status    TYPE ty_result.
+          ls_local_file       TYPE lif_defs=>ty_file_item,
+          ls_object_status    TYPE lif_defs=>ty_result.
 
     LOOP AT mt_transport_objects INTO ls_transport_object.
       LOOP AT it_object_statuses INTO ls_object_status
-        WHERE obj_name = ls_transport_object-obj_name
-          AND obj_type = ls_transport_object-object.
+          WHERE obj_name = ls_transport_object-obj_name
+          AND obj_type = ls_transport_object-object
+          AND NOT lstate IS INITIAL.
 
         CASE ls_object_status-lstate.
-          WHEN gc_state-added OR gc_state-modified.
+          WHEN lif_defs=>gc_state-added OR lif_defs=>gc_state-modified.
             IF ls_transport_object-delflag = abap_true.
               lcx_exception=>raise( |Object { ls_transport_object-obj_name
               } should be added/modified, but has deletion flag in transport| ).
@@ -229,7 +230,7 @@ CLASS lcl_transport_objects IMPLEMENTATION.
               iv_path     = ls_local_file-file-path
               iv_filename = ls_local_file-file-filename
               iv_data     = ls_local_file-file-data ).
-          WHEN gc_state-deleted.
+          WHEN lif_defs=>gc_state-deleted.
             IF ls_transport_object-delflag = abap_false.
               lcx_exception=>raise( |Object { ls_transport_object-obj_name
               } should be removed, but has NO deletion flag in transport| ).
@@ -250,12 +251,12 @@ CLASS lcl_transport_objects IMPLEMENTATION.
 
 ENDCLASS.
 
-CLASS lcl_transport_to_branch DEFINITION.
+CLASS lcl_transport_2_branch DEFINITION.
   PUBLIC SECTION.
     METHODS:
       create
         IMPORTING io_repository          TYPE REF TO lcl_repo_online
-                  is_transport_to_branch TYPE ty_transport_to_branch
+                  is_transport_to_branch TYPE lif_defs=>ty_transport_to_branch
                   it_transport_objects   TYPE scts_tadir
         RAISING   lcx_exception.
   PRIVATE SECTION.
@@ -268,28 +269,28 @@ CLASS lcl_transport_to_branch DEFINITION.
         lcx_exception.
     METHODS generate_commit_message
       IMPORTING
-        is_transport_to_branch TYPE ty_transport_to_branch
+        is_transport_to_branch TYPE lif_defs=>ty_transport_to_branch
       RETURNING
-        VALUE(rs_comment)      TYPE ty_comment.
+        VALUE(rs_comment)      TYPE lif_defs=>ty_comment.
     METHODS stage_transport_objects
       IMPORTING
         it_transport_objects TYPE scts_tadir
         io_stage             TYPE REF TO lcl_stage
-        is_stage_objects     TYPE ty_stage_files
-        it_object_statuses   TYPE ty_results_tt
+        is_stage_objects     TYPE lif_defs=>ty_stage_files
+        it_object_statuses   TYPE lif_defs=>ty_results_tt
       RAISING
         lcx_exception.
 ENDCLASS.
 
-CLASS lcl_transport_to_branch IMPLEMENTATION.
+CLASS lcl_transport_2_branch IMPLEMENTATION.
 
   METHOD create.
     DATA:
-      lv_branch_name      TYPE string,
-      ls_comment          TYPE ty_comment,
-      lo_stage            TYPE REF TO lcl_stage,
-      ls_stage_objects    TYPE ty_stage_files,
-      lt_object_statuses  TYPE ty_results_tt.
+      lv_branch_name     TYPE string,
+      ls_comment         TYPE lif_defs=>ty_comment,
+      lo_stage           TYPE REF TO lcl_stage,
+      ls_stage_objects   TYPE lif_defs=>ty_stage_files,
+      lt_object_statuses TYPE lif_defs=>ty_results_tt.
 
     lv_branch_name = lcl_git_branch_list=>complete_heads_branch_name(
         lcl_git_branch_list=>normalize_branch_name( is_transport_to_branch-branch_name ) ).
diff --git a/src/zabapgit_unit_test.prog.abap b/src/zabapgit_unit_test.prog.abap
index 3b321b7ba..b093fc3d7 100644
--- a/src/zabapgit_unit_test.prog.abap
+++ b/src/zabapgit_unit_test.prog.abap
@@ -50,6 +50,7 @@ CLASS ltcl_convert DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FIN
 
   PRIVATE SECTION.
     METHODS convert_int FOR TESTING RAISING lcx_exception.
+    METHODS split_string FOR TESTING.
 
 ENDCLASS.                    "ltcl_convert DEFINITION
 
@@ -79,15 +80,41 @@ CLASS ltcl_convert IMPLEMENTATION.
 
   ENDMETHOD.                    "convert_int
 
+  METHOD split_string.
+
+    DATA: lt_act TYPE string_table,
+          lt_exp TYPE string_table.
+
+    APPEND 'ABC' TO lt_exp.
+    APPEND '123' TO lt_exp.
+
+    " Case 1. String separated by CRLF
+    lt_act = lcl_convert=>split_string( 'ABC' && cl_abap_char_utilities=>cr_lf && '123' ).
+
+    cl_abap_unit_assert=>assert_equals( exp = lt_exp
+                                        act = lt_act
+                                        msg = ' Error during string split: CRLF' ).
+
+    CLEAR: lt_act.
+
+    " Case 2. String separated by LF
+    lt_act = lcl_convert=>split_string( 'ABC' && cl_abap_char_utilities=>newline && '123' ).
+
+    cl_abap_unit_assert=>assert_equals( exp = lt_exp
+                                        act = lt_act
+                                        msg = ' Error during string split: LF' ).
+
+  ENDMETHOD.                    "split_string.
+
 ENDCLASS.                    "ltcl_convert IMPLEMENTATION
 
-CLASS lth_critical_tests DEFINITION FINAL.
+CLASS ltcl_critical_tests DEFINITION FINAL FOR TESTING.
   PUBLIC SECTION.
     CLASS-METHODS:
       check_run_permission.
 ENDCLASS.
 
-CLASS lth_critical_tests IMPLEMENTATION.
+CLASS ltcl_critical_tests IMPLEMENTATION.
 
   METHOD check_run_permission.
     DATA: lo_settings TYPE REF TO lcl_settings.
@@ -135,15 +162,15 @@ ENDCLASS.                    "ltcl_dangerous DEFINITION
 CLASS ltcl_dangerous IMPLEMENTATION.
 
   METHOD class_setup.
-    lth_critical_tests=>check_run_permission( ).
+    ltcl_critical_tests=>check_run_permission( ).
   ENDMETHOD.                    "class_setup
 
   METHOD run.
 
     DATA: lo_repo    TYPE REF TO lcl_repo_online,
-          lt_tadir   TYPE ty_tadir_tt,
+          lt_tadir   TYPE lif_defs=>ty_tadir_tt,
           lv_msg     TYPE string,
-          lt_results TYPE ty_results_tt,
+          lt_results TYPE lif_defs=>ty_results_tt,
           lt_types   TYPE lcl_objects=>ty_types_tt.
 
     FIELD-SYMBOLS: <ls_result> LIKE LINE OF lt_results,
@@ -268,8 +295,8 @@ CLASS ltcl_diff IMPLEMENTATION.
     FIELD-SYMBOLS: <ls_diff> LIKE LINE OF lt_diff.
 
 
-    CONCATENATE LINES OF mt_new INTO lv_new SEPARATED BY gc_newline.
-    CONCATENATE LINES OF mt_old INTO lv_old SEPARATED BY gc_newline.
+    CONCATENATE LINES OF mt_new INTO lv_new SEPARATED BY lif_defs=>gc_newline.
+    CONCATENATE LINES OF mt_old INTO lv_old SEPARATED BY lif_defs=>gc_newline.
 
     lv_xnew = lcl_convert=>string_to_xstring_utf8( lv_new ).
     lv_xold = lcl_convert=>string_to_xstring_utf8( lv_old ).
@@ -457,6 +484,10 @@ CLASS ltcl_git_porcelain DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHO
         RAISING lcx_exception,
       root_empty FOR TESTING
         RAISING lcx_exception,
+      namespaces FOR TESTING
+        RAISING lcx_exception,
+      more_sub FOR TESTING
+        RAISING lcx_exception,
       sub FOR TESTING
         RAISING lcx_exception.
 
@@ -481,7 +512,7 @@ CLASS ltcl_git_porcelain IMPLEMENTATION.
     <ls_expanded>-path  = iv_path.
     <ls_expanded>-name  = iv_name.
     <ls_expanded>-sha1  = 'a'.
-    <ls_expanded>-chmod = gc_chmod-file.
+    <ls_expanded>-chmod = lif_defs=>gc_chmod-file.
 
   ENDMETHOD.
 
@@ -530,6 +561,50 @@ CLASS ltcl_git_porcelain IMPLEMENTATION.
 
   ENDMETHOD.
 
+  METHOD more_sub.
+
+    FIELD-SYMBOLS: <ls_tree> LIKE LINE OF mt_trees.
+
+    append( iv_path = '/src/foo_a/foo_a1/'
+            iv_name = 'a1.txt' ).
+
+    append( iv_path = '/src/foo_a/foo_a2/'
+            iv_name = 'a2.txt' ).
+
+    mt_trees = lcl_git_porcelain=>build_trees( mt_expanded ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = lines( mt_trees )
+      exp = 5 ).
+
+    LOOP AT mt_trees ASSIGNING <ls_tree>.
+      cl_abap_unit_assert=>assert_not_initial( <ls_tree>-data ).
+    ENDLOOP.
+
+  ENDMETHOD.
+
+  METHOD namespaces.
+
+    FIELD-SYMBOLS: <ls_tree> LIKE LINE OF mt_trees.
+
+    append( iv_path = '/src/#foo#a/#foo#a1/'
+            iv_name = 'a1.txt' ).
+
+    append( iv_path = '/src/#foo#a/#foo#a2/'
+            iv_name = 'a2.txt' ).
+
+    mt_trees = lcl_git_porcelain=>build_trees( mt_expanded ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = lines( mt_trees )
+      exp = 5 ).
+
+    LOOP AT mt_trees ASSIGNING <ls_tree>.
+      cl_abap_unit_assert=>assert_not_initial( <ls_tree>-data ).
+    ENDLOOP.
+
+  ENDMETHOD.
+
   METHOD root_empty.
 
     append( iv_path = '/sub/'
@@ -591,6 +666,8 @@ CLASS ltcl_xml DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL.
     METHODS:
       up FOR TESTING
         RAISING lcx_exception,
+      empty FOR TESTING
+        RAISING lcx_exception,
       down FOR TESTING
         RAISING lcx_exception.
 
@@ -609,6 +686,38 @@ ENDCLASS.
 
 CLASS ltcl_xml IMPLEMENTATION.
 
+  METHOD empty.
+
+    DATA: ls_old    TYPE st_old,
+          ls_new    TYPE st_new,
+          lv_xml    TYPE string,
+          lo_input  TYPE REF TO lcl_xml_input,
+          lo_output TYPE REF TO lcl_xml_output.
+
+
+    CLEAR ls_old.
+
+    CREATE OBJECT lo_output.
+    lo_output->add( iv_name = 'DATA'
+                    ig_data = ls_old ).
+    lv_xml = lo_output->render( ).
+
+    CREATE OBJECT lo_input
+      EXPORTING
+        iv_xml = lv_xml.
+    lo_input->read( EXPORTING iv_name = 'DATA'
+                    CHANGING cg_data = ls_new ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = ls_new-foo
+      exp = ls_old-foo ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = ls_new-bar
+      exp = ls_old-bar ).
+
+  ENDMETHOD.
+
   METHOD up.
 
     DATA: ls_old    TYPE st_old,
@@ -773,7 +882,7 @@ CLASS ltcl_object_types IMPLEMENTATION.
 
   METHOD is_supported.
 
-    DATA: ls_item      TYPE ty_item,
+    DATA: ls_item      TYPE lif_defs=>ty_item,
           lv_supported TYPE abap_bool,
           lt_types     TYPE lcl_objects=>ty_types_tt.
 
@@ -799,7 +908,7 @@ CLASS ltcl_object_types IMPLEMENTATION.
 
   METHOD not_exist.
 
-    DATA: ls_item   TYPE ty_item,
+    DATA: ls_item   TYPE lif_defs=>ty_item,
           lv_exists TYPE abap_bool,
           lt_types  TYPE lcl_objects=>ty_types_tt.
 
@@ -859,7 +968,7 @@ CLASS ltcl_git_pack_decode_commit IMPLEMENTATION.
 
   METHOD add.
 
-    CONCATENATE mv_str iv_string gc_newline INTO mv_str.
+    CONCATENATE mv_str iv_string lif_defs=>gc_newline INTO mv_str.
 
   ENDMETHOD.
 
@@ -992,7 +1101,7 @@ CLASS ltcl_git_pack DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FI
     METHODS:
       object_blob
         IMPORTING iv_data          TYPE xstring
-        RETURNING VALUE(rs_object) TYPE ty_object
+        RETURNING VALUE(rs_object) TYPE lif_defs=>ty_object
         RAISING   lcx_exception.
 
 ENDCLASS.                    "test DEFINITION
@@ -1012,12 +1121,12 @@ CLASS ltcl_git_pack IMPLEMENTATION.
 
 
     APPEND INITIAL LINE TO lt_tree ASSIGNING <ls_tree>.
-    <ls_tree>-chmod = gc_chmod-file.
+    <ls_tree>-chmod = lif_defs=>gc_chmod-file.
     <ls_tree>-name  = 'b.txt'.
     <ls_tree>-sha1  = '0123'.
 
     APPEND INITIAL LINE TO lt_tree ASSIGNING <ls_tree>.
-    <ls_tree>-chmod = gc_chmod-file.
+    <ls_tree>-chmod = lif_defs=>gc_chmod-file.
     <ls_tree>-name  = 'a.txt'.
     <ls_tree>-sha1  = '0123'.
 
@@ -1040,12 +1149,12 @@ CLASS ltcl_git_pack IMPLEMENTATION.
 
 
     APPEND INITIAL LINE TO lt_tree ASSIGNING <ls_tree>.
-    <ls_tree>-chmod = gc_chmod-file.
+    <ls_tree>-chmod = lif_defs=>gc_chmod-file.
     <ls_tree>-name  = 'foo.txt'.
     <ls_tree>-sha1  = '0123'.
 
     APPEND INITIAL LINE TO lt_tree ASSIGNING <ls_tree>.
-    <ls_tree>-chmod = gc_chmod-dir.
+    <ls_tree>-chmod = lif_defs=>gc_chmod-dir.
     <ls_tree>-name  = 'foo'.
     <ls_tree>-sha1  = '0123'.
 
@@ -1063,22 +1172,22 @@ CLASS ltcl_git_pack IMPLEMENTATION.
   METHOD pack_multiple.
 
     CONSTANTS: lc_data TYPE x LENGTH 15 VALUE '123456789ABCDEF545794254754554',
-               lc_sha  TYPE ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc'.
+               lc_sha  TYPE lif_defs=>ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc'.
 
-    DATA: lt_objects TYPE ty_objects_tt,
+    DATA: lt_objects TYPE lif_defs=>ty_objects_tt,
           ls_object  LIKE LINE OF lt_objects,
           lt_nodes   TYPE lcl_git_pack=>ty_nodes_tt,
           ls_node    LIKE LINE OF lt_nodes,
           ls_commit  TYPE lcl_git_pack=>ty_commit,
-          lt_result  TYPE ty_objects_tt,
+          lt_result  TYPE lif_defs=>ty_objects_tt,
           lv_data    TYPE xstring.
 
 
 * blob
     lv_data = lc_data.
     CLEAR ls_object.
-    ls_object-sha1 = lcl_hash=>sha1( iv_type = gc_type-blob iv_data = lv_data ).
-    ls_object-type = gc_type-blob.
+    ls_object-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-blob iv_data = lv_data ).
+    ls_object-type = lif_defs=>gc_type-blob.
     ls_object-data = lv_data.
     APPEND ls_object TO lt_objects.
 
@@ -1091,8 +1200,8 @@ CLASS ltcl_git_pack IMPLEMENTATION.
     ls_commit-body      = 'body'.
     lv_data = lcl_git_pack=>encode_commit( ls_commit ).
     CLEAR ls_object.
-    ls_object-sha1 = lcl_hash=>sha1( iv_type = gc_type-commit iv_data = lv_data ).
-    ls_object-type = gc_type-commit.
+    ls_object-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-commit iv_data = lv_data ).
+    ls_object-type = lif_defs=>gc_type-commit.
     ls_object-data = lv_data.
     APPEND ls_object TO lt_objects.
 
@@ -1104,8 +1213,8 @@ CLASS ltcl_git_pack IMPLEMENTATION.
     APPEND ls_node TO lt_nodes.
     lv_data = lcl_git_pack=>encode_tree( lt_nodes ).
     CLEAR ls_object.
-    ls_object-sha1 = lcl_hash=>sha1( iv_type = gc_type-tree iv_data = lv_data ).
-    ls_object-type = gc_type-tree.
+    ls_object-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-tree iv_data = lv_data ).
+    ls_object-type = lif_defs=>gc_type-tree.
     ls_object-data = lv_data.
     APPEND ls_object TO lt_objects.
 
@@ -1122,9 +1231,9 @@ CLASS ltcl_git_pack IMPLEMENTATION.
 
   METHOD object_blob.
 
-    rs_object-sha1 = lcl_hash=>sha1( iv_type = gc_type-blob
+    rs_object-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-blob
                                      iv_data = iv_data ).
-    rs_object-type = gc_type-blob.
+    rs_object-type = lif_defs=>gc_type-blob.
     rs_object-data = iv_data.
 
   ENDMETHOD.                    "object_blob
@@ -1133,9 +1242,9 @@ CLASS ltcl_git_pack IMPLEMENTATION.
 
     CONSTANTS: lc_data TYPE x LENGTH 8 VALUE '0123456789ABCDEF'.
 
-    DATA: lt_objects TYPE ty_objects_tt,
+    DATA: lt_objects TYPE lif_defs=>ty_objects_tt,
           ls_object  LIKE LINE OF lt_objects,
-          lt_result  TYPE ty_objects_tt,
+          lt_result  TYPE lif_defs=>ty_objects_tt,
           lv_data    TYPE xstring.
 
 
@@ -1158,10 +1267,10 @@ CLASS ltcl_git_pack IMPLEMENTATION.
 
     CONSTANTS: lc_data TYPE x LENGTH 8 VALUE '0123456789ABCDEF'.
 
-    DATA: lt_objects TYPE ty_objects_tt,
+    DATA: lt_objects TYPE lif_defs=>ty_objects_tt,
           ls_object  LIKE LINE OF lt_objects,
           lv_xstring TYPE xstring,
-          lt_result  TYPE ty_objects_tt,
+          lt_result  TYPE lif_defs=>ty_objects_tt,
           lv_data    TYPE xstring.
 
 
@@ -1185,7 +1294,7 @@ CLASS ltcl_git_pack IMPLEMENTATION.
 
   METHOD tree.
 
-    CONSTANTS: lc_sha TYPE ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc'.
+    CONSTANTS: lc_sha TYPE lif_defs=>ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc'.
 
     DATA: lt_nodes  TYPE lcl_git_pack=>ty_nodes_tt,
           ls_node   LIKE LINE OF lt_nodes,
@@ -1193,7 +1302,7 @@ CLASS ltcl_git_pack IMPLEMENTATION.
           lt_result TYPE lcl_git_pack=>ty_nodes_tt.
 
     CLEAR ls_node.
-    ls_node-chmod = gc_chmod-file.
+    ls_node-chmod = lif_defs=>gc_chmod-file.
     ls_node-name = 'foobar.txt'.
     ls_node-sha1 = lc_sha.
     APPEND ls_node TO lt_nodes.
@@ -1209,8 +1318,8 @@ CLASS ltcl_git_pack IMPLEMENTATION.
 
   METHOD commit.
 
-    CONSTANTS: lc_tree   TYPE ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc',
-               lc_parent TYPE ty_sha1 VALUE '1236cb3c4b7f0b3600b64f744cde614a283a88dc'.
+    CONSTANTS: lc_tree   TYPE lif_defs=>ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc',
+               lc_parent TYPE lif_defs=>ty_sha1 VALUE '1236cb3c4b7f0b3600b64f744cde614a283a88dc'.
 
     DATA: ls_commit TYPE lcl_git_pack=>ty_commit,
           ls_result TYPE lcl_git_pack=>ty_commit,
@@ -1265,8 +1374,8 @@ CLASS ltcl_html IMPLEMENTATION.
     mo_html->add( 'hello world' ).
     mo_html->add( '</td>' ).
 
-    lv_exp = '<td>' && gc_newline &&
-             '  hello world' && gc_newline &&
+    lv_exp = '<td>' && lif_defs=>gc_newline &&
+             '  hello world' && lif_defs=>gc_newline &&
              '</td>'.
 
     cl_abap_unit_assert=>assert_equals(
@@ -1283,8 +1392,8 @@ CLASS ltcl_html IMPLEMENTATION.
     mo_html->add( '<input name="comment" type="text">' ).
     mo_html->add( '</td>' ).
 
-    lv_exp = '<td>' && gc_newline &&
-             '  <input name="comment" type="text">' && gc_newline &&
+    lv_exp = '<td>' && lif_defs=>gc_newline &&
+             '  <input name="comment" type="text">' && lif_defs=>gc_newline &&
              '</td>'.
 
     cl_abap_unit_assert=>assert_equals(
@@ -1301,8 +1410,8 @@ CLASS ltcl_html IMPLEMENTATION.
     mo_html->add( '<textarea name="body" rows="10" cols="72"></textarea>' ).
     mo_html->add( '</td>' ).
 
-    lv_exp = '<td>' && gc_newline &&
-             '  <textarea name="body" rows="10" cols="72"></textarea>' && gc_newline &&
+    lv_exp = '<td>' && lif_defs=>gc_newline &&
+             '  <textarea name="body" rows="10" cols="72"></textarea>' && lif_defs=>gc_newline &&
              '</td>'.
 
     cl_abap_unit_assert=>assert_equals(
@@ -1319,8 +1428,8 @@ CLASS ltcl_html IMPLEMENTATION.
     mo_html->add( 'foo<br>bar' ).
     mo_html->add( '</td>' ).
 
-    lv_exp = '<td>' && gc_newline &&
-             '  foo<br>bar' && gc_newline &&
+    lv_exp = '<td>' && lif_defs=>gc_newline &&
+             '  foo<br>bar' && lif_defs=>gc_newline &&
              '</td>'.
 
     cl_abap_unit_assert=>assert_equals(
@@ -1340,11 +1449,11 @@ CLASS ltcl_html IMPLEMENTATION.
     mo_html->add( '}' ).
     mo_html->add( '</style>' ).
 
-    lv_exp = '<style type="text/css">' && gc_newline &&
-             '  .class1 { color: red }' && gc_newline &&
-             '  .class2 {' && gc_newline &&
-             '    color: red' && gc_newline &&
-             '  }' && gc_newline &&
+    lv_exp = '<style type="text/css">' && lif_defs=>gc_newline &&
+             '  .class1 { color: red }' && lif_defs=>gc_newline &&
+             '  .class2 {' && lif_defs=>gc_newline &&
+             '    color: red' && lif_defs=>gc_newline &&
+             '  }' && lif_defs=>gc_newline &&
              '</style>'.
 
     cl_abap_unit_assert=>assert_equals(
@@ -1367,7 +1476,7 @@ CLASS ltcl_serialize DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT F
 
     METHODS:
       check
-        IMPORTING is_item TYPE ty_item
+        IMPORTING is_item TYPE lif_defs=>ty_item
         RAISING   lcx_exception,
       serialize_tabl FOR TESTING RAISING lcx_exception,
       serialize_enqu FOR TESTING RAISING lcx_exception,
@@ -1394,7 +1503,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_enqu.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'ENQU'.
@@ -1406,7 +1515,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_shlp.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'SHLP'.
@@ -1418,7 +1527,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_view.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'VIEW'.
@@ -1430,7 +1539,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_tabl.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'TABL'.
@@ -1442,7 +1551,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_auth.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'AUTH'.
@@ -1454,7 +1563,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_clas.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'CLAS'.
@@ -1466,7 +1575,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_doma.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'DOMA'.
@@ -1478,7 +1587,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_dtel.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'DTEL'.
@@ -1490,7 +1599,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_fugr.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'FUGR'.
@@ -1502,7 +1611,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_msag.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'MSAG'.
@@ -1514,7 +1623,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_prog.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'PROG'.
@@ -1526,7 +1635,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_tran.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'TRAN'.
@@ -1538,7 +1647,7 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD serialize_ttyp.
 
-    DATA: ls_item  TYPE ty_item.
+    DATA: ls_item  TYPE lif_defs=>ty_item.
 
 
     ls_item-obj_type = 'TTYP'.
@@ -1550,10 +1659,10 @@ CLASS ltcl_serialize IMPLEMENTATION.
 
   METHOD check.
 
-    DATA: lt_files TYPE ty_files_tt.
+    DATA: lt_files TYPE lif_defs=>ty_files_tt.
 
     lt_files = lcl_objects=>serialize( is_item     = is_item
-                                       iv_language = gc_english ).
+                                       iv_language = lif_defs=>gc_english ).
 
     cl_abap_unit_assert=>assert_not_initial( lt_files ).
 
@@ -1627,8 +1736,8 @@ CLASS ltcl_login_manager IMPLEMENTATION.
 
 ENDCLASS.
 
-CLASS ltcl_html_action_utils DEFINITION
-  FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL
+CLASS ltcl_html_action_utils DEFINITION FOR TESTING RISK LEVEL HARMLESS
+  DURATION SHORT FINAL
   INHERITING FROM cl_aunit_assert.
 
   PUBLIC SECTION.
@@ -1686,8 +1795,7 @@ CLASS ltcl_html_action_utils IMPLEMENTATION.
 
 ENDCLASS. "ltcl_html_action_utils
 
-CLASS ltcl_path DEFINITION
-  FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL
+CLASS ltcl_path DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL
   INHERITING FROM cl_aunit_assert.
 
   PUBLIC SECTION.
@@ -1844,8 +1952,8 @@ CLASS ltcl_path IMPLEMENTATION.
 
 ENDCLASS.   "ltcl_path
 
-CLASS ltcl_file_status DEFINITION
-  FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL
+CLASS ltcl_file_status DEFINITION FOR TESTING RISK LEVEL HARMLESS
+  DURATION SHORT FINAL
   INHERITING FROM cl_aunit_assert.
 
   PUBLIC SECTION.
@@ -1857,11 +1965,11 @@ CLASS ltcl_file_status IMPLEMENTATION.
 
   METHOD calculate_status.
 
-    DATA: lt_local       TYPE ty_files_item_tt,
-          lt_remote      TYPE ty_files_tt,
-          lt_state       TYPE ty_file_signatures_tt,
-          lt_results     TYPE ty_results_tt,
-          lt_results_exp TYPE ty_results_tt.
+    DATA: lt_local       TYPE lif_defs=>ty_files_item_tt,
+          lt_remote      TYPE lif_defs=>ty_files_tt,
+          lt_state       TYPE lif_defs=>ty_file_signatures_tt,
+          lt_results     TYPE lif_defs=>ty_results_tt,
+          lt_results_exp TYPE lif_defs=>ty_results_tt.
 
     FIELD-SYMBOLS: <local>  LIKE LINE OF lt_local,
                    <remote> LIKE LINE OF lt_remote,
@@ -1945,8 +2053,8 @@ CLASS ltcl_file_status IMPLEMENTATION.
 
 ENDCLASS.   "ltcl_file_status
 
-CLASS ltcl_file_status2 DEFINITION
-  FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL
+CLASS ltcl_file_status2 DEFINITION FOR TESTING RISK LEVEL HARMLESS
+  DURATION SHORT FINAL
   INHERITING FROM cl_aunit_assert.
 
   PUBLIC SECTION.
@@ -1958,7 +2066,7 @@ CLASS ltcl_file_status2 IMPLEMENTATION.
 
   METHOD check.
 
-    DATA: lt_results TYPE ty_results_tt,
+    DATA: lt_results TYPE lif_defs=>ty_results_tt,
           lo_log     TYPE REF TO lcl_log.
 
     FIELD-SYMBOLS: <result> LIKE LINE OF lt_results.
@@ -2085,14 +2193,16 @@ CLASS ltcl_persistence_settings DEFINITION FINAL FOR TESTING
       read_run_critical_tests       FOR TESTING RAISING cx_static_check,
       read_not_found_critical_tests FOR TESTING RAISING cx_static_check.
     DATA:
-      mo_persistence_settings TYPE REF TO lcl_persistence_settings,
+      mo_persistence_settings TYPE REF TO lcl_persist_settings,
       mo_settings             TYPE REF TO lcl_settings.
 ENDCLASS.
 
 CLASS ltcl_persistence_settings IMPLEMENTATION.
+
   METHOD class_setup.
-    lth_critical_tests=>check_run_permission( ).
+    ltcl_critical_tests=>check_run_permission( ).
   ENDMETHOD.
+
   METHOD setup.
     CREATE OBJECT mo_persistence_settings.
     CREATE OBJECT mo_settings.
diff --git a/src/zabapgit_unit_test_clas_intf.prog.abap b/src/zabapgit_unit_test_clas_intf.prog.abap
index 3f424b432..de0f19545 100644
--- a/src/zabapgit_unit_test_clas_intf.prog.abap
+++ b/src/zabapgit_unit_test_clas_intf.prog.abap
@@ -1,7 +1,7 @@
 
 CLASS ltd_spy_oo_object DEFINITION FOR TESTING.
   PUBLIC SECTION.
-    INTERFACES: lif_object_oriented_object_fnc.
+    INTERFACES: lif_oo_object_fnc.
     DATA:
       mv_package               TYPE devclass,
       mv_overwrite             TYPE seox_boolean,
@@ -14,14 +14,14 @@ CLASS ltd_spy_oo_object DEFINITION FOR TESTING.
       mt_local_test_classes    TYPE rswsourcet,
       mv_force                 TYPE seoflag,
       ms_deserialize_key       TYPE seoclskey,
-      mt_source                TYPE ty_string_tt,
-      ms_item_to_activate      TYPE ty_item,
-      mt_descriptions          TYPE ty_seocompotx_tt,
+      mt_source                TYPE lif_defs=>ty_string_tt,
+      ms_item_to_activate      TYPE lif_defs=>ty_item,
+      mt_descriptions          TYPE lif_defs=>ty_seocompotx_tt,
       ms_description_key       TYPE seoclskey,
       mv_text_pool_class_name  TYPE seoclsname,
       mt_text_pool             TYPE textpool_table,
       mv_text_pool_inserted    TYPE abap_bool,
-      mt_sotr                  TYPE ty_sotr_tt,
+      mt_sotr                  TYPE lif_defs=>ty_sotr_tt,
       mt_sotr_package          TYPE devclass,
       mv_docu_object_name      TYPE dokhl-object,
       mv_docu_language         TYPE spras,
@@ -37,7 +37,7 @@ CLASS ltd_spy_oo_object DEFINITION FOR TESTING.
 
 ENDCLASS.
 CLASS ltd_spy_oo_object IMPLEMENTATION.
-  METHOD lif_object_oriented_object_fnc~create.
+  METHOD lif_oo_object_fnc~create.
     DATA lv_properties_structure_name TYPE string.
     lv_properties_structure_name = cl_abap_typedescr=>describe_by_data( is_properties )->absolute_name.
     IF lv_properties_structure_name = cl_abap_typedescr=>describe_by_data( ms_interface_properties )->absolute_name.
@@ -48,7 +48,8 @@ CLASS ltd_spy_oo_object IMPLEMENTATION.
     mv_package                = iv_package.
     mv_overwrite              = iv_overwrite.
   ENDMETHOD.
-  METHOD lif_object_oriented_object_fnc~generate_locals.
+
+  METHOD lif_oo_object_fnc~generate_locals.
     ms_locals_key            = is_key.
     mt_local_definitions     = it_local_definitions.
     mt_local_implementations = it_local_implementations.
@@ -57,21 +58,21 @@ CLASS ltd_spy_oo_object IMPLEMENTATION.
     mv_force                 = iv_force.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~deserialize_source.
+  METHOD lif_oo_object_fnc~deserialize_source.
     ms_deserialize_key = is_key.
     mt_source          = it_source.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~add_to_activation_list.
+  METHOD lif_oo_object_fnc~add_to_activation_list.
     ms_item_to_activate = is_item.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~update_descriptions.
+  METHOD lif_oo_object_fnc~update_descriptions.
     ms_description_key = is_key.
     mt_descriptions    = it_descriptions.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~insert_text_pool.
+  METHOD lif_oo_object_fnc~insert_text_pool.
     mv_text_pool_inserted   = abap_true.
     mv_text_pool_class_name = iv_class_name.
     mt_text_pool            = it_text_pool.
@@ -80,28 +81,28 @@ CLASS ltd_spy_oo_object IMPLEMENTATION.
       exp = sy-langu ).
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~create_sotr.
+  METHOD lif_oo_object_fnc~create_sotr.
     mt_sotr = it_sotr.
     mt_sotr_package = iv_package.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~create_documentation.
+  METHOD lif_oo_object_fnc~create_documentation.
     mv_docu_object_name = iv_object_name.
     mv_docu_language    = iv_language.
     mt_docu_lines       = it_lines.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_includes.
+  METHOD lif_oo_object_fnc~get_includes.
     APPEND 'dummy' TO rt_includes.
     mv_get_includes_called = abap_true.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~exists.
+  METHOD lif_oo_object_fnc~exists.
     mv_exists_called = abap_true.
     rv_exists = mv_exists.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~serialize_abap.
+  METHOD lif_oo_object_fnc~serialize_abap.
     ms_serialize_key = is_class_key.
     CASE iv_type.
       WHEN seop_ext_class_locals_def.
@@ -117,35 +118,35 @@ CLASS ltd_spy_oo_object IMPLEMENTATION.
     ENDCASE.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_class_properties.
+  METHOD lif_oo_object_fnc~get_class_properties.
     rs_class_properties = ms_class_properties.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_interface_properties.
+  METHOD lif_oo_object_fnc~get_interface_properties.
     rs_interface_properties = ms_interface_properties.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_text_pool.
+  METHOD lif_oo_object_fnc~read_text_pool.
     rt_text_pool = mt_text_pool.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_sotr.
+  METHOD lif_oo_object_fnc~read_sotr.
     rt_sotr = mt_sotr.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_documentation.
+  METHOD lif_oo_object_fnc~read_documentation.
     rt_lines = mt_docu_lines.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~read_descriptions.
+  METHOD lif_oo_object_fnc~read_descriptions.
     rt_descriptions = mt_descriptions.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~get_skip_test_classes.
+  METHOD lif_oo_object_fnc~get_skip_test_classes.
     rv_skip = mv_skip_test_classes.
   ENDMETHOD.
 
-  METHOD lif_object_oriented_object_fnc~delete.
+  METHOD lif_oo_object_fnc~delete.
     ms_delete_key = is_deletion_key.
   ENDMETHOD.
 
@@ -184,7 +185,7 @@ CLASS ltd_fake_object_files IMPLEMENTATION.
                                         exp = abap_false ).
   ENDMETHOD.
   METHOD constructor.
-    DATA ls_empty_item TYPE ty_item.
+    DATA ls_empty_item TYPE lif_defs=>ty_item.
     super->constructor( ls_empty_item ).
     APPEND 'source'         TO me->mt_sources.
     APPEND 'definition'     TO me->mt_local_definitions.
@@ -217,19 +218,19 @@ CLASS ltc_oo_test DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT.
       mo_xml_input               TYPE REF TO lcl_xml_input,
       mo_xml_out                 TYPE REF TO lcl_xml_output,
       mo_oo_object               TYPE REF TO lif_object,
-      ms_item                    TYPE ty_item.
+      ms_item                    TYPE lif_defs=>ty_item.
     METHODS: when_deserializing
       RAISING
         lcx_exception,
       then_should_deserialize_source,
       given_the_descriptions
         IMPORTING
-          it_descriptions TYPE ty_seocompotx_tt
+          it_descriptions TYPE lif_defs=>ty_seocompotx_tt
         RAISING
           lcx_exception,
       then_shuld_update_descriptions
         IMPORTING
-          it_descriptions TYPE ty_seocompotx_tt,
+          it_descriptions TYPE lif_defs=>ty_seocompotx_tt,
       then_it_should_add_activation,
       given_documentation_in_xml_as
         IMPORTING
@@ -342,7 +343,7 @@ CLASS ltcl_class_deserialization IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     CREATE OBJECT mo_xml_out.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zcl_class'.
@@ -384,7 +385,7 @@ CLASS ltcl_class_deserialization IMPLEMENTATION.
   METHOD should_update_descriptions.
     DATA:
       ls_description  TYPE seocompotx,
-      lt_descriptions TYPE ty_seocompotx_tt.
+      lt_descriptions TYPE lif_defs=>ty_seocompotx_tt.
 
     given_a_class_properties( ).
 
@@ -461,7 +462,7 @@ CLASS ltcl_class_deserialization IMPLEMENTATION.
 
   METHOD insert_text_pool.
     DATA: lt_pool_external TYPE textpool_table,
-          ls_pool_external TYPE ty_tpool.
+          ls_pool_external TYPE lif_defs=>ty_tpool.
     ls_pool_external-id = 'ID'.
     ls_pool_external-key = 'KEY'.
     APPEND ls_pool_external TO lt_pool_external.
@@ -485,7 +486,7 @@ CLASS ltcl_class_deserialization IMPLEMENTATION.
 
   METHOD create_stor_from_xml.
     DATA:
-      lt_sotr TYPE ty_sotr_tt,
+      lt_sotr TYPE lif_defs=>ty_sotr_tt,
       ls_sotr LIKE LINE OF lt_sotr.
 
     given_a_class_properties( ).
@@ -544,7 +545,7 @@ CLASS ltcl_interface_deserialization IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     CREATE OBJECT mo_xml_out.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zif_interface'.
@@ -569,7 +570,7 @@ CLASS ltcl_interface_deserialization IMPLEMENTATION.
   METHOD update_descriptions.
     DATA:
       ls_description  TYPE seocompotx,
-      lt_descriptions TYPE ty_seocompotx_tt.
+      lt_descriptions TYPE lif_defs=>ty_seocompotx_tt.
 
     given_an_interface_properties( ).
 
@@ -648,7 +649,7 @@ CLASS ltcl_class_changed IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     CREATE OBJECT mo_xml_out.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zcl_class'.
@@ -695,7 +696,7 @@ CLASS ltcl_interface_changed IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     CREATE OBJECT mo_xml_out.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zif_interface'.
@@ -743,7 +744,7 @@ CLASS ltcl_exists_test IMPLEMENTATION.
   METHOD setup.
     CREATE OBJECT mo_spy_oo_object_functions.
     me->mo_spy_oo_object_functions->mv_exists = abap_true.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
   ENDMETHOD.
 
   METHOD class_exists.
@@ -809,7 +810,7 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     me->mo_spy_oo_object_functions->mv_exists = abap_true.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zcl_class'.
@@ -824,7 +825,7 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD serialize_abap.
-    DATA lt_abap_source TYPE ty_string_tt.
+    DATA lt_abap_source TYPE lif_defs=>ty_string_tt.
 
     APPEND 'a_source_line' TO  me->mo_spy_oo_object_functions->mt_source.
 
@@ -839,7 +840,7 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD serialize_local_definitions.
-    DATA lt_abap_source TYPE ty_string_tt.
+    DATA lt_abap_source TYPE lif_defs=>ty_string_tt.
 
     APPEND 'a_local_definition' TO  me->mo_spy_oo_object_functions->mt_local_definitions.
 
@@ -855,7 +856,7 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD serialize_local_implementation.
-    DATA lt_abap_source TYPE ty_string_tt.
+    DATA lt_abap_source TYPE lif_defs=>ty_string_tt.
 
     APPEND 'a_local_implementation' TO  me->mo_spy_oo_object_functions->mt_local_implementations.
 
@@ -871,7 +872,7 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD serialize_local_macros.
-    DATA lt_abap_source TYPE ty_string_tt.
+    DATA lt_abap_source TYPE lif_defs=>ty_string_tt.
     APPEND 'a_local_macro' TO  me->mo_spy_oo_object_functions->mt_local_macros.
 
     mo_oo_object->serialize( mo_xml_out ).
@@ -886,7 +887,7 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD serialize_test_classes.
-    DATA lt_abap_source TYPE ty_string_tt.
+    DATA lt_abap_source TYPE lif_defs=>ty_string_tt.
     APPEND 'a_local_test' TO  me->mo_spy_oo_object_functions->mt_local_test_classes.
 
     mo_oo_object->serialize( mo_xml_out ).
@@ -999,8 +1000,8 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
 
   METHOD read_sotr_if_exception_class.
     DATA:
-      lt_sotr        TYPE ty_sotr_tt,
-      lt_actual_sotr TYPE ty_sotr_tt,
+      lt_sotr        TYPE lif_defs=>ty_sotr_tt,
+      lt_actual_sotr TYPE lif_defs=>ty_sotr_tt,
       ls_sotr        LIKE LINE OF lt_sotr.
 
     me->mo_spy_oo_object_functions->ms_class_properties-category = seoc_category_exception.
@@ -1028,7 +1029,7 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
 
   METHOD do_not_read_sotr_regular_class.
     DATA:
-      lt_actual_sotr TYPE ty_sotr_tt.
+      lt_actual_sotr TYPE lif_defs=>ty_sotr_tt.
 
     CLEAR: me->mo_spy_oo_object_functions->ms_class_properties-category.
 
@@ -1075,9 +1076,9 @@ CLASS ltcl_serialize_class IMPLEMENTATION.
 
   METHOD should_serialize_descriptions.
     DATA:
-      lt_descriptions        TYPE ty_seocompotx_tt,
-      lt_actual_descriptions TYPE ty_seocompotx_tt,
-      ls_description         TYPE LINE OF ty_seocompotx_tt.
+      lt_descriptions        TYPE lif_defs=>ty_seocompotx_tt,
+      lt_actual_descriptions TYPE lif_defs=>ty_seocompotx_tt,
+      ls_description         TYPE LINE OF lif_defs=>ty_seocompotx_tt.
 
     ls_description-clsname = 'class'.
     APPEND ls_description TO lt_descriptions.
@@ -1126,7 +1127,7 @@ CLASS ltcl_serialize_interface IMPLEMENTATION.
     CREATE OBJECT mo_fake_object_files.
     CREATE OBJECT mo_spy_oo_object_functions.
     me->mo_spy_oo_object_functions->mv_exists = abap_true.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
 
     ms_item-devclass = 'package_name'.
     ms_item-obj_name = 'zif_interface'.
@@ -1141,7 +1142,7 @@ CLASS ltcl_serialize_interface IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD serialize_abap.
-    DATA lt_abap_source TYPE ty_string_tt.
+    DATA lt_abap_source TYPE lif_defs=>ty_string_tt.
 
     APPEND 'a_source_line' TO  me->mo_spy_oo_object_functions->mt_source.
 
@@ -1227,9 +1228,9 @@ CLASS ltcl_serialize_interface IMPLEMENTATION.
 
   METHOD should_serialize_descriptions.
     DATA:
-      lt_descriptions        TYPE ty_seocompotx_tt,
-      lt_actual_descriptions TYPE ty_seocompotx_tt,
-      ls_description         TYPE LINE OF ty_seocompotx_tt.
+      lt_descriptions        TYPE lif_defs=>ty_seocompotx_tt,
+      lt_actual_descriptions TYPE lif_defs=>ty_seocompotx_tt,
+      ls_description         TYPE LINE OF lif_defs=>ty_seocompotx_tt.
 
     ls_description-clsname = 'class'.
     APPEND ls_description TO lt_descriptions.
@@ -1272,7 +1273,7 @@ CLASS ltcl_delete_oo_test IMPLEMENTATION.
   METHOD setup.
     CREATE OBJECT mo_spy_oo_object_functions.
     me->mo_spy_oo_object_functions->mv_exists = abap_true.
-    lth_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
+    ltcl_oo_factory_injector=>inject( mo_spy_oo_object_functions ).
   ENDMETHOD.
 
   METHOD class_delete.
diff --git a/src/zabapgit_unit_test_transport.prog.abap b/src/zabapgit_unit_test_transport.prog.abap
index e5bff13a5..2947c5a36 100644
--- a/src/zabapgit_unit_test_transport.prog.abap
+++ b/src/zabapgit_unit_test_transport.prog.abap
@@ -34,12 +34,12 @@ CLASS ltcl_transport_objects DEFINITION FOR TESTING.
                   iv_filename          TYPE string
                   iv_path              TYPE string
                   iv_data              TYPE string
-        RETURNING VALUE(rs_local_file) TYPE ty_file_item,
+        RETURNING VALUE(rs_local_file) TYPE lif_defs=>ty_file_item,
       when_staging
         RAISING lcx_exception,
       then_file_should_be_added
         IMPORTING
-          is_local_file TYPE ty_file_item,
+          is_local_file TYPE lif_defs=>ty_file_item,
       then_it_should_raise_exception
         IMPORTING
           with_text TYPE string,
@@ -50,8 +50,8 @@ CLASS ltcl_transport_objects DEFINITION FOR TESTING.
 
     DATA: mo_transport_objects TYPE REF TO lcl_transport_objects,
           mt_transport_objects TYPE scts_tadir,
-          mt_object_statuses   TYPE ty_results_tt,
-          ms_stage_objects     TYPE ty_stage_files,
+          mt_object_statuses   TYPE lif_defs=>ty_results_tt,
+          ms_stage_objects     TYPE lif_defs=>ty_stage_files,
           mo_stage             TYPE REF TO lcl_stage.
 ENDCLASS.
 
@@ -63,7 +63,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
         iv_branch_sha1 = 'Branch_SH1'.
   ENDMETHOD.
   METHOD add_new_to_local_files.
-    DATA ls_local_file TYPE ty_file_item.
+    DATA ls_local_file TYPE lif_defs=>ty_file_item.
 
     given_the_transport_object(
       iv_obj_name   = 'CL_FOO'
@@ -73,7 +73,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
       iv_filename   = 'CL_FOO.abap'
-      iv_lstate     = gc_state-added ).
+      iv_lstate     = lif_defs=>gc_state-added ).
 
     ls_local_file = given_the_local_file(
       iv_obj_name = 'CL_FOO'
@@ -87,7 +87,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
     then_file_should_be_added( ls_local_file ).
   ENDMETHOD.
   METHOD modified_to_new_local_files.
-    DATA ls_local_file TYPE ty_file_item.
+    DATA ls_local_file TYPE lif_defs=>ty_file_item.
     given_the_transport_object(
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS' ).
@@ -96,7 +96,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
       iv_filename   = 'CL_FOO.abap'
-      iv_lstate     = gc_state-modified ).
+      iv_lstate     = lif_defs=>gc_state-modified ).
 
     ls_local_file = given_the_local_file(
       iv_obj_name = 'CL_FOO'
@@ -111,8 +111,8 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
   ENDMETHOD.
   METHOD should_add_all_local_files.
     "Not only .abap, but also .xml and other includes
-    DATA ls_abap_local_file TYPE ty_file_item.
-    DATA ls_xml_local_file  TYPE ty_file_item.
+    DATA ls_abap_local_file TYPE lif_defs=>ty_file_item.
+    DATA ls_xml_local_file  TYPE lif_defs=>ty_file_item.
 
     given_the_transport_object(
       iv_obj_name   = 'CL_FOO'
@@ -122,13 +122,13 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
       iv_filename   = 'CL_FOO.abap'
-      iv_lstate     = gc_state-modified ).
+      iv_lstate     = lif_defs=>gc_state-modified ).
 
     given_the_object_status(
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
       iv_filename   = 'CL_FOO.xml'
-      iv_lstate     = gc_state-modified ).
+      iv_lstate     = lif_defs=>gc_state-modified ).
 
     ls_abap_local_file = given_the_local_file(
       iv_obj_name = 'CL_FOO'
@@ -157,7 +157,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
     given_the_object_status(
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
-      iv_lstate     = gc_state-added ).
+      iv_lstate     = lif_defs=>gc_state-added ).
 
     then_it_should_raise_exception(
       with_text = 'Object CL_A_CLASS_NOT_IN_REPO not found in the local repository files' ).
@@ -172,7 +172,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
     given_the_object_status(
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
-      iv_lstate     = gc_state-added ).
+      iv_lstate     = lif_defs=>gc_state-added ).
 
     given_the_local_file(
       iv_obj_name = 'CL_ANOTHER_LOCAL_FILE'
@@ -194,7 +194,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
     given_the_object_status(
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
-      iv_lstate     = gc_state-added ).
+      iv_lstate     = lif_defs=>gc_state-added ).
 
     then_it_should_raise_exception(
       with_text = 'Object CL_FOO should be added/modified, but has deletion flag in transport' ).
@@ -209,7 +209,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
     given_the_object_status(
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
-      iv_lstate     = gc_state-modified ).
+      iv_lstate     = lif_defs=>gc_state-modified ).
 
     then_it_should_raise_exception(
       with_text = 'Object CL_FOO should be added/modified, but has deletion flag in transport' ).
@@ -225,7 +225,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_obj_type   = 'CLAS'
       iv_filename   = 'CL_FOO.abap'
       iv_path       = '/a_path'
-      iv_lstate     = gc_state-deleted ).
+      iv_lstate     = lif_defs=>gc_state-deleted ).
 
     when_staging( ).
 
@@ -246,14 +246,14 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_obj_type   = 'CLAS'
       iv_filename   = 'CL_FOO.abap'
       iv_path       = '/a_path'
-      iv_lstate     = gc_state-deleted ).
+      iv_lstate     = lif_defs=>gc_state-deleted ).
 
     given_the_object_status(
       iv_obj_name   = 'CL_FOO'
       iv_obj_type   = 'CLAS'
       iv_filename   = 'CL_FOO.xml'
       iv_path       = '/a_path'
-      iv_lstate     = gc_state-deleted ).
+      iv_lstate     = lif_defs=>gc_state-deleted ).
 
     when_staging( ).
 
@@ -277,7 +277,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_obj_type   = 'CLAS'
       iv_filename   = 'CL_FOO.abap'
       iv_path       = '/a_path'
-      iv_lstate     = gc_state-deleted ).
+      iv_lstate     = lif_defs=>gc_state-deleted ).
 
     then_it_should_raise_exception(
          with_text = 'Object CL_FOO should be removed, but has NO deletion flag in transport' ).
@@ -292,7 +292,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD given_the_object_status.
-    DATA ls_object_status TYPE ty_result.
+    DATA ls_object_status TYPE lif_defs=>ty_result.
     ls_object_status-obj_name = iv_obj_name.
     ls_object_status-obj_type = iv_obj_type.
     ls_object_status-filename = iv_filename.
diff --git a/src/zabapgit_util.prog.abap b/src/zabapgit_util.prog.abap
index 6f3b9a3e2..a1e56414e 100644
--- a/src/zabapgit_util.prog.abap
+++ b/src/zabapgit_util.prog.abap
@@ -2,6 +2,35 @@
 *&  Include           ZABAPGIT_UTIL
 *&---------------------------------------------------------------------*
 
+CLASS lcl_state DEFINITION.
+
+  PUBLIC SECTION.
+
+    CLASS-METHODS:
+      reduce
+        IMPORTING
+          iv_cur  TYPE char1
+        CHANGING
+          cv_prev TYPE char1.
+
+ENDCLASS.
+
+CLASS lcl_state IMPLEMENTATION.
+
+  METHOD reduce.
+
+    IF cv_prev = iv_cur OR iv_cur IS INITIAL.
+      RETURN. " No change
+    ELSEIF cv_prev IS INITIAL.
+      cv_prev = iv_cur.
+    ELSE.
+      cv_prev = lif_defs=>gc_state-mixed.
+    ENDIF.
+
+  ENDMETHOD.
+
+ENDCLASS.
+
 *----------------------------------------------------------------------*
 *       CLASS lcl_time DEFINITION
 *----------------------------------------------------------------------*
@@ -89,7 +118,7 @@ CLASS lcl_convert DEFINITION FINAL.
 
     CLASS-METHODS x_to_bitbyte
       IMPORTING iv_x              TYPE x
-      RETURNING VALUE(rv_bitbyte) TYPE ty_bitbyte.
+      RETURNING VALUE(rv_bitbyte) TYPE lif_defs=>ty_bitbyte.
 
     CLASS-METHODS string_to_xstring_utf8
       IMPORTING iv_string         TYPE string
@@ -109,6 +138,10 @@ CLASS lcl_convert DEFINITION FINAL.
                 iv_length         TYPE i
       RETURNING VALUE(rv_xstring) TYPE xstring.
 
+    CLASS-METHODS split_string
+      IMPORTING iv_string       TYPE string
+      RETURNING VALUE(rt_lines) TYPE string_table.
+
 ENDCLASS.                    "lcl_convert DEFINITION
 
 *----------------------------------------------------------------------*
@@ -218,6 +251,19 @@ CLASS lcl_convert IMPLEMENTATION.
 
   ENDMETHOD.                    "x_to_bitbyte
 
+  METHOD split_string.
+
+    FIND FIRST OCCURRENCE OF cl_abap_char_utilities=>cr_lf IN iv_string.
+
+    " Convert string into table depending on separator type CR_LF vs. LF
+    IF sy-subrc = 0.
+      SPLIT iv_string AT cl_abap_char_utilities=>cr_lf INTO TABLE rt_lines.
+    ELSE.
+      SPLIT iv_string AT cl_abap_char_utilities=>newline INTO TABLE rt_lines.
+    ENDIF.
+
+  ENDMETHOD.                    "split_string
+
 ENDCLASS.                    "lcl_convert IMPLEMENTATION
 
 *----------------------------------------------------------------------*
@@ -235,14 +281,14 @@ CLASS lcl_hash DEFINITION FINAL.
       RETURNING VALUE(rv_checksum) TYPE ty_adler32.
 
     CLASS-METHODS sha1
-      IMPORTING iv_type        TYPE ty_type
+      IMPORTING iv_type        TYPE lif_defs=>ty_type
                 iv_data        TYPE xstring
-      RETURNING VALUE(rv_sha1) TYPE ty_sha1
+      RETURNING VALUE(rv_sha1) TYPE lif_defs=>ty_sha1
       RAISING   lcx_exception.
 
     CLASS-METHODS sha1_raw
       IMPORTING iv_data        TYPE xstring
-      RETURNING VALUE(rv_sha1) TYPE ty_sha1
+      RETURNING VALUE(rv_sha1) TYPE lif_defs=>ty_sha1
       RAISING   lcx_exception.
 
 ENDCLASS.                    "lcl_hash DEFINITION
@@ -371,12 +417,10 @@ CLASS lcl_path IMPLEMENTATION.
   METHOD split_file_location.
 
     DATA: lv_cnt TYPE i,
-          lv_off TYPE i,
           lv_len TYPE i.
 
     FIND FIRST OCCURRENCE OF REGEX '^/(.*/)?' IN iv_fullpath
       MATCH COUNT lv_cnt
-      MATCH OFFSET lv_off
       MATCH LENGTH lv_len.
 
     IF lv_cnt > 0.
@@ -408,8 +452,8 @@ CLASS lcl_path IMPLEMENTATION.
 
   METHOD change_dir.
 
-    DATA lv_last TYPE i.
-    DATA lv_temp TYPE string.
+    DATA: lv_last TYPE i,
+          lv_temp TYPE string.
 
     lv_last = strlen( iv_cur_dir ) - 1.
 
@@ -513,7 +557,7 @@ CLASS lcl_url IMPLEMENTATION.
 
   METHOD path_name.
 
-    DATA: lv_host TYPE string.
+    DATA: lv_host TYPE string ##NEEDED.
 
     FIND REGEX '(.*://[^/]*)(.*)' IN iv_repo
       SUBMATCHES lv_host rv_path_name.
@@ -563,7 +607,7 @@ CLASS lcl_diff DEFINITION FINAL.
              update TYPE i,
            END OF ty_count.
 
-    DATA mt_beacons TYPE ty_string_tt READ-ONLY.
+    DATA mt_beacons TYPE lif_defs=>ty_string_tt READ-ONLY.
 
 * assumes data is UTF8 based with newlines
 * only works with lines up to 255 characters
@@ -628,8 +672,8 @@ CLASS lcl_diff IMPLEMENTATION.
     lv_new = lcl_convert=>xstring_to_string_utf8( iv_new ).
     lv_old = lcl_convert=>xstring_to_string_utf8( iv_old ).
 
-    SPLIT lv_new AT gc_newline INTO TABLE et_new.
-    SPLIT lv_old AT gc_newline INTO TABLE et_old.
+    SPLIT lv_new AT lif_defs=>gc_newline INTO TABLE et_new.
+    SPLIT lv_old AT lif_defs=>gc_newline INTO TABLE et_old.
 
   ENDMETHOD.                    "unpack
 
@@ -1133,9 +1177,9 @@ CLASS lcl_log IMPLEMENTATION.
 
 
     READ TABLE mt_log INDEX 1 INTO ls_log1.
-    READ TABLE mt_log INDEX 1 INTO ls_log2.
-    READ TABLE mt_log INDEX 1 INTO ls_log3.
-    READ TABLE mt_log INDEX 1 INTO ls_log4.
+    READ TABLE mt_log INDEX 2 INTO ls_log2.
+    READ TABLE mt_log INDEX 3 INTO ls_log3.
+    READ TABLE mt_log INDEX 4 INTO ls_log4.
 
     CALL FUNCTION 'POPUP_TO_INFORM'
       EXPORTING
diff --git a/src/zabapgit_view_repo.prog.abap b/src/zabapgit_view_repo.prog.abap
index c637a0506..c643522f5 100644
--- a/src/zabapgit_view_repo.prog.abap
+++ b/src/zabapgit_view_repo.prog.abap
@@ -2,7 +2,7 @@
 *&  Include           ZABAPGIT_VIEW_REPO
 *&---------------------------------------------------------------------*
 
-CLASS lcl_gui_view_repo_content DEFINITION FINAL.
+CLASS lcl_gui_view_repo DEFINITION FINAL.
   PUBLIC SECTION.
     INTERFACES lif_gui_page.
     ALIASES render FOR lif_gui_page~render.
@@ -36,28 +36,28 @@ CLASS lcl_gui_view_repo_content DEFINITION FINAL.
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html
         RAISING   lcx_exception,
       build_head_menu
-        IMPORTING iv_lstate      TYPE char1
-                  iv_rstate      TYPE char1
+        IMPORTING iv_lstate         TYPE char1
+                  iv_rstate         TYPE char1
         RETURNING VALUE(ro_toolbar) TYPE REF TO lcl_html_toolbar
         RAISING   lcx_exception,
       build_grid_menu
         RETURNING VALUE(ro_toolbar) TYPE REF TO lcl_html_toolbar
         RAISING   lcx_exception,
       render_item
-        IMPORTING is_item        TYPE lcl_repo_content_browser=>ty_repo_item
+        IMPORTING is_item        TYPE lcl_repo_content_list=>ty_repo_item
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html
         RAISING   lcx_exception,
       render_item_files
-        IMPORTING is_item        TYPE lcl_repo_content_browser=>ty_repo_item
+        IMPORTING is_item        TYPE lcl_repo_content_list=>ty_repo_item
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html,
       render_item_command
-        IMPORTING is_item        TYPE lcl_repo_content_browser=>ty_repo_item
+        IMPORTING is_item        TYPE lcl_repo_content_list=>ty_repo_item
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html,
       get_item_class
-        IMPORTING is_item        TYPE lcl_repo_content_browser=>ty_repo_item
+        IMPORTING is_item        TYPE lcl_repo_content_list=>ty_repo_item
         RETURNING VALUE(rv_html) TYPE string,
       get_item_icon
-        IMPORTING is_item        TYPE lcl_repo_content_browser=>ty_repo_item
+        IMPORTING is_item        TYPE lcl_repo_content_list=>ty_repo_item
         RETURNING VALUE(rv_html) TYPE string,
       render_empty_package
         RETURNING VALUE(rv_html) TYPE string,
@@ -67,7 +67,7 @@ CLASS lcl_gui_view_repo_content DEFINITION FINAL.
 
     METHODS:
       build_obj_jump_link
-        IMPORTING is_item        TYPE lcl_repo_content_browser=>ty_repo_item
+        IMPORTING is_item        TYPE lcl_repo_content_list=>ty_repo_item
         RETURNING VALUE(rv_html) TYPE string,
       build_dir_jump_link
         IMPORTING iv_path        TYPE string
@@ -75,7 +75,7 @@ CLASS lcl_gui_view_repo_content DEFINITION FINAL.
 
 ENDCLASS. "lcl_gui_view_repo_content
 
-CLASS lcl_gui_view_repo_content IMPLEMENTATION.
+CLASS lcl_gui_view_repo IMPLEMENTATION.
 
   METHOD constructor.
 
@@ -102,29 +102,29 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
     CASE iv_action.
       WHEN c_actions-toggle_hide_files. " Toggle file diplay
         mv_hide_files   = lcl_app=>user( )->toggle_hide_files( ).
-        ev_state        = gc_event_state-re_render.
+        ev_state        = lif_defs=>gc_event_state-re_render.
       WHEN c_actions-change_dir.        " Change dir
         lv_path         = lcl_html_action_utils=>dir_decode( iv_getdata ).
         mv_cur_dir      = lcl_path=>change_dir( iv_cur_dir = mv_cur_dir iv_cd = lv_path ).
-        ev_state        = gc_event_state-re_render.
+        ev_state        = lif_defs=>gc_event_state-re_render.
       WHEN c_actions-toggle_folders.    " Toggle folder view
         mv_show_folders = boolc( mv_show_folders <> abap_true ).
         mv_cur_dir      = '/'. " Root
-        ev_state        = gc_event_state-re_render.
+        ev_state        = lif_defs=>gc_event_state-re_render.
       WHEN c_actions-toggle_changes.    " Toggle changes only view
         mv_changes_only = lcl_app=>user( )->toggle_changes_only( ).
-        ev_state        = gc_event_state-re_render.
+        ev_state        = lif_defs=>gc_event_state-re_render.
       WHEN c_actions-display_more.      " Increase MAX lines limit
         mv_max_lines    = mv_max_lines + mv_max_setting.
-        ev_state        = gc_event_state-re_render.
+        ev_state        = lif_defs=>gc_event_state-re_render.
     ENDCASE.
 
   ENDMETHOD. "lif_gui_page~on_event
 
   METHOD lif_gui_page~render.
 
-    DATA: lt_repo_items TYPE lcl_repo_content_browser=>tt_repo_items,
-          lo_browser    TYPE REF TO lcl_repo_content_browser,
+    DATA: lt_repo_items TYPE lcl_repo_content_list=>tt_repo_items,
+          lo_browser    TYPE REF TO lcl_repo_content_list,
           lx_error      TYPE REF TO lcx_exception,
           lv_lstate     TYPE char1,
           lv_rstate     TYPE char1,
@@ -151,8 +151,10 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
                                           iv_changes_only = mv_changes_only ).
 
         LOOP AT lt_repo_items ASSIGNING <ls_item>.
-          _reduce_state lv_lstate <ls_item>-lstate.
-          _reduce_state lv_rstate <ls_item>-rstate.
+          lcl_state=>reduce( EXPORTING iv_cur = <ls_item>-lstate
+                             CHANGING cv_prev = lv_lstate ).
+          lcl_state=>reduce( EXPORTING iv_cur = <ls_item>-rstate
+                             CHANGING cv_prev = lv_rstate ).
         ENDLOOP.
 
         ro_html->add( render_head_line( iv_lstate = lv_lstate
@@ -199,7 +201,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
           ro_html->add( |Only { lv_max_str } shown in list. Display {
             lcl_html=>a( iv_txt = lv_add_str iv_act = c_actions-display_more )
             } more. (Set in Advanced > {
-            lcl_html=>a( iv_txt = 'Settings' iv_act = gc_action-go_settings )
+            lcl_html=>a( iv_txt = 'Settings' iv_act = lif_defs=>gc_action-go_settings )
             } )| ).
           ro_html->add( '</div>' ).
         ENDIF.
@@ -263,8 +265,9 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
     DATA: lo_tb_advanced TYPE REF TO lcl_html_toolbar,
           lo_tb_branch   TYPE REF TO lcl_html_toolbar,
           lv_key         TYPE lcl_persistence_db=>ty_value,
-          lv_wp_opt      LIKE gc_html_opt-crossout,
-          lv_pull_opt    LIKE gc_html_opt-crossout.
+          lv_wp_opt      LIKE lif_defs=>gc_html_opt-crossout,
+          lv_crossout    LIKE lif_defs=>gc_html_opt-crossout,
+          lv_pull_opt    LIKE lif_defs=>gc_html_opt-crossout.
 
     CREATE OBJECT ro_toolbar.
     CREATE OBJECT lo_tb_branch.
@@ -273,71 +276,77 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
     lv_key = mo_repo->get_key( ).
 
     IF mo_repo->is_write_protected( ) = abap_true.
-      lv_wp_opt   = gc_html_opt-crossout.
-      lv_pull_opt = gc_html_opt-crossout.
+      lv_wp_opt   = lif_defs=>gc_html_opt-crossout.
+      lv_pull_opt = lif_defs=>gc_html_opt-crossout.
     ELSE.
-      lv_pull_opt = gc_html_opt-strong.
+      lv_pull_opt = lif_defs=>gc_html_opt-strong.
     ENDIF.
 
     " Build branch drop-down ========================
     IF mo_repo->is_offline( ) = abap_false. " Online ?
       lo_tb_branch->add( iv_txt = 'Overview'
-                         iv_act = |{ gc_action-go_branch_overview }?{ lv_key }| ).
+                         iv_act = |{ lif_defs=>gc_action-go_branch_overview }?{ lv_key }| ).
       lo_tb_branch->add( iv_txt = 'Switch'
-                         iv_act = |{ gc_action-git_branch_switch }?{ lv_key }|
+                         iv_act = |{ lif_defs=>gc_action-git_branch_switch }?{ lv_key }|
                          iv_opt = lv_wp_opt ).
       lo_tb_branch->add( iv_txt = 'Create'
-                         iv_act = |{ gc_action-git_branch_create }?{ lv_key }| ).
+                         iv_act = |{ lif_defs=>gc_action-git_branch_create }?{ lv_key }| ).
       lo_tb_branch->add( iv_txt = 'Delete'
-                         iv_act = |{ gc_action-git_branch_delete }?{ lv_key }| ).
+                         iv_act = |{ lif_defs=>gc_action-git_branch_delete }?{ lv_key }| ).
     ENDIF.
 
     " Build advanced drop-down ========================
     IF mo_repo->is_offline( ) = abap_false. " Online ?
       lo_tb_advanced->add( iv_txt = 'Reset local'
-                           iv_act = |{ gc_action-git_reset }?{ lv_key }|
+                           iv_act = |{ lif_defs=>gc_action-git_reset }?{ lv_key }|
                            iv_opt = lv_wp_opt ).
       lo_tb_advanced->add( iv_txt = 'Background mode'
-                           iv_act = |{ gc_action-go_background }?{ lv_key }| ).
+                           iv_act = |{ lif_defs=>gc_action-go_background }?{ lv_key }| ).
       lo_tb_advanced->add( iv_txt = 'Change remote'
-                           iv_act = |{ gc_action-repo_remote_change }?{ lv_key }| ).
+                           iv_act = |{ lif_defs=>gc_action-repo_remote_change }?{ lv_key }| ).
       lo_tb_advanced->add( iv_txt = 'Make off-line'
-                           iv_act = |{ gc_action-repo_remote_detach }?{ lv_key }| ).
+                           iv_act = |{ lif_defs=>gc_action-repo_remote_detach }?{ lv_key }| ).
       lo_tb_advanced->add( iv_txt = 'Force stage'
-                           iv_act = |{ gc_action-go_stage }?{ lv_key }| ).
+                           iv_act = |{ lif_defs=>gc_action-go_stage }?{ lv_key }| ).
       lo_tb_advanced->add( iv_txt = 'Transport to Branch'
-                           iv_act = |{ gc_action-repo_transport_to_branch }?{ lv_key }| ).
+                           iv_act = |{ lif_defs=>gc_action-repo_transport_to_branch }?{ lv_key }| ).
     ELSE.
       lo_tb_advanced->add( iv_txt = 'Make on-line'
-                           iv_act = |{ gc_action-repo_remote_attach }?{ lv_key }| ).
+                           iv_act = |{ lif_defs=>gc_action-repo_remote_attach }?{ lv_key }| ).
     ENDIF.
     lo_tb_advanced->add( iv_txt = 'Repo settings'
-                         iv_act = |{ gc_action-repo_settings }?{ lv_key }| ).
+                         iv_act = |{ lif_defs=>gc_action-repo_settings }?{ lv_key }| ).
     lo_tb_advanced->add( iv_txt = 'Update local checksums'
-                         iv_act = |{ gc_action-repo_refresh_checksums }?{ lv_key }| ).
+                         iv_act = |{ lif_defs=>gc_action-repo_refresh_checksums }?{ lv_key }| ).
     lo_tb_advanced->add( iv_txt = 'Remove'
-                         iv_act = |{ gc_action-repo_remove }?{ lv_key }| ).
+                         iv_act = |{ lif_defs=>gc_action-repo_remove }?{ lv_key }| ).
+
+    CLEAR lv_crossout.
+    IF mo_repo->is_write_protected( ) = abap_true
+        OR lcl_auth=>is_allowed( lif_auth=>gc_authorization-uninstall ) = abap_false.
+      lv_crossout = lif_defs=>gc_html_opt-crossout.
+    ENDIF.
     lo_tb_advanced->add( iv_txt = 'Uninstall'
-                         iv_act = |{ gc_action-repo_purge }?{ lv_key }|
-                         iv_opt = lv_wp_opt ).
+                         iv_act = |{ lif_defs=>gc_action-repo_purge }?{ lv_key }|
+                         iv_opt = lv_crossout ).
 
     " Build main toolbar ==============================
     IF mo_repo->is_offline( ) = abap_false. " Online ?
       TRY.
           IF iv_rstate IS NOT INITIAL. " Something new at remote
             ro_toolbar->add( iv_txt = 'Pull'
-                             iv_act = |{ gc_action-git_pull }?{ lv_key }|
+                             iv_act = |{ lif_defs=>gc_action-git_pull }?{ lv_key }|
                              iv_opt = lv_pull_opt ).
           ENDIF.
           IF iv_lstate IS NOT INITIAL. " Something new at local
             ro_toolbar->add( iv_txt = 'Stage'
-                             iv_act = |{ gc_action-go_stage }?{ lv_key }|
-                             iv_opt = gc_html_opt-strong ).
+                             iv_act = |{ lif_defs=>gc_action-go_stage }?{ lv_key }|
+                             iv_opt = lif_defs=>gc_html_opt-strong ).
           ENDIF.
           IF iv_rstate IS NOT INITIAL OR iv_lstate IS NOT INITIAL. " Any changes
             ro_toolbar->add( iv_txt = 'Show diff'
-                             iv_act = |{ gc_action-go_diff }?key={ lv_key }|
-                             iv_opt = gc_html_opt-strong ).
+                             iv_act = |{ lif_defs=>gc_action-go_diff }?key={ lv_key }|
+                             iv_opt = lif_defs=>gc_html_opt-strong ).
           ENDIF.
         CATCH lcx_exception ##NO_HANDLER.
           " authorization error or repository does not exist
@@ -347,17 +356,17 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
                        io_sub = lo_tb_branch ) ##NO_TEXT.
     ELSE.
       ro_toolbar->add( iv_txt = 'Import ZIP'
-                       iv_act = |{ gc_action-zip_import }?{ lv_key }|
-                       iv_opt = gc_html_opt-strong ).
+                       iv_act = |{ lif_defs=>gc_action-zip_import }?{ lv_key }|
+                       iv_opt = lif_defs=>gc_html_opt-strong ).
       ro_toolbar->add( iv_txt = 'Export ZIP'
-                       iv_act = |{ gc_action-zip_export }?{ lv_key }|
-                       iv_opt = gc_html_opt-strong ).
+                       iv_act = |{ lif_defs=>gc_action-zip_export }?{ lv_key }|
+                       iv_opt = lif_defs=>gc_html_opt-strong ).
     ENDIF.
 
     ro_toolbar->add( iv_txt = 'Advanced'
                      io_sub = lo_tb_advanced ) ##NO_TEXT.
     ro_toolbar->add( iv_txt = 'Refresh'
-                     iv_act = |{ gc_action-repo_refresh }?{ lv_key }| ).
+                     iv_act = |{ lif_defs=>gc_action-repo_refresh }?{ lv_key }| ).
     ro_toolbar->add( iv_txt = lcl_html=>icon( iv_name = 'settings/grey70' )
                      io_sub = build_grid_menu( ) ).
 
@@ -486,7 +495,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
 
         ro_html->add( '<div>' ).
         ro_html->add_a( iv_txt = |view diff ({ is_item-changes })|
-                        iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
+                        iv_act = |{ lif_defs=>gc_action-go_diff }?{ lv_difflink }| ).
         ro_html->add( lcl_gui_chunk_lib=>render_item_state( iv1 = is_item-lstate
                                                             iv2 = is_item-rstate ) ).
         ro_html->add( '</div>' ).
@@ -500,7 +509,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
               iv_key  = mo_repo->get_key( )
               ig_file = ls_file ).
             ro_html->add_a( iv_txt = 'view diff'
-                            iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
+                            iv_act = |{ lif_defs=>gc_action-go_diff }?{ lv_difflink }| ).
             ro_html->add( lcl_gui_chunk_lib=>render_item_state( iv1 = ls_file-lstate
                                                                 iv2 = ls_file-rstate ) ).
           ELSE.
@@ -559,7 +568,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
                                                     iv_obj_name = is_item-obj_name ).
 
     rv_html = lcl_html=>a( iv_txt = |{ is_item-obj_name }|
-                           iv_act = |{ gc_action-jump }?{ lv_encode }| ).
+                           iv_act = |{ lif_defs=>gc_action-jump }?{ lv_encode }| ).
 
   ENDMETHOD.  "build_obj_jump_link
 
diff --git a/src/zabapgit_view_tutorial.prog.abap b/src/zabapgit_view_tutorial.prog.abap
index a73ca6806..26aae5e7d 100644
--- a/src/zabapgit_view_tutorial.prog.abap
+++ b/src/zabapgit_view_tutorial.prog.abap
@@ -16,7 +16,7 @@ ENDCLASS.                       "lcl_gui_view_tutorial
 CLASS lcl_gui_view_tutorial IMPLEMENTATION.
 
   METHOD lif_gui_page~on_event.
-    ev_state = gc_event_state-not_handled.
+    ev_state = lif_defs=>gc_event_state-not_handled.
   ENDMETHOD.  " lif_gui_page~on_event.
 
   METHOD lif_gui_page~render.
@@ -33,58 +33,58 @@ CLASS lcl_gui_view_tutorial IMPLEMENTATION.
 
     CREATE OBJECT ro_html.
 
-    _add '<h1>Tutorial</h1>'.
-    _add '<hr>'.
+    ro_html->add( '<h1>Tutorial</h1>' ).
+    ro_html->add( '<hr>' ).
 
-    _add '<h2>Adding and cloning repos</h2>'.
-    _add '<p><ul>'.
+    ro_html->add( '<h2>Adding and cloning repos</h2>' ).
+    ro_html->add( '<p><ul>' ).
 
-    _add `<li>To clone a remote repo (e.g. from github) click `.
-    ro_html->add_a( iv_txt = '+ Clone' iv_act = gc_action-repo_clone ).
-    _add ' from the top menu. This will copy a remote repo to your system.</li>'.
+    ro_html->add( `<li>To clone a remote repo (e.g. from github) click ` ).
+    ro_html->add_a( iv_txt = '+ Clone' iv_act = lif_defs=>gc_action-repo_clone ).
+    ro_html->add( ' from the top menu. This will copy a remote repo to your system.</li>' ).
 
-    _add `<li>To add a local package as a repo click `.
-    ro_html->add_a( iv_txt = '+ Offline' iv_act = gc_action-repo_newoffline ).
-    _add ' from the top menu. This will track a repo which already exist in'.
-    _add ' the system with abapGit. You''ll be able to attach it to remote origin'.
-    _add ' or just serialize as a zip file</li>'.
+    ro_html->add( `<li>To add a local package as a repo click ` ).
+    ro_html->add_a( iv_txt = '+ Offline' iv_act = lif_defs=>gc_action-repo_newoffline ).
+    ro_html->add( ' from the top menu. This will track a repo which already exist in' ).
+    ro_html->add( ' the system with abapGit. You''ll be able to attach it to remote origin' ).
+    ro_html->add( ' or just serialize as a zip file</li>' ).
 
-    _add `<li>Go `.
-    ro_html->add_a( iv_txt = 'Explore' iv_act = gc_action-go_explore ).
-    _add ' to find projects using abapGit</li>'.
+    ro_html->add( `<li>Go ` ).
+    ro_html->add_a( iv_txt = 'Explore' iv_act = lif_defs=>gc_action-go_explore ).
+    ro_html->add( ' to find projects using abapGit</li>' ).
 
-    _add '</ul></p>'.
+    ro_html->add( '</ul></p>' ).
 
-    _add '<h2>Repository list and favorites</h2>'.
-    _add '<p><ul>'.
+    ro_html->add( '<h2>Repository list and favorites</h2>' ).
+    ro_html->add( '<p><ul>' ).
     ro_html->add( |<li>To choose a repo press {
                   lcl_html=>icon( 'three-bars/blue' ) } at the favorite bar.</li>| ).
     ro_html->add( |<li>To favorite a repo click {
                   lcl_html=>icon( 'star/darkgrey' ) } icon at repo toolbar.</li>| ).
-    _add '</ul></p>'.
+    ro_html->add( '</ul></p>' ).
 
-    _add '<h2>abapGit related repositories</h2>'.
-    _add '<p><ul>'.
-    _add '<li>'.
+    ro_html->add( '<h2>abapGit related repositories</h2>' ).
+    ro_html->add( '<p><ul>' ).
+    ro_html->add( '<li>' ).
     IF lcl_services_abapgit=>is_installed( ) = abap_true.
-      _add 'abapGit installed in package&nbsp;'.
-      _add lcl_services_abapgit=>c_package_abapgit.
+      ro_html->add( 'abapGit installed in package&nbsp;' ).
+      ro_html->add( lcl_services_abapgit=>c_package_abapgit ).
     ELSE.
-      ro_html->add_a( iv_txt = 'install abapGit repo' iv_act = gc_action-abapgit_install ).
-      _add ' - To keep abapGit up-to-date (or also to contribute) you need to'.
-      _add 'install it as a repository.'.
+      ro_html->add_a( iv_txt = 'install abapGit repo' iv_act = lif_defs=>gc_action-abapgit_install ).
+      ro_html->add( ' - To keep abapGit up-to-date (or also to contribute) you need to' ).
+      ro_html->add( 'install it as a repository.' ).
     ENDIF.
-    _add '</li>'.
-    _add '<li>'.
+    ro_html->add( '</li>' ).
+    ro_html->add( '<li>' ).
     IF lcl_services_abapgit=>is_installed_pi( ) = abap_true.
-      _add 'abapGit plugins installed in package&nbsp;'.
-      _add lcl_services_abapgit=>c_package_plugins.
+      ro_html->add( 'abapGit plugins installed in package&nbsp;' ).
+      ro_html->add( lcl_services_abapgit=>c_package_plugins ).
     ELSE.
-      ro_html->add_a( iv_txt = 'install abapGit plugins' iv_act = gc_action-abapgit_install_pi ).
-      _add ' - you can also install plugins to extend supported object types'.
+      ro_html->add_a( iv_txt = 'install abapGit plugins' iv_act = lif_defs=>gc_action-abapgit_install_pi ).
+      ro_html->add( ' - you can also install plugins to extend supported object types' ).
     ENDIF.
-    _add '</li>'.
-    _add '</ul></p>'.
+    ro_html->add( '</li>' ).
+    ro_html->add( '</ul></p>' ).
 
   ENDMETHOD. " render_content.
 
diff --git a/src/zabapgit_xml.prog.abap b/src/zabapgit_xml.prog.abap
index edcd55efc..5e68b5bf5 100644
--- a/src/zabapgit_xml.prog.abap
+++ b/src/zabapgit_xml.prog.abap
@@ -16,7 +16,7 @@ CLASS lcl_xml DEFINITION ABSTRACT.
   PROTECTED SECTION.
     DATA: mi_ixml     TYPE REF TO if_ixml,
           mi_xml_doc  TYPE REF TO if_ixml_document,
-          ms_metadata TYPE ty_metadata.
+          ms_metadata TYPE lif_defs=>ty_metadata.
 
     CONSTANTS: c_abapgit_tag             TYPE string VALUE 'abapGit' ##NO_TEXT,
                c_attr_version            TYPE string VALUE 'version' ##NO_TEXT,
@@ -81,7 +81,7 @@ CLASS lcl_xml IMPLEMENTATION.
     li_element = mi_xml_doc->find_from_name_ns( depth = 0 name = c_abapgit_tag ).
     li_version = li_element->if_ixml_node~get_attributes(
       )->get_named_item_ns( c_attr_version ) ##no_text.
-    IF li_version->get_value( ) <> gc_xml_version.
+    IF li_version->get_value( ) <> lif_defs=>gc_xml_version.
       display_xml_error( ).
     ENDIF.
 
@@ -96,7 +96,7 @@ CLASS lcl_xml IMPLEMENTATION.
     DATA: lv_version TYPE string.
 
 
-    lv_version = |abapGit version: { gc_abap_version }|.
+    lv_version = |abapGit version: { lif_defs=>gc_abap_version }|.
 
     CALL FUNCTION 'POPUP_TO_INFORM'
       EXPORTING
@@ -183,9 +183,11 @@ CLASS lcl_xml_output DEFINITION FINAL INHERITING FROM lcl_xml CREATE PUBLIC.
       add_xml
         IMPORTING iv_name TYPE clike
                   ii_xml  TYPE REF TO if_ixml_element,
+      build_asx_node
+        RETURNING VALUE(ri_element) TYPE REF TO if_ixml_element,
       render
         IMPORTING iv_normalize  TYPE sap_bool DEFAULT abap_true
-                  is_metadata   TYPE ty_metadata OPTIONAL
+                  is_metadata   TYPE lif_defs=>ty_metadata OPTIONAL
         RETURNING VALUE(rv_xml) TYPE string.
 
   PRIVATE SECTION.
@@ -215,6 +217,10 @@ CLASS lcl_xml_output IMPLEMENTATION.
 
     ASSERT NOT iv_name IS INITIAL.
 
+    IF ig_data IS INITIAL.
+      RETURN.
+    ENDIF.
+
     APPEND INITIAL LINE TO lt_stab ASSIGNING <ls_stab>.
     <ls_stab>-name = iv_name.
     GET REFERENCE OF ig_data INTO <ls_stab>-value.
@@ -256,17 +262,20 @@ CLASS lcl_xml_output IMPLEMENTATION.
     IF mi_raw IS INITIAL.
       li_abap ?= mi_xml_doc->get_root( )->get_first_child( ).
       mi_xml_doc->get_root( )->remove_child( li_abap ).
+      IF li_abap IS INITIAL.
+        li_abap = build_asx_node( ).
+      ENDIF.
     ELSE.
       li_abap = mi_raw.
     ENDIF.
 
     li_git = mi_xml_doc->create_element( c_abapgit_tag ).
-    li_git->set_attribute( name = c_attr_version value = gc_xml_version ). "#EC NOTEXT
+    li_git->set_attribute( name = c_attr_version value = lif_defs=>gc_xml_version ).
     IF NOT is_metadata IS INITIAL.
       li_git->set_attribute( name  = c_attr_serializer
-                             value = is_metadata-class ).   "#EC NOTEXT
+                             value = is_metadata-class ).
       li_git->set_attribute( name  = c_attr_serializer_version
-                             value = is_metadata-version ). "#EC NOTEXT
+                             value = is_metadata-version ).
     ENDIF.
     li_git->append_child( li_abap ).
     mi_xml_doc->get_root( )->append_child( li_git ).
@@ -275,6 +284,27 @@ CLASS lcl_xml_output IMPLEMENTATION.
 
   ENDMETHOD.                    "render
 
+  METHOD build_asx_node.
+
+    DATA: li_attr TYPE REF TO if_ixml_attribute.
+
+
+    ri_element = mi_xml_doc->create_element_ns(
+      name   = 'abap'
+      prefix = 'asx' ).
+
+    li_attr = mi_xml_doc->create_attribute_ns( 'version' ).
+    li_attr->if_ixml_node~set_value( '1.0' ).
+    ri_element->set_attribute_node_ns( li_attr ).
+
+    li_attr = mi_xml_doc->create_attribute_ns(
+      name   = 'asx'
+      prefix = 'xmlns' ).
+    li_attr->if_ixml_node~set_value( 'http://www.sap.com/abapxml' ).
+    ri_element->set_attribute_node_ns( li_attr ).
+
+  ENDMETHOD.
+
 ENDCLASS.                    "lcl_xml_output IMPLEMENTATION
 
 *----------------------------------------------------------------------*
@@ -297,7 +327,7 @@ CLASS lcl_xml_input DEFINITION FINAL INHERITING FROM lcl_xml CREATE PUBLIC.
         RETURNING VALUE(ri_raw) TYPE REF TO if_ixml_document,
 * todo, add read_xml to match add_xml in lcl_xml_output
       get_metadata
-        RETURNING VALUE(rs_metadata) TYPE ty_metadata.
+        RETURNING VALUE(rs_metadata) TYPE lif_defs=>ty_metadata.
 
   PRIVATE SECTION.
     METHODS: fix_xml.
diff --git a/src/zabapgit_zip.prog.abap b/src/zabapgit_zip.prog.abap
index 2bc4650c2..d1e2fb9cb 100644
--- a/src/zabapgit_zip.prog.abap
+++ b/src/zabapgit_zip.prog.abap
@@ -32,11 +32,11 @@ CLASS lcl_zip DEFINITION FINAL.
 
     CLASS-METHODS unzip_file
       IMPORTING iv_xstr         TYPE xstring
-      RETURNING VALUE(rt_files) TYPE ty_files_tt
+      RETURNING VALUE(rt_files) TYPE lif_defs=>ty_files_tt
       RAISING   lcx_exception.
 
     CLASS-METHODS normalize_path
-      CHANGING ct_files TYPE ty_files_tt
+      CHANGING ct_files TYPE lif_defs=>ty_files_tt
       RAISING  lcx_exception.
 
     CLASS-METHODS filename
@@ -51,14 +51,10 @@ CLASS lcl_zip DEFINITION FINAL.
       RAISING   lcx_exception.
 
     CLASS-METHODS encode_files
-      IMPORTING it_files       TYPE ty_files_item_tt
+      IMPORTING it_files       TYPE lif_defs=>ty_files_item_tt
       RETURNING VALUE(rv_xstr) TYPE xstring
       RAISING   lcx_exception.
 
-    CLASS-METHODS get_message
-      RETURNING VALUE(rv_message) TYPE string
-      RAISING   lcx_exception.
-
 ENDCLASS.                    "lcl_zip DEFINITION
 
 *----------------------------------------------------------------------*
@@ -68,46 +64,6 @@ ENDCLASS.                    "lcl_zip DEFINITION
 *----------------------------------------------------------------------*
 CLASS lcl_zip IMPLEMENTATION.
 
-  METHOD get_message.
-* method not in use?
-    ASSERT 0 = 1.
-
-*    DATA: lv_returncode TYPE c,
-*          lt_fields     TYPE TABLE OF sval.
-*
-*    FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
-*
-*
-*    APPEND INITIAL LINE TO lt_fields ASSIGNING <ls_field>.
-*    <ls_field>-tabname   = 'ABAPTXT255'.
-*    <ls_field>-fieldname = 'LINE'.
-*    <ls_field>-fieldtext = 'Commit message'.                "#EC NOTEXT
-*    <ls_field>-field_obl = abap_true.
-*
-*    CALL FUNCTION 'POPUP_GET_VALUES'
-*      EXPORTING
-*        no_value_check  = abap_true
-*        popup_title     = 'Enter commit message'            "#EC NOTEXT
-*      IMPORTING
-*        returncode      = lv_returncode
-*      TABLES
-*        fields          = lt_fields
-*      EXCEPTIONS
-*        error_in_fields = 1
-*        OTHERS          = 2.
-*    IF sy-subrc <> 0.
-*      lcx_exception=>raise( 'Error from POPUP_GET_VALUES' ).
-*    ENDIF.
-*    IF lv_returncode = 'A'.
-*      lcx_exception=>raise( 'cancelled' ).
-*    ENDIF.
-*
-*    READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
-*    ASSERT sy-subrc = 0.
-*    rv_message = <ls_field>-value.
-
-  ENDMETHOD.                    "get_message
-
   METHOD file_download.
 
     DATA: lt_rawdata  TYPE solix_tab,
@@ -386,7 +342,7 @@ CLASS lcl_zip IMPLEMENTATION.
 
       <ls_file>-data = lv_data.
 
-      <ls_file>-sha1 = lcl_hash=>sha1( iv_type = gc_type-blob
+      <ls_file>-sha1 = lcl_hash=>sha1( iv_type = lif_defs=>gc_type-blob
                                        iv_data = <ls_file>-data ).
 
     ENDLOOP.
@@ -398,9 +354,7 @@ CLASS lcl_zip IMPLEMENTATION.
   METHOD export.
 
     DATA: lo_log TYPE REF TO lcl_log,
-          lt_zip TYPE ty_files_item_tt.
-
-    FIELD-SYMBOLS: <ls_zip> LIKE LINE OF lt_zip.
+          lt_zip TYPE lif_defs=>ty_files_item_tt.
 
 
     CREATE OBJECT lo_log.
@@ -434,14 +388,17 @@ CLASS lcl_zip IMPLEMENTATION.
           ls_data TYPE lcl_persistence_repo=>ty_repo.
 
 
-    ls_data-package = lcl_popups=>popup_package_export( ).
+    ls_data-key = 'DUMMY'.
+    ls_data-dot_abapgit = lcl_dot_abapgit=>build_default( )->get_data( ).
+
+    lcl_popups=>popup_package_export(
+      IMPORTING
+        ev_package      = ls_data-package
+        ev_folder_logic = ls_data-dot_abapgit-folder_logic ).
     IF ls_data-package IS INITIAL.
       RAISE EXCEPTION TYPE lcx_cancel.
     ENDIF.
 
-    ls_data-key = 'DUMMY'.
-    ls_data-dot_abapgit = lcl_dot_abapgit=>build_default( )->get_data( ).
-
     CREATE OBJECT lo_repo
       EXPORTING
         is_data = ls_data.
@@ -453,12 +410,12 @@ CLASS lcl_zip IMPLEMENTATION.
   METHOD export_object.
 
     DATA: ls_tadir    TYPE tadir,
-          ls_item     TYPE ty_item,
+          ls_item     TYPE lif_defs=>ty_item,
           lv_folder   TYPE string,
           lv_fullpath TYPE string,
           lt_rawdata  TYPE solix_tab,
           lv_sep      TYPE c LENGTH 1,
-          lt_files    TYPE ty_files_tt.
+          lt_files    TYPE lif_defs=>ty_files_tt.
 
     STATICS: lv_prev TYPE string.
 
diff --git a/travis.sh b/travis.sh
index 352774ec0..94d6043f0 100755
--- a/travis.sh
+++ b/travis.sh
@@ -2,14 +2,13 @@
 abapmerge src/zabapgit.prog.abap > ../zabapgit.abap
 wc -l ../zabapgit.abap
 cd ..
-git clone https://github.com/larshp/abapGit.git -b gh-pages pages
+git clone https://github.com/larshp/abapGit.git -b build build
 ls -l
-cp zabapgit.abap pages/build/zabapgit$(date -u "+%Y-%m-%d-%H-%M-%S").txt
-cp zabapgit.abap pages/build/zabapgit.txt
-cd pages
+cp zabapgit.abap build/zabapgit.abap
+cd build
 git status
 git config --global user.email "builds@travis-ci.com"
 git config --global user.name "Travis CI"
-git add build/*.txt
+git add zabapgit.abap
 git commit -m "Travis build $TRAVIS_BUILD_NUMBER"
-git push -q https://$GITHUB_API_KEY@github.com/larshp/abapGit.git gh-pages > /dev/null 2>&1
+git push -q https://$GITHUB_API_KEY@github.com/larshp/abapGit.git build > /dev/null 2>&1