See #1227 . Experimental viewport layerset visualisation.

Fix some refresh glitches in IFC Git panel
Fix iterator::get() invalid cast on nullptr
2026-08-28 07:49:59 +00:00 · 2023-04-26 22:10:34 +10:00 · 2023-04-26 00:07:22 +01:00 · 2023-04-25 21:00:01 +02:00 · 2023-04-25 07:30:35 +01:00 · 2023-04-24 22:41:38 +10:00
329 changed files with 50250 additions and 30592 deletions
@@ -0,0 +1,104 @@
+import pathlib
+import shutil
+
+import requests
+import zipfile
+import os
+
+# To test this locally, set these environment variables
+REPO_OWNER = os.environ.get("REPO_OWNER", "IfcOpenShell/IfcOpenShell")
+MY_WORKFLOW = os.environ.get("MY_WORKFLOW", "ci-ifcopenshell-conda-daily")
+WORKFLOW_RUN_ID = os.environ.get("WORKFLOW_RUN_ID", None)
+TOKEN = os.environ.get("GITHUB_TOKEN", None)
+# To test this locally create a fine-grained personal access token for this repo with permissions "actions:read"
+# See https://github.com/settings/tokens?type=beta
+
+# This is a list of strings that indicate that a job has stopped abruptly.
+SIGNS_OF_STOPPAGE = [
+    "Error: The operation was canceled.",
+    "fatal error C1060: compiler is out of heap space",
+]
+
+
+def start_request_session():
+    s = requests.Session()
+    headers = {
+        "Accept": "application/vnd.github+json",
+        "X-GitHub-Api-Version": "2022-11-28",
+    }
+    if TOKEN:
+        headers["Authorization"] = f"Bearer {TOKEN}"
+
+    s.headers = headers
+    return s
+
+
+def get_ci_run(repo_name, run_id):
+    url = f"https://api.github.com/repos/{repo_name}/actions/runs/{run_id}"
+    s = start_request_session()
+    response = s.get(url)
+    return response.json()
+
+
+def evaluate_log_file_for_abrupt_stop(log_file):
+    with open(log_file) as f:
+        for i, line in enumerate(f):
+            for sign in SIGNS_OF_STOPPAGE:
+                if sign in line:
+                    print(f"Found sign of abrupt stoppage in [line {i}]: '{sign}'")
+                    return True
+    return False
+
+
+def get_ci_specific_run_specific_failure_details(repo_name, run_id):
+    url = f"https://api.github.com/repos/{repo_name}/actions/runs/{run_id}/attempts/1/logs"
+    s = start_request_session()
+    response = s.get(url)
+
+    # SAVE zip file
+    with open("logs.zip", "wb") as f:
+        f.write(response.content)
+
+    # unzip file
+    with zipfile.ZipFile("logs.zip", "r") as zip_ref:
+        zip_ref.extractall("logs")
+
+    failed_logs = []
+    for file in pathlib.Path("logs").iterdir():
+        if file.is_dir():
+            continue
+
+        if evaluate_log_file_for_abrupt_stop(file):
+            failed_logs.append(file)
+
+    return failed_logs
+
+
+def restart_job(repo_name, job_id):
+    url = f"https://api.github.com/repos/{repo_name}/actions/runs/{job_id}/rerun-failed-jobs"
+    s = start_request_session()
+    response = s.post(url)
+    return response.json()
+
+
+def eval_jobs():
+    run = get_ci_run(REPO_OWNER, WORKFLOW_RUN_ID)
+    if run["run_attempt"] > 1:
+        print("This is not the first attempt. Exiting")
+        return
+    failed_logs = get_ci_specific_run_specific_failure_details(REPO_OWNER, WORKFLOW_RUN_ID)
+
+    if len(failed_logs) == 0:
+        print("No runs exhibit signs of abrupt stoppage")
+        return
+
+    print("restarting job", WORKFLOW_RUN_ID)
+    r = restart_job(REPO_OWNER, WORKFLOW_RUN_ID)
+    print(r)
+
+    shutil.rmtree("logs")
+    os.remove("logs.zip")
+
+
+if __name__ == "__main__":
+    eval_jobs()
@@ -62,6 +62,7 @@ jobs:
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+          python-version: '3.10'
      - run: echo ${{ env.DATE }}
      - name: Get current date
        id: date
@@ -4,6 +4,7 @@ on:
  push:
      paths:
        - .github/workflows/ci-ifcopenshell-conda-daily.yml
+        - conda/**
  schedule:
  #         ┌───────────── minute (0 - 59)
  #         │  ┌───────────── hour (0 - 23)
@@ -53,11 +54,13 @@ jobs:
          sudo mv -v MacOSX10.13.sdk /opt/ && \
          ls /opt/
      - uses: seanmiddleditch/gha-setup-ninja@master
-      - uses: conda-incubator/setup-miniconda@v2  # https://github.com/conda-incubator/setup-miniconda
+      - uses: mamba-org/provision-with-micromamba@main # https://github.com/mamba-org/provision-with-micromamba
        with:
-          activate-environment: conda-build
-          python-version: ${{ matrix.pyver.distver }}
+          channels: conda-forge
+          channel-priority: strict
          environment-file: conda/environment.yml
+          extra-specs: |
+            python=${{ matrix.pyver.distver }}
      - name: build, test and upload ifcopenshell
        if: ${{ matrix.platform.upload == 'true' }}
        run: |
@@ -7,7 +7,7 @@ on:
      - 'test/**'
      - 'conda/**'
      - 'cmake/**'
-      - '.github/workflows/ci_py_only.yml'
+      - '.github/workflows/ci-py-only.yml'
  pull_request:

 jobs:
@@ -46,13 +46,14 @@ jobs:
          
      - name: ccache
        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ${GITHUB_WORKFLOW}

      - name: Build ifcopenshell
        run: |
+          sudo /usr/sbin/update-ccache-symlinks
          mkdir build && cd build
-          cmake \
-               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+          PATH="/usr/lib/ccache:$PATH" cmake \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_PREFIX_PATH=/usr \
               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -62,7 +63,7 @@ jobs:
               -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
               -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
               -DCOLLADA_SUPPORT=Off \
-               "-DSCHEMA_VERSIONS=2x3;4" \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
               -DBUILD_CONVERT=Off \
               -DGLTF_SUPPORT=On \
               -DJSON_INCLUDE_DIR=/usr/include \
@@ -79,13 +80,14 @@ jobs:
      - name: Install Python dependencies
        run: |
          sudo /usr/bin/python -m pip install -U pip
-          sudo /usr/bin/python -m pip install xmlschema numpy lxml
-          sudo /usr/bin/python -m pip install src/bcf
+          sudo /usr/bin/python -m pip install xmlschema xsdata numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf --no-deps
          sudo /usr/bin/python -m pip install pytest
          sudo /usr/bin/python -m pip install isodate
          sudo /usr/bin/python -m pip install lark
          sudo /usr/bin/python -m pip install networkx
          sudo /usr/bin/python -m pip install tabulate
+          sudo /usr/bin/python -m pip install python-dateutil

      - name: Test
        run: |
@@ -0,0 +1,34 @@
+name: Restart failed daily conda builds
+
+on:
+  workflow_run:
+    workflows: [ ci-ifcopenshell-conda-daily ]
+    types:
+      - completed
+
+env:
+  REPO_OWNER: IfcOpenShell/IfcOpenShell
+  MY_WORKFLOW: ci-ifcopenshell-conda-daily
+
+jobs:
+  restart-failed-runs:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: Use python 3.11
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.11
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+      - name: Check for failed runs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WORKFLOW_RUN_ID: ${{ github.event.workflow_run.id }}
+        run: |
+          python check_repo_ci_jobs.py
+        working-directory: .github/workflows
@@ -57,6 +57,8 @@ jobs:
          
      - name: ccache
        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ${GITHUB_WORKFLOW}

      - name: Build ifcopenshell
        run: |
@@ -73,7 +75,7 @@ jobs:
               -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
               -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
               -DCOLLADA_SUPPORT=Off \
-               "-DSCHEMA_VERSIONS=2x3;4;4x3" \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
               -DGLTF_SUPPORT=On \
               -DJSON_INCLUDE_DIR=/usr/include \
               -DCGAL_INCLUDE_DIR=/usr/include \
@@ -103,14 +105,15 @@ jobs:
      - name: Install Python dependencies
        run: |
          sudo /usr/bin/python -m pip install -U pip
-          sudo /usr/bin/python -m pip install xmlschema numpy lxml
-          sudo /usr/bin/python -m pip install src/bcf
+          sudo /usr/bin/python -m pip install xmlschema xsdata numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf --no-deps
          sudo /usr/bin/python -m pip install pytest
          sudo /usr/bin/python -m pip install isodate
          sudo /usr/bin/python -m pip install lark
          sudo /usr/bin/python -m pip install networkx
          sudo /usr/bin/python -m pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
          sudo /usr/bin/python -m pip install tabulate
+          sudo /usr/bin/python -m pip install python-dateutil

      - name: Test
        run: |
@@ -84,6 +84,9 @@ src/ifcopenshell-python/test/build
 # blenderbim libs
 src/blenderbim/blenderbim/libs

+# blenderbim test temp files
+src/blenderbim/test/files/temp
+
 # ifcopenshell swig and compiled files
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper.so
 src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
@@ -27,7 +27,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu focal-proposed main restricted" |
                    libboost-all-dev \
                    libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev \
                    libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-                    libhdf5-serial-dev ; \
+                    libhdf5-serial-dev python3-pytest ; \
    rm -rf /var/lib/apt/lists/* ; 

 COPY . /home/IfcOpenShell/
@@ -1017,7 +1017,7 @@ endforeach(COMPONENT)

 set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_CONTACT}")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libxml2, libocct-foundation-dev, libocct-modeling-algorithms-dev, libocct-modeling-data-dev, libocct-ocaf-dev, libocct-visualization-dev, libocct-data-exchange-dev, libhdf5-serial-dev, libpython3.8 ${BOOST_DEPS}")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libxml2, libocct-foundation-dev, libocct-modeling-algorithms-dev, libocct-modeling-data-dev, libocct-ocaf-dev, libocct-visualization-dev, libocct-data-exchange-dev, libhdf5-serial-dev, libpython3.8, python3-pytest ${BOOST_DEPS}")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
@@ -10,5 +10,4 @@ dependencies:
  - ripgrep
  - pip
  - pip:
-      - --extra-index-url https://lief.s3-website.fr-par.scw.cloud/latest
-      - lief==0.13.0.dev0
+      - lief==0.13
@@ -1,8 +1,6 @@
 {% set name = "ifcopenshell" %}
 {% set version = "0.7.0" %}
-{% set occt_version = "7.6.2" %}
-{% set cgal_cpp_version = "5.3" %}
-{% set hdf5_version = "1.12.1" %}
+

 package:
  name: {{ name }}
@@ -38,7 +36,7 @@ requirements:
  run:
    - python
    - boost-cpp
-    - occt
+    - {{ pin_compatible('occt', max_pin='x.x.x') }}
    - libxml2
    - cgal-cpp
    - hdf5
@@ -59,6 +59,10 @@ import multiprocessing
 import platform
 import sysconfig

+# @todo temporary for expired mpfr.org certificate on 2023-04-08
+import ssl
+ssl._create_default_https_context = ssl._create_unverified_context
+
 from urllib.request import urlretrieve


@@ -1,5 +1,5 @@
 # BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
+# Copyright (C) 2020-2023 Dion Moult <dion@thinkmoult.com>
 #
 # This file is part of BlenderBIM Add-on.
 #
@@ -16,7 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

-PYTHON:=python
+PYTHON:=python3.10
+PIP:=pip3.10
 PATCH:=patch
 SED:=sed -i
 ifeq ($(OS),Windows_NT)
@@ -56,7 +57,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/linux-64/hpp
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/linux-64/eigenpy-2.6.5-py37h95e2c48_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py37h0379df6_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/30/c0/d0526314971fc661b083ab135747dc68446a3022686da8c16d25fcf6ef07/lxml-4.6.3-cp37-cp37m-manylinux2014_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/a2/73/07f507b539527579c026ed5f411c35e287685ce794c4dfb7edf6675cdc24/Shapely-1.8.4-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/1d/a4/931d0780f31f3ea8c4f9ef6464a2825137c5241e6707a5fb03bef760a7eb/shapely-2.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/ed/d5/c2e84e1e36ab8ebea033921d5886a056c77e18bab5ab1051fcc22de2e8a2/Pillow-9.2.0-cp37-cp37m-manylinux_2_28_x86_64.whl
 endif
 ifeq ($(PYVERSION), py39)
@@ -64,7 +65,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/linux-64/hpp
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/linux-64/eigenpy-2.6.5-py39h5aed9d1_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py39h5472131_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/19/d9/a69c6aff5673554df48120565a14a50eaa41d29ae03b02faa0b023666318/lxml-4.6.3-cp39-cp39-manylinux2014_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/08/12/5af915b2bc0470f4a652ef9978557a0fa8b705b122ccaec6626029e1674c/Shapely-1.8.4-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/2d/f2/8ec281d357e8bb7d08dc8d727f0e4c8ef3dae7d3fa75c69c8e452bb82d50/shapely-2.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/01/61/3ff85fb4bb596ce3d223c8fcf93c8df5c12bc8899dfb4fb3cb1c5b20dd5f/Pillow-9.2.0-cp39-cp39-manylinux_2_28_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
@@ -72,7 +73,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/linux-64/hpp
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/linux-64/eigenpy-2.6.11-py310hf3e5c9c_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py310h7c3ba0c_5.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/25/1e/19b46d8e8881fe0df2e20945d51919eeb1817836d62a90efa8506530e45c/lxml-4.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/60/20/c6321e3da92a4ad9495727c9aa8c423e47295572ccd35ece82d1ac013e28/Shapely-1.8.4-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/a8/a5/403728b5614b28083f6424dfdefec5fcf58068495fb03bb08532671c642f/shapely-2.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/f6/51/320986ebd6d46a0e95c2240468ced73153b691ce07617078bcdf30c609ec/Pillow-9.2.0-cp310-cp310-manylinux_2_28_x86_64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/linux-64/assimp-5.0.1-hedfc422_6.tar.bz2
@@ -86,7 +87,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-64/hpp-f
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eigenpy-2.6.5-py37h0695097_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py37hd79e0ac_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/1e/3e/f0abc15d5dac50939bccc589aae336d5ead4c72e7ad1039a2e0f3630ea92/lxml-4.6.3-cp37-cp37m-macosx_10_9_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/47/a9/7c644e71638bff2bbaa87f05ee62fdf6b4552a55e74bbf731d6210b6d436/Shapely-1.8.4-cp37-cp37m-macosx_10_9_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/e6/7d/4923f27c340339e1c896c77cafc8ed672c8d381a025bbab6c6ddcba27e8f/shapely-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/88/49/c26fc3b5b0e82bdc9d8751d6b939da29327b0d98f7c3b95a575cbfed2743/Pillow-9.2.0-cp37-cp37m-macosx_10_10_x86_64.whl
 endif
 ifeq ($(PYVERSION), py39)
@@ -94,7 +95,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-64/hpp-f
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eigenpy-2.6.5-py39h5405915_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py39ha641261_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/b8/74/a71f7ad72e8db54ce899efab84507b801660750cbbfa6a39e6717557d36a/lxml-4.6.3-cp39-cp39-macosx_10_9_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/f5/f9/bf6cc34b02b3c7d3777c5e47fa57d2f69387613bbd8decdf3577a9d83a83/Shapely-1.8.4-cp39-cp39-macosx_10_9_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/36/a4/7e542a209f862f967d7cb8e939eff155f4294a27d17e16441fb8bdd51a2c/shapely-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/88/7a/ddfe28b485b623361457d4783007c1f9ba83a87f93e7fec32f64793efb6c/Pillow-9.2.0-cp39-cp39-macosx_10_10_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
@@ -102,7 +103,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/osx-64/hpp-f
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/osx-64/eigenpy-2.6.11-py310hc03097c_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py310h509978a_5.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/a1/44/17b7dac7a18807d30e2fe10c3328c152808f5464565e230bfd0e77f178c6/lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/f5/a8/02347c450b5507b9a7a2c15ad6a029613149468fc55ac2100ab215666159/Shapely-1.8.4-cp310-cp310-macosx_10_9_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/1f/2a/dc3353c2431cf53e8d04bb8fba27e584410ca3435c9c85f76d71bf0c0e80/shapely-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/d8/60/b13c00d403f34110e96c1b5c0afa73ce461efe3fe960c3a7e3e7fe190d82/Pillow-9.2.0-cp310-cp310-macosx_10_10_x86_64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-64/assimp-5.0.1-h1224e73_6.tar.bz2
@@ -117,7 +118,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-64/hpp-f
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eigenpy-2.6.5-py37h0695097_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py37hd79e0ac_3.tar.bz2
 LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-64/lxml-4.9.1-py37h994c40b_0.tar.bz2
-SHAPELY_URL:=https://files.pythonhosted.org/packages/47/a9/7c644e71638bff2bbaa87f05ee62fdf6b4552a55e74bbf731d6210b6d436/Shapely-1.8.4-cp37-cp37m-macosx_10_9_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/e6/7d/4923f27c340339e1c896c77cafc8ed672c8d381a025bbab6c6ddcba27e8f/shapely-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/aa/bc/21097cd891dd2fa02f2b3d767e02e883e026482e59d29975d1bc30024aa3/Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
 endif
 ifeq ($(PYVERSION), py39)
@@ -125,7 +126,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-arm64/hp
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.7/download/osx-arm64/eigenpy-2.6.7-py39ha69f3c1_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py39h2550fe3_0.tar.bz2
 LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h9eb174b_0.tar.bz2
-SHAPELY_URL:=https://files.pythonhosted.org/packages/8e/60/8186995a96c5a27c9b79c015bbdd89c6d9a6df9988f86f3f1027ecd4a56a/Shapely-1.8.4-cp39-cp39-macosx_11_0_arm64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/ea/aa/45fbd031edf3149cb767d8b9f9db45d5faf0324d743c6b8fb0298cc022d0/shapely-2.0.1-cp39-cp39-macosx_11_0_arm64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/aa/bc/21097cd891dd2fa02f2b3d767e02e883e026482e59d29975d1bc30024aa3/Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
 endif
 ifeq ($(PYVERSION), py310)
@@ -133,7 +134,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/osx-arm64/hp
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.9/download/osx-arm64/eigenpy-2.6.9-py310habfc766_1.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py310h4566fd1_0.tar.bz2
 LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
-SHAPELY_URL:=https://files.pythonhosted.org/packages/ba/d0/75cd36c81a1aa26dd6d37cf7ae1c79b0bc2d379e0f32c359bcb00b14e5c3/Shapely-1.8.4-cp310-cp310-macosx_11_0_arm64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/ec/41/d59208743e737184e1b403e95a937aebb022b8459e99efbcd5208fc8be46/shapely-2.0.1-cp310-cp310-macosx_11_0_arm64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/0c/5f/117b653cad585f3aedfe0de996c292e67d4b020ed77f652e5a6c8c24f908/Pillow-9.2.0-cp310-cp310-macosx_11_0_arm64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-arm64/assimp-5.0.1-h0f81e16_7.tar.bz2
@@ -147,7 +148,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/win-64/hpp-f
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/win-64/eigenpy-2.6.5-py37h2c32e34_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py37h3b38789_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/9e/5e/171ee9d40a600f565fe691ec5bf7596247ec62cfb2edc00c91afe8ea837b/lxml-4.6.3-cp37-cp37m-win_amd64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/ca/4d/85b912d7947261e6b3218b01946bcd7c2efb2bbafaf517c6fe1dc3bb8399/Shapely-1.8.4-cp37-cp37m-win_amd64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/e2/87/b8b8d8d57b429b01aa56b7d723075c09f33c988b8091bb6f790c83436909/shapely-2.0.1-cp37-cp37m-win_amd64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/69/f5/9e802159d78b2eaf26bf1f8b94648605993f5ca7247ac8870f065063fc40/Pillow-9.2.0-cp37-cp37m-win_amd64.whl
 endif
 ifeq ($(PYVERSION), py39)
@@ -155,7 +156,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/win-64/hpp-f
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/win-64/eigenpy-2.6.5-py39h3ce40e6_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py39hefe7e4c_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/72/d4/426ecb8849c47c3e370c87aa0ac05d85768df917ffea27fcd6686a5e6495/lxml-4.6.3-cp39-cp39-win_amd64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/72/c3/0d52812db25ca71203f6203891277e6ee4f0244b21a36c062123ece15f36/Shapely-1.8.4-cp39-cp39-win_amd64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/a7/ae/eab645c4075093584b7a65ab71cb8ff4563a015bd935c9b55dba14b2c1eb/shapely-2.0.1-cp39-cp39-win_amd64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/19/3f/b4d4bcf05dbcbe07f2e9613a8f4180c297395e73a91d8ad22c32c6624f8c/Pillow-9.2.0-cp39-cp39-win_amd64.whl
 endif
 ifeq ($(PYVERSION), py310)
@@ -163,7 +164,7 @@ HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/win-64/hpp-f
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/win-64/eigenpy-2.6.11-py310hbd43d28_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py310hc781a3c_5.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/f6/71/65c80a4caa1617a4c6e8fe1500cebb179db96232e2f623bfe6a1f4294e39/lxml-4.8.0-cp310-cp310-win_amd64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/24/b5/46d13799804b5fe9ede2eca8b19023410e29b78baca0bff727671a1df8c1/Shapely-1.8.4-cp310-cp310-win_amd64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/81/8a/7ac076a86b2632f1872284c5e60ed5f2fc26094875a85b35d9fa17b52504/shapely-2.0.1-cp310-cp310-win_amd64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/02/55/67a3c17b9e7d972ed8c246f104da99ca4f3ea42fba566697e479011b84b6/Pillow-9.2.0-cp310-cp310-win_amd64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/win-64/assimp-5.0.1-hc2aa0de_6.tar.bz2
@@ -207,14 +208,16 @@ endif
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/api/* dist/blenderbim/libs/site/packages/ifcopenshell/api/
 	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/entity_instance.py dist/blenderbim/libs/site/packages/ifcopenshell/
 	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/file.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/validate.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/express/rule_executor.py dist/blenderbim/libs/site/packages/ifcopenshell/express/
 	# Provides bcf functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/bcf/src/bcf dist/blenderbim/libs/site/packages/
 	# Provides IFCClash functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcclash/ifcclash dist/blenderbim/libs/site/packages/
 	# Provides BIMTester functionality
 	cd dist/working && $(PYTHON) -m venv env
-	cd dist/working && . env/bin/activate && pip install pybabel
-	cd dist/working && . env/bin/activate && pip install babel
+	cd dist/working && . env/bin/activate && $(PIP) install pybabel
+	cd dist/working && . env/bin/activate && $(PIP) install babel
 	cd dist/working && . env/bin/activate && ./env/bin/pybabel compile -d ./IfcOpenShell-0.7.0/src/ifcbimtester/bimtester/locale/
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
 	# Provides IFCTester functionality
@@ -233,14 +236,11 @@ endif
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
 	# Provides IFCCityJSON functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccityjson dist/blenderbim/libs/site/packages/
-	rm -rf dist/working
-
-	# Provides express rule validation for ifcopenshell.validate
-	mkdir dist/working
-	cd dist/working && wget https://files.pythonhosted.org/packages/e5/6c/f3a15217ac72912c28c5d7a7a8e87ff6d6475c9530595ae9f0f8dedd8dd8/pytest-7.2.1.tar.gz
-	cd dist/working && tar -xzvf pytest*
-	cp -r dist/working/pytest-7.2.1/src/pytest dist/blenderbim/libs/site/packages/
-	cp -r dist/working/pytest-7.2.1/src/_pytest dist/blenderbim/libs/site/packages/
+	# Provides IfcGit functionality
+	cd dist/working && . env/bin/activate && $(PIP) install GitPython --target=./site-packages
+	cp -r dist/working/site-packages/smmap dist/blenderbim/libs/site/packages/
+	cp -r dist/working/site-packages/gitdb dist/blenderbim/libs/site/packages/
+	cp -r dist/working/site-packages/git dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

 	# Provides Mustache templating in construction documentation
@@ -376,10 +376,10 @@ endif
 	cd dist/working && cp *.whl shapely.zip && unzip shapely.zip
 	cp -r dist/working/shapely dist/blenderbim/libs/site/packages/
 ifeq ($(PLATFORM), win)
-	cp -r dist/working/Shapely.libs dist/blenderbim/libs/site/packages/
+	cp -r dist/working/shapely.libs dist/blenderbim/libs/site/packages/
 endif
 ifeq ($(PLATFORM), linux)
-	cp -r dist/working/Shapely.libs dist/blenderbim/libs/site/packages/
+	cp -r dist/working/shapely.libs dist/blenderbim/libs/site/packages/
 endif
 	rm -rf dist/working

@@ -401,11 +401,13 @@ endif
 	cp -r dist/working/tqdm-4.50.0/tqdm dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

-	# Required by IFCCityJSON
 	mkdir dist/working
 	cd dist/working && $(PYTHON) -m venv env
 	cd dist/working && mkdir site-packages
-	cd dist/working && . env/bin/activate && pip install cjio --target=./site-packages
+	# Required by IFCCityJSON
+	cd dist/working && . env/bin/activate && $(PIP) install cjio --target=./site-packages
+	# Provides express rule validation for ifcopenshell.validate
+	cd dist/working && . env/bin/activate && $(PIP) install pytest --target=./site-packages
 	cd dist/working/site-packages/ && rm -r *dist-info*
 	cp -r dist/working/site-packages/* dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
@@ -623,7 +625,7 @@ endif
 	cd dist/working/brickschema-0.5.1/ && cp -r brickschema ../../blenderbim/libs/site/packages/
 	# For now lets bundle the latest nightly schema
 	cd dist/working && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
-	cd dist/working && cp Brick.ttl ../../blenderbim/bim/schema/Brick.ttl
+	cd dist/working && cp Brick.ttl ../blenderbim/bim/schema/Brick.ttl
 	rm -rf dist/working

 	# Required by brickschema
@@ -655,6 +657,13 @@ endif
 	cd dist/working/ && cp -r pkg_resources ../blenderbim/libs/site/packages/
 	rm -rf dist/working

+	# Required for hipped roof generation
+	mkdir dist/working
+	cd dist/working && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip
+	cd dist/working && unzip master.zip
+	cp -r dist/working/bpypolyskel-master/bpypolyskel dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" __init__.py
 	cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./*
 	rm -rf dist/blenderbim
@@ -17,6 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
+import blenderbim
 import importlib
 from . import handler, ui, prop, operator, helper

@@ -70,6 +71,7 @@ modules = {
    "covetool": None,
    "augin": None,
    "debug": None,
+    "ifcgit": None,
    # Uncomment this line to enable loading of the demo module. Happy hacking!
    # The name "demo" must correlate to a folder name in `bim/module/`.
    # "demo": None,
@@ -152,7 +154,7 @@ def register():
    bpy.app.handlers.redo_post.append(handler.redo_post)
    bpy.app.handlers.load_post.append(handler.setDefaultProperties)
    bpy.app.handlers.load_post.append(handler.loadIfcStore)
-    bpy.app.handlers.save_pre.append(handler.ensureIfcExported)
+    bpy.app.handlers.save_post.append(handler.ensureIfcExported)
    bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
    bpy.types.Object.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
    bpy.types.Material.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
@@ -171,10 +173,14 @@ def register():

 def unregister():
    for cls in reversed(classes):
-        bpy.utils.unregister_class(cls)
+        if getattr(cls, "is_registered", None) is None:
+            bpy.utils.unregister_class(cls)
+        elif cls.is_registered:
+            bpy.utils.unregister_class(cls)
+
    bpy.app.handlers.load_post.remove(handler.setDefaultProperties)
    bpy.app.handlers.load_post.remove(handler.loadIfcStore)
-    bpy.app.handlers.save_pre.remove(handler.ensureIfcExported)
+    bpy.app.handlers.save_post.remove(handler.ensureIfcExported)
    del bpy.types.Scene.BIMProperties
    del bpy.types.Object.BIMObjectProperties
    del bpy.types.Material.BIMObjectProperties
@@ -19,11 +19,13 @@
 */

 * { stroke-linecap: round; stroke-linejoin: round; }
-text { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type B TT'; font-size: 4.13px; }
+text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type B TT', 'DejaVu Sans Condensed', 'Liberation Sans', 'Arial Narrow', 'Arial'; font-size: 4.13px; }
 .cut { fill: black; stroke: black; stroke-linecap: 'round'; stroke-width: 0.35; fill-rule: evenodd; }
 .projection { fill: white; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
+.surface { stroke: none; fill: #fff; fill-rule: evenodd; }
 .annotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .IfcAnnotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
+.IfcGeographicElement { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 1; }
 .PredefinedType-LINEWORK { stroke: black; stroke-width: 0.25; }
 .PredefinedType-BACKGROUND { stroke: black; stroke-width: 0.18; }
 .PredefinedType-GRID { marker-start: url(#grid-marker); marker-end: url(#grid-marker); }
@@ -32,23 +34,27 @@ text { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type B TT';
 .PredefinedType-PLANLEVEL { marker-end: url(#plan-level-marker); }
 .PredefinedType-DIMENSION { marker-start: url(#dimension-marker-start); marker-end: url(#dimension-marker-end); }
 .PredefinedType-ANGLE { marker-start: url(#angle-marker-start); marker-end: url(#angle-marker-end); }
-.PredefinedType-RADIUS { marker-end: url(#radius-marker-end); }
+.PredefinedType-RADIUS { marker-end: url(#fall-marker-end); }
+.PredefinedType-FALL { marker-end: url(#radius-marker-end); }
+.PredefinedType-SLOPEANGLE { marker-end: url(#radius-marker-end); }
+.PredefinedType-SLOPEPERCENT { marker-end: url(#radius-marker-end); }
+.PredefinedType-SLOPEFRACTION { marker-end: url(#radius-marker-end); }
 .PredefinedType-DIAMETER { marker-start: url(#diameter-marker-start); marker-end: url(#diameter-marker-end); }
 .PredefinedType-HIDDENLINE { stroke-dasharray: 3, 2; }
 .PredefinedType-STAIRARROW { marker-start: url(#stair-marker-start); marker-end: url(#stair-marker-end); }
 .PredefinedType-BOUNDARY { fill: none; stroke: red; stroke-width: 1; stroke-dasharray: 12, 4, 3, 4, 3, 4; }
-.PredefinedType-BATTING { marker-start: url(#batting); stroke: none; }
 .PredefinedType-SEALANT { fill: url(#crosshatch1); stroke-width: 0.25; }
 .PredefinedType-FILLAREA { fill: white; stroke: black; }
 .PredefinedType-BREAKLINE { fill: none; stroke: black; stroke-width: 0.25; marker-mid: url(#breakline-marker); }
 .PredefinedType-TEXT { fill: black; stroke: none; }
 path.PredefinedType-TEXTLEADER { marker-end: url(#leader-marker); }
-text.PredefinedType-TEXTLEADER { fill: black; stroke: none; }
-text.title { /* 7mm */ font-size: 11.55px; }
-text.header { /* 5mm */ font-size: 8.25px; }
-text.large { /* 3.5mm */ font-size: 5.78px; }
-text.regular { /* 2.5mm */ font-size: 4.13px; }
-text.small { /* 1.8mm */ font-size: 2.97px; }
+text.PredefinedType-TEXTLEADER, tspan.PredefinedType-TEXTLEADER { fill: black; stroke: none; }
+text.title, tspan.title { /* 7mm */ font-size: 11.55px; }
+text.header, tspan.header { /* 5mm */ font-size: 8.25px; }
+text.large, tspan.large { /* 3.5mm */ font-size: 5.78px; }
+text.regular, tspan.regular { /* 2.5mm */ font-size: 4.13px; }
+text.small, tspan.small { /* 1.8mm */ font-size: 2.97px; }
+text.GRID, tspan.GRID { /* 5mm */ font-size: 8.25px; }
 .material-blank { fill: white; }
 .material-diagonal1 { fill: url(#diagonal1); }
 .material-diagonal2 { fill: url(#diagonal2); }
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <marker id="batting" markerHeight="10" markerWidth="4" orient="auto" refX="0" refY="5" markerUnits="userSpaceOnUse">
        <!-- Tip: https://svg-path-visualizer.netlify.app/ -->
-        <path style="fill: none; stroke:black; stroke-width:0.18" d="M 0 2 A 2 2 0 0 1 4 2 L 2 8 M 0 2 L 2 8 A 2 2 0 0 0 4 10 M 2 8 A 2 2 0 0 1 0 10" />
-    </marker>
+        <!-- Tip: https://www.svgviewer.dev/ -->
    <marker id="eng-dimension-marker-start" markerHeight="14" markerWidth="11" orient="auto" refX="1" refY="7">
        <g>
            <path d="M 11 3.5 L 11 10.5 L 1 7" class="annotation" style="fill:black;" />
@@ -21,6 +19,12 @@
            <path d="M 0 3.5 L 0 10.5 L 10 7" class="annotation" style="fill:black;" />
        </g>
    </marker>
+    <!-- same as for the radius -->
+    <marker id="fall-marker-end" markerHeight="14" markerWidth="11" orient="auto" refX="10" refY="7">
+        <g>
+            <path d="M 0 3.5 L 0 10.5 L 10 7" class="annotation" style="fill:black;" />
+        </g>
+    </marker>
    <marker id="angle-marker-start" markerHeight="14" markerWidth="11" orient="auto" refX="1" refY="7">
        <g>
            <path d="M 11 3.5 L 11 10.5 L 1 7" class="annotation" style="fill:black;" />
@@ -92,4 +96,12 @@
            <path d="M 7.5 10 L 10 0 L 15 10" class="annotation" style="stroke-width:1; fill: white;" />
        </g>
    </marker>
+    <filter x="0" y="0" width="1" height="1" id="fill-background">
+      <feFlood flood-color="white" result="bg" />
+      <feMerge>
+        <feMergeNode in="bg"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+
 </svg>
@@ -17,16 +17,49 @@
    <line x1="0" y1="0" x2="0" y2="3" style="stroke:black; stroke-width:0.25" />
 </pattern>
 <pattern id="square1" width="1" height="1" patternUnits="userSpaceOnUse">
-    <line x1="0" y1="0" x2="0" y2="1" style="stroke:black; stroke-width:0.25" />
-    <line x1="0" y1="0" x2="1" y2="0" style="stroke:black; stroke-width:0.25" />
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 1 0 1 1" />
 </pattern>
 <pattern id="square2" width="2" height="2" patternUnits="userSpaceOnUse">
-    <line x1="0" y1="0" x2="0" y2="2" style="stroke:black; stroke-width:0.25" />
-    <line x1="0" y1="0" x2="2" y2="0" style="stroke:black; stroke-width:0.25" />
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 2" />
 </pattern>
 <pattern id="square3" width="3" height="3" patternUnits="userSpaceOnUse">
-    <line x1="0" y1="0" x2="0" y2="3" style="stroke:black; stroke-width:0.25" />
-    <line x1="0" y1="0" x2="3" y2="0" style="stroke:black; stroke-width:0.25" />
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 3 0 3 3" />
+</pattern>
+<pattern id="recth1" width="2" height="1" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 1" />
+</pattern>
+<pattern id="recth2" width="4" height="2" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 4 0 4 2" />
+</pattern>
+<pattern id="recth3" width="6" height="3" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 6 0 6 3" />
+</pattern>
+<pattern id="rectv1" width="1" height="2" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 1 0 1 2" />
+</pattern>
+<pattern id="rectv2" width="2" height="4" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 4" />
+</pattern>
+<pattern id="rectv3" width="3" height="6" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 3 0 3 6" />
+</pattern>
+<pattern id="tile1" width="2" height="2" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 2 0 2 1 0 1 M 1 1 1 2" />
+</pattern>
+<pattern id="tile2" width="4" height="4" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 4 0 4 2 0 2 M 2 2 2 4" />
+</pattern>
+<pattern id="tile3" width="6" height="6" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 6 0 6 3 0 3 M 3 3 3 6" />
+</pattern>
+<pattern id="board1" width="4" height="2" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 4 0 4 1 0 1 M 2 1 2 2" />
+</pattern>
+<pattern id="board2" width="8" height="4" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 8 0 8 2 0 2 M 4 2 4 4" />
+</pattern>
+<pattern id="board3" width="12" height="6" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 12 0 12 3 0 3 M 6 3 6 6" />
 </pattern>
 <pattern id="crosshatch1" width="1" height="1" patternTransform="rotate(45 0 0)" patternUnits="userSpaceOnUse">
    <line x1="0" y1="0" x2="0" y2="1" style="stroke:black; stroke-width:0.25" />
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="rectangle-tag">
+        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="triangle-tag">
+        <path style="fill: white; stroke: black; stroke-width: 0.25;" d="M 3.1409425e-7,-7.1069207 5.7650623,2.8784603 l -11.5301246,-6e-7 z" />
+    </g>
+    <g id="hexagon-tag">
+        <path style="fill: white; stroke: black; stroke-width: 0.25;" d="m 0.0161133,-6.0583333 5.2339915,3.8366023 -2.031433,6.1633977 c 0,0 -6.4894866,-0.027414 -6.4894866,-0.027414 l -1.97929,-6.1803395 5.2662181,-3.7922467" />
+    </g>
+    <g id="capsule-tag">
+        <rect x="-6" y="-2.5" width="12" height="5" rx="2.5" ry="2.5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="circle-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="door-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <text y="-1.75" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+        <line x1="-5" x2="5" style="stroke: black; stroke-width: 0.25;" />
+        <text y="2.5" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+    </g>
+    <g id="space-tag">
+        <text y="-5" class="large" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <text class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+        <text y="5" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+    </g>
+    <g id="elevation-arrow">
+        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
+    </g>
+    <g id="elevation-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
+    </g>
+    <g id="section-arrow">
+        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
+    </g>
+    <g id="section-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
+    </g>
+</svg>
@@ -1,13 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION((),'2;1');
-FILE_NAME('EPset_Annotation.ifc','2020-01-01T00:00:00',(),(),'EPset_Annotation','EPset_Annotation',$);
-FILE_SCHEMA(('IFC4'));
-ENDSEC;
-DATA;
-#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4));
-#2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
-#3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#4=IFCSIMPLEPROPERTYTEMPLATE('3q0oxMUKP47vZ4jnyG$dDb',$,'Classes','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-ENDSEC;
-END-ISO-10303-21;
@@ -5,20 +5,24 @@ FILE_NAME('EPset_Drawing.ifc','2020-01-01T00:00:00',(),(),'EPset_Drawing','EPset
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15));
+#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15,#16,#17,#18,#19));
 #2=IFCSIMPLEPROPERTYTEMPLATE('23JavTMk98ZxXhrUEnjAcf',$,'TargetView','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#3=IFCSIMPLEPROPERTYTEMPLATE('1yVWUt5H9DAOuu0OaMMLpe',$,'Scale','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#4=IFCSIMPLEPROPERTYTEMPLATE('3gsuPBtU93b8f0gg1pjkq6',$,'HumanScale','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('1yVWUt5H9DAOuu0OaMMLpe',$,'Scale','The scale of this drawing represented as a numerator and denominator, such as 1/100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('3gsuPBtU93b8f0gg1pjkq6',$,'HumanScale','The scale of this drawing in human readable format, such as 1:100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #5=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #6=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #7=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #8=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #9=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#10=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#11=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#10=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','Selector expression to include ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 #12=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
 #13=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
 #14=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
 #15=IFCSIMPLEPROPERTYTEMPLATE('2sHDBuW7P4TROy$hL2w7ct',$,'Patterns','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#16=IFCSIMPLEPROPERTYTEMPLATE('1$xfo9EVb26QLqmPll2_RK',$,'MetricPrecision','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
+#17=IFCSIMPLEPROPERTYTEMPLATE('38uAtrp9nD_901NO42zd$7',$,'ImperialPrecision','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#18=IFCSIMPLEPROPERTYTEMPLATE('1MX0uffTL6TOvtvEJpxFmk',$,'DecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
+#19=IFCSIMPLEPROPERTYTEMPLATE('0joEq0Rd10cxweEh0NeHT6',$,'JoinCriteria','Comma separated selection keys which determine what cut objects are to be joined.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 ENDSEC;
 END-ISO-10303-21;
@@ -0,0 +1,34 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((),'2;1');
+FILE_NAME('Psets_BBIM_Annotation.ifc','2020-01-01T00:00:00',(),(),'Psets_BBIM_Annotation','Psets_BBIM_Annotation',$);
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#2,#3,#4));
+#2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('3q0oxMUKP47vZ4jnyG$dDb',$,'Classes','Classes separarated by spaces that end up in classes for this element in svg. Can be used to specify the text font size: small - 1.8mm; regular - 2.5mm; large - 3.5mm; header - 5mm; title - 7mm. By default regular size is used.',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#5=IFCPROPERTYSETTEMPLATE('0iKwujnQL9IevVQato8f7Z',$,'BBIM_Batting','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#6,#7));
+#6=IFCSIMPLEPROPERTYTEMPLATE('0t2LEesGT1QRQtrIZUAR8L',$,'Thickness','Batting thickness',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure',$,$,$,$,$,.READWRITE.);
+#7=IFCSIMPLEPROPERTYTEMPLATE('082PndS6v2kBOiJoSboMnh',$,'Reverse pattern direction','Reverse batting pattern (swap starting and ending points)',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#8=IFCPROPERTYSETTEMPLATE('1Dx2EiZnP67xotInXpwz90',$,'BBIM_Section','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#9,#10,#11,#12,#13));
+#9=IFCSIMPLEPROPERTYTEMPLATE('2a_9s8spHDc9dZHtgg71XL',$,'ShowStartArrow','Display start arrow.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#10=IFCSIMPLEPROPERTYTEMPLATE('3i6SH_GbT7zhKea$wVE56A',$,'StartArrowSymbol','Custom symbol for the start of the section marker arrow. Need to make sure it''s present in "symbols.svg".',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('1DtsPn5a9FG8$zXHDDMavY',$,'ShowEndArrow','Display end arrow.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#12=IFCSIMPLEPROPERTYTEMPLATE('2$6U0mLI9AiPRWeBabdY3u',$,'EndArrowSymbol','Custom symbol for the end of the section marker arrow. Need to make sure it''s present in "symbols.svg".',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#13=IFCSIMPLEPROPERTYTEMPLATE('1naFqntIL7igCY7hCaE7kq',$,'HasConnectedSectionLine','Connect or disconnect section markers with line (by default = True).',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#14=IFCPROPERTYSETTEMPLATE('3V8oZ8YRD3_O7uR5vcUleS',$,'BBIM_Documentation','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#15,#16,#17,#18,#19,#20,#21,#22));
+#15=IFCSIMPLEPROPERTYTEMPLATE('0ulAhgk3v9qfGlDILauR6J',$,'SheetsDir','Default sheets directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#16=IFCSIMPLEPROPERTYTEMPLATE('2yvlVKiQXASucfH40deCvu',$,'LayoutsDir','Default layouts directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#17=IFCSIMPLEPROPERTYTEMPLATE('2kXZqXicL3jRwsOnLM_0ho',$,'TitleblocksDir','Default titleblocks directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#18=IFCSIMPLEPROPERTYTEMPLATE('1lmOfo9Bf9beMBJkCZKf5Y',$,'DrawingsDir','Default drawings directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#19=IFCSIMPLEPROPERTYTEMPLATE('30cOKpb4D9CADKM04$N9X3',$,'StylesheetPath','Default stylesheet CSS',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#20=IFCSIMPLEPROPERTYTEMPLATE('23tejOrxj859R_eCRp1AFP',$,'MarkersPath','Default markers SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#21=IFCSIMPLEPROPERTYTEMPLATE('1UDakJ5_f7kBhggNSW4$h5',$,'SymbolsPath','Default symbols SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#22=IFCSIMPLEPROPERTYTEMPLATE('0d53LEtgLDQxnv__NfgH7i',$,'PatternsPath','Default patterns SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#23=IFCPROPERTYSETTEMPLATE('0I9merLinF5Ap$aZwaclgm',$,'BBIM_Dimension','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#24,#25));
+#24=IFCSIMPLEPROPERTYTEMPLATE('1rL2AbQsXD8RbpoWH5pYOV',$,'ShowDescriptionOnly','Hide the measurement values and show only annotation description',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#25=IFCSIMPLEPROPERTYTEMPLATE('0SVyOfB0rC2xNfdRYf3XvY',$,'SuppressZeroInches','Suppress 0 inch values in dimension annotation text (for example: 12'' - 0" -> 12'')',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+ENDSEC;
+END-ISO-10303-21;
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="rectangle-tag">
-        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-    </g>
-    <g id="door-tag">
-        <circle cy="1.75" r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-        <line x1="-5" y1="1.75" x2="5" y2="1.75" style="stroke: black; stroke-width: 0.25;" />
-    </g>
-    <g id="elevation-arrow">
-        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
-    </g>
-    <g id="elevation-tag">
-        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
-    </g>
-    <g id="section-arrow">
-        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
-    </g>
-    <g id="section-tag">
-        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
-    </g>
-</svg>
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
   viewBox="0 0 841 594"
   id="root"
   version="1.1"
   height="594mm"
-   width="841mm">
+   width="841mm"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
  <defs
     id="defs901" />
  <metadata
@@ -20,7 +20,6 @@
        <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>
@@ -44,146 +43,10 @@
       width="3027.1016"
       id="rect116616"
       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.88976377;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       id="text116526"
-       y="909.15491"
-       x="113.70713"
-       style="font-style:normal;font-weight:normal;font-size:15.1536px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.1536px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none"
-         y="909.15491"
-         x="113.70713"
-         id="tspan116524">REV. NO.</tspan></text>
    <path
       id="path116530"
       d="M 75.590564,895.24802 H 3102.9921"
       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path116532"
-       d="M 151.6811,895.24802 V 1046.9291"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 454.04331,895.24802 V 1046.9291"
-       id="path116534" />
-    <path
-       id="path116536"
-       d="M 529.63386,895.24802 V 1046.4302"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 605.22441,895.24802 V 1046.9291"
-       id="path116538" />
-    <path
-       id="path116540"
-       d="M 75.590564,914.14565 H 605.22441"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 75.590564,933.04329 H 605.22441"
-       id="path116542" />
-    <path
-       id="path116544"
-       d="M 75.590564,951.94093 H 605.22441"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 75.590564,970.83857 H 605.22441"
-       id="path116546" />
-    <path
-       id="path116548"
-       d="M 75.590564,989.73621 H 605.22441"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 75.590564,1008.6338 H 605.22441"
-       id="path116550" />
-    <path
-       id="path116552"
-       d="M 75.590564,1027.5315 H 605.22441"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path116576"
-       d="M 2800.5,895.24802 V 1046.9291"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path116578"
-       d="m 2800.5,1008.6338 h 302.4921"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path116598"
-       d="m 3027.4027,1008.6338 v 38.2953"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:15.1536px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       x="302.86591"
-       y="909.15491"
-       id="text1395"><tspan
-         id="tspan1393"
-         x="302.86591"
-         y="909.15491"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.1536px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
-    <text
-       id="text1399"
-       y="909.15491"
-       x="491.97513"
-       style="font-style:normal;font-weight:normal;font-size:15.1536px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.1536px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none"
-         y="909.15491"
-         x="491.97513"
-         id="tspan1397">AUTHOR</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:16.0591px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       x="568.05585"
-       y="909.15485"
-       id="text1403"><tspan
-         id="tspan1401"
-         x="568.05585"
-         y="909.15485"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.0591px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:11.2271px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       x="2839.5081"
-       y="1020.4988"
-       id="text1421"><tspan
-         id="tspan1419"
-         x="2839.5081"
-         y="1020.4988"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.2271px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none">DRAWING NUMBER</tspan></text>
-    <text
-       id="text1429"
-       y="1020.4988"
-       x="3038.5586"
-       style="font-style:normal;font-weight:normal;font-size:11.2271px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.2271px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none"
-         y="1020.4988"
-         x="3038.5586"
-         id="tspan1427">REV</tspan></text>
-    <text
-       id="text2529"
-       y="1036.1166"
-       x="3030.9653"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3918px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.999999px"
-         y="1036.1166"
-         x="3030.9653"
-         id="tspan2527">{{Revision}}</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3918px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="2804.7021"
-       y="1036.1166"
-       id="text2533"><tspan
-         id="tspan2531"
-         x="2804.7021"
-         y="1036.1166"
-         style="stroke-width:0.999999px">{{Identification}} - {{Name}}</tspan></text>
  </g>
  <g
     transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)"
@@ -205,4 +68,260 @@
     transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)"
     id="g90677"
     style="stroke-width:3.77953" />
+  <g
+     id="g38171"
+     transform="translate(411.014,286.96036)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,246.86771 V 286.75"
+       id="path116576" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,276.8677 H 410"
+       id="path116578" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 390.00031,276.8677 V 287"
+       id="path116598" />
+    <text
+       id="text1421"
+       y="280.00699"
+       x="340.28653"
+       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="280.00699"
+         x="340.28653"
+         id="tspan1419">DRAWING NUMBER</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="393.00568"
+       y="280.0592"
+       id="text1429"><tspan
+         id="tspan1427"
+         x="393.00568"
+         y="280.0592"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none">REV</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="390.94287"
+       y="284.13919"
+       id="text2529"><tspan
+         id="tspan2527"
+         x="390.94287"
+         y="284.13919"
+         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
+    <text
+       id="text2533"
+       y="284.13919"
+       x="331.07742"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.265;stroke-dasharray:none"
+         y="284.13919"
+         x="331.07742"
+         id="tspan2531">{{Identification}}</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,266.868 H 410"
+       id="path36736" />
+    <text
+       id="text36740"
+       y="270.05899"
+       x="339.00919"
+       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none"
+         y="270.05899"
+         x="339.00919"
+         id="tspan36738">DRAWING TITLE</tspan></text>
+    <text
+       id="text36744"
+       y="275.05634"
+       x="330.99438"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.96055px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.371;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.371;stroke-dasharray:none"
+         y="275.05634"
+         x="330.99438"
+         id="tspan36742">{{Name}}</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 390.00031,246.86771 V 266.993"
+       id="path36746" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="397.04108"
+       y="249.72177"
+       id="text36677"><tspan
+         id="tspan36675"
+         x="397.04108"
+         y="249.72177"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">GRID NORTH</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="338.77008"
+       y="249.72177"
+       id="text36752"><tspan
+         id="tspan36750"
+         x="335.76562"
+         y="249.72177"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">COMPANY</tspan></text>
+    <g
+       id="g37148"
+       transform="translate(399.87519,258.25776)">
+      <g
+         id="g37140"
+         data-type="grid-north">
+        <path
+           id="path11652"
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="M 0,0 V 7.12566 Z" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="M 7.3079,3e-5 H -7.30798"
+           id="path36547" />
+        <circle
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           id="path36601"
+           cx="-3.8305665e-05"
+           cy="4.15625e-05"
+           r="5" />
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="m -5.00004,4e-5 5,-5 5,5 H 3.94162 L -4e-5,-3.94162 -3.9417,4e-5 Z"
+           id="path36671" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-dasharray:none"
+           d="M -4e-5,-7.12545 V 3e-5"
+           id="path36673" />
+      </g>
+    </g>
+  </g>
+  <g
+     id="g38492"
+     transform="translate(9.7896584,287.21036)">
+    <text
+       id="text116526"
+       y="250.54721"
+       x="20.085007"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="250.54721"
+         x="20.085007"
+         id="tspan116524">REV. NO.</tspan></text>
+    <path
+       id="path116532"
+       d="M 30.132288,246.86771 V 287"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 110.13229,246.86771 V 287"
+       id="path116534" />
+    <path
+       id="path116536"
+       d="M 130.13229,246.86771 V 286.868"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 150.13229,246.86771 V 287"
+       id="path116538" />
+    <path
+       id="path116540"
+       d="M 10,251.86771 H 170.132"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10,256.86771 H 170.132"
+       id="path116542" />
+    <path
+       id="path116544"
+       d="M 10,261.86771 H 170.132"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10,266.86771 H 170.132"
+       id="path116546" />
+    <path
+       id="path116548"
+       d="M 10,271.86771 H 170.132"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10,276.8677 H 170.132"
+       id="path116550" />
+    <path
+       id="path116552"
+       d="M 10,281.86772 H 170.132"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="70.13327"
+       y="250.54721"
+       id="text1395"><tspan
+         id="tspan1393"
+         x="70.13327"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
+    <text
+       id="text1399"
+       y="250.54721"
+       x="120.16841"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="250.54721"
+         x="120.16841"
+         id="tspan1397">AUTHOR</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="140.29811"
+       y="250.54721"
+       id="text1403"><tspan
+         id="tspan1401"
+         x="140.29811"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">ISSUED</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="180.14232"
+       y="250.54721"
+       id="text36130"><tspan
+         id="tspan36128"
+         x="175.72011"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">NOTES</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="194.37886"
+       y="255.5477"
+       id="text36768"><tspan
+         id="tspan36766"
+         x="189.95665"
+         y="255.5477"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DO NOT SCALE DRAWINGS</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 170.132,246.86771 V 287"
+       id="path36836" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="160.29811"
+       y="250.54721"
+       id="text36842"><tspan
+         id="tspan36840"
+         x="160.29811"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
+  </g>
 </svg>
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
   width="594mm"
   height="420mm"
   version="1.1"
   id="root"
-   viewBox="0 0 594 420">
+   viewBox="0 0 594 420"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
  <defs
     id="defs901" />
  <metadata
@@ -20,7 +20,6 @@
        <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>
@@ -40,146 +39,10 @@
     width="553.5"
     id="rect116616"
     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <text
-     id="text116526"
-     y="363.54721"
-     x="30.085009"
-     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-       y="363.54721"
-       x="30.085009"
-       id="tspan116524">REV. NO.</tspan></text>
  <path
     id="path116530"
     d="m 20.000001,359.86771 553.749999,0"
     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     id="path116532"
-     d="M 40.132289,359.86771 V 400"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 120.13229,359.86771 V 400"
-     id="path116534" />
-  <path
-     id="path116536"
-     d="M 140.13229,359.86771 V 399.868"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 160.13229,359.86771 V 400"
-     id="path116538" />
-  <path
-     id="path116540"
-     d="M 20.000001,364.86771 H 160.13229"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 20.000001,369.86771 H 160.13229"
-     id="path116542" />
-  <path
-     id="path116544"
-     d="M 20.000001,374.86771 H 160.13229"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 20.000001,379.86771 H 160.13229"
-     id="path116546" />
-  <path
-     id="path116548"
-     d="M 20.000001,384.86771 H 160.13229"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 20.000001,389.8677 H 160.13229"
-     id="path116550" />
-  <path
-     id="path116552"
-     d="M 20.000001,394.86772 H 160.13229"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     x="80.13327"
-     y="363.54721"
-     id="text1395"><tspan
-       id="tspan1393"
-       x="80.13327"
-       y="363.54721"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
-  <text
-     id="text1399"
-     y="363.54721"
-     x="130.16841"
-     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-       y="363.54721"
-       x="130.16841"
-       id="tspan1397">AUTHOR</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     x="150.29811"
-     y="363.54721"
-     id="text1403"><tspan
-       id="tspan1401"
-       x="150.29811"
-       y="363.54721"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
-  <path
-     id="path116576"
-     d="M 493.96563,359.86771 V 400"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     id="path116578"
-     d="M 493.96563,389.8677 H 574"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     id="path116598"
-     d="M 554.00031,389.8677 V 400"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     x="504.28653"
-     y="393.00699"
-     id="text1421"><tspan
-       id="tspan1419"
-       x="504.28653"
-       y="393.00699"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DRAWING NUMBER</tspan></text>
-  <text
-     id="text1429"
-     y="393.00699"
-     x="556.9519"
-     style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-       y="393.00699"
-       x="556.9519"
-       id="tspan1427">REV</tspan></text>
-  <text
-     id="text2529"
-     y="397.13919"
-     x="554.94287"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     xml:space="preserve"><tspan
-       style="stroke-width:0.264583px"
-       y="397.13919"
-       x="554.94287"
-       id="tspan2527">{{Revision}}</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     x="495.07742"
-     y="397.13919"
-     id="text2533"><tspan
-       id="tspan2531"
-       x="495.07742"
-       y="397.13919"
-       style="stroke-width:0.264583px">{{Identification}} - {{Name}}</tspan></text>
  <g
     style="stroke-width:3.77953"
     id="g90669"
@@ -200,4 +63,260 @@
     style="stroke-width:3.77953"
     id="g90677"
     transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)" />
+  <g
+     id="g38171"
+     transform="translate(163.75769,113)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,246.86771 V 286.75"
+       id="path116576" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,276.8677 H 410"
+       id="path116578" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 390.00031,276.8677 V 287"
+       id="path116598" />
+    <text
+       id="text1421"
+       y="280.00699"
+       x="340.28653"
+       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="280.00699"
+         x="340.28653"
+         id="tspan1419">DRAWING NUMBER</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="393.00568"
+       y="280.0592"
+       id="text1429"><tspan
+         id="tspan1427"
+         x="393.00568"
+         y="280.0592"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none">REV</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="390.94287"
+       y="284.13919"
+       id="text2529"><tspan
+         id="tspan2527"
+         x="390.94287"
+         y="284.13919"
+         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
+    <text
+       id="text2533"
+       y="284.13919"
+       x="331.07742"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.265;stroke-dasharray:none"
+         y="284.13919"
+         x="331.07742"
+         id="tspan2531">{{Identification}}</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,266.868 H 410"
+       id="path36736" />
+    <text
+       id="text36740"
+       y="270.05899"
+       x="339.00919"
+       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none"
+         y="270.05899"
+         x="339.00919"
+         id="tspan36738">DRAWING TITLE</tspan></text>
+    <text
+       id="text36744"
+       y="275.05634"
+       x="330.99438"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.96055px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.371;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.371;stroke-dasharray:none"
+         y="275.05634"
+         x="330.99438"
+         id="tspan36742">{{Name}}</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 390.00031,246.86771 V 266.993"
+       id="path36746" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="397.04108"
+       y="249.72177"
+       id="text36677"><tspan
+         id="tspan36675"
+         x="397.04108"
+         y="249.72177"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">GRID NORTH</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="338.77008"
+       y="249.72177"
+       id="text36752"><tspan
+         id="tspan36750"
+         x="335.76562"
+         y="249.72177"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">COMPANY</tspan></text>
+    <g
+       id="g37148"
+       transform="translate(399.87519,258.25776)">
+      <g
+         id="g37140"
+         data-type="grid-north">
+        <path
+           id="path11652"
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="M 0,0 V 7.12566 Z" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="M 7.3079,3e-5 H -7.30798"
+           id="path36547" />
+        <circle
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           id="path36601"
+           cx="-3.8305665e-05"
+           cy="4.15625e-05"
+           r="5" />
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="m -5.00004,4e-5 5,-5 5,5 H 3.94162 L -4e-5,-3.94162 -3.9417,4e-5 Z"
+           id="path36671" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-dasharray:none"
+           d="M -4e-5,-7.12545 V 3e-5"
+           id="path36673" />
+      </g>
+    </g>
+  </g>
+  <g
+     id="g38492"
+     transform="translate(10.000001,113)">
+    <text
+       id="text116526"
+       y="250.54721"
+       x="20.085007"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="250.54721"
+         x="20.085007"
+         id="tspan116524">REV. NO.</tspan></text>
+    <path
+       id="path116532"
+       d="M 30.132288,246.86771 V 287"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 110.13229,246.86771 V 287"
+       id="path116534" />
+    <path
+       id="path116536"
+       d="M 130.13229,246.86771 V 286.868"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 150.13229,246.86771 V 287"
+       id="path116538" />
+    <path
+       id="path116540"
+       d="M 10,251.86771 H 170.132"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10,256.86771 H 170.132"
+       id="path116542" />
+    <path
+       id="path116544"
+       d="M 10,261.86771 H 170.132"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10,266.86771 H 170.132"
+       id="path116546" />
+    <path
+       id="path116548"
+       d="M 10,271.86771 H 170.132"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10,276.8677 H 170.132"
+       id="path116550" />
+    <path
+       id="path116552"
+       d="M 10,281.86772 H 170.132"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="70.13327"
+       y="250.54721"
+       id="text1395"><tspan
+         id="tspan1393"
+         x="70.13327"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
+    <text
+       id="text1399"
+       y="250.54721"
+       x="120.16841"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="250.54721"
+         x="120.16841"
+         id="tspan1397">AUTHOR</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="140.29811"
+       y="250.54721"
+       id="text1403"><tspan
+         id="tspan1401"
+         x="140.29811"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">ISSUED</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="180.14232"
+       y="250.54721"
+       id="text36130"><tspan
+         id="tspan36128"
+         x="175.72011"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">NOTES</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="194.37886"
+       y="255.5477"
+       id="text36768"><tspan
+         id="tspan36766"
+         x="189.95665"
+         y="255.5477"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DO NOT SCALE DRAWINGS</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 170.132,246.86771 V 287"
+       id="path36836" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="160.29811"
+       y="250.54721"
+       id="text36842"><tspan
+         id="tspan36840"
+         x="160.29811"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
+  </g>
 </svg>
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
   width="420mm"
   height="297mm"
   version="1.1"
   id="root"
-   viewBox="0 0 420 297">
+   viewBox="0 0 420 297"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
  <defs
     id="defs901" />
  <metadata
@@ -20,7 +20,6 @@
        <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>
@@ -40,150 +39,10 @@
     width="399.5"
     id="rect116616"
     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.49999897;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <text
-     id="text116526"
-     y="250.54721"
-     x="20.085007"
-     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-       y="250.54721"
-       x="20.085007"
-       id="tspan116524">REV. NO.</tspan></text>
  <path
     id="path116530"
     d="m 10,246.86771 399.75,0"
     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     id="path116532"
-     d="M 30.132288,246.86771 V 287"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 110.13229,246.86771 V 287"
-     id="path116534" />
-  <path
-     id="path116536"
-     d="M 130.13229,246.86771 V 286.868"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 150.13229,246.86771 V 287"
-     id="path116538" />
-  <path
-     id="path116540"
-     d="M 10,251.86771 H 150.13229"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 10,256.86771 H 150.13229"
-     id="path116542" />
-  <path
-     id="path116544"
-     d="M 10,261.86771 H 150.13229"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 10,266.86771 H 150.13229"
-     id="path116546" />
-  <path
-     id="path116548"
-     d="M 10,271.86771 H 150.13229"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 10,276.8677 H 150.13229"
-     id="path116550" />
-  <path
-     id="path116552"
-     d="M 10,281.86772 H 150.13229"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     x="70.13327"
-     y="250.54721"
-     id="text1395"><tspan
-       id="tspan1393"
-       x="70.13327"
-       y="250.54721"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
-  <text
-     id="text1399"
-     y="250.54721"
-     x="120.16841"
-     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-       y="250.54721"
-       x="120.16841"
-       id="tspan1397">AUTHOR</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     x="140.29811"
-     y="250.54721"
-     id="text1403"><tspan
-       id="tspan1401"
-       x="140.29811"
-       y="250.54721"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
-  <g
-     transform="translate(-154)"
-     id="g3735">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 483.96563,246.86771 V 287"
-       id="path116576" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 483.96563,276.8677 H 564"
-       id="path116578" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 544.00031,276.8677 V 287"
-       id="path116598" />
-    <text
-       id="text1421"
-       y="280.00699"
-       x="494.28653"
-       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="280.00699"
-         x="494.28653"
-         id="tspan1419">DRAWING NUMBER</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="546.9519"
-       y="280.00699"
-       id="text1429"><tspan
-         id="tspan1427"
-         x="546.9519"
-         y="280.00699"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">REV</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="544.94287"
-       y="284.13919"
-       id="text2529"><tspan
-         id="tspan2527"
-         x="544.94287"
-         y="284.13919"
-         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
-    <text
-       id="text2533"
-       y="284.13919"
-       x="485.07742"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.264583px"
-         y="284.13919"
-         x="485.07742"
-         id="tspan2531">{{Identification}} - {{Name}}</tspan></text>
-  </g>
  <g
     style="stroke-width:3.77953"
     id="g90669"
@@ -204,4 +63,271 @@
     style="stroke-width:3.77953"
     id="g90677"
     transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:100%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="162.3047"
+     y="256.66803"
+     id="text36756" />
+  <text
+     xml:space="preserve"
+     style="font-size:20.4013px;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT, Normal';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264999;stroke-linecap:round;stroke-dasharray:none"
+     x="161.2028"
+     y="266.93387"
+     id="text36760" />
+  <g
+     id="g38492">
+    <text
+       id="text116526"
+       y="250.54721"
+       x="20.085007"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="250.54721"
+         x="20.085007"
+         id="tspan116524">REV. NO.</tspan></text>
+    <path
+       id="path116532"
+       d="M 30.132288,246.86771 V 287"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 110.13229,246.86771 V 287"
+       id="path116534" />
+    <path
+       id="path116536"
+       d="M 130.13229,246.86771 V 286.868"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 150.13229,246.86771 V 287"
+       id="path116538" />
+    <path
+       id="path116540"
+       d="m 10,251.86771 160.132,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10,256.86771 160.132,0"
+       id="path116542" />
+    <path
+       id="path116544"
+       d="m 10,261.86771 160.132,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10,266.86771 160.132,0"
+       id="path116546" />
+    <path
+       id="path116548"
+       d="m 10,271.86771 160.132,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10,276.8677 160.132,0"
+       id="path116550" />
+    <path
+       id="path116552"
+       d="m 10,281.86772 160.132,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="70.13327"
+       y="250.54721"
+       id="text1395"><tspan
+         id="tspan1393"
+         x="70.13327"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
+    <text
+       id="text1399"
+       y="250.54721"
+       x="120.16841"
+       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="250.54721"
+         x="120.16841"
+         id="tspan1397">AUTHOR</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="140.29811"
+       y="250.54721"
+       id="text1403"><tspan
+         id="tspan1401"
+         x="140.29811"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">ISSUED</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="180.14232"
+       y="250.54721"
+       id="text36130"><tspan
+         id="tspan36128"
+         x="175.72011"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">NOTES</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="194.37886"
+       y="255.5477"
+       id="text36768"><tspan
+         id="tspan36766"
+         x="189.95665"
+         y="255.5477"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DO NOT SCALE DRAWINGS</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 170.132,246.86771 V 287"
+       id="path36836" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="160.29811"
+       y="250.54721"
+       id="text36842"><tspan
+         id="tspan36840"
+         x="160.29811"
+         y="250.54721"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
+  </g>
+  <g
+     id="g38171"
+     transform="translate(-0.25000095)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,246.86771 V 286.75"
+       id="path116576" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,276.8677 H 410"
+       id="path116578" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 390.00031,276.8677 V 287"
+       id="path116598" />
+    <text
+       id="text1421"
+       y="280.00699"
+       x="340.28653"
+       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="280.00699"
+         x="340.28653"
+         id="tspan1419">DRAWING NUMBER</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="393.00568"
+       y="280.0592"
+       id="text1429"><tspan
+         id="tspan1427"
+         x="393.00568"
+         y="280.0592"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none">REV</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="390.94287"
+       y="284.13919"
+       id="text2529"><tspan
+         id="tspan2527"
+         x="390.94287"
+         y="284.13919"
+         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
+    <text
+       id="text2533"
+       y="284.13919"
+       x="331.07742"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.265;stroke-dasharray:none"
+         y="284.13919"
+         x="331.07742"
+         id="tspan2531">{{Identification}}</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 329.96563,266.868 H 410"
+       id="path36736" />
+    <text
+       id="text36740"
+       y="270.05899"
+       x="339.00919"
+       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none"
+         y="270.05899"
+         x="339.00919"
+         id="tspan36738">DRAWING TITLE</tspan></text>
+    <text
+       id="text36744"
+       y="275.05634"
+       x="330.99438"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.96055px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.371;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.371;stroke-dasharray:none"
+         y="275.05634"
+         x="330.99438"
+         id="tspan36742">{{Name}}</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 390.00031,246.86771 V 266.993"
+       id="path36746" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="397.04108"
+       y="249.72177"
+       id="text36677"><tspan
+         id="tspan36675"
+         x="397.04108"
+         y="249.72177"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">GRID NORTH</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="338.77008"
+       y="249.72177"
+       id="text36752"><tspan
+         id="tspan36750"
+         x="335.76562"
+         y="249.72177"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">COMPANY</tspan></text>
+    <g
+       id="g37148"
+       transform="translate(399.87519,258.25776)">
+      <g
+         id="g37140"
+         data-type="grid-north">
+        <path
+           id="path11652"
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="M 0,0 V 7.12566 Z" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="M 7.3079,3e-5 H -7.30798"
+           id="path36547" />
+        <circle
+           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           id="path36601"
+           cx="-3.8305665e-05"
+           cy="4.15625e-05"
+           r="5" />
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
+           d="m -5.00004,4e-5 5,-5 5,5 H 3.94162 L -4e-5,-3.94162 -3.9417,4e-5 Z"
+           id="path36671" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-dasharray:none"
+           d="M -4e-5,-7.12545 V 3e-5"
+           id="path36673" />
+      </g>
+    </g>
+  </g>
 </svg>
@@ -45,7 +45,6 @@ class IfcExporter:
        self.set_header()
        IfcStore.update_cache()
        if bpy.context.scene.BIMProjectProperties.is_authoring:
-            self.sync_deletions()
            self.sync_all_objects()
            self.sync_edited_objects()
        extension = self.ifc_export_settings.output_file.split(".")[-1].lower()
@@ -87,19 +86,6 @@ class IfcExporter:
            self.get_application_name(), self.get_application_version()
        )

-    def sync_deletions(self):
-        results = []
-        for ifc_definition_id in IfcStore.deleted_ids:
-            try:
-                product = self.file.by_id(ifc_definition_id)
-                if hasattr(product, "GlobalId"):
-                    results.append(product.GlobalId)
-            except:
-                continue
-            ifcopenshell.api.run("root.remove_product", self.file, **{"product": product})
-        IfcStore.deleted_ids.clear()
-        return results
-
    def sync_all_objects(self):
        results = []
        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
@@ -126,7 +112,8 @@ class IfcExporter:
                continue
            try:
                if isinstance(obj, bpy.types.Material):
-                    blenderbim.core.style.update_style_colours(tool.Ifc, tool.Style, obj=obj)
+                    if tool.Ifc.has_changed_shading(obj):
+                        blenderbim.core.style.update_style_colours(tool.Ifc, tool.Style, obj=obj)
                else:
                    element = tool.Ifc.get_entity(obj)
                    if element:
@@ -149,10 +136,10 @@ class IfcExporter:
        return checksum != str([s.id() for s in tool.Geometry.get_styles(obj) if s])

    def sync_object_placement(self, obj):
+        element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
        if not tool.Ifc.is_moved(obj):
            return
        blender_matrix = np.array(obj.matrix_world)
-        element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
        if (obj.scale - Vector((1.0, 1.0, 1.0))).length > 1e-4:
            bpy.ops.bim.update_representation(obj=obj.name)
            return element
@@ -47,9 +47,9 @@ def mode_callback(obj, data):
        ):
            continue
        if obj.data.BIMMeshProperties.ifc_definition_id:
-            IfcStore.edited_objs.add(obj)
+            tool.Ifc.edit(obj)
        elif IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).is_a("IfcGridAxis"):
-            IfcStore.edited_objs.add(obj)
+            tool.Ifc.edit(obj)


 def name_callback(obj, data):
@@ -94,23 +94,27 @@ def name_callback(obj, data):

 def color_callback(obj, data):
    if obj.BIMMaterialProperties.ifc_style_id:
-        IfcStore.edited_objs.add(obj)
+        tool.Ifc.edit(obj)


 def active_object_callback():
    refresh_ui_data()


-def subscribe_to(object, data_path, callback):
+def active_material_index_callback(obj, data):
+    refresh_ui_data()
+
+
+def subscribe_to(obj, data_path, callback):
    try:
-        subscribe_to = object.path_resolve(data_path, False)
+        subscribe_to = obj.path_resolve(data_path, False)
    except:
        return
    bpy.msgbus.subscribe_rna(
        key=subscribe_to,
-        owner=object,
+        owner=obj,
        args=(
-            object,
+            obj,
            data_path,
        ),
        notify=callback,
@@ -231,6 +235,11 @@ def setDefaultProperties(scene):
    ifcopenshell.api.owner.settings.get_application = get_application
    # TODO: Move to drawing module
    if len(bpy.context.scene.DocProperties.drawing_styles) == 0:
+        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
+        drawing_style.name = "Blender Default"
+        drawing_style.render_type = "DEFAULT"
+        bpy.ops.bim.save_drawing_style(index="0")
+
        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
        drawing_style.name = "Technical"
        drawing_style.render_type = "VIEWPORT"
@@ -293,8 +302,4 @@ def setDefaultProperties(scene):
                RasterStyleProperty.OVERLAY_SHOW_RELATIONSHIP_LINES.value: False,
            }
        )
-        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
-        drawing_style.name = "Blender Default"
-        drawing_style.render_type = "DEFAULT"
-        bpy.ops.bim.save_drawing_style(index="2")
        AuthoringData.type_thumbnails = {}
@@ -31,9 +31,15 @@ import blenderbim.tool as tool
 from blenderbim.bim.ifc import IfcStore


-def draw_attributes(props, layout, copy_operator=None):
+def draw_attributes(props, layout, copy_operator=None, popup_active_attribute=None):
+    """you can set attribute active in popup with `active_attribute`
+    meaning you will be able to type into attribute's field without having to click
+    on it first
+    """
    for attribute in props:
        row = layout.row(align=True)
+        if attribute == popup_active_attribute:
+            row.activate_init = True
        draw_attribute(attribute, row, copy_operator)


@@ -64,14 +70,14 @@ def draw_attribute(attribute, layout, copy_operator=None):
            text=attribute.name,
        )

+    if attribute.is_uri:
+        op = layout.operator("bim.select_uri_attribute", text="", icon="FILE_FOLDER")
+        op.data_path = attribute.path_from_id("string_value")
    if attribute.is_optional:
        layout.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
    if copy_operator:
        op = layout.operator(f"{copy_operator}", text="", icon="COPYDOWN")
        op.name = attribute.name
-    if attribute.is_uri:
-        op = layout.operator("bim.select_uri_attribute", text="", icon="FILE_FOLDER")
-        op.data_path = attribute.path_from_id("string_value")


 def import_attributes(ifc_class, props, data, callback=None):
@@ -24,6 +24,7 @@ import zipfile
 import tempfile
 import ifcopenshell
 import blenderbim.bim.handler
+import blenderbim.tool as tool
 from pathlib import Path


@@ -35,7 +36,6 @@ class IfcStore:
    cache_path = None
    id_map = {}
    guid_map = {}
-    deleted_ids = set()
    edited_objs = set()
    pset_template_path = ""
    pset_template_file = None
@@ -62,7 +62,6 @@ class IfcStore:
        IfcStore.cache_path = None
        IfcStore.id_map = {}
        IfcStore.guid_map = {}
-        IfcStore.deleted_ids = set()
        IfcStore.edited_objs = set()
        IfcStore.pset_template_path = ""
        IfcStore.pset_template_file = None
@@ -277,23 +276,6 @@ class IfcStore:
            data = {"id": element.id(), "obj": obj.name}
            IfcStore.commit_link_element(data)

-    @staticmethod
-    def delete_element(element):
-        IfcStore.deleted_ids.add(element.id())
-        if IfcStore.history:
-            data = {"id": element.id()}
-            IfcStore.history[-1]["operations"].append(
-                {"rollback": IfcStore.rollback_delete_element, "commit": IfcStore.commit_delete_element, "data": data}
-            )
-
-    @staticmethod
-    def rollback_delete_element(data):
-        IfcStore.deleted_ids.remove(data["id"])
-
-    @staticmethod
-    def commit_delete_element(data):
-        IfcStore.deleted_ids.add(data["id"])
-
    @staticmethod
    def link_element(element, obj):
        existing_obj = IfcStore.id_map.get(element.id(), None)
@@ -320,6 +302,7 @@ class IfcStore:
            blenderbim.bim.handler.subscribe_to(obj, "diffuse_color", blenderbim.bim.handler.color_callback)
        elif isinstance(obj, bpy.types.Object):
            blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
+            blenderbim.bim.handler.subscribe_to(obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback)

        for listener in IfcStore.element_listeners:
            listener(element, obj)
@@ -370,7 +353,7 @@ class IfcStore:
    def unlink_element(element=None, obj=None):
        if element is None:
            try:
-                element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
+                element = tool.Ifc.get_entity(obj)
            except:
                pass

@@ -60,7 +60,6 @@ class MaterialCreator:

    def create(self, element, obj, mesh):
        self.mesh = mesh
-        self.obj = obj
        if (hasattr(element, "Representation") and not element.Representation) or (
            hasattr(element, "RepresentationMaps") and not element.RepresentationMaps
        ):
@@ -140,11 +139,11 @@ class MaterialCreator:
    def assign_material_slots_to_faces(self):
        if "ios_materials" not in self.mesh or not self.mesh["ios_materials"]:
            return
-        if len(self.obj.material_slots) == 1:
+        if len(self.mesh.materials) == 1:
            return
        material_to_slot = {}
        for i, material in enumerate(self.mesh["ios_materials"]):
-            slot_index = self.obj.material_slots.find(self.styles[material].name)
+            slot_index = self.mesh.materials.find(self.styles[material].name)
            material_to_slot[i] = slot_index

        if len(self.mesh.polygons) == len(self.mesh["ios_material_ids"]):
@@ -242,6 +241,8 @@ class IfcImporter:
        self.profile_code("Create native elements")
        self.create_elements()
        self.profile_code("Create elements")
+        self.create_generic_elements(self.annotations)
+        self.profile_code("Create annotations")
        self.create_grids()
        self.profile_code("Create grids")
        self.create_spatial_elements()
@@ -302,12 +303,12 @@ class IfcImporter:
        )
        if self.body_contexts:
            self.settings.set_context_ids(self.body_contexts)
-        # Annotation is to accommodate broken Revit files
+        # Annotation ContextType is to accommodate broken Revit files
        # See https://github.com/Autodesk/revit-ifc/issues/187
        self.plan_contexts = [
            c.id()
            for c in self.file.by_type("IfcGeometricRepresentationContext")
-            if c.ContextType in ["Plan", "Annotation"]
+            if c.ContextType in ["Plan", "Annotation"] or c.ContextIdentifier == "Annotation"
        ]
        if self.plan_contexts:
            self.settings_2d.set_context_ids(self.plan_contexts)
@@ -321,10 +322,13 @@ class IfcImporter:
            if isinstance(self.elements, set):
                self.elements = list(self.elements)
            # TODO: enable filtering for annotations
-            self.annotations = set(self.file.by_type("IfcAnnotation"))
+            self.annotations = set([a for a in self.file.by_type("IfcAnnotation") if not a.HasAssignments])
        else:
-            self.elements = self.file.by_type("IfcElement")
-            self.annotations = set(self.file.by_type("IfcAnnotation"))
+            if self.file.schema in ("IFC2X3", "IFC4"):
+                self.elements = self.file.by_type("IfcElement") + self.file.by_type("IfcProxy")
+            else:
+                self.elements = self.file.by_type("IfcElement")
+            self.annotations = set([a for a in self.file.by_type("IfcAnnotation") if not a.HasAssignments])

        self.elements = [e for e in self.elements if not e.is_a("IfcFeatureElement")]
        if self.ifc_import_settings.is_coordinating:
@@ -335,14 +339,7 @@ class IfcImporter:
        if self.ifc_import_settings.has_filter or offset or offset_limit < len(self.elements):
            self.element_types = set([ifcopenshell.util.element.get_type(e) for e in self.elements])
        else:
-            if self.file.schema in ("IFC2X3", "IFC4"):
-                self.element_types = set(
-                    self.file.by_type("IfcElementType")
-                    + self.file.by_type("IfcDoorStyle")
-                    + self.file.by_type("IfcWindowStyle")
-                )
-            else:
-                self.element_types = set(self.file.by_type("IfcElementType"))
+            self.element_types = set(self.file.by_type("IfcTypeProduct"))

        if self.ifc_import_settings.has_filter and self.ifc_import_settings.should_filter_spatial_elements:
            self.spatial_elements = self.get_spatial_elements_filtered_by_elements(self.elements)
@@ -616,37 +613,33 @@ class IfcImporter:

    def create_element_type(self, element):
        self.ifc_import_settings.logger.info("Creating object %s", element)
-        representation_map = self.get_type_product_body_representation_map(element)
+        representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+        if not representation:
+            representation = ifcopenshell.util.representation.get_representation(element, "Plan", "Annotation")
+        if not representation:
+            representation = ifcopenshell.util.representation.get_representation(element, "Model", "Annotation")
        mesh = None
-        if representation_map:
-            representation = representation_map.MappedRepresentation
+        if representation:
            mesh_name = "{}/{}".format(representation.ContextOfItems.id(), representation.id())
            mesh = self.meshes.get(mesh_name)
            if mesh is None:
+                shape = None
                try:
-                    shape = ifcopenshell.geom.create_shape(self.settings, representation_map.MappedRepresentation)
+                    shape = ifcopenshell.geom.create_shape(self.settings, representation)
+                except:
+                    try:
+                        shape = ifcopenshell.geom.create_shape(self.settings_2d, representation)
+                    except:
+                        self.ifc_import_settings.logger.error("Failed to generate shape for %s", element)
+                if shape:
                    mesh = self.create_mesh(element, shape)
                    tool.Loader.link_mesh(shape, mesh)
                    self.meshes[mesh_name] = mesh
-                except:
-                    self.ifc_import_settings.logger.error("Failed to generate shape for %s", element)
        obj = bpy.data.objects.new(tool.Loader.get_name(element), mesh)
        self.link_element(element, obj)
        self.material_creator.create(element, obj, mesh)
        self.type_products[element.GlobalId] = obj

-    def get_type_product_body_representation_map(self, element):
-        if not element.RepresentationMaps:
-            return
-        for representation_map in element.RepresentationMaps:
-            context = representation_map.MappedRepresentation.ContextOfItems
-            if (
-                context.ContextType == "Model"
-                and context.ContextIdentifier == "Body"
-                and context.TargetView == "MODEL_VIEW"
-            ):
-                return representation_map
-
    def create_native_elements(self):
        progress = 0
        checkpoint = time.time()
@@ -916,9 +909,6 @@ class IfcImporter:

        if mesh:
            pass
-        elif element.is_a("IfcAnnotation") and element.ObjectType == "DRAWING":
-            mesh = self.create_camera(element, shape)
-            tool.Loader.link_mesh(shape, mesh)
        elif element.is_a("IfcAnnotation") and self.is_curve_annotation(element) and shape:
            mesh = self.create_curve(element, shape)
            tool.Loader.link_mesh(shape, mesh)
@@ -985,9 +975,37 @@ class IfcImporter:
            self.convert_representation(representation)

        mesh = bpy.data.meshes.new("Native")
+
+        props = bpy.context.scene.BIMGeoreferenceProperties
+        mat = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
+        if props.has_blender_offset and self.is_point_far_away(self.mesh_data["co"][0:3], is_meters=False):
+            offset_point = np.linalg.inv(mat) @ np.array(
+                (
+                    float(props.blender_eastings),
+                    float(props.blender_northings),
+                    float(props.blender_orthogonal_height),
+                    0.0,
+                )
+            )
+            verts = [None] * len(self.mesh_data["co"])
+            for i in range(0, len(self.mesh_data["co"]), 3):
+                verts[i], verts[i + 1], verts[i + 2] = ifcopenshell.util.geolocation.enh2xyz(
+                    self.mesh_data["co"][i] * self.unit_scale,
+                    self.mesh_data["co"][i + 1] * self.unit_scale,
+                    self.mesh_data["co"][i + 2] * self.unit_scale,
+                    offset_point[0] * self.unit_scale,
+                    offset_point[1] * self.unit_scale,
+                    offset_point[2] * self.unit_scale,
+                    float(props.blender_x_axis_abscissa),
+                    float(props.blender_x_axis_ordinate),
+                )
+            mesh["has_cartesian_point_offset"] = True
+        else:
+            verts = [c * self.unit_scale for c in self.mesh_data["co"]]
+            mesh["has_cartesian_point_offset"] = False
+
        mesh.vertices.add(self.mesh_data["total_verts"])
-        mesh.vertices.foreach_set("co", [c * self.unit_scale for c in self.mesh_data["co"]])
-        # mesh.vertices.foreach_set("co", self.mesh_data["co"])
+        mesh.vertices.foreach_set("co", verts)
        mesh.loops.add(len(self.mesh_data["vertex_index"]))
        mesh.loops.foreach_set("vertex_index", self.mesh_data["vertex_index"])
        mesh.polygons.add(self.mesh_data["total_polygons"])
@@ -1497,6 +1515,8 @@ class IfcImporter:
        if rendering_style and texture_style:
            self.create_surface_style_with_textures(blender_material, rendering_style, texture_style)

+        tool.Style.record_shading(blender_material)
+
    def create_surface_style_shading(self, blender_material, surface_style):
        alpha = 1.0
        # Transparency was added in IFC4
@@ -1799,54 +1819,6 @@ class IfcImporter:
            ):
                return representation.Items[0].MappingTarget

-    def create_camera(self, element, shape):
-        if hasattr(shape, "geometry"):
-            geometry = shape.geometry
-        else:
-            geometry = shape
-
-        v = geometry.verts
-        x = [v[i] for i in range(0, len(v), 3)]
-        y = [v[i + 1] for i in range(0, len(v), 3)]
-        z = [v[i + 2] for i in range(0, len(v), 3)]
-        width = max(x) - min(x)
-        height = max(y) - min(y)
-        depth = max(z) - min(z)
-
-        camera = bpy.data.cameras.new(tool.Loader.get_mesh_name(geometry))
-        camera.type = "ORTHO"
-        camera.ortho_scale = width if width > height else height
-        camera.clip_end = depth
-
-        if width > height:
-            camera.BIMCameraProperties.raster_x = 1000
-            camera.BIMCameraProperties.raster_y = round(1000 * (height / width))
-        else:
-            camera.BIMCameraProperties.raster_x = round(1000 * (width / height))
-            camera.BIMCameraProperties.raster_y = 1000
-
-        psets = ifcopenshell.util.element.get_psets(element)
-        pset = psets.get("EPset_Drawing")
-        if pset:
-            if "TargetView" in pset:
-                camera.BIMCameraProperties.target_view = pset["TargetView"]
-            if "Scale" in pset:
-                valid_scales = [
-                    i[0] for i in get_diagram_scales(None, bpy.context) if pset["Scale"] == i[0].split("|")[-1]
-                ]
-                if valid_scales:
-                    camera.BIMCameraProperties.diagram_scale = valid_scales[0]
-                else:
-                    camera.BIMCameraProperties.diagram_scale = "CUSTOM"
-                    camera.BIMCameraProperties.custom_diagram_scale = pset["Scale"]
-            if "HasUnderlay" in pset:
-                camera.BIMCameraProperties.has_underlay = pset["HasUnderlay"]
-            if "HasLinework" in pset:
-                camera.BIMCameraProperties.has_linework = pset["HasLinework"]
-            if "HasAnnotation" in pset:
-                camera.BIMCameraProperties.has_annotation = pset["HasAnnotation"]
-        return camera
-
    def create_curve(self, element, shape):
        if hasattr(shape, "geometry"):
            geometry = shape.geometry
@@ -34,7 +34,6 @@ class AggregateData:
        cls.data = {
            "has_relating_object": cls.has_relating_object(),
            "relating_object_label": cls.get_relating_object_label(),
-            "relating_object_id": cls.get_relating_object_id(),
            "has_related_objects": cls.has_related_objects(),
            "related_objects_amount": cls.get_related_objects_amount(),
            "ifc_class": cls.ifc_class(),
@@ -55,12 +54,6 @@ class AggregateData:
        if aggregate:
            return f"{aggregate.is_a()}/{aggregate.Name or ''}"

-    @classmethod
-    def get_relating_object_id(cls) -> int:
-        aggregate = cls.get_relating_object()
-        if aggregate:
-            return aggregate.id()
-
    @classmethod
    def get_related_objects(cls):
        return ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(bpy.context.active_object))
@@ -58,16 +58,22 @@ class BIM_OT_unassign_object(bpy.types.Operator, Operator):
    bl_idname = "bim.unassign_object"
    bl_label = "Unassign Object"
    bl_options = {"REGISTER", "UNDO"}
-    relating_object: bpy.props.IntProperty()
-    related_object: bpy.props.IntProperty()

    def _execute(self, context):
-        core.unassign_object(
-            tool.Ifc,
-            tool.Collector,
-            relating_obj=tool.Ifc.get_object(tool.Ifc.get().by_id(self.relating_object)),
-            related_obj=tool.Ifc.get_object(tool.Ifc.get().by_id(self.related_object)),
-        )
+        for obj in bpy.context.selected_objects:
+            element = tool.Ifc.get_entity(obj)
+            if not element:
+                continue
+            aggregate = ifcopenshell.util.element.get_aggregate(element)
+            if not aggregate:
+                continue
+            core.unassign_object(
+                tool.Ifc,
+                tool.Aggregate,
+                tool.Collector,
+                relating_obj=tool.Ifc.get_object(aggregate),
+                related_obj=tool.Ifc.get_object(element),
+            )


 class BIM_OT_enable_editing_aggregate(bpy.types.Operator, Operator):
@@ -92,52 +98,61 @@ class BIM_OT_disable_editing_aggregate(bpy.types.Operator, Operator):
        core.disable_editing_aggregate(tool.Aggregate, obj=context.active_object)


-class BIM_OT_add_aggregate(bpy.types.Operator):
+class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):
    """Add aggregate to IFC element"""

    bl_idname = "bim.add_aggregate"
    bl_label = "Add Aggregate"
    bl_options = {"REGISTER", "UNDO"}
    obj: bpy.props.StringProperty()
+    ifc_class: bpy.props.StringProperty(name="IFC Class", default="IfcElementAssembly")

-    def execute(self, context):
-        return IfcStore.execute_ifc_operator(self, context)
+    def invoke(self, context, event):
+        return context.window_manager.invoke_props_dialog(self)
+
+    def draw(self, context):
+        row = self.layout
+        row.prop(self, "ifc_class")

    def _execute(self, context):
-        obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
-        element = tool.Ifc.get_entity(obj)
-        if not element:
-            return {"FINISHED"}
+        try:
+            ifc_class = tool.Ifc.schema().declaration_by_name(self.ifc_class).name()
+        except:
+            return
+        aggregate = self.create_aggregate(context, ifc_class)

-        aggregate = self.create_aggregate(context)
-        tool.Collector.sync(obj)
-        current_aggregate = ifcopenshell.util.element.get_aggregate(element)
-        current_container = ifcopenshell.util.element.get_container(element)
-        if current_aggregate:
-            core.assign_object(
-                tool.Ifc,
-                tool.Aggregate,
-                tool.Collector,
-                relating_obj=tool.Ifc.get_object(current_aggregate),
-                related_obj=aggregate,
-            )
-        elif current_container:
-            blenderbim.core.spatial.assign_container(
-                tool.Ifc,
-                tool.Collector,
-                tool.Spatial,
-                structure_obj=tool.Ifc.get_object(current_container),
-                element_obj=aggregate,
-            )
-        core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
-        return {"FINISHED"}
+        for obj in context.selected_objects:
+            element = tool.Ifc.get_entity(obj)
+            if not element:
+                continue

-    def create_aggregate(self, context):
-        aggregate_collection = bpy.data.collections.new("IfcElementAssembly/Assembly")
+            tool.Collector.sync(obj)
+            current_aggregate = ifcopenshell.util.element.get_aggregate(element)
+            current_container = ifcopenshell.util.element.get_container(element)
+            if current_aggregate:
+                core.assign_object(
+                    tool.Ifc,
+                    tool.Aggregate,
+                    tool.Collector,
+                    relating_obj=tool.Ifc.get_object(current_aggregate),
+                    related_obj=aggregate,
+                )
+            elif current_container:
+                blenderbim.core.spatial.assign_container(
+                    tool.Ifc,
+                    tool.Collector,
+                    tool.Spatial,
+                    structure_obj=tool.Ifc.get_object(current_container),
+                    element_obj=aggregate,
+                )
+            core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
+
+    def create_aggregate(self, context, ifc_class):
+        aggregate_collection = bpy.data.collections.new(f"{ifc_class}/Assembly")
        context.scene.collection.children.link(aggregate_collection)
        aggregate = bpy.data.objects.new("Assembly", None)
        aggregate_collection.objects.link(aggregate)
-        bpy.ops.bim.assign_class(obj=aggregate.name, ifc_class="IfcElementAssembly")
+        bpy.ops.bim.assign_class(obj=aggregate.name, ifc_class=ifc_class)
        return aggregate


@@ -67,8 +67,6 @@ class BIM_PT_aggregate(Panel):
                row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
                row.operator("bim.add_aggregate", icon="ADD", text="")
                op = row.operator("bim.unassign_object", icon="X", text="")
-                op.relating_object = AggregateData.data["relating_object_id"]
-                op.related_object = context.active_object.BIMObjectProperties.ifc_definition_id
            else:
                row.label(text="No Aggregate", icon="TRIA_UP")
                row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
@@ -59,9 +59,13 @@ class MaterialAttributesData:

    @classmethod
    def load(cls):
-        cls.data = {"attributes": cls.attributes()}
+        cls.data = {"ifc_definition_id": cls.ifc_definition_id(), "attributes": cls.attributes()}
        cls.is_loaded = True

+    @classmethod
+    def ifc_definition_id(cls):
+        return bpy.context.active_object.active_material.BIMObjectProperties.ifc_definition_id
+
    @classmethod
    def attributes(cls):
        results = []
@@ -50,7 +50,20 @@ class EnableEditingAttributes(bpy.types.Operator):
        oprops = obj.BIMObjectProperties
        props = obj.BIMAttributeProperties
        props.attributes.clear()
-        blenderbim.bim.helper.import_attributes2(tool.Ifc.get().by_id(oprops.ifc_definition_id), props.attributes)
+
+        def callback(name, prop, data):
+            if name in ("RefLatitude", "RefLongitude"):
+                new = props.attributes.add()
+                new.name = name
+                new.is_null = data[name] is None
+                new.is_optional = True
+                new.data_type = "string"
+                new.ifc_class = data["type"]
+                new.string_value = "" if new.is_null else json.dumps(data[name])
+
+        blenderbim.bim.helper.import_attributes2(
+            tool.Ifc.get().by_id(oprops.ifc_definition_id), props.attributes, callback=callback
+        )
        props.is_editing_attributes = True
        return {"FINISHED"}

@@ -87,7 +100,19 @@ class EditAttributes(bpy.types.Operator, Operator):
            obj = bpy.data.materials.get(self.obj)
        props = obj.BIMAttributeProperties
        product = tool.Ifc.get_entity(obj)
-        attributes = blenderbim.bim.helper.export_attributes(props.attributes)
+
+        def callback(attributes, prop):
+            if prop.name in ("RefLatitude", "RefLongitude"):
+                if prop.is_null:
+                    attributes[prop.name] = None
+                else:
+                    try:
+                        attributes[prop.name] = json.loads(prop.string_value)
+                    except:
+                        attributes[prop.name] = None
+                return True
+
+        attributes = blenderbim.bim.helper.export_attributes(props.attributes, callback=callback)
        ifcopenshell.api.run("attribute.edit_attributes", self.file, product=product, attributes=attributes)
        bpy.ops.bim.disable_editing_attributes(obj=obj.name, obj_type=self.obj_type)
        return {"FINISHED"}
@@ -94,4 +94,10 @@ class BIM_PT_material_attributes(Panel):
    def draw(self, context):
        if not MaterialAttributesData.is_loaded:
            MaterialAttributesData.load()
+        elif (
+            context.active_object.active_material.BIMObjectProperties.ifc_definition_id
+            != MaterialAttributesData.data["ifc_definition_id"]
+        ):
+            MaterialAttributesData.load()
+
        draw_ui(context, self.layout, "Material", MaterialAttributesData.data["attributes"])
@@ -218,7 +218,7 @@ class EditBcfTopicName(bpy.types.Operator):
        props = context.scene.BCFProperties
        blender_topic = props.active_topic
        bcfxml = bcfstore.BcfStore.get_bcfxml()
-        topic = bcfxml.topics[blender_topic.name]
+        topic = bcfxml.topics[blender_topic.name].topic
        topic.title = blender_topic.title
        return {"FINISHED"}

@@ -233,7 +233,7 @@ class EditBcfTopic(bpy.types.Operator):
        blender_topic = props.active_topic
        bcfxml = bcfstore.BcfStore.get_bcfxml()

-        topic = bcfxml.topics[blender_topic.name]
+        topic = bcfxml.topics[blender_topic.name].topic
        topic.title = blender_topic.title or None
        topic.priority = blender_topic.priority or None
        topic.due_date = blender_topic.due_date or None
@@ -931,7 +931,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        # Operators with context overrides are used because they are
        # significantly faster than looping through all objects

-        exception_global_ids = {v.ifc_guid for v in viewpoint.visualization_info.components.visibility.exceptions}
+        exception_global_ids = {v.ifc_guid for v in viewpoint.visualization_info.components.visibility.exceptions or []}

        if viewpoint.visualization_info.components.visibility.default_visibility:
            old = context.area.type
@@ -940,7 +940,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
            context.area.type = old
            for global_id in exception_global_ids:
                obj = IfcStore.get_element(global_id)
-                if obj:
+                if obj and bpy.context.view_layer.objects.get(obj.name):
                    obj.hide_set(True)
        else:
            objs = []
@@ -979,11 +979,12 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        context.area.type = old

    def set_openings_visibility(self, is_visible, context):
-        for collection in self.get_opening_collections(context):
-            collection.hide_viewport = not is_visible
+        pass # We no longer have an openings collection

    def set_selection(self, viewpoint):
-        selected_global_ids = [s.ifc_guid for s in viewpoint.visualization_info.components.selection]
+        if not viewpoint.visualization_info.components or not viewpoint.visualization_info.components.selection:
+            return
+        selected_global_ids = [s.ifc_guid for s in viewpoint.visualization_info.components.selection.component or []]
        bpy.ops.object.select_all(action="DESELECT")
        for global_id in selected_global_ids:
            obj = IfcStore.get_element(global_id)
@@ -992,7 +993,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):

    def set_colours(self, viewpoint):
        global_id_colours = {}
-        for coloring in viewpoint.visualization_info.components.coloring:
+        for coloring in viewpoint.visualization_info.components.coloring or []:
            for component in coloring.components:
                global_id_colours.setdefault(component.ifc_guid, coloring.color)
        for global_id, color in global_id_colours.items():
@@ -1000,14 +1001,6 @@ class ActivateBcfViewpoint(bpy.types.Operator):
            if obj:
                obj.color = self.hex_to_rgb(color)

-    def get_opening_collections(self, context):
-        collections = []
-        for collection in context.view_layer.layer_collection.children:
-            opening_collection = collection.children.get("IfcOpeningElements")
-            if opening_collection:
-                collections.append(opening_collection)
-        return collections
-
    def draw_lines(self, viewpoint, context):
        gp = bpy.data.grease_pencils.new("BCF")
        scene = context.scene
@@ -119,7 +119,7 @@ class Loader:

 class LoadProjectSpaceBoundaries(bpy.types.Operator):
    bl_idname = "bim.load_project_space_boundaries"
-    bl_label = "Load all project space boundaries"
+    bl_label = "Load All Project Space Boundaries"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
@@ -131,7 +131,7 @@ class LoadProjectSpaceBoundaries(bpy.types.Operator):

 class LoadBoundary(bpy.types.Operator):
    bl_idname = "bim.load_boundary"
-    bl_label = "Load boundary"
+    bl_label = "Load Boundary"
    bl_options = {"REGISTER", "UNDO"}
    boundary_id: bpy.props.IntProperty()

@@ -147,7 +147,7 @@ class LoadBoundary(bpy.types.Operator):

 class LoadSpaceBoundaries(bpy.types.Operator):
    bl_idname = "bim.load_space_boundaries"
-    bl_label = "Load selected space boundaries"
+    bl_label = "Load Selected Space Boundaries"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
@@ -168,7 +168,7 @@ def get_element_boundaries(element):

 class SelectRelatedElementBoundaries(bpy.types.Operator):
    bl_idname = "bim.select_related_element_boundaries"
-    bl_label = "Select related element space boundaries"
+    bl_label = "Select Related Element Space Boundaries"
    bl_options = {"REGISTER", "UNDO"}
    related_element: bpy.props.IntProperty()

@@ -185,7 +185,7 @@ class SelectRelatedElementBoundaries(bpy.types.Operator):

 class SelectRelatedElementTypeBoundaries(bpy.types.Operator):
    bl_idname = "bim.select_related_element_type_boundaries"
-    bl_label = "Select related element type space boundaries"
+    bl_label = "Select Related Element Type Space Boundaries"
    bl_options = {"REGISTER", "UNDO"}
    related_element: bpy.props.IntProperty()

@@ -208,7 +208,7 @@ class SelectRelatedElementTypeBoundaries(bpy.types.Operator):

 class SelectSpaceBoundaries(bpy.types.Operator):
    bl_idname = "bim.select_space_boundaries"
-    bl_label = "Select all space boundaries"
+    bl_label = "Select All Space Boundaries"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
@@ -224,7 +224,7 @@ class SelectSpaceBoundaries(bpy.types.Operator):

 class SelectProjectBoundaries(bpy.types.Operator):
    bl_idname = "bim.select_project_space_boundaries"
-    bl_label = "Select all project space boundaries"
+    bl_label = "Select All Project Space Boundaries"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
@@ -260,7 +260,7 @@ def get_colour(ifc_boundary):

 class ColourByRelatedBuildingElement(bpy.types.Operator):
    bl_idname = "bim.colour_by_related_building_element"
-    bl_label = "Apply colour based on related building elements"
+    bl_label = "Apply Colour Based on Related Building Elements"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
@@ -308,7 +308,7 @@ EDITABLE_ATTRIBUTES = {

 class EnableEditingBoundary(bpy.types.Operator):
    bl_idname = "bim.enable_editing_boundary"
-    bl_label = "Edit boundary relations"
+    bl_label = "Edit Boundary Relations"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
@@ -327,7 +327,7 @@ class EnableEditingBoundary(bpy.types.Operator):

 class DisableEditingBoundary(bpy.types.Operator):
    bl_idname = "bim.disable_editing_boundary"
-    bl_label = "Disable editing boundary relations"
+    bl_label = "Disable Editing Boundary Relations"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
@@ -340,7 +340,7 @@ class DisableEditingBoundary(bpy.types.Operator):

 class EditBoundaryAttributes(bpy.types.Operator):
    bl_idname = "bim.edit_boundary_attributes"
-    bl_label = "Disable editing boundary relations"
+    bl_label = "Disable Editing Boundary Relations"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
@@ -361,7 +361,7 @@ class EditBoundaryAttributes(bpy.types.Operator):

 class UpdateBoundaryGeometry(bpy.types.Operator):
    bl_idname = "bim.update_boundary_geometry"
-    bl_label = "Update boundary geometry"
+    bl_label = "Update Boundary Geometry"
    bl_description = """
    Update boundary connection geometry from mesh.
    Mesh must lie on a single plane. It should look like a face or a face with holes.
@@ -123,6 +123,7 @@ class BIM_PT_SpaceBoundaries(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1
    bl_parent_id = "BIM_PT_geometry_object"

    @classmethod
@@ -18,8 +18,8 @@

 import bpy
 from blenderbim.bim.module.model.data import AuthoringData
-from blenderbim.bim.module.model.root import ConstrTypeEntityNotFound
 from bpy.types import PropertyGroup
+from math import pi


 class BIMCadProperties(PropertyGroup):
@@ -28,3 +28,7 @@ class BIMCadProperties(PropertyGroup):
    distance: bpy.props.FloatProperty(name="Distance", default=0.1)
    x: bpy.props.FloatProperty(name="X", default=0.2)
    y: bpy.props.FloatProperty(name="Y", default=0.1)
+    gable_roof_edge_angle: bpy.props.FloatProperty(
+        name="Gable Roof Edge Angle", default=pi / 2, soft_min=0, soft_max=pi / 2, subtype="ANGLE"
+    )
+    gable_roof_separate_verts: bpy.props.BoolProperty(name="Separate Verts", default=True)
@@ -21,7 +21,7 @@ import bpy
 import blenderbim.tool as tool
 import blenderbim.bim.module.type.prop as type_prop
 from bpy.types import WorkSpaceTool
-from blenderbim.bim.module.model.data import AuthoringData
+from blenderbim.bim.module.model.data import AuthoringData, RailingData, RoofData


 class CadTool(WorkSpaceTool):
@@ -34,7 +34,7 @@ class CadTool(WorkSpaceTool):
    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.cad")
    bl_widget = None
    # https://docs.blender.org/api/current/bpy.types.KeyMapItems.html
-    bl_keymap = (
+    bl_keymap = tool.Blender.get_default_selection_keypmap() + (
        ("bim.cad_hotkey", {"type": "C", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_C")]}),
        ("bim.cad_hotkey", {"type": "E", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_E")]}),
        ("bim.cad_hotkey", {"type": "F", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_F")]}),
@@ -48,7 +48,9 @@ class CadTool(WorkSpaceTool):

    def draw_settings(context, layout, tool):
        obj = context.active_object
-        if obj and obj.data and hasattr(obj.data, "BIMMeshProperties") and obj.data.BIMMeshProperties.is_profile:
+        if not obj or not obj.data:
+            return
+        if hasattr(obj.data, "BIMMeshProperties") and obj.data.BIMMeshProperties.subshape_type == "PROFILE":
            row = layout.row(align=True)
            row.label(text="", icon="EVENT_SHIFT")
            row.label(text="", icon="EVENT_Q")
@@ -100,7 +102,62 @@ class CadTool(WorkSpaceTool):
            row.label(text="", icon="EVENT_SHIFT")
            row.label(text="", icon="EVENT_X")
            row.operator("bim.reset_vertex", text="Reset Vertex")
+
+        elif hasattr(obj.data, "BIMMeshProperties") and obj.data.BIMMeshProperties.subshape_type == "AXIS":
+            row = layout.row(align=True)
+            row.label(text="", icon="EVENT_SHIFT")
+            row.label(text="", icon="EVENT_Q")
+            row.operator("bim.edit_extrusion_axis", text="Save Axis")
+            row.operator("bim.disable_editing_extrusion_axis", text="", icon="CANCEL")
+
+            row = layout.row(align=True)
+            row.label(text="", icon="EVENT_SHIFT")
+            row.label(text="", icon="EVENT_E")
+            row.operator("bim.cad_hotkey", text="Extend").hotkey = "S_E"
+
+            row = layout.row(align=True)
+            row.label(text="", icon="EVENT_SHIFT")
+            row.label(text="", icon="EVENT_T")
+            row.operator("bim.cad_hotkey", text="Mitre").hotkey = "S_T"
+
+            row = layout.row(align=True)
+            row.label(text="", icon="EVENT_SHIFT")
+            row.label(text="", icon="EVENT_F")
+            row.operator("bim.cad_hotkey", text="Fillet").hotkey = "S_F"
+
+            row = layout.row(align=True)
+            row.label(text="", icon="EVENT_SHIFT")
+            row.label(text="", icon="EVENT_O")
+            row.operator("bim.cad_hotkey", text="Offset").hotkey = "S_O"
+
        else:
+            if (
+                (RailingData.is_loaded or not RailingData.load())
+                and RailingData.data["parameters"]
+                and context.active_object.BIMRailingProperties.is_editing_path
+            ):
+                row = layout.row(align=True)
+                row.label(text="", icon="EVENT_SHIFT")
+                row.label(text="", icon="EVENT_Q")
+                row.operator("bim.cad_hotkey", text="Apply Railing Path").hotkey = "S_Q"
+                row.operator("bim.cancel_editing_railing_path", icon="CANCEL", text="")
+
+            elif (
+                (RoofData.is_loaded or not RoofData.load())
+                and RoofData.data["parameters"]
+                and context.active_object.BIMRoofProperties.is_editing_path
+            ):
+                row = layout.row(align=True)
+                row.label(text="", icon="EVENT_SHIFT")
+                row.label(text="", icon="EVENT_Q")
+                row.operator("bim.cad_hotkey", text="Apply Roof Path").hotkey = "S_Q"
+                row.operator("bim.cancel_editing_roof_path", icon="CANCEL", text="")
+
+                row = layout.row(align=True)
+                row.label(text="", icon="EVENT_SHIFT")
+                row.label(text="", icon="EVENT_R")
+                row.operator("bim.cad_hotkey", text="Set Gable Roof Angle").hotkey = "S_R"
+
            row = layout.row(align=True)
            row.label(text="", icon="EVENT_SHIFT")
            row.label(text="", icon="EVENT_E")
@@ -148,20 +205,32 @@ class CadHotkey(bpy.types.Operator):
            if self.is_profile():
                row = self.layout.row()
                row.prop(props, "radius")
+
        elif self.hotkey == "S_F":
            if not self.is_profile():
                row = self.layout.row()
                row.prop(props, "resolution")
            row = self.layout.row()
            row.prop(props, "radius")
+
        elif self.hotkey == "S_O":
            row = self.layout.row()
            row.prop(props, "distance")
+
        elif self.hotkey == "S_R":
-            row = self.layout.row()
-            row.prop(props, "x")
-            row = self.layout.row()
-            row.prop(props, "y")
+            if self.is_profile():
+                row = self.layout.row()
+                row.prop(props, "x")
+                row = self.layout.row()
+                row.prop(props, "y")
+            elif (
+                (RoofData.is_loaded or not RoofData.load())
+                and RoofData.data["parameters"]
+                and bpy.context.active_object.BIMRoofProperties.is_editing_path
+            ):
+                self.layout.row().prop(props, "gable_roof_edge_angle")
+                self.layout.row().prop(props, "gable_roof_separate_verts")
+
        elif self.hotkey == "S_V":
            if not self.is_profile():
                row = self.layout.row()
@@ -187,13 +256,39 @@ class CadHotkey(bpy.types.Operator):

    def hotkey_S_Q(self):
        if tool.Ifc.get_entity(bpy.context.active_object):
-            bpy.ops.bim.edit_extrusion_profile()
+            if bpy.context.active_object.data.BIMMeshProperties.subshape_type == "PROFILE":
+                bpy.ops.bim.edit_extrusion_profile()
+            elif bpy.context.active_object.data.BIMMeshProperties.subshape_type == "AXIS":
+                bpy.ops.bim.edit_extrusion_axis()
+
+            elif (
+                (RailingData.is_loaded or not RailingData.load())
+                and RailingData.data["parameters"]
+                and bpy.context.active_object.BIMRailingProperties.is_editing_path
+            ):
+                bpy.ops.bim.finish_editing_railing_path()
+
+            elif (
+                (RoofData.is_loaded or not RoofData.load())
+                and RoofData.data["parameters"]
+                and bpy.context.active_object.BIMRoofProperties.is_editing_path
+            ):
+                bpy.ops.bim.finish_editing_roof_path()
+
        else:
            bpy.ops.bim.edit_arbitrary_profile()

    def hotkey_S_R(self):
        if self.is_profile():
            bpy.ops.bim.add_rectangle(x=self.props.x, y=self.props.y)
+        elif (
+            (RoofData.is_loaded or not RoofData.load())
+            and RoofData.data["parameters"]
+            and bpy.context.active_object.BIMRoofProperties.is_editing_path
+        ):
+            bpy.ops.bim.set_gable_roof_edge_angle(
+                angle=self.props.gable_roof_edge_angle, separate_verts=self.props.gable_roof_separate_verts
+            )

    def hotkey_S_T(self):
        bpy.ops.bim.cad_mitre()
@@ -210,4 +305,9 @@ class CadHotkey(bpy.types.Operator):

    def is_profile(self):
        obj = bpy.context.active_object
-        return obj and obj.data and hasattr(obj.data, "BIMMeshProperties") and obj.data.BIMMeshProperties.is_profile
+        return (
+            obj
+            and obj.data
+            and hasattr(obj.data, "BIMMeshProperties")
+            and obj.data.BIMMeshProperties.subshape_type == "PROFILE"
+        )
@@ -31,6 +31,7 @@ from blenderbim.bim.ifc import IfcStore
 class ExportClashSets(bpy.types.Operator):
    bl_idname = "bim.export_clash_sets"
    bl_label = "Export Clash Sets"
+    bl_description = "Export clash sets to a selected file"
    filename_ext = ".json"
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
    filter_glob: bpy.props.StringProperty(default="*.json", options={"HIDDEN"})
@@ -64,6 +65,7 @@ class ImportClashSets(bpy.types.Operator):
    bl_idname = "bim.import_clash_sets"
    bl_label = "Import Clash Sets"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Import clash sets from a selected file"
    filename_ext = ".json"
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
    filter_glob: bpy.props.StringProperty(default="*.json", options={"HIDDEN"})
@@ -101,6 +103,7 @@ class AddClashSet(bpy.types.Operator):
    bl_idname = "bim.add_clash_set"
    bl_label = "Add Clash Set"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Add a clash set"

    def execute(self, context):
        new = context.scene.BIMClashProperties.clash_sets.add()
@@ -113,6 +116,7 @@ class RemoveClashSet(bpy.types.Operator):
    bl_idname = "bim.remove_clash_set"
    bl_label = "Remove Clash Set"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Remove the selected clash set"
    index: bpy.props.IntProperty()

    def execute(self, context):
@@ -124,6 +128,7 @@ class AddClashSource(bpy.types.Operator):
    bl_idname = "bim.add_clash_source"
    bl_label = "Add Clash Source"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Add a clash source to this group"
    group: bpy.props.StringProperty()

    def execute(self, context):
@@ -136,6 +141,7 @@ class RemoveClashSource(bpy.types.Operator):
    bl_idname = "bim.remove_clash_source"
    bl_label = "Remove Clash Source"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Remove this clash source"
    index: bpy.props.IntProperty()
    group: bpy.props.StringProperty()

@@ -149,6 +155,7 @@ class SelectClashSource(bpy.types.Operator):
    bl_idname = "bim.select_clash_source"
    bl_label = "Select Clash Source"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Select an IFC file to add as a clash source"
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
    filter_glob: bpy.props.StringProperty(default="*.ifc", options={"HIDDEN"})
    index: bpy.props.IntProperty()
@@ -197,6 +204,7 @@ class SelectSmartGroupedClashesPath(bpy.types.Operator):
 class ExecuteIfcClash(bpy.types.Operator):
    bl_idname = "bim.execute_ifc_clash"
    bl_label = "Execute IFC Clash"
+    bl_description = "Execute clash detection and save the information to a .bcf or .json file"
    filter_glob: bpy.props.StringProperty(default="*.bcf;*.json", options={"HIDDEN"})
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")

@@ -266,6 +274,7 @@ class SelectIfcClashResults(bpy.types.Operator):
    bl_idname = "bim.select_ifc_clash_results"
    bl_label = "Select IFC Clash Results"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Select the clashing IFC geometry stored in a file"
    filename_ext = ".json"
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")

@@ -299,7 +308,8 @@ class SelectIfcClashResults(bpy.types.Operator):
            for scene in obj.users_scene:
                if scene.BIMProperties.ifc_file:
                    ifc_file = scene.BIMProperties.ifc_file
-                    break
+                    if scene.library:
+                        break

            if ifc_file:
                if ifc_file not in IfcStore.session_files:
@@ -65,12 +65,13 @@ class ClassificationsData:

 class ReferencesData:
    @classmethod
-    def is_available_classification_added(cls):
+    def active_classification_library(cls):
        if not IfcStore.classification_file or not IfcStore.classification_file.by_type("IfcClassification"):
            return False
        props = bpy.context.scene.BIMClassificationProperties
        name = IfcStore.classification_file.by_id(int(props.available_classifications)).Name
-        return name in [e.Name for e in tool.Ifc.get().by_type("IfcClassification")]
+        if name in [e.Name for e in tool.Ifc.get().by_type("IfcClassification")]:
+            return name


 class ClassificationReferencesData(ReferencesData):
@@ -81,7 +82,7 @@ class ClassificationReferencesData(ReferencesData):
    def load(cls):
        cls.is_loaded = True
        cls.data["references"] = cls.references()
-        cls.data["is_available_classification_added"] = cls.is_available_classification_added()
+        cls.data["active_classification_library"] = cls.active_classification_library()

    @classmethod
    def references(cls):
@@ -103,7 +104,7 @@ class MaterialClassificationsData(ReferencesData):
    def load(cls):
        cls.is_loaded = True
        cls.data["references"] = cls.references()
-        cls.data["is_available_classification_added"] = cls.is_available_classification_added()
+        cls.data["active_classification_library"] = cls.active_classification_library()

    @classmethod
    def references(cls):
@@ -125,7 +126,7 @@ class CostClassificationsData(ReferencesData):
    def load(cls):
        cls.is_loaded = True
        cls.data["references"] = cls.references()
-        cls.data["is_available_classification_added"] = cls.is_available_classification_added()
+        cls.data["active_classification_library"] = cls.active_classification_library()

    @classmethod
    def references(cls):
@@ -100,12 +100,16 @@ class ReferenceUI:
                self.draw_reference_ui(reference)

    def draw_add_ui(self, context):
-        if not self.data.data["is_available_classification_added"]:
+        if not self.data.data["active_classification_library"]:
+            row = self.layout.row(align=True)
+            row.label(text="No Active Classification Library")
+            row.operator("bim.load_classification_library", text="", icon="IMPORT")
            return
        row = self.layout.row(align=True)
-        row.prop(self.sprops, "available_classifications", text="")
+        row.label(text=f"Active Classification Library: {self.data.data['active_classification_library']}")
+        #row.prop(self.sprops, "available_classifications", text="")
        if not self.sprops.available_library_references:
-            op = row.operator("bim.change_classification_level", text="", icon="IMPORT")
+            op = row.operator("bim.change_classification_level", text="", icon="GREASEPENCIL")
            op.parent_id = int(self.sprops.available_classifications)
            return
        if self.sprops.active_library_referenced_source:
@@ -74,6 +74,7 @@ class BIM_PT_object_constraints(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1
    bl_parent_id = "BIM_PT_misc_object"

    @classmethod
@@ -67,6 +67,15 @@ classes = (
    operator.ExpandCostItemRate,
    operator.ContractCostItemRate,
    operator.CalculateCostItemResourceValue,
+    operator.ClearCostItemAssignments,
+    operator.HighlightProductCostItem,
+    operator.LoadProductCostItems,
+    operator.ReorderCostItem,
+    operator.SelectUnassignedProducts,
+    operator.LoadCostItemElementQuantities,
+    operator.LoadCostItemTaskQuantities,
+    operator.LoadCostItemResourceQuantities,
+    operator.ChangeParentCostItem,
    prop.CostItem,
    prop.CostItemQuantity,
    prop.CostItemType,
@@ -80,6 +89,8 @@ classes = (
    ui.BIM_UL_cost_item_quantities,
    ui.BIM_UL_cost_item_types,
    ui.BIM_UL_cost_item_rates,
+    ui.BIM_UL_product_cost_items,
+    ui.BIM_PT_Costing_Tools,
 )


@@ -89,9 +89,16 @@ class CostSchedulesData:
            data = {}
            cls._load_cost_item_quantities(cost_item, data)
            cls._load_cost_values(cost_item, data)
+            cls._load_nesting_index(cost_item, data)
            results[cost_item.id()] = data
        return results

+    @classmethod
+    def _load_nesting_index(cls, cost_item, data):
+        data["NestingIndex"] = None
+        for rel in cost_item.Nests or []:
+            data["NestingIndex"] = rel.RelatedObjects.index(cost_item)
+
    @classmethod
    def _load_cost_values(cls, root_element, data):
        # data["CostValues"] = []
@@ -119,34 +126,51 @@ class CostSchedulesData:

    @classmethod
    def _load_cost_item_quantities(cls, cost_item, data):
-        parametric_quantities = []
-        for rel in cost_item.Controls:
-            for related_object in rel.RelatedObjects or []:
-                quantities = cls._get_object_quantities(cost_item, related_object)
-                # data["Controls"][related_object.id()] = quantities
-                parametric_quantities.extend(quantities)
-
-        # data["CostQuantities"] = []
+        # parametric_quantities = []
+        # for rel in cost_item.Controls:
+        #     for related_object in rel.RelatedObjects or []:
+        #         quantities = cls._get_object_quantities(cost_item, related_object)
+        #         parametric_quantities.extend(quantities)
        data["TotalCostQuantity"] = ifcopenshell.util.cost.get_total_quantity(cost_item)
-        for quantity in cost_item.CostQuantities or []:
-            if quantity.id() in parametric_quantities:
-                continue
-            # quantity_data = quantity.get_info()
-            # del quantity_data["Unit"]
-            # cls.physical_quantities[quantity.id()] = quantity_data
-            # data["CostQuantities"].append(quantity.id())
-        # data["Unit"] = None
-        data["UnitSymbol"] = "?"
+        data["UnitSymbol"] = "-"
        if cost_item.CostQuantities:
            quantity = cost_item.CostQuantities[0]
            unit = ifcopenshell.util.unit.get_property_unit(quantity, tool.Ifc.get())
            if unit:
-                # data["Unit"] = unit.id()
                data["UnitSymbol"] = ifcopenshell.util.unit.get_unit_symbol(unit)
            else:
-                # data["Unit"] = None
                data["UnitSymbol"] = None

+        # same_unit_nested_cost_item = set()
+        # data["DerivedTotalCostQuantity"] = None
+        # if cost_item.IsNestedBy:
+        #     data["TotalCostQuantity"] = 0.0
+        #     derived_quantity = 0
+        #     derived_unit = None
+        #     should_sum = False
+        #     for rel in cost_item.IsNestedBy:
+        #         for related_object in rel.RelatedObjects or []:
+        #             for quantity in related_object.CostQuantities or []:
+        #                 nested_unit = ifcopenshell.util.unit.get_property_unit(quantity, tool.Ifc.get())
+        #                 if derived_unit is None:
+        #                     derived_unit = nested_unit
+        #                 elif nested_unit and nested_unit.id() == derived_unit.id():
+        #                     same_unit_nested_cost_item.add(related_object)
+        #                 else:
+        #                     derived_unit = None
+        #                     break
+        #     for cost in same_unit_nested_cost_item:
+        #         qto = ifcopenshell.util.cost.get_total_quantity(cost)
+        #         derived_quantity += qto
+        #         print(derived_quantity)
+        #     if derived_quantity not in [0, None]:
+        #         data["DerivedTotalCostQuantity"] = derived_quantity
+        #         if derived_unit:
+        #             data["DerivedUnitSymbol"] = ifcopenshell.util.unit.get_unit_symbol(derived_unit)
+        #         else:
+        #             data["DerivedUnitSymbol"] = "?"
+        #         print("Total Cost", data["DerivedTotalCostQuantity"], cost_item.Name)
+
    @classmethod
    def _get_object_quantities(cls, cost_item, element):
        if not element.is_a("IfcObject"):
@@ -236,6 +260,7 @@ class CostSchedulesData:
                break
        return results

+
 class CostItemRatesData:
    data = {}
    is_loaded = False
@@ -23,7 +23,6 @@ import time
 import ifcopenshell.api
 import blenderbim.bim.helper
 import blenderbim.tool as tool
-from blenderbim.bim.ifc import IfcStore
 from bpy_extras.io_utils import ImportHelper
 import blenderbim.tool as tool
 import blenderbim.core.cost as core
@@ -36,7 +35,7 @@ class AddCostSchedule(bpy.types.Operator, tool.Ifc.Operator):
    bl_description = "Add a new cost schedule"

    def _execute(self, context):
-        core.add_cost_schedule(tool.Ifc, predefined_type = context.scene.BIMCostProperties.cost_schedule_predefined_types)
+        core.add_cost_schedule(tool.Ifc, predefined_type=context.scene.BIMCostProperties.cost_schedule_predefined_types)


 class EditCostSchedule(bpy.types.Operator, tool.Ifc.Operator):
@@ -150,7 +149,7 @@ class ContractCostItem(bpy.types.Operator, tool.Ifc.Operator):

 class RemoveCostItem(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.remove_cost_item"
-    bl_label = "Remove Cost item"
+    bl_label = "Remove Cost Item"
    bl_options = {"REGISTER", "UNDO"}
    cost_item: bpy.props.IntProperty()

@@ -456,9 +455,7 @@ class SelectCostItemProducts(bpy.types.Operator, tool.Ifc.Operator):
    cost_item: bpy.props.IntProperty()

    def _execute(self, context):
-        core.select_cost_item_products(
-            tool.Cost, tool.Spatial, cost_item=tool.Ifc.get().by_id(self.cost_item), include_nested=False
-        )
+        core.select_cost_item_products(tool.Cost, tool.Spatial, cost_item=tool.Ifc.get().by_id(self.cost_item))
        return {"FINISHED"}


@@ -520,6 +517,36 @@ class LoadCostItemQuantities(bpy.types.Operator):
        return {"FINISHED"}


+class LoadCostItemElementQuantities(bpy.types.Operator):
+    bl_idname = "bim.load_cost_item_element_quantities"
+    bl_label = "Load Cost Item Element Quantities"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        core.load_cost_item_element_quantities(tool.Cost)
+        return {"FINISHED"}
+
+
+class LoadCostItemTaskQuantities(bpy.types.Operator):
+    bl_idname = "bim.load_cost_item_task_quantities"
+    bl_label = "Load Cost Item Task Quantities"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        core.load_cost_item_task_quantities(tool.Cost)
+        return {"FINISHED"}
+
+
+class LoadCostItemResourceQuantities(bpy.types.Operator):
+    bl_idname = "bim.load_cost_item_resource_quantities"
+    bl_label = "Load Cost Item Resource Quantities"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        core.load_cost_item_resource_quantities(tool.Cost)
+        return {"FINISHED"}
+
+
 class LoadCostItemTypes(bpy.types.Operator):
    bl_idname = "bim.load_cost_item_types"
    bl_label = "Load Cost Item Types"
@@ -605,3 +632,95 @@ class ExportCostSchedules(bpy.types.Operator):
    def draw(self, context):
        self.layout.label(text="Choose a format")
        self.layout.prop(self, "format")
+
+
+class ClearCostItemAssignments(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.clear_cost_item_assignments"
+    bl_label = "Clear Cost Item Product Assignments"
+    bl_options = {"REGISTER", "UNDO"}
+    cost_item: bpy.props.IntProperty()
+    related_object_type: bpy.props.StringProperty()
+
+    def _execute(self, context):
+        core.clear_cost_item_assignments(
+            tool.Ifc,
+            tool.Cost,
+            cost_item=tool.Ifc.get().by_id(self.cost_item),
+            related_object_type=self.related_object_type,
+        )
+        return {"FINISHED"}
+
+
+class LoadProductCostItems(bpy.types.Operator):
+    bl_idname = "bim.load_product_cost_items"
+    bl_label = "Get Product Cost Assignments"
+    bl_options = {"REGISTER", "UNDO"}
+
+    @classmethod
+    def poll(cls, context):
+        if not tool.Ifc.get():
+            return False
+        if not context.active_object:
+            return False
+        if not context.active_object.BIMObjectProperties.ifc_definition_id:
+            return False
+        return True
+
+    def execute(self, context):
+        core.load_product_cost_items(tool.Cost, product=tool.Ifc.get().by_id(context.active_object.BIMObjectProperties.ifc_definition_id))
+        return {"FINISHED"}
+
+
+class HighlightProductCostItem(bpy.types.Operator):
+    bl_idname = "bim.highlight_product_cost_item"
+    bl_label = "Highlight Product Cost Items"
+    bl_options = {"REGISTER", "UNDO"}
+    cost_item: bpy.props.IntProperty()
+
+    def execute(self, context):
+        r = core.highlight_product_cost_item(tool.Spatial, tool.Cost, cost_item=tool.Ifc.get().by_id(self.cost_item))
+        if isinstance(r, str):
+            self.report({"WARNING"}, r)
+        return {"FINISHED"}
+
+
+class ReorderCostItem(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.reorder_cost_item_nesting"
+    bl_label = "Reorder Nesting"
+    bl_options = {"REGISTER", "UNDO"}
+    new_index: bpy.props.IntProperty()
+    cost_item: bpy.props.IntProperty()
+
+    def _execute(self, context):
+        ifcopenshell.api.run(
+            "nest.reorder_nesting",
+            tool.Ifc.get(),
+            **{
+                "item": tool.Ifc.get().by_id(self.cost_item),
+                "new_index": self.new_index,
+            },
+        )
+        tool.Cost.load_cost_schedule_tree()
+
+
+class SelectUnassignedProducts(bpy.types.Operator):
+    bl_idname = "bim.select_unassigned_products"
+    bl_label = "Select Unassigned Products"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        core.select_unassigned_products(tool.Ifc, tool.Cost, tool.Spatial)
+        return {"FINISHED"}
+
+
+class ChangeParentCostItem(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.change_parent_cost_item"
+    bl_label = "Change Parent Cost Item"
+    bl_options = {"REGISTER", "UNDO"}
+    new_parent: bpy.props.IntProperty()
+
+    def _execute(self, context):
+        r = core.change_parent_cost_item(tool.Ifc, tool.Cost, new_parent=tool.Ifc.get().by_id(self.new_parent))
+        if isinstance(r, str):
+            self.report({"WARNING"}, r)
+        return {"FINISHED"}
@@ -75,7 +75,7 @@ def update_active_cost_item_index(self, context):
    if schedule.PredefinedType == "SCHEDULEOFRATES":
        tool.Cost.load_cost_item_types()
    else:
-        tool.Cost.load_cost_item_quantities(cost_item=tool.Cost.get_highlighted_cost_item())
+        tool.Cost.load_cost_item_quantities()
    CostClassificationsData.load()


@@ -135,6 +135,23 @@ class CostItemType(PropertyGroup):
    ifc_definition_id: IntProperty(name="IFC Definition ID")


+def update_cost_item_parent(self, context):
+    cost_item = tool.Cost.get_highlighted_cost_item()
+    tool.Cost.toggle_cost_item_parent(cost_item=cost_item)
+
+
+def update_active_cost_item_elements(self, context):
+    bpy.ops.bim.load_cost_item_element_quantities()
+
+
+def update_active_cost_item_tasks(self, context):
+    bpy.ops.bim.load_cost_item_task_quantities()
+
+
+def update_active_cost_item_resources(self, context):
+    bpy.ops.bim.load_cost_item_resource_quantities()
+
+
 class BIMCostProperties(PropertyGroup):
    cost_schedule_predefined_types: EnumProperty(
        items=get_schedule_predefined_types, name="Predefined Type", default=None
@@ -164,6 +181,7 @@ class BIMCostProperties(PropertyGroup):
        name="Cost Types",
    )
    cost_category: StringProperty(name="Cost Category")
+    fixed_cost_value: FloatProperty(name="Fixed Cost Value")
    active_cost_value_id: IntProperty(name="Active Cost Item Value Id")
    cost_value_editing_type: StringProperty(name="Cost Value Editing Type")
    cost_value_attributes: CollectionProperty(name="Cost Value Attributes", type=Attribute)
@@ -186,3 +204,12 @@ class BIMCostProperties(PropertyGroup):
    cost_item_rates: CollectionProperty(name="Cost Item Rates", type=CostItem)
    active_cost_item_rate_index: IntProperty(name="Active Cost Rate Index")
    contracted_cost_item_rates: StringProperty(name="Contracted Cost Item Rates", default="[]")
+    product_cost_items: CollectionProperty(name="Product Cost Items", type=CostItem)
+    active_product_cost_item_index: IntProperty(name="Active Product Cost Item Index")
+    enable_reorder: BoolProperty(name="Enable Reorder", default=False)
+    show_nested_elements: BoolProperty(name="Show Nested Tasks", default=False, update=update_active_cost_item_elements)
+    show_nested_tasks: BoolProperty(name="Show Nested Tasks", default=False, update=update_active_cost_item_tasks)
+    show_nested_resources: BoolProperty(
+        name="Show Nested Tasks", default=False, update=update_active_cost_item_resources
+    )
+    change_cost_item_parent: BoolProperty(name="Change Cost Item Parent", default=False, update=update_cost_item_parent)
@@ -61,8 +61,10 @@ class BIM_PT_cost_schedules(Panel):
        row.label(text=cost_schedule["name"], icon="LINENUMBERS_ON")

        if self.props.active_cost_schedule_id and self.props.active_cost_schedule_id == cost_schedule["id"]:
-            op = row.operator("bim.select_cost_schedule_products", icon="RESTRICT_SELECT_OFF", text="")
+            op = row.operator("bim.select_cost_schedule_products", icon="RESTRICT_SELECT_OFF", text="Assigned")
            op.cost_schedule = cost_schedule["id"]
+            row.operator("bim.select_unassigned_products", icon="RESTRICT_SELECT_OFF", text="Unassigned")
+
            row.prop(self.props, "should_show_column_ui", text="", icon="SHORTDISPLAY")
            if self.props.is_editing == "COST_SCHEDULE_ATTRIBUTES":
                row.operator("bim.edit_cost_schedule", text="", icon="CHECKMARK")
@@ -102,7 +104,8 @@ class BIM_PT_cost_schedules(Panel):
        if self.props.cost_items and self.props.active_cost_item_index < len(self.props.cost_items):
            ifc_definition_id = self.props.cost_items[self.props.active_cost_item_index].ifc_definition_id
        if ifc_definition_id:
-
+            row.prop(self.props, "change_cost_item_parent", text="", icon="LINKED")
+            row.prop(self.props, "enable_reorder", text="", icon="SORTALPHA")
            if not CostSchedulesData.data["is_editing_rates"]:
                op = row.operator("bim.enable_editing_cost_item_quantities", text="", icon="PROPERTIES")
                op.cost_item = ifc_definition_id
@@ -173,6 +176,8 @@ class BIM_PT_cost_schedules(Panel):
    def draw_editable_cost_item_values_ui(self):
        row = self.layout.row(align=True)
        row.prop(self.props, "cost_types", text="")
+        if self.props.cost_types == "FIXED":
+            row.prop(self.props, "fixed_cost_value", text="")
        if self.props.cost_types == "CATEGORY":
            row.prop(self.props, "cost_category", text="")
        op = row.operator("bim.add_cost_value", text="Add Value", icon="ADD")
@@ -341,7 +346,8 @@ class BIM_PT_cost_item_quantities(Panel):
        has_quantity_names = CostProp.get_product_quantity_names(self, context)

        row2 = col.row(align=True)
-        row2.label(text="Elements")
+        total_cost_item_products = len(self.props.cost_item_products)
+        row2.label(text="Elements ({})".format(total_cost_item_products))
        op = row2.operator("bim.select_cost_item_products", icon="RESTRICT_SELECT_OFF", text="")
        op.cost_item = cost_item.ifc_definition_id

@@ -361,6 +367,8 @@ class BIM_PT_cost_item_quantities(Panel):
            op.cost_item = cost_item.ifc_definition_id
            op.related_object = 0

+        row2 = col.row()
+        row2.prop(self.props, "show_nested_elements", text="Show nested")
        row2 = col.row()
        row2.template_list(
            "BIM_UL_cost_item_quantities",
@@ -371,6 +379,11 @@ class BIM_PT_cost_item_quantities(Panel):
            "active_cost_item_product_index",
        )

+        row2 = col.row()
+        op = row2.operator("bim.clear_cost_item_assignments", text="Clear assignments", icon="X")
+        op.cost_item = cost_item.ifc_definition_id
+        op.related_object_type = "PRODUCT"
+
        if has_quantity_names:
            row2 = col.row()
            row2.prop(self.props, "product_quantity_names", text="")
@@ -381,7 +394,8 @@ class BIM_PT_cost_item_quantities(Panel):
        has_quantity_names = CostProp.get_process_quantity_names(self, context)

        row2 = col.row(align=True)
-        row2.label(text="Tasks")
+        total_cost_item_processes = len(self.props.cost_item_processes)
+        row2.label(text="Tasks ({})".format(total_cost_item_processes))

        tprops = context.scene.BIMTaskTreeProperties
        wprops = context.scene.BIMWorkScheduleProperties
@@ -397,6 +411,9 @@ class BIM_PT_cost_item_quantities(Panel):
            op.cost_item = cost_item.ifc_definition_id
            op.prop_name = ""

+        row2 = col.row()
+        row2.prop(self.props, "show_nested_tasks", text="Show nested")
+
        row2 = col.row()
        row2.template_list(
            "BIM_UL_cost_item_quantities",
@@ -407,6 +424,11 @@ class BIM_PT_cost_item_quantities(Panel):
            "active_cost_item_process_index",
        )

+        row2 = col.row()
+        op = row2.operator("bim.clear_cost_item_assignments", text="Clear assignments", icon="X")
+        op.cost_item = cost_item.ifc_definition_id
+        op.related_object_type = "PROCESS"
+
        if has_quantity_names:
            row2 = col.row()
            row2.prop(self.props, "process_quantity_names", text="")
@@ -417,7 +439,8 @@ class BIM_PT_cost_item_quantities(Panel):
        has_quantity_names = CostProp.get_resource_quantity_names(self, context)

        row2 = col.row(align=True)
-        row2.label(text="Resources")
+        total_cost_item_resources = len(self.props.cost_item_resources)
+        row2.label(text="Resources ({})".format(total_cost_item_resources))

        op = row2.operator("bim.calculate_cost_item_resource_value", text="", icon="DISC")
        op.cost_item = cost_item.ifc_definition_id
@@ -436,6 +459,9 @@ class BIM_PT_cost_item_quantities(Panel):
            op.cost_item = cost_item.ifc_definition_id
            op.prop_name = ""

+        row2 = col.row()
+        row2.prop(self.props, "show_nested_resources", text="Show nested")
+
        row2 = col.row()
        row2.template_list(
            "BIM_UL_cost_item_quantities",
@@ -446,6 +472,11 @@ class BIM_PT_cost_item_quantities(Panel):
            "active_cost_item_resource_index",
        )

+        row2 = col.row()
+        op = row2.operator("bim.clear_cost_item_assignments", text="Clear assignments", icon="X")
+        op.cost_item = cost_item.ifc_definition_id
+        op.related_object_type = "RESOURCE"
+
        if has_quantity_names:
            row2 = col.row()
            row2.prop(self.props, "resource_quantity_names", text="")
@@ -518,8 +549,23 @@ class BIM_UL_cost_items_trait:
                split2.label(text=str(cost_item["CategoryValues"].get(column.name, "-")))

            self.draw_total_cost_column(split2, cost_item)
+            if self.props.enable_reorder:
+                self.draw_order_operator(row, item.ifc_definition_id, cost_item)
+
+            if self.props.change_cost_item_parent:
+                self.draw_parent_operator(row, item.ifc_definition_id)
+
            # TODO: reimplement "bim.copy_cost_item_values" somewhere with better UX

+    def draw_parent_operator(self, row, cost_item_id):
+        if self.props.active_cost_item_id:
+            if self.props.active_cost_item_id != cost_item_id:
+                op = row.operator(
+                    "bim.change_parent_cost_item", text="", icon="LINKED", emboss=False
+                ).new_parent = cost_item_id
+            else:
+                row.label(text="", icon="BLANK1")
+
    def draw_hierarchy(self, row, item):
        for i in range(0, item.level_index):
            row.label(text="", icon="BLANK1")
@@ -550,6 +596,17 @@ class BIM_UL_cost_items_trait:
    def draw_uom_column(self, layout, cost_item):
        layout.label(text=cost_item["UnitBasisUnitSymbol"] or "?" if cost_item["UnitBasisValueComponent"] else "-")

+    def draw_order_operator(self, row, ifc_definition_id, cost_item):
+        if cost_item["NestingIndex"] is not None:
+            if cost_item["NestingIndex"] == 0:
+                op = row.operator("bim.reorder_cost_item_nesting", icon="TRIA_DOWN", text="")
+                op.cost_item = ifc_definition_id
+                op.new_index = cost_item["NestingIndex"] + 1
+            elif cost_item["NestingIndex"] > 0:
+                op = row.operator("bim.reorder_cost_item_nesting", icon="TRIA_UP", text="")
+                op.cost_item = ifc_definition_id
+                op.new_index = cost_item["NestingIndex"] - 1
+
    def draw_total_quantity_column(self, layout, cost_item):
        layout.label(text="{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '?'}")

@@ -604,9 +661,45 @@ class BIM_UL_cost_item_quantities(UIList):

        if item:
            row = layout.row(align=True)
+            op = row.operator("bim.select_product", text="", icon="RESTRICT_SELECT_OFF")
+            op.product = item.ifc_definition_id
            row.split(factor=0.8)
            row.label(text=item.name)
            row.label(text="{0:.2f}".format(item.total_quantity))
            op = row.operator("bim.unassign_cost_item_quantity", text="", icon="X")
            op.cost_item = cost_item.ifc_definition_id
            op.related_object = item.ifc_definition_id
+
+
+class BIM_UL_product_cost_items(UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            row = layout.row(align=True)
+            op = row.operator("bim.highlight_product_cost_item", text="", icon="STYLUS_PRESSURE")
+            op.cost_item = item.ifc_definition_id
+            row.split(factor=0.8)
+            row.label(text=item.name)
+
+
+class BIM_PT_Costing_Tools(Panel):
+    bl_label = "5D Tools"
+    bl_idname = "BIM_PT_Costing_Tools"
+    bl_space_type = "VIEW_3D"
+    bl_region_type = "UI"
+    bl_category = "4D/5D Toolkit"
+
+    def draw(self, context):
+        self.props = context.scene.BIMCostProperties
+        row = self.layout.row()
+        row.operator(
+            "bim.load_product_cost_items", icon="FILE_REFRESH"
+        )
+        row = self.layout.row()
+        row.template_list(
+            "BIM_UL_product_cost_items",
+            "",
+            self.props,
+            "product_cost_items",
+            self.props,
+            "active_product_cost_item_index",
+        )
@@ -82,6 +82,7 @@ class BIM_PT_object_documents(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1
    bl_parent_id = "BIM_PT_misc_object"

    @classmethod
@@ -17,11 +17,12 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
-from . import ui, prop, operator, handler, gizmos
+from . import ui, prop, operator, handler, gizmos, workspace

 classes = (
+    operator.ActivateDrawing,
    operator.ActivateDrawingStyle,
-    operator.ActivateView,
+    operator.ActivateModel,
    operator.AddAnnotation,
    operator.AddDrawing,
    operator.AddDrawingStyle,
@@ -29,12 +30,11 @@ classes = (
    operator.AddDrawingToSheet,
    operator.AddSchedule,
    operator.AddScheduleToSheet,
-    operator.AddSectionsAnnotations,
    operator.AddSheet,
+    operator.AddTextLiteral,
    operator.BuildSchedule,
    operator.CleanWireframes,
    operator.ContractSheet,
-    operator.CopyGrid,
    operator.CreateDrawing,
    operator.CreateSheets,
    operator.DisableEditingAssignedProduct,
@@ -44,27 +44,30 @@ classes = (
    operator.DisableEditingText,
    operator.DuplicateDrawing,
    operator.EditAssignedProduct,
+    operator.EditSheet,
    operator.EditText,
-    operator.EditVectorStyle,
+    operator.EditTextPopup,
    operator.EnableEditingAssignedProduct,
    operator.EnableEditingText,
    operator.ExpandSheet,
    operator.LoadDrawings,
    operator.LoadSchedules,
    operator.LoadSheets,
+    operator.OpenDrawing,
    operator.OpenSchedule,
    operator.OpenSheet,
-    operator.OpenView,
    operator.RemoveDrawing,
    operator.RemoveDrawingFromSheet,
    operator.RemoveDrawingStyle,
    operator.RemoveDrawingStyleAttribute,
    operator.RemoveSchedule,
    operator.RemoveSheet,
+    operator.RemoveTextLiteral,
+    operator.SelectAllDrawings,
    operator.ResizeText,
    operator.SaveDrawingStyle,
-    operator.SelectDocIfcFile,
    operator.SelectAssignedProduct,
+    operator.SelectDocIfcFile,
    prop.Variable,
    prop.Drawing,
    prop.Schedule,
@@ -72,8 +75,10 @@ classes = (
    prop.Sheet,
    prop.DocProperties,
    prop.BIMCameraProperties,
+    prop.Literal,
    prop.BIMTextProperties,
    prop.BIMAssignedProductProperties,
+    prop.BIMAnnotationProperties,
    ui.BIM_PT_camera,
    ui.BIM_PT_drawing_underlay,
    ui.BIM_PT_annotation_utilities,
@@ -89,11 +94,15 @@ classes = (
    gizmos.DimensionLabelGizmo,
    gizmos.ExtrusionGuidesGizmo,
    gizmos.ExtrusionWidget,
+    workspace.Hotkey,
 )


 def register():
+    if not bpy.app.background:
+        bpy.utils.register_tool(workspace.AnnotationTool, after={"bim.bim_tool"}, separator=True, group=True)
    bpy.types.Scene.DocProperties = bpy.props.PointerProperty(type=prop.DocProperties)
+    bpy.types.Scene.BIMAnnotationProperties = bpy.props.PointerProperty(type=prop.BIMAnnotationProperties)
    bpy.types.Camera.BIMCameraProperties = bpy.props.PointerProperty(type=prop.BIMCameraProperties)
    bpy.types.Object.BIMAssignedProductProperties = bpy.props.PointerProperty(type=prop.BIMAssignedProductProperties)
    bpy.types.Object.BIMTextProperties = bpy.props.PointerProperty(type=prop.BIMTextProperties)
@@ -103,7 +112,10 @@ def register():


 def unregister():
+    if not bpy.app.background:
+        bpy.utils.unregister_tool(workspace.AnnotationTool)
    del bpy.types.Scene.DocProperties
+    del bpy.types.Scene.BIMAnnotationProperties
    del bpy.types.Camera.BIMCameraProperties
    del bpy.types.Object.BIMAssignedProductProperties
    del bpy.types.Object.BIMTextProperties
@@ -32,7 +32,7 @@ class Annotator:
        if related_element is None:
            location, _, _, _ = Annotator.get_placeholder_coords(bpy.context)
        else:
-            obj.data.BIMTextProperties.related_element = related_element
+            obj.data.BIMAssignedProductProperties.related_element = related_element
            location = related_element.location
        obj.location = location
        obj.hide_render = True
@@ -77,66 +77,35 @@ class Annotator:
            co1, co2, _, _ = Annotator.get_placeholder_coords()
        co1 = obj.matrix_world.inverted() @ co1
        co2 = obj.matrix_world.inverted() @ co2
+
        if isinstance(obj.data, bpy.types.Mesh):
            obj.data.vertices.add(2)
            obj.data.vertices[-2].co = co1
            obj.data.vertices[-1].co = co2
            obj.data.edges.add(1)
            obj.data.edges[-1].vertices = (obj.data.vertices[-2].index, obj.data.vertices[-1].index)
+
        if isinstance(obj.data, bpy.types.Curve):
            polyline = obj.data.splines.new("POLY")
            polyline.points.add(1)
            polyline.points[-2].co = list(co1) + [1]
            polyline.points[-1].co = list(co2) + [1]
+
        return obj

    @staticmethod
    def add_plane_to_annotation(obj):
-        co1, co2, co3, co4 = Annotator.get_placeholder_coords()
-        co1 = obj.matrix_world.inverted() @ co1  # bot left
-        co2 = obj.matrix_world.inverted() @ co2  # top left
-        co3 = obj.matrix_world.inverted() @ co3  # bot right
-        co4 = obj.matrix_world.inverted() @ co4  # top right
+        # default order = bot left, top left, bot right, top right
+        # therefore we redefine the order
+        face_verts = [0, 2, 3, 1]

-        obj.data.vertices.add(4)
-        v1 = obj.data.vertices[-4]
-        v2 = obj.data.vertices[-3]
-        v3 = obj.data.vertices[-2]
-        v4 = obj.data.vertices[-1]
-        v1.co = co4
-        v2.co = co2
-        v3.co = co1
-        v4.co = co3
+        verts_world_space = Annotator.get_placeholder_coords()
+        verts_local = [obj.matrix_world.inverted() @ v for v in verts_world_space]
+        bm = tool.Blender.get_bmesh_for_mesh(obj.data, clean=True)
+        new_verts = [bm.verts.new(v) for v in verts_local]

-        obj.data.edges.add(4)
-        e1 = obj.data.edges[-4]
-        e2 = obj.data.edges[-3]
-        e3 = obj.data.edges[-2]
-        e4 = obj.data.edges[-1]
-        e1.vertices = (v1.index, v2.index)
-        e2.vertices = (v2.index, v3.index)
-        e3.vertices = (v3.index, v4.index)
-        e4.vertices = (v4.index, v1.index)
-
-        obj.data.loops.add(4)
-        l1 = obj.data.loops[-4]
-        l2 = obj.data.loops[-3]
-        l3 = obj.data.loops[-2]
-        l4 = obj.data.loops[-1]
-        l1.vertex_index = v1.index
-        l1.edge_index = e1.index
-        l2.vertex_index = v2.index
-        l2.edge_index = e2.index
-        l3.vertex_index = v3.index
-        l3.edge_index = e3.index
-        l4.vertex_index = v4.index
-        l4.edge_index = e4.index
-
-        obj.data.polygons.add(1)
-        p1 = obj.data.polygons[-1]
-        p1.vertices = (v1.index, v2.index, v3.index, v4.index)
-        p1.loop_start = l1.index
-        p1.loop_total = 4
+        bm.faces.new([new_verts[i] for i in face_verts])
+        tool.Blender.apply_bmesh(obj.data, bm, obj)
        return obj

    @staticmethod
@@ -144,15 +113,15 @@ class Annotator:
        camera = tool.Ifc.get_object(drawing)
        co1, _, _, _ = Annotator.get_placeholder_coords(camera)
        matrix_world = camera.matrix_world.copy()
-        matrix_world[0][3] = co1.x
-        matrix_world[1][3] = co1.y
-        matrix_world[2][3] = co1.z
+        matrix_world.translation = co1
        collection = camera.users_collection[0]
+
        if object_type == "TEXT":
            obj = bpy.data.objects.new(object_type, None)
            obj.matrix_world = matrix_world
            collection.objects.link(obj)
            return obj
+
        elif object_type in ("TEXT_LEADER", "SECTION_LEVEL"):
            data = bpy.data.curves.new(object_type, type="CURVE")
            data.dimensions = "3D"
@@ -161,17 +130,20 @@ class Annotator:
            obj.matrix_world = matrix_world
            collection.objects.link(obj)
            return obj
+
        if object_type != "ANGLE":
            for obj in collection.objects:
                element = tool.Ifc.get_entity(obj)
                if element and element.ObjectType == object_type and obj.type == object_type.upper():
                    return obj
+
        if data_type == "mesh":
            data = bpy.data.meshes.new(object_type)
        elif data_type == "curve":
            data = bpy.data.curves.new(object_type, type="CURVE")
            data.dimensions = "3D"
            data.resolution_u = 2
+
        obj = bpy.data.objects.new(object_type, data)
        obj.matrix_world = matrix_world
        collection.objects.link(obj)
@@ -182,14 +154,13 @@ class Annotator:
        if not camera:
            camera = bpy.context.scene.camera
        z_offset = camera.matrix_world.to_quaternion() @ Vector((0, 0, -1))
-        if bpy.context.scene.render.resolution_x > bpy.context.scene.render.resolution_y:
-            y = (
-                camera.data.ortho_scale
-                * (bpy.context.scene.render.resolution_y / bpy.context.scene.render.resolution_x)
-                / 4
-            )
-        else:
-            y = camera.data.ortho_scale / 4
+        y = camera.data.ortho_scale / 4
+
+        res_x = bpy.context.scene.render.resolution_x
+        res_y = bpy.context.scene.render.resolution_y
+        if res_x > res_y:
+            y *= res_y / res_x
+
        y_offset = camera.matrix_world.to_quaternion() @ Vector((0, y, 0))
        x_offset = camera.matrix_world.to_quaternion() @ Vector((y / 2, 0, 0))
        return (
@@ -16,17 +16,22 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

+import os
 import bpy
+import ifcopenshell.util.element
 import ifcopenshell.util.representation
 import blenderbim.tool as tool
+from pathlib import Path


 def refresh():
    ProductAssignmentsData.is_loaded = False
-    TextData.is_loaded = False
    SheetsData.is_loaded = False
    SchedulesData.is_loaded = False
    DrawingsData.is_loaded = False
+    AnnotationData.is_loaded = False
+    DecoratorData.data = {}
+    DecoratorData.cut_cache = {}


 class ProductAssignmentsData:
@@ -49,40 +54,42 @@ class ProductAssignmentsData:
                return f"{rel.RelatingProduct.is_a()}/{name}"


-class TextData:
-    data = {}
-    is_loaded = False
-
-    @classmethod
-    def load(cls):
-        cls.data = {"attributes": cls.attributes()}
-        cls.is_loaded = True
-
-    @classmethod
-    def attributes(cls):
-        element = tool.Ifc.get_entity(bpy.context.active_object)
-        if not element or not element.is_a("IfcAnnotation") or element.ObjectType not in ["TEXT", "TEXT_LEADER"]:
-            return []
-        rep = ifcopenshell.util.representation.get_representation(element, "Plan", "Annotation")
-        text_literal = [i for i in rep.Items if i.is_a("IfcTextLiteral")][0]
-        return [
-            {"name": "Literal", "value": text_literal.Literal},
-            {"name": "BoxAlignment", "value": text_literal.BoxAlignment},
-        ]
-
-
 class SheetsData:
    data = {}
    is_loaded = False

    @classmethod
    def load(cls):
-        cls.data = {"total_sheets": cls.total_sheets()}
+        cls.data = {
+            "has_saved_ifc": cls.has_saved_ifc(),
+            "total_sheets": cls.total_sheets(),
+            "titleblocks": cls.titleblocks(),
+        }
        cls.is_loaded = True

+    @classmethod
+    def has_saved_ifc(cls):
+        return os.path.isfile(tool.Ifc.get_path())
+
    @classmethod
    def total_sheets(cls):
-        return len([d for d in tool.Ifc.get().by_type("IfcDocumentInformation") if d.Scope == "DOCUMENTATION"])
+        return len([d for d in tool.Ifc.get().by_type("IfcDocumentInformation") if d.Scope == "SHEET"])
+
+    @classmethod
+    def titleblocks(cls):
+        files = Path(os.path.join(bpy.context.scene.BIMProperties.data_dir, "templates", "titleblocks")).glob("*.svg")
+        files = [str(f.stem) for f in files]
+
+        if tool.Ifc.get():
+            project = tool.Ifc.get().by_type("IfcProject")[0]
+            titleblocks_dir = ifcopenshell.util.element.get_pset(project, "BBIM_Documentation", "TitleblocksDir")
+            if not titleblocks_dir:
+                titleblocks_dir = bpy.context.scene.DocProperties.titleblocks_dir
+            titleblocks_dir = tool.Ifc.resolve_uri(titleblocks_dir)
+            if os.path.exists(titleblocks_dir):
+                files.extend([str(f.stem) for f in Path(titleblocks_dir).glob("*.svg")])
+
+        return [(f, f, "") for f in sorted(list(set(files)))]


 class DrawingsData:
@@ -91,9 +98,17 @@ class DrawingsData:

    @classmethod
    def load(cls):
-        cls.data = {"total_drawings": cls.total_drawings(), "location_hint": cls.location_hint()}
+        cls.data = {
+            "has_saved_ifc": cls.has_saved_ifc(),
+            "total_drawings": cls.total_drawings(),
+            "location_hint": cls.location_hint(),
+        }
        cls.is_loaded = True

+    @classmethod
+    def has_saved_ifc(cls):
+        return os.path.isfile(tool.Ifc.get_path())
+
    @classmethod
    def total_drawings(cls):
        return len([e for e in tool.Ifc.get().by_type("IfcAnnotation") if e.ObjectType == "DRAWING"])
@@ -115,9 +130,185 @@ class SchedulesData:

    @classmethod
    def load(cls):
-        cls.data = {"total_schedules": cls.total_schedules()}
+        cls.data = {"has_saved_ifc": cls.has_saved_ifc(), "total_schedules": cls.total_schedules()}
        cls.is_loaded = True

+    @classmethod
+    def has_saved_ifc(cls):
+        return os.path.isfile(tool.Ifc.get_path())
+
    @classmethod
    def total_schedules(cls):
        return len([d for d in tool.Ifc.get().by_type("IfcDocumentInformation") if d.Scope == "SCHEDULE"])
+
+
+FONT_SIZES = {
+    "small": 1.8,
+    "regular": 2.5,
+    "large": 3.5,
+    "header": 5.0,
+    "title": 7.0,
+}
+
+
+class DecoratorData:
+    # stores 1 type of data per object
+    data = {}
+    cut_cache = {}
+
+    # used by Ifc Annotations with ObjectType = "BATTING"
+    @classmethod
+    def get_batting_thickness(cls, obj):
+        result = cls.data.get(obj.name, None)
+        if result is not None:
+            return result
+        element = tool.Ifc.get_entity(obj)
+        if element:
+            unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+            thickness = ifcopenshell.util.element.get_pset(element, "BBIM_Batting", "Thickness")
+            thickness = thickness * unit_scale if thickness else 1.5
+            cls.data[obj.name] = thickness
+            return thickness
+
+    # used by Ifc Annotations with ObjectType = "SECTION"
+    @classmethod
+    def get_section_markers_display_data(cls, obj):
+        result = cls.data.get(obj.name, None)
+        if result is not None:
+            return result
+
+        element = tool.Ifc.get_entity(obj)
+        if not element:
+            return
+
+        # default values
+        pset_data = {
+            "HasConnectedSectionLine": True,
+            "ShowStartArrow": True,
+            "StartArrowSymbol": "",
+            "ShowEndArrow": True,
+            "EndArrowSymbol": "",
+        }
+        obj_pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Section") or {}
+        pset_data.update(obj_pset_data)
+
+        # create more usable display data
+        start_symbol = pset_data["StartArrowSymbol"]
+        end_symbol = pset_data["EndArrowSymbol"]
+        display_data = {
+            "start": {
+                "add_circle": pset_data["ShowStartArrow"] and not start_symbol,
+                "add_symbol": pset_data["ShowStartArrow"] or bool(start_symbol),
+                "symbol": start_symbol or "section-arrow",
+            },
+            "end": {
+                "add_circle": pset_data["ShowEndArrow"] and not end_symbol,
+                "add_symbol": pset_data["ShowEndArrow"] or bool(end_symbol),
+                "symbol": end_symbol or "section-arrow",
+            },
+            "connect_markers": pset_data["HasConnectedSectionLine"],
+        }
+
+        cls.data[obj.name] = display_data
+        return display_data
+
+    # used by Ifc Annotations with ObjectType = "TEXT" / "TEXT_LEADER"
+    @classmethod
+    def get_ifc_text_data(cls, obj):
+        """returns font size in mm for current ifc text object"""
+        result = cls.data.get(obj.name, None)
+        if result is not None:
+            return result
+
+        element = tool.Ifc.get_entity(obj)
+        if not element or not tool.Drawing.is_annotation_object_type(element, ["TEXT", "TEXT_LEADER"]):
+            return None
+
+        props = obj.BIMTextProperties
+        # getting font size
+        classes = ifcopenshell.util.element.get_pset(element, "EPset_Annotation", "Classes")
+        # use `regular` as default
+        if classes:
+            classes_split = classes.split()
+            # prioritize smaller font sizes just like in svg
+            font_size_type = next(
+                (font_size_type for font_size_type in FONT_SIZES if font_size_type in classes_split), "regular"
+            )
+        else:
+            font_size_type = "regular"
+        font_size = FONT_SIZES[font_size_type]
+
+        # other attributes
+        props_literals = props.literals
+        props_literals_n = len(props.literals)
+        literals = tool.Drawing.get_text_literal(obj, return_list=True)
+        literals_data = []
+        for i, literal in enumerate(literals):
+            literal_data = {
+                "Literal": literal.Literal,
+                "BoxAlignment": literal.BoxAlignment,
+            }
+            if i < props_literals_n:
+                literal_data["CurrentValue"] = props_literals[i].value
+            else:
+                literal_data["CurrentValue"] = literal.Literal
+
+            literals_data.append(literal_data)
+
+        text_data = {"Literals": literals_data, "FontSize": font_size}
+        cls.data[obj.name] = text_data
+        return text_data
+
+    # used by Ifc Annotations with ObjectType = "DIMENSION" / "DIAMETER"
+    @classmethod
+    def get_dimension_data(cls, obj):
+        result = cls.data.get(obj.name, None)
+        if result is not None:
+            return result
+
+        element = tool.Ifc.get_entity(obj)
+        supported_object_types = ("DIMENSION", "DIAMETER")
+        if not element or not element.is_a("IfcAnnotation") or element.ObjectType not in supported_object_types:
+            return None
+
+        dimension_style = "arrow"
+        classes = ifcopenshell.util.element.get_pset(element, "EPset_Annotation", "Classes")
+        if classes and "oblique" in classes.lower().split():
+            dimension_style = "oblique"
+
+        pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Dimension") or {}
+        show_description_only = pset_data.get("ShowDescriptionOnly", False)
+        suppress_zero_inches = pset_data.get("SuppressZeroInches", False)
+
+        dimension_data = {
+            "dimension_style": dimension_style,
+            "show_description_only": show_description_only,
+            "suppress_zero_inches": suppress_zero_inches,
+        }
+        cls.data[obj.name] = dimension_data
+        return dimension_data
+
+
+class AnnotationData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.props = bpy.context.scene.BIMAnnotationProperties
+        cls.data["relating_types"] = cls.get_relating_types()
+
+    @classmethod
+    def get_relating_types(cls):
+        object_type = cls.props.object_type
+        relating_types = []
+        for relating_type in tool.Ifc.get().by_type("IfcTypeProduct"):
+            if tool.Drawing.is_annotation_object_type(relating_type, object_type):
+                relating_types.append(relating_type)
+
+        enum_items = [(str(e.id()), e.Name or "Unnamed", e.Description or "") for e in relating_types]
+
+        # item to create anootations without relating types
+        enum_items.insert(0, ("0", "-", ""))
+        return enum_items
@@ -18,10 +18,9 @@

 import bpy
 import blf
-import math
-import gpu, bgl
+import gpu
 from bpy import types
-from mathutils import Vector, Matrix
+from mathutils import Vector
 from mathutils import geometry
 from bpy_extras import view3d_utils
 from blenderbim.bim.module.drawing.shaders import DotsGizmoShader, ExtrusionGuidesShader, BaseLinesShader
@@ -273,7 +272,7 @@ class CustomGizmo:
            gpu.matrix.multiply_matrix(self.matrix_world)
            batch.draw()

-        bgl.glDisable(bgl.GL_BLEND)
+        gpu.state.blend_set("NONE")


 class OffsetHandle:
@@ -500,7 +499,7 @@ class ExtrusionWidget(types.GizmoGroup):
        gz = self.guides = self.gizmos.new("BIM_GT_extrusion_guides")
        gz.matrix_basis = basis
        gz.color = gz.color_highlight = tuple(theme.gizmo_secondary)
-        gz.alpha = gz.alpha_highlight = 0.5
+        gz.alpha = gz.alpha_highlight = 0.75
        gz.use_draw_modal = True
        gz.target_set_prop("depth", prop, "value")
        gz.scale_value = scale_value
@@ -23,8 +23,7 @@ from bpy.app.handlers import persistent

@persistent
 def toggleDecorationsOnLoad(*args):
-    toggle = bpy.context.scene.DocProperties.should_draw_decorations
-    if toggle:
+    if bpy.context.scene.DocProperties.should_draw_decorations:
        decoration.DecorationsHandler.install(bpy.context)
    else:
        decoration.DecorationsHandler.uninstall()
@@ -120,9 +120,9 @@ class BoundingBox:

 # This function stolen from https://github.com/kevancress/MeasureIt_ARCH/blob/dcf607ce0896aa2284463c6b4ae9cd023fc54cbe/measureit_arch_baseclass.py
 # MeasureIt-ARCH is GPL-v3
-# In the future I will need to rewrite this to allow the user to have custom
-# settings for each annotation object, not read from Blender.
-def format_distance(value, isArea=False, hide_units=True):
+def format_distance(
+    value, isArea=False, hide_units=True, precision=None, decimal_places=None, suppress_zero_inches=False
+):
    s_code = "\u00b2"  # Superscript two THIS IS LEGACY (but being kept for when Area Measurements are re-implimented)

    # Get Scene Unit Settings
@@ -131,7 +131,7 @@ def format_distance(value, isArea=False, hide_units=True):
    unit_length = bpy.context.scene.unit_settings.length_unit

    toInches = 39.3700787401574887
-    inPerFoot = 11.999
+    inPerFoot = 11.9999

    if isArea:
        toInches = 1550
@@ -141,8 +141,7 @@ def format_distance(value, isArea=False, hide_units=True):

    # Imperial Formatting
    if unit_system == "IMPERIAL":
-        precision = bpy.context.scene.BIMProperties.imperial_precision
-        if precision == "NONE":
+        if not precision:
            precision = 256
        elif precision == "1":
            precision = 1
@@ -186,44 +185,50 @@ def format_distance(value, isArea=False, hide_units=True):
            inches = 0

        if not isArea:
+            add_inches = bool(inches) or not suppress_zero_inches
            tx_dist = ""
            if feet:
                tx_dist += str(feet) + "'"
-            if feet and inches:
+            if feet and add_inches:
                tx_dist += " - "
-            if inches:
+            if add_inches:
                tx_dist += str(inches)
-            if inches and frac:
+            if add_inches and frac:
                tx_dist += " "
            if frac:
                tx_dist += str(frac) + "/" + str(base)
-            if inches or frac:
+            if add_inches or frac:
                tx_dist += '"'
        else:
            tx_dist = str("%1.3f" % (value * toInches / inPerFoot)) + " sq. ft."

    # METRIC FORMATTING
    elif unit_system == "METRIC":
-        precision = bpy.context.scene.BIMProperties.metric_precision
-        if precision != 0:
+        if precision:
            value = precision * round(float(value) / precision)

+        if decimal_places:
+            fmt = "%1." + str(decimal_places) + "f"
+
        # Meters
        if unit_length == "METERS":
-            fmt = "%1.3f"
+            if not decimal_places:
+                fmt = "%1.3f"
            if hide_units is False:
                fmt += " m"
            tx_dist = fmt % value
        # Centimeters
        elif unit_length == "CENTIMETERS":
-            fmt = "%1.1f"
+            if not decimal_places:
+                fmt = "%1.1f"
            if hide_units is False:
                fmt += " cm"
            d_cm = value * (100)
            tx_dist = fmt % d_cm
        # Millimeters
        elif unit_length == "MILLIMETERS":
-            fmt = "%1.0f"
+            if not decimal_places:
+                fmt = "%1.0f"
            if hide_units is False:
                fmt += " mm"
            d_mm = value * (1000)
@@ -231,20 +236,21 @@ def format_distance(value, isArea=False, hide_units=True):

        # Otherwise Use Adaptive Units
        else:
-            if round(value, 2) >= 1.0:
+            if round(value, 2) >= 1.0 and not decimal_places:
                fmt = "%1.3f"
                if hide_units is False:
                    fmt += " m"
                tx_dist = fmt % value
            else:
-                if round(value, 2) >= 0.01:
+                if round(value, 2) >= 0.01 and not decimal_places:
                    fmt = "%1.1f"
                    if hide_units is False:
                        fmt += " cm"
                    d_cm = value * (100)
                    tx_dist = fmt % d_cm
                else:
-                    fmt = "%1.0f"
+                    if not decimal_places:
+                        fmt = "%1.0f"
                    if hide_units is False:
                        fmt += " mm"
                    d_mm = value * (1000)
@@ -25,7 +25,8 @@ import blenderbim.tool as tool
 import blenderbim.core.drawing as core
 import blenderbim.bim.module.drawing.annotation as annotation
 import blenderbim.bim.module.drawing.decoration as decoration
-from blenderbim.bim.module.drawing.data import DrawingsData
+from blenderbim.bim.module.drawing.data import DrawingsData, DecoratorData, SheetsData, AnnotationData
+from blenderbim.bim.module.drawing.data import refresh as refresh_drawing_data
 from pathlib import Path
 from blenderbim.bim.prop import Attribute, StrProperty
 from bpy.types import PropertyGroup
@@ -38,24 +39,19 @@ from bpy.props import (
    FloatProperty,
    FloatVectorProperty,
    CollectionProperty,
+    BoolVectorProperty,
 )


 diagram_scales_enum = []
-titleblocks_enum = []
 sheets_enum = []
-vector_styles_enum = []


 def purge():
    global diagram_scales_enum
-    global titleblocks_enum
    global sheets_enum
-    global vector_styles_enum
    diagram_scales_enum = []
-    titleblocks_enum = []
    sheets_enum = []
-    vector_styles_enum = []


 def update_target_view(self, context):
@@ -84,7 +80,7 @@ def update_diagram_scale(self, context):
        )
    except:
        return
-    pset = ifcopenshell.util.element.get_psets(element).get("EPset_Drawing")
+    pset = ifcopenshell.util.element.get_pset(element, "EPset_Drawing")
    if pset:
        pset = tool.Ifc.get().by_id(pset["id"])
    else:
@@ -189,20 +185,14 @@ def update_layer(self, context, name, value):
    ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties={name: value})


-def getTitleblocks(self, context):
-    global titleblocks_enum
-    if len(titleblocks_enum) < 1:
-        titleblocks_enum.clear()
-        files = Path(os.path.join(context.scene.BIMProperties.data_dir, "templates", "titleblocks")).glob("*.svg")
-        files = sorted([str(f.stem) for f in files])
-        titleblocks_enum.extend([(f, f, "") for f in files])
-    return titleblocks_enum
+def get_titleblocks(self, context):
+    if not SheetsData.is_loaded:
+        SheetsData.load()
+    return SheetsData.data["titleblocks"]


-def refreshTitleblocks(self, context):
-    global titleblocks_enum
-    titleblocks_enum.clear()
-    getTitleblocks(self, context)
+def update_titleblocks(self, context):
+    SheetsData.data["titleblocks"] = SheetsData.titleblocks()


 def toggleDecorations(self, context):
@@ -212,25 +202,12 @@ def toggleDecorations(self, context):
        collection = context.scene.camera.users_collection[0]
        for obj in collection.objects:
            tool.Drawing.update_text_value(obj)
+        refresh_drawing_data()
        decoration.DecorationsHandler.install(context)
    else:
        decoration.DecorationsHandler.uninstall()


-def getVectorStyles(self, context):
-    global vector_styles_enum
-    if len(vector_styles_enum) < 1:
-        sheets_enum.clear()
-        for filename in Path(os.path.join(context.scene.BIMProperties.data_dir, "styles")).glob("*.css"):
-            f = str(filename.stem)
-            vector_styles_enum.append((f, f, ""))
-    return vector_styles_enum
-
-
-def refreshFontSize(self, context):
-    annotation.Annotator.resize_text(context.active_object)
-
-
 class Variable(PropertyGroup):
    name: StringProperty(name="Name")
    prop_key: StringProperty(name="Property Key")
@@ -240,6 +217,7 @@ class Drawing(PropertyGroup):
    ifc_definition_id: IntProperty(name="IFC Definition ID")
    name: StringProperty(name="Name", update=update_drawing_name)
    target_view: StringProperty(name="Target View")
+    is_selected: BoolProperty(name="Is Selected", default=True)


 class Schedule(PropertyGroup):
@@ -249,19 +227,9 @@ class Schedule(PropertyGroup):


 class Sheet(PropertyGroup):
-    def set_name(self, new):
-        old = self.get("name")
-        path = os.path.join(bpy.context.scene.BIMProperties.data_dir, "sheets")
-        if old and os.path.isfile(os.path.join(path, old + ".svg")):
-            os.rename(os.path.join(path, old + ".svg"), os.path.join(path, new + ".svg"))
-        self["name"] = new
-
-    def get_name(self):
-        return self.get("name")
-
    ifc_definition_id: IntProperty(name="IFC Definition ID")
    identification: StringProperty(name="Identification")
-    name: StringProperty(name="Name", get=get_name, set=set_name)
+    name: StringProperty(name="Name")
    is_sheet: BoolProperty(name="Is Sheet", default=False)
    reference_type: StringProperty(name="Reference Type")
    is_expanded: BoolProperty(name="Is Expanded", default=False)
@@ -279,7 +247,6 @@ class DrawingStyle(PropertyGroup):
        name="Render Type",
        default="VIEWPORT",
    )
-    vector_style: EnumProperty(items=getVectorStyles, name="Vector Style")
    include_query: StringProperty(name="Include Query")
    exclude_query: StringProperty(name="Exclude Query")
    attributes: CollectionProperty(name="Attributes", type=StrProperty)
@@ -338,7 +305,7 @@ class DocProperties(PropertyGroup):
    current_drawing_index: IntProperty(name="Current Drawing Index")
    schedules: CollectionProperty(name="Schedules", type=Schedule)
    active_schedule_index: IntProperty(name="Active Schedule Index")
-    titleblock: EnumProperty(items=getTitleblocks, name="Titleblock", update=refreshTitleblocks)
+    titleblock: EnumProperty(items=get_titleblocks, name="Titleblock", update=update_titleblocks)
    is_editing_sheets: BoolProperty(name="Is Editing Sheets", default=False)
    sheets: CollectionProperty(name="Sheets", type=Sheet)
    active_sheet_index: IntProperty(name="Active Sheet Index")
@@ -348,9 +315,23 @@ class DocProperties(PropertyGroup):
    decorations_colour: FloatVectorProperty(
        name="Decorations Colour", subtype="COLOR", default=(1, 1, 1, 1), min=0.0, max=1.0, size=4
    )
+    sheets_dir: StringProperty(default=os.path.join("sheets") + os.path.sep, name="Default Sheets Directory")
+    layouts_dir: StringProperty(default=os.path.join("layouts") + os.path.sep, name="Default Layouts Directory")
+    titleblocks_dir: StringProperty(
+        default=os.path.join("layouts", "titleblocks") + os.path.sep, name="Default Titleblocks Directory"
+    )
+    drawings_dir: StringProperty(default=os.path.join("drawings") + os.path.sep, name="Default Drawings Directory")
+    stylesheet_path: StringProperty(
+        default=os.path.join("drawings", "assets", "default.css"), name="Default Stylesheet"
+    )
+    markers_path: StringProperty(default=os.path.join("drawings", "assets", "markers.svg"), name="Default Markers")
+    symbols_path: StringProperty(default=os.path.join("drawings", "assets", "symbols.svg"), name="Default Symbols")
+    patterns_path: StringProperty(default=os.path.join("drawings", "assets", "patterns.svg"), name="Default Patterns")


 class BIMCameraProperties(PropertyGroup):
+    calculate_shapely_surfaces: BoolProperty(name="Calculate Shapely Surfaces", default=False)
+    calculate_svgfill_surfaces: BoolProperty(name="Calculate SVGFill Surfaces", default=False)
    has_underlay: BoolProperty(name="Underlay", default=False, update=update_has_underlay)
    has_linework: BoolProperty(name="Linework", default=True, update=update_has_linework)
    has_annotation: BoolProperty(name="Annotation", default=True, update=update_has_annotation)
@@ -381,10 +362,66 @@ class BIMCameraProperties(PropertyGroup):
        return False


+DEFAULT_BOX_ALIGNMENT = [False] * 6 + [True] + [False] * 2
+BOX_ALIGNMENT_POSITIONS = [
+    "top-left",
+    "top-middle",
+    "top-right",
+    "middle-left",
+    "center",
+    "middle-right",
+    "bottom-left",
+    "bottom-middle",
+    "bottom-right",
+]
+
+
+class Literal(PropertyGroup):
+    def set_box_alignment(self, new_value):
+        markers = new_value.count(True)
+        if not markers:
+            return
+
+        if markers > 1:
+            prev_value = self.get("box_alignment", DEFAULT_BOX_ALIGNMENT)
+            # looking for the first value changed to positive
+            first_changed_value = next((i for i in range(9) if new_value[i] and new_value[i] != prev_value[i]), None)
+
+            # if nothing have changed we just keep the previous value
+            if first_changed_value is None:
+                return
+            new_value = [False] * 9
+            new_value[first_changed_value] = True
+
+        self["box_alignment"] = new_value
+        position_string = BOX_ALIGNMENT_POSITIONS[next(i for i in range(9) if new_value[i])]
+        self.attributes["BoxAlignment"].set_value(position_string)
+
+    def get_box_alignment(self):
+        return self.get("box_alignment", DEFAULT_BOX_ALIGNMENT)
+
+    attributes: CollectionProperty(name="Attributes", type=Attribute)
+    # Current text value with evaluated experessions stored in `value`.
+    # The original (Literal) value stored in `attributes['Literal']`
+    # and can be accessed with `get_text()`
+    value: StringProperty(name="Value", default="TEXT")
+    box_alignment: BoolVectorProperty(
+        name="Box alignment", size=9, set=set_box_alignment, get=get_box_alignment, default=DEFAULT_BOX_ALIGNMENT
+    )
+    ifc_definition_id: IntProperty(name="IFC definition ID", default=0)
+
+    def get_literal_edited_data(self):
+        text_data = {
+            "CurrentValue": self.attributes["Literal"].string_value,
+            "Literal": self.attributes["Literal"].string_value,
+            "BoxAlignment": self.attributes["BoxAlignment"].string_value,
+        }
+        return text_data
+
+
 class BIMTextProperties(PropertyGroup):
    is_editing: BoolProperty(name="Is Editing", default=False)
-    attributes: CollectionProperty(name="Attributes", type=Attribute)
-    value: StringProperty(name="Value", default="TEXT")
+    literals: CollectionProperty(name="Literals", type=Literal)
    font_size: EnumProperty(
        items=[
            ("1.8", "1.8 - Small", ""),
@@ -394,11 +431,79 @@ class BIMTextProperties(PropertyGroup):
            ("7.0", "7.0 - Title", ""),
        ],
        default="2.5",
-        update=refreshFontSize,
        name="Font Size",
    )

+    def get_text_edited_data(self):
+        """should be called only if `is_editing`
+        otherwise should use `DecoratorData.get_ifc_text_data(obj)` instead
+        because this data could be out of date
+        """
+        literals_data = []
+        for literal in self.literals:
+            literal_data = literal.get_literal_edited_data()
+            literals_data.append(literal_data)
+        text_data = {
+            "Literals": literals_data,
+            "FontSize": float(self.font_size),
+        }
+        return text_data
+

 class BIMAssignedProductProperties(PropertyGroup):
    is_editing_product: BoolProperty(name="Is Editing Product", default=False)
    relating_product: PointerProperty(name="Relating Product", type=bpy.types.Object)
+
+
+# ObjectType: annotation_name, description, icon, data_type
+# fmt: off
+ANNOTATION_TYPES_DATA = {
+    "DIMENSION":     ("Dimension",        "Add dimensions annotation.\nMeasurement values can be hidden through ShowDescriptionOnly property\nof BBIM_Dimension property set", "FIXED_SIZE", "curve"),
+    "ANGLE":         ("Angle",            "", "DRIVER_ROTATIONAL_DIFFERENCE", "curve"),
+    "RADIUS":        ("Radius",           "", "FORWARD", "curve"),
+    "DIAMETER":      ("Diameter",         "Add diameter annotation.\nMeasurement values can be hidden through ShowDescriptionOnly property\nof BBIM_Dimension property set", "ARROW_LEFTRIGHT", "curve"),
+    "TEXT":          ("Text",             "", "SMALL_CAPS", "empty"),
+    "TEXT_LEADER":   ("Leader",           "", "TRACKING_BACKWARDS", "curve"),
+    "STAIR_ARROW":   ("Stair Arrow",      "Add stair arrow annotation.\nIf you have IfcStairFlight object selected, it will be used as a reference for the annotation", "SCREEN_BACK", "curve"),
+    "HIDDEN_LINE":   ("Hidden",           "", "CON_TRACKTO", "mesh"),
+    "PLAN_LEVEL":    ("Level (Plan)",     "", "SORTBYEXT", "curve"),
+    "SECTION_LEVEL": ("Level (Section)",  "", "TRIA_DOWN", "curve"),
+    "BREAKLINE":     ("Breakline",        "", "FCURVE", "mesh"),
+    "LINEWORK":      ("Line",             "", "MESH_MONKEY", "mesh"),
+    "BATTING":       ("Batting",          "Add batting annotation.\nThickness could be changed through Thickness property of BBIM_Batting property set", "FORCE_FORCE", "mesh"),
+    "FILL_AREA":     ("Fill Area",        "", "NODE_TEXTURE", "mesh"),
+    "FALL":          ("Fall",             "", "SORT_ASC", "curve"),
+}
+# fmt: on
+
+annotation_classes = [(x, *ANNOTATION_TYPES_DATA[x][:3], i) for i, x in enumerate(ANNOTATION_TYPES_DATA)]
+
+
+def get_annotation_data_prop(prop_name):
+    def function(self, context):
+        if not AnnotationData.is_loaded:
+            AnnotationData.load()
+        return AnnotationData.data[prop_name]
+
+    return function
+
+
+def update_annotation_object_type(self, context):
+    self.relating_type_id = "0"
+    # changing enum doesn't trigger refresh by itself
+    AnnotationData.is_loaded = False
+
+
+class BIMAnnotationProperties(PropertyGroup):
+    object_type: bpy.props.EnumProperty(
+        name="Annotation Object Type", items=annotation_classes, default="TEXT", update=update_annotation_object_type
+    )
+    relating_type_id: bpy.props.EnumProperty(
+        name="Relating Annotation Type", items=get_annotation_data_prop("relating_types")
+    )
+    create_representation_for_type: bpy.props.BoolProperty(
+        name="Create Representation For Type",
+        default=False,
+        description='Whether "Add type" should define a representation for the type \n'
+        "or allow occurences to have their own",
+    )
@@ -16,10 +16,177 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

-import bgl
-from mathutils import Matrix
 from gpu.types import GPUShader
 from gpu_extras.batch import batch_for_shader
+import gpu
+
+
+BASE_DEF_GLSL = """
+#define PI 3.141592653589793
+#define MAX_POINTS 64
+#define CIRCLE_SEGS 12
+#define SMOOTH_WIDTH 1.0
+#define lineSmooth true
+"""
+
+# since `bgl` is deprecated, creating smoothing lines became tricky
+# Notes for creating shaders with smoothed lines:
+# in geom shader - use triangle_strip, DEFAULT_SETUP, do_edge_verts or do_vertex to emit vertices
+# in frag shader - use lineWidth uniform, smoothline flaot in, smoothing shader code from base shader
+# mind the vertex limit since emitting vertices for smoothed lines produces twice as much vertices
+
+BASE_LIB_GLSL = """
+// TODO: redefine as macor instead
+uniform vec2 winsize;
+uniform float lineWidth;
+#define half_winsize (winsize / 2)
+// convert camera to window
+#define C2W(v) vec4(v.x * half_winsize.x / v.w, v.y * half_winsize.y / v.w, v.z / v.w, 1)
+// convert window to camera
+#define W2C(v) vec4(v.x * v.w / half_winsize.x, v.y * v.w / half_winsize.y, v.z * v.w, 1)
+
+void emitSegment(vec4 p0, vec4 p1) {
+    gl_Position = p0;
+    EmitVertex();
+    gl_Position = p1;
+    EmitVertex();
+    EndPrimitive();
+}
+
+void emitTriangle(vec4 p1, vec4 p2, vec4 p3) {
+    gl_Position = p1;
+    EmitVertex();
+    gl_Position = p2;
+    EmitVertex();
+    gl_Position = p3;
+    EmitVertex();
+    EndPrimitive();
+}
+
+#define matCLIP2WIN() vec4(winsize.x/2, winsize.y/2, 1, 1)
+#define CLIP2WIN(v) (clip2win * (v) / (v).w)
+#define matWIN2CLIP() vec4(2/winsize.x, 2/winsize.y, 1, 1)
+#define WIN2CLIP(v) (win2clip * (v) * (v).w)
+#define DEFAULT_SETUP() vec4 clip2win = matCLIP2WIN(), win2clip = matWIN2CLIP(); vec2 EDGE_DIR
+
+out float smoothline;
+
+void arrow_head(in vec4 dir, in float size, in float angle, out vec4 head[3]) {
+    vec4 nose = dir * size;
+    float c = cos(angle), s = sin(angle);
+    head[0] = nose;
+    head[1] = vec4(mat2(c, -s, +s, c) * nose.xy, 0, 0);
+    head[2] = vec4(mat2(c, +s, -s, c) * nose.xy, 0, 0);
+}
+
+void circle_head(in float size, out vec4 head[CIRCLE_SEGS]) {
+    float angle_d = PI * 2 / CIRCLE_SEGS;
+    for(int i = 0; i<CIRCLE_SEGS; i++) {
+        float angle = angle_d * i;
+        head[i] = vec4(cos(angle), sin(angle), 0, 0) * size;
+    }
+}
+
+bool check_counterclockwise(in vec4 A, in vec4 B, in vec4 C) {
+    return (C.y-A.y) * (B.x-A.x) > (B.y-A.y) * (C.x-A.x);
+}
+
+void angle_circle_head(
+    in vec4 circle_start, in float circle_angle,
+    in bool counterclockwise,
+    out vec4 head[CIRCLE_SEGS+1], out float angle_segs) {
+    
+    // 1 added to CIRCLE_SEGS because we're number of vertices
+    // for n segments is n+1
+    
+    float angle_d;
+    angle_d = PI * 2 / CIRCLE_SEGS; // 30d
+    // need to bottom clamp it to 1, otherwise it causes Blender crash at extruding the curve
+    angle_segs = max(1, ceil(circle_angle / angle_d));
+    angle_d = circle_angle / angle_segs;
+    
+    for(int i = 0; i < (angle_segs + 1); i++) {
+        float angle = angle_d * i;
+        if (counterclockwise) {
+            head[i] = vec4(
+                circle_start.x *  cos(-angle) + circle_start.y * sin(-angle),
+                circle_start.x * -sin(-angle) + circle_start.y * cos(-angle),
+                0, 0
+            );
+        } else {
+                head[i] = vec4(
+                circle_start.x *  cos(angle) + circle_start.y * sin(angle),
+                circle_start.x * -sin(angle) + circle_start.y * cos(angle),
+                0, 0
+            );
+        }
+    }
+}
+
+void cross_head(in vec4 dir, in float size, out vec4 head[3]) {
+    vec4 nose = dir * size;
+    float c = cos(PI/2), s = sin(PI/2);
+    head[0] = nose;
+    head[1] = vec4(mat2(c, -s, +s, c) * nose.xy, 0, 0);
+    head[2] = vec4(mat2(c, +s, -s, c) * nose.xy, 0, 0);
+}
+
+// do_vertex_util is custom EmitVertex method to support line smoothing
+// `e`   - edge xy direction in win/clip space (directions are invariant in both spaces)
+#define do_vertex(pos, e) (do_vertex_util(pos, vec2(-(e).y, (e).x) / winsize.xy))
+#define do_vertex_win(pos, e) ( do_vertex( WIN2CLIP( pos ), e ) )
+
+// if vertex is shared by two segments of the line still need to emit it twice 
+// to avoid smoothing artifacts
+// don't forget to initialize `vec2 EDGE_DIR` for macro to work
+// `pos0` / `pos1` - vertex position in clip space
+#define do_edge_verts(pos0, pos1) ( EDGE_DIR = normalize( ( (pos1) - (pos0) ).xy ), do_vertex( pos0, EDGE_DIR ), do_vertex( pos1, EDGE_DIR) )
+#define do_edge_verts_win(pos0, pos1) ( do_edge_verts( WIN2CLIP(pos0), WIN2CLIP(pos1) ) )
+void do_vertex_util(vec4 pos, vec2 ofs)
+{
+    float final_line_width = lineWidth + SMOOTH_WIDTH * float(lineSmooth);
+    ofs *= final_line_width;
+
+    smoothline = final_line_width * 0.5;
+    gl_Position = pos;
+    gl_Position.xy += ofs * pos.w;
+    EmitVertex();
+
+    smoothline = -final_line_width * 0.5;
+    gl_Position = pos;
+    gl_Position.xy -= ofs * pos.w;
+    EmitVertex();
+}
+
+// geometry utils
+void triangle_head(in vec4 side, in vec4 dir, in float length, in float width, in float radius, out vec4 head[5]) {
+    vec4 nose = side * length;
+    vec4 ear = dir * width;
+    head[0] = side * -radius;
+    head[1] = nose * -.5;
+    head[2] = vec4(0) + ear;
+    head[3] = nose * .5;
+    head[4] = side * radius;
+}
+
+void do_triangle_head(vec4 pos_w, vec4 head[5]) {
+    DEFAULT_SETUP();
+    do_edge_verts_win(pos_w + head[0], pos_w + head[1]);
+    do_edge_verts_win(pos_w + head[1], pos_w + head[2]);
+    do_edge_verts_win(pos_w + head[2], pos_w + head[3]);
+    do_edge_verts_win(pos_w + head[3], pos_w + head[4]);
+}
+
+void do_circle_head(vec4 pos_w, vec4 head[CIRCLE_SEGS]) {
+    DEFAULT_SETUP();
+    for(int i=0; i<CIRCLE_SEGS-1; i++) {
+        do_edge_verts_win(pos_w + head[i], pos_w + head[i+1]);
+        EmitVertex();
+    }
+    do_edge_verts_win( pos_w + head[CIRCLE_SEGS-1], pos_w + head[0] );
+}
+
+"""


 class BaseShader:
@@ -28,7 +195,7 @@ class BaseShader:

    The Geometry shader works in clipping coords (aftre projecting before division and window scaling).
    To make window-scale geometry, vectors should be calculated in window space and than back-projected to clipping spae.
-    Provide `winSize` uniform vector with halfsize of window, and use W2C and C2W macros.
+    Provide `half_winsize` uniform vector with halfsize of window, and use W2C and C2W macros.

    Replace glsl code in derived classes.
    Beware of unused attributes and uniforms: glsl compiler will optimize them out and blender fail with an exception.
@@ -43,9 +210,7 @@ class BaseShader:

    TYPE = None  # should be LINES|POINTS|etc

-    DEF_GLSL = """
-    #define PI 3.141592653589793
-    """
+    DEF_GLSL = BASE_DEF_GLSL

    VERT_GLSL = """
    uniform mat4 viewMatrix;
@@ -63,46 +228,45 @@ class BaseShader:
    """

    # prepended to geom_glsl
-    LIB_GLSL = """
-    uniform vec2 winSize;
-    // convert camera to window
-    #define C2W(v) vec4(v.x * winSize.x / v.w, v.y * winSize.y / v.w, v.z / v.w, 1)
-    // convert window to camera
-    #define W2C(v) vec4(v.x * v.w / winSize.x, v.y * v.w / winSize.y, v.z * v.w, 1)
-
-    void emitSegment(vec4 p0, vec4 p1) {
-        gl_Position = p0;
-        EmitVertex();
-        gl_Position = p1;
-        EmitVertex();
-        EndPrimitive();
-    }
-
-    void emitTriangle(vec4 p1, vec4 p2, vec4 p3) {
-        gl_Position = p1;
-        EmitVertex();
-        gl_Position = p2;
-        EmitVertex();
-        gl_Position = p3;
-        EmitVertex();
-        EndPrimitive();
-    }
-    """
+    LIB_GLSL = BASE_LIB_GLSL

    GEOM_GLSL = """
+    uniform float viewportDrawingScale;
+
+    layout(lines) in;
+    layout(triangle_strip, max_vertices = 4) out;
+
+    void main() {
+        // default setup for macro to work
+        vec4 clip2win = matCLIP2WIN();
+        vec4 win2clip = matWIN2CLIP();
+        vec2 EDGE_DIR;
+
+        vec4 p0 = gl_in[0].gl_Position, p1 = gl_in[1].gl_Position;
+        do_edge_verts(p0, p1);
+        EndPrimitive();
+    }
    """

    FRAG_GLSL = """
    uniform vec4 color;
+    uniform float lineWidth;
+    
+    in float smoothline;
    out vec4 fragColor;
-
    void main() {
+        vec2 co = gl_FragCoord.xy;
+
        fragColor = color;
+        if (lineSmooth) {
+            fragColor.a *= clamp((lineWidth + SMOOTH_WIDTH) * 0.5 - abs(smoothline), 0.0, 1.0);
+        }
    }
    """

    def __init__(self):
        # NB: libcode arg doesn't work
+        # TODO: rename to .shader
        self.prog = GPUShader(
            vertexcode=self.VERT_GLSL,
            fragcode=self.FRAG_GLSL,
@@ -120,27 +284,29 @@ class BaseShader:
        self.prog.bind()

    def glenable(self):
-        bgl.glEnable(bgl.GL_BLEND)
-        bgl.glBlendFunc(bgl.GL_SRC_ALPHA, bgl.GL_ONE_MINUS_SRC_ALPHA)
-        bgl.glBlendEquation(bgl.GL_FUNC_ADD)
-
-        # bgl.glEnable(bgl.GL_DEPTH_TEST)
-        # bgl.glDepthFunc(bgl.GL_LEQUAL)
-        # bgl.glDepthMask(True)
+        gpu.state.blend_set("ALPHA")
+        gpu.state.depth_test_set("LESS_EQUAL")

    def uniform_region(self, ctx):
        region = ctx.region
        region3d = ctx.region_data
-        try:
-            self.prog.uniform_float("viewMatrix", region3d.perspective_matrix)
-        except ValueError:  # unused uniform
-            pass
-        try:
-            self.prog.uniform_float("winSize", (region.width / 2, region.height / 2))
-        except ValueError:  # unused uniform
-            pass
+
+        uniform_floats = {
+            "viewMatrix": region3d.perspective_matrix,
+            "winsize": (region.width, region.height),
+            "lineWidth": 2.5,
+        }
+
+        for name, value in uniform_floats.items():
+            try:
+                self.prog.uniform_float(name, value)
+                # TODO: shouldn't just try'n'catch them
+                # because they may indicate errors in code
+            except ValueError:  # unused uniform
+                pass


+# TODO: add smoothing if this shades is going to be used
 class BaseLinesShader(BaseShader):
    """Draws line segments with gaps around vertices at endpoints"""

@@ -185,7 +351,6 @@ class BaseLinesShader(BaseShader):

    def glenable(self):
        super().glenable()
-        bgl.glEnable(bgl.GL_LINE_SMOOTH)


 class GizmoShader(BaseShader):
@@ -207,6 +372,7 @@ class GizmoShader(BaseShader):
    """


+# TODO: add smoothing if this shader is going to be used
 class DotsGizmoShader(GizmoShader):
    """Draws circles of radius 1 around points"""

@@ -274,24 +440,26 @@ class ExtrusionGuidesShader(GizmoShader):
    uniform mat4 ModelViewProjectionMatrix;

    layout(lines) in;
-    layout(line_strip, max_vertices=10) out;
+    layout(triangle_strip, max_vertices=MAX_POINTS) out;

    void main() {
-        vec4 p0 = gl_in[0].gl_Position, p1 = gl_in[1].gl_Position;
-        vec4 p0w = C2W(p0), p1w = C2W(p1);
+        // default setup for macro to work
+        vec2 EDGE_DIR;

-        emitSegment(p0, p1);
+        vec4 p0 = gl_in[0].gl_Position, p1 = gl_in[1].gl_Position;
+        do_edge_verts(p0, p1);
+        EndPrimitive();

        vec4 bx = ModelViewProjectionMatrix[0] * CROSS_SIZE;
        vec4 by = ModelViewProjectionMatrix[1] * CROSS_SIZE;

-        emitSegment(p0 - bx, p0 + bx);
-        emitSegment(p0 - by, p0 + by);
-        emitSegment(p1 - bx, p1 + bx);
-        emitSegment(p1 - by, p1 + by);
+        do_edge_verts(p0 - bx, p0 + bx);
+        EndPrimitive();
+        do_edge_verts(p0 - by, p0 + by);
+        EndPrimitive();
+        do_edge_verts(p1 - bx, p1 + bx);
+        EndPrimitive();
+        do_edge_verts(p1 - by, p1 + by);
+        EndPrimitive();
    }
    """
-
-    def glenable(self):
-        super().glenable()
-        bgl.glEnable(bgl.GL_LINE_SMOOTH)
@@ -17,12 +17,15 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import os
+import bpy
+import uuid
+import shutil
 import ntpath
 import pystache
 import urllib.parse
 import xml.etree.ElementTree as ET
 import blenderbim.tool as tool
-from shutil import copy
+import ifcopenshell.util.geolocation
 from xml.dom import minidom


@@ -31,22 +34,29 @@ class SheetBuilder:
        self.data_dir = None
        self.scale = "NTS"

-    def create(self, sheet_path, titleblock_name):
+    def create(self, layout_path, titleblock_name):
        root = ET.Element("svg")
        root.attrib["xmlns"] = "http://www.w3.org/2000/svg"
        root.attrib["xmlns:xlink"] = "http://www.w3.org/1999/xlink"
        root.attrib["id"] = "root"
        root.attrib["version"] = "1.1"

-        view_root = ET.parse(
-            os.path.join(self.data_dir, "templates", "titleblocks", titleblock_name + ".svg")
-        ).getroot()
+        sheet_dir = os.path.dirname(layout_path)
+        ootb_titleblock_path = os.path.join(self.data_dir, "templates", "titleblocks", titleblock_name + ".svg")
+        titleblock_path = tool.Ifc.resolve_uri(tool.Drawing.get_default_titleblock_path(titleblock_name))
+
+        os.makedirs(sheet_dir, exist_ok=True)
+        os.makedirs(os.path.dirname(titleblock_path), exist_ok=True)
+        if not os.path.exists(titleblock_path):
+            shutil.copy(ootb_titleblock_path, titleblock_path)
+
+        view_root = ET.parse(titleblock_path).getroot()
        view_width = self.convert_to_mm(view_root.attrib.get("width"))
        view_height = self.convert_to_mm(view_root.attrib.get("height"))
        view = ET.SubElement(root, "g")
        view.attrib["data-type"] = "titleblock"
        titleblock = ET.SubElement(view, "image")
-        titleblock.attrib["xlink:href"] = "../templates/titleblocks/" + titleblock_name + ".svg"
+        titleblock.attrib["xlink:href"] = os.path.relpath(titleblock_path, sheet_dir)
        titleblock.attrib["x"] = "0"
        titleblock.attrib["y"] = "0"
        titleblock.attrib["width"] = str(view_width)
@@ -56,26 +66,25 @@ class SheetBuilder:
        root.attrib["height"] = "{}mm".format(view_height)
        root.attrib["viewBox"] = "0 0 {} {}".format(view_width, view_height)

-        with open(sheet_path, "w") as f:
+        with open(layout_path, "w") as f:
            f.write(minidom.parseString(ET.tostring(root)).toprettyxml(indent="    "))

    def add_drawing(self, reference, drawing, sheet):
        filename = drawing.Name
-        sheet_name = os.path.splitext(os.path.basename(tool.Drawing.get_document_uri(sheet)))[0]
-        sheet_dir = os.path.join(self.data_dir, "sheets")
-        drawing_dir = os.path.join(self.data_dir, "diagrams")
-        sheet_path = os.path.join(sheet_dir, sheet_name + ".svg")
-        drawing_path = os.path.join(drawing_dir, filename + ".svg")
-        underlay_path = os.path.join(drawing_dir, filename + "-underlay.png")
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        layout_dir = os.path.dirname(layout_path)

-        if not os.path.isfile(sheet_path):
+        drawing_path = tool.Drawing.get_document_uri(tool.Drawing.get_drawing_reference(drawing))
+        underlay_path = os.path.splitext(drawing_path)[0] + "-underlay.png"
+
+        if not os.path.exists(layout_path) or not os.path.exists(drawing_path):
            raise FileNotFoundError

        ET.register_namespace("", "http://www.w3.org/2000/svg")
        ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")

-        sheet_tree = ET.parse(sheet_path)
-        sheet_root = sheet_tree.getroot()
+        layout_tree = ET.parse(layout_path)
+        layout_root = layout_tree.getroot()

        view_tree = ET.parse(drawing_path)
        view_root = view_tree.getroot()
@@ -83,7 +92,7 @@ class SheetBuilder:
        # The view is placed into a group with a background image element.
        # Although the foreground SVG already has a background, it is duplicated
        # here to accommodate browsers which do not nest images.
-        view = ET.SubElement(sheet_root, "g")
+        view = ET.SubElement(layout_root, "g")
        view.attrib["data-type"] = "drawing"
        view.attrib["data-id"] = str(reference.id())
        view.attrib["data-drawing"] = drawing.GlobalId
@@ -93,7 +102,7 @@ class SheetBuilder:
        if os.path.isfile(underlay_path):
            background = ET.SubElement(view, "image")
            background.attrib["data-type"] = "background"
-            background.attrib["xlink:href"] = os.path.relpath(underlay_path, sheet_dir)
+            background.attrib["xlink:href"] = os.path.relpath(underlay_path, layout_dir)
            background.attrib["x"] = "30"
            background.attrib["y"] = "30"
            background.attrib["width"] = str(view_width)
@@ -102,102 +111,126 @@ class SheetBuilder:
        if os.path.isfile(drawing_path):
            foreground = ET.SubElement(view, "image")
            foreground.attrib["data-type"] = "foreground"
-            foreground.attrib["xlink:href"] = os.path.relpath(drawing_path, sheet_dir)
+            foreground.attrib["xlink:href"] = os.path.relpath(drawing_path, layout_dir)
            foreground.attrib["x"] = "30"
            foreground.attrib["y"] = "30"
            foreground.attrib["width"] = str(view_width)
            foreground.attrib["height"] = str(view_height)

-        self.add_view_title(30, view_height + 35, view)
-        sheet_tree.write(sheet_path)
+        self.add_view_title(30, view_height + 35, view, layout_dir)
+        layout_tree.write(layout_path)

    def remove_drawing(self, reference, sheet):
        ET.register_namespace("", "http://www.w3.org/2000/svg")

-        sheet_path = tool.Drawing.get_document_uri(sheet)
-        sheet_tree = ET.parse(sheet_path)
-        sheet_root = sheet_tree.getroot()
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        layout_tree = ET.parse(layout_path)
+        layout_root = layout_tree.getroot()

-        for g in sheet_root.findall("{http://www.w3.org/2000/svg}g"):
+        for g in layout_root.findall("{http://www.w3.org/2000/svg}g"):
            if g.attrib.get("data-id") == str(reference.id()):
-                sheet_root.remove(g)
+                layout_root.remove(g)
                break

-        sheet_tree.write(sheet_path)
+        layout_tree.write(layout_path)

    def add_schedule(self, reference, schedule, sheet):
-        view_path = tool.Drawing.get_document_uri(schedule)
+        view_path = tool.Drawing.get_path_with_ext(tool.Drawing.get_document_uri(schedule), "svg")
        if not os.path.exists(view_path):
            tool.Drawing.create_svg_schedule(schedule)
        schedule_name = os.path.splitext(os.path.basename(view_path))[0]
-        sheet_path = tool.Drawing.get_document_uri(sheet)
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        layout_dir = os.path.dirname(layout_path)

        ET.register_namespace("", "http://www.w3.org/2000/svg")
        ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")

-        sheet_tree = ET.parse(sheet_path)
-        sheet_root = sheet_tree.getroot()
+        layout_tree = ET.parse(layout_path)
+        layout_root = layout_tree.getroot()

        view_tree = ET.parse(view_path)
        view_root = view_tree.getroot()
        view_width = self.convert_to_mm(view_root.attrib.get("width"))
        view_height = self.convert_to_mm(view_root.attrib.get("height"))

-        view = ET.SubElement(sheet_root, "g")
+        view = ET.SubElement(layout_root, "g")
        view.attrib["data-type"] = "schedule"
        view.attrib["data-id"] = str(reference.id())
        view.attrib["data-schedule"] = str(schedule.id())

        foreground = ET.SubElement(view, "image")
        foreground.attrib["data-type"] = "table"
-        foreground.attrib["xlink:href"] = "../schedules/{}.svg".format(schedule_name)
+        foreground.attrib["xlink:href"] = os.path.relpath(view_path, layout_dir)
        foreground.attrib["x"] = "30"
        foreground.attrib["y"] = "30"
        foreground.attrib["width"] = str(view_width)
        foreground.attrib["height"] = str(view_height)

-        self.add_view_title(30, view_height + 35, view)
-        sheet_tree.write(sheet_path)
+        self.add_view_title(30, view_height + 35, view, layout_dir)
+        layout_tree.write(layout_path)

-    def add_view_title(self, x, y, parent):
-        title_tree = ET.parse(os.path.join(self.data_dir, "templates", "view-title.svg"))
+    def add_view_title(self, x, y, parent, layout_dir):
+        title_path = os.path.join(layout_dir, "assets", "view-title.svg")
+        os.makedirs(os.path.dirname(title_path), exist_ok=True)
+        if not os.path.exists(title_path):
+            ootb_title = os.path.join(bpy.context.scene.BIMProperties.data_dir, "assets", "view-title.svg")
+            shutil.copy(ootb_title, title_path)
+
+        title_tree = ET.parse(title_path)
        title_root = title_tree.getroot()
        title = ET.SubElement(parent, "image")
        title.attrib["data-type"] = "view-title"
-        title.attrib["xlink:href"] = "../templates/view-title.svg"
+        title.attrib["xlink:href"] = os.path.relpath(title_path, layout_dir)
        title.attrib["x"] = str(x)
        title.attrib["y"] = str(y)
        title.attrib["width"] = str(self.convert_to_mm(title_root.attrib.get("width")))
        title.attrib["height"] = str(self.convert_to_mm(title_root.attrib.get("height")))

    def build(self, sheet):
-        sheet_name = os.path.splitext(os.path.basename(tool.Drawing.get_document_uri(sheet)))[0]
-        os.makedirs(os.path.join(self.data_dir, "build", sheet_name), exist_ok=True)
+        self.references = {"SHEET": None, "RASTER": []}

-        sheet_path = os.path.join(self.data_dir, "sheets", f"{sheet_name}.svg")
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        self.layout_dir = os.path.dirname(layout_path)
+
+        sheet_path = tool.Ifc.resolve_uri(tool.Drawing.get_default_sheet_path(sheet[0], sheet.Name))
+        self.sheets_dir = os.path.dirname(sheet_path)
+
+        os.makedirs(self.sheets_dir, exist_ok=True)

        ET.register_namespace("", "http://www.w3.org/2000/svg")
        ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")

-        tree = ET.parse(sheet_path)
+        tree = ET.parse(layout_path)
        root = tree.getroot()

+        self.defs = ET.Element("defs")
+        root.append(self.defs)
+
        self.build_titleblock(root, sheet)
        self.build_drawings(root, sheet)
-        self.build_schedules(root)
+        self.build_schedules(root, sheet)

-        with open(os.path.join(self.data_dir, "build", sheet_name, f"{sheet_name}.svg"), "wb") as output:
+        with open(sheet_path, "wb") as output:
            tree.write(output)

+        self.references["SHEET"] = sheet_path
+
+        return self.references
+
    def build_titleblock(self, root, sheet):
        titleblock = root.findall('{http://www.w3.org/2000/svg}g[@data-type="titleblock"]')[0]
        image = titleblock.findall("{http://www.w3.org/2000/svg}image")[0]
-        titleblock.append(self.parse_embedded_svg(image, sheet.get_info()))
+        g = self.parse_embedded_svg(image, sheet.get_info())
+        grid_north = ifcopenshell.util.geolocation.get_grid_north(tool.Ifc.get()) * -1
+        true_north = ifcopenshell.util.geolocation.get_true_north(tool.Ifc.get()) * -1
+        for north in g.iterfind('.//{http://www.w3.org/2000/svg}g[@data-type="grid-north"]'):
+            north.attrib["transform"] = f"rotate({grid_north})"
+        for north in g.iterfind('.//{http://www.w3.org/2000/svg}g[@data-type="true-north"]'):
+            north.attrib["transform"] = f"rotate({true_north})"
+        titleblock.append(g)
        titleblock.remove(image)

    def build_drawings(self, root, sheet):
-        sheet_name = os.path.splitext(os.path.basename(tool.Drawing.get_document_uri(sheet)))[0]
-
        for view in root.findall('{http://www.w3.org/2000/svg}g[@data-type="drawing"]'):
            reference = tool.Ifc.get().by_id(int(view.attrib["data-id"]))
            drawing = tool.Ifc.get().by_id(view.attrib["data-drawing"])
@@ -220,12 +253,15 @@ class SheetBuilder:
                view.append(self.parse_embedded_svg(foreground, {}))

            if background is not None:
-                background_path = os.path.join(self.data_dir, "sheets", self.get_href(background))
-                copy(background_path, os.path.join(self.data_dir, "build", sheet_name))
+                background_path = os.path.join(self.layout_dir, self.get_href(background))
+                raster_path = os.path.join(self.sheets_dir, os.path.basename(background_path))
+                shutil.copy(background_path, raster_path)
+                self.references["RASTER"].append(raster_path)

            if view_title is not None:
                foreground_path = self.get_href(foreground)
                data = reference.get_info()
+                data.update({"Sheet" + k: v for k, v in sheet.get_info().items()})
                if not data["Name"]:
                    data["Name"] = ntpath.basename(foreground_path)[0:-4]
                data["Scale"] = tool.Drawing.get_drawing_human_scale(drawing)
@@ -234,7 +270,7 @@ class SheetBuilder:
            for image in images:
                view.remove(image)

-    def build_schedules(self, root):
+    def build_schedules(self, root, sheet):
        for view in root.findall('{http://www.w3.org/2000/svg}g[@data-type="schedule"]'):
            reference = tool.Ifc.get().by_id(int(view.attrib["data-id"]))
            schedule = tool.Ifc.get().by_id(int(view.attrib["data-schedule"]))
@@ -256,6 +292,7 @@ class SheetBuilder:
            if view_title is not None:
                path = self.get_href(table)
                data = reference.get_info()
+                data.update({"Sheet" + k: v for k, v in sheet.get_info().items()})
                if not data["Name"]:
                    data["Name"] = schedule.Name or "Unnamed"
                view.append(self.parse_embedded_svg(view_title, data))
@@ -271,8 +308,22 @@ class SheetBuilder:
        group.attrib["transform"] = "translate({},{})".format(
            self.convert_to_mm(image.attrib.get("x")), self.convert_to_mm(image.attrib.get("y"))
        )
+
+        # Convert viewBox into a clip path
+        clip_id = str(uuid.uuid4())
+        group.attrib["clip-path"] = f"url(#{clip_id})"
+        clip_path = ET.Element("clipPath")
+        clip_path.attrib["id"] = clip_id
+        rect = ET.Element("rect")
+        rect.attrib["x"] = "0"
+        rect.attrib["y"] = "0"
+        rect.attrib["width"] = str(self.convert_to_mm(image.attrib.get("width")))
+        rect.attrib["height"] = str(self.convert_to_mm(image.attrib.get("height")))
+        clip_path.append(rect)
+        self.defs.append(clip_path)
+
        svg_path = self.get_href(image)
-        with open(os.path.join(self.data_dir, "sheets", svg_path), "r") as template:
+        with open(os.path.join(self.layout_dir, svg_path), "r") as template:
            embedded = ET.fromstring(pystache.render(template.read(), data))
            # viewBox should not be nested
            embedded.attrib["viewBox"] = ""
@@ -282,9 +333,45 @@ class SheetBuilder:
            for image in images:
                new_href = ntpath.basename(image.attrib.get("{http://www.w3.org/1999/xlink}href"))
                image.attrib["{http://www.w3.org/1999/xlink}href"] = new_href
-        group.append(embedded)
+        for child in embedded:
+            if "namedview" in child.tag:
+                continue
+            group.append(child)
        return group

+    def change_titleblock(self, sheet, titleblock_name):
+        ootb_titleblock_path = os.path.join(self.data_dir, "templates", "titleblocks", titleblock_name + ".svg")
+        titleblock_path = tool.Drawing.get_default_titleblock_path(titleblock_name)
+        sheet_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        sheet_dir = os.path.dirname(sheet_path)
+
+        os.makedirs(sheet_dir, exist_ok=True)
+        os.makedirs(os.path.dirname(titleblock_path), exist_ok=True)
+        if not os.path.exists(titleblock_path):
+            shutil.copy(ootb_titleblock_path, titleblock_path)
+
+        ET.register_namespace("", "http://www.w3.org/2000/svg")
+        ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")
+
+        view_root = ET.parse(ootb_titleblock_path).getroot()
+        view_width = self.convert_to_mm(view_root.attrib.get("width"))
+        view_height = self.convert_to_mm(view_root.attrib.get("height"))
+
+        sheet_tree = ET.parse(sheet_path)
+        root = sheet_tree.getroot()
+
+        titleblock = sheet_tree.findall('{http://www.w3.org/2000/svg}g[@data-type="titleblock"]')[0]
+        image = titleblock.findall("{http://www.w3.org/2000/svg}image[@{http://www.w3.org/1999/xlink}href]")[0]
+        image.attrib["{http://www.w3.org/1999/xlink}href"] = os.path.relpath(titleblock_path, sheet_dir)
+        image.attrib["width"] = str(view_width)
+        image.attrib["height"] = str(view_height)
+
+        root.attrib["width"] = "{}mm".format(view_width)
+        root.attrib["height"] = "{}mm".format(view_height)
+        root.attrib["viewBox"] = "0 0 {} {}".format(view_width, view_height)
+
+        sheet_tree.write(sheet_path)
+
    def convert_to_mm(self, value):
        # CSS is what defines these possibilities
        # https://www.w3.org/TR/SVG/refs.html#ref-css-values-3
@@ -21,6 +21,7 @@ import re
 import bpy
 import math
 import bmesh
+import shutil
 import pystache
 import mathutils
 import xml.etree.ElementTree as ET
@@ -31,10 +32,12 @@ import ifcopenshell.util.representation
 import blenderbim.tool as tool
 import blenderbim.bim.module.drawing.helper as helper
 import blenderbim.bim.module.drawing.annotation as annotation
-from math import pi
-from mathutils import Vector
-from mathutils import geometry
+
+from blenderbim.bim.module.drawing.data import DecoratorData
 from blenderbim.bim.ifc import IfcStore
+
+from math import pi, ceil, atan, degrees
+from mathutils import geometry, Vector
 from bpy_extras import view3d_utils


@@ -63,6 +66,7 @@ class SvgWriter:
        self.scale = 1 / 100  # 1:100
        self.camera_width = None
        self.camera_height = None
+        self.resource_paths = {}

    def create_blank_svg(self, output_path):
        self.calculate_scale()
@@ -81,53 +85,79 @@ class SvgWriter:
        self.svg.save(pretty=True)

    def draw_underlay(self, image):
-        self.svg.add(
-            self.svg.image(
-                os.path.join("..", "diagrams", os.path.basename(image)),
-                width=self.width,
-                height=self.height,
-            )
-        )
+        self.svg.add(self.svg.image(os.path.basename(image), width=self.width, height=self.height))
        return self

-    def define_boilerplate(self, stylesheet=None, markers=None, symbols=None, patterns=None):
-        self.add_stylesheet(stylesheet)
-        self.add_markers(markers)
-        self.add_symbols(symbols)
-        self.add_patterns(patterns)
+    def setup_drawing_resource_paths(self, element):
+        pset = ifcopenshell.util.element.get_pset(element, "EPset_Drawing")
+        for resource in ("Stylesheet", "Markers", "Symbols", "Patterns"):
+            resource_path = pset.get(resource)
+            if not resource_path:
+                self.resource_paths[resource] = None
+                continue
+            resource_path = tool.Ifc.resolve_uri(resource_path)
+            os.makedirs(os.path.dirname(resource_path), exist_ok=True)
+            if not os.path.exists(resource_path):
+                resource_basename = os.path.basename(resource_path)
+                ootb_resource = os.path.join(bpy.context.scene.BIMProperties.data_dir, "assets", resource_basename)
+                if os.path.exists(ootb_resource):
+                    shutil.copy(ootb_resource, resource_path)
+            self.resource_paths[resource] = resource_path
+
+    def define_boilerplate(self):
+        self.add_stylesheet()
+        self.add_markers()
+        self.add_symbols()
+        self.add_patterns()
        return self

    def calculate_scale(self):
+        # svg_scale is for conversion from m to paper units
+        # paper units = mm x drawing scale
        self.svg_scale = self.scale * 1000  # IFC is in meters, SVG is in mm
        self.raw_width = self.camera_width
        self.raw_height = self.camera_height
        self.width = self.raw_width * self.svg_scale
        self.height = self.raw_height * self.svg_scale

-    def add_stylesheet(self, uri):
-        default_stylesheet = os.path.join(self.data_dir, "styles", f"default.css")
-        with open(tool.Ifc.resolve_uri(uri) or default_stylesheet, "r") as stylesheet:
+    def add_stylesheet(self):
+        if not self.resource_paths["Stylesheet"] or not os.path.exists(self.resource_paths["Stylesheet"]):
+            return
+        with open(self.resource_paths["Stylesheet"], "r") as stylesheet:
            self.svg.defs.add(self.svg.style(stylesheet.read()))

-    def add_markers(self, uri):
-        tree = ET.parse(tool.Ifc.resolve_uri(uri) or os.path.join(self.data_dir, "templates", "markers.svg"))
+    def add_markers(self):
+        if not self.resource_paths["Markers"] or not os.path.exists(self.resource_paths["Markers"]):
+            return
+        tree = ET.parse(self.resource_paths["Markers"])
        root = tree.getroot()
        for child in root:
            self.svg.defs.add(External(child))

-    def add_symbols(self, uri):
-        tree = ET.parse(tool.Ifc.resolve_uri(uri) or os.path.join(self.data_dir, "templates", "symbols.svg"))
+    def add_symbols(self):
+        if not self.resource_paths["Symbols"] or not os.path.exists(self.resource_paths["Symbols"]):
+            return
+        tree = ET.parse(self.resource_paths["Symbols"])
        root = tree.getroot()
        for child in root:
            self.svg.defs.add(External(child))

-    def add_patterns(self, uri):
-        tree = ET.parse(tool.Ifc.resolve_uri(uri) or os.path.join(self.data_dir, "templates", "patterns.svg"))
+    def find_xml_symbol_by_id(self, id):
+        tree = ET.parse(self.resource_paths["Symbols"])
+        xml_symbol = tree.find(f'.//*[@id="{id}"]')
+        return External(xml_symbol) if xml_symbol else None
+
+    def add_patterns(self):
+        if not self.resource_paths["Patterns"] or not os.path.exists(self.resource_paths["Patterns"]):
+            return
+        tree = ET.parse(self.resource_paths["Patterns"])
        root = tree.getroot()
        for child in root:
            self.svg.defs.add(External(child))

-    def draw_annotations(self, annotations):
+    def draw_annotations(self, annotations, precision, decimal_places):
+        self.precision = precision
+        self.decimal_places = decimal_places
        for element in annotations:
            obj = tool.Ifc.get_object(element)
            if not obj or element.ObjectType == "DRAWING":
@@ -160,6 +190,8 @@ class SvgWriter:
                self.draw_section_level_annotation(obj)
            elif element.ObjectType == "TEXT":
                self.draw_text_annotation(obj, obj.location)
+            elif element.ObjectType in ("FALL", "SLOPE_ANGLE", "SLOPE_FRACTION", "SLOPE_PERCENT"):
+                self.draw_fall_annotations(obj)
            else:
                self.draw_misc_annotation(obj)

@@ -195,19 +227,15 @@ class SvgWriter:
            # TODO: allow metric to be configurable
            rl = (matrix_world @ points[0].co.xyz).z
            if bpy.context.scene.unit_settings.system == "IMPERIAL":
-                rl = helper.format_distance(rl)
+                rl = helper.format_distance(rl, precision=self.precision, decimal_places=self.decimal_places)
            else:
                unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
                rl /= unit_scale
                rl = ifcopenshell.util.geolocation.auto_z2e(tool.Ifc.get(), rl)
                rl *= unit_scale
                rl = "{:.3f}m".format(rl)
-            text_style = {
-                "text-anchor": "start",
-                "alignment-baseline": "baseline",
-                "dominant-baseline": "baseline",
-            }
-            self.svg.add(self.svg.text(f"RL +{rl}", insert=tuple(text_position), **text_style))
+            text_style = self.get_box_alignment_parameters("bottom-left")
+            self.svg.add(self.svg.text(f"RL +{rl}", insert=tuple(text_position), class_="SECTIONLEVEL", **text_style))
            if tag:
                self.svg.add(self.svg.text(tag, insert=(text_position[0], text_position[1] - 5), **text_style))

@@ -234,11 +262,8 @@ class SvgWriter:
                self.svg.text(
                    "UP",
                    insert=tuple(text_position),
-                    **{
-                        "text-anchor": "middle",
-                        "alignment-baseline": "middle",
-                        "dominant-baseline": "middle",
-                    },
+                    class_="STAIR",
+                    **self.get_box_alignment_parameters("center"),
                )
            )

@@ -262,26 +287,21 @@ class SvgWriter:
            )
            line["stroke-dasharray"] = "12.5, 3, 3, 3"
            axis_tag = tool.Ifc.get_entity(obj).Name
+            text_style = self.get_box_alignment_parameters("center")
            self.svg.add(
                self.svg.text(
                    axis_tag,
                    insert=tuple(start * self.svg_scale),
-                    **{
-                        "text-anchor": "middle",
-                        "alignment-baseline": "middle",
-                        "dominant-baseline": "middle",
-                    },
+                    class_="GRID",
+                    **text_style,
                )
            )
            self.svg.add(
                self.svg.text(
                    axis_tag,
                    insert=tuple(end * self.svg_scale),
-                    **{
-                        "text-anchor": "middle",
-                        "alignment-baseline": "middle",
-                        "dominant-baseline": "middle",
-                    },
+                    class_="GRID",
+                    **text_style,
                )
            )

@@ -320,7 +340,7 @@ class SvgWriter:
    def get_attribute_classes(self, obj):
        element = tool.Ifc.get_entity(obj)
        global_id = "GlobalId-{}".format(element.GlobalId)
-        predefined_type = "PredefinedType-" + self.canonicalise_class_name(
+        predefined_type = "PredefinedType-" + tool.Drawing.canonicalise_class_name(
            str(ifcopenshell.util.element.get_predefined_type(element))
        )
        classes = [global_id, element.is_a(), predefined_type]
@@ -328,14 +348,13 @@ class SvgWriter:
        if custom_classes:
            classes.extend(custom_classes.split())
        for key in self.metadata:
-            value = ifcopenshell.util.selector.Selector.get_element_value(element, key)
+            value = ifcopenshell.util.selector.get_element_value(element, key)
            if value:
-                classes.append(self.canonicalise_class_name(key) + "-" + self.canonicalise_class_name(str(value)))
+                classes.append(
+                    tool.Drawing.canonicalise_class_name(key) + "-" + tool.Drawing.canonicalise_class_name(str(value))
+                )
        return classes

-    def canonicalise_class_name(self, name):
-        return re.sub("[^0-9a-zA-Z]+", "", name)
-
    def draw_line_annotation(self, obj):
        # TODO: properly scope these offsets
        x_offset = self.raw_width / 2
@@ -360,23 +379,135 @@ class SvgWriter:
            self.draw_edge_annotation(obj, classes)

    def draw_edge_annotation(self, obj, classes):
+        predefined_type = classes[2].split("-", 1)[1]
+
        x_offset = self.raw_width / 2
        y_offset = self.raw_height / 2
        matrix_world = obj.matrix_world
-        for edge in obj.data.edges:
-            v0_global = matrix_world @ obj.data.vertices[edge.vertices[0]].co.xyz
-            v1_global = matrix_world @ obj.data.vertices[edge.vertices[1]].co.xyz
+
+        def draw_simple_edge_annotation(v0, v1):
+            v0_global = matrix_world @ obj.data.vertices[v0].co.xyz
+            v1_global = matrix_world @ obj.data.vertices[v1].co.xyz
            v0 = self.project_point_onto_camera(v0_global)
            v1 = self.project_point_onto_camera(v1_global)
            start = Vector(((x_offset + v0.x), (y_offset - v0.y)))
            end = Vector(((x_offset + v1.x), (y_offset - v1.y)))
-            vector = end - start
            line = self.svg.add(
-                self.svg.line(
-                    start=tuple(start * self.svg_scale), end=tuple(end * self.svg_scale), class_=" ".join(classes)
-                )
+                self.svg.line(start=start * self.svg_scale, end=end * self.svg_scale, class_=" ".join(classes))
            )

+        # BATTING ANNOTATIONS
+        if predefined_type == "BATTING":
+            v0_global = matrix_world @ obj.data.vertices[0].co.xyz
+            v1_global = matrix_world @ obj.data.vertices[1].co.xyz
+            v0 = self.project_point_onto_camera(v0_global)
+            v1 = self.project_point_onto_camera(v1_global)
+            start_svg = Vector(((x_offset + v0.x), (y_offset - v0.y))) * self.svg_scale
+            end_svg = Vector(((x_offset + v1.x), (y_offset - v1.y))) * self.svg_scale
+
+            element = tool.Ifc.get_entity(obj)
+            pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Batting") or {}
+
+            unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+            # default thickness set to 15 mm in paper space to keep the insulation visible
+            thickness = pset_data["Thickness"] * unit_scale * self.svg_scale if "Thickness" in pset_data else 15.0
+            reverse_x = pset_data.get("Reverse pattern direction", False)
+
+            if reverse_x:
+                start_svg, end_svg = end_svg, start_svg
+
+            pattern_dir = (end_svg - start_svg).normalized()
+            pattern_length = (end_svg - start_svg).length
+            segment_width = thickness / 2.5
+
+            segments = ceil(pattern_length / segment_width)
+            end_marker_width = pattern_length - segment_width * (segments - 1)
+
+            points = [start_svg + pattern_dir * segment_width * i for i in range(segments)]
+            marker_id = f"batting-{element.GlobalId}"
+            marker_end_id = f"batting-end-{element.GlobalId}"
+            path_data = f"""M 0 {0.2*thickness}
+                A {0.5*segment_width} {0.2*thickness} 0 0 1 {segment_width} {0.2*thickness}
+                L {0.5*segment_width} {0.8*thickness}
+                M 0 {0.2*thickness}
+                L {0.5*segment_width} {0.8*thickness}
+                A {0.5*segment_width} {0.2*thickness} 0 0 0 {segment_width} {1.0*thickness}
+                M {0.5*segment_width} {0.8*thickness}
+                A {0.5*segment_width} {0.2*thickness} 0 0 1 0 {1.0*thickness}
+                """
+            path_data = " ".join(path_data.split())
+
+            svg_path = self.svg.path(style="fill: none; stroke:black; stroke-width:0.18", d=path_data)
+            if reverse_x:
+                svg_path.update({"transform": f"scale(-1,-1) translate(-{segment_width}, -{thickness})"})
+
+            marker = self.svg.marker(
+                markerUnits="userSpaceOnUse",
+                insert=(0, thickness / 2),
+                size=(segment_width, thickness),
+                orient="auto",
+                id=marker_id,
+            )
+            marker.add(svg_path)
+            self.svg.add(marker)
+
+            # separate marker for the end of the pattern to truncate it more gracefully
+            marker_end = marker.copy()
+            marker_end.update({"markerWidth": end_marker_width, "id": marker_end_id})
+            self.svg.add(marker_end)
+
+            polyline_style = (
+                f"marker-start: url(#{marker_id}); "
+                f"marker-mid: url(#{marker_id}); stroke: none; "
+                f"marker-end: url(#{marker_end_id}); stroke: none; "
+            )
+            self.svg.add(self.svg.polyline(points=points, class_=" ".join(classes), style=polyline_style))
+
+        elif predefined_type == "SECTION":
+            display_data = DecoratorData.get_section_markers_display_data(obj)
+            connect_markers = display_data["connect_markers"]
+
+            if connect_markers:
+                for edge in obj.data.edges:
+                    draw_simple_edge_annotation(*edge.vertices[:])
+            else:
+                for edge in obj.data.edges:
+                    v0_marker_position = "start" if edge.vertices[0] == 0 else "end"
+                    v1_marker_position = "start" if edge.vertices[1] == 0 else "end"
+
+                    v0_global = matrix_world @ obj.data.vertices[edge.vertices[0]].co.xyz
+                    v1_global = matrix_world @ obj.data.vertices[edge.vertices[1]].co.xyz
+                    v0 = self.project_point_onto_camera(v0_global)
+                    v1 = self.project_point_onto_camera(v1_global)
+                    start = Vector(((x_offset + v0.x), (y_offset - v0.y)))
+                    end = Vector(((x_offset + v1.x), (y_offset - v1.y)))
+
+                    edge_dir = (end - start).normalized()
+                    circle_radius = 5
+                    segment_size = circle_radius * 3
+
+                    if display_data[v0_marker_position]["add_symbol"]:
+                        self.svg.add(
+                            self.svg.line(
+                                start=start * self.svg_scale,
+                                end=start * self.svg_scale + edge_dir * segment_size,
+                                class_=" ".join(classes),
+                            )
+                        )
+
+                    if display_data[v1_marker_position]["add_symbol"]:
+                        self.svg.add(
+                            self.svg.line(
+                                start=end * self.svg_scale,
+                                end=end * self.svg_scale - edge_dir * segment_size,
+                                class_=" ".join(classes),
+                            )
+                        )
+
+        else:
+            for edge in obj.data.edges:
+                draw_simple_edge_annotation(*edge.vertices[:])
+
    def draw_leader_annotation(self, obj):
        self.draw_line_annotation(obj)
        spline = obj.data.splines[0]
@@ -393,65 +524,81 @@ class SvgWriter:

        self.draw_line_annotation(obj)

-        v1 = self.project_point_onto_camera(obj.matrix_world @ Vector((0, 0, 0)))
-        v2 = self.project_point_onto_camera(obj.matrix_world @ Vector((0, 0, -1)))
-        angle = -math.degrees((v2 - v1).xy.angle_signed(Vector((0, 1))))
+        display_data = DecoratorData.get_section_markers_display_data(obj)

-        for vert in obj.data.vertices:
-            point = obj.matrix_world @ vert.co
-            symbol_position = self.project_point_onto_camera(point)
-            symbol_position = Vector(((x_offset + symbol_position.x), (y_offset - symbol_position.y)))
-            transform = "rotate({}, {}, {})".format(
-                angle,
-                (symbol_position * self.svg_scale)[0],
-                (symbol_position * self.svg_scale)[1],
-            )
+        for edge in obj.data.edges:
+            edge_verts = [obj.data.vertices[v_i] for v_i in edge.vertices]

-            self.svg.add(
-                self.svg.use("#section-arrow", insert=tuple(symbol_position * self.svg_scale), transform=transform)
-            )
-            self.svg.add(self.svg.use("#section-tag", insert=tuple(symbol_position * self.svg_scale)))
+            # convert edge vertiices coordinates to svg space
+            # to calculate the edge angle and for later use
+            edge_verts_svg = []
+            for vert in edge_verts:
+                point = obj.matrix_world @ vert.co
+                symbol_position = self.project_point_onto_camera(point)
+                symbol_position = Vector(((x_offset + symbol_position.x), (y_offset - symbol_position.y)))
+                symbol_position_svg = symbol_position * self.svg_scale
+                edge_verts_svg.append(symbol_position_svg)

-            reference_id, sheet_id = self.get_reference_and_sheet_id_from_annotation(tool.Ifc.get_entity(obj))
-            text_position = list(symbol_position * self.svg_scale)
-            text_style = {
-                "text-anchor": "middle",
-                "alignment-baseline": "middle",
-                "dominant-baseline": "middle",
-            }
-            self.svg.add(self.svg.text(reference_id, insert=(text_position[0], text_position[1] - 2.5), **text_style))
-            self.svg.add(self.svg.text(sheet_id, insert=(text_position[0], text_position[1] + 2.5), **text_style))
+            edge_dir = (edge_verts_svg[1] - edge_verts_svg[0]).normalized()
+            angle = degrees(edge_dir.xy.angle_signed(Vector([1, 0])))
+
+            for v_i, symbol_position_svg in zip(edge.vertices, edge_verts_svg):
+                current_marker_position = "start" if v_i == 0 else "end"
+
+                # marker arrow symbol
+                if display_data[current_marker_position]["add_symbol"]:
+                    transform = "rotate({}, {}, {})".format(angle, *symbol_position_svg.xy)
+                    symbol_id = display_data[current_marker_position]["symbol"]
+                    self.svg.add(self.svg.use(f"#{symbol_id}", insert=symbol_position_svg, transform=transform))
+
+                # marker circle and it's text
+                if display_data[current_marker_position]["add_circle"]:
+                    self.svg.add(self.svg.use("#section-tag", insert=symbol_position_svg))
+
+                    reference_id, sheet_id = self.get_reference_and_sheet_id_from_annotation(tool.Ifc.get_entity(obj))
+                    text_position = symbol_position_svg
+                    text_style = self.get_box_alignment_parameters("center")
+                    self.svg.add(
+                        self.svg.text(
+                            reference_id,
+                            insert=(text_position[0], text_position[1] - 2.5),
+                            class_="SECTION",
+                            **text_style,
+                        )
+                    )
+                    self.svg.add(
+                        self.svg.text(
+                            sheet_id, insert=(text_position[0], text_position[1] + 2.5), class_="SECTION", **text_style
+                        )
+                    )

    def draw_elevation_annotation(self, obj):
        x_offset = self.raw_width / 2
        y_offset = self.raw_height / 2
        symbol_position = self.project_point_onto_camera(obj.location)
        symbol_position = Vector(((x_offset + symbol_position.x), (y_offset - symbol_position.y)))
+        symbol_position_svg = symbol_position * self.svg_scale

        v1 = self.project_point_onto_camera(obj.matrix_world @ Vector((0, 0, 0)))
        v2 = self.project_point_onto_camera(obj.matrix_world @ Vector((0, 0, -1)))
        angle = -math.degrees((v2 - v1).xy.angle_signed(Vector((0, 1))))

-        transform = "rotate({}, {}, {})".format(
-            angle,
-            (symbol_position * self.svg_scale)[0],
-            (symbol_position * self.svg_scale)[1],
-        )
+        transform = "rotate({}, {}, {})".format(angle, *symbol_position_svg.xy)

-        self.svg.add(
-            self.svg.use("#elevation-arrow", insert=tuple(symbol_position * self.svg_scale), transform=transform)
-        )
-        self.svg.add(self.svg.use("#elevation-tag", insert=tuple(symbol_position * self.svg_scale)))
+        self.svg.add(self.svg.use("#elevation-arrow", insert=symbol_position_svg, transform=transform))
+        self.svg.add(self.svg.use("#elevation-tag", insert=symbol_position_svg))

        reference_id, sheet_id = self.get_reference_and_sheet_id_from_annotation(tool.Ifc.get_entity(obj))
-        text_position = list(symbol_position * self.svg_scale)
-        text_style = {
-            "text-anchor": "middle",
-            "alignment-baseline": "middle",
-            "dominant-baseline": "middle",
-        }
-        self.svg.add(self.svg.text(reference_id, insert=(text_position[0], text_position[1] - 2.5), **text_style))
-        self.svg.add(self.svg.text(sheet_id, insert=(text_position[0], text_position[1] + 2.5), **text_style))
+        text_position = symbol_position_svg
+        text_style = self.get_box_alignment_parameters("center")
+        self.svg.add(
+            self.svg.text(
+                reference_id, insert=(text_position[0], text_position[1] - 2.5), class_="ELEVATION", **text_style
+            )
+        )
+        self.svg.add(
+            self.svg.text(sheet_id, insert=(text_position[0], text_position[1] + 2.5), class_="ELEVATION", **text_style)
+        )

    def get_reference_and_sheet_id_from_annotation(self, element):
        reference_id = "-"
@@ -470,85 +617,121 @@ class SvgWriter:
                return (reference_id, sheet_id)
        return ("-", "-")

+    def get_box_alignment_parameters(self, box_alignment):
+        """Convenience method to get svg parameters for text alignment
+        in a readable way.
+
+        Metehod expecting values like:
+
+        `top-left`, `top-middle`, `top-right`,
+
+        `middle-left`, `center`, `middle-right`,
+
+        `bottom-left`, `bottom-middle`, `bottom-right`
+        """
+        # reference for alignment values:
+        # https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/text-anchor
+        # https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/alignment-baseline
+        vertical_alignment = {
+            "top": "hanging",
+            "bottom": "baseline",
+            "center": "middle",
+            "middle": "middle",
+        }
+        alignment_baseline = vertical_alignment[next(align for align in vertical_alignment if align in box_alignment)]
+        horizontal_alignment = {
+            "left": "start",
+            "right": "end",
+            "center": "middle",
+            "middle": "middle",
+        }
+        text_anchor = horizontal_alignment[next(align for align in horizontal_alignment if align in box_alignment)]
+
+        # using dominant-baseline because we plan to use <tspan> subtags
+        # otherwise alignment-baseline would be sufficient
+        return {
+            "dominant-baseline": alignment_baseline,
+            "text-anchor": text_anchor,
+        }
+
    def draw_text_annotation(self, text_obj, position):
        x_offset = self.raw_width / 2
        y_offset = self.raw_height / 2
        element = tool.Ifc.get_entity(text_obj)
-        rep = ifcopenshell.util.representation.get_representation(element, "Plan", "Annotation")
-        text_literal = [i for i in rep.Items if i.is_a("IfcTextLiteral")][0]
+        text_literals = tool.Drawing.get_text_literal(text_obj, return_list=True)
+        product = tool.Drawing.get_assigned_product(element)

        text_position = self.project_point_onto_camera(position)
        text_position = Vector(((x_offset + text_position.x), (y_offset - text_position.y)))
+        text_position_svg = text_position * self.svg_scale

-        local_x_axis = text_obj.matrix_world.to_quaternion() @ Vector((1, 0, 0))
-        projected_x_axis = self.project_point_onto_camera(position + local_x_axis)
-        angle = math.degrees(
-            (Vector((x_offset + projected_x_axis.x, y_offset - projected_x_axis.y)) - text_position).angle_signed(
-                Vector((1, 0))
-            )
-        )
+        def get_basis_vector(matrix, i=0):
+            """returns basis vector for i in world space, unaffected by object scale"""
+            return matrix.inverted()[i].to_3d().normalized()

-        transform = "rotate({}, {}, {})".format(
-            angle,
-            (text_position * self.svg_scale)[0],
-            (text_position * self.svg_scale)[1],
-        )
+        text_dir_world_x_axis = get_basis_vector(text_obj.matrix_world)
+        text_dir = (self.camera.matrix_world.inverted().to_quaternion() @ text_dir_world_x_axis).to_2d().normalized()
+        angle = math.degrees(-text_dir.angle_signed(Vector((1, 0))))
+
+        transform = "rotate({}, {}, {})".format(angle, *text_position_svg)
+        classes = self.get_attribute_classes(text_obj)
+        classes_str = " ".join(classes)

        symbol = tool.Drawing.get_annotation_symbol(element)
+        template_text_fields = []
        if symbol:
-            self.svg.add(self.svg.use(f"#{symbol}", insert=tuple(text_position * self.svg_scale)))
+            symbol_svg = self.find_xml_symbol_by_id(symbol)
+            if symbol_svg:
+                symbol_xml = symbol_svg.get_xml()
+                template_text_fields = symbol_xml.findall('.//text[@data-type="text-template"]')
+                # if there is a symbol with template text fields
+                # then we just populate it's fields with the data from text literals
+                if template_text_fields:
+                    symbol_xml.attrib["transform"] = f"translate({', '.join(map(str, text_position_svg))})"
+                    symbol_xml.attrib.pop("id")
+                    # note: zip makes sure that we iterate over the shortest list
+                    for field, text_literal in zip(template_text_fields, text_literals):
+                        field.text = tool.Drawing.replace_text_literal_variables(text_literal.Literal, product)
+                        field.attrib["class"] = classes_str
+                    self.svg.add(symbol_svg)
+                    return None

-        if text_literal.BoxAlignment == "top-left":
-            alignment_baseline = "hanging"
-            text_anchor = "start"
-        elif text_literal.BoxAlignment == "top-middle":
-            alignment_baseline = "hanging"
-            text_anchor = "middle"
-        elif text_literal.BoxAlignment == "top-right":
-            alignment_baseline = "hanging"
-            text_anchor = "end"
-        elif text_literal.BoxAlignment == "middle-left":
-            alignment_baseline = "middle"
-            text_anchor = "start"
-        elif text_literal.BoxAlignment == "center":
-            alignment_baseline = "middle"
-            text_anchor = "middle"
-        elif text_literal.BoxAlignment == "middle-right":
-            alignment_baseline = "middle"
-            text_anchor = "end"
-        elif text_literal.BoxAlignment == "bottom-left":
-            alignment_baseline = "baseline"
-            text_anchor = "start"
-        elif text_literal.BoxAlignment == "bottom-middle":
-            alignment_baseline = "baseline"
-            text_anchor = "middle"
-        elif text_literal.BoxAlignment == "bottom-right":
-            alignment_baseline = "baseline"
-            text_anchor = "end"
+            if not symbol_svg or not template_text_fields:
+                self.svg.add(self.svg.use(f"#{symbol}", insert=text_position_svg))

-        literal = text_literal.Literal
+        for text_literal in text_literals:
+            # after pretty indentation some redundant spaces can occur in svg tags
+            # this is why we apply "font-size: 0;" to the text tag to remove those spaces
+            # and add clases to the tspan tags
+            # ref: https://github.com/IfcOpenShell/IfcOpenShell/issues/2833#issuecomment-1471584960

-        product = tool.Drawing.get_assigned_product(element)
-        selector = ifcopenshell.util.selector.Selector
-        variables = {}
-        if product != None:
-            for variable in re.findall("{{.*?}}", literal):
-                literal = literal.replace(variable, str(selector.get_element_value(product, variable[2:-2]) or ""))
+            text = tool.Drawing.replace_text_literal_variables(text_literal.Literal, product)
+            attribs = {
+                "transform": transform,
+                "style": "font-size: 0;",
+            }

-        for line_number, text_line in enumerate(literal.replace("\\n", "\n").split("\n")):
-            self.svg.add(
-                self.svg.text(
-                    text_line,
-                    insert=tuple((text_position * self.svg_scale) + Vector((0, 3.5 * line_number))),
-                    class_=" ".join(self.get_attribute_classes(text_obj)),
-                    **{
-                        "text-anchor": text_anchor,
-                        "alignment-baseline": alignment_baseline,
-                        "dominant-baseline": alignment_baseline,
-                        "transform": transform,
-                    },
+            def add_text_tag(add_fill_bg):
+                text_tag = self.svg.text(
+                    "",
+                    **(attribs | {"filter": "url(#fill-background)"}) if add_fill_bg else attribs,
+                    **self.get_box_alignment_parameters(text_literal.BoxAlignment),
                )
-            )
+                self.svg.add(text_tag)
+
+                text_lines = text.replace("\\n", "\n").split("\n")
+
+                for line_number, text_line in enumerate(text_lines):
+                    # position has to be inserted at tspan to avoid x offset between tspans
+                    tspan = self.svg.tspan(text_line, class_=classes_str, insert=text_position_svg)
+                    # doing it here and not in tspan constructor because constructor adds unnecessary spaces
+                    tspan.update({"dy": f"{line_number}em"})
+                    text_tag.add(tspan)
+
+            if "fill-bg" in classes:
+                add_text_tag(True)
+            add_text_tag(False)
+

    def draw_break_annotations(self, obj):
        x_offset = self.raw_width / 2
@@ -596,28 +779,24 @@ class SvgWriter:
                )
            )
            # TODO: allow metric to be configurable
-            rl = ((matrix_world @ points[0].co).xyz + obj.location).z
+            rl = (matrix_world @ points[0].co).z
            if bpy.context.scene.unit_settings.system == "IMPERIAL":
-                rl = helper.format_distance(rl)
+                rl = helper.format_distance(rl, precision=self.precision, decimal_places=self.decimal_places)
            else:
                unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
                rl /= unit_scale
                rl = ifcopenshell.util.geolocation.auto_z2e(tool.Ifc.get(), rl)
                rl *= unit_scale
                rl = "{:.3f}m".format(rl)
-            if projected_points[0].x > projected_points[-1].x:
-                text_anchor = "end"
-            else:
-                text_anchor = "start"
+
+            box_alignment = "bottom-left" if projected_points[0].x <= projected_points[-1].x else "bottom-right"
+            text_style = self.get_box_alignment_parameters(box_alignment)
            self.svg.add(
                self.svg.text(
                    "RL +{}".format(rl),
                    insert=tuple(text_position),
-                    **{
-                        "text-anchor": text_anchor,
-                        "alignment-baseline": "baseline",
-                        "dominant-baseline": "baseline",
-                    },
+                    class_="PLANLEVEL",
+                    **text_style,
                )
            )

@@ -625,7 +804,7 @@ class SvgWriter:
        points = obj.data.splines[0].points
        region = bpy.context.region
        region_3d = bpy.context.area.spaces.active.region_3d
-        points_chunked = [points[i:i+3] for i in range(len(points)-2)]
+        points_chunked = [points[i : i + 3] for i in range(len(points) - 2)]

        for points_chunk in points_chunked:
            points_2d = [view3d_utils.location_3d_to_region_2d(region, region_3d, p.co.xyz) for p in points_chunk]
@@ -651,7 +830,7 @@ class SvgWriter:
            bm.verts.index_update()
            bm.edges.index_update()
            new_verts = [bm.verts.new(p) for p in points_chunk]
-            new_edges = [bm.edges.new( (new_verts[e[0]], new_verts[e[1]]) ) for e in ((0, 1), (1, 2))]
+            new_edges = [bm.edges.new((new_verts[e[0]], new_verts[e[1]])) for e in ((0, 1), (1, 2))]
            self.draw_svg_3point_arc(obj, bm)

    def draw_svg_3point_arc(self, obj, bm):
@@ -733,16 +912,11 @@ class SvgWriter:
        text_offset = (text_position - center_position).xy.normalized() * 5
        text_position += text_offset

-        text_style = {
-            "text-anchor": "middle",
-            "alignment-baseline": "middle",
-            "dominant-baseline": "middle",
-        }
-
+        text_style = self.get_box_alignment_parameters("center")
        angle_text = abs(round(math.degrees(angle), 3))
        if is_reflex:
            angle_text = 360 - angle_text
-        self.svg.add(self.svg.text(f"{angle_text}deg", insert=tuple(text_position), **text_style))
+        self.svg.add(self.svg.text(f"{angle_text}deg", insert=tuple(text_position), class_="ANGLE", **text_style))

        # Draw SVG arc, see for details: http://xahlee.info/js/svg_circle_arc.html
        arc_proj_end_pts = [self.project_point_onto_camera(v) for v in arc_end_pts]
@@ -799,23 +973,89 @@ class SvgWriter:
            )
            text_position += text_offset

-            text_style = {
-                "text-anchor": "middle",
-                "alignment-baseline": "middle",
-                "dominant-baseline": "middle",
-            }
-
-            radius = ((matrix_world @ points[-1].co) - (matrix_world @ points[-2].co)).length
-            radius = helper.format_distance(radius)
+            text_style = self.get_box_alignment_parameters("center")
+            radius = (points[-1].co - points[-2].co).length
+            radius = helper.format_distance(radius, precision=self.precision, decimal_places=self.decimal_places)
            tag = element.Description or f"R{radius}"

-            self.svg.add(self.svg.text(tag, insert=tuple(text_position), **text_style))
+            self.svg.add(self.svg.text(tag, insert=tuple(text_position), class_="RADIUS", **text_style))
+
+    def draw_fall_annotations(self, obj):
+        x_offset = self.raw_width / 2
+        y_offset = self.raw_height / 2
+        classes = self.get_attribute_classes(obj)
+        element = tool.Ifc.get_entity(obj)
+        matrix_world = obj.matrix_world
+        for spline in obj.data.splines:
+            points = self.get_spline_points(spline)
+            projected_points = [self.project_point_onto_camera(matrix_world @ p.co.xyz) for p in points]
+            d = " ".join(
+                [
+                    "L {} {}".format((x_offset + p.x) * self.svg_scale, (y_offset - p.y) * self.svg_scale)
+                    for p in projected_points
+                ]
+            )
+            d = "M{}".format(d[1:])
+            path = self.svg.add(self.svg.path(d=d, class_=" ".join(classes)))
+
+            p0 = Vector(
+                (
+                    (x_offset + projected_points[0].x) * self.svg_scale,
+                    (y_offset - projected_points[0].y) * self.svg_scale,
+                )
+            )
+            p1 = Vector(
+                (
+                    (x_offset + projected_points[1].x) * self.svg_scale,
+                    (y_offset - projected_points[1].y) * self.svg_scale,
+                )
+            )
+
+            # generate label text
+            # same function as in decoration.py
+            def get_label_text():
+                B, A = [v.co.xyz for v in points[:2]]
+                rise = abs(A.z - B.z)
+                O = A.copy()
+                O.z = B.z
+                run = (B - O).length
+                if run != 0:
+                    angle_tg = rise / run
+                    angle = round(degrees(atan(angle_tg)))
+                else:
+                    angle = 90
+
+                # ues SLOPE_ANGLE as default
+                if element.ObjectType in ("FALL", "SLOPE_ANGLE"):
+                    return f"{angle}°"
+                elif element.ObjectType == "SLOPE_FRACTION":
+                    if angle == 90:
+                        return "-"
+                    return f"{helper.format_distance(rise, precision=self.precision, decimal_places=self.decimal_places)} / {helper.format_distance(run, precision=self.precision, decimal_places=self.decimal_places)}"
+                elif element.ObjectType == "SLOPE_PERCENT":
+                    if angle == 90:
+                        return "-"
+                    return f"{round(angle_tg * 100)} %"
+
+            tag = element.Description or get_label_text()
+
+            text_offset = (p0 - p1).xy.normalized() * len(tag)
+            text_position = projected_points[0]
+            text_position = Vector(
+                ((x_offset + text_position.x) * self.svg_scale, (y_offset - text_position.y) * self.svg_scale)
+            )
+            text_position += text_offset
+
+            text_style = self.get_box_alignment_parameters("center")
+            self.svg.add(self.svg.text(tag, insert=tuple(text_position), class_="RADIUS", **text_style))

    def draw_diameter_annotations(self, obj):
        classes = self.get_attribute_classes(obj)
        matrix_world = obj.matrix_world
        element = tool.Ifc.get_entity(obj)
-        text_override = element.Description
+        dimension_text = element.Description
+        dimension_data = DecoratorData.get_dimension_data(obj)
+
        for spline in obj.data.splines:
            points = self.get_spline_points(spline)
            for i, p in enumerate(points):
@@ -824,22 +1064,35 @@ class SvgWriter:
                v0_global = matrix_world @ points[i].co.xyz
                v1_global = matrix_world @ points[i + 1].co.xyz
                self.draw_dimension_annotation(
-                    v0_global, v1_global, classes, text_override, text_format=lambda x: "D" + x
+                    v0_global,
+                    v1_global,
+                    classes,
+                    dimension_text,
+                    text_format=lambda x: "D" + x,
+                    show_description_only=dimension_data["show_description_only"],
+                    suppress_zero_inches=dimension_data["suppress_zero_inches"],
                )

    def draw_dimension_annotations(self, obj):
        classes = self.get_attribute_classes(obj)
        matrix_world = obj.matrix_world
        element = tool.Ifc.get_entity(obj)
-        text_override = element.Description
+        dimension_text = element.Description
+        dimension_data = DecoratorData.get_dimension_data(obj)
+
        for spline in obj.data.splines:
            points = self.get_spline_points(spline)
-            for i, p in enumerate(points):
-                if i + 1 >= len(points):
-                    continue
+            for i in range(len(points) - 1):
                v0_global = matrix_world @ points[i].co.xyz
                v1_global = matrix_world @ points[i + 1].co.xyz
-                self.draw_dimension_annotation(v0_global, v1_global, classes, text_override)
+                self.draw_dimension_annotation(
+                    v0_global,
+                    v1_global,
+                    classes,
+                    dimension_text=dimension_text,
+                    show_description_only=dimension_data["show_description_only"],
+                    suppress_zero_inches=dimension_data["suppress_zero_inches"],
+                )

    def draw_measureit_arch_dimension_annotations(self):
        try:
@@ -853,45 +1106,56 @@ class SvgWriter:
                Vector(coord[0]), Vector(coord[1]), ["IfcAnnotation", "PredefinedType-DIMENSION"]
            )

-    def draw_dimension_annotation(self, v0_global, v1_global, classes, text_override=None, text_format=lambda x: x):
-        x_offset = self.raw_width / 2
-        y_offset = self.raw_height / 2
+    def draw_dimension_annotation(
+        self,
+        v0_global,
+        v1_global,
+        classes,
+        dimension_text=None,
+        text_format=lambda x: x,
+        show_description_only=False,
+        suppress_zero_inches=False,
+    ):
+        offset = Vector([self.raw_width, self.raw_height]) / 2
        v0 = self.project_point_onto_camera(v0_global)
        v1 = self.project_point_onto_camera(v1_global)
-        start = Vector(((x_offset + v0.x), (y_offset - v0.y)))
-        end = Vector(((x_offset + v1.x), (y_offset - v1.y)))
+        start = (offset + v0.xy * Vector((1, -1))) * self.svg_scale
+        end = (offset + v1.xy * Vector((1, -1))) * self.svg_scale
        mid = ((end - start) / 2) + start
        vector = end - start
        perpendicular = Vector((vector.y, -vector.x)).normalized()
        dimension = (v1_global - v0_global).length
-        dimension = helper.format_distance(dimension)
-        sheet_dimension = ((end * self.svg_scale) - (start * self.svg_scale)).length
-        if sheet_dimension < 5:  # annotation can't fit
-            # offset text to right of marker
-            text_position = (end * self.svg_scale) + perpendicular + (3 * vector.normalized())
-        else:
-            text_position = (mid * self.svg_scale) + perpendicular
+        dimension = helper.format_distance(
+            dimension,
+            precision=self.precision,
+            decimal_places=self.decimal_places,
+            suppress_zero_inches=suppress_zero_inches,
+        )
+        sheet_dimension = (end - start).length
+
+        # if annotation can't fit offset text to the right of marker
+        text_position = mid if sheet_dimension > 5 else (end + (3 * vector.normalized()))
        rotation = math.degrees(vector.angle_signed(Vector((1, 0))))
-        line = self.svg.add(
-            self.svg.line(
-                start=tuple(start * self.svg_scale), end=tuple(end * self.svg_scale), class_=" ".join(classes)
+
+        line = self.svg.line(start=start, end=end, class_=" ".join(classes))
+        self.svg.add(line)
+
+        def create_text_tag(text, text_position, box_alignment):
+            text_kwargs = {"transform": "rotate({} {} {})".format(rotation, text_position.x, text_position.y)}
+            return self.svg.text(
+                text_format(text),
+                insert=text_position,
+                class_="DIMENSION",
+                **(text_kwargs | self.get_box_alignment_parameters(box_alignment)),
            )
-        )
-        if text_override is not None:
-            text = text_override
-        else:
-            text = str(dimension)
-        text = text_format(text)
-        self.svg.add(
-            self.svg.text(
-                text,
-                insert=tuple(text_position),
-                **{
-                    "transform": "rotate({} {} {})".format(rotation, text_position.x, text_position.y),
-                    "text-anchor": "middle",
-                },
-            )
-        )
+
+        if not show_description_only:
+            self.svg.add(create_text_tag(str(dimension), text_position + perpendicular, "bottom-middle"))
+            if dimension_text:
+                self.svg.add(create_text_tag(dimension_text, text_position - perpendicular, "top-middle"))
+
+        elif show_description_only and dimension_text:
+            self.svg.add(create_text_tag(dimension_text, text_position + perpendicular, "bottom-middle"))

    def project_point_onto_camera(self, point):
        # TODO is this needlessly complex?
@@ -20,7 +20,13 @@ import bpy
 import blenderbim.bim.helper
 import blenderbim.tool as tool
 from bpy.types import Panel
-from blenderbim.bim.module.drawing.data import ProductAssignmentsData, TextData, SheetsData, SchedulesData, DrawingsData
+from blenderbim.bim.module.drawing.data import (
+    ProductAssignmentsData,
+    SheetsData,
+    SchedulesData,
+    DrawingsData,
+    DecoratorData,
+)


 class BIM_PT_camera(Panel):
@@ -56,6 +62,11 @@ class BIM_PT_camera(Panel):
        row.prop(props, "has_annotation", icon="MOD_EDGESPLIT")
        row.prop(dprops, "should_use_annotation_cache", text="", icon="FILE_REFRESH")

+        row = layout.row()
+        row.prop(props, "calculate_shapely_surfaces")
+        row = layout.row()
+        row.prop(props, "calculate_svgfill_surfaces")
+
        row = layout.row()
        row.prop(dprops, "should_extract")

@@ -78,7 +89,7 @@ class BIM_PT_camera(Panel):

        row = layout.row(align=True)
        row.operator("bim.create_drawing", text="Create Drawing", icon="OUTPUT")
-        op = row.operator("bim.open_view", icon="URL", text="")
+        op = row.operator("bim.open_drawing", icon="URL", text="")
        op.view = context.active_object.name.split("/")[1]


@@ -117,9 +128,6 @@ class BIM_PT_drawing_underlay(Panel):
                row = layout.row()
                row.prop(drawing_style, "render_type")
                row = layout.row(align=True)
-                row.prop(drawing_style, "vector_style")
-                row.operator("bim.edit_vector_style", text="", icon="GREASEPENCIL")
-                row = layout.row(align=True)
                row.prop(drawing_style, "include_query")
                row = layout.row(align=True)
                row.prop(drawing_style, "exclude_query")
@@ -152,6 +160,14 @@ class BIM_PT_drawings(Panel):
        if not DrawingsData.is_loaded:
            DrawingsData.load()

+        if not DrawingsData.data["has_saved_ifc"]:
+            row = self.layout.row()
+            row.label(text="Project Not Yet Saved", icon="ERROR")
+            row = self.layout.row()
+            op = row.operator("export_ifc.bim", icon="EXPORT", text="Save Project")
+            op.should_save_as = False
+            return
+
        self.props = context.scene.DocProperties

        if not self.props.is_editing_drawings:
@@ -174,12 +190,16 @@ class BIM_PT_drawings(Panel):
                col.alignment = "LEFT"
                row2 = col.row(align=True)
                row2.operator("bim.remove_drawing", icon="X", text="").drawing = active_drawing.ifc_definition_id
-                row2.operator("bim.duplicate_drawing", icon="COPYDOWN", text="").drawing = active_drawing.ifc_definition_id
+                row2.operator(
+                    "bim.duplicate_drawing", icon="COPYDOWN", text=""
+                ).drawing = active_drawing.ifc_definition_id
                col = row.column()
                col.alignment = "RIGHT"
-                op = row.operator("bim.open_view", icon="URL", text="")
+                op = row.operator("bim.select_all_drawings", icon="SELECT_SUBTRACT", text="")
+                op = row.operator("bim.open_drawing", icon="URL", text="")
                op.view = active_drawing.name
-                op = row.operator("bim.activate_view", icon="OUTLINER_OB_CAMERA", text="")
+                row.operator("bim.activate_model", icon="VIEW3D", text="")
+                op = row.operator("bim.activate_drawing", icon="OUTLINER_OB_CAMERA", text="")
                op.drawing = active_drawing.ifc_definition_id
                row.operator("bim.create_drawing", text="", icon="OUTPUT")
            self.layout.template_list(
@@ -212,6 +232,14 @@ class BIM_PT_schedules(Panel):
        if not SchedulesData.is_loaded:
            SchedulesData.load()

+        if not SchedulesData.data["has_saved_ifc"]:
+            row = self.layout.row()
+            row.label(text="Project Not Yet Saved", icon="ERROR")
+            row = self.layout.row()
+            op = row.operator("export_ifc.bim", icon="EXPORT", text="Save Project")
+            op.should_save_as = False
+            return
+
        self.props = context.scene.DocProperties

        if not self.props.is_editing_schedules:
@@ -255,6 +283,14 @@ class BIM_PT_sheets(Panel):
        if not SheetsData.is_loaded:
            SheetsData.load()

+        if not SheetsData.data["has_saved_ifc"]:
+            row = self.layout.row()
+            row.label(text="Project Not Yet Saved", icon="ERROR")
+            row = self.layout.row()
+            op = row.operator("export_ifc.bim", icon="EXPORT", text="Save Project")
+            op.should_save_as = False
+            return
+
        self.props = context.scene.DocProperties

        if not self.props.is_editing_sheets:
@@ -272,6 +308,7 @@ class BIM_PT_sheets(Panel):
            active_sheet = self.props.sheets[self.props.active_sheet_index]
            row = self.layout.row(align=True)
            row.alignment = "RIGHT"
+            row.operator("bim.edit_sheet", icon="GREASEPENCIL", text="")
            row.operator("bim.open_sheet", icon="URL", text="")
            row.operator("bim.add_drawing_to_sheet", icon="IMAGE_PLANE", text="")
            row.operator("bim.add_schedule_to_sheet", icon="PRESET_NEW", text="")
@@ -291,6 +328,7 @@ class BIM_PT_product_assignments(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1

    @classmethod
    def poll(cls, context):
@@ -325,6 +363,7 @@ class BIM_PT_text(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 0

    @classmethod
    def poll(cls, context):
@@ -333,27 +372,67 @@ class BIM_PT_text(Panel):
        element = tool.Ifc.get_entity(context.active_object)
        if not element:
            return
-        return element.is_a("IfcAnnotation") and element.ObjectType in ["TEXT", "TEXT_LEADER"]
+        return tool.Drawing.is_annotation_object_type(element, ["TEXT", "TEXT_LEADER"])

    def draw(self, context):
-        if not TextData.is_loaded:
-            TextData.load()
-
-        props = context.active_object.BIMTextProperties
+        obj = context.active_object
+        props = obj.BIMTextProperties

        if props.is_editing:
+            # shares most of the code with EditTextPopup.draw()
+            # need to keep them in sync or move to some common function
+
            row = self.layout.row(align=True)
            row.operator("bim.edit_text", icon="CHECKMARK")
+            row.operator("bim.add_text_literal", icon="ADD", text="")
            row.operator("bim.disable_editing_text", icon="CANCEL", text="")
-            blenderbim.bim.helper.draw_attributes(props.attributes, self.layout)
+
+            row = self.layout.row(align=True)
+            row.prop(props, "font_size")
+
+            for i, literal_props in enumerate(props.literals):
+                box = self.layout.box()
+                row = self.layout.row(align=True)
+
+                row = box.row(align=True)
+                row.label(text=f"Literal[{i}]:")
+                row.operator("bim.remove_text_literal", icon="X", text="").literal_prop_id = i
+
+                # skip BoxAlignment since we're going to format it ourselves
+                attributes = [a for a in literal_props.attributes if a.name != "BoxAlignment"]
+                blenderbim.bim.helper.draw_attributes(attributes, box)
+
+                row = box.row(align=True)
+                cols = [row.column(align=True) for i in range(3)]
+                for i in range(9):
+                    cols[i % 3].prop(
+                        literal_props,
+                        "box_alignment",
+                        text="",
+                        index=i,
+                        icon="RADIOBUT_ON" if literal_props.box_alignment[i] else "RADIOBUT_OFF",
+                    )
+
+                col = row.column(align=True)
+                col.label(text="    Text box alignment:")
+                col.label(text=f'    {literal_props.attributes["BoxAlignment"].string_value}')
+
        else:
+            text_data = DecoratorData.get_ifc_text_data(obj)
+
            row = self.layout.row()
            row.operator("bim.enable_editing_text", icon="GREASEPENCIL")

-            for attribute in TextData.data["attributes"]:
-                row = self.layout.row(align=True)
-                row.label(text=attribute["name"])
-                row.label(text=attribute["value"])
+            row = self.layout.row(align=True)
+            row.label(text="FontSize")
+            row.label(text=str(text_data["FontSize"]))
+
+            for literal_data in text_data["Literals"]:
+                box = self.layout.box()
+                for attribute in literal_data:
+                    row = box.row(align=True)
+                    row.label(text=attribute)
+                    row.label(text=literal_data[attribute])


 class BIM_PT_annotation_utilities(Panel):
@@ -417,9 +496,18 @@ class BIM_PT_annotation_utilities(Panel):
        op.data_type = "mesh"

        row = layout.row(align=True)
+        op = row.operator("bim.add_annotation", text="Batting", icon="FORCE_FORCE")
+        op.object_type = "BATTING"
+        op.data_type = "mesh"
+        op.description = "Add batting annotation.\nThickness could be changed through Thickness property of BBIM_Batting property set"
        op = row.operator("bim.add_annotation", text="Fill Area", icon="NODE_TEXTURE")
        op.object_type = "FILL_AREA"

+        row = layout.row(align=True)
+        op = row.operator("bim.add_annotation", text="Fall", icon="SORT_ASC")
+        op.object_type = "FALL"
+        op.data_type = "curve"
+
        row = layout.row(align=True)
        row.prop(self.props, "should_draw_decorations", text="Viewport Annotations")
        row.enabled = context.scene.camera is not None
@@ -429,6 +517,8 @@ class BIM_UL_drawinglist(bpy.types.UIList):
    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
        if item:
            row = layout.row(align=True)
+            selected_icon = "CHECKBOX_HLT" if item.is_selected else "CHECKBOX_DEHLT"
+            row.prop(item, "is_selected", text="", icon=selected_icon)
            icon = "UV_FACESEL"
            if item.target_view == "ELEVATION_VIEW":
                icon = "UV_VERTEXSEL"
@@ -445,26 +535,35 @@ class BIM_UL_drawinglist(bpy.types.UIList):

 class BIM_UL_sheets(bpy.types.UIList):
    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-
-            if item.is_sheet:
-                if item.is_expanded:
-                    row.operator(
-                        "bim.contract_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_DOWN"
-                    ).sheet = item.ifc_definition_id
-                else:
-                    row.operator(
-                        "bim.expand_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT"
-                    ).sheet = item.ifc_definition_id
-            else:
-                row.label(text="", icon="BLANK1")
-                if item.reference_type == "DRAWING":
-                    row.label(text="", icon="IMAGE_DATA")
-                elif item.reference_type == "SCHEDULE":
-                    row.label(text="", icon="LONGDISPLAY")
-
-            name = "{} - {}".format(item.identification or "X", item.name or "Unnamed")
-            row.label(text=name)
-        else:
+        if not item:
            layout.label(text="", translate=False)
+            return
+
+        row = layout.row(align=True)
+        if item.is_sheet:
+            if item.is_expanded:
+                row.operator(
+                    "bim.contract_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_DOWN"
+                ).sheet = item.ifc_definition_id
+            else:
+                row.operator(
+                    "bim.expand_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT"
+                ).sheet = item.ifc_definition_id
+
+            row.label(text=f"{item.identification} - {item.name}")
+        else:
+            row.label(text="", icon="BLANK1")
+            if item.reference_type == "DRAWING":
+                row.label(text="", icon="IMAGE_DATA")
+            elif item.reference_type == "SCHEDULE":
+                row.label(text="", icon="LONGDISPLAY")
+            elif item.reference_type == "TITLEBLOCK":
+                row.label(text="", icon="MENU_PANEL")
+            elif item.reference_type == "REVISION":
+                row.label(text="", icon="RECOVER_LAST")
+
+            if item.identification:
+                name = f"{item.identification} - {item.name or 'Unnamed'}"
+            else:
+                name = item.name or "Unnamed"
+            row.label(text=name)
@@ -0,0 +1,296 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 @Andrej730
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import os
+import bpy
+import blenderbim.tool as tool
+from blenderbim.bim.helper import prop_with_search
+from bpy.types import WorkSpaceTool
+
+# from blenderbim.bim.module.model.data import AuthoringData, RailingData, RoofData
+from blenderbim.bim.module.drawing.prop import ANNOTATION_TYPES_DATA
+from blenderbim.bim.module.drawing.data import DecoratorData, AnnotationData
+from blenderbim.bim.ifc import IfcStore
+import blenderbim.bim.handler
+
+
+# declaring it here to avoid circular import problems
+class Operator:
+    def execute(self, context):
+        IfcStore.execute_ifc_operator(self, context)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+
+class AnnotationTool(WorkSpaceTool):
+    bl_space_type = "VIEW_3D"
+    bl_context_mode = "OBJECT"
+
+    bl_idname = "bim.annotation_tool"
+    bl_label = "Annotation Tool"
+    bl_description = "Gives you Annotation related superpowers"
+    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.annotation")
+    bl_widget = None
+    # https://docs.blender.org/api/current/bpy.types.KeyMapItems.html
+    bl_keymap = tool.Blender.get_default_selection_keypmap() + (
+        ("bim.annotation_hotkey", {"type": "A", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_A")]}),
+        ("bim.annotation_hotkey", {"type": "C", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_C")]}),
+        ("bim.annotation_hotkey", {"type": "E", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_E")]}),
+        ("bim.annotation_hotkey", {"type": "F", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_F")]}),
+        ("bim.annotation_hotkey", {"type": "G", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_G")]}),
+        ("bim.annotation_hotkey", {"type": "K", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_K")]}),
+        ("bim.annotation_hotkey", {"type": "M", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_M")]}),
+        ("bim.annotation_hotkey", {"type": "O", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_O")]}),
+        ("bim.annotation_hotkey", {"type": "Q", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_Q")]}),
+        ("bim.annotation_hotkey", {"type": "R", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_R")]}),
+        ("bim.annotation_hotkey", {"type": "T", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_T")]}),
+        ("bim.annotation_hotkey", {"type": "V", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_V")]}),
+        ("bim.annotation_hotkey", {"type": "X", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_X")]}),
+        ("bim.annotation_hotkey", {"type": "Y", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_Y")]}),
+        ("bim.annotation_hotkey", {"type": "D", "value": "PRESS", "alt": True}, {"properties": [("hotkey", "A_D")]}),
+        ("bim.annotation_hotkey", {"type": "E", "value": "PRESS", "alt": True}, {"properties": [("hotkey", "A_E")]}),
+        ("bim.annotation_hotkey", {"type": "O", "value": "PRESS", "alt": True}, {"properties": [("hotkey", "A_O")]}),
+    )
+
+    def draw_settings(context, layout, ws_tool):
+        # Unlike operators, Blender doesn't treat workspace tools as a class, so we'll create our own.
+        AnnotationToolUI.draw(context, layout)
+
+
+def add_layout_hotkey_operator(layout, text, hotkey, description):
+    modifiers = {
+        "A": "EVENT_ALT",
+        "S": "EVENT_SHIFT",
+    }
+    modifier, key = hotkey.split("_")
+
+    row = layout.row(align=True)
+    row.label(text="", icon=modifiers[modifier])
+    row.label(text="", icon=f"EVENT_{key}")
+
+    op = row.operator("bim.annotation_hotkey", text=text)
+    op.hotkey = hotkey
+    op.description = description
+    return op, row
+
+
+# TODO: move to operator
+def create_annotation_type(context):
+    # just empty to store parameters
+    props = context.scene.BIMAnnotationProperties
+    object_type = props.object_type
+    create_representation = props.create_representation_for_type
+    drawing = tool.Ifc.get_entity(bpy.context.scene.camera)
+
+    if props.create_representation_for_type:
+        obj = tool.Drawing.create_annotation_object(drawing, object_type)
+    else:
+        obj = bpy.data.objects.new(object_type, None)
+
+    obj.name = f"{object_type}_TYPE"
+    obj.location = context.scene.cursor.location
+    tool.Drawing.ensure_annotation_in_drawing_plane(obj)
+
+    drawing = tool.Ifc.get_entity(context.scene.camera)
+    ifc_context = tool.Drawing.get_annotation_context(tool.Drawing.get_drawing_target_view(drawing))
+
+    element = tool.Drawing.run_root_assign_class(
+        obj=obj,
+        ifc_class="IfcTypeProduct",
+        predefined_type=object_type,
+        should_add_representation=create_representation,
+        context=ifc_context,
+        ifc_representation_class=tool.Drawing.get_ifc_representation_class(object_type),
+    )
+    element.ApplicableOccurrence = f"IfcAnnotation/{object_type}"
+
+    tool.Blender.select_and_activate_single_object(context, obj)
+
+
+# TODO: move to operator
+def create_annotation_occurence(context):
+    # object_type = context.scene.BIMAnnotationProperties.object_type
+    props = context.scene.BIMAnnotationProperties
+    relating_type = tool.Ifc.get().by_id(int(props.relating_type_id))
+    object_type = props.object_type
+
+    drawing = tool.Ifc.get_entity(context.scene.camera)
+    obj = tool.Drawing.create_annotation_object(drawing, object_type)
+    obj.name = relating_type.Name
+    ifc_context = tool.Drawing.get_annotation_context(tool.Drawing.get_drawing_target_view(drawing))
+    relating_type_repr = tool.Drawing.get_annotation_representation(relating_type)
+    element = tool.Drawing.run_root_assign_class(
+        obj=obj,
+        ifc_class="IfcAnnotation",
+        predefined_type=object_type,
+        should_add_representation=not bool(relating_type_repr),
+        context=ifc_context,
+        ifc_representation_class=tool.Drawing.get_ifc_representation_class(object_type),
+    )
+
+    blenderbim.core.type.assign_type(tool.Ifc, tool.Type, element=element, type=relating_type)
+
+    tool.Ifc.run("group.assign_group", group=tool.Drawing.get_drawing_group(drawing), products=[element])
+    tool.Collector.assign(obj)
+    tool.Blender.select_and_activate_single_object(context, obj)
+
+
+def create_annotation():
+    props = bpy.context.scene.BIMAnnotationProperties
+    create_type_occurence = props.relating_type_id != "0"
+    if create_type_occurence:
+        create_annotation_occurence(bpy.context)
+    else:
+        object_type = props.object_type
+        bpy.ops.bim.add_annotation(object_type=object_type, data_type=ANNOTATION_TYPES_DATA[object_type][-1])
+
+
+class AnnotationToolUI:
+    @classmethod
+    def draw(cls, context, layout):
+        cls.layout = layout
+        cls.props = context.scene.BIMAnnotationProperties
+
+        row = cls.layout.row(align=True)
+        if not tool.Ifc.get():
+            row.label(text="No IFC Project", icon="ERROR")
+            return
+
+        if not AnnotationData.is_loaded:
+            AnnotationData.load()
+
+        cls.draw_type_selection_interface()
+
+        if context.active_object and context.selected_objects:
+            cls.draw_edit_object_interface(context)
+        elif not context.selected_objects:
+            cls.draw_create_object_interface()
+
+    @classmethod
+    def draw_create_object_interface(cls):
+        row = cls.layout.row(align=True)
+        op, row = add_layout_hotkey_operator(cls.layout, "Add Type", "S_C", "Create a new annotation type")
+        selected_icon = "CHECKBOX_HLT" if cls.props.create_representation_for_type else "CHECKBOX_DEHLT"
+        row.prop(cls.props, "create_representation_for_type", text="", icon=selected_icon)
+
+    @classmethod
+    def draw_edit_object_interface(cls, context):
+        if DecoratorData.get_ifc_text_data(bpy.context.object):
+            add_layout_hotkey_operator(cls.layout, "Edit Text", "S_E", "")
+
+    @classmethod
+    def draw_header_interface(cls):
+        cls.draw_type_selection_interface()
+
+    @classmethod
+    def draw_basic_annotation_tool_interface(cls):
+        cls.draw_type_selection_interface()
+
+    @classmethod
+    def draw_type_selection_interface(cls):
+        # shared by both sidebar and header
+        object_type = cls.props.object_type
+
+        row = cls.layout.row(align=True)
+        row.label(text="", icon="FILE_VOLUME")
+        prop_with_search(row, cls.props, "object_type", text="")
+
+        row = cls.layout.row(align=True)
+        row.label(text="", icon="FILE_3D")
+        prop_with_search(row, cls.props, "relating_type_id", text="")
+
+        create_type_occurence = cls.props.relating_type_id != "0"
+        label = "Add Type Occurence" if create_type_occurence else "Add Annotation"
+        add_layout_hotkey_operator(cls.layout, label, "S_A", "Create a new annotation")
+
+        if object_type in ("TEXT", "STAIR_ARROW"):
+            add_layout_hotkey_operator(
+                cls.layout,
+                "Bulk Tag",
+                "S_T",
+                "Create new annotations and automatically adjust them to the selected objects",
+            )
+        add_layout_hotkey_operator(
+            cls.layout, "Readjust", "S_G", "Readjust tags based on the products they are assigned to"
+        )
+
+
+class Hotkey(bpy.types.Operator, Operator):
+    bl_idname = "bim.annotation_hotkey"
+    bl_label = "Hotkey"
+    bl_options = {"REGISTER", "UNDO"}
+    hotkey: bpy.props.StringProperty()
+    description: bpy.props.StringProperty()
+
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+
+    @classmethod
+    def description(cls, context, operator):
+        return operator.description or ""
+
+    def _execute(self, context):
+        self.props = context.scene.BIMAnnotationProperties
+        getattr(self, f"hotkey_{self.hotkey}")()
+
+    def invoke(self, context, event):
+        # https://blender.stackexchange.com/questions/276035/how-do-i-make-operators-remember-their-property-values-when-called-from-a-hotkey
+        self.props = context.scene.BIMAnnotationProperties
+        return self.execute(context)
+
+    def draw(self, context):
+        pass
+
+    def hotkey_S_T(self):
+        props = bpy.context.scene.BIMAnnotationProperties
+        object_type = props.object_type
+
+        related_objects = bpy.context.selected_objects
+        for related_object in related_objects:
+            create_annotation()
+            obj = bpy.context.active_object
+            bpy.ops.object.mode_set(mode="OBJECT")
+            tool.Drawing.setup_annotation_object(obj, object_type, related_object)
+
+    def hotkey_S_A(self):
+        create_annotation()
+
+    def hotkey_S_E(self):
+        if not bpy.context.object:
+            return
+
+        if DecoratorData.get_ifc_text_data(bpy.context.object):
+            bpy.ops.bim.edit_text_popup()
+
+    def hotkey_S_G(self):
+        for obj in bpy.context.selected_objects:
+            element = tool.Ifc.get_entity(obj)
+            if not element or not element.is_a("IfcAnnotation"):
+                continue
+
+            related_product = tool.Drawing.get_assigned_product(element)
+            if not related_product:
+                continue
+            related_object = tool.Ifc.get_object(related_product)
+
+            tool.Drawing.setup_annotation_object(obj, element.ObjectType, related_object)
+
+    def hotkey_S_C(self):
+        create_annotation_type(bpy.context)
@@ -27,6 +27,11 @@ classes = (
    operator.OverrideDelete,
    operator.OverrideDuplicateMove,
    operator.OverrideDuplicateMoveLinked,
+    operator.OverrideDuplicateMoveLinkedMacro,
+    operator.OverrideDuplicateMoveMacro,
+    operator.OverrideJoin,
+    operator.OverrideModeSetEdit,
+    operator.OverrideModeSetObject,
    operator.OverrideOutlinerDelete,
    operator.OverridePasteBuffer,
    operator.RemoveConnection,
@@ -35,6 +40,7 @@ classes = (
    operator.SwitchRepresentation,
    operator.UpdateParametricRepresentation,
    operator.UpdateRepresentation,
+    prop.BIMObjectGeometryProperties,
    prop.BIMGeometryProperties,
    ui.BIM_PT_derived_placements,
    ui.BIM_PT_representations,
@@ -48,23 +54,44 @@ addon_keymaps = []


 def register():
+    operator.OverrideDuplicateMoveMacro.define("BIM_OT_override_object_duplicate_move")
+    operator.OverrideDuplicateMoveMacro.define("TRANSFORM_OT_translate")
+    operator.OverrideDuplicateMoveLinkedMacro.define("BIM_OT_override_object_duplicate_move_linked")
+    operator.OverrideDuplicateMoveLinkedMacro.define("TRANSFORM_OT_translate")
+
+    bpy.types.Object.BIMGeometryProperties = bpy.props.PointerProperty(type=prop.BIMObjectGeometryProperties)
    bpy.types.Scene.BIMGeometryProperties = bpy.props.PointerProperty(type=prop.BIMGeometryProperties)
    bpy.types.OBJECT_PT_transform.append(ui.BIM_PT_transform)
+    bpy.types.VIEW3D_MT_object.append(ui.object_menu)
    wm = bpy.context.window_manager
    if wm.keyconfigs.addon:
-        km = wm.keyconfigs.addon.keymaps.new(name="3D View", space_type="VIEW_3D")
+        km = wm.keyconfigs.addon.keymaps.new(name="Object Mode", space_type="EMPTY")
+        kmi = km.keymap_items.new("bim.override_object_join", "J", "PRESS", ctrl=True)
+        kmi = km.keymap_items.new("bim.override_object_duplicate_move_macro", "D", "PRESS", shift=True)
+        kmi = km.keymap_items.new("bim.override_object_duplicate_move_linked_macro", "D", "PRESS", alt=True)
        kmi = km.keymap_items.new("bim.override_paste_buffer", "V", "PRESS", ctrl=True)
-        kmi.properties["name"] = "bim.override_paste_buffer"
-        addon_keymaps.append((km, kmi))
+        kmi = km.keymap_items.new("bim.override_mode_set_edit", "TAB", "PRESS")
+        kmi = km.keymap_items.new("bim.override_object_delete", "X", "PRESS")
+        kmi = km.keymap_items.new("bim.override_object_delete", "DEL", "PRESS")
+        kmi.properties.confirm = False
+
+        km = wm.keyconfigs.addon.keymaps.new(name="Mesh", space_type="EMPTY")
+        kmi = km.keymap_items.new("bim.override_mode_set_object", "TAB", "PRESS")
+
+        km = wm.keyconfigs.addon.keymaps.new(name="Curve", space_type="EMPTY")
+        kmi = km.keymap_items.new("bim.override_mode_set_object", "TAB", "PRESS")
+
        km = wm.keyconfigs.addon.keymaps.new(name="Outliner", space_type="OUTLINER")
        kmi = km.keymap_items.new("bim.override_paste_buffer", "V", "PRESS", ctrl=True)
-        kmi.properties["name"] = "bim.override_paste_buffer"
-        addon_keymaps.append((km, kmi))
+        kmi = km.keymap_items.new("bim.override_outliner_delete", "X", "PRESS")
+        kmi = km.keymap_items.new("bim.override_outliner_delete", "DEL", "PRESS")


 def unregister():
+    bpy.types.VIEW3D_MT_object.remove(ui.object_menu)
    bpy.types.OBJECT_PT_transform.remove(ui.BIM_PT_transform)
    del bpy.types.Scene.BIMGeometryProperties
+    del bpy.types.Object.BIMGeometryProperties
    wm = bpy.context.window_manager
    kc = wm.keyconfigs.addon
    if kc:
@@ -35,12 +35,18 @@ class RepresentationsData:
    @classmethod
    def load(cls):
        cls.data = {"representations": cls.representations()}
+        cls.data["contexts"] = cls.contexts()
        cls.is_loaded = True

    @classmethod
    def representations(cls):
        results = []
        element = tool.Ifc.get_entity(bpy.context.active_object)
+
+        active_representation_id = None
+        if bpy.context.active_object.data and hasattr(bpy.context.active_object.data, "BIMMeshProperties"):
+            active_representation_id = bpy.context.active_object.data.BIMMeshProperties.ifc_definition_id
+
        representations = []
        if element.is_a("IfcProduct") and element.Representation:
            representations = element.Representation.Representations
@@ -57,6 +63,7 @@ class RepresentationsData:
                "ContextIdentifier": "",
                "TargetView": "",
                "RepresentationType": representation_type or "",
+                "is_active": representation.id() == active_representation_id,
            }
            if representation.ContextOfItems.is_a("IfcGeometricRepresentationSubContext"):
                data["ContextIdentifier"] = representation.ContextOfItems.ContextIdentifier or ""
@@ -64,6 +71,25 @@ class RepresentationsData:
            results.append(data)
        return results

+    @classmethod
+    def contexts(cls):
+        results = []
+        for element in tool.Ifc.get().by_type("IfcGeometricRepresentationContext", include_subtypes=False):
+            results.append((str(element.id()), element.ContextType or "Unnamed", ""))
+        for element in tool.Ifc.get().by_type("IfcGeometricRepresentationSubContext", include_subtypes=False):
+            results.append(
+                (
+                    str(element.id()),
+                    "{}/{}/{}".format(
+                        element.ContextType or "Unnamed",
+                        element.ContextIdentifier or "Unnamed",
+                        element.TargetView or "Unnamed",
+                    ),
+                    "",
+                )
+            )
+        return results
+

 class ConnectionsData:
    data = {}
@@ -38,6 +38,7 @@ class Helper:
        bm = bmesh.new()
        bm.from_mesh(mesh)
        bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)

        bm.faces.ensure_lookup_table()
        face = None
@@ -61,6 +62,7 @@ class Helper:
        bm = bmesh.new()
        bm.from_mesh(mesh)
        bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)

        bm.faces.ensure_lookup_table()
        potential_faces = []
@@ -88,6 +90,7 @@ class Helper:
        bm = bmesh.new()
        bm.from_mesh(mesh)
        bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)

        bm.faces.ensure_lookup_table()
        potential_faces = []
@@ -289,6 +292,7 @@ class Helper:
        bm = bmesh.new()
        bm.from_mesh(mesh)
        bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)

        bm.faces.ensure_lookup_table()
        potential_faces = []
@@ -385,6 +389,7 @@ class Helper:
        bm = bmesh.new()
        bm.from_mesh(mesh)
        bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)

        bm.faces.ensure_lookup_table()
        faces = bm.faces
@@ -28,12 +28,12 @@ import ifcopenshell.api
 import blenderbim.core.geometry as core
 import blenderbim.core.style
 import blenderbim.core.root
+import blenderbim.core.drawing
 import blenderbim.tool as tool
 import blenderbim.bim.handler
 from mathutils import Vector
 from blenderbim.bim import import_ifc
 from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.module.root.prop import get_contexts


 class Operator:
@@ -59,27 +59,20 @@ class AddRepresentation(bpy.types.Operator, Operator):
    bl_idname = "bim.add_representation"
    bl_label = "Add Representation"
    bl_options = {"REGISTER", "UNDO"}
-    obj: bpy.props.StringProperty()
-    context_id: bpy.props.IntProperty()
-    ifc_representation_class: bpy.props.StringProperty()
-    profile_set_usage: bpy.props.IntProperty()

    def _execute(self, context):
-        ifc_context = self.context_id
-        if not ifc_context and get_contexts(self, context):
-            ifc_context = int(context.scene.BIMRootProperties.contexts or "0") or None
+        ifc_context = int(context.active_object.BIMGeometryProperties.contexts or "0") or None
        if ifc_context:
            ifc_context = tool.Ifc.get().by_id(ifc_context)
-        obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
        core.add_representation(
            tool.Ifc,
            tool.Geometry,
            tool.Style,
            tool.Surveyor,
-            obj=obj,
+            obj=context.active_object,
            context=ifc_context,
-            ifc_representation_class=self.ifc_representation_class,
-            profile_set_usage=tool.Ifc.get().by_id(self.profile_set_usage) if self.profile_set_usage else None,
+            ifc_representation_class=None,
+            profile_set_usage=None,
        )


@@ -196,7 +189,8 @@ class UpdateRepresentation(bpy.types.Operator, Operator):
            ifcopenshell.api.run("boundary.assign_connection_geometry", tool.Ifc.get(), **settings)
            return

-        core.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+        if tool.Ifc.is_moved(obj):
+            core.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)

        if material and material.is_a() in ["IfcMaterialProfileSet", "IfcMaterialLayerSet"]:
            # These objects are parametrically based on an axis and should not be modified as a mesh
@@ -257,6 +251,20 @@ class UpdateRepresentation(bpy.types.Operator, Operator):

        obj.data.BIMMeshProperties.ifc_definition_id = int(new_representation.id())
        obj.data.name = f"{old_representation.ContextOfItems.id()}/{new_representation.id()}"
+
+        # TODO: In simple scenarios, a type has a ShapeRepresentation of ID
+        # 123. This is then mapped through mapped representations by
+        # occurrences, with no cartesian transformation. In this case, the mesh
+        # data is 100% shared and therefore all have the same mesh name
+        # referencing ID 123. (i.e. the local origins are shared). However, in
+        # complex scenarios, occurrences may have their own cartesian
+        # transformation (via MappingTarget). This will mean that occurrences
+        # will not share the same mesh data and will instead reference a
+        # different ShapeRepresentation ID. In this scenario, we have to
+        # propagate the obj.data back to the type itself and all sibling
+        # occurrences and accommodate their individual cartesian
+        # transformations.
+
        core.remove_representation(tool.Ifc, tool.Geometry, obj=obj, representation=old_representation)
        if obj.data.BIMMeshProperties.ifc_parameters:
            core.get_representation_ifc_parameters(tool.Geometry, obj=obj)
@@ -352,52 +360,9 @@ class CopyRepresentation(bpy.types.Operator, Operator):
                    return r.MappedRepresentation


-class OverrideDeleteTrait:
-    def delete_ifc_object(self, obj):
-        element = tool.Ifc.get_entity(obj)
-        if not element:
-            return
-        IfcStore.delete_element(element)
-        if obj.users_collection and obj.users_collection[0].name == obj.name:
-            parent = ifcopenshell.util.element.get_aggregate(element)
-            if not parent:
-                parent = ifcopenshell.util.element.get_container(element)
-            if parent:
-                parent_obj = tool.Ifc.get_object(parent)
-                if parent_obj:
-                    parent_collection = bpy.data.collections.get(parent_obj.name)
-                    for child in obj.users_collection[0].children:
-                        parent_collection.children.link(child)
-            bpy.data.collections.remove(obj.users_collection[0])
-        if getattr(element, "FillsVoids", None):
-            self.remove_filling(element)
-        if element.is_a("IfcOpeningElement"):
-            if element.HasFillings:
-                for rel in element.HasFillings:
-                    self.remove_filling(rel.RelatedBuildingElement)
-            else:
-                if element.VoidsElements:
-                    self.delete_opening_element(element)
-        else:
-            if getattr(element, "HasOpenings", None):
-                for rel in element.HasOpenings:
-                    self.delete_opening_element(rel.RelatedOpeningElement)
-            for port in ifcopenshell.util.system.get_ports(element):
-                self.remove_port(port)
-
-    def delete_opening_element(self, element):
-        bpy.ops.bim.remove_opening(opening_id=element.id())
-
-    def remove_filling(self, element):
-        bpy.ops.bim.remove_filling(filling=element.id())
-
-    def remove_port(self, port):
-        blenderbim.core.system.remove_port(tool.Ifc, tool.System, port=port)
-
-
-class OverrideDelete(bpy.types.Operator, OverrideDeleteTrait):
-    bl_idname = "object.delete"
-    bl_label = "Delete"
+class OverrideDelete(bpy.types.Operator):
+    bl_idname = "bim.override_object_delete"
+    bl_label = "IFC Delete"
    bl_options = {"REGISTER", "UNDO"}
    use_global: bpy.props.BoolProperty(default=False)
    confirm: bpy.props.BoolProperty(default=True)
@@ -424,16 +389,18 @@ class OverrideDelete(bpy.types.Operator, OverrideDeleteTrait):

    def _execute(self, context):
        for obj in context.selected_objects:
-            self.delete_ifc_object(obj)
-            bpy.data.objects.remove(obj)
+            if tool.Ifc.get_entity(obj):
+                tool.Geometry.delete_ifc_object(obj)
+            else:
+                bpy.data.objects.remove(obj)
        # Required otherwise gizmos are still visible
        context.view_layer.objects.active = None
        return {"FINISHED"}


-class OverrideOutlinerDelete(bpy.types.Operator, OverrideDeleteTrait):
-    bl_idname = "outliner.delete"
-    bl_label = "Delete"
+class OverrideOutlinerDelete(bpy.types.Operator):
+    bl_idname = "bim.override_outliner_delete"
+    bl_label = "IFC Delete"
    bl_options = {"REGISTER", "UNDO"}
    hierarchy: bpy.props.BoolProperty(default=False)

@@ -482,8 +449,7 @@ class OverrideOutlinerDelete(bpy.types.Operator, OverrideDeleteTrait):
                objects_to_delete.add(bpy.data.objects.get(item.name))
        for obj in objects_to_delete:
            # This is the only difference
-            self.delete_ifc_object(obj)
-            bpy.data.objects.remove(obj)
+            tool.Geometry.delete_ifc_object(obj)
        return {"FINISHED"}

    def get_collection_objects_and_children(self, collection):
@@ -499,9 +465,82 @@ class OverrideOutlinerDelete(bpy.types.Operator, OverrideDeleteTrait):
        return {"objects": objects, "children": children}


+class OverrideDuplicateMoveMacro(bpy.types.Macro):
+    bl_idname = "bim.override_object_duplicate_move_macro"
+    bl_label = "IFC Duplicate Objects"
+    bl_options = {"REGISTER", "UNDO"}
+
+
 class OverrideDuplicateMove(bpy.types.Operator):
-    bl_idname = "object.duplicate_move"
-    bl_label = "Duplicate Objects"
+    bl_idname = "bim.override_object_duplicate_move"
+    bl_label = "IFC Duplicate Objects"
+    bl_options = {"REGISTER", "UNDO"}
+    is_interactive: bpy.props.BoolProperty(name="Is Interactive", default=True)
+
+    @classmethod
+    def poll(cls, context):
+        return len(context.selected_objects) > 0
+
+    def execute(self, context):
+        # Deep magick from the dawn of time
+        if IfcStore.get_file():
+            IfcStore.execute_ifc_operator(self, context)
+            if self.new_active_obj:
+                context.view_layer.objects.active = self.new_active_obj
+            return {"FINISHED"}
+
+        new_active_obj = None
+        for obj in context.selected_objects:
+            new_obj = obj.copy()
+            if obj.data:
+                new_obj.data = obj.data.copy()
+            if obj == context.active_object:
+                new_active_obj = new_obj
+            for collection in obj.users_collection:
+                collection.objects.link(new_obj)
+            obj.select_set(False)
+            new_obj.select_set(True)
+        if new_active_obj:
+            context.view_layer.objects.active = new_active_obj
+        return {"FINISHED"}
+
+    def _execute(self, context):
+        self.new_active_obj = None
+        # Track decompositions so they can be recreated after the operation
+        relationships = tool.Root.get_decomposition_relationships(context.selected_objects)
+        old_to_new = {}
+        for obj in context.selected_objects:
+            new_obj = obj.copy()
+            if obj.data:
+                new_obj.data = obj.data.copy()
+            if obj == context.active_object:
+                self.new_active_obj = new_obj
+            for collection in obj.users_collection:
+                collection.objects.link(new_obj)
+            obj.select_set(False)
+            new_obj.select_set(True)
+            # Copy the actual class
+            new = blenderbim.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=new_obj)
+            if new:
+                array_pset = ifcopenshell.util.element.get_pset(new, "BBIM_Array")
+                if array_pset:
+                    array_pset = tool.Ifc.get().by_id(array_pset["id"])
+                    ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), product=new, pset=array_pset)
+                old_to_new[tool.Ifc.get_entity(obj)] = [new]
+        # Recreate decompositions
+        tool.Root.recreate_decompositions(relationships, old_to_new)
+        blenderbim.bim.handler.purge_module_data()
+
+
+class OverrideDuplicateMoveLinkedMacro(bpy.types.Macro):
+    bl_idname = "bim.override_object_duplicate_move_linked_macro"
+    bl_label = "IFC Duplicate Linked"
+    bl_options = {"REGISTER", "UNDO"}
+
+
+class OverrideDuplicateMoveLinked(bpy.types.Operator):
+    bl_idname = "bim.override_object_duplicate_move_linked"
+    bl_label = "IFC Duplicate Linked"
    bl_options = {"REGISTER", "UNDO"}

    @classmethod
@@ -519,8 +558,6 @@ class OverrideDuplicateMove(bpy.types.Operator):
        new_active_obj = None
        for obj in context.selected_objects:
            new_obj = obj.copy()
-            if obj.data:
-                new_obj.data = obj.data.copy()
            if obj == context.active_object:
                new_active_obj = new_obj
            for collection in obj.users_collection:
@@ -529,7 +566,6 @@ class OverrideDuplicateMove(bpy.types.Operator):
            new_obj.select_set(True)
        if new_active_obj:
            context.view_layer.objects.active = new_active_obj
-        bpy.ops.transform.translate("INVOKE_DEFAULT")
        return {"FINISHED"}

    def _execute(self, context):
@@ -550,70 +586,117 @@ class OverrideDuplicateMove(bpy.types.Operator):
            # Copy the actual class
            new = blenderbim.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=new_obj)
            if new:
-                old_to_new[tool.Ifc.get_entity(obj)] = [new]
-        # Recreate decompositions
-        tool.Root.recreate_decompositions(relationships, old_to_new)
-        bpy.ops.transform.translate("INVOKE_DEFAULT")
-        blenderbim.bim.handler.purge_module_data()
-
-
-class OverrideDuplicateMoveLinked(bpy.types.Operator):
-    bl_idname = "object.duplicate_move_linked"
-    bl_label = "Duplicate Linked"
-
-    @classmethod
-    def poll(cls, context):
-        return len(context.selected_objects) > 0
-
-    def execute(self, context):
-        # Deep magick from the dawn of time
-        if IfcStore.get_file():
-            IfcStore.execute_ifc_operator(self, context)
-            if self.new_active_obj:
-                context.view_layer.objects.active = self.new_active_obj
-            return {"FINISHED"}
-
-        new_active_obj = None
-        for obj in context.selected_objects:
-            new_obj = obj.copy()
-            if obj == context.active_object:
-                new_active_obj = new_obj
-            for collection in obj.users_collection:
-                collection.objects.link(new_obj)
-            obj.select_set(False)
-            new_obj.select_set(True)
-        if new_active_obj:
-            context.view_layer.objects.active = new_active_obj
-        bpy.ops.transform.translate("INVOKE_DEFAULT")
-        return {"FINISHED"}
-
-    def _execute(self, context):
-        self.new_active_obj = None
-        # Track decompositions so they can be recreated after the operation
-        relationships = tool.Root.get_decomposition_relationships(context.selected_objects)
-        old_to_new = {}
-        for obj in context.selected_objects:
-            new_obj = obj.copy()
-            if obj == context.active_object:
-                self.new_active_obj = new_obj
-            for collection in obj.users_collection:
-                collection.objects.link(new_obj)
-            obj.select_set(False)
-            new_obj.select_set(True)
-            # Copy the actual class
-            new = blenderbim.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=new_obj)
-            if new:
+                array_pset = ifcopenshell.util.element.get_pset(new, "BBIM_Array")
+                if array_pset:
+                    array_pset = tool.Ifc.get().by_id(array_pset["id"])
+                    ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), product=new, pset=array_pset)
                old_to_new[tool.Ifc.get_entity(obj)] = new
        # Recreate decompositions
        tool.Root.recreate_decompositions(relationships, old_to_new)
-        bpy.ops.transform.translate("INVOKE_DEFAULT")
        blenderbim.bim.handler.purge_module_data()
        return {"FINISHED"}


+class OverrideJoin(bpy.types.Operator, Operator):
+    bl_idname = "bim.override_object_join"
+    bl_label = "IFC Join"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def invoke(self, context, event):
+        if not tool.Ifc.get():
+            return bpy.ops.object.join()
+        return self.execute(context)
+
+    def _execute(self, context):
+        if not tool.Ifc.get():
+            return bpy.ops.object.join()
+
+        if not context.active_object:
+            return
+
+        self.target = context.active_object
+        self.target_element = tool.Ifc.get_entity(self.target)
+        if self.target_element:
+            return self.join_ifc_obj()
+        return self.join_blender_obj()
+
+    def join_ifc_obj(self):
+        representation = tool.Ifc.get().by_id(self.target.data.BIMMeshProperties.ifc_definition_id)
+        if representation.RepresentationType in ("Tessellation", "Brep"):
+            for obj in bpy.context.selected_objects:
+                if obj == self.target:
+                    continue
+                element = tool.Ifc.get_entity(obj)
+                if element:
+                    ifcopenshell.api.run("root.remove_product", tool.Ifc.get(), product=element)
+            bpy.ops.object.join()
+            bpy.ops.bim.update_representation(obj=self.target.name, ifc_representation_class="")
+        elif representation.RepresentationType == "SweptSolid":
+            target_placement = np.array(self.target.matrix_world)
+            items = list(representation.Items)
+            for obj in bpy.context.selected_objects:
+                if obj == self.target:
+                    continue
+                element = tool.Ifc.get_entity(obj)
+
+                # Non IFC elements cannot be joined since we cannot guarantee SweptSolid compliance
+                if not element:
+                    obj.select_set(False)
+                    continue
+
+                # Only objects of the same representation type can be joined
+                obj_rep = tool.Ifc.get().by_id(obj.data.BIMMeshProperties.ifc_definition_id)
+                if obj_rep.RepresentationType != "SweptSolid":
+                    obj.select_set(False)
+                    continue
+
+                placement = np.array(obj.matrix_world)
+
+                for item in obj_rep.Items:
+                    copied_item = ifcopenshell.util.element.copy_deep(tool.Ifc.get(), item)
+                    for style in item.StyledByItem:
+                        copied_style = ifcopenshell.util.element.copy(tool.Ifc.get(), style)
+                        copied_style.Item = copied_item
+                    if copied_item.Position:
+                        position = ifcopenshell.util.placement.get_axis2placement(copied_item.Position)
+                    else:
+                        position = np.eye(4)
+                    position = placement @ position
+                    position = np.linalg.inv(target_placement) @ position
+                    copied_item.Position = tool.Ifc.get().createIfcAxis2Placement3D(
+                        tool.Ifc.get().createIfcCartesianPoint([float(n) for n in position[:, 3][:3]]),
+                        tool.Ifc.get().createIfcDirection([float(n) for n in position[:, 2][:3]]),
+                        tool.Ifc.get().createIfcDirection([float(n) for n in position[:, 0][:3]]),
+                    )
+                    items.append(copied_item)
+                ifcopenshell.api.run("root.remove_product", tool.Ifc.get(), product=element)
+            representation.Items = items
+            bpy.ops.object.join()
+            core.switch_representation(
+                tool.Ifc,
+                tool.Geometry,
+                obj=self.target,
+                representation=representation,
+                should_reload=True,
+                is_global=True,
+                should_sync_changes_first=False,
+                apply_openings=True,
+            )
+
+    def join_blender_obj(self):
+        for obj in bpy.context.selected_objects:
+            if obj == self.target:
+                continue
+            element = tool.Ifc.get_entity(obj)
+            if element:
+                ifcopenshell.api.run("root.remove_product", tool.Ifc.get(), product=element)
+        bpy.ops.object.join()
+
+
 class OverridePasteBuffer(bpy.types.Operator):
    bl_idname = "bim.override_paste_buffer"
-    bl_label = "Paste BIM Objects"
+    bl_label = "IFC Paste BIM Objects"
+    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
        bpy.ops.view3d.pastebuffer()
@@ -621,3 +704,161 @@ class OverridePasteBuffer(bpy.types.Operator):
            for obj in context.selected_objects:
                blenderbim.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=obj)
        return {"FINISHED"}
+
+
+class OverrideModeSetEdit(bpy.types.Operator):
+    bl_idname = "bim.override_mode_set_edit"
+    bl_label = "IFC Mode Set Edit"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        return IfcStore.execute_ifc_operator(self, context)
+
+    def _execute(self, context):
+        objs = context.selected_objects or ([context.active_object] if context.active_object else [])
+        active_obj = context.active_object
+
+        if context.active_object:
+            context.active_object.select_set(True)
+        for obj in objs:
+            if not obj:
+                continue
+
+            element = tool.Ifc.get_entity(obj)
+            if not element:
+                continue
+
+            # We are switching from OBJECT to EDIT mode.
+            usage_type = tool.Model.get_usage_type(element)
+            if usage_type:
+                # Parametric objects shall not be edited as meshes as they
+                # can be modified to be incompatible with the parametric
+                # constraints.
+                obj.select_set(False)
+                continue
+
+            representation = tool.Geometry.get_active_representation(obj)
+            if not representation:
+                continue
+
+            if tool.Geometry.is_meshlike(representation):
+                if getattr(element, "HasOpenings", None):
+                    # Mesh elements with openings must disable openings
+                    # so that you can edit the original topology.
+                    core.switch_representation(
+                        tool.Ifc,
+                        tool.Geometry,
+                        obj=obj,
+                        representation=representation,
+                        should_reload=True,
+                        is_global=True,
+                        should_sync_changes_first=False,
+                        apply_openings=False,
+                    )
+                obj.data.BIMMeshProperties.mesh_checksum = tool.Geometry.get_mesh_checksum(obj.data)
+            else:
+                obj.select_set(False)
+                continue
+
+        if not context.selected_objects or len(context.selected_objects) != len(objs):
+            # We are trying to edit at least one non-mesh-like object : Display a hint to the user
+            self.report({"INFO"}, "Only mesh-compatible representations may be edited in edit mode.")
+
+        if context.active_object not in context.selected_objects:
+            # The active object is non-mesh-like. Set a valid object (or None) as active
+            context.view_layer.objects.active = context.selected_objects[0] if context.selected_objects else None
+        if context.active_object:
+            bpy.ops.object.mode_set(mode="EDIT", toggle=True)
+        else:
+            # restore the selection if nothing worked
+            for obj in objs:
+                obj.select_set(True)
+            context.view_layer.objects.active = active_obj
+        return {"FINISHED"}
+
+    def invoke(self, context, event):
+        if not tool.Ifc.get():
+            return bpy.ops.object.mode_set(mode="EDIT", toggle=True)
+        return self.execute(context)
+
+
+class OverrideModeSetObject(bpy.types.Operator):
+    bl_idname = "bim.override_mode_set_object"
+    bl_label = "IFC Mode Set Object"
+    bl_options = {"REGISTER", "UNDO"}
+    should_save: bpy.props.BoolProperty(name="Should Save", default=True)
+
+    def execute(self, context):
+        return IfcStore.execute_ifc_operator(self, context)
+
+    def _execute(self, context):
+        for obj in self.edited_objs:
+            if self.should_save:
+                bpy.ops.bim.update_representation(obj=obj.name, ifc_representation_class="")
+                if getattr(tool.Ifc.get_entity(obj), "HasOpenings", False):
+                    self.reload_representation(obj)
+            else:
+                self.reload_representation(obj)
+
+        for obj in self.unchanged_objs_with_openings:
+            self.reload_representation(obj)
+        return {"FINISHED"}
+
+    def reload_representation(self, obj):
+        representation = tool.Ifc.get().by_id(obj.data.BIMMeshProperties.ifc_definition_id)
+        core.switch_representation(
+            tool.Ifc,
+            tool.Geometry,
+            obj=obj,
+            representation=representation,
+            should_reload=True,
+            is_global=True,
+            should_sync_changes_first=False,
+            apply_openings=True,
+        )
+
+    def draw(self, context):
+        if self.is_valid:
+            row = self.layout.row()
+            row.prop(self, "should_save")
+        else:
+            row = self.layout.row()
+            row.label(text="No Geometry Found: Object will revert to previous state.")
+
+    def invoke(self, context, event):
+        self.is_valid = True
+        self.should_save = True
+
+        bpy.ops.object.mode_set(mode="EDIT", toggle=True)
+
+        if not tool.Ifc.get():
+            return {"FINISHED"}
+
+        objs = context.selected_objects or [context.active_object]
+
+        self.edited_objs = []
+        self.unchanged_objs_with_openings = []
+
+        for obj in objs:
+            if not obj:
+                continue
+
+            element = tool.Ifc.get_entity(obj)
+            if not element:
+                continue
+
+            if obj.data.BIMMeshProperties.ifc_definition_id:
+                if not tool.Geometry.has_geometric_data(obj):
+                    self.is_valid = False
+                    self.should_save = False
+                representation = tool.Ifc.get().by_id(obj.data.BIMMeshProperties.ifc_definition_id)
+                if tool.Geometry.is_meshlike(
+                    representation
+                ) and obj.data.BIMMeshProperties.mesh_checksum != tool.Geometry.get_mesh_checksum(obj.data):
+                    self.edited_objs.append(obj)
+                elif getattr(element, "HasOpenings", None):
+                    self.unchanged_objs_with_openings.append(obj)
+
+        if self.edited_objs:
+            return context.window_manager.invoke_props_dialog(self)
+        return self.execute(context)
@@ -18,6 +18,7 @@

 import bpy
 from blenderbim.bim.prop import StrProperty, Attribute
+from blenderbim.bim.module.geometry.data import RepresentationsData
 from bpy.types import PropertyGroup
 from bpy.props import (
    PointerProperty,
@@ -31,6 +32,16 @@ from bpy.props import (
 )


+def get_contexts(self, context):
+    if not RepresentationsData.is_loaded:
+        RepresentationsData.load()
+    return RepresentationsData.data["contexts"]
+
+
+class BIMObjectGeometryProperties(PropertyGroup):
+    contexts: EnumProperty(items=get_contexts, name="Contexts")
+
+
 class BIMGeometryProperties(PropertyGroup):
    # Revit workaround
    should_use_presentation_style_assignment: BoolProperty(name="Force Presentation Style Assignment", default=False)
@@ -23,6 +23,12 @@ from blenderbim.bim.helper import prop_with_search
 from blenderbim.bim.module.geometry.data import RepresentationsData, ConnectionsData, DerivedPlacementsData


+def object_menu(self, context):
+    self.layout.operator("bim.override_object_duplicate_move", icon="PLUGIN")
+    self.layout.operator("bim.override_object_delete", icon="PLUGIN")
+    self.layout.operator("bim.override_paste_buffer", icon="PLUGIN")
+
+
 class BIM_PT_representations(Panel):
    bl_label = "IFC Representations"
    bl_idname = "BIM_PT_representations"
@@ -30,6 +36,7 @@ class BIM_PT_representations(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1
    bl_parent_id = "BIM_PT_geometry_object"

    @classmethod
@@ -51,7 +58,7 @@ class BIM_PT_representations(Panel):
            layout.label(text="No representations found")

        row = layout.row(align=True)
-        prop_with_search(row, context.scene.BIMRootProperties, "contexts", text="")
+        prop_with_search(row, context.active_object.BIMGeometryProperties, "contexts", text="")
        row.operator("bim.add_representation", icon="ADD", text="")

        for representation in RepresentationsData.data["representations"]:
@@ -60,7 +67,7 @@ class BIM_PT_representations(Panel):
            row.label(text=representation["ContextIdentifier"])
            row.label(text=representation["TargetView"])
            row.label(text=representation["RepresentationType"])
-            op = row.operator("bim.switch_representation", icon="OUTLINER_DATA_MESH", text="")
+            op = row.operator("bim.switch_representation", icon="FILE_REFRESH" if representation["is_active"] else "OUTLINER_DATA_MESH", text="")
            op.should_switch_all_meshes = True
            op.should_reload = True
            op.ifc_definition_id = representation["id"]
@@ -75,6 +82,7 @@ class BIM_PT_connections(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1
    bl_parent_id = "BIM_PT_geometry_object"

    @classmethod
@@ -179,6 +187,7 @@ class BIM_PT_derived_placements(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1
    bl_parent_id = "OBJECT_PT_transform"

    def draw(self, context):
@@ -49,7 +49,7 @@ class BIM_OT_cityjson2ifc(Operator):

 class BIM_OT_find_cityjson_lod(Operator):
    bl_idname = "bim.find_cityjson_lod"
-    bl_label = "Find LODs in CityJSON file"
+    bl_label = "Find LODs in CityJSON File"
    bl_context = "scene"

    def execute(self, context):
@@ -75,6 +75,7 @@ class BIM_PT_object_groups(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1
    bl_parent_id = "BIM_PT_utilities_object"

    @classmethod
@@ -0,0 +1,44 @@
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# 2023 Bruno Postle <bruno@postle.net>, Bruno Perdigão <brunoperdigao@tutanota.com>,
+# Massimo Fabbro <maxfb87@yahoo.it>
+
+import bpy
+from . import ui, prop, operator
+
+
+classes = (
+    operator.AddFileToRepo,
+    operator.CommitChanges,
+    operator.CreateRepo,
+    operator.DiscardUncommitted,
+    operator.DisplayRevision,
+    operator.DisplayUncommitted,
+    operator.Merge,
+    operator.RefreshGit,
+    operator.SwitchRevision,
+    prop.IfcGitListItem,
+    prop.IfcGitProperties,
+    ui.IFCGIT_PT_panel,
+    ui.COMMIT_UL_List,
+)
+
+
+def register():
+    bpy.types.Scene.IfcGitProperties = bpy.props.PointerProperty(type=prop.IfcGitProperties)
+
+
+def unregister():
+    del bpy.types.Scene.IfcGitProperties
@@ -0,0 +1,123 @@
+import bpy
+import os
+import shutil
+
+# import tool
+import blenderbim.tool as tool
+
+
+def refresh():
+    IfcGitData.is_loaded = False
+
+
+class IfcGitData:
+
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.data = {
+            "repo": cls.repo(),
+            "branch_names": cls.branch_names(),
+            "path_ifc": cls.path_ifc(),
+            "branches_by_hexsha": cls.branches_by_hexsha(),
+            "tags_by_hexsha": cls.tags_by_hexsha(),
+            "name_ifc": cls.name_ifc(),
+            "dir_name": cls.dir_name(),
+            "base_name": cls.base_name(),
+            "is_dirty": cls.is_dirty(),
+            "commit": cls.commit(),
+            "current_revision": cls.current_revision(),
+            "git_exe": cls.git_exe(),
+            "ifcmerge_exe": cls.ifcmerge_exe(),
+        }
+        cls.is_loaded = True
+
+    @classmethod
+    def repo(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return tool.IfcGit.repo_from_path(path_ifc)
+        return None
+
+    @classmethod
+    def branch_names(cls):
+        return []
+
+    @classmethod
+    def path_ifc(cls):
+        path_ifc = tool.Ifc.get_path()
+        if os.path.isfile(path_ifc):
+            return tool.Ifc.get_path()
+        return None
+
+    @classmethod
+    def branches_by_hexsha(cls):
+        try:
+            if tool.IfcGitRepo.repo.branches:
+                return tool.IfcGit.branches_by_hexsha(tool.IfcGitRepo.repo)
+        except:
+            return {}
+
+    @classmethod
+    def tags_by_hexsha(cls):
+        if tool.IfcGitRepo.repo:
+            return tool.IfcGit.tags_by_hexsha(tool.IfcGitRepo.repo)
+        return {}
+
+    @classmethod
+    def name_ifc(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if tool.IfcGitRepo.repo and os.path.isfile(path_ifc):
+                working_dir = tool.IfcGitRepo.repo.working_dir
+                return os.path.relpath(path_ifc, working_dir)
+        return None
+
+    @classmethod
+    def dir_name(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return os.path.dirname(path_ifc)
+        return None
+
+    @classmethod
+    def base_name(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return os.path.basename(path_ifc)
+        return None
+
+    @classmethod
+    def is_dirty(cls):
+        if cls.repo() and cls.git_exe():
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return cls.repo().is_dirty(path=path_ifc)
+        return False
+
+    @classmethod
+    def commit(cls):
+        props = bpy.context.scene.IfcGitProperties
+        if len(props.ifcgit_commits) > 0:
+            item = props.ifcgit_commits[props.commit_index]
+            if cls.repo():
+                return cls.repo().commit(rev=item.hexsha)
+
+    @classmethod
+    def current_revision(cls):
+        props = bpy.context.scene.IfcGitProperties
+        if len(props.ifcgit_commits) > 0:
+            return tool.IfcGitRepo.repo.commit()
+
+    @classmethod
+    def git_exe(cls):
+        return shutil.which("git")
+
+    @classmethod
+    def ifcmerge_exe(cls):
+        return shutil.which("ifcmerge")
@@ -0,0 +1,194 @@
+import os
+import re
+import bpy
+import blenderbim.core.ifcgit as core
+import blenderbim.tool as tool
+from blenderbim.bim.module.ifcgit.data import IfcGitData, refresh
+
+
+class CreateRepo(bpy.types.Operator):
+    """Initialise a Git repository"""
+
+    bl_label = "Create Git repository"
+    bl_idname = "ifcgit.createrepo"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        path_ifc = IfcGitData.data["path_ifc"]
+        if not os.path.isfile(path_ifc):
+            return False
+        if IfcGitData.data["repo"]:
+            # repo already exists
+            return False
+        if re.match("^/home/[^/]+/?$", os.path.dirname(path_ifc)):
+            # don't make ${HOME} a repo
+            return False
+        return True
+
+    def execute(self, context):
+
+        core.create_repo(tool.IfcGit, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class AddFileToRepo(bpy.types.Operator):
+    """Add a file to a repository"""
+
+    bl_label = "Add file to repository"
+    bl_idname = "ifcgit.addfile"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        path_ifc = IfcGitData.data["path_ifc"]
+        if not os.path.isfile(path_ifc):
+            return False
+        if not IfcGitData.data["repo"]:
+            # repo doesn't exist
+            return False
+        return True
+
+    def execute(self, context):
+
+        core.add_file(tool.IfcGit, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class DiscardUncommitted(bpy.types.Operator):
+    """Discard saved changes and update to HEAD"""
+
+    bl_label = "Discard uncommitted changes"
+    bl_idname = "ifcgit.discard"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        core.discard_uncomitted(tool.IfcGit, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class CommitChanges(bpy.types.Operator):
+    """Commit current saved changes"""
+
+    bl_label = "Commit changes"
+    bl_idname = "ifcgit.commit_changes"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        props = context.scene.IfcGitProperties
+        repo = IfcGitData.data["repo"]
+        if props.commit_message == "":
+            return False
+        if (
+            repo
+            and repo.head.is_detached
+            and (
+                not tool.is_valid_ref_format(props.new_branch_name)
+                or props.new_branch_name in [branch.name for branch in repo.branches]
+            )
+        ):
+            cls.poll_message_set(
+                "The new branch name is invalid, please insert a valid branch name (eg. with no spaces, ...)"
+            )
+            return False
+        return True
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.commit_changes(tool.IfcGit, tool.Ifc, repo, context)
+        bpy.ops.ifcgit.refresh()
+        refresh()
+        return {"FINISHED"}
+
+
+class RefreshGit(bpy.types.Operator):
+    """Refresh revision list"""
+
+    bl_label = ""
+    bl_idname = "ifcgit.refresh"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        repo = IfcGitData.data["repo"]
+        if repo != None and repo.heads:
+            return True
+        return False
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.refresh_revision_list(tool.IfcGit, repo, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class DisplayRevision(bpy.types.Operator):
+    """Colourise objects by selected revision"""
+
+    bl_label = ""
+    bl_idname = "ifcgit.display_revision"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        core.colourise_revision(tool.IfcGit, context)
+        refresh()
+        return {"FINISHED"}
+
+
+class DisplayUncommitted(bpy.types.Operator):
+    """Colourise uncommitted objects"""
+
+    bl_label = "Show uncommitted changes"
+    bl_idname = "ifcgit.display_uncommitted"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.colourise_uncommitted(tool.IfcGit, tool.Ifc, repo)
+        refresh()
+        return {"FINISHED"}
+
+
+class SwitchRevision(bpy.types.Operator):
+    """Switches the repository to the selected revision and reloads the IFC file"""
+
+    bl_label = ""
+    bl_idname = "ifcgit.switch_revision"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        core.switch_revision(tool.IfcGit, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class Merge(bpy.types.Operator):
+    """Merges the selected branch into working branch"""
+
+    bl_label = "Merge this branch"
+    bl_idname = "ifcgit.merge"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        if IfcGitData.data["ifcmerge_exe"]:
+            return True
+        return False
+
+    def execute(self, context):
+
+        if core.merge_branch(tool.IfcGit, tool.Ifc, self):
+            refresh()
+            return {"FINISHED"}
+        else:
+            return {"CANCELLED"}
@@ -0,0 +1,72 @@
+import bpy
+from bpy.types import PropertyGroup
+from bpy.props import (
+    StringProperty,
+    BoolProperty,
+    CollectionProperty,
+    IntProperty,
+    EnumProperty,
+)
+from blenderbim.bim.module.ifcgit.data import IfcGitData, refresh
+
+
+def git_branches(self, context):
+    """branches enum"""
+
+    # NOTE "Python must keep a reference to the strings returned by
+    # the callback or Blender will misbehave or even crash"
+    IfcGitData.data["branch_names"] = sorted([branch.name for branch in IfcGitData.data["repo"].heads])
+
+    if "main" in IfcGitData.data["branch_names"]:
+        IfcGitData.data["branch_names"].remove("main")
+        IfcGitData.data["branch_names"] = ["main"] + IfcGitData.data["branch_names"]
+
+    return [(myname, myname, myname) for myname in IfcGitData.data["branch_names"]]
+
+
+def update_revlist(self, context):
+    """wrapper to trigger update of the revision list"""
+
+    bpy.ops.ifcgit.refresh()
+    props = context.scene.IfcGitProperties
+    props.commit_index = 0
+
+
+class IfcGitListItem(PropertyGroup):
+    """Group of properties representing an item in the list."""
+
+    hexsha: StringProperty(
+        name="Git hash",
+        description="checksum for this commit",
+        default="Uncommitted data!",
+    )
+    relevant: BoolProperty(
+        name="Is relevant",
+        description="does this commit reference our ifc file",
+        default=False,
+    )
+
+
+class IfcGitProperties(PropertyGroup):
+
+    ifcgit_commits: CollectionProperty(type=IfcGitListItem, name="List of git items")
+    commit_index: IntProperty(name="Index for my_list", default=0)
+    commit_message: StringProperty(
+        name="Commit message",
+        description="A human readable description of these changes",
+        default="",
+    )
+    new_branch_name: StringProperty(
+        name="New branch name",
+        description="A short name used to refer to this branch",
+        default="",
+    )
+    display_branch: EnumProperty(items=git_branches, update=update_revlist)
+    ifcgit_filter: EnumProperty(
+        items=[
+            ("all", "All", "All revisions"),
+            ("tagged", "Tagged", "Tagged revisions"),
+            ("relevant", "Relevant", "Revisions for this project"),
+        ],
+        update=update_revlist,
+    )
@@ -0,0 +1,166 @@
+import bpy
+import time
+from blenderbim.bim.module.ifcgit.data import IfcGitData, refresh
+
+
+class IFCGIT_PT_panel(bpy.types.Panel):
+    """Scene Properties panel to interact with IFC repository data"""
+
+    bl_label = "IFC Git"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_project_info"
+
+    def draw(self, context):
+
+        if not IfcGitData.is_loaded:
+            IfcGitData.load()
+
+        layout = self.layout
+        path_ifc = IfcGitData.data["path_ifc"]
+
+        if not IfcGitData.data["git_exe"]:
+            row = layout.row()
+            row.label(text="Git is not installed", icon="ERROR")
+            return
+
+        props = context.scene.IfcGitProperties
+
+        # TODO if file isn't saved, offer to save to disk
+
+        row = layout.row()
+        if path_ifc:
+            if IfcGitData.data["repo"]:
+                name_ifc = IfcGitData.data["name_ifc"]
+                row.label(text=IfcGitData.data["repo"].working_dir, icon="SYSTEM")
+                if name_ifc in IfcGitData.data["repo"].untracked_files:
+                    row.operator(
+                        "ifcgit.addfile",
+                        text="Add '" + name_ifc + "' to repository",
+                        icon="FILE",
+                    )
+                else:
+                    row.label(text=name_ifc, icon="FILE")
+            else:
+                row.operator(
+                    "ifcgit.createrepo",
+                    text="Create '" + IfcGitData.data["dir_name"] + "' repository",
+                    icon="SYSTEM",
+                )
+                row.label(text=IfcGitData.data["base_name"], icon="FILE")
+                return
+        else:
+            row.label(text="No Git repository found", icon="SYSTEM")
+            row.label(text="No IFC project saved", icon="FILE")
+            return
+
+        is_dirty = IfcGitData.data["is_dirty"]
+
+        if is_dirty:
+            row = layout.row()
+            row.label(text="Saved changes have not been committed", icon="ERROR")
+
+            row = layout.row()
+            row.operator("ifcgit.display_uncommitted", icon="SELECT_DIFFERENCE")
+            row.operator("ifcgit.discard", icon="TRASH")
+
+            row = layout.row()
+            row.prop(props, "commit_message")
+
+            if IfcGitData.data["repo"].head.is_detached:
+                row = layout.row()
+                row.label(text="HEAD is detached, commit will create a branch", icon="ERROR")
+                row.prop(props, "new_branch_name")
+
+            row = layout.row()
+            row.operator("ifcgit.commit_changes", icon="GREASEPENCIL")
+
+        row = layout.row()
+        if IfcGitData.data["repo"].head.is_detached:
+            row.label(text="Working branch: Detached HEAD")
+        else:
+            row.label(text="Working branch: " + IfcGitData.data["repo"].active_branch.name)
+
+        grouped = layout.row()
+        column = grouped.column()
+        row = column.row()
+        row.prop(props, "display_branch", text="Browse branch")
+        row.prop(props, "ifcgit_filter", text="Filter revisions")
+
+        row = column.row()
+        row.template_list(
+            "COMMIT_UL_List",
+            "The_List",
+            props,
+            "ifcgit_commits",
+            props,
+            "commit_index",
+        )
+        column = grouped.column()
+        row = column.row()
+        row.operator("ifcgit.refresh", icon="FILE_REFRESH")
+
+        if not is_dirty:
+
+            row = column.row()
+            row.operator("ifcgit.display_revision", icon="SELECT_DIFFERENCE")
+
+            row = column.row()
+            row.operator("ifcgit.switch_revision", icon="CURRENT_FILE")
+
+            # TODO operator to tag selected
+
+            row = column.row()
+            row.operator("ifcgit.merge", icon="EXPERIMENTAL", text="")
+
+        if not props.ifcgit_commits:
+            return
+
+        item = props.ifcgit_commits[props.commit_index]
+        commit = IfcGitData.data["commit"]
+        if not item.relevant:
+            row = layout.row()
+            row.label(text="Revision unrelated to current IFC project", icon="ERROR")
+
+        box = layout.box()
+        column = box.column(align=True)
+        row = column.row()
+        row.label(text=commit.hexsha)
+        row = column.row()
+        row.label(text=commit.author.name + " <" + commit.author.email + ">")
+        row = column.row()
+        row.label(text=commit.message)
+
+
+class COMMIT_UL_List(bpy.types.UIList):
+    """List of Git commits"""
+
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+
+        props = context.scene.IfcGitProperties
+
+        current_revision = IfcGitData.data["current_revision"]
+
+        # TODO Figure how this "item" can be acesse in "data.py"
+        # so it's possible to move the ".commit"
+        commit = IfcGitData.data["repo"].commit(rev=item.hexsha)
+
+        lookup = IfcGitData.data["branches_by_hexsha"]
+        refs = ""
+        if item.hexsha in lookup:
+            for branch in lookup[item.hexsha]:
+                if branch.name == props.display_branch:
+                    refs = "[" + branch.name + "] "
+
+        lookup = IfcGitData.data["tags_by_hexsha"]
+        if item.hexsha in lookup:
+            for tag in lookup[item.hexsha]:
+                refs += "{" + tag.name + "} "
+
+        if commit == current_revision:
+            layout.label(text="[HEAD] " + refs + commit.message, icon="DECORATE_KEYFRAME")
+        else:
+            layout.label(text=refs + commit.message, icon="DECORATE_ANIMATE")
+        layout.label(text=time.strftime("%c", time.localtime(commit.committed_date)))
@@ -100,6 +100,7 @@ class BIM_PT_library_references(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_order = 1
    bl_parent_id = "BIM_PT_misc_object"

    @classmethod
@@ -24,6 +24,7 @@ import ifcopenshell.util.attribute
 import ifcopenshell.util.representation
 import blenderbim.bim.helper
 import blenderbim.tool as tool
+import blenderbim.core.style
 import blenderbim.core.material as core
 import blenderbim.bim.module.model.profile as model_profile
 from blenderbim.bim.module.material.prop import purge as material_prop_purge
@@ -515,7 +516,7 @@ class EditAssignedMaterial(bpy.types.Operator, tool.Ifc.Operator):

 class EnableEditingMaterialSetItemProfile(bpy.types.Operator):
    bl_idname = "bim.enable_editing_material_set_item_profile"
-    bl_label = "Enable Editing Material Set Item"
+    bl_label = "Enable Editing Material Set Item Profile"
    bl_options = {"REGISTER", "UNDO"}
    obj: bpy.props.StringProperty()
    material_set_item: bpy.props.IntProperty()
@@ -531,7 +532,7 @@ class EnableEditingMaterialSetItemProfile(bpy.types.Operator):

 class DisableEditingMaterialSetItemProfile(bpy.types.Operator):
    bl_idname = "bim.disable_editing_material_set_item_profile"
-    bl_label = "Disable Editing Material Set Item"
+    bl_label = "Disable Editing Material Set Item Profile"
    bl_options = {"REGISTER", "UNDO"}
    obj: bpy.props.StringProperty()

@@ -664,35 +665,27 @@ class CopyMaterial(bpy.types.Operator, tool.Ifc.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
-        self.file = IfcStore.get_file()
-        material = ifcopenshell.util.element.get_material(
-            self.file.by_id(context.active_object.BIMObjectProperties.ifc_definition_id)
-        )
-        for obj in tool.Blender.get_selected_objects():
-            if obj == context.active_object:
-                continue
-            if not obj.BIMObjectProperties.ifc_definition_id:
-                continue
-            ifcopenshell.api.run(
-                "material.copy_material",
-                self.file,
-                **{
-                    "material": material,
-                    "element": self.file.by_id(obj.BIMObjectProperties.ifc_definition_id),
-                },
-            )
-            self.set_default_material(obj, material)
+        blender_material = context.active_object.active_material
+        material = tool.Ifc.get_entity(blender_material)

-    def set_default_material(self, obj, material):
-        object_material_ids = [
-            om.BIMObjectProperties.ifc_definition_id
-            for om in obj.data.materials
-            if om is not None and om.BIMObjectProperties.ifc_definition_id
-        ]
+        if tool.Ifc.has_changed_shading(blender_material):
+            blenderbim.core.style.update_style_colours(tool.Ifc, tool.Style, obj=blender_material)

-        if material.id() in object_material_ids:
-            return
-        obj.data.materials.append(IfcStore.get_element(material.id()))
+        copied_material = ifcopenshell.api.run("material.copy_material", tool.Ifc.get(), material=material)
+        copied_blender_material = blender_material.copy()
+        copied_style = self.get_style(copied_material)
+        tool.Ifc.link(copied_material, copied_blender_material)
+        if copied_style:
+            tool.Ifc.link(copied_style, copied_blender_material)
+        context.active_object.active_material = copied_blender_material
+
+    def get_style(self, material):
+        for material_representation in material.HasRepresentation:
+            for representation in material_representation.Representations:
+                for item in representation.Items:
+                    for style in item.Styles:
+                        if style.is_a("IfcSurfaceStyle"):
+                            return style


 class ExpandMaterialCategory(bpy.types.Operator):
@@ -92,6 +92,7 @@ class BIM_PT_material(Panel):
        material_id = context.active_object.active_material.BIMObjectProperties.ifc_definition_id
        if bool(material_id):
            row.operator("bim.remove_material", icon="X", text="Remove IFC Material").material = material_id
+            row.operator("bim.copy_material", icon="DUPLICATE", text="")
            row.operator("bim.unlink_material", icon="UNLINKED", text="")
        else:
            op = row.operator("bim.add_material", icon="ADD", text="Create IFC Material")
@@ -158,8 +159,6 @@ class BIM_PT_object_material(Panel):
                op.material_set_usage = ObjectMaterialData.data["material_id"]
            row.operator("bim.disable_editing_assigned_material", icon="CANCEL", text="")
        else:
-            if ObjectMaterialData.data["material_class"] == "IfcMaterial":
-                row.operator("bim.copy_material", icon="COPYDOWN", text="")
            row.operator("bim.enable_editing_assigned_material", icon="GREASEPENCIL", text="")
            row.operator("bim.unassign_material", icon="X", text="")

@@ -197,7 +196,7 @@ class BIM_PT_object_material(Panel):
        else:
            row = self.layout.row(align=True)
            if ObjectMaterialData.data["set_item_name"] == "profile":
-                row.prop(self.mprops, "profiles", icon="ITALIC", text="")
+                prop_with_search(row, self.mprops, "profiles", icon="ITALIC", text="")
            prop_with_search(row, self.props, "material", icon="MATERIAL", text="")
            op = row.operator(f"bim.add_{ObjectMaterialData.data['set_item_name']}", icon="ADD", text="")
            setattr(op, f"{ObjectMaterialData.data['set_item_name']}_set", ObjectMaterialData.data["set"]["id"])
@@ -231,11 +230,11 @@ class BIM_PT_object_material(Panel):
        draw_attributes(self.props.material_set_item_attributes, box)

        row = box.row()
-        row.prop(self.props, "material_set_item_material", icon="MATERIAL", text="Material")
+        prop_with_search(row, self.props, "material_set_item_material", icon="MATERIAL", text="Material")

        if ObjectMaterialData.data["set_item_name"] == "profile":
            row = box.row()
-            row.prop(self.mprops, "profiles", icon="ITALIC", text="Profile")
+            prop_with_search(row, self.mprops, "profiles", icon="ITALIC", text="Profile")

    def draw_read_only_set_item_ui(self, set_item, index, is_first=False, is_last=False):
        if ObjectMaterialData.data["material_class"] == "IfcMaterialList":
@@ -25,7 +25,9 @@ from . import (
    array,
    product,
    wall,
+    roof,
    slab,
+    space,
    stair,
    window,
    opening,
@@ -34,6 +36,8 @@ from . import (
    profile,
    sverchok_modifier,
    door,
+    railing,
+    roof,
 )

 classes = (
@@ -43,13 +47,15 @@ classes = (
    array.EnableEditingArray,
    array.RemoveArray,
    array.SelectArrayParent,
+    array.Input3DCursorXArray,
+    array.Input3DCursorYArray,
+    array.Input3DCursorZArray,
    product.AddConstrTypeInstance,
    product.AddEmptyType,
    product.AlignProduct,
    product.ChangeTypePage,
-    product.DisplayConstrTypes,
    product.LoadTypeThumbnails,
-    product.ReinvokeOperator,
+    product.MirrorElements,
    workspace.Hotkey,
    wall.AlignWall,
    wall.ChangeExtrusionDepth,
@@ -74,9 +80,13 @@ classes = (
    opening.ShowOpenings,
    profile.ChangeCardinalPoint,
    profile.ChangeProfileDepth,
+    profile.DisableEditingExtrusionAxis,
+    profile.EditExtrusionAxis,
+    profile.EnableEditingExtrusionAxis,
    profile.ExtendProfile,
    profile.RecalculateProfile,
    profile.Rotate90,
+    roof.GenerateHippedRoof,
    slab.DisableEditingExtrusionProfile,
    slab.DisableEditingSketchExtrusionProfile,
    slab.EditExtrusionProfile,
@@ -85,24 +95,24 @@ classes = (
    slab.EnableEditingSketchExtrusionProfile,
    slab.ResetVertex,
    slab.SetArcIndex,
-    prop.ConstrTypeInfo,
-    prop.ConstrClassInfo,
-    prop.ConstrBrowserState,
+    space.GenerateSpace,
    prop.BIMModelProperties,
    prop.BIMArrayProperties,
    prop.BIMStairProperties,
    prop.BIMSverchokProperties,
    prop.BIMWindowProperties,
    prop.BIMDoorProperties,
+    prop.BIMRailingProperties,
+    prop.BIMRoofProperties,
    ui.BIM_PT_authoring,
    ui.BIM_PT_array,
    ui.BIM_PT_stair,
    ui.BIM_PT_sverchok,
    ui.BIM_PT_window,
    ui.BIM_PT_door,
-    ui.DisplayConstrTypesUI,
+    ui.BIM_PT_railing,
+    ui.BIM_PT_roof,
    ui.LaunchTypeManager,
-    ui.HelpConstrTypes,
    ui.BIM_MT_model,
    grid.BIM_OT_add_object,
    stair.BIM_OT_add_object,
@@ -134,6 +144,25 @@ classes = (
    door.FinishEditingDoor,
    door.EnableEditingDoor,
    door.RemoveDoor,
+    railing.BIM_OT_add_railing,
+    railing.AddRailing,
+    railing.CancelEditingRailing,
+    railing.FinishEditingRailing,
+    railing.EnableEditingRailing,
+    railing.CancelEditingRailingPath,
+    railing.FinishEditingRailingPath,
+    railing.EnableEditingRailingPath,
+    railing.RemoveRailing,
+    roof.BIM_OT_add_roof,
+    roof.AddRoof,
+    roof.CancelEditingRoof,
+    roof.FinishEditingRoof,
+    roof.EnableEditingRoof,
+    roof.CancelEditingRoofPath,
+    roof.FinishEditingRoofPath,
+    roof.EnableEditingRoofPath,
+    roof.RemoveRoof,
+    roof.SetGableRoofEdgeAngle,
 )

 addon_keymaps = []
@@ -148,10 +177,14 @@ def register():
    bpy.types.Object.BIMSverchokProperties = bpy.props.PointerProperty(type=prop.BIMSverchokProperties)
    bpy.types.Object.BIMWindowProperties = bpy.props.PointerProperty(type=prop.BIMWindowProperties)
    bpy.types.Object.BIMDoorProperties = bpy.props.PointerProperty(type=prop.BIMDoorProperties)
+    bpy.types.Object.BIMRailingProperties = bpy.props.PointerProperty(type=prop.BIMRailingProperties)
+    bpy.types.Object.BIMRoofProperties = bpy.props.PointerProperty(type=prop.BIMRoofProperties)
    bpy.types.VIEW3D_MT_mesh_add.append(grid.add_object_button)
    bpy.types.VIEW3D_MT_mesh_add.append(stair.add_object_button)
    bpy.types.VIEW3D_MT_mesh_add.append(window.add_object_button)
    bpy.types.VIEW3D_MT_mesh_add.append(door.add_object_button)
+    bpy.types.VIEW3D_MT_mesh_add.append(railing.add_object_button)
+    bpy.types.VIEW3D_MT_mesh_add.append(roof.add_object_button)
    bpy.types.VIEW3D_MT_add.append(ui.add_menu)
    bpy.app.handlers.load_post.append(handler.load_post)
    wm = bpy.context.window_manager
@@ -171,11 +204,15 @@ def unregister():
    del bpy.types.Object.BIMSverchokProperties
    del bpy.types.Object.BIMWindowProperties
    del bpy.types.Object.BIMDoorProperties
+    del bpy.types.Object.BIMRailingProperties
+    del bpy.types.Object.BIMRoofProperties
    bpy.app.handlers.load_post.remove(handler.load_post)
    bpy.types.VIEW3D_MT_mesh_add.remove(grid.add_object_button)
    bpy.types.VIEW3D_MT_mesh_add.remove(stair.add_object_button)
    bpy.types.VIEW3D_MT_mesh_add.remove(window.add_object_button)
    bpy.types.VIEW3D_MT_mesh_add.remove(door.add_object_button)
+    bpy.types.VIEW3D_MT_mesh_add.remove(railing.add_object_button)
+    bpy.types.VIEW3D_MT_mesh_add.remove(roof.add_object_button)
    bpy.types.VIEW3D_MT_add.remove(ui.add_menu)
    wm = bpy.context.window_manager
    kc = wm.keyconfigs.addon
@@ -22,22 +22,30 @@ import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.element
 import blenderbim.tool as tool
-from mathutils import Vector
+from mathutils import Vector, Matrix


 class AddArray(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.add_array"
    bl_label = "Add Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
        obj = context.active_object
        element = tool.Ifc.get_entity(obj)

-        array = {"children": [], "count": 1, "x": 0.0, "y": 0.0, "z": 0.0}
+        array = {
+            "children": [],
+            "count": 1,
+            "x": 0.0,
+            "y": 0.0,
+            "z": 0.0,
+            "use_local_space": True,
+            "sync_children": False,
+            "method": "OFFSET",
+        }

-        psets = ifcopenshell.util.element.get_psets(element)
-        pset = psets.get("BBIM_Array", None)
+        pset = ifcopenshell.util.element.get_pset(element, "BBIM_Array")

        if pset:
            data = json.loads(pset["Data"])
@@ -59,17 +67,39 @@ class AddArray(bpy.types.Operator, tool.Ifc.Operator):
 class DisableEditingArray(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.disable_editing_array"
    bl_label = "Disable Editing Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
-        props = context.active_object.BIMArrayProperties.is_editing = -1
+        context.active_object.BIMArrayProperties.is_editing = -1
+        return {"FINISHED"}
+
+
+class EnableEditingArray(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.enable_editing_array"
+    bl_label = "Enable Editing Array"
+    bl_options = {"REGISTER", "UNDO"}
+    item: bpy.props.IntProperty()
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Array", "Data"))[self.item]
+        props = obj.BIMArrayProperties
+        props.count = data["count"]
+        props.x = data["x"]
+        props.y = data["y"]
+        props.z = data["z"]
+        props.use_local_space = data.get("use_local_space", False)
+        props.sync_children = data.get("sync_children", False)
+        props.method = data.get("method", "OFFSET")
+        props.is_editing = self.item
        return {"FINISHED"}


 class EditArray(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.edit_array"
    bl_label = "Edit Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}
    item: bpy.props.IntProperty()

    def _execute(self, context):
@@ -77,8 +107,7 @@ class EditArray(bpy.types.Operator, tool.Ifc.Operator):
        element = tool.Ifc.get_entity(obj)
        props = obj.BIMArrayProperties

-        psets = ifcopenshell.util.element.get_psets(element)
-        pset = psets["BBIM_Array"]
+        pset = ifcopenshell.util.element.get_pset(element, "BBIM_Array")
        data = json.loads(pset["Data"])
        data[self.item] = {
            "children": data[self.item]["children"],
@@ -86,6 +115,9 @@ class EditArray(bpy.types.Operator, tool.Ifc.Operator):
            "x": props.x,
            "y": props.y,
            "z": props.z,
+            "use_local_space": props.use_local_space,
+            "sync_children": props.sync_children,
+            "method": props.method,
        }

        props.is_editing = -1
@@ -103,30 +135,10 @@ class EditArray(bpy.types.Operator, tool.Ifc.Operator):
        return {"FINISHED"}


-class EnableEditingArray(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.enable_editing_array"
-    bl_label = "Enable Editing Array"
-    bl_options = {"REGISTER"}
-    item: bpy.props.IntProperty()
-
-    def _execute(self, context):
-        obj = context.active_object
-        element = tool.Ifc.get_entity(obj)
-        psets = ifcopenshell.util.element.get_psets(element)
-        data = json.loads(psets["BBIM_Array"]["Data"])[self.item]
-        props = obj.BIMArrayProperties
-        props.count = data["count"]
-        props.x = data["x"]
-        props.y = data["y"]
-        props.z = data["z"]
-        props.is_editing = self.item
-        return {"FINISHED"}
-
-
 class RemoveArray(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.remove_array"
    bl_label = "Remove Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}
    item: bpy.props.IntProperty()

    def _execute(self, context):
@@ -134,8 +146,7 @@ class RemoveArray(bpy.types.Operator, tool.Ifc.Operator):
        element = tool.Ifc.get_entity(obj)
        props = obj.BIMArrayProperties

-        psets = ifcopenshell.util.element.get_psets(element)
-        pset = psets["BBIM_Array"]
+        pset = ifcopenshell.util.element.get_pset(element, "BBIM_Array")
        data = json.loads(pset["Data"])
        data[self.item]["count"] = 1

@@ -175,3 +186,48 @@ class SelectArrayParent(bpy.types.Operator):
            context.view_layer.objects.active = obj
            obj.select_set(True)
        return {"FINISHED"}
+
+class Input3DCursorXArray(bpy.types.Operator):
+    bl_idname = "bim.input_cursor_x_array"
+    bl_label = "Get 3d Cursor X Input for Array"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        obj = context.active_object
+        props = obj.BIMArrayProperties
+        cursor = context.scene.cursor
+        if props.use_local_space:
+            props.x = (Matrix.inverted(obj.matrix_world) @ cursor.matrix.col[3]).x
+        else:
+            props.x = cursor.location.x - obj.location.x
+        return {"FINISHED"}
+
+class Input3DCursorYArray(bpy.types.Operator):
+    bl_idname = "bim.input_cursor_y_array"
+    bl_label = "Get 3d Cursor Y Input for Array"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        obj = context.active_object
+        props = obj.BIMArrayProperties
+        cursor = context.scene.cursor
+        if props.use_local_space:
+            props.y = (Matrix.inverted(obj.matrix_world) @ cursor.matrix.col[3]).y
+        else:
+            props.y = cursor.location.y - obj.location.y
+        return {"FINISHED"}
+
+class Input3DCursorZArray(bpy.types.Operator):
+    bl_idname = "bim.input_cursor_z_array"
+    bl_label = "Get 3d Cursor Z Input for Array"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        obj = context.active_object
+        props = obj.BIMArrayProperties
+        cursor = context.scene.cursor
+        if props.use_local_space:
+            props.z = (Matrix.inverted(obj.matrix_world) @ cursor.matrix.col[3]).z
+        else:
+            props.z = cursor.location.z - obj.location.z
+        return {"FINISHED"}
@@ -24,8 +24,6 @@ import ifcopenshell
 import ifcopenshell.util.element
 from ifcopenshell.util.doc import get_entity_doc, get_predefined_type_doc
 import blenderbim.tool as tool
-from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.module.model.root import ConstrTypeEntityNotFound


 def refresh():
@@ -35,6 +33,8 @@ def refresh():
    SverchokData.is_loaded = False
    WindowData.is_loaded = False
    DoorData.is_loaded = False
+    RailingData.is_loaded = False
+    RoofData.is_loaded = False


 class AuthoringData:
@@ -47,9 +47,8 @@ class AuthoringData:
    def load(cls):
        cls.is_loaded = True
        cls.props = bpy.context.scene.BIMModelProperties
-        cls.load_ifc_classes()
-        cls.load_relating_types()
-        cls.load_relating_types_browser()
+        cls.data["ifc_classes"] = cls.ifc_classes()
+        cls.data["relating_type_id"] = cls.relating_type_id()
        cls.data["type_class"] = cls.type_class()
        cls.data["type_predefined_type"] = cls.type_predefined_type()
        cls.data["total_types"] = cls.total_types()
@@ -62,13 +61,21 @@ class AuthoringData:
        cls.data["has_visible_openings"] = cls.has_visible_openings()
        cls.data["active_class"] = cls.active_class()
        cls.data["active_material_usage"] = cls.active_material_usage()
+        cls.data["active_representation_type"] = cls.active_representation_type()

    @classmethod
    def type_class(cls):
        declaration = tool.Ifc.schema().declaration_by_name("IfcElementType")
        declarations = ifcopenshell.util.schema.get_subtypes(declaration)
        names = [d.name() for d in declarations]
-        names.extend(("IfcDoorStyle", "IfcWindowStyle"))
+
+        declaration = tool.Ifc.schema().declaration_by_name("IfcSpatialElementType")
+        declarations = ifcopenshell.util.schema.get_subtypes(declaration)
+        names.extend([d.name() for d in declarations])
+
+        if tool.Ifc.get_schema() in ("IFC2X3", "IFC4"):
+            names.extend(("IfcDoorStyle", "IfcWindowStyle"))
+
        version = tool.Ifc.get_schema()
        return [(c, c, get_entity_doc(version, c).get("description", "")) for c in sorted(names)]

@@ -90,23 +97,11 @@ class AuthoringData:

    @classmethod
    def type_thumbnail(cls):
-        if not cls.data["relating_types_ids"]:
+        if not cls.data["relating_type_id"]:
            return 0
        element = tool.Ifc.get().by_id(int(cls.props.relating_type_id))
        return cls.type_thumbnails.get(element.id(), None) or 0

-    @classmethod
-    def load_ifc_classes(cls):
-        cls.data["ifc_classes"] = cls.ifc_classes()
-
-    @classmethod
-    def load_relating_types(cls):
-        cls.data["relating_types_ids"] = cls.relating_types()
-
-    @classmethod
-    def load_relating_types_browser(cls):
-        cls.data["relating_types_ids_browser"] = cls.relating_types_browser()
-
    @classmethod
    def total_types(cls):
        type_class = cls.props.type_class
@@ -176,176 +171,47 @@ class AuthoringData:
    def active_material_usage(cls):
        element = tool.Ifc.get_entity(bpy.context.active_object)
        if element:
-            material = ifcopenshell.util.element.get_material(element, should_inherit=False)
-            if material:
-                if material.is_a("IfcMaterialLayerSetUsage"):
-                    return f"LAYER{material.LayerSetDirection[-1]}"
-                elif material.is_a("IfcMaterialProfileSetUsage"):
-                    return "PROFILE"
+            return tool.Model.get_usage_type(element)
+
+    @classmethod
+    def active_representation_type(cls):
+        if bpy.context.active_object:
+            representation = tool.Geometry.get_active_representation(bpy.context.active_object)
+            if representation:
+                return representation.RepresentationType

    @classmethod
    def ifc_classes(cls):
        results = []
        classes = {
-            e.is_a()
-            for e in tool.Ifc.get().by_type("IfcElementType")
-            + tool.Ifc.get().by_type("IfcDoorStyle")
-            + tool.Ifc.get().by_type("IfcWindowStyle")
-            + tool.Ifc.get().by_type("IfcSpaceType")
+            e.is_a() for e in (tool.Ifc.get().by_type("IfcElementType") + tool.Ifc.get().by_type("IfcSpaceType"))
        }
+
+        if tool.Ifc.get_schema() in ("IFC2X3", "IFC4"):
+            classes.update(
+                {e.is_a() for e in (tool.Ifc.get().by_type("IfcDoorStyle") + tool.Ifc.get().by_type("IfcWindowStyle"))}
+            )
        results.extend([(c, c, "") for c in sorted(classes)])
        return results

    @classmethod
-    def constr_class_entities(cls, ifc_class=None):
+    def relating_type_id(cls):
        ifc_classes = cls.data["ifc_classes"]
        if not ifc_classes:
            return []
        results = []
-        if ifc_class is None:
-            ifc_class = cls.props.ifc_class
+        ifc_class = cls.props.ifc_class
        if not ifc_class and ifc_classes:
            ifc_class = ifc_classes[0][0]
        if ifc_class:
            elements = sorted(tool.Ifc.get().by_type(ifc_class), key=lambda s: s.Name or "Unnamed")
            results.extend(elements)
-            return results
+            return [
+                (str(e.id()), e.Name or "Unnamed", e.Description or "")
+                for e in results
+            ]
        return []

-    @classmethod
-    def relating_types(cls, ifc_class=None):
-        return [
-            (str(e.id()), e.Name or "Unnamed", e.Description or "")
-            for e in cls.constr_class_entities(ifc_class=ifc_class)
-        ]
-
-    @classmethod
-    def relating_types_browser(cls):
-        if cls.data["ifc_classes"]:
-            return cls.relating_types(ifc_class=cls.props.ifc_class_browser)
-
-    @classmethod
-    def new_constr_class_info(cls, ifc_class):
-        if ifc_class not in cls.props.constr_classes:
-            cls.props.constr_classes.add().name = ifc_class
-        return cls.props.constr_classes[ifc_class]
-
-    @classmethod
-    def assetize_constr_class(cls, ifc_class=None):
-        selected_ifc_class = cls.props.ifc_class
-        selected_relating_type_id = cls.props.relating_type_id
-        if ifc_class is None:
-            ifc_class = cls.props.ifc_class_browser
-        if cls.constr_class_info(ifc_class) is None:
-            cls.new_constr_class_info(ifc_class)
-        constr_class_occurrences = cls.constr_class_entities(ifc_class)
-        constr_classes = cls.props.constr_classes
-
-        for constr_class_entity in constr_class_occurrences:
-            if (
-                ifc_class not in constr_classes
-                or constr_class_entity.Name not in constr_classes[ifc_class].constr_types
-            ):
-                obj = tool.Ifc.get_object(constr_class_entity)
-                cls.assetize_object(obj, ifc_class, constr_class_entity)
-        cls.constr_class_info(ifc_class).fully_loaded = True
-        cls.props.updating = True
-        cls.props.ifc_class = selected_ifc_class
-        cls.props.relating_type_id = selected_relating_type_id
-        cls.props.updating = False
-
-    @classmethod
-    def assetize_object(cls, obj, ifc_class, ifc_class_entity, from_selection=False):
-        relating_type_id = ifc_class_entity.id()
-        to_be_deleted = False
-        if obj.type == "EMPTY":
-            kwargs = {}
-            if not from_selection:
-                kwargs.update({"ifc_class": ifc_class, "relating_type_id": relating_type_id})
-            new_obj = cls.new_relating_type(**kwargs)
-            if new_obj is not None:
-                to_be_deleted = True
-                obj = new_obj
-                obj.hide_set(True)
-        obj.asset_mark()
-        obj.asset_generate_preview()
-        blender33_or_above = bpy.app.version >= (3, 3, 0)
-        interval = 1e-4
-
-        def wait_for_asset_previews_generation(check_interval_seconds=interval):
-            if blender33_or_above and bpy.app.is_job_running("RENDER_PREVIEW"):
-                return check_interval_seconds
-            else:
-                if ifc_class not in cls.props.constr_classes:
-                    cls.props.constr_classes.add().name = ifc_class
-                constr_class_info = cls.props.constr_classes[ifc_class]
-                # relating_type = cls.relating_type_name_by_id(ifc_class, relating_type_id)
-                if str(relating_type_id) not in constr_class_info.constr_types:
-                    constr_class_info.constr_types.add().name = str(relating_type_id)
-                relating_type_info = constr_class_info.constr_types[str(relating_type_id)]
-                relating_type_info.object = obj
-                relating_type_info.icon_id = obj.preview.icon_id
-
-                if to_be_deleted:
-                    element = tool.Ifc.get_entity(obj)
-                    if element:
-                        tool.Ifc.delete(element)
-                    tool.Ifc.unlink(obj=obj)
-                    for collection in obj.users_collection:
-                        collection.objects.unlink(obj)
-                return None
-
-        first_interval = 0 if blender33_or_above else interval
-        bpy.app.timers.register(wait_for_asset_previews_generation, first_interval=first_interval)
-
-    @classmethod
-    def assetize_relating_type_from_selection(cls, browser=False):
-        ifc_class = cls.props.ifc_class_browser if browser else cls.props.ifc_class
-        relating_type_id = cls.props.relating_type_id_browser if browser else cls.props.relating_type_id
-        constr_class_occurrences = cls.constr_class_entities(ifc_class=ifc_class)
-        constr_class_occurrences = [
-            entity for entity in constr_class_occurrences if entity.id() == int(relating_type_id)
-        ]
-        if len(constr_class_occurrences) == 0:
-            raise ConstrTypeEntityNotFound()
-        constr_class_entity = constr_class_occurrences[0]
-        if (obj := tool.Ifc.get_object(constr_class_entity)) is None:
-            raise ConstrTypeEntityNotFound()
-        cls.assetize_object(obj, ifc_class, constr_class_entity, from_selection=True)
-
-    @staticmethod
-    def constr_class_info(ifc_class):
-        props = bpy.context.scene.BIMModelProperties
-        return props.constr_classes[ifc_class] if ifc_class in props.constr_classes else None
-
-    @classmethod
-    def new_relating_type(cls, ifc_class=None, relating_type_id=None):
-        if ifc_class is None:
-            bpy.ops.bim.add_constr_type_instance(
-                ifc_class=cls.props.ifc_class, relating_type_id=int(cls.props.relating_type_id), link_to_scene=True
-            )
-        else:
-            cls.props.updating = True
-            cls.props.ifc_class = ifc_class
-            cls.props.relating_type_id = str(relating_type_id)
-            cls.props.updating = False
-            bpy.ops.bim.add_constr_type_instance(link_to_scene=True)
-        return bpy.context.selected_objects[-1]
-
-    @staticmethod
-    def relating_type_name_by_id(ifc_class, relating_type_id):
-        file = IfcStore.get_file()
-        try:
-            constr_class_entity = file.by_id(int(relating_type_id))
-        except (RuntimeError, ValueError):
-            return None
-        return constr_class_entity.Name if constr_class_entity.is_a() == ifc_class else None
-
-    @classmethod
-    def relating_type_id_by_name(cls, ifc_class, relating_type):
-        relating_types = [ct[0] for ct in cls.relating_types(ifc_class=ifc_class) if ct[1] == relating_type]
-        return None if len(relating_types) == 0 else relating_types[0]
-

 class ArrayData:
    data = {}
@@ -460,3 +326,43 @@ class DoorData:
            if parameters:
                parameters["data_dict"] = json.loads(parameters.get("Data", "[]") or "[]")
                return parameters
+
+
+class RailingData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.data = {"parameters": cls.parameters()}
+
+    @classmethod
+    def parameters(cls):
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        if element:
+            psets = ifcopenshell.util.element.get_psets(element)
+            parameters = psets.get("BBIM_Railing", None)
+            if parameters:
+                parameters["data_dict"] = json.loads(parameters.get("Data", "[]") or "[]")
+                return parameters
+
+
+class RoofData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.data = {"parameters": cls.parameters()}
+
+    @classmethod
+    def parameters(cls):
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        if element:
+            psets = ifcopenshell.util.element.get_psets(element)
+            parameters = psets.get("BBIM_Roof", None)
+            if parameters:
+                parameters["data_dict"] = json.loads(parameters.get("Data", "[]") or "[]")
+                return parameters
@@ -0,0 +1,303 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import gpu
+import bmesh
+import blenderbim.tool as tool
+from math import sin, cos, radians
+from bpy.types import SpaceView3D
+from mathutils import Vector, Matrix
+from gpu_extras.batch import batch_for_shader
+
+
+ERROR_ELEMENTS_COLOR = (1, 0.2, 0.322, 1)  # RED
+UNSPECIAL_ELEMENT_COLOR = (0.2, 0.2, 0.2, 1)  # GREY
+
+
+def transparent_color(color, alpha=0.1):
+    color = [i for i in color]
+    color[3] = alpha
+    return color
+
+
+def bm_check_vertex_in_groups(vertex, deform_layer, groups):
+    """returns tuple boolean (whether vertex is in any of the groups)
+    and related group index"""
+    for group_index in vertex[deform_layer].keys():
+        if group_index in groups:
+            return True, group_index
+    return False, None
+
+
+class ProfileDecorator:
+    installed = None
+
+    @classmethod
+    def install(cls, context, get_custom_bmesh=None, draw_faces=False, exit_edit_mode_callback=None):
+        """Note that operators that change mesh in `exit_edit_mode_callback` can freeze blender.
+        The workaround is to move their code to function and use it for callback.
+
+        Example: https://devtalk.blender.org/t/calling-operator-that-saves-bmesh-freezes-blender-forever/28595"""
+        if cls.installed:
+            cls.uninstall()
+        handler = cls()
+        cls.installed = SpaceView3D.draw_handler_add(
+            handler, (context, get_custom_bmesh, draw_faces, exit_edit_mode_callback), "WINDOW", "POST_VIEW"
+        )
+
+    @classmethod
+    def uninstall(cls):
+        try:
+            SpaceView3D.draw_handler_remove(cls.installed, "WINDOW")
+        except ValueError:
+            pass
+        cls.installed = None
+
+    def draw_batch(self, shader_type, content_pos, color, indices=None):
+        shader = self.line_shader if shader_type == "LINES" else self.shader
+        batch = batch_for_shader(shader, shader_type, {"pos": content_pos}, indices=indices)
+        shader.uniform_float("color", color)
+        batch.draw(shader)
+
+    def draw_faces(self, bm, vertices_coords):
+        """mutates original bm (triangulates it)
+        so the triangulation edges will be shown too
+        """
+        traingulated_bm = bm
+        bmesh.ops.triangulate(traingulated_bm, faces=traingulated_bm.faces)
+
+        face_indices = [[v.index for v in f.verts] for f in traingulated_bm.faces]
+        faces_color = transparent_color(self.model_props.decorator_color_special)
+        self.draw_batch("TRIS", vertices_coords, faces_color, face_indices)
+
+    def __call__(self, context, get_custom_bmesh=None, draw_faces=False, exit_edit_mode_callback=None):
+        self.model_props = context.scene.BIMModelProperties
+        selected_elements_color = self.model_props.decorator_color_selected
+        unselected_elements_color = self.model_props.decorator_color_unselected
+        special_elements_color = self.model_props.decorator_color_special
+
+        obj = context.active_object
+
+        if obj.mode != "EDIT":
+            if exit_edit_mode_callback:
+                ProfileDecorator.uninstall()
+                exit_edit_mode_callback()
+            return
+
+        if get_custom_bmesh:
+            bm = get_custom_bmesh()
+        else:
+            bm = bmesh.from_edit_mesh(obj.data)
+
+        gpu.state.point_size_set(6)
+        gpu.state.blend_set("ALPHA")
+
+        ### Actually drawing
+        all_vertices = []
+        error_vertices = []
+        selected_vertices = []
+        unselected_vertices = []
+        # special = associated with arcs/circles
+        special_vertices = []
+        special_vertex_indices = {}
+        selected_edges = []
+        unselected_edges = []
+        arc_edges = []
+        roof_angle_edges = []
+        preview_edges = []
+
+        arc_groups = []
+        circle_groups = []
+        for i, group in enumerate(obj.vertex_groups):
+            if "IFCARCINDEX" in group.name:
+                arc_groups.append(i)
+            elif "IFCCIRCLE" in group.name:
+                circle_groups.append(i)
+
+        arcs = {}
+        circles = {}
+
+        # https://docs.blender.org/api/blender_python_api_2_63_8/bmesh.html#CustomDataAccess
+        # This is how we access vertex groups via bmesh, apparently, it's not very intuitive
+        deform_layer = bm.verts.layers.deform.active
+        angle_layer = bm.edges.layers.float.get("BBIM_gable_roof_angles")
+        preview_layer = bm.edges.layers.int.get("BBIM_preview")
+
+        for vertex in bm.verts:
+            co = tuple(obj.matrix_world @ vertex.co)
+            all_vertices.append(co)
+            if vertex.hide:
+                continue
+
+            is_arc, is_circle = False, False
+            # deform_layer is None if there are no verts assigned to vertex groups
+            # even if there are vertex groups in the obj.vertex_groups
+            if deform_layer:
+                is_arc, group_index = bm_check_vertex_in_groups(vertex, deform_layer, arc_groups)
+                if is_arc:
+                    arcs.setdefault(group_index, []).append(vertex)
+                    special_vertex_indices[vertex.index] = group_index
+
+                is_circle, group_index = bm_check_vertex_in_groups(vertex, deform_layer, circle_groups)
+                if is_circle:
+                    circles.setdefault(group_index, []).append(vertex)
+                    special_vertex_indices[vertex.index] = group_index
+
+            if vertex.select:
+                selected_vertices.append(co)
+            else:
+                if len(vertex.link_edges) > 1 and is_circle:
+                    error_vertices.append(co)
+                elif is_circle:
+                    special_vertices.append(co)
+                elif len(vertex.link_edges) != 2:
+                    error_vertices.append(co)
+                elif is_arc:
+                    special_vertices.append(co)
+                else:
+                    unselected_vertices.append(co)
+
+        for edge in bm.edges:
+            edge_indices = [v.index for v in edge.verts]
+            if edge.hide:
+                continue
+            if edge.select:
+                selected_edges.append(edge_indices)
+            else:
+                i1, i2 = edge.verts[0].index, edge.verts[1].index
+                # making sure that both vertices are in the same group
+                if i1 in special_vertex_indices and special_vertex_indices[i1] == special_vertex_indices.get(i2, None):
+                    arc_edges.append(edge_indices)
+                elif angle_layer and edge[angle_layer] > 0:
+                    roof_angle_edges.append(edge_indices)
+                elif preview_layer and edge[preview_layer] == 1:
+                    preview_edges.append(edge_indices)
+                else:
+                    unselected_edges.append(edge_indices)
+
+        ### Actually drawing
+        # 3D_POLYLINE_UNIFORM_COLOR is good for smoothed lines since `bgl.enable(GL_LINE_SMOOTH)` is deprecated
+        self.line_shader = gpu.shader.from_builtin("3D_POLYLINE_UNIFORM_COLOR")
+        self.line_shader.bind()
+        # POLYLINE_UNIFORM_COLOR specific uniforms
+        self.line_shader.uniform_float("viewportSize", (context.region.width, context.region.height))
+        self.line_shader.uniform_float("lineWidth", 2.0)
+
+        # general shader
+        self.shader = gpu.shader.from_builtin("3D_UNIFORM_COLOR")
+        self.shader.bind()
+
+        # Draw faces
+        if draw_faces:
+            self.draw_faces(bm, all_vertices)
+
+        self.draw_batch("LINES", all_vertices, transparent_color(unselected_elements_color), unselected_edges)
+        self.draw_batch("LINES", all_vertices, selected_elements_color, selected_edges)
+        self.draw_batch("LINES", all_vertices, UNSPECIAL_ELEMENT_COLOR, arc_edges)
+        self.draw_batch("LINES", all_vertices, special_elements_color, preview_edges)
+        self.draw_batch("LINES", all_vertices, special_elements_color, roof_angle_edges)
+
+        self.draw_batch("POINTS", unselected_vertices, transparent_color(unselected_elements_color, 0.5))
+        self.draw_batch("POINTS", error_vertices, ERROR_ELEMENTS_COLOR)
+        self.draw_batch("POINTS", special_vertices, self.model_props.decorator_color_special)
+        self.draw_batch("POINTS", selected_vertices, self.model_props.decorator_color_selected)
+
+        # Draw arcs
+        arc_centroids = []
+        arc_segments = []
+        for arc in arcs.values():
+            if len(arc) != 3:
+                continue
+            sorted_arc = [None, None, None]
+            for v1 in arc:
+                connections = 0
+                for link_edge in v1.link_edges:
+                    v2 = link_edge.other_vert(v1)
+                    if v2 in arc:
+                        connections += 1
+                if connections == 2:  # Midpoint
+                    sorted_arc[1] = v1
+                else:
+                    sorted_arc[2 if sorted_arc[2] is None else 0] = v1
+            points = [tuple(obj.matrix_world @ v.co) for v in sorted_arc]
+            centroid = tool.Cad.get_center_of_arc(points)
+            if centroid:
+                arc_centroids.append(tuple(centroid))
+            arc_segments.append(tool.Cad.create_arc_segments(pts=points, num_verts=17, make_edges=True))
+
+        self.draw_batch("POINTS", arc_centroids, UNSPECIAL_ELEMENT_COLOR)
+        for verts, edges in arc_segments:
+            self.draw_batch("LINES", verts, special_elements_color, edges)
+
+        # Draw circles
+        circle_centroids = []
+        circle_segments = []
+        for circle in circles.values():
+            if len(circle) != 2:
+                continue
+            p1 = obj.matrix_world @ circle[0].co
+            p2 = obj.matrix_world @ circle[1].co
+            radius = (p2 - p1).length / 2
+            centroid = p1.lerp(p2, 0.5)
+            circle_centroids.append(tuple(centroid))
+            segments = self.create_circle_segments(360, 20, radius)
+            matrix = obj.matrix_world.copy()
+            matrix.col[3] = centroid.to_4d()
+            segments = [[list(matrix @ Vector(v)) for v in segments[0]], segments[1]]
+            circle_segments.append(segments)
+
+        self.draw_batch("POINTS", circle_centroids, UNSPECIAL_ELEMENT_COLOR)
+        for verts, edges in circle_segments:
+            self.draw_batch("LINES", verts, special_elements_color, edges)
+
+    def create_matrix(self, p, x, y, z):
+        return Matrix([x, y, z, p]).to_4x4().transposed()
+
+    # https://github.com/nortikin/sverchok/blob/master/nodes/generator/basic_3pt_arc.py
+    # This function is taken from Sverchok, licensed under GPL v2-or-later.
+    # This is a combination of the make_verts and make_edges function.
+    def create_circle_segments(self, Angle, Vertices, Radius):
+        if Angle < 360:
+            theta = Angle / (Vertices - 1)
+        else:
+            theta = Angle / Vertices
+        listVertX = []
+        listVertY = []
+        for i in range(Vertices):
+            listVertX.append(Radius * cos(radians(theta * i)))
+            listVertY.append(Radius * sin(radians(theta * i)))
+
+        if Angle < 360 and self.mode_ == 0:
+            sigma = radians(Angle)
+            listVertX[-1] = Radius * cos(sigma)
+            listVertY[-1] = Radius * sin(sigma)
+        elif Angle < 360 and self.mode_ == 1:
+            listVertX.append(0.0)
+            listVertY.append(0.0)
+
+        points = list((x, y, 0) for x, y in zip(listVertX, listVertY))
+
+        listEdg = [(i, i + 1) for i in range(Vertices - 1)]
+
+        if Angle < 360 and self.mode_ == 1:
+            listEdg.append((0, Vertices))
+            listEdg.append((Vertices - 1, Vertices))
+        else:
+            listEdg.append((Vertices - 1, 0))
+
+        return points, listEdg
@@ -43,6 +43,7 @@ def update_door_modifier_representation(context):
    props = obj.BIMDoorProperties
    element = tool.Ifc.get_entity(obj)
    ifc_file = tool.Ifc.get()
+    sliding_door = "SLIDING" in props.door_type

    representation_data = {
        "operation_type": props.door_type,
@@ -87,13 +88,37 @@ def update_door_modifier_representation(context):
    model_representation = ifcopenshell.api.run("geometry.add_door_representation", ifc_file, **representation_data)
    tool.Model.replace_object_ifc_representation(body, obj, model_representation)

-    # PLAN_VIEW representation
-    plan = ifcopenshell.util.representation.get_context(ifc_file, "Plan", "Body", "PLAN_VIEW")
-    if plan:
-        representation_data["context"] = plan
+    # Body/PLAN_VIEW representation
+    plan_body = ifcopenshell.util.representation.get_context(ifc_file, "Plan", "Body", "PLAN_VIEW")
+    if plan_body:
+        representation_data["context"] = plan_body
        plan_representation = ifcopenshell.api.run("geometry.add_door_representation", ifc_file, **representation_data)
-        tool.Model.replace_object_ifc_representation(plan, obj, plan_representation)
+        tool.Model.replace_object_ifc_representation(plan_body, obj, plan_representation)

+    # Annotation/PLAN_VIEW representation
+    plan_annotation = ifcopenshell.util.representation.get_context(ifc_file, "Plan", "Annotation", "PLAN_VIEW")
+    if plan_annotation:
+        if not sliding_door:
+            # only sliding doors have Annotation/PLAN_VIEW
+            # for other types we just check for old representation and remove it if it's there
+            old_representation = ifcopenshell.util.representation.get_representation(
+                element, "Plan", "Annotation", "PLAN_VIEW"
+            )
+            if old_representation:
+                core.remove_representation(
+                    tool.Ifc,
+                    tool.Geometry,
+                    obj=obj,
+                    representation=old_representation,
+                )
+        else:
+            representation_data["context"] = plan_annotation
+            plan_representation = ifcopenshell.api.run(
+                "geometry.add_door_representation", ifc_file, **representation_data
+            )
+            tool.Model.replace_object_ifc_representation(plan_annotation, obj, plan_representation)
+
+    if plan_body or plan_annotation:
        # adding switch representation at the end instead of changing order of representations
        # to prevent #2744
        core.switch_representation(
@@ -105,7 +130,7 @@ def update_door_modifier_representation(context):
            is_global=True,
            should_sync_changes_first=True,
        )
-        
+
    # type attributes
    element.OperationType = props.door_type

@@ -118,6 +143,7 @@ def update_door_modifier_representation(context):
    update_simple_openings(element, props.overall_width, props.overall_height)


+# TODO: move it out to tools
 def bm_sort_out_geom(geom_data):
    geom_dict = {"verts": [], "edges": [], "faces": []}

@@ -262,13 +288,17 @@ def update_door_modifier_bmesh(context):
    door_type = props.door_type
    double_swing_door = "DOUBLE_SWING" in door_type
    double_door = "DOUBLE_DOOR" in door_type
+    sliding_door = "SLIDING" in door_type

    # lining params
    lining_depth = props.lining_depth * si_conversion
    lining_thickness_default = props.lining_thickness * si_conversion
    lining_offset = props.lining_offset * si_conversion
-    lining_to_panel_offset_x = props.lining_to_panel_offset_x * si_conversion
-    lining_to_panel_offset_y = props.lining_to_panel_offset_y * si_conversion
+    lining_to_panel_offset_x = (
+        props.lining_to_panel_offset_x * si_conversion if not sliding_door else lining_thickness_default
+    )
+    panel_depth = props.panel_depth * si_conversion
+    lining_to_panel_offset_y = props.lining_to_panel_offset_y * si_conversion if not sliding_door else -panel_depth

    transom_thickness = props.transom_thickness * si_conversion / 2
    transfom_offset = props.transom_offset * si_conversion
@@ -277,10 +307,10 @@ def update_door_modifier_bmesh(context):
    window_lining_height = overall_height - transfom_offset - transom_thickness

    side_lining_thickness = lining_thickness_default
-    panel_lining_overlap_x = max(lining_thickness_default - lining_to_panel_offset_x, 0)
+    panel_lining_overlap_x = max(lining_thickness_default - lining_to_panel_offset_x, 0) if not sliding_door else 0

    top_lining_thickness = transom_thickness or lining_thickness_default
-    panel_top_lining_overlap_x = max(top_lining_thickness - lining_to_panel_offset_x, 0)
+    panel_top_lining_overlap_x = max(top_lining_thickness - lining_to_panel_offset_x, 0) if not sliding_door else 0
    door_opening_width = overall_width - lining_to_panel_offset_x * 2
    if double_swing_door:
        side_lining_thickness = side_lining_thickness - panel_lining_overlap_x
@@ -295,7 +325,6 @@ def update_door_modifier_bmesh(context):
    casing_depth = props.casing_depth * si_conversion

    # panel params
-    panel_depth = props.panel_depth * si_conversion
    panel_width = door_opening_width * props.panel_width_ratio
    frame_depth = props.frame_depth * si_conversion
    frame_thickness = props.frame_thickness * si_conversion
@@ -388,7 +417,7 @@ def update_door_modifier_bmesh(context):
    panel_position = V(lining_to_panel_offset_x, lining_to_panel_offset_y, threshold_thickness)

    if double_door:
-        # TODO: keep a little space between doors for readibility?
+        # keeping a little space between doors for readibility
        double_door_offset = 0.001 * si_conversion
        panel_size.x = panel_size.x / 2 - double_door_offset
        door_verts.extend(create_bm_door_panel(panel_size, panel_position, "LEFT"))
@@ -439,12 +468,12 @@ def update_door_modifier_bmesh(context):
    obj.data.update()


-class BIM_OT_add_door(Operator):
+class BIM_OT_add_door(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "mesh.add_door"
    bl_label = "Door"
    bl_options = {"REGISTER", "UNDO"}

-    def execute(self, context):
+    def _execute(self, context):
        ifc_file = tool.Ifc.get()
        if not ifc_file:
            self.report({"ERROR"}, "You need to start IFC project first to create a door.")
@@ -459,7 +488,6 @@ class BIM_OT_add_door(Operator):
        mesh = bpy.data.meshes.new("IfcDoor")
        obj = bpy.data.objects.new("IfcDoor", mesh)
        obj.location = spawn_location
-        body_context = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW")
        element = blenderbim.core.root.assign_class(
            tool.Ifc, tool.Collector, tool.Root, obj=obj, ifc_class="IfcDoor", should_add_representation=False
        )
@@ -499,12 +527,9 @@ class AddDoor(bpy.types.Operator, tool.Ifc.Operator):

        door_data["lining_properties"] = lining_props
        door_data["panel_properties"] = panel_props
-        psets = ifcopenshell.util.element.get_psets(element)
-        pset = psets.get("BBIM_Door", None)
+        pset = tool.Pset.get_element_pset(element, "BBIM_Door")

-        if pset:
-            pset = tool.Ifc.get().by_id(pset["id"])
-        else:
+        if not pset:
            pset = ifcopenshell.api.run("pset.add_pset", tool.Ifc.get(), product=element, name="BBIM_Door")

        ifcopenshell.api.run(
@@ -519,14 +544,13 @@ class AddDoor(bpy.types.Operator, tool.Ifc.Operator):

 class CancelEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.cancel_editing_door"
-    bl_label = "Cancel editing Door"
+    bl_label = "Cancel Editing Door"
    bl_options = {"REGISTER"}

    def _execute(self, context):
        obj = context.active_object
        element = tool.Ifc.get_entity(obj)
-        psets = ifcopenshell.util.element.get_psets(element)
-        data = json.loads(psets["BBIM_Door"]["Data"])
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Door", "Data"))
        props = obj.BIMDoorProperties
        # restore previous settings since editing was canceled
        for prop_name in data:
@@ -549,7 +573,7 @@ class CancelEditingDoor(bpy.types.Operator, tool.Ifc.Operator):

 class FinishEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.finish_editing_door"
-    bl_label = "Finish editing door"
+    bl_label = "Finish Editing Door"
    bl_options = {"REGISTER"}

    def _execute(self, context):
@@ -557,8 +581,6 @@ class FinishEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
        element = tool.Ifc.get_entity(obj)
        props = obj.BIMDoorProperties

-        psets = ifcopenshell.util.element.get_psets(element)
-        pset = psets["BBIM_Door"]
        door_data = props.get_general_kwargs()
        lining_props = props.get_lining_kwargs()
        panel_props = props.get_panel_kwargs()
@@ -570,7 +592,7 @@ class FinishEditingDoor(bpy.types.Operator, tool.Ifc.Operator):

        update_door_modifier_representation(context)

-        pset = tool.Ifc.get().by_id(pset["id"])
+        pset = tool.Pset.get_element_pset(element, "BBIM_Door")
        door_data = json.dumps(door_data, default=list)
        ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties={"Data": door_data})
        return {"FINISHED"}
@@ -585,8 +607,7 @@ class EnableEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
        obj = context.active_object
        props = obj.BIMDoorProperties
        element = tool.Ifc.get_entity(obj)
-        pset = ifcopenshell.util.element.get_psets(element)
-        data = json.loads(pset["BBIM_Door"]["Data"])
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Door", "Data"))
        data.update(data.pop("lining_properties"))
        data.update(data.pop("panel_properties"))

@@ -615,8 +636,7 @@ class RemoveDoor(bpy.types.Operator, tool.Ifc.Operator):
        element = tool.Ifc.get_entity(obj)
        obj.BIMDoorProperties.is_editing = -1

-        pset = ifcopenshell.util.element.get_psets(element)
-        pset = tool.Ifc.get().by_id(pset["BBIM_Door"]["id"])
+        pset = tool.Pset.get_element_pset(element, "BBIM_Door")
        ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
        props.door_added_previously = True

@@ -60,9 +60,6 @@ def load_post(*args):
        product.regenerate_profile_usage,
    )

-    IfcStore.add_element_listener(wall.element_listener)
-    IfcStore.add_element_listener(profile.element_listener)
-
    ifcopenshell.api.add_post_listener(
        "geometry.add_representation", "BlenderBIM.DumbWall.CalculateQuantities", wall.calculate_quantities
    )
@@ -38,7 +38,7 @@ class MepGenerator:
    def __init__(self, relating_type):
        self.relating_type = relating_type

-    def generate(self, link_to_scene=True):
+    def generate(self):
        self.file = tool.Ifc.get()
        self.collection = bpy.context.view_layer.active_layer_collection.collection

@@ -55,15 +55,15 @@ class MepGenerator:
                self.height = dimensions.get("NominalHeight")
                self.length = 1

-                return self.derive_from_cursor(link_to_scene=link_to_scene)
+                return self.derive_from_cursor()
        elif self.relating_type.is_a("IfcPipeSegmentType"):
            pass

-    def derive_from_cursor(self, link_to_scene):
+    def derive_from_cursor(self):
        self.location = bpy.context.scene.cursor.location
-        return self.create_rectangle_segment(link_to_scene)
+        return self.create_rectangle_segment()

-    def create_rectangle_segment(self, link_to_scene):
+    def create_rectangle_segment(self):
        verts = [
            Vector((-self.width / 2, self.height / 2, 0)),
            Vector((-self.width / 2, -self.height / 2, 0)),
@@ -89,11 +89,11 @@ class MepGenerator:
        ifc_class = ifc_classes[0]

        obj = bpy.data.objects.new(tool.Model.generate_occurrence_name(self.relating_type, ifc_class), mesh)
-        if link_to_scene:
-            obj.location = self.location
-            obj.rotation_euler[0] = math.pi / 2
-            obj.rotation_euler[2] = math.pi / 2
-            self.collection.objects.link(obj)
+
+        obj.location = self.location
+        obj.rotation_euler[0] = math.pi / 2
+        obj.rotation_euler[2] = math.pi / 2
+        self.collection.objects.link(obj)

        bpy.ops.bim.assign_class(
            obj=obj.name,
@@ -18,7 +18,6 @@

 import bpy
 import gpu
-import bgl
 import bmesh
 import logging
 import numpy as np
@@ -36,7 +35,6 @@ from bpy.types import Operator
 from bpy.types import SpaceView3D
 from bpy.props import FloatProperty
 from bpy_extras.object_utils import AddObjectHelper, object_data_add
-from gpu.types import GPUShader, GPUBatch, GPUIndexBuf, GPUVertBuf, GPUVertFormat
 from gpu_extras.batch import batch_for_shader


@@ -53,38 +51,47 @@ class AddFilledOpening(bpy.types.Operator, tool.Ifc.Operator):


 class FilledOpeningGenerator:
-    def generate(self, filling_obj, voided_obj):
+    def generate(self, filling_obj, voided_obj, target=None):
        props = bpy.context.scene.BIMModelProperties
        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())

        filling = tool.Ifc.get_entity(filling_obj)
+        element = tool.Ifc.get_entity(voided_obj)

        if not voided_obj or not filling_obj:
            return

-        element = tool.Ifc.get_entity(voided_obj)
-        target = bpy.context.scene.cursor.location
-        raycast = voided_obj.closest_point_on_mesh(voided_obj.matrix_world.inverted() @ target, distance=0.01)
-        if not raycast[0]:
-            target = filling_obj.matrix_world.col[3].to_3d().copy()
-            raycast = voided_obj.closest_point_on_mesh(voided_obj.matrix_world.inverted() @ target, distance=0.5)
+        if filling.FillsVoids:
+            ifcopenshell.api.run(
+                "void.remove_opening", tool.Ifc.get(), opening=filling.FillsVoids[0].RelatingOpeningElement
+            )
+
+        if target is None:
+            target = bpy.context.scene.cursor.location
+
+        # Sometimes, the voided_obj may be an aggregate, which won't have any representation.
+        if voided_obj.data:
+            raycast = voided_obj.closest_point_on_mesh(voided_obj.matrix_world.inverted() @ target, distance=0.01)
            if not raycast[0]:
-                return
+                target = filling_obj.matrix_world.col[3].to_3d().copy()
+                raycast = voided_obj.closest_point_on_mesh(voided_obj.matrix_world.inverted() @ target, distance=0.5)
+                if not raycast[0]:
+                    return

-        # In this prototype, we assume openings are only added to axis-based elements
-        layers = tool.Model.get_material_layer_parameters(element)
-        axis = tool.Model.get_wall_axis(voided_obj, layers=layers)["base"]
+            # In this prototype, we assume openings are only added to axis-based elements
+            layers = tool.Model.get_material_layer_parameters(element)
+            axis = tool.Model.get_wall_axis(voided_obj, layers=layers)["base"]

-        new_matrix = voided_obj.matrix_world.copy()
-        new_matrix.col[3] = tool.Cad.point_on_edge(target, axis).to_4d()
+            new_matrix = voided_obj.matrix_world.copy()
+            new_matrix.col[3] = tool.Cad.point_on_edge(target, axis).to_4d()

-        if filling.is_a("IfcDoor"):
-            new_matrix[2][3] = voided_obj.matrix_world[2][3]
-        else:
-            new_matrix[2][3] = voided_obj.matrix_world[2][3] + (props.rl2 * unit_scale)
+            if filling.is_a("IfcDoor"):
+                new_matrix[2][3] = voided_obj.matrix_world[2][3]
+            else:
+                new_matrix[2][3] = voided_obj.matrix_world[2][3] + (props.rl2 * unit_scale)

-        filling_obj.matrix_world = new_matrix
-        bpy.context.view_layer.update()
+            filling_obj.matrix_world = new_matrix
+            bpy.context.view_layer.update()

        if tool.Ifc.is_moved(voided_obj):
            blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=voided_obj)
@@ -133,22 +140,29 @@ class FilledOpeningGenerator:
        ifcopenshell.api.run("void.add_opening", tool.Ifc.get(), opening=opening, element=element)
        ifcopenshell.api.run("void.add_filling", tool.Ifc.get(), opening=opening, element=filling)

-        representation = tool.Ifc.get().by_id(voided_obj.data.BIMMeshProperties.ifc_definition_id)
-        blenderbim.core.geometry.switch_representation(
-            tool.Ifc,
-            tool.Geometry,
-            obj=voided_obj,
-            representation=representation,
-            should_reload=True,
-            is_global=True,
-            should_sync_changes_first=False,
-        )
+        voided_objs = [voided_obj]
+        # Openings affect all subelements of an aggregate
+        for subelement in ifcopenshell.util.element.get_decomposition(element):
+            subobj = tool.Ifc.get_object(subelement)
+            if subobj:
+                voided_objs.append(subobj)

-        return {"FINISHED"}
+        for voided_obj in voided_objs:
+            if voided_obj.data:
+                representation = tool.Ifc.get().by_id(voided_obj.data.BIMMeshProperties.ifc_definition_id)
+                blenderbim.core.geometry.switch_representation(
+                    tool.Ifc,
+                    tool.Geometry,
+                    obj=voided_obj,
+                    representation=representation,
+                    should_reload=True,
+                    is_global=True,
+                    should_sync_changes_first=False,
+                )

    def regenerate_from_type(self, usecase_path, ifc_file, settings):
        filling = settings["related_object"]
-        if not filling.FillsVoids:
+        if not getattr(filling, "FillsVoids", None):
            return

        opening = filling.FillsVoids[0].RelatingOpeningElement
@@ -201,8 +215,9 @@ class FilledOpeningGenerator:

    def generate_opening_from_filling(self, filling, filling_obj, voided_obj):
        thickness = voided_obj.dimensions[1] + 0.1 + 0.1
-        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        shape_builder = ifcopenshell.util.shape_builder.ShapeBuilder(tool.Ifc.get())
+        ifc_file = tool.Ifc.get()
+        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file)
+        shape_builder = ifcopenshell.util.shape_builder.ShapeBuilder(ifc_file)

        profile = None
        filling_type = ifcopenshell.util.element.get_type(filling)
@@ -211,46 +226,59 @@ class FilledOpeningGenerator:
                filling_type, "Model", "Profile", "ELEVATION_VIEW"
            )
            filling_obj = tool.Ifc.get_object(filling_type)
-        context = ifcopenshell.util.representation.get_context(tool.Ifc.get(), "Model", "Body", "MODEL_VIEW")
+        context = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW")

        if profile:
+            curve_3d = ifcopenshell.util.representation.resolve_representation(profile).Items[0]
+
+            def get_curve_2d_from_3d(curve_3d):
+                ifc_segments = [shape_builder.deep_copy(s) for s in curve_3d.Segments]
+                ifc_points = ifc_file.createIfcCartesianPointList2D([Vector(p).xz for p in curve_3d.Points.CoordList])
+                ifc_curve = ifc_file.createIfcIndexedPolyCurve(Points=ifc_points, Segments=ifc_segments)
+                return ifc_curve
+
            extrusion = shape_builder.extrude(
-                ifcopenshell.util.representation.resolve_representation(profile).Items[0],
+                get_curve_2d_from_3d(curve_3d),
                magnitude=thickness / unit_scale,
                position=Vector([0.0, -0.1 / unit_scale, 0.0]),
-                extrusion_vector=Vector([0.0, 1.0, 0.0]),
+                position_x_axis=Vector((1, 0, 0)),
+                position_z_axis=Vector((0, -1, 0)),
+                extrusion_vector=Vector((0, 0, -1)),
            )
            return shape_builder.get_representation(context, [extrusion])

        x, y, z = filling_obj.dimensions
        opening_position = Vector([0.0, -0.1 / unit_scale, 0.0])
+        opening_size = Vector([x, z]) / unit_scale

        # Windows and doors can have a casing that overlaps the wall
        # but shouldn't affect the size of the opening.
        # So we shouldn't use object dimensions in that case. More: #2784
        # Just keeping it for windows and doors for now to be safe
-        x_redefined, z_redefined = False, False
+        has_width_attribute, has_height_attribute = False, False
        if filling.is_a() in ["IfcWindow", "IfcDoor"]:
            if filling.OverallWidth:
-                x = filling.OverallWidth
-                x_redefined = True
+                opening_size.x = filling.OverallWidth
+                has_width_attribute = True
            if filling.OverallHeight:
-                z = filling.OverallHeight
-                z_redefined = True
+                opening_size.y = filling.OverallHeight
+                has_height_attribute = True

        # making sure if min_x or min_z != 0 to shift the opening accordingly
        # to prevent something like #2784
-        if not x_redefined:
+        if not has_width_attribute:
            opening_position.x = min(v[0] for v in filling_obj.bound_box)

-        if not z_redefined:
+        if not has_height_attribute:
            opening_position.z = min(v[2] for v in filling_obj.bound_box)

        extrusion = shape_builder.extrude(
-            shape_builder.rectangle(size=Vector([x / unit_scale, 0.0, z / unit_scale])),
+            shape_builder.rectangle(size=opening_size),
            magnitude=thickness / unit_scale,
            position=opening_position,
-            extrusion_vector=Vector([0.0, 1.0, 0.0]),
+            position_z_axis=Vector((0.0, -1.0, 0.0)),
+            position_x_axis=Vector((1.0, 0.0, 0.0)),
+            extrusion_vector=Vector((0.0, 0.0, -1.0)),
        )

        return shape_builder.get_representation(context, [extrusion])
@@ -299,21 +327,26 @@ class RecalculateFill(bpy.types.Operator, tool.Ifc.Operator):
                ifcopenshell.api.run(
                    "geometry.edit_object_placement", tool.Ifc.get(), product=opening, matrix=obj.matrix_world
                )
+
+            decomposed_building_elements = set()
            for building_element in building_elements:
+                decomposed_building_elements.add(building_element)
+                decomposed_building_elements.update(ifcopenshell.util.element.get_decomposition(building_element))
+
+            for building_element in decomposed_building_elements:
                building_obj = tool.Ifc.get_object(building_element)
-                body = ifcopenshell.util.representation.get_representation(
-                    building_element, "Model", "Body", "MODEL_VIEW"
-                )
-                if body:
-                    blenderbim.core.geometry.switch_representation(
-                        tool.Ifc,
-                        tool.Geometry,
-                        obj=building_obj,
-                        representation=body,
-                        should_reload=True,
-                        is_global=True,
-                        should_sync_changes_first=False,
-                    )
+                if building_obj and building_obj.data:
+                    representation = tool.Geometry.get_active_representation(building_obj)
+                    if representation:
+                        blenderbim.core.geometry.switch_representation(
+                            tool.Ifc,
+                            tool.Geometry,
+                            obj=building_obj,
+                            representation=representation,
+                            should_reload=True,
+                            is_global=True,
+                            should_sync_changes_first=False,
+                        )
        return {"FINISHED"}


@@ -628,7 +661,14 @@ class ShowOpenings(Operator, tool.Ifc.Operator):
                continue
            if tool.Ifc.is_moved(obj):
                blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
-            openings = tool.Model.load_openings(element, [r.RelatedOpeningElement for r in element.HasOpenings])
+            openings = tool.Model.load_openings(
+                element,
+                [
+                    r.RelatedOpeningElement
+                    for r in element.HasOpenings
+                    if not tool.Ifc.get_object(r.RelatedOpeningElement)
+                ],
+            )
            for opening in openings:
                new = props.openings.add()
                new.obj = opening
@@ -678,28 +718,36 @@ class EditOpenings(Operator, tool.Ifc.Operator):
                if opening_obj:
                    if tool.Ifc.is_edited(opening_obj):
                        tool.Geometry.run_geometry_update_representation(obj=opening_obj)
-                        building_objs.add(obj)
-                        building_objs.update(self.get_all_building_objects_of_similar_openings(opening))
                    elif tool.Ifc.is_moved(opening_obj):
                        blenderbim.core.geometry.edit_object_placement(
                            tool.Ifc, tool.Geometry, tool.Surveyor, obj=opening_obj
                        )
-                        building_objs.add(obj)
+                    building_objs.add(obj)
+                    building_objs.update(self.get_all_building_objects_of_similar_openings(opening))
                    tool.Ifc.unlink(element=opening, obj=opening_obj)
                    bpy.data.objects.remove(opening_obj)

+        decomposed_building_objs = set()
        for obj in building_objs:
-            element = tool.Ifc.get_entity(obj)
-            body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
-            blenderbim.core.geometry.switch_representation(
-                tool.Ifc,
-                tool.Geometry,
-                obj=obj,
-                representation=body,
-                should_reload=True,
-                is_global=True,
-                should_sync_changes_first=False,
-            )
+            decomposed_building_objs.add(obj)
+            for subelement in ifcopenshell.util.element.get_decomposition(tool.Ifc.get_entity(obj)):
+                subobj = tool.Ifc.get_object(subelement)
+                if subobj:
+                    decomposed_building_objs.add(subobj)
+
+        for obj in decomposed_building_objs:
+            if obj.data:
+                element = tool.Ifc.get_entity(obj)
+                body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+                blenderbim.core.geometry.switch_representation(
+                    tool.Ifc,
+                    tool.Geometry,
+                    obj=obj,
+                    representation=body,
+                    should_reload=True,
+                    is_global=True,
+                    should_sync_changes_first=False,
+                )
        return {"FINISHED"}

    def get_all_building_objects_of_similar_openings(self, opening):
@@ -719,6 +767,7 @@ class EditOpenings(Operator, tool.Ifc.Operator):
        return results


+# TODO: merge with ProfileDecorator?
 class DecorationsHandler:
    installed = None

@@ -737,27 +786,38 @@ class DecorationsHandler:
            pass
        cls.installed = None

+    def draw_batch(self, shader_type, content_pos, color, indices=None):
+        shader = self.line_shader if shader_type == "LINES" else self.shader
+        batch = batch_for_shader(shader, shader_type, {"pos": content_pos}, indices=indices)
+        shader.uniform_float("color", color)
+        batch.draw(shader)
+
    def __call__(self, context):
-        bgl.glLineWidth(2)
-        bgl.glPointSize(6)
-        bgl.glEnable(bgl.GL_BLEND)
-        bgl.glEnable(bgl.GL_LINE_SMOOTH)
+        self.model_props = context.scene.BIMModelProperties
+        selected_elements_color = self.model_props.decorator_color_selected
+        unselected_elements_color = self.model_props.decorator_color_unselected
+        special_elements_color = self.model_props.decorator_color_special
+
+        def transparent_color(color, alpha=0.1):
+            color = [i for i in color]
+            color[3] = alpha
+            return color
+
+        gpu.state.point_size_set(6)
+        gpu.state.blend_set("ALPHA")

        for opening in context.scene.BIMModelProperties.openings:
            obj = opening.obj
-
            if not obj:
                continue

-            white = (1, 1, 1, 1)
-            white_t = (1, 1, 1, 0.1)
-            green = (0.545, 0.863, 0, 1)
-            red = (1, 0.2, 0.322, 1)
-            red_t = (1, 0.2, 0.322, 0.1)
-            blue = (0.157, 0.565, 1, 1)
-            blue_t = (0.157, 0.565, 1, 0.1)
-            grey = (0.2, 0.2, 0.2, 1)
+            self.line_shader = gpu.shader.from_builtin("3D_POLYLINE_UNIFORM_COLOR")
+            self.line_shader.bind()  # required to be able to change uniforms of the shader
+            # POLYLINE_UNIFORM_COLOR specific uniforms
+            self.line_shader.uniform_float("viewportSize", (context.region.width, context.region.height))
+            self.line_shader.uniform_float("lineWidth", 2.0)

+            # general shader
            self.shader = gpu.shader.from_builtin("3D_UNIFORM_COLOR")

            verts = []
@@ -789,41 +849,22 @@ class DecorationsHandler:
                    else:
                        unselected_edges.append(edge_indices)

-                batch = batch_for_shader(self.shader, "LINES", {"pos": verts}, indices=unselected_edges)
-                self.shader.bind()
-                self.shader.uniform_float("color", white)
-                batch.draw(self.shader)
-
-                batch = batch_for_shader(self.shader, "LINES", {"pos": verts}, indices=selected_edges)
-                self.shader.uniform_float("color", green)
-                batch.draw(self.shader)
-
-                batch = batch_for_shader(self.shader, "POINTS", {"pos": unselected_vertices})
-                self.shader.uniform_float("color", white)
-                batch.draw(self.shader)
-
-                batch = batch_for_shader(self.shader, "POINTS", {"pos": selected_vertices})
-                self.shader.uniform_float("color", green)
-                batch.draw(self.shader)
+                self.draw_batch("LINES", verts, transparent_color(unselected_elements_color, 0.5), unselected_edges)
+                self.draw_batch("LINES", verts, selected_elements_color, selected_edges)
+                self.draw_batch("POINTS", unselected_vertices, unselected_elements_color)
+                self.draw_batch("POINTS", selected_vertices, selected_elements_color)
            else:
                bm = bmesh.new()
                bm.from_mesh(obj.data)

                verts = [tuple(obj.matrix_world @ v.co) for v in bm.verts]
                edges = [tuple([v.index for v in e.verts]) for e in bm.edges]
-
-                batch = batch_for_shader(self.shader, "LINES", {"pos": verts}, indices=edges)
-                self.shader.bind()
-                self.shader.uniform_float("color", green if obj in context.selected_objects else blue)
-                batch.draw(self.shader)
+                color = selected_elements_color if obj in context.selected_objects else special_elements_color
+                self.draw_batch("LINES", verts, color, edges)

            obj.data.calc_loop_triangles()
            tris = [tuple(t.vertices) for t in obj.data.loop_triangles]
-
-            batch = batch_for_shader(self.shader, "TRIS", {"pos": verts}, indices=tris)
-            self.shader.bind()
-            self.shader.uniform_float("color", blue_t)
-            batch.draw(self.shader)
+            self.draw_batch("TRIS", verts, transparent_color(special_elements_color), tris)

            if "HalfSpaceSolid" in obj.name:
                # Arrow shape
@@ -836,10 +877,8 @@ class DecorationsHandler:
                    tuple(obj.matrix_world @ Vector((0, -0.05, 0.45))),
                ]
                edges = [(0, 1), (1, 2), (1, 3), (1, 4), (1, 5)]
-                batch = batch_for_shader(self.shader, "LINES", {"pos": verts}, indices=edges)
-                self.shader.bind()
-                self.shader.uniform_float("color", green if obj in context.selected_objects else blue)
-                batch.draw(self.shader)
+                color = selected_elements_color if obj in context.selected_objects else special_elements_color
+                self.draw_batch("LINES", verts, color, edges)

            if obj.mode != "EDIT":
                bm.free()
@@ -31,7 +31,6 @@ import blenderbim.core.geometry
 from . import wall, slab, profile, mep
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.module.model.data import AuthoringData
-from blenderbim.bim.module.model.prop import store_cursor_position
 from mathutils import Vector, Matrix
 from bpy_extras.object_utils import AddObjectHelper
 from . import prop
@@ -69,7 +68,6 @@ class AddConstrTypeInstance(bpy.types.Operator):
    ifc_class: bpy.props.StringProperty()
    relating_type_id: bpy.props.IntProperty()
    from_invoke: bpy.props.BoolProperty(default=False)
-    link_to_scene: bpy.props.BoolProperty(default=True)

    def invoke(self, context, event):
        return self.execute(context)
@@ -95,14 +93,14 @@ class AddConstrTypeInstance(bpy.types.Operator):
        material = ifcopenshell.util.element.get_material(relating_type)

        if material and material.is_a("IfcMaterialProfileSet"):
-            if profile.DumbProfileGenerator(relating_type).generate(link_to_scene=self.link_to_scene):
+            if profile.DumbProfileGenerator(relating_type).generate():
                return {"FINISHED"}
        elif material and material.is_a("IfcMaterialLayerSet"):
-            if self.generate_layered_element(ifc_class, relating_type, link_to_scene=self.link_to_scene):
+            if self.generate_layered_element(ifc_class, relating_type):
                select_and_activate_single_object(context, context.selected_objects[-1])
                return {"FINISHED"}
        if relating_type.is_a("IfcFlowSegmentType") and not relating_type.RepresentationMaps:
-            if mep.MepGenerator(relating_type).generate(link_to_scene=self.link_to_scene):
+            if mep.MepGenerator(relating_type).generate():
                return {"FINISHED"}

        building_obj = None
@@ -133,26 +131,27 @@ class AddConstrTypeInstance(bpy.types.Operator):
        mesh = bpy.data.meshes.new(name="Instance")
        mesh.from_pydata(verts, edges, faces)
        obj = bpy.data.objects.new(tool.Model.generate_occurrence_name(relating_type, instance_class), mesh)
-        if self.link_to_scene:
-            obj.location = context.scene.cursor.location
-            collection = context.view_layer.active_layer_collection.collection
-            collection.objects.link(obj)
-            collection_obj = bpy.data.objects.get(collection.name)
+
+        obj.location = context.scene.cursor.location
+        collection = context.view_layer.active_layer_collection.collection
+        collection.objects.link(obj)
+        collection_obj = bpy.data.objects.get(collection.name)
+
        bpy.ops.bim.assign_class(obj=obj.name, ifc_class=instance_class)
        element = tool.Ifc.get_entity(obj)
        blenderbim.core.type.assign_type(tool.Ifc, tool.Type, element=element, type=relating_type)
-        if self.link_to_scene:
-            # Update required as core.type.assign_type may change obj.data
-            context.view_layer.update()
+
+        # Update required as core.type.assign_type may change obj.data
+        context.view_layer.update()

        # set occurences properties for the types defined with modifiers
        if instance_class in ["IfcWindow", "IfcDoor"]:
-            pset_name = f'BBIM_{instance_class[3:]}'
+            pset_name = f"BBIM_{instance_class[3:]}"
            bbim_pset = ifcopenshell.util.element.get_psets(element).get(pset_name, None)
            if bbim_pset:
-                bbim_prop_data = json.loads(bbim_pset['Data'])
-                element.OverallWidth = bbim_prop_data['overall_width']
-                element.OverallHeight = bbim_prop_data['overall_height']
+                bbim_prop_data = json.loads(bbim_pset["Data"])
+                element.OverallWidth = bbim_prop_data["overall_width"]
+                element.OverallHeight = bbim_prop_data["overall_height"]

        if (
            building_obj
@@ -162,7 +161,7 @@ class AddConstrTypeInstance(bpy.types.Operator):
            if instance_class in ["IfcWindow", "IfcDoor"]:
                # TODO For now we are hardcoding windows and doors as a prototype
                bpy.ops.bim.add_filled_opening(voided_obj=building_obj.name, filling_obj=obj.name)
-        elif self.link_to_scene:
+        else:
            if collection_obj and collection_obj.BIMObjectProperties.ifc_definition_id:
                obj.location[2] = collection_obj.location[2] - min([v[2] for v in obj.bound_box])

@@ -184,7 +183,7 @@ class AddConstrTypeInstance(bpy.types.Operator):
        return {"FINISHED"}

    @staticmethod
-    def generate_layered_element(ifc_class, relating_type, link_to_scene=True):
+    def generate_layered_element(ifc_class, relating_type):
        layer_set_direction = None

        parametric = ifcopenshell.util.element.get_psets(relating_type).get("EPset_Parametric")
@@ -198,9 +197,9 @@ class AddConstrTypeInstance(bpy.types.Operator):

        obj = None
        if layer_set_direction == "AXIS3":
-            obj = slab.DumbSlabGenerator(relating_type).generate(link_to_scene=link_to_scene)
+            obj = slab.DumbSlabGenerator(relating_type).generate()
        elif layer_set_direction == "AXIS2":
-            obj = wall.DumbWallGenerator(relating_type).generate(link_to_scene=link_to_scene)
+            obj = wall.DumbWallGenerator(relating_type).generate()
        else:
            pass  # Dumb block generator? Eh? :)

@@ -223,66 +222,6 @@ class ChangeTypePage(bpy.types.Operator, tool.Ifc.Operator):
        return {"FINISHED"}


-class DisplayConstrTypes(bpy.types.Operator):
-    bl_idname = "bim.display_constr_types"
-    bl_label = "Browse Construction Types"
-    bl_options = {"REGISTER"}
-    bl_description = "Display all available Construction Types to add new instances"
-
-    def invoke(self, context, event):
-        if not AuthoringData.is_loaded:
-            AuthoringData.load()
-        props = context.scene.BIMModelProperties
-        ifc_class = props.ifc_class
-        constr_class_info = AuthoringData.constr_class_info(ifc_class)
-        if constr_class_info is None or not constr_class_info.fully_loaded:
-            AuthoringData.assetize_constr_class(ifc_class)
-        bpy.ops.bim.display_constr_types_ui("INVOKE_DEFAULT")
-        return {"FINISHED"}
-
-
-class ReinvokeOperator(bpy.types.Operator):
-    bl_idname = "bim.reinvoke_operator"
-    bl_label = "Reinvoke Popup Operator"
-    bl_options = {"REGISTER"}
-    bl_description = "Reinvoke a popup operator"
-    operator: bpy.props.StringProperty()
-
-    def execute(self, context):
-        return {"FINISHED"}
-
-    def invoke(self, context, event):
-        browser_state = context.scene.BIMModelProperties.constr_browser_state
-        store_cursor_position(context, event, window=False)
-        cursor_x, cursor_y = browser_state.cursor_x, browser_state.cursor_y
-        window_x, window_y = browser_state.window_x, browser_state.window_y
-        window = context.window
-        operator = self.operator
-        self.move_cursor_away(context, window)
-
-        def move_cursor_to_window():
-            window.cursor_warp(window_x, window_y)
-
-        def run_operator(operator, *args, **kwargs):
-            reduce(lambda x, arg: getattr(x, arg), operator.split("."), bpy.ops)(*args, **kwargs)
-
-        def reinvoke():
-            run_operator(operator, "INVOKE_DEFAULT", reinvoked=True)
-            window.cursor_warp(cursor_x, cursor_y)
-
-        bpy.app.timers.register(move_cursor_to_window, first_interval=browser_state.update_delay)
-        bpy.app.timers.register(reinvoke, first_interval=3 * browser_state.update_delay)
-        return {"FINISHED"}
-
-    def move_cursor_away(self, context, window):  # closes current popup
-        browser_state = context.scene.BIMModelProperties.constr_browser_state
-        window.cursor_warp(browser_state.far_away_x, browser_state.far_away_y)
-
-    @staticmethod
-    def run_operator(operator, *args, **kwargs):
-        reduce(lambda x, arg: getattr(x, arg), operator.split("."), bpy.ops)(*args, **kwargs)
-
-
 class AlignProduct(bpy.types.Operator):
    bl_idname = "bim.align_product"
    bl_label = "Align Product"
@@ -459,6 +398,71 @@ class LoadTypeThumbnails(bpy.types.Operator, tool.Ifc.Operator):
        return {"FINISHED"}


+class MirrorElements(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.mirror_elements"
+    bl_label = "Mirror Elements"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Faux-mirrors the selected objects by an active empty along a mirror plane"
+
+    @classmethod
+    def poll(cls, context):
+        return context.selected_objects
+
+    def _execute(self, context):
+        # This is not a true mirror operation. In BIM, objects that are
+        # mirrored are not the same type. (i.e. a mirrored asymmetric desk is a
+        # completely different product). To preserve types, we calculate
+        # bounding box centroids, and mirror the position of the object.  The
+        # mirrored object performs the necessary rotation to preserve the
+        # mirrored intention, but never actually truly mirror anything (i.e.
+        # scale = -1).
+
+        # Objects are mirrored along the YZ plane of the mirror object.
+        # Mirrored objects have their relative local Y and Z axes preserved,
+        # and the new X axis is calculated.
+
+        # In theory, untyped objects may be truly mirrored, but this is not yet
+        # implemented.
+        mirror = context.active_object
+        reflection = Matrix()
+        reflection[0][0] = -1
+
+        mirror.select_set(False)
+
+        if not context.selected_objects:
+            self.report(
+                {"INFO"},
+                "At least two objects must be selected: an object to be mirrored, and a mirror axis as the active object.",
+            )
+            return {"FINISHED"}
+
+        bpy.ops.bim.override_object_duplicate_move(is_interactive=False)
+
+        for obj in context.selected_objects:
+            if obj == mirror:
+                continue
+
+            objmat = mirror.matrix_world.inverted() @ obj.matrix_world.copy()
+            x, y, z = objmat.to_3x3().col
+            centroid = Vector(obj.bound_box[0]).lerp(Vector(obj.bound_box[6]), 0.5)
+            c = mirror.matrix_world.inverted() @ obj.matrix_world @ centroid
+            newy = mirror.matrix_world.to_quaternion() @ (y @ reflection)
+            newz = mirror.matrix_world.to_quaternion() @ (z @ reflection)
+            newx = newy.cross(newz)
+            newc = mirror.matrix_world @ (c @ reflection)
+
+            newmat = Matrix((newx.to_4d(), newy.to_4d(), newz.to_4d(), newc.to_4d())).transposed()
+            newmat.col[3][0:3] = Vector(newmat.col[3][0:3]) - (newmat.to_quaternion() @ centroid)
+
+            obj.matrix_world = newmat
+
+    def copy_obj(self, obj):
+        new = obj.copy()
+        new.data = wall2.data.copy()
+        wall1.users_collection[0].objects.link(wall2)
+        blenderbim.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=wall2)
+
+
 def generate_box(usecase_path, ifc_file, settings):
    box_context = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Box", "MODEL_VIEW")
    if not box_context:
@@ -481,7 +485,7 @@ def generate_box(usecase_path, ifc_file, settings):
            "geometry.assign_representation",
            ifc_file,
            should_run_listeners=False,
-            **{"product": product, "representation": new_box}
+            **{"product": product, "representation": new_box},
        )


@@ -18,7 +18,6 @@

 import bpy
 import copy
-import math
 import bmesh
 import mathutils.geometry
 import ifcopenshell
@@ -29,66 +28,11 @@ import blenderbim.bim.handler
 import blenderbim.tool as tool
 import blenderbim.core.type
 import blenderbim.core.geometry
-from blenderbim.bim.ifc import IfcStore
 from math import pi, degrees, inf
-from mathutils import Vector, Matrix
+from mathutils import Vector, Matrix, Quaternion
 from blenderbim.bim.module.geometry.helper import Helper
-
-
-def element_listener(element, obj):
-    blenderbim.bim.handler.subscribe_to(obj, "mode", mode_callback)
-
-
-def mode_callback(obj, data):
-    for obj in set(bpy.context.selected_objects + [bpy.context.active_object]):
-        if (
-            not obj.data
-            or not isinstance(obj.data, (bpy.types.Mesh, bpy.types.Curve, bpy.types.TextCurve))
-            or not obj.BIMObjectProperties.ifc_definition_id
-            or not bpy.context.scene.BIMProjectProperties.is_authoring
-        ):
-            return
-        product = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
-        parametric = ifcopenshell.util.element.get_psets(product).get("EPset_Parametric")
-        if not parametric or parametric["Engine"] != "BlenderBIM.DumbProfile":
-            return
-        if obj.mode == "EDIT":
-            IfcStore.edited_objs.add(obj)
-            bm = bmesh.from_edit_mesh(obj.data)
-            bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
-            bmesh.update_edit_mesh(obj.data)
-            bm.free()
-        else:
-            material_usage = ifcopenshell.util.element.get_material(product)
-            x, y = obj.dimensions[0:2]
-            if not material_usage.CardinalPoint:
-                new_origin = obj.matrix_world @ (Vector(obj.bound_box[0]) + (Vector((x, y, 0)) / 2))
-            elif material_usage.CardinalPoint == 1:
-                new_origin = obj.matrix_world @ Vector(obj.bound_box[4])
-            elif material_usage.CardinalPoint == 2:
-                new_origin = obj.matrix_world @ (Vector(obj.bound_box[0]) + (Vector((x, 0, 0)) / 2))
-            elif material_usage.CardinalPoint == 3:
-                new_origin = obj.matrix_world @ Vector(obj.bound_box[0])
-            elif material_usage.CardinalPoint == 4:
-                new_origin = obj.matrix_world @ (Vector(obj.bound_box[4]) + (Vector((0, y, 0)) / 2))
-            elif material_usage.CardinalPoint == 5:
-                new_origin = obj.matrix_world @ (Vector(obj.bound_box[0]) + (Vector((x, y, 0)) / 2))
-            elif material_usage.CardinalPoint == 6:
-                new_origin = obj.matrix_world @ (Vector(obj.bound_box[0]) + (Vector((0, y, 0)) / 2))
-            elif material_usage.CardinalPoint == 7:
-                new_origin = obj.matrix_world @ Vector(obj.bound_box[7])
-            elif material_usage.CardinalPoint == 8:
-                new_origin = obj.matrix_world @ (Vector(obj.bound_box[3]) + (Vector((x, 0, 0)) / 2))
-            elif material_usage.CardinalPoint == 9:
-                new_origin = obj.matrix_world @ Vector(obj.bound_box[3])
-            if (obj.matrix_world.translation - new_origin).length < 0.001:
-                return
-            obj.data.transform(
-                Matrix.Translation(
-                    (obj.matrix_world.inverted().to_quaternion() @ (obj.matrix_world.translation - new_origin))
-                )
-            )
-            obj.matrix_world.translation = new_origin
+from blenderbim.bim.module.model.wall import DumbWallRecalculator
+from blenderbim.bim.module.model.decorator import ProfileDecorator


 class DumbProfileGenerator:
@@ -96,9 +40,9 @@ class DumbProfileGenerator:
        self.relating_type = relating_type
        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())

-    def generate(self, link_to_scene=True):
-        self.file = IfcStore.get_file()
-        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(IfcStore.get_file())
+    def generate(self):
+        self.file = tool.Ifc.get()
+        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
        material = ifcopenshell.util.element.get_material(self.relating_type)
        if material and material.is_a("IfcMaterialProfileSet"):
            self.profile_set = material
@@ -114,13 +58,13 @@ class DumbProfileGenerator:
        self.rotation = 0
        self.location = Vector((0, 0, 0))
        self.cardinal_point = int(bpy.context.scene.BIMModelProperties.cardinal_point)
-        return self.derive_from_cursor(link_to_scene=link_to_scene)
+        return self.derive_from_cursor()

-    def derive_from_cursor(self, link_to_scene):
+    def derive_from_cursor(self):
        self.location = bpy.context.scene.cursor.location
-        return self.create_profile(link_to_scene)
+        return self.create_profile()

-    def create_profile(self, link_to_scene):
+    def create_profile(self):
        ifc_classes = ifcopenshell.util.type.get_applicable_entities(self.relating_type.is_a(), self.file.schema)
        # Standard cases are deprecated, so let's cull them
        ifc_class = [c for c in ifc_classes if "StandardCase" not in c][0]
@@ -132,10 +76,9 @@ class DumbProfileGenerator:
        if self.relating_type.is_a() in ["IfcBeamType", "IfcMemberType"]:
            matrix_world = Matrix.Rotation(pi / 2, 4, "Z") @ Matrix.Rotation(pi / 2, 4, "X") @ matrix_world
        matrix_world.col[3] = self.location.to_4d()
-        if link_to_scene and self.collection_obj and self.collection_obj.BIMObjectProperties.ifc_definition_id:
+        if self.collection_obj and self.collection_obj.BIMObjectProperties.ifc_definition_id:
            matrix_world[2][3] = self.collection_obj.location[2]
-        if link_to_scene:
-            self.collection.objects.link(obj)
+        self.collection.objects.link(obj)

        element = blenderbim.core.root.assign_class(
            tool.Ifc,
@@ -190,8 +133,7 @@ class DumbProfileGenerator:
        pset = ifcopenshell.api.run("pset.add_pset", self.file, product=element, name="EPset_Parametric")
        ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset, properties={"Engine": "BlenderBIM.DumbProfile"})

-        if link_to_scene:
-            obj.select_set(True)
+        obj.select_set(True)

        return obj

@@ -318,7 +260,7 @@ class DumbProfileJoiner:
        body[1 if connection == "ATEND" else 0] = intersect
        self.recreate_profile(element1, profile1, axis, body)

-    def set_depth(self, profile1, length):
+    def set_depth(self, profile1, si_length):
        element1 = tool.Ifc.get_entity(profile1)
        if not element1:
            return
@@ -328,9 +270,7 @@ class DumbProfileJoiner:
        axis1 = self.get_profile_axis(profile1)
        axis = copy.deepcopy(axis1)
        body = copy.deepcopy(axis1)
-        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        si_length = unit_scale * length
-        end = profile1.matrix_world @ Vector((si_length, 0, 0))
+        end = profile1.matrix_world @ Vector((0, 0, si_length))
        axis[1] = end
        body[1] = end
        self.recreate_profile(element1, profile1, axis, body)
@@ -502,9 +442,7 @@ class DumbProfileJoiner:
            # Openings should move with the host overall ...
            # ... except their position should stay the same along the local Z axis of the wall
            for opening in [r.RelatedOpeningElement for r in element.HasOpenings]:
-                percent = tool.Cad.edge_percent(
-                    self.body[0], (previous_origin, (previous_matrix @ Vector((0, 0, 1))))
-                )
+                percent = tool.Cad.edge_percent(self.body[0], (previous_origin, (previous_matrix @ Vector((0, 0, 1)))))
                is_z_offset_increased = True if percent < 0 else False

                change_in_z = (self.body[0] - previous_origin).length / self.unit_scale
@@ -806,14 +744,7 @@ class DumbProfileJoiner:
        return self.create_matrix(p, x_axis, y_axis, z_axis)

    def create_matrix(self, p, x, y, z):
-        return Matrix(
-            (
-                (x[0], y[0], z[0], p[0]),
-                (x[1], y[1], z[1], p[1]),
-                (x[2], y[2], z[2], p[2]),
-                (0.0, 0.0, 0.0, 1.0),
-            )
-        )
+        return Matrix([x, y, z, p]).to_4x4().transposed()

    def get_profile_axis(self, obj):
        z_values = [v[2] for v in obj.bound_box]
@@ -905,13 +836,144 @@ class Rotate90(bpy.types.Operator, tool.Ifc.Operator):
        return context.selected_objects

    def _execute(self, context):
-        objs = []
+        profile_objs = []
+        layer2_objs = []
        for obj in context.selected_objects:
            element = tool.Ifc.get_entity(obj)
+            usage = tool.Model.get_usage_type(element)
+            if usage == "PROFILE":
+                profile_objs.append(obj)
+            elif usage == "LAYER2":
+                layer2_objs.append(obj)
            if element.ConnectedTo or element.ConnectedFrom:
-                objs.append(obj)
+                ifcopenshell.api.run("geometry.disconnect_path", tool.Ifc.get(), element=element, connection_type="ATSTART")
+                ifcopenshell.api.run("geometry.disconnect_path", tool.Ifc.get(), element=element, connection_type="ATEND")
+                ifcopenshell.api.run("geometry.disconnect_path", tool.Ifc.get(), element=element, connection_type="ATPATH")
            rotate_matrix = Matrix.Rotation(pi / 2, 4, self.axis)
            obj.matrix_world @= rotate_matrix
        bpy.context.view_layer.update()
-        DumbProfileRecalculator().recalculate(objs)
+        DumbProfileRecalculator().recalculate(profile_objs)
+        DumbWallRecalculator().recalculate(layer2_objs)
+        return {"FINISHED"}
+
+
+class EnableEditingExtrusionAxis(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.enable_editing_extrusion_axis"
+    bl_label = "Enable Editing Extrusion Axis"
+    bl_options = {"REGISTER", "UNDO"}
+
+    @classmethod
+    def poll(cls, context):
+        return context.selected_objects
+
+    def _execute(self, context):
+        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+
+        axis = ifcopenshell.util.representation.get_representation(element, "Model", "Axis", "GRAPH_VIEW")
+        if axis:
+            position = obj.matrix_world.copy()
+            tool.Model.import_axis(axis.Items[0], obj=obj)
+        else:
+            body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+            extrusion = tool.Model.get_extrusion(body)
+
+            if extrusion.Position:
+                position = Matrix(ifcopenshell.util.placement.get_axis2placement(extrusion.Position).tolist())
+                position[0][3] *= self.unit_scale
+                position[1][3] *= self.unit_scale
+                position[2][3] *= self.unit_scale
+            else:
+                position = Matrix()
+
+            direction = Vector(extrusion.ExtrudedDirection.DirectionRatios).normalized()
+            tool.Model.import_axis([Vector((0, 0, 0)), direction * extrusion.Depth], obj=obj, position=position)
+
+        bpy.ops.object.mode_set(mode="EDIT")
+        ProfileDecorator.install(context, exit_edit_mode_callback=lambda: disable_editing_extrusion_axis(context))
+        if not bpy.app.background:
+            bpy.ops.wm.tool_set_by_id(tool.Blender.get_viewport_context(), name="bim.cad_tool")
+        return {"FINISHED"}
+
+
+def disable_editing_extrusion_axis(context):
+    ProfileDecorator.uninstall()
+    bpy.ops.object.mode_set(mode="OBJECT")
+
+    obj = context.active_object
+    element = tool.Ifc.get_entity(obj)
+    body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+
+    blenderbim.core.geometry.switch_representation(
+        tool.Ifc,
+        tool.Geometry,
+        obj=obj,
+        representation=body,
+        should_reload=True,
+        is_global=True,
+        should_sync_changes_first=False,
+    )
+    return {"FINISHED"}
+
+
+class DisableEditingExtrusionAxis(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.disable_editing_extrusion_axis"
+    bl_label = "Disable Editing Extrusion Axis"
+    bl_options = {"REGISTER", "UNDO"}
+
+    @classmethod
+    def poll(cls, context):
+        return context.selected_objects
+
+    def _execute(self, context):
+        return disable_editing_extrusion_axis()
+
+
+class EditExtrusionAxis(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.edit_extrusion_axis"
+    bl_label = "Edit Extrusion Axis"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        ProfileDecorator.uninstall()
+        bpy.ops.object.mode_set(mode="OBJECT")
+
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+
+        start = obj.matrix_world @ obj.data.vertices[0].co.copy()
+        end = obj.matrix_world @ obj.data.vertices[1].co.copy()
+        depth = (end - start).length
+        z_axis = (end - start).normalized()
+        y_axis = Vector((0, 0, 1))
+        x_axis = y_axis.cross(z_axis).normalized()
+        y_axis = z_axis.cross(x_axis).normalized()
+
+        body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+        blenderbim.core.geometry.switch_representation(
+            tool.Ifc,
+            tool.Geometry,
+            obj=obj,
+            representation=body,
+            should_reload=True,
+            is_global=True,
+            should_sync_changes_first=False,
+        )
+
+        matrix = Matrix(
+            (
+                [x_axis[0], y_axis[0], z_axis[0], start.x],
+                [x_axis[1], y_axis[1], z_axis[1], start.y],
+                [x_axis[2], y_axis[2], z_axis[2], start.z],
+                [0, 0, 0, 1],
+            )
+        )
+
+        obj.matrix_world = matrix
+        bpy.context.view_layer.update()
+
+        joiner = DumbProfileJoiner()
+        joiner.set_depth(obj, depth)
        return {"FINISHED"}
@@ -21,8 +21,8 @@ import ifcopenshell
 import blenderbim.tool as tool
 from blenderbim.bim.prop import ObjProperty
 from blenderbim.bim.module.model.data import AuthoringData
-from blenderbim.bim.module.model.root import ConstrTypeEntityNotFound
 from bpy.types import PropertyGroup, NodeTree
+from math import pi


 def get_ifc_class(self, context):
@@ -37,16 +37,10 @@ def get_type_class(self, context):
    return AuthoringData.data["type_class"]


-def get_relating_type(self, context):
+def get_relating_type_id(self, context):
    if not AuthoringData.is_loaded:
        AuthoringData.load()
-    return AuthoringData.data["relating_types_ids"]
-
-
-def get_relating_type_browser(self, context):
-    if not AuthoringData.is_loaded:
-        AuthoringData.load()
-    return AuthoringData.data["relating_types_ids_browser"]
+    return AuthoringData.data["relating_type_id"]


 def get_type_predefined_type(self, context):
@@ -55,41 +49,9 @@ def get_type_predefined_type(self, context):
    return AuthoringData.data["type_predefined_type"]


-def store_cursor_position(context, event, cursor=True, window=True):
-    browser_state = context.scene.BIMModelProperties.constr_browser_state
-    if cursor:
-        browser_state.cursor_x, browser_state.cursor_y = event.mouse_x, event.mouse_y
-    if window:
-        browser_state.window_x, browser_state.window_y = event.mouse_x, event.mouse_y
-
-
-def update_icon_id(self, context, browser=False):
-    if context == "lost_context" or (context.region is not None and context.region.type != "TOOL_HEADER"):
-        ifc_class = self.ifc_class_browser if browser else self.ifc_class
-        relating_type_id = self.relating_type_id_browser if browser else self.relating_type_id
-        # relating_type = AuthoringData.relating_type_name_by_id(ifc_class, relating_type_id)
-
-        if ifc_class not in self.constr_classes or relating_type_id not in self.constr_classes[ifc_class].constr_types:
-            try:
-                AuthoringData.assetize_relating_type_from_selection(browser=browser)
-            except ConstrTypeEntityNotFound:
-                return
-
-        def set_icon(update_interval_seconds=1e-4):
-            if (
-                ifc_class not in self.constr_classes
-                or relating_type_id not in self.constr_classes[ifc_class].constr_types
-            ):
-                return update_interval_seconds
-            else:
-                self.icon_id = self.constr_classes[ifc_class].constr_types[relating_type_id].icon_id
-
-        bpy.app.timers.register(set_icon)
-
-
 def update_ifc_class(self, context):
    bpy.ops.bim.load_type_thumbnails(ifc_class=self.ifc_class)
-    AuthoringData.data["relating_types_ids"] = AuthoringData.relating_types()
+    AuthoringData.data["relating_type_id"] = AuthoringData.relating_types()
    AuthoringData.data["type_thumbnail"] = AuthoringData.type_thumbnail()


@@ -102,21 +64,8 @@ def update_type_class(self, context):
    AuthoringData.data["type_predefined_type"] = AuthoringData.type_predefined_type()


-def update_ifc_class_browser(self, context):
-    if context.region is not None and context.region.type != "TOOL_HEADER":
-        AuthoringData.load_ifc_classes()
-        AuthoringData.load_relating_types_browser()
-        if self.updating:
-            return
-        ifc_class = self.ifc_class_browser
-        constr_class_info = AuthoringData.constr_class_info(ifc_class)
-
-        if constr_class_info is None or not constr_class_info.fully_loaded:
-            AuthoringData.assetize_constr_class(ifc_class)
-
-
-def update_relating_type(self, context):
-    AuthoringData.load_relating_types()
+def update_relating_type_id(self, context):
+    AuthoringData.data["relating_type_id"] = AuthoringData.relating_type_id()
    AuthoringData.data["type_thumbnail"] = AuthoringData.type_thumbnail()


@@ -124,81 +73,20 @@ def update_type_page(self, context):
    AuthoringData.data["paginated_relating_types"] = AuthoringData.paginated_relating_types()


-def update_relating_type_browser(self, context):
-    AuthoringData.load_relating_types_browser()
-    if not self.updating:
-        update_icon_id(self, context, browser=True)
-
-
-def update_relating_type_by_name(self, context):
-    AuthoringData.load_relating_types()
-    relating_type_id = AuthoringData.relating_type_id_by_name(self.ifc_class, self.relating_type)
-    if relating_type_id is not None:
-        self.relating_type_id = relating_type_id
-
-
-def get_constr_class_info(props, ifc_class):
-    return props.constr_classes[ifc_class] if ifc_class in props.constr_classes else None
-
-
-def update_preview_multiple(self, context):
-    if context.region is not None and context.region.type != "TOOL_HEADER":
-        if self.preview_multiple_constr_types:
-            ifc_class = self.ifc_class
-            constr_class_info = get_constr_class_info(self, ifc_class)
-            if constr_class_info is None or not constr_class_info.fully_loaded:
-                AuthoringData.assetize_constr_class(ifc_class)
-        else:
-            update_relating_type(self, context)
-
-
-class ConstrTypeInfo(PropertyGroup):
-    name: bpy.props.StringProperty(name="Construction type ID")
-    icon_id: bpy.props.IntProperty(name="Icon ID")
-    object: bpy.props.PointerProperty(name="Object", type=bpy.types.Object)
-
-
-class ConstrClassInfo(PropertyGroup):
-    name: bpy.props.StringProperty(name="Construction class")
-    constr_types: bpy.props.CollectionProperty(type=ConstrTypeInfo)
-    fully_loaded: bpy.props.BoolProperty(default=False)
-
-
-class ConstrBrowserState(PropertyGroup):
-    cursor_x: bpy.props.IntProperty()
-    cursor_y: bpy.props.IntProperty()
-    window_x: bpy.props.IntProperty()
-    window_y: bpy.props.IntProperty()
-    far_away_x: bpy.props.IntProperty(default=10)  # lower left corner to temporarily warp the mouse
-    far_away_y: bpy.props.IntProperty(default=10)  # useful to close popup operators
-    updating: bpy.props.BoolProperty()
-    update_delay: bpy.props.FloatProperty(default=3e-2)
-
-
 class BIMModelProperties(PropertyGroup):
    ifc_class: bpy.props.EnumProperty(items=get_ifc_class, name="Construction Class", update=update_ifc_class)
-    ifc_class_browser: bpy.props.EnumProperty(
-        items=get_ifc_class, name="Construction Class", update=update_ifc_class_browser
-    )
-    relating_type: bpy.props.StringProperty(update=update_relating_type_by_name)
    relating_type_id: bpy.props.EnumProperty(
-        items=get_relating_type, name="Construction Type", update=update_relating_type
-    )
-    relating_type_id_browser: bpy.props.EnumProperty(
-        items=get_relating_type_browser, name="Construction Type", update=update_relating_type_browser
+        items=get_relating_type_id, name="Construction Type", update=update_relating_type_id
    )
    icon_id: bpy.props.IntProperty()
-    preview_multiple_constr_types: bpy.props.BoolProperty(default=False, update=update_preview_multiple)
    updating: bpy.props.BoolProperty(default=False)
    occurrence_name_style: bpy.props.EnumProperty(
        items=[("CLASS", "By Class", ""), ("TYPE", "By Type", ""), ("CUSTOM", "Custom", "")],
        name="Occurrence Name Style",
    )
    occurrence_name_function: bpy.props.StringProperty(name="Occurrence Name Function")
-    getter_enum = {"ifc_class": get_ifc_class, "relating_type": get_relating_type}
-    constr_classes: bpy.props.CollectionProperty(type=ConstrClassInfo)
-    constr_browser_state: bpy.props.PointerProperty(type=ConstrBrowserState)
-    extrusion_depth: bpy.props.FloatProperty(default=42.0)
+    getter_enum = {"ifc_class": get_ifc_class, "relating_type": get_relating_type_id}
+    extrusion_depth: bpy.props.FloatProperty(default=42.0, subtype="DISTANCE")
    cardinal_point: bpy.props.EnumProperty(
        items=(
            # TODO: complain to buildingSMART
@@ -225,7 +113,7 @@ class BIMModelProperties(PropertyGroup):
        name="Cardinal Point",
        default="5",
    )
-    length: bpy.props.FloatProperty(default=42.0)
+    length: bpy.props.FloatProperty(default=42.0, subtype="DISTANCE")
    openings: bpy.props.CollectionProperty(type=ObjProperty)
    x: bpy.props.FloatProperty(name="X", default=0.5)
    y: bpy.props.FloatProperty(name="Y", default=0.5)
@@ -244,26 +132,74 @@ class BIMModelProperties(PropertyGroup):
            ("WINDOW", "Window", ""),
            ("DOOR", "Door", ""),
            ("STAIR", "Stair", ""),
+            ("RAILING", "Railing", ""),
+            ("ROOF", "Roof", ""),
        ),
        name="Type Template",
        default="MESH",
    )
    type_class: bpy.props.EnumProperty(items=get_type_class, name="IFC Class", update=update_type_class)
    type_predefined_type: bpy.props.EnumProperty(items=get_type_predefined_type, name="Predefined Type", default=None)
+    type_name: bpy.props.StringProperty(name="Name", default="TYPEX")
+    decorator_color_selected: bpy.props.FloatVectorProperty(
+        name="Selected Elements Color",
+        subtype="COLOR",
+        default=(0.545, 0.863, 0, 1),  # green
+        min=0.0,
+        max=1.0,
+        size=4,
+        description="Color of selected verts/edges (used in profile editing mode)",
+    )
+    decorator_color_unselected: bpy.props.FloatVectorProperty(
+        name="Not Selected Elements Color",
+        subtype="COLOR",
+        default=(1, 1, 1, 1),  # green
+        min=0.0,
+        max=1.0,
+        size=4,
+        description="Color of not selected verts/edges (used in profile editing mode)",
+    )
+    decorator_color_special: bpy.props.FloatVectorProperty(
+        name="Special Elements Color",
+        subtype="COLOR",
+        default=(0.157, 0.565, 1, 1),  # blue
+        min=0.0,
+        max=1.0,
+        size=4,
+        description="Color of special selected verts/edges (openings, preview verts/edges in roof editing, verts with arcs/circles in profile editing)",
+    )


 class BIMArrayProperties(PropertyGroup):
-    is_editing: bpy.props.IntProperty(default=-1)
-    count: bpy.props.IntProperty(name="Count", default=0)
+    is_editing: bpy.props.IntProperty(
+        default=-1, description="Currently edited array index. -1 if not in array editing mode."
+    )
+    count: bpy.props.IntProperty(name="Count", default=0, min=0)
    x: bpy.props.FloatProperty(name="X", default=0)
    y: bpy.props.FloatProperty(name="Y", default=0)
    z: bpy.props.FloatProperty(name="Z", default=0)
+    use_local_space: bpy.props.BoolProperty(
+        name="Use Local Space",
+        description="Use local space for array items offset instead of world space",
+        default=True,
+    )
+    method: bpy.props.EnumProperty(
+        items=(("OFFSET", "Offset", ""), ("DISTRIBUTE", "Distribute", "")),
+        name="Method",
+        default="OFFSET",
+    )
+    sync_children: bpy.props.BoolProperty(
+        name="Sync Children",
+        description="Regenerate all children based on the parent object",
+        default=False,
+    )


 class BIMStairProperties(PropertyGroup):
    stair_types = (
        ("CONCRETE", "Concrete", ""),
        ("WOOD/STEEL", "Wood / Steel", ""),
+        ("GENERIC", "Generic", ""),
    )

    stair_added_previously: bpy.props.BoolProperty(default=False)
@@ -284,7 +220,6 @@ class BIMStairProperties(PropertyGroup):
            "width": self.width,
            "height": self.height,
            "number_of_treads": self.number_of_treads,
-            "tread_depth": self.tread_depth,
            "tread_run": self.tread_run,
        }

@@ -294,11 +229,20 @@ class BIMStairProperties(PropertyGroup):
                    "base_slab_depth": self.base_slab_depth,
                    "top_slab_depth": self.top_slab_depth,
                    "has_top_nib": self.has_top_nib,
+                    "tread_depth": self.tread_depth,
                }
            )
            return stair_kwargs

        elif self.stair_type == "WOOD/STEEL":
+            stair_kwargs.update(
+                {
+                    "tread_depth": self.tread_depth,
+                }
+            )
+            return stair_kwargs
+
+        elif self.stair_type == "GENERIC":
            return stair_kwargs


@@ -330,6 +274,7 @@ class BIMWindowProperties(PropertyGroup):
    )

    # number of panels and default mullion/transom values
+    # fmt: off
    window_types_panels = {
        "SINGLE_PANEL":            (1, ((0,   0  ), (0,    0  ))),
        "DOUBLE_PANEL_HORIZONTAL": (2, ((0,   0  ), (0.45, 0  ))),
@@ -341,6 +286,7 @@ class BIMWindowProperties(PropertyGroup):
        "TRIPLE_PANEL_HORIZONTAL": (3, ((0,   0  ), (0.3,  0.6))),
        "TRIPLE_PANEL_VERTICAL":   (3, ((0.2, 0.4), (0,    0  ))),
    }
+    # fmt: on

    window_added_previously: bpy.props.BoolProperty(default=False)
    is_editing: bpy.props.IntProperty(default=-1)
@@ -443,7 +389,9 @@ class BIMDoorProperties(PropertyGroup):
        ("DOUBLE_SWING_LEFT", "DOUBLE_SWING_LEFT", ""),
        ("DOUBLE_SWING_RIGHT", "DOUBLE_SWING_RIGHT", ""),
        ("DOUBLE_DOOR_SINGLE_SWING", "DOUBLE_DOOR_SINGLE_SWING", ""),
-        ("DOUBLE_DOOR_DOUBLE_SWING", "DOUBLE_DOOR_DOUBLE_SWING", ""),
+        ("SLIDING_TO_LEFT", "SLIDING_TO_LEFT", ""),
+        ("SLIDING_TO_RIGHT", "SLIDING_TO_RIGHT", ""),
+        ("DOUBLE_DOOR_SLIDING", "DOUBLE_DOOR_SLIDING", ""),
    )

    door_added_previously: bpy.props.BoolProperty(default=False)
@@ -513,10 +461,12 @@ class BIMDoorProperties(PropertyGroup):
            "lining_depth": self.lining_depth,
            "lining_thickness": self.lining_thickness,
            "lining_offset": self.lining_offset,
-            "lining_to_panel_offset_x": self.lining_to_panel_offset_x,
-            "lining_to_panel_offset_y": self.lining_to_panel_offset_y,
        }

+        if "SLIDING" not in self.door_type:
+            kwargs["lining_to_panel_offset_x"] = self.lining_to_panel_offset_x
+            kwargs["lining_to_panel_offset_y"] = self.lining_to_panel_offset_y
+
        kwargs["transom_thickness"] = self.transom_thickness
        if self.transom_thickness:
            kwargs["transom_offset"] = self.transom_offset
@@ -541,3 +491,56 @@ class BIMDoorProperties(PropertyGroup):
            kwargs["frame_depth"] = self.frame_depth

        return kwargs
+
+
+class BIMRailingProperties(PropertyGroup):
+    railing_types = (("FRAMELESS_PANEL", "FRAMELESS_PANEL", ""),)
+
+    railing_added_previously: bpy.props.BoolProperty(default=False)
+    is_editing: bpy.props.IntProperty(default=-1)
+    is_editing_path: bpy.props.BoolProperty(default=False)
+
+    railing_type: bpy.props.EnumProperty(name="Railing Type", items=railing_types, default="FRAMELESS_PANEL")
+    height: bpy.props.FloatProperty(name="Height", default=1.0)
+    thickness: bpy.props.FloatProperty(name="Thickness", default=0.050)
+    spacing: bpy.props.FloatProperty(name="Spacing", default=0.050)
+
+    def get_general_kwargs(self):
+        return {
+            "railing_type": self.railing_type,
+            "height": self.height,
+            "thickness": self.thickness,
+            "spacing": self.spacing,
+        }
+
+
+class BIMRoofProperties(PropertyGroup):
+    roof_types = (("HIP/GABLE ROOF", "HIP/GABLE ROOF", ""),)
+    roof_generation_methods = (
+        ("HEIGHT", "HEIGHT", ""),
+        ("ANGLE", "ANGLE", ""),
+    )
+
+    roof_added_previously: bpy.props.BoolProperty(default=False)
+    is_editing: bpy.props.IntProperty(default=-1)
+    is_editing_path: bpy.props.BoolProperty(default=False)
+
+    roof_type: bpy.props.EnumProperty(name="Roof Type", items=roof_types, default="HIP/GABLE ROOF")
+    generation_method: bpy.props.EnumProperty(
+        name="Roof Generation Method", items=roof_generation_methods, default="ANGLE"
+    )
+    height: bpy.props.FloatProperty(
+        name="Height", default=1.0, description="Maximum height of the roof to be generated.", subtype="DISTANCE"
+    )
+    angle: bpy.props.FloatProperty(name="Slope Angle", default=pi / 18, subtype="ANGLE")
+
+    def get_general_kwargs(self):
+        kwargs = {
+            "roof_type": self.roof_type,
+            "generation_method": self.generation_method,
+        }
+        if self.generation_method == "HEIGHT":
+            kwargs["height"] = self.height
+        else:
+            kwargs["angle"] = self.angle
+        return kwargs
@@ -0,0 +1,436 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 @Andrej730
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import bpy
+from bpy.types import Operator
+import bmesh
+
+import ifcopenshell
+from ifcopenshell.util.shape_builder import V
+import blenderbim
+import blenderbim.tool as tool
+import blenderbim.core.geometry as core
+from blenderbim.bim.helper import convert_property_group_from_si
+from blenderbim.bim.ifc import IfcStore
+from blenderbim.bim.module.model.door import bm_sort_out_geom
+from blenderbim.bim.module.model.data import RailingData, refresh
+from blenderbim.bim.module.model.decorator import ProfileDecorator
+
+from mathutils import Vector, Matrix
+from pprint import pprint
+import json
+
+# reference:
+# https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRailing.htm
+# https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRailingType.htm
+
+
+def bm_split_edge_at_offset(edge, offset):
+    v0, v1 = edge.verts
+
+    offset = offset / 2
+    edge_len = (v0.co - v1.co).xy.length
+
+    split_output_0 = bmesh.utils.edge_split(edge, v0, offset / edge_len)
+    split_output_1 = bmesh.utils.edge_split(edge, v1, offset / (edge_len - offset))
+    new_geometry = bm_sort_out_geom(split_output_0 + split_output_1)
+    return new_geometry
+
+
+def update_railing_modifier_ifc_data(context):
+    """should be called after new geometry settled
+    since it's going to update ifc representation
+    """
+    obj = context.active_object
+    props = obj.BIMRailingProperties
+    element = tool.Ifc.get_entity(obj)
+    ifc_file = tool.Ifc.get()
+
+    # type attributes
+    element.PredefinedType = "USERDEFINED"
+    # occurences attributes
+    occurences = tool.Ifc.get_all_element_occurences(element)
+    for occurence in occurences:
+        occurence.ObjectType = props.railing_type
+
+    # update pset
+    pset_common = tool.Pset.get_element_pset(element, "Pset_RailingCommon")
+    if not pset_common:
+        pset_common = ifcopenshell.api.run("pset.add_pset", ifc_file, product=element, name="Pset_RailingCommon")
+
+    ifcopenshell.api.run(
+        "pset.edit_pset",
+        ifc_file,
+        pset=pset_common,
+        properties={
+            "Height": props.height,
+        },
+    )
+    tool.Ifc.edit(obj)
+
+
+def update_bbim_railing_pset(element, railing_data):
+    pset = tool.Pset.get_element_pset(element, "BBIM_Railing")
+    if not pset:
+        pset = ifcopenshell.api.run("pset.add_pset", tool.Ifc.get(), product=element, name="BBIM_Railing")
+    railing_data = json.dumps(railing_data, default=list)
+    ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties={"Data": railing_data})
+
+
+def update_railing_modifier_bmesh(context):
+    obj = context.object
+    props = obj.BIMRailingProperties
+
+    if not RailingData.is_loaded:
+        RailingData.load()
+    path_data = RailingData.data["parameters"]["data_dict"]["path_data"]
+
+    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+    # need to make sure we support edit mode
+    # since users will probably be in edit mode when they'll be changing railing path
+    bm = tool.Blender.get_bmesh_for_mesh(obj.data, clean=True)
+
+    # generating railing path
+    bm.verts.index_update()
+    bm.edges.index_update()
+    new_verts = [bm.verts.new(Vector(v) * si_conversion) for v in path_data["verts"]]
+    new_edges = [bm.edges.new((new_verts[e[0]], new_verts[e[1]])) for e in path_data["edges"]]
+    bm.verts.index_update()
+    bm.edges.index_update()
+
+    if props.is_editing_path:
+        tool.Blender.apply_bmesh(obj.data, bm)
+        return
+
+    # generating the entire railing
+    height = props.height * si_conversion
+    thickness = props.thickness * si_conversion
+    spacing = props.spacing * si_conversion
+
+    # spacing
+    # split each edge in 3 segments by 0.5 * spacing by x-y plane
+    main_edges = bm.edges[:]
+    for main_edge in main_edges:
+        bm_split_edge_at_offset(main_edge, spacing)
+
+    # thickness
+    # keep track of translated verts so we won't translate the same
+    # vert twice
+    edge_dissolving_verts = []
+    for main_edge in main_edges:
+        v0, v1 = main_edge.verts
+        edge_dissolving_verts.extend([v0, v1])
+
+        edge_dir = ((v1.co - v0.co) * V(1, 1, 0)).normalized()
+        ortho_vector = edge_dir.cross(V(0, 0, 1))
+
+        extruded_geom = bmesh.ops.extrude_edge_only(bm, edges=[main_edge])["geom"]
+        extruded_verts = bm_sort_out_geom(extruded_geom)["verts"]
+        bmesh.ops.translate(bm, vec=ortho_vector * (-thickness / 2), verts=extruded_verts)
+
+        extruded_geom = bmesh.ops.extrude_edge_only(bm, edges=[main_edge])["geom"]
+        extruded_verts = bm_sort_out_geom(extruded_geom)["verts"]
+        bmesh.ops.translate(bm, vec=ortho_vector * (thickness / 2), verts=extruded_verts)
+
+        # dissolve middle edge
+        bmesh.ops.dissolve_edges(bm, edges=[main_edge])
+
+    # height
+    extruded_geom = bmesh.ops.extrude_face_region(bm, geom=bm.faces)["geom"]
+    extruded_verts = bm_sort_out_geom(extruded_geom)["verts"]
+    extrusion_vector = Vector((0, 0, 1)) * height
+    bmesh.ops.translate(bm, vec=extrusion_vector, verts=extruded_verts)
+
+    # dissolve middle edges
+    edges_to_dissolve = []
+    verts_to_dissolve = []
+    for v in edge_dissolving_verts:
+        for e in v.link_edges:
+            other_vert = e.other_vert(v)
+            if other_vert in extruded_verts:
+                edges_to_dissolve.append(e)
+                verts_to_dissolve.append(other_vert)
+    bmesh.ops.dissolve_edges(bm, edges=edges_to_dissolve)
+    bmesh.ops.dissolve_verts(bm, verts=verts_to_dissolve)
+
+    # to remove unnecessary verts in 0 spacing case
+    bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
+
+    tool.Blender.apply_bmesh(obj.data, bm)
+
+
+def get_path_data(obj):
+    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+    if obj.mode == "EDIT":
+        # otherwise mesh may not contain all changes
+        # added in edit mode
+        obj.update_from_editmode()
+
+    mesh = obj.data
+    path_data = dict()
+    path_data["edges"] = [e.vertices[:] for e in mesh.edges]
+    path_data["verts"] = [v.co / si_conversion for v in mesh.vertices]
+
+    if not path_data["edges"] or not path_data["verts"]:
+        return None
+    return path_data
+
+
+class BIM_OT_add_railing(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "mesh.add_railing"
+    bl_label = "Railing"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        ifc_file = tool.Ifc.get()
+        if not ifc_file:
+            self.report({"ERROR"}, "You need to start IFC project first to create a railing.")
+            return {"CANCELLED"}
+
+        if context.object is not None:
+            spawn_location = context.object.location.copy()
+            context.object.select_set(False)
+        else:
+            spawn_location = bpy.context.scene.cursor.location.copy()
+
+        mesh = bpy.data.meshes.new("IfcRailing")
+        obj = bpy.data.objects.new("IfcRailing", mesh)
+        obj.location = spawn_location
+        body_context = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW")
+        blenderbim.core.root.assign_class(
+            tool.Ifc,
+            tool.Collector,
+            tool.Root,
+            obj=obj,
+            ifc_class="IfcRailing",
+            should_add_representation=True,
+            context=body_context,
+        )
+        bpy.ops.object.select_all(action="DESELECT")
+        bpy.context.view_layer.objects.active = None
+        bpy.context.view_layer.objects.active = obj
+        obj.select_set(True)
+        bpy.ops.bim.add_railing()
+        return {"FINISHED"}
+
+
+# UI operators
+class AddRailing(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.add_railing"
+    bl_label = "Add Railing"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        props = obj.BIMRailingProperties
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+
+        if element.is_a() not in ("IfcRailing", "IfcRailingType"):
+            self.report({"ERROR"}, "Object has to be IfcRailing/IfcRailingType type to add a railing.")
+            return {"CANCELLED"}
+
+        # need to make sure all default props will have correct units
+        if not props.railing_added_previously:
+            skip_props = ("is_editing", "railing_type", "railing_added_previously")
+            convert_property_group_from_si(props, skip_props=skip_props)
+
+        railing_data = props.get_general_kwargs()
+        path_data = get_path_data(obj)
+        if not path_data:
+            path_data = {
+                "edges": [[0, 1], [1, 2]],
+                "verts": [
+                    Vector([-1.0, 0.0, 0.0]) / si_conversion,
+                    Vector([0.0, 0.0, 0.0]) / si_conversion,
+                    Vector([1.0, 0.0, 0.0]) / si_conversion,
+                ],
+            }
+        railing_data["path_data"] = path_data
+
+        update_bbim_railing_pset(element, railing_data)
+        refresh()
+        update_railing_modifier_bmesh(context)
+        update_railing_modifier_ifc_data(context)
+        return {"FINISHED"}
+
+
+class EnableEditingRailing(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.enable_editing_railing"
+    bl_label = "Enable Editing Railing"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        props = obj.BIMRailingProperties
+        element = tool.Ifc.get_entity(obj)
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Railing", "Data"))
+        data["path_data"] = json.dumps(data["path_data"])
+
+        # required since we could load pset from .ifc and BIMRailingProperties won't be set
+        for prop_name in data:
+            setattr(props, prop_name, data[prop_name])
+
+        # need to make sure all props that weren't used before
+        # will have correct units
+        skip_props = ("is_editing", "railing_type", "railing_added_previously")
+        skip_props += tuple(data.keys())
+        convert_property_group_from_si(props, skip_props=skip_props)
+
+        props.is_editing = 1
+        return {"FINISHED"}
+
+
+class CancelEditingRailing(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.cancel_editing_railing"
+    bl_label = "Cancel Editing Railing"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Railing", "Data"))
+        props = obj.BIMRailingProperties
+        # restore previous settings since editing was canceled
+        for prop_name in data:
+            setattr(props, prop_name, data[prop_name])
+
+        body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+        blenderbim.core.geometry.switch_representation(
+            tool.Ifc,
+            tool.Geometry,
+            obj=obj,
+            representation=body,
+            should_reload=True,
+            is_global=True,
+            should_sync_changes_first=False,
+        )
+
+        props.is_editing = -1
+        return {"FINISHED"}
+
+
+class FinishEditingRailing(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.finish_editing_railing"
+    bl_label = "Finish Editing Railing"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        props = obj.BIMRailingProperties
+
+        if not RailingData.is_loaded:
+            RailingData.load()
+        path_data = RailingData.data["parameters"]["data_dict"]["path_data"]
+
+        railing_data = props.get_general_kwargs()
+        railing_data["path_data"] = path_data
+        props.is_editing = -1
+
+        update_bbim_railing_pset(element, railing_data)
+        update_railing_modifier_ifc_data(context)
+        return {"FINISHED"}
+
+
+class EnableEditingRailingPath(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.enable_editing_railing_path"
+    bl_label = "Enable Editing Railing Path"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        props = obj.BIMRailingProperties
+
+        props.is_editing_path = True
+        update_railing_modifier_bmesh(context)
+
+        if bpy.context.object.mode != "EDIT":
+            bpy.ops.object.mode_set(mode="EDIT")
+        bpy.ops.wm.tool_set_by_id(tool.Blender.get_viewport_context(), name="bim.cad_tool")
+        ProfileDecorator.install(context, exit_edit_mode_callback=lambda: cancel_editing_railing_path(context))
+        return {"FINISHED"}
+
+
+def cancel_editing_railing_path(context):
+    obj = context.active_object
+    props = obj.BIMRailingProperties
+
+    ProfileDecorator.uninstall()
+    props.is_editing_path = False
+
+    update_railing_modifier_bmesh(context)
+    if bpy.context.object.mode == "EDIT":
+        bpy.ops.object.mode_set(mode="OBJECT")
+    return {"FINISHED"}
+
+
+class CancelEditingRailingPath(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.cancel_editing_railing_path"
+    bl_label = "Cancel Editing Railing Path"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        return cancel_editing_railing_path(context)
+
+
+class FinishEditingRailingPath(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.finish_editing_railing_path"
+    bl_label = "Finish Editing Railing Path"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        props = obj.BIMRailingProperties
+
+        railing_data = props.get_general_kwargs()
+        path_data = get_path_data(obj)
+        railing_data["path_data"] = path_data
+        ProfileDecorator.uninstall()
+        props.is_editing_path = False
+
+        update_bbim_railing_pset(element, railing_data)
+        refresh()  # RailingData has to be updated before run update_railing_modifier_bmesh
+        update_railing_modifier_bmesh(context)
+        if bpy.context.object.mode == "EDIT":
+            bpy.ops.object.mode_set(mode="OBJECT")
+        update_railing_modifier_ifc_data(context)
+        return {"FINISHED"}
+
+
+class RemoveRailing(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.remove_railing"
+    bl_label = "Remove Railing"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        props = obj.BIMRailingProperties
+        element = tool.Ifc.get_entity(obj)
+        obj.BIMRailingProperties.is_editing = -1
+
+        pset = tool.Pset.get_element_pset(element, "BBIM_Railing")
+        ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
+        props.railing_added_previously = True
+        return {"FINISHED"}
+
+
+def add_object_button(self, context):
+    self.layout.operator(BIM_OT_add_railing.bl_idname, icon="PLUGIN")
@@ -0,0 +1,706 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>, @Andrej730
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+import bmesh
+
+import ifcopenshell
+import blenderbim
+import blenderbim.tool as tool
+from blenderbim.bim.helper import convert_property_group_from_si
+from blenderbim.bim.module.model.door import bm_sort_out_geom
+from blenderbim.bim.module.model.data import RoofData, refresh
+from blenderbim.bim.module.model.decorator import ProfileDecorator
+
+import json
+from math import tan, pi
+from mathutils import Vector, Matrix
+from bpypolyskel import bpypolyskel
+import shapely
+from pprint import pprint
+
+# reference:
+# https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRoof.htm
+# https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRoofType.htm
+
+
+NON_SI_ROOF_PROPS = ("is_editing", "roof_type", "roof_added_previously", "generation_method", "angle")
+
+
+def float_is_zero(f):
+    return 0.0001 >= f >= -0.0001
+
+
+def bm_mesh_clean_up(bm):
+    # remove internal edges and faces
+    # adding missing faces so we could rely on `e.is_boundary` later
+    bmesh.ops.contextual_create(bm, geom=bm.edges[:])
+    edges_to_dissolve = [e for e in bm.edges if not e.is_boundary]
+    bmesh.ops.dissolve_edges(bm, edges=edges_to_dissolve)
+    bmesh.ops.delete(bm, geom=bm.faces[:], context="FACES_ONLY")
+    bmesh.ops.dissolve_limit(
+        bm,
+        angle_limit=0.0872665,
+        use_dissolve_boundaries=False,
+        delimit={"NORMAL"},
+        edges=bm.edges[:],
+        verts=bm.verts[:],
+    )
+    bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
+
+
+class GenerateHippedRoof(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.generate_hipped_roof"
+    bl_label = "Generate Hipped Roof"
+    bl_options = {"REGISTER", "UNDO"}
+
+    roof_generation_methods = (
+        ("HEIGHT", "HEIGHT", ""),
+        ("ANGLE", "ANGLE", ""),
+    )
+
+    mode: bpy.props.EnumProperty(name="Roof Generation Method", items=roof_generation_methods, default="ANGLE")
+    height: bpy.props.FloatProperty(
+        name="Height", default=1.0, description="Maximum height of the roof to be generated.", subtype="DISTANCE"
+    )
+    angle: bpy.props.FloatProperty(name="Slope Angle", default=pi / 18, subtype="ANGLE")
+
+    def _execute(self, context):
+        obj = bpy.context.active_object
+        if not obj:
+            self.report({"ERROR"}, "Need to select some object first.")
+            return {"CANCELLED"}
+
+        bm = tool.Blender.get_bmesh_for_mesh(obj.data)
+        generate_hiped_roof_bmesh(bm, self.mode, self.height, self.angle)
+        tool.Blender.apply_bmesh(obj.data, bm)
+        return {"FINISHED"}
+
+
+def generate_hiped_roof_bmesh(bm, mode="ANGLE", height=1.0, angle=pi / 18, mutate_current_bmesh=True):
+    """return bmesh with gable roof geometry
+
+    `mutate_current_bmesh` is a flag to indicate whether the input bmesh
+    should be mutated or a new bmesh should be created and returned.
+
+    If the object is in EDIT mode then it will be the only way to change it.
+
+    If roof bmesh needed only to supply into decorator then there is no reason to mutate it.
+    """
+
+    if not mutate_current_bmesh:
+        bm = bm.copy()
+
+    # CLEAN UP
+    bm_mesh_clean_up(bm)
+
+    boundary_lines = []
+
+    original_geometry_data = dict()
+    angle_layer = bm.edges.layers.float.get("BBIM_gable_roof_angles")
+    separate_verts_layer = bm.edges.layers.int.get("BBIM_gable_roof_separate_verts")
+    if angle_layer:
+        original_geometry_data["edges"] = [
+            (set(bm_get_indices(e.verts)), e[angle_layer], e[separate_verts_layer]) for e in bm.edges
+        ]
+    else:
+        original_geometry_data["edges"] = [(set(bm_get_indices(e.verts)), None, None) for e in bm.edges]
+
+    original_geometry_data["verts"] = {v.index: v.co.copy() for v in bm.verts}
+    footprint_z = bm.verts[:][0].co.z
+
+    def calculate_hiped_roof():
+        for edge in bm.edges:
+            boundary_lines.append(shapely.LineString([v.co for v in edge.verts]))
+
+        unioned_boundaries = shapely.union_all(shapely.GeometryCollection(boundary_lines))
+        closed_polygons = shapely.polygonize(unioned_boundaries.geoms)
+
+        # find the polygon with the biggest area
+        roof_polygon = max(closed_polygons.geoms, key=lambda polygon: polygon.area)
+
+        # add z coordinate if not present
+        roof_polygon = shapely.force_3d(roof_polygon)
+
+        # make sure the polygon is counter-clockwise
+        if not shapely.is_ccw(roof_polygon):
+            roof_polygon = roof_polygon.reverse()
+
+        # Define vertices for the base footprint of the building at height 0.0
+        # counterclockwise order
+        verts = [Vector(v) for v in roof_polygon.exterior.coords[0:-1]]
+        total_exterior_verts = len(verts)
+        next_index = total_exterior_verts
+
+        inner_loops = None  # in case when there is no .interiors
+        for interior in roof_polygon.interiors:
+            if inner_loops is None:
+                inner_loops = []
+            loop = interior.coords[0:-1]
+            total_verts = len(loop)
+            verts.extend([Vector(v) for v in loop])
+            inner_loops.append((next_index, total_verts))
+            next_index += total_verts
+
+        unit_vectors = None  # we have no unit vectors, let them computed by polygonize()
+        start_exterior_index = 0
+
+        faces = []
+        nonlocal height, angle
+        if mode == "HEIGHT":
+            height = height
+            angle = 0.0
+        else:
+            angle = tan(angle)
+            height = 0.0
+
+        faces = bpypolyskel.polygonize(
+            verts, start_exterior_index, total_exterior_verts, inner_loops, height, angle, faces, unit_vectors
+        )
+        edges = []
+        return verts, edges, faces
+
+    verts, edges, faces = calculate_hiped_roof()
+    bm.clear()
+
+    new_verts = [bm.verts.new(v) for v in verts]
+    new_edges = [bm.edges.new([new_verts[vi] for vi in edge]) for edge in edges]
+    new_faces = [bm.faces.new([new_verts[vi] for vi in face]) for face in faces]
+
+    def find_identical_new_vert(co):
+        for v in bm.verts:
+            if float_is_zero((co - v.co).length):
+                return v
+
+    def find_other_polygon_verts(edge):
+        polygon = edge.link_faces[0]
+        return [v for v in polygon.verts if v not in edge.verts]
+
+    def change_angle(projected_vert_co, edge_verts, new_angle):
+        A, B = [v.co for v in edge_verts]
+        P = projected_vert_co
+
+        AP = P - A
+        AB = B - A
+        AB_dir = AB.normalized()
+        proj_length = AP.dot(AB_dir)
+        C = A + AB_dir * proj_length
+        Pp = P * Vector([1, 1, 0]) + Vector([0, 0, C.z])
+
+        Pp = P * Vector([1, 1, 0]) + Vector([0, 0, C.z])
+        angle_tan = tan(new_angle)
+        dist = (P.z - Pp.z) / angle_tan
+        PPnew = C + (Pp - C).normalized() * dist
+        Pnew = PPnew * Vector([1, 1, 0]) + Vector([0, 0, P.z])
+        return Pnew
+
+    footprint_edges = []
+    footprint_verts = set()
+    verts_to_change = {}
+    verts_to_rip = []
+    bottom_chords_to_remove = []
+
+    # find footprint edges
+    for edge in bm.edges:
+        if all(float_is_zero(v.co.z - footprint_z) for v in edge.verts):
+            footprint_edges.append(edge)
+            footprint_verts.update(edge.verts)
+
+    old_verts_remap = {}
+    for old_vert in original_geometry_data["verts"]:
+        old_vert_co = original_geometry_data["verts"][old_vert]
+        old_verts_remap[old_vert] = find_identical_new_vert(old_vert_co)
+
+    # iterate over edges from original geometry
+    # if their angle was redefined by user - apply the changes to the related vertices
+    # to match the requested angle
+    for old_edge_verts, defined_angle, separate_verts in original_geometry_data["edges"]:
+        if not defined_angle:
+            continue
+
+        edge_verts_remaped = set(old_verts_remap[old_vert] for old_vert in old_edge_verts)
+
+        for edge in footprint_edges:
+            if set(edge.verts) == edge_verts_remaped:
+                identical_edge = edge
+                break
+
+        verts_to_move = find_other_polygon_verts(identical_edge)
+        for v in verts_to_move:
+            if not separate_verts:
+                vert_co = verts_to_change.get(v, v.co)
+                new_vert_co = change_angle(vert_co, edge_verts_remaped, defined_angle)
+                verts_to_change[v] = new_vert_co
+            else:
+                vert_co = v.co
+                new_vert_co = change_angle(vert_co, edge_verts_remaped, defined_angle)
+                verts_to_rip.append([v, new_vert_co, identical_edge])
+
+        if defined_angle >= pi / 2:
+            bottom_chords_to_remove.append(identical_edge)
+
+    def separate_vert(bm, vert, edge, new_co):
+        face = next(f for f in vert.link_faces if edge in f.edges)
+        new_v = bmesh.utils.face_vert_separate(face, vert)
+        new_v.co = new_co
+        new_edge = bm.edges.new((vert, new_v))
+
+        for cur_edge in face.edges:
+            if cur_edge == edge:
+                continue
+            bmesh.ops.contextual_create(bm, geom=[new_edge, cur_edge])
+
+    # apply all changes once at the end
+    for v in verts_to_change:
+        v.co = verts_to_change[v]
+
+    for v, new_co, edge in verts_to_rip:
+        separate_vert(bm, v, edge, new_co)
+
+    bmesh.ops.delete(bm, geom=bottom_chords_to_remove, context="EDGES")
+
+    extrusion_geom = bmesh.ops.extrude_face_region(bm, geom=bm.faces)["geom"]
+    extruded_verts = bm_sort_out_geom(extrusion_geom)["verts"]
+    bmesh.ops.translate(bm, vec=[0.0, 0.0, 0.1], verts=extruded_verts)
+
+    bmesh.ops.recalc_face_normals(bm, faces=bm.faces[:])
+    return bm
+
+
+def bm_get_indices(sequence):
+    return [i.index for i in sequence]
+
+
+def roof_is_gabled():
+    if not RoofData.is_loaded:
+        RoofData.load()
+
+    path_data = RoofData.parameters()["data_dict"]["path_data"]
+    angle_layer = path_data.get("gable_roof_angles", None)
+    if not angle_layer:
+        return False
+    for edge_angle in angle_layer:
+        if float_is_zero(edge_angle - pi / 2):
+            return True
+    return False
+
+
+def update_roof_modifier_ifc_data(context):
+    """should be called after new geometry settled
+    since it's going to update ifc representation
+    """
+    obj = context.active_object
+    props = obj.BIMRoofProperties
+    element = tool.Ifc.get_entity(obj)
+
+    # type attributes
+    if props.roof_type == "HIP/GABLE ROOF":
+        element.PredefinedType = "GABLE_ROOF" if roof_is_gabled() else "HIP_ROOF"
+
+    # occurences attributes
+    # occurences = tool.Ifc.get_all_element_occurences(element)
+
+    tool.Ifc.edit(obj)
+
+
+def update_bbim_roof_pset(element, roof_data):
+    pset = tool.Pset.get_element_pset(element, "BBIM_Roof")
+    if not pset:
+        pset = ifcopenshell.api.run("pset.add_pset", tool.Ifc.get(), product=element, name="BBIM_Roof")
+    roof_data = json.dumps(roof_data, default=list)
+    ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties={"Data": roof_data})
+
+
+def update_roof_modifier_bmesh(context):
+    obj = context.object
+    props = obj.BIMRoofProperties
+
+    if not RoofData.is_loaded:
+        RoofData.load()
+    path_data = RoofData.data["parameters"]["data_dict"]["path_data"]
+    angle_layer_data = path_data.get("gable_roof_angles", None)
+    separate_verts_data = path_data.get("gable_roof_separate_verts", None)
+
+    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+    # need to make sure we support edit mode
+    # since users will probably be in edit mode when they'll be changing roof path
+    bm = tool.Blender.get_bmesh_for_mesh(obj.data, clean=True)
+    angle_layer = bm.edges.layers.float.new("BBIM_gable_roof_angles")
+    separate_verts_layer = bm.edges.layers.int.new("BBIM_gable_roof_separate_verts")
+
+    # generating roof path
+    new_verts = [bm.verts.new(Vector(v) * si_conversion) for v in path_data["verts"]]
+    new_edges = []
+    for i in range(len(path_data["edges"])):
+        e = path_data["edges"][i]
+        edge = bm.edges.new((new_verts[e[0]], new_verts[e[1]]))
+        edge[angle_layer] = angle_layer_data[i] if angle_layer_data else 0
+        edge[separate_verts_layer] = separate_verts_data[i] if separate_verts_data else 0
+        new_edges.append(edge)
+
+    if props.is_editing_path:
+        tool.Blender.apply_bmesh(obj.data, bm)
+        return
+
+    height = props.height * si_conversion
+    generate_hiped_roof_bmesh(bm, props.generation_method, height, props.angle, mutate_current_bmesh=True)
+    tool.Blender.apply_bmesh(obj.data, bm)
+
+
+def get_path_data(obj):
+    """get path data for current mesh, path data is cleaned up"""
+    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+
+    if obj.mode == "EDIT":
+        # otherwise mesh may not contain all changes
+        # added in edit mode
+        obj.update_from_editmode()
+
+    bm = tool.Blender.get_bmesh_for_mesh(obj.data)
+    bm_mesh_clean_up(bm)
+
+    angle_layer = bm.edges.layers.float.get("BBIM_gable_roof_angles")
+    separate_verts_layer = bm.edges.layers.int.get("BBIM_gable_roof_separate_verts")
+
+    path_data = dict()
+    path_data["edges"] = [bm_get_indices(e.verts) for e in bm.edges]
+    path_data["verts"] = [v.co / si_conversion for v in bm.verts]
+    if angle_layer:
+        path_data["gable_roof_angles"] = [e[angle_layer] for e in bm.edges]
+    if separate_verts_layer:
+        path_data["gable_roof_separate_verts"] = [e[separate_verts_layer] for e in bm.edges]
+
+    if not path_data["edges"] or not path_data["verts"]:
+        return None
+    return path_data
+
+
+class BIM_OT_add_roof(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "mesh.add_roof"
+    bl_label = "Roof"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        ifc_file = tool.Ifc.get()
+        if not ifc_file:
+            self.report({"ERROR"}, "You need to start IFC project first to create a roof.")
+            return {"CANCELLED"}
+
+        if context.object is not None:
+            spawn_location = context.object.location.copy()
+            context.object.select_set(False)
+        else:
+            spawn_location = bpy.context.scene.cursor.location.copy()
+
+        mesh = bpy.data.meshes.new("IfcRoof")
+        obj = bpy.data.objects.new("IfcRoof", mesh)
+        obj.location = spawn_location
+        body_context = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW")
+        blenderbim.core.root.assign_class(
+            tool.Ifc,
+            tool.Collector,
+            tool.Root,
+            obj=obj,
+            ifc_class="IfcRoof",
+            should_add_representation=True,
+            context=body_context,
+        )
+        bpy.ops.object.select_all(action="DESELECT")
+        bpy.context.view_layer.objects.active = None
+        bpy.context.view_layer.objects.active = obj
+        obj.select_set(True)
+        bpy.ops.bim.add_roof()
+        return {"FINISHED"}
+
+
+# UI operators
+class AddRoof(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.add_roof"
+    bl_label = "Add Roof"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        props = obj.BIMRoofProperties
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+
+        if element.is_a() not in ("IfcRoof", "IfcRoofType"):
+            self.report({"ERROR"}, "Object has to be IfcRoof/IfcRoofType type to add a roof.")
+            return {"CANCELLED"}
+
+        # need to make sure all default props will have correct units
+        if not props.roof_added_previously:
+            convert_property_group_from_si(props, skip_props=NON_SI_ROOF_PROPS)
+
+        roof_data = props.get_general_kwargs()
+        path_data = get_path_data(obj)
+        if not path_data:
+            path_data = {
+                "edges": [[0, 1], [1, 2], [2, 3], [3, 0]],
+                "verts": [
+                    Vector([-5.0, -5.0, 0.0]) / si_conversion,
+                    Vector([-5.0, 5.0, 0.0]) / si_conversion,
+                    Vector([5.0, 5.0, 0.0]) / si_conversion,
+                    Vector([5.0, -5.0, 0.0]) / si_conversion,
+                ],
+            }
+        roof_data["path_data"] = path_data
+
+        update_bbim_roof_pset(element, roof_data)
+        refresh()
+        update_roof_modifier_bmesh(context)
+        update_roof_modifier_ifc_data(context)
+        return {"FINISHED"}
+
+
+class EnableEditingRoof(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.enable_editing_roof"
+    bl_label = "Enable Editing Roof"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        props = obj.BIMRoofProperties
+        element = tool.Ifc.get_entity(obj)
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Roof", "Data"))
+        data["path_data"] = json.dumps(data["path_data"])
+
+        # required since we could load pset from .ifc and BIMRoofProperties won't be set
+        for prop_name in data:
+            setattr(props, prop_name, data[prop_name])
+
+        # need to make sure all props that weren't used before
+        # will have correct units
+        skip_props = NON_SI_ROOF_PROPS + tuple(data.keys())
+        convert_property_group_from_si(props, skip_props=skip_props)
+
+        props.is_editing = 1
+        return {"FINISHED"}
+
+
+class CancelEditingRoof(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.cancel_editing_roof"
+    bl_label = "Cancel Editing Roof"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Roof", "Data"))
+        props = obj.BIMRoofProperties
+        # restore previous settings since editing was canceled
+        for prop_name in data:
+            setattr(props, prop_name, data[prop_name])
+
+        body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+        blenderbim.core.geometry.switch_representation(
+            tool.Ifc,
+            tool.Geometry,
+            obj=obj,
+            representation=body,
+            should_reload=True,
+            is_global=True,
+            should_sync_changes_first=False,
+        )
+
+        props.is_editing = -1
+        return {"FINISHED"}
+
+
+class FinishEditingRoof(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.finish_editing_roof"
+    bl_label = "Finish Editing Roof"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        props = obj.BIMRoofProperties
+
+        if not RoofData.is_loaded:
+            RoofData.load()
+        path_data = RoofData.data["parameters"]["data_dict"]["path_data"]
+
+        roof_data = props.get_general_kwargs()
+        roof_data["path_data"] = path_data
+        props.is_editing = -1
+
+        update_bbim_roof_pset(element, roof_data)
+        update_roof_modifier_ifc_data(context)
+        return {"FINISHED"}
+
+
+class EnableEditingRoofPath(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.enable_editing_roof_path"
+    bl_label = "Enable Editing Roof Path"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        props = obj.BIMRoofProperties
+
+        props.is_editing_path = True
+        update_roof_modifier_bmesh(context)
+
+        if bpy.context.object.mode != "EDIT":
+            bpy.ops.object.mode_set(mode="EDIT")
+        bpy.ops.wm.tool_set_by_id(tool.Blender.get_viewport_context(), name="bim.cad_tool")
+
+        def mark_preview_edges(bm, bew_verts, new_edges, new_faces):
+            preview_layer = bm.edges.layers.int["BBIM_preview"]
+            # can't create layer in callback because it kill all the bm edge references
+            for edge in new_edges:
+                edge[preview_layer] = 1
+
+        def get_custom_bmesh():
+            # copying to make sure not to mutate the edit mode bmesh
+            bm = tool.Blender.get_bmesh_for_mesh(obj.data)
+            main_bm = bm.copy()
+            main_bm.edges.layers.int.new("BBIM_preview")
+
+            si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+            height = props.height * si_conversion
+            second_bm = generate_hiped_roof_bmesh(
+                bm, props.generation_method, height, props.angle, mutate_current_bmesh=False
+            )
+            bmesh.ops.translate(second_bm, verts=second_bm.verts, vec=Vector((0, 0, 1)))
+
+            tool.Blender.bmesh_join(main_bm, second_bm, callback=mark_preview_edges)
+            return main_bm
+
+        ProfileDecorator.install(
+            context,
+            get_custom_bmesh,
+            draw_faces=True,
+            exit_edit_mode_callback=lambda: cancel_editing_roof_path(context),
+        )
+        return {"FINISHED"}
+
+
+def cancel_editing_roof_path(context):
+    obj = context.active_object
+    props = obj.BIMRoofProperties
+
+    ProfileDecorator.uninstall()
+    props.is_editing_path = False
+
+    update_roof_modifier_bmesh(context)
+    if bpy.context.object.mode == "EDIT":
+        bpy.ops.object.mode_set(mode="OBJECT")
+    return {"FINISHED"}
+
+
+class CancelEditingRoofPath(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.cancel_editing_roof_path"
+    bl_label = "Cancel Editing Roof Path"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        return cancel_editing_roof_path(context)
+
+
+class FinishEditingRoofPath(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.finish_editing_roof_path"
+    bl_label = "Finish Editing Roof Path"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        props = obj.BIMRoofProperties
+
+        roof_data = props.get_general_kwargs()
+        path_data = get_path_data(obj)
+        roof_data["path_data"] = path_data
+        ProfileDecorator.uninstall()
+        props.is_editing_path = False
+
+        update_bbim_roof_pset(element, roof_data)
+        refresh()  # RoofData has to be updated before run update_roof_modifier_bmesh
+        update_roof_modifier_bmesh(context)
+        update_roof_modifier_ifc_data(context)
+        if bpy.context.object.mode == "EDIT":
+            bpy.ops.object.mode_set(mode="OBJECT")
+        update_roof_modifier_ifc_data(context)
+        return {"FINISHED"}
+
+
+class RemoveRoof(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.remove_roof"
+    bl_label = "Remove Roof"
+    bl_options = {"REGISTER"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        props = obj.BIMRoofProperties
+        element = tool.Ifc.get_entity(obj)
+        obj.BIMRoofProperties.is_editing = -1
+
+        pset = tool.Pset.get_element_pset(element, "BBIM_Roof")
+        ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
+        props.roof_added_previously = True
+        return {"FINISHED"}
+
+
+class SetGableRoofEdgeAngle(bpy.types.Operator):
+    bl_idname = "bim.set_gable_roof_edge_angle"
+    bl_label = "Set Gable Roof Edge Angle"
+    bl_options = {"REGISTER", "UNDO"}
+    angle: bpy.props.FloatProperty(name="Angle", default=90)
+    separate_verts: bpy.props.BoolProperty(name="Separate Verts", default=True)
+
+    @classmethod
+    def poll(cls, context):
+        obj = context.active_object
+        return obj and obj.type == "MESH" and context.mode == "EDIT_MESH"
+
+    def draw(self, context):
+        layout = self.layout
+        for prop in self.__class__.__annotations__.keys():
+            layout.prop(self, prop)
+
+    def execute(self, context):
+        # tried to avoid bmesh with foreach_get and foreach_set
+        # but in EDIT mode it's only possible to change attributes by working with bmesh
+
+        me = context.object.data
+        bm = tool.Blender.get_bmesh_for_mesh(me)
+
+        # check if attribute exists or create one
+        if "BBIM_gable_roof_angles" not in me.attributes:
+            me.attributes.new("BBIM_gable_roof_angles", type="FLOAT", domain="EDGE")
+
+        if "BBIM_gable_roof_separate_verts" not in me.attributes:
+            me.attributes.new("BBIM_gable_roof_separate_verts", type="INT", domain="EDGE")
+
+        angles_layer = bm.edges.layers.float["BBIM_gable_roof_angles"]
+        separate_verts_layer = bm.edges.layers.int["BBIM_gable_roof_separate_verts"]
+
+        for e in bm.edges:
+            if not e.select:
+                continue
+            e[angles_layer] = self.angle
+            e[separate_verts_layer] = self.separate_verts
+
+        tool.Blender.apply_bmesh(me, bm)
+        return {"FINISHED"}
+
+
+def add_object_button(self, context):
+    self.layout.operator(BIM_OT_add_roof.bl_idname, icon="PLUGIN")
--- a/Show More
+++ b/Show More