From c15c4b6f1e1f84e542b501c93ab0d17528daff4b Mon Sep 17 00:00:00 2001
From: Faili <321Faily@gmail.com>
Date: Fri, 12 Apr 2024 17:43:32 +0200
Subject: [PATCH] [TASK] rename ext and namespace (#90)

Co-authored-by: DDEV User <nobody@example.com>
---
 composer.json                                 |   2 +-
 composer.lock                                 | 113 +++++++++---------
 config/sites/portfolio/config.yaml            |   2 +-
 .../Classes/Controller/ProjectController.php  |   6 +-
 .../portfolio/Classes/Domain/Model/Link.php   |   2 +-
 .../Classes/Domain/Model/Project.php          |   2 +-
 .../Domain/Repository/ProjectRepository.php   |   2 +-
 .../Hooks/PageRenderer/WebfontHook.php        |  10 +-
 .../Classes/UserFunctions/SetCss.php          |   2 +-
 .../portfolio/Configuration/Form/Setup.yaml   |   8 +-
 .../portfolio/Configuration/Icons.php         |  12 +-
 .../portfolio/Configuration/Services.yaml     |   4 +-
 .../ContentElements/Plugin.typoscript         |   6 +-
 .../Base/Typoscript/Lib/Content.typoscript    |   6 +-
 .../Sets/Base/Typoscript/Page.typoscript      |  10 +-
 .../Configuration/Sets/Base/config.yaml       |   4 +-
 .../Configuration/Sets/Base/page.tsconfig     |   2 +-
 .../Configuration/Sets/Base/setup.typoscript  |  18 +--
 .../TCA/Overrides/tt_content.php              |  30 ++---
 .../tt_content_element_client_logos.php       |   6 +-
 .../tt_content_element_introduction_card.php  |   4 +-
 .../tt_content_element_portfolio_projects.php |   4 +-
 .../tt_content_element_project_teaser.php     |   4 +-
 .../Overrides/tt_content_element_resume.php   |  10 +-
 .../Overrides/tt_content_element_services.php |   6 +-
 .../tt_content_element_skill_display.php      |  10 +-
 .../tx_portfolio_additional_resume_item.php   |  14 +--
 .../TCA/tx_portfolio_client_logo.php          |   8 +-
 .../TCA/tx_portfolio_domain_model_link.php    |   8 +-
 .../TCA/tx_portfolio_domain_model_project.php |  16 +--
 .../TCA/tx_portfolio_resume_item.php          |  14 +--
 .../TCA/tx_portfolio_service.php              |   8 +-
 .../Configuration/TCA/tx_portfolio_skill.php  |   8 +-
 .../Stylesheet/abstracts/_variables.scss      |  26 ++--
 .../Private/Language/de.locallang_db.xlf      |   2 +-
 .../Private/Language/de.locallang_form.xlf    |   2 +-
 .../Private/Language/locallang_db.xlf         |   2 +-
 .../Private/Language/locallang_form.xlf       |   2 +-
 local_packages/portfolio/composer.json        |   9 +-
 local_packages/portfolio/ext_emconf.php       |   8 +-
 local_packages/portfolio/ext_localconf.php    |   8 +-
 local_packages/portfolio/package.json         |   2 +-
 42 files changed, 207 insertions(+), 215 deletions(-)

diff --git a/composer.json b/composer.json
index 03f8b1c..56dd5da 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.2",
-        "surfcamp/portfolio": "dev-main",
+        "friendsoftypo3/theme-portfolio": "dev-main",
         "typo3/cms-backend": "dev-main",
         "typo3/cms-belog": "dev-main",
         "typo3/cms-beuser": "dev-main",
diff --git a/composer.lock b/composer.lock
index 24d84c5..f0bb319 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "58f2610ef2b5e1d4f166b4588934074f",
+    "content-hash": "519e144f08c9d6f757fb1e08e8f7c8be",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -813,6 +813,48 @@
             },
             "time": "2023-12-01T16:26:39+00:00"
         },
+        {
+            "name": "friendsoftypo3/theme-portfolio",
+            "version": "dev-main",
+            "dist": {
+                "type": "path",
+                "url": "local_packages/portfolio",
+                "reference": "50638199742e28a25833bf42468ccc08a6044480"
+            },
+            "require": {
+                "php": ">=8.2.0",
+                "typo3/cms-backend": "dev-main",
+                "typo3/cms-core": "dev-main",
+                "typo3/cms-frontend": "dev-main"
+            },
+            "require-dev": {
+                "roave/security-advisories": "dev-master"
+            },
+            "type": "typo3-cms-extension",
+            "extra": {
+                "typo3/cms": {
+                    "extension-key": "theme_portfolio"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "FriendsOfTYPO3\\ThemePortfolio\\": "Classes"
+                }
+            },
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "fpachowsky",
+                    "email": "f.pachowsky@googlemail.com"
+                }
+            ],
+            "description": "TYPO3 theme for a portfolio website",
+            "transport-options": {
+                "relative": true
+            }
+        },
         {
             "name": "graham-campbell/result-type",
             "version": "v1.1.2",
@@ -2254,49 +2296,6 @@
             },
             "time": "2019-03-08T08:55:37+00:00"
         },
-        {
-            "name": "surfcamp/portfolio",
-            "version": "dev-main",
-            "dist": {
-                "type": "path",
-                "url": "local_packages/portfolio",
-                "reference": "fceab323645b8d3c4f172120fe83c430afd7cde8"
-            },
-            "require": {
-                "php": ">=8.2.0",
-                "typo3/cms-backend": "dev-main",
-                "typo3/cms-core": "dev-main",
-                "typo3/cms-frontend": "dev-main"
-            },
-            "require-dev": {
-                "roave/security-advisories": "dev-master"
-            },
-            "type": "typo3-cms-extension",
-            "extra": {
-                "typo3/cms": {
-                    "extension-key": "portfolio"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Surfcamp\\Portfolio\\": "Classes"
-                }
-            },
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "fpachowsky",
-                    "email": "f.pachowsky@googlemail.com"
-                }
-            ],
-            "description": "TYPO3 set for a portfolio website",
-            "homepage": "https://team2.surfcamp.typo3.com",
-            "transport-options": {
-                "relative": true
-            }
-        },
         {
             "name": "symfony/cache",
             "version": "v7.0.6",
@@ -5595,12 +5594,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/dashboard.git",
-                "reference": "b1f11a5b028148c748009d3edc949f39e21e0a4a"
+                "reference": "411a82221901c4b9bf7fc4424051da763bfd88c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/dashboard/zipball/b1f11a5b028148c748009d3edc949f39e21e0a4a",
-                "reference": "b1f11a5b028148c748009d3edc949f39e21e0a4a",
+                "url": "https://api.github.com/repos/TYPO3-CMS/dashboard/zipball/411a82221901c4b9bf7fc4424051da763bfd88c5",
+                "reference": "411a82221901c4b9bf7fc4424051da763bfd88c5",
                 "shasum": ""
             },
             "require": {
@@ -5651,7 +5650,7 @@
                 "issues": "https://forge.typo3.org",
                 "source": "https://github.com/typo3/typo3"
             },
-            "time": "2024-04-04T05:03:05+00:00"
+            "time": "2024-04-12T13:08:26+00:00"
         },
         {
             "name": "typo3/cms-extbase",
@@ -5659,12 +5658,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/extbase.git",
-                "reference": "b303eeab277f10305c1e3d03b2c64086b49b6e0e"
+                "reference": "685b81f2e9b24677331671254d21d1ab3d16f037"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/extbase/zipball/b303eeab277f10305c1e3d03b2c64086b49b6e0e",
-                "reference": "b303eeab277f10305c1e3d03b2c64086b49b6e0e",
+                "url": "https://api.github.com/repos/TYPO3-CMS/extbase/zipball/685b81f2e9b24677331671254d21d1ab3d16f037",
+                "reference": "685b81f2e9b24677331671254d21d1ab3d16f037",
                 "shasum": ""
             },
             "require": {
@@ -5722,7 +5721,7 @@
                 "issues": "https://forge.typo3.org",
                 "source": "https://github.com/typo3/typo3"
             },
-            "time": "2024-04-07T05:58:26+00:00"
+            "time": "2024-04-12T11:00:50+00:00"
         },
         {
             "name": "typo3/cms-extensionmanager",
@@ -6041,12 +6040,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/frontend.git",
-                "reference": "8c9f49b2c1ce1f57793f05dab3f4db2433074201"
+                "reference": "6061e601ae18810f232dcbb7e91c0ec3e5166aa0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/frontend/zipball/8c9f49b2c1ce1f57793f05dab3f4db2433074201",
-                "reference": "8c9f49b2c1ce1f57793f05dab3f4db2433074201",
+                "url": "https://api.github.com/repos/TYPO3-CMS/frontend/zipball/6061e601ae18810f232dcbb7e91c0ec3e5166aa0",
+                "reference": "6061e601ae18810f232dcbb7e91c0ec3e5166aa0",
                 "shasum": ""
             },
             "require": {
@@ -6099,7 +6098,7 @@
                 "issues": "https://forge.typo3.org",
                 "source": "https://github.com/typo3/typo3"
             },
-            "time": "2024-04-07T17:26:46+00:00"
+            "time": "2024-04-12T10:12:23+00:00"
         },
         {
             "name": "typo3/cms-info",
@@ -7586,7 +7585,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "surfcamp/portfolio": 20,
+        "friendsoftypo3/theme-portfolio": 20,
         "typo3/cms-backend": 20,
         "typo3/cms-belog": 20,
         "typo3/cms-beuser": 20,
diff --git a/config/sites/portfolio/config.yaml b/config/sites/portfolio/config.yaml
index 6330107..3fd41ba 100644
--- a/config/sites/portfolio/config.yaml
+++ b/config/sites/portfolio/config.yaml
@@ -1,6 +1,6 @@
 base: '%env(TYPO3_BASE_URL)%'
 dependencies:
-  - surfcamp/base
+  - friendsoftypo3/base
 errorHandling:
   -
     errorCode: 404
diff --git a/local_packages/portfolio/Classes/Controller/ProjectController.php b/local_packages/portfolio/Classes/Controller/ProjectController.php
index 432d5c8..b3aa12e 100644
--- a/local_packages/portfolio/Classes/Controller/ProjectController.php
+++ b/local_packages/portfolio/Classes/Controller/ProjectController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Surfcamp\Portfolio\Controller;
+namespace FriendsOfTYPO3\ThemePortfolio\Controller;
 
 use Psr\Http\Message\ResponseInterface;
-use Surfcamp\Portfolio\Domain\Model\Project;
+use FriendsOfTYPO3\ThemePortfolio\Domain\Model\Project;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
-use Surfcamp\Portfolio\Domain\Repository\ProjectRepository;
+use FriendsOfTYPO3\ThemePortfolio\Domain\Repository\ProjectRepository;
 
 class ProjectController extends ActionController
 {
diff --git a/local_packages/portfolio/Classes/Domain/Model/Link.php b/local_packages/portfolio/Classes/Domain/Model/Link.php
index 334dde0..0943186 100644
--- a/local_packages/portfolio/Classes/Domain/Model/Link.php
+++ b/local_packages/portfolio/Classes/Domain/Model/Link.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Surfcamp\Portfolio\Domain\Model;
+namespace FriendsOfTYPO3\ThemePortfolio\Domain\Model;
 
 use Symfony\Component\Config\Resource\FileResource;
 use TYPO3\CMS\Core\Resource\FileReference;
diff --git a/local_packages/portfolio/Classes/Domain/Model/Project.php b/local_packages/portfolio/Classes/Domain/Model/Project.php
index b414f00..f9aec86 100644
--- a/local_packages/portfolio/Classes/Domain/Model/Project.php
+++ b/local_packages/portfolio/Classes/Domain/Model/Project.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Surfcamp\Portfolio\Domain\Model;
+namespace FriendsOfTYPO3\ThemePortfolio\Domain\Model;
 
 use TYPO3\CMS\Extbase\Domain\Model\Category;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
diff --git a/local_packages/portfolio/Classes/Domain/Repository/ProjectRepository.php b/local_packages/portfolio/Classes/Domain/Repository/ProjectRepository.php
index 8c572b5..fc83e98 100644
--- a/local_packages/portfolio/Classes/Domain/Repository/ProjectRepository.php
+++ b/local_packages/portfolio/Classes/Domain/Repository/ProjectRepository.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Surfcamp\Portfolio\Domain\Repository;
+namespace FriendsOfTYPO3\ThemePortfolio\Domain\Repository;
 
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
diff --git a/local_packages/portfolio/Classes/Hooks/PageRenderer/WebfontHook.php b/local_packages/portfolio/Classes/Hooks/PageRenderer/WebfontHook.php
index 67a2737..d49de5b 100644
--- a/local_packages/portfolio/Classes/Hooks/PageRenderer/WebfontHook.php
+++ b/local_packages/portfolio/Classes/Hooks/PageRenderer/WebfontHook.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace Surfcamp\Portfolio\Hooks\PageRenderer;
+namespace FriendsOfTYPO3\ThemePortfolio\Hooks\PageRenderer;
 
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Http\ApplicationType;
@@ -27,8 +27,8 @@ public function execute(&$params, &$pagerenderer): void
         $this->includeFont($settings['style']['font'], $pagerenderer);
         $this->includeFont($settings['style']['copyFont'], $pagerenderer);
 
-        $pagerenderer->addCssFile('EXT:portfolio/Resources/Public/Fonts/roboto/webfont.css');
-        $pagerenderer->addCssFile('EXT:portfolio/Resources/Public/Fonts/roboto-slab/webfont.css');
+        $pagerenderer->addCssFile('EXT:theme_portfolio/Resources/Public/Fonts/roboto/webfont.css');
+        $pagerenderer->addCssFile('EXT:theme_portfolio/Resources/Public/Fonts/roboto-slab/webfont.css');
     }
 
     protected function includeFont($name, $pagerenderer) {
@@ -42,7 +42,7 @@ protected function findIncludePath($name): ?string
     {
         $name = strtolower($name);
         $name = str_replace(' ', '-', $name);
-        $filename = 'EXT:portfolio/Resources/Public/Fonts/' . $name .'/webfont.css';
+        $filename = 'EXT:theme_portfolio/Resources/Public/Fonts/' . $name .'/webfont.css';
         if (file_exists(GeneralUtility::getFileAbsFileName($filename))) {
             return $filename;
         }
@@ -54,4 +54,4 @@ protected function getSettings(ServerRequestInterface $request): array
     {
         return $request->getAttribute('site')->getConfiguration()['settings'];
     }
-}
\ No newline at end of file
+}
diff --git a/local_packages/portfolio/Classes/UserFunctions/SetCss.php b/local_packages/portfolio/Classes/UserFunctions/SetCss.php
index 71f764f..965706a 100644
--- a/local_packages/portfolio/Classes/UserFunctions/SetCss.php
+++ b/local_packages/portfolio/Classes/UserFunctions/SetCss.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Surfcamp\Portfolio\UserFunctions;
+namespace FriendsOfTYPO3\ThemePortfolio\UserFunctions;
 
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Utility\PathUtility;
diff --git a/local_packages/portfolio/Configuration/Form/Setup.yaml b/local_packages/portfolio/Configuration/Form/Setup.yaml
index 8b640d1..ccc26ad 100644
--- a/local_packages/portfolio/Configuration/Form/Setup.yaml
+++ b/local_packages/portfolio/Configuration/Form/Setup.yaml
@@ -4,7 +4,7 @@ TYPO3:
       persistenceManager:
         allowSaveToExtensionPaths: true
         allowedExtensionPaths:
-          110: EXT:portfolio/Resources/Private/Forms/
+          110: EXT:theme_portfolio/Resources/Private/Forms/
       prototypes:
         standard:
           formElementsDefinition:
@@ -16,8 +16,8 @@ TYPO3:
                     # Standard-Sprachdatei von EXT:form (wird immer benötigt, muss aber nur in TYPO3 v8 und v9 manuell verlinkt werden):
                     10: 'EXT:form/Resources/Private/Language/locallang.xlf'
                     # Lade deine eigenen Sprachdateien nachfolgend:
-                    20: 'EXT:portfolio/Resources/Private/Language/locallang_form.xlf'
+                    20: 'EXT:theme_portfolio/Resources/Private/Language/locallang_form.xlf'
                 templateRootPaths:
-                  20: 'EXT:portfolio/Resources/Private/Templates/Form/'
+                  20: 'EXT:theme_portfolio/Resources/Private/Templates/Form/'
                 partialRootPaths:
-                  20: 'EXT:portfolio/Resources/Private/Templates/Form/Partials/'
+                  20: 'EXT:theme_portfolio/Resources/Private/Templates/Form/Partials/'
diff --git a/local_packages/portfolio/Configuration/Icons.php b/local_packages/portfolio/Configuration/Icons.php
index dffee89..b86c658 100644
--- a/local_packages/portfolio/Configuration/Icons.php
+++ b/local_packages/portfolio/Configuration/Icons.php
@@ -6,26 +6,26 @@
 return [
     'icon_intro' => [
         'provider' => BitmapIconProvider::class,
-        'source' => 'EXT:portfolio/Resources/Public/Icons/Backend/intro.png',
+        'source' => 'EXT:theme_portfolio/Resources/Public/Icons/Backend/intro.png',
     ],
     'icon_skills' => [
         'provider' => BitmapIconProvider::class,
-        'source' => 'EXT:portfolio/Resources/Public/Icons/Backend/skills.png',
+        'source' => 'EXT:theme_portfolio/Resources/Public/Icons/Backend/skills.png',
     ],
     'icon_resume' => [
         'provider' => BitmapIconProvider::class,
-        'source' => 'EXT:portfolio/Resources/Public/Icons/Backend/resume.png',
+        'source' => 'EXT:theme_portfolio/Resources/Public/Icons/Backend/resume.png',
     ],
     'icon_services' => [
         'provider' => BitmapIconProvider::class,
-        'source' => 'EXT:portfolio/Resources/Public/Icons/Backend/services.png',
+        'source' => 'EXT:theme_portfolio/Resources/Public/Icons/Backend/services.png',
     ],
     'icon_clients' => [
         'provider' => BitmapIconProvider::class,
-        'source' => 'EXT:portfolio/Resources/Public/Icons/Backend/clients.png',
+        'source' => 'EXT:theme_portfolio/Resources/Public/Icons/Backend/clients.png',
     ],
     'icon_project' => [
         'provider' => BitmapIconProvider::class,
-        'source' => 'EXT:portfolio/Resources/Public/Icons/Backend/project.png',
+        'source' => 'EXT:theme_portfolio/Resources/Public/Icons/Backend/project.png',
     ],
 ];
diff --git a/local_packages/portfolio/Configuration/Services.yaml b/local_packages/portfolio/Configuration/Services.yaml
index 38a0790..210e502 100644
--- a/local_packages/portfolio/Configuration/Services.yaml
+++ b/local_packages/portfolio/Configuration/Services.yaml
@@ -5,5 +5,5 @@ services:
     autoconfigure: true
     public: false
 
-  Surfcamp\Portfolio\:
-    resource: '../Classes/*'
\ No newline at end of file
+  FriendsOfTYPO3\ThemePortfolio\:
+    resource: '../Classes/*'
diff --git a/local_packages/portfolio/Configuration/Sets/Base/Typoscript/ContentElements/Plugin.typoscript b/local_packages/portfolio/Configuration/Sets/Base/Typoscript/ContentElements/Plugin.typoscript
index b841d2c..c871179 100644
--- a/local_packages/portfolio/Configuration/Sets/Base/Typoscript/ContentElements/Plugin.typoscript
+++ b/local_packages/portfolio/Configuration/Sets/Base/Typoscript/ContentElements/Plugin.typoscript
@@ -1,11 +1,11 @@
 plugin.tx_portfolio.view {
     layoutRootPaths {
-        0 = EXT:portfolio/Resources/Private/Templates/Layouts/
+        0 = EXT:theme_portfolio/Resources/Private/Templates/Layouts/
     }
     partialRootPaths {
-        0 = EXT:portfolio/Resources/Private/Templates/Partials/
+        0 = EXT:theme_portfolio/Resources/Private/Templates/Partials/
     }
     templateRootPaths {
         0 = EXT:form/Resources/Private/Frontend/Templates/
     }
-}
\ No newline at end of file
+}
diff --git a/local_packages/portfolio/Configuration/Sets/Base/Typoscript/Lib/Content.typoscript b/local_packages/portfolio/Configuration/Sets/Base/Typoscript/Lib/Content.typoscript
index c646850..1ac6eb4 100644
--- a/local_packages/portfolio/Configuration/Sets/Base/Typoscript/Lib/Content.typoscript
+++ b/local_packages/portfolio/Configuration/Sets/Base/Typoscript/Lib/Content.typoscript
@@ -1,8 +1,8 @@
 lib.content = FLUIDTEMPLATE
 lib.content {
-    layoutRootPaths.10 = EXT:portfolio/Resources/Private/Templates/Layouts/
-    partialRootPaths.10 = EXT:portfolio/Resources/Private/Templates/Partials/
-    templateRootPaths.10 = EXT:portfolio/Resources/Private/Templates/Content/
+    layoutRootPaths.10 = EXT:theme_portfolio/Resources/Private/Templates/Layouts/
+    partialRootPaths.10 = EXT:theme_portfolio/Resources/Private/Templates/Partials/
+    templateRootPaths.10 = EXT:theme_portfolio/Resources/Private/Templates/Content/
 
     dataProcessing.1712913685 = site
 }
diff --git a/local_packages/portfolio/Configuration/Sets/Base/Typoscript/Page.typoscript b/local_packages/portfolio/Configuration/Sets/Base/Typoscript/Page.typoscript
index 4f9b4ee..ade6807 100644
--- a/local_packages/portfolio/Configuration/Sets/Base/Typoscript/Page.typoscript
+++ b/local_packages/portfolio/Configuration/Sets/Base/Typoscript/Page.typoscript
@@ -2,14 +2,14 @@ page = PAGE
 
 page {
     10 = PAGEVIEW
-    10.paths.0 = EXT:portfolio/Resources/Private/Templates/
+    10.paths.0 = EXT:theme_portfolio/Resources/Private/Templates/
 
     css_inlinestyle >
     cssInline >
     includeCSS >
     includeCSSLibs >
     includeCSS {
-      styles = EXT:portfolio/Resources/Public/Stylesheet/styles.css
+      styles = EXT:theme_portfolio/Resources/Public/Stylesheet/styles.css
     }
 
     includeJS >
@@ -18,7 +18,7 @@ page {
     includeJSFooter >
     includeJSFooterlibs >
     includeJSFooter {
-      app = EXT:portfolio/Resources/Public/JavaScript/app.js
+      app = EXT:theme_portfolio/Resources/Public/JavaScript/app.js
       app {
         async = 1
         defer = 1
@@ -31,13 +31,13 @@ page {
 
     headerData {
         100 = USER
-        100.userFunc = Surfcamp\Portfolio\UserFunctions\SetCss->getCssForHeader
+        100.userFunc = FriendsOfTYPO3\ThemePortfolio\UserFunctions\SetCss->getCssForHeader
     }
 
     bodyTagCObject = COA
     bodyTagCObject {
         10 = USER
-        10.userFunc = Surfcamp\Portfolio\UserFunctions\SetCss->getBodyDataModifier
+        10.userFunc = FriendsOfTYPO3\ThemePortfolio\UserFunctions\SetCss->getBodyDataModifier
         wrap = <body|>
     }
 }
diff --git a/local_packages/portfolio/Configuration/Sets/Base/config.yaml b/local_packages/portfolio/Configuration/Sets/Base/config.yaml
index cb2a476..b352b77 100644
--- a/local_packages/portfolio/Configuration/Sets/Base/config.yaml
+++ b/local_packages/portfolio/Configuration/Sets/Base/config.yaml
@@ -1,2 +1,2 @@
-name: surfcamp/base
-label: Base
\ No newline at end of file
+name: friendsoftypo3/base
+label: Base
diff --git a/local_packages/portfolio/Configuration/Sets/Base/page.tsconfig b/local_packages/portfolio/Configuration/Sets/Base/page.tsconfig
index 15bc456..02869db 100644
--- a/local_packages/portfolio/Configuration/Sets/Base/page.tsconfig
+++ b/local_packages/portfolio/Configuration/Sets/Base/page.tsconfig
@@ -1 +1 @@
-@import 'EXT:portfolio/Configuration/Sets/Base/PageTS/*'
+@import 'EXT:theme_portfolio/Configuration/Sets/Base/PageTS/*'
diff --git a/local_packages/portfolio/Configuration/Sets/Base/setup.typoscript b/local_packages/portfolio/Configuration/Sets/Base/setup.typoscript
index 70d8741..c7efbea 100644
--- a/local_packages/portfolio/Configuration/Sets/Base/setup.typoscript
+++ b/local_packages/portfolio/Configuration/Sets/Base/setup.typoscript
@@ -1,14 +1,8 @@
 @import 'EXT:form/Configuration/TypoScript/*'
 
-@import 'EXT:portfolio/Configuration/Sets/Base/Typoscript/*'
-@import 'EXT:portfolio/Configuration/Sets/Base/Typoscript/Lib/*'
-@import 'EXT:portfolio/Configuration/Sets/Base/Typoscript/Constants/*'
-@import 'EXT:portfolio/Configuration/Sets/Base/Typoscript/Extensions/*'
-@import 'EXT:portfolio/Configuration/Sets/Base/Typoscript/Navigation/*'
-@import 'EXT:portfolio/Configuration/Sets/Base/Typoscript/ContentElements/*'
-
-tt_content.form_formframework =< lib.content
-tt_content.form_formframework.20 = EXTBASEPLUGIN
-tt_content.form_formframework.20.extensionName = Form
-tt_content.form_formframework.20.pluginName = Formframework
-tt_content.form_formframework.templateName = Generic
+@import 'EXT:theme_portfolio/Configuration/Sets/Base/Typoscript/*'
+@import 'EXT:theme_portfolio/Configuration/Sets/Base/Typoscript/Lib/*'
+@import 'EXT:theme_portfolio/Configuration/Sets/Base/Typoscript/Constants/*'
+@import 'EXT:theme_portfolio/Configuration/Sets/Base/Typoscript/Extensions/*'
+@import 'EXT:theme_portfolio/Configuration/Sets/Base/Typoscript/Navigation/*'
+@import 'EXT:theme_portfolio/Configuration/Sets/Base/Typoscript/ContentElements/*'
diff --git a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content.php b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content.php
index badcab6..311e3da 100644
--- a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content.php
+++ b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content.php
@@ -3,7 +3,7 @@
 defined('TYPO3') or die();
 
 $GLOBALS['TCA']['tt_content']['columns']['link'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.link',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.link',
     'config' => [
         'type' => 'input',
         'renderType' => 'inputLink',
@@ -14,7 +14,7 @@
         'fieldControl' => [
             'linkPopup' => [
                 'options' => [
-                    'title' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.link.formlabel',
+                    'title' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.link.formlabel',
                     'windowOpenParameters' => 'height=800,width=1000,status=0,menubar=0,scrollbars=1',
                 ],
             ],
@@ -23,7 +23,7 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['link_text'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.link_text',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.link_text',
     'config' => [
         'type' => 'input',
         'size' => 50,
@@ -33,34 +33,34 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['header_style'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style',
     'config' => [
         'type' => 'select',
         'renderType' => 'selectSingle',
         'items' => [
             ['label' => '', 'value' => ''],
             [
-                'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h1',
+                'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h1',
                 'value' => 'h1'
             ],
             [
-                'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h2',
+                'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h2',
                 'value' => 'h2'
             ],
             [
-                'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h3',
+                'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h3',
                 'value' => 'h3'
             ],
             [
-                'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h4',
+                'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h4',
                 'value' => 'h4 '
             ],
             [
-                'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h5',
+                'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h5',
                 'value' => 'h5'
             ],
             [
-                'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h6',
+                'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.header_style.h6',
                 'value' => 'h6'
             ],
         ],
@@ -68,17 +68,17 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['background'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.background',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.background',
     'config' => [
         'type' => 'select',
         'renderType' => 'selectSingle',
         'items' => [
             [
-                'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.background.dark',
+                'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.background.dark',
                 'value' => 'bg--section-background-dark'
             ],
             [
-                'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.background.light',
+                'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.background.light',
                 'value' => 'bg--section-background-light'
             ],
         ],
@@ -123,9 +123,9 @@
     \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
         'Portfolio',
         'Projects',
-        'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.portfolio_projects',
+        'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.portfolio_projects',
         'icon_project',
         'default',
-        'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.portfolio_projects.description',
+        'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.portfolio_projects.description',
     );
 });
diff --git a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_client_logos.php b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_client_logos.php
index 061f0c0..0608e40 100644
--- a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_client_logos.php
+++ b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_client_logos.php
@@ -9,8 +9,8 @@
     'tt_content',
     'CType',
     [
-        'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.client_logos',
-        'description' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.client_logos.description',
+        'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.client_logos',
+        'description' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.client_logos.description',
         'value' => 'client_logos',
         'icon' => 'icon_clients',
         'group' => 'default',
@@ -41,7 +41,7 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['client_logos'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.client_logos',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.client_logos',
     'config' => [
         'type' => 'inline',
         'foreign_table' => 'tx_portfolio_client_logo',
diff --git a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_introduction_card.php b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_introduction_card.php
index 2e442c8..c7885c3 100644
--- a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_introduction_card.php
+++ b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_introduction_card.php
@@ -9,8 +9,8 @@
     'tt_content',
     'CType',
     [
-        'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.introduction_card',
-        'description' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.introduction_card.description',
+        'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.introduction_card',
+        'description' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.introduction_card.description',
         'value' => 'introduction_card',
         'icon' => 'icon_intro',
         'group' => 'default',
diff --git a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_portfolio_projects.php b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_portfolio_projects.php
index 3908184..5ce84f3 100644
--- a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_portfolio_projects.php
+++ b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_portfolio_projects.php
@@ -10,8 +10,8 @@
     'tt_content',
     'CType',
     [
-        'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.portfolio_projects',
-        'description' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.portfolio_projects.description',
+        'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.portfolio_projects',
+        'description' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.portfolio_projects.description',
         'value' => 'portfolio_projects',
         'icon' => 'icon_project',
         'group' => 'default',
diff --git a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_project_teaser.php b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_project_teaser.php
index 62ff0e2..050f7c0 100644
--- a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_project_teaser.php
+++ b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_project_teaser.php
@@ -10,8 +10,8 @@
     'tt_content',
     'CType',
     [
-        'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.project_teaser',
-        'description' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.project_teaser.description',
+        'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.project_teaser',
+        'description' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.project_teaser.description',
         'value' => 'project_teaser',
         'icon' => 'icon_project',
         'group' => 'default',
diff --git a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_resume.php b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_resume.php
index bcda78b..47e1bf4 100644
--- a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_resume.php
+++ b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_resume.php
@@ -9,8 +9,8 @@
     'tt_content',
     'CType',
     [
-        'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume',
-        'description' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.description',
+        'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume',
+        'description' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.description',
         'value' => 'resume',
         'icon' => 'icon_resume',
         'group' => 'default',
@@ -42,14 +42,14 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['additional_header'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.additional_header',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.additional_header',
     'config' => [
         'type' => 'input',
     ]
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['resume_items'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.items',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.items',
     'config' => [
         'type' => 'inline',
         'foreign_table' => 'tx_portfolio_resume_item',
@@ -61,7 +61,7 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['additional_resume_items'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.additional_resume_items',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.additional_resume_items',
     'config' => [
         'type' => 'inline',
         'foreign_table' => 'tx_portfolio_resume_item',
diff --git a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_services.php b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_services.php
index f4098b9..5b7fca1 100644
--- a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_services.php
+++ b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_services.php
@@ -10,8 +10,8 @@
     'tt_content',
     'CType',
     [
-        'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.services',
-        'description' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.services.description',
+        'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.services',
+        'description' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.services.description',
         'value' => 'services',
         'icon' => 'icon_services',
         'group' => 'default',
@@ -46,7 +46,7 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['services'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.services',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.services',
     'config' => [
         'type' => 'inline',
         'foreign_table' => 'tx_portfolio_service',
diff --git a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_skill_display.php b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_skill_display.php
index eb59d79..6626e82 100644
--- a/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_skill_display.php
+++ b/local_packages/portfolio/Configuration/TCA/Overrides/tt_content_element_skill_display.php
@@ -9,8 +9,8 @@
     'tt_content',
     'CType',
     [
-        'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display',
-        'description' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.description',
+        'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display',
+        'description' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.description',
         'value' => 'skill_display',
         'icon' => 'icon_skills',
         'group' => 'default',
@@ -47,10 +47,10 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['skills'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skills',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skills',
     'config' => [
         'type' => 'inline',
-        'help' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skills_help',
+        'help' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skills_help',
         'foreign_table' => 'tx_portfolio_skill',
         'foreign_field' => 'parent',
         'foreign_sortby' => 'sorting',
@@ -61,7 +61,7 @@
 ];
 
 $GLOBALS['TCA']['tt_content']['columns']['show_progress_level'] = [
-    'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.show_progress_level',
+    'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.show_progress_level',
     'config' => [
         'type' => 'check',
     ]
diff --git a/local_packages/portfolio/Configuration/TCA/tx_portfolio_additional_resume_item.php b/local_packages/portfolio/Configuration/TCA/tx_portfolio_additional_resume_item.php
index a9d0755..9a7afb7 100644
--- a/local_packages/portfolio/Configuration/TCA/tx_portfolio_additional_resume_item.php
+++ b/local_packages/portfolio/Configuration/TCA/tx_portfolio_additional_resume_item.php
@@ -8,7 +8,7 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'title' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.item',
+        'title' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.item',
         'delete' => 'deleted',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
@@ -114,7 +114,7 @@
             ],
         ],
         'position' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.position',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.position',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -124,14 +124,14 @@
             ],
         ],
         'description' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.description',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.description',
             'config' => [
                 'type' => 'text',
                 'eval' => 'trim',
             ],
         ],
         'location' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.location',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.location',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -140,7 +140,7 @@
             ],
         ],
         'time_period' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.time_period',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.time_period',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -149,7 +149,7 @@
             ],
         ],
         'institution' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.institution',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.institution',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -165,4 +165,4 @@
             ]
         ]
     ],
-];
\ No newline at end of file
+];
diff --git a/local_packages/portfolio/Configuration/TCA/tx_portfolio_client_logo.php b/local_packages/portfolio/Configuration/TCA/tx_portfolio_client_logo.php
index b0ec58f..d9c83ca 100644
--- a/local_packages/portfolio/Configuration/TCA/tx_portfolio_client_logo.php
+++ b/local_packages/portfolio/Configuration/TCA/tx_portfolio_client_logo.php
@@ -8,7 +8,7 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'title' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill',
+        'title' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill',
         'delete' => 'deleted',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
@@ -111,7 +111,7 @@
             ],
         ],
         'name' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.name',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.name',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -121,7 +121,7 @@
             ],
         ],
         'image' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.image',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.image',
             'config' => [
                 'type' => 'file',
                 'allowed' => 'common-media-types',
@@ -129,4 +129,4 @@
             ],
         ],
     ],
-];
\ No newline at end of file
+];
diff --git a/local_packages/portfolio/Configuration/TCA/tx_portfolio_domain_model_link.php b/local_packages/portfolio/Configuration/TCA/tx_portfolio_domain_model_link.php
index 6e60ec4..ed3c317 100644
--- a/local_packages/portfolio/Configuration/TCA/tx_portfolio_domain_model_link.php
+++ b/local_packages/portfolio/Configuration/TCA/tx_portfolio_domain_model_link.php
@@ -8,7 +8,7 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'title' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.item',
+        'title' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.item',
         'delete' => 'deleted',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
@@ -111,7 +111,7 @@
             ],
         ],
         'name' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.name',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.name',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -121,11 +121,11 @@
             ],
         ],
         'link' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.link',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.link',
             'config' => [
                 'type' => 'link',
                 'required' => true,
             ],
         ],
     ],
-];
\ No newline at end of file
+];
diff --git a/local_packages/portfolio/Configuration/TCA/tx_portfolio_domain_model_project.php b/local_packages/portfolio/Configuration/TCA/tx_portfolio_domain_model_project.php
index 0f87647..df20e03 100644
--- a/local_packages/portfolio/Configuration/TCA/tx_portfolio_domain_model_project.php
+++ b/local_packages/portfolio/Configuration/TCA/tx_portfolio_domain_model_project.php
@@ -4,7 +4,7 @@
 
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:tx_portfolio_domain_model_project',
+        'title' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:tx_portfolio_domain_model_project',
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -14,7 +14,7 @@
             'disabled' => 'hidden',
         ],
         'searchFields' => 'title',
-        'iconfile' => 'EXT:portfolio/Resources/Public/Icons/Backend/project.png',
+        'iconfile' => 'EXT:theme_portfolio/Resources/Public/Icons/Backend/project.png',
     ],
     'types' => [
         '1' => ['showitem' => '
@@ -46,7 +46,7 @@
             ],
         ],
         'title' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.title',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.title',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -55,21 +55,21 @@
             ],
         ],
         'description' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.description',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.description',
             'config' => [
                 'type' => 'text',
                 'enableRichtext' => true,
             ],
         ],
         'show_detail_page' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.showDetailPage',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.showDetailPage',
             'config' => [
                 'type' => 'check',
                 'default' => false,
             ],
         ],
         'links' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.links',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.links',
             'config' => [
                 'type' => 'inline',
                 'foreign_table' => 'tx_portfolio_domain_model_link',
@@ -83,7 +83,7 @@
             ],
         ],
         'images' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.image',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.image',
             'config' => [
                 'type' => 'inline',
                 'foreign_field' => 'parent',
@@ -93,4 +93,4 @@
             ],
         ],
     ],
-];
\ No newline at end of file
+];
diff --git a/local_packages/portfolio/Configuration/TCA/tx_portfolio_resume_item.php b/local_packages/portfolio/Configuration/TCA/tx_portfolio_resume_item.php
index ac623fa..feabd27 100644
--- a/local_packages/portfolio/Configuration/TCA/tx_portfolio_resume_item.php
+++ b/local_packages/portfolio/Configuration/TCA/tx_portfolio_resume_item.php
@@ -8,7 +8,7 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'title' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.item',
+        'title' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.resume.item',
         'delete' => 'deleted',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
@@ -114,7 +114,7 @@
             ],
         ],
         'position' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.position',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.position',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -124,14 +124,14 @@
             ],
         ],
         'description' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.description',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.description',
             'config' => [
                 'type' => 'text',
                 'eval' => 'trim',
             ],
         ],
         'location' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.location',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.location',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -140,7 +140,7 @@
             ],
         ],
         'time_period' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.time_period',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.time_period',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -149,7 +149,7 @@
             ],
         ],
         'institution' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.institution',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.institution',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -165,4 +165,4 @@
             ]
         ]
     ],
-];
\ No newline at end of file
+];
diff --git a/local_packages/portfolio/Configuration/TCA/tx_portfolio_service.php b/local_packages/portfolio/Configuration/TCA/tx_portfolio_service.php
index 5f3de5e..9924d1d 100644
--- a/local_packages/portfolio/Configuration/TCA/tx_portfolio_service.php
+++ b/local_packages/portfolio/Configuration/TCA/tx_portfolio_service.php
@@ -8,7 +8,7 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'title' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill',
+        'title' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill',
         'delete' => 'deleted',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
@@ -111,7 +111,7 @@
             ],
         ],
         'name' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.name',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.name',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -121,7 +121,7 @@
             ],
         ],
         'description' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:field.description',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:field.description',
             'config' => [
                 'type' => 'text',
                 'enableRichtext' => true,
@@ -133,4 +133,4 @@
             ],
         ],
     ],
-];
\ No newline at end of file
+];
diff --git a/local_packages/portfolio/Configuration/TCA/tx_portfolio_skill.php b/local_packages/portfolio/Configuration/TCA/tx_portfolio_skill.php
index 0850cfb..be8eea5 100644
--- a/local_packages/portfolio/Configuration/TCA/tx_portfolio_skill.php
+++ b/local_packages/portfolio/Configuration/TCA/tx_portfolio_skill.php
@@ -8,7 +8,7 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'title' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill',
+        'title' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill',
         'delete' => 'deleted',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
@@ -111,7 +111,7 @@
             ],
         ],
         'name' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill_name',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill_name',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -121,7 +121,7 @@
             ],
         ],
         'progress_level' => [
-            'label' => 'LLL:EXT:portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill_level',
+            'label' => 'LLL:EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf:content_element.skill_display.skill_level',
             'config' => [
                 'type' => 'number',
                 'min' => 0,
@@ -129,4 +129,4 @@
             ],
         ],
     ],
-];
\ No newline at end of file
+];
diff --git a/local_packages/portfolio/Resources/Private/Build/Stylesheet/abstracts/_variables.scss b/local_packages/portfolio/Resources/Private/Build/Stylesheet/abstracts/_variables.scss
index eb4623b..8ce0638 100644
--- a/local_packages/portfolio/Resources/Private/Build/Stylesheet/abstracts/_variables.scss
+++ b/local_packages/portfolio/Resources/Private/Build/Stylesheet/abstracts/_variables.scss
@@ -22,10 +22,10 @@
 $body-bg-color:             var(--color-background);
 
 $colors: (
-    'primary':            var(--color-primary),
-    'secondary':          var(--color-secondary),
-    'base-background':    var(--color-base-background),
-    'base-text':          var(--color-base-text),
+        'primary':            var(--color-primary),
+        'secondary':          var(--color-secondary),
+        'base-background':    var(--color-base-background),
+        'base-text':          var(--color-base-text),
 );
 
 // Typography
@@ -35,11 +35,11 @@ $line-height-base:            1.25;
 
 // Breakpoint Sizes
 $breakpoints: (
-    xs: 0px,
-    sm: 375px,
-    md: 768px,
-    lg: 1024px,
-    xl: 1440px,
+        xs: 0px,
+        sm: 375px,
+        md: 768px,
+        lg: 1024px,
+        xl: 1440px,
 );
 
 // * font-weights
@@ -166,8 +166,8 @@ $transition-timing-slow: 500ms;
 
 // Image Ratios
 $ratios: (
-    '16-9':    53.33%,
-    '3-2':     66%,
-    '4-3':     75%,
-    '1-1':     100%,
+        '16-9':    53.33%,
+        '3-2':     66%,
+        '4-3':     75%,
+        '1-1':     100%,
 );
diff --git a/local_packages/portfolio/Resources/Private/Language/de.locallang_db.xlf b/local_packages/portfolio/Resources/Private/Language/de.locallang_db.xlf
index eeefbdf..6115a5b 100644
--- a/local_packages/portfolio/Resources/Private/Language/de.locallang_db.xlf
+++ b/local_packages/portfolio/Resources/Private/Language/de.locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" target-language="de"  datatype="plaintext" original="EXT:portfolio/Resources/Private/Language/locallang_db.xlf" product-name="portfolio">
+	<file source-language="en" target-language="de"  datatype="plaintext" original="EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf" product-name="portfolio">
 		<header/>
 		<body>
 			<trans-unit id="content_element.introduction_card" resname="content_element.introduction_card" xml:space="preserve">
diff --git a/local_packages/portfolio/Resources/Private/Language/de.locallang_form.xlf b/local_packages/portfolio/Resources/Private/Language/de.locallang_form.xlf
index b01a351..92bab57 100644
--- a/local_packages/portfolio/Resources/Private/Language/de.locallang_form.xlf
+++ b/local_packages/portfolio/Resources/Private/Language/de.locallang_form.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" target-language="de"  datatype="plaintext" original="EXT:portfolio/Resources/Private/Language/locallang_form.xlf" product-name="portfolio">
+	<file source-language="en" target-language="de"  datatype="plaintext" original="EXT:theme_portfolio/Resources/Private/Language/locallang_form.xlf" product-name="portfolio">
 		<header/>
 		<body>
 			<trans-unit id="contactForm.element.text-1.properties.label" resname="element.text-1.properties.label" xml:space="preserve">
diff --git a/local_packages/portfolio/Resources/Private/Language/locallang_db.xlf b/local_packages/portfolio/Resources/Private/Language/locallang_db.xlf
index 432d55f..720a10d 100644
--- a/local_packages/portfolio/Resources/Private/Language/locallang_db.xlf
+++ b/local_packages/portfolio/Resources/Private/Language/locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" datatype="plaintext" original="EXT:portfolio/Resources/Private/Language/locallang_db.xlf" product-name="portfolio">
+	<file source-language="en" datatype="plaintext" original="EXT:theme_portfolio/Resources/Private/Language/locallang_db.xlf" product-name="portfolio">
 		<header/>
 		<body>
 			<trans-unit id="content_element.introduction_card" resname="content_element.introduction_card" xml:space="preserve">
diff --git a/local_packages/portfolio/Resources/Private/Language/locallang_form.xlf b/local_packages/portfolio/Resources/Private/Language/locallang_form.xlf
index 834dd26..b6366b9 100644
--- a/local_packages/portfolio/Resources/Private/Language/locallang_form.xlf
+++ b/local_packages/portfolio/Resources/Private/Language/locallang_form.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" datatype="plaintext" original="EXT:portfolio/Resources/Private/Language/locallang_form.xlf" product-name="portfolio">
+	<file source-language="en" datatype="plaintext" original="EXT:theme_portfolio/Resources/Private/Language/locallang_form.xlf" product-name="portfolio">
 		<header/>
 		<body>
 			<trans-unit id="contactForm.element.text-1.properties.label" resname="element.text-1.properties.label" xml:space="preserve">
diff --git a/local_packages/portfolio/composer.json b/local_packages/portfolio/composer.json
index dc6276c..bf803f4 100644
--- a/local_packages/portfolio/composer.json
+++ b/local_packages/portfolio/composer.json
@@ -1,8 +1,7 @@
 {
-  "name": "surfcamp/portfolio",
-  "description": "TYPO3 set for a portfolio website",
+  "name": "friendsoftypo3/theme-portfolio",
+  "description": "TYPO3 theme for a portfolio website",
   "type": "typo3-cms-extension",
-  "homepage": "https://team2.surfcamp.typo3.com",
   "license": "GPL-2.0-or-later",
   "authors": [
     {
@@ -21,12 +20,12 @@
   },
   "extra": {
     "typo3/cms": {
-      "extension-key": "portfolio"
+      "extension-key": "theme_portfolio"
     }
   },
   "autoload": {
     "psr-4": {
-      "Surfcamp\\Portfolio\\": "Classes"
+      "FriendsOfTYPO3\\ThemePortfolio\\": "Classes"
     }
   }
 }
diff --git a/local_packages/portfolio/ext_emconf.php b/local_packages/portfolio/ext_emconf.php
index fd210fd..78f0032 100644
--- a/local_packages/portfolio/ext_emconf.php
+++ b/local_packages/portfolio/ext_emconf.php
@@ -1,8 +1,8 @@
 <?php
 $EM_CONF[$_EXTKEY] = [
-    'title' => 'TYPO3 Portfolio Set',
-    'description' => '',
-    'category' => '',
+    'title' => 'Portfolio Theme',
+    'description' => 'TYPO3 theme for a portfolio website',
+    'category' => 'Theme',
     'state' => 'alpha',
     'author' => 'Felix Pachowsky',
     'author_email' => 'f.pachowsky@googlemail.com',
@@ -11,7 +11,7 @@
     'constraints' => [
         'depends' => [
             'php' => '8.2-',
-            'typo3' => '11.5-',
+            'typo3' => '13.0-',
         ],
         'conflicts' => [
         ],
diff --git a/local_packages/portfolio/ext_localconf.php b/local_packages/portfolio/ext_localconf.php
index c53cf1a..c58d5b7 100644
--- a/local_packages/portfolio/ext_localconf.php
+++ b/local_packages/portfolio/ext_localconf.php
@@ -1,8 +1,8 @@
 <?php
 declare(strict_types=1);
 
-use Surfcamp\Portfolio\Controller\ProjectController;
-use Surfcamp\Portfolio\Hooks\PageRenderer\WebfontHook;
+use FriendsOfTYPO3\ThemePortfolio\Controller\ProjectController;
+use FriendsOfTYPO3\ThemePortfolio\Hooks\PageRenderer\WebfontHook;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
 
@@ -13,14 +13,14 @@
             module.tx_form {
                 settings {
                     yamlConfigurations {
-                        110 = EXT:portfolio/Configuration/Form/Setup.yaml
+                        110 = EXT:theme_portfolio/Configuration/Form/Setup.yaml
                     }
                 }
             }
             plugin.tx_form {
                 settings {
                     yamlConfigurations {
-                        110 = EXT:portfolio/Configuration/Form/Setup.yaml
+                        110 = EXT:theme_portfolio/Configuration/Form/Setup.yaml
                     }
                 }
             }
diff --git a/local_packages/portfolio/package.json b/local_packages/portfolio/package.json
index f7d0fcd..aed5fbf 100644
--- a/local_packages/portfolio/package.json
+++ b/local_packages/portfolio/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "portfolio",
+  "name": "theme.portfolio",
   "private": true,
   "version": "0.0.0",
   "license": "GPL-2.0-or-later",