diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 37d2be37..d324049f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,18 +14,31 @@ jobs:
     strategy:
       matrix:
         node: [ '14', '13', '12' ]
-        os: [ ubuntu-latest ]
+        os: [ windows-latest, ubuntu-latest ]
     name: Test with Node v${{ matrix.node }} on ${{ matrix.os }}
     steps:
+    - name: Tell if project is using npm or yarn
+      id: _1
+      uses: garronej/github_actions_toolkit@v1.11
+      with: 
+        action_name: tell_if_project_uses_npm_or_yarn
+        owner: ${{github.repository_owner}}
+        repo: ${{github.event.repository.name}}
+        branch: ${{github.ref}}
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node }}
-    - run: npm ci
-    - run: npm run build
-    - run: npm run test
-
-
+    - if: steps._1.npm_or_yarn == 'yarn'
+      run: |
+        yarn install --frozen-lockfile                                                                                                                                                                                        
+        yarn run build
+        yarn run test
+    - if: steps._1.npm_or_yarn == 'npm'
+      run: |
+        npm ci                                                                                                                                                                                        
+        npm run build
+        npm run test
   trigger_publish:
     name: Trigger publish.yaml workflow if package.json version updated ( and secrets.PAT is set ).
     runs-on: ubuntu-latest
@@ -37,7 +50,7 @@ jobs:
 
     - name: Get version on latest
       id: v_latest
-      uses: garronej/github_actions_toolkit@v1.9
+      uses: garronej/github_actions_toolkit@v1.11
       with: 
         action_name: get_package_json_version
         owner: ${{github.repository_owner}}
@@ -47,7 +60,7 @@ jobs:
 
     - name: Get version on develop
       id: v_develop
-      uses: garronej/github_actions_toolkit@v1.9
+      uses: garronej/github_actions_toolkit@v1.11
       with: 
         action_name: get_package_json_version
         owner: ${{github.repository_owner}}
@@ -57,7 +70,7 @@ jobs:
 
     - name: 'Trigger the ''publish'' workflow' 
       if: ${{ !!env.PAT && steps.v_develop.outputs.compare_result == '1' }}
-      uses: garronej/github_actions_toolkit@v1.9
+      uses: garronej/github_actions_toolkit@v1.11
       env:
         GITHUB_TOKEN: ${{ secrets.PAT }} 
       with:
@@ -73,4 +86,4 @@ jobs:
               steps.v_develop.outputs.version,
               github.event.repository.name
             )
-          }}
+          }}
\ No newline at end of file
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 43c6fbfb..f973285f 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Synchronize package.json  and package-lock.json version if needed.
-      uses: garronej/github_actions_toolkit@v1.9
+      uses: garronej/github_actions_toolkit@v1.11
       env:
         GITHUB_TOKEN: ${{ secrets.PAT }} 
       with:
@@ -19,7 +19,7 @@ jobs:
         commit_author_email: ts_ci@github.com
     - name: Update CHANGELOG.md
       if: ${{ !!github.event.client_payload.from_version }}
-      uses: garronej/github_actions_toolkit@v1.9
+      uses: garronej/github_actions_toolkit@v1.11
       env:
         GITHUB_TOKEN: ${{ secrets.PAT }} 
       with:
@@ -51,8 +51,18 @@ jobs:
         git branch latest
         git checkout latest
     - uses: actions/setup-node@v1
-    - run: npm ci
-    - run: npm run enable_short_import_path
+    - run: |
+        if [ -f "./yarn.lock" ]; then
+            yarn install --frozen-lockfile                                                                                                                                                                                        
+        else
+            npm ci
+        fi
+    - run: |
+        PACKAGE_MANAGER=npm
+        if [ -f "./yarn.lock" ]; then
+            PACKAGE_MANAGER=yarn
+        fi
+        $PACKAGE_MANAGER run enable_short_import_path
       env:
         DRY_RUN: "0"
     - name: (DEBUG) Show how the files have been moved to enable short import
@@ -103,4 +113,4 @@ jobs:
         branch: latest
         draft: false
         prerelease: false
-        body: ${{ steps.id_rb.outputs.body }}
+        body: ${{ steps.id_rb.outputs.body }}
\ No newline at end of file
diff --git a/README.md b/README.md
index ff6c24c2..8734b67a 100644
--- a/README.md
+++ b/README.md
@@ -42,12 +42,10 @@ Typically you will get:
 `package.json`:
 ```json
   "devDependencies": {
-    "keycloak-react-theming": "^0.0.10",
-    [...]
+    "keycloak-react-theming": "^0.0.10"
   },
   "scripts": {
-    "build": "react-scripts build && build-keycloak-theme",
-    [...]
+    "build": "react-scripts build && build-keycloak-theme"
   },
 ```
 
diff --git a/package.json b/package.json
index bfed3301..df32203d 100755
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
         "!src/test/",
         "dist/",
         "!dist/test/",
-        "!dist/tsconfig.tsbuildinfo"
+        "!dist/tsconfig.tsbuildinfo",
+        "res/"
     ],
     "keywords": [
         "keycloak",
@@ -38,7 +39,7 @@
     "devDependencies": {
         "@types/node": "^10.0.0",
         "copyfiles": "^2.4.1",
-        "denoify": "^0.6.4",
+        "denoify": "^0.6.5",
         "scripting-tools": "^0.19.13",
         "typescript": "^4.1.5"
     },
diff --git a/res/test.txt b/res/test.txt
new file mode 100644
index 00000000..e69de29b