diff --git a/.github/workflows/MacOs_8.14.yml b/.github/workflows/MacOs_8.14.yml
deleted file mode 100644
index 4f91b93..0000000
--- a/.github/workflows/MacOs_8.14.yml
+++ /dev/null
@@ -1,185 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: MacOS
-
-# Controls when the workflow will run
-# on:
-#  # Triggers the workflow on push or pull request events but only for the main branch
-#  push:
-#    branches:
-#      - macos
-
-#  pull_request:
-#    branches:
-#      - '**'
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-###############################################################################
-# Platform script options shared among all jobs
-###############################################################################
-env:
-  COQREGTESTING: y
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  Ubuntu_platform:
-    name: MacOS
-    runs-on: macos-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-          
-      - name: Git checkout install scripts
-        uses: actions/checkout@v2
-        with:
-          path: main
-          
-      - name: Git checkout Coq platform
-        uses: actions/checkout@v2
-        with:
-          repository: coq/platform
-          path: platform
-
-      - name: Cache opam/coq
-        id: cache-opam
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-opam-modules
-        with:
-          path: ~/.opam
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-8.14
-
-      - name: Install homebrew and make
-        shell: bash
-        run: |
-          pwd
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          brew update
-          brew install make
-          brew install gcc
-          brew install unzip
-          if [[ $(uname -m) == 'arm64' ]]; then
-            export PATH=/opt/homebrew/bin:$PATH
-          fi
-
-      #Github actions uses bash 3 instead of bash 4 which is needed for the installer script :) 
-      - name: Install Bash 4 and GNU sed on Mac
-        run: |
-          brew install bash
-          brew install gnu-sed
-
-          echo "/usr/local/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
-
-      - name: Install Opam
-        run: |
-          brew install opam
-
-      - name: Set switch name in coq platform
-        shell: bash
-        run: |
-          echo COQ_PLATFORM_SWITCH_NAME=coq_for_waterproof >> platform/package_picks/coq_platform_switch_name.sh
-          cat platform/package_picks/coq_platform_switch_name.sh
-
-      - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }}
-        name: Run coq platform make
-        shell: bash
-        run: |
-          cd platform
-          opam init
-          chmod +x coq_platform_make.sh
-          ./coq_platform_make.sh -extent=b -parallel=p -jobs=2 -vst=n -compcert=n -pick="8.14~2022.01" -set-switch=y 
-          opam init
-
-      - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }}
-        name: Install serapi
-        shell: bash
-        run: |
-          opam install -y coq-serapi
-          opam install -y coq-coquelicot
-
-      - name: Install coq (Guarantee check)
-        shell: bash
-        run: |
-          brew install coq
-
-#      - name: Install Waterproof library
-#        shell: bash
-#        run: |
-#          cd platform
-#          git clone https://github.com/impermeable/coq-waterproof
-#          cd coq-waterproof
-#          make
-#          make install
-#          cd ..
-#          rm -rf coq-waterproof
-
-      - name: Install system utilities
-        shell: bash
-        run: |
-          brew install findutils
-          brew install coreutils
-          pip3 install macpack
-      
-      # These libraries returned {dir} not found errors, installing them seems to solve the issue.
-      # Problem with installed libraries for workflows?
-      - name: Install libraries that gave errors in installer creation
-        shell: bash
-        run: |
-          brew install adwaita-icon-theme
-          brew install gtksourceview3
-
-      - name: Opam install coq-ide
-        shell: bash
-        run: |
-          brew install expat libxml2
-          opam install -y coqide
-
-      - name: Checking glib directory and compiling?
-        shell: bash
-        run: |
-          pwd
-          cd /usr/local/share/glib-2.0/schemas
-          glib-compile-schemas .
-          pwd
-          ls
-
-      - name: Install packages from cfg and add to installer
-        shell: bash
-        run: |
-          cd main
-          chmod +x install_packages_macos.sh
-          ./install_packages_macos.sh packages_macos.cfg
-
-      - name: Create installer (original)
-        shell: bash
-        run: |
-          cd platform
-          pwd
-          ls
-          opam switch coq_for_waterproof
-          chmod +x macos/create_installer_macos.sh
-          ./macos/create_installer_macos.sh -q
-
-      - name: Check install
-        shell: bash
-        run: |
-          cd platform/macos_installer
-          pwd
-          ls
-
-      - name: 'Upload Artifact'
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: 'MacOs installer Shell Script'
-          path: platform/macos_installer/*.dmg
-          retention-days: 5
-          
diff --git a/.github/workflows/MacOs_8.14_base.yml b/.github/workflows/MacOs_8.14_base.yml
deleted file mode 100644
index f9c3e4f..0000000
--- a/.github/workflows/MacOs_8.14_base.yml
+++ /dev/null
@@ -1,167 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: MacOS
-
-# Controls when the workflow will run
-# on:
-#   # Triggers the workflow on push or pull request events but only for the main branch
-#   push:
-#     branches:
-#       - macos
-
-#   # Allows you to run this workflow manually from the Actions tab
-#   workflow_dispatch:
-
-###############################################################################
-# Platform script options shared among all jobs
-###############################################################################
-env:
-  COQREGTESTING: y
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  Ubuntu_platform:
-    name: MacOS
-    runs-on: macos-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-          
-      - name: Git checkout install scripts
-        uses: actions/checkout@v2
-        with:
-          path: main
-          
-      - name: Git checkout Coq platform
-        uses: actions/checkout@v2
-        with:
-          repository: coq/platform
-          path: platform
-
-      - name: Cache opam/coq
-        id: cache-opam
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-opam-modules
-        with:
-          path: ~/.opam
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-8.14
-
-      - name: Install homebrew and make
-        shell: bash
-        run: |
-          pwd
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          brew update
-          brew install make
-          brew install gcc
-          brew install unzip
-          if [[ $(uname -m) == 'arm64' ]]; then
-            export PATH=/opt/homebrew/bin:$PATH
-          fi
-
-      #Github actions uses bash 3 instead of bash 4 which is needed for the installer script :) 
-      - name: Install Bash 4 and GNU sed on Mac
-        run: |
-          brew install bash
-          brew install gnu-sed
-
-          echo "/usr/local/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
-
-      - name: Install Opam
-        run: |
-          brew install opam
-
-      - name: Set switch name in coq platform
-        shell: bash
-        run: |
-          echo COQ_PLATFORM_SWITCH_NAME=coq_for_waterproof >> platform/package_picks/coq_platform_switch_name.sh
-          cat platform/package_picks/coq_platform_switch_name.sh
-
-      - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }}
-        name: Run coq platform make
-        shell: bash
-        run: |
-          pwd
-          cd platform
-          chmod +x coq_platform_make.sh
-          ./coq_platform_make.sh -extent=b -parallel=p -jobs=2 -vst=n -compcert=n -pick="8.14~2022.01" -set-switch=y 
-
-      - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }}
-        name: Install serapi
-        shell: bash
-        run: |
-          opam install -y coq-serapi
-          opam install -y coq-coquelicot
-
-#      - name: Install Waterproof library
-#       shell: bash
-#        run: |
-#          git clone https://github.com/impermeable/coq-waterproof
-#          cd coq-waterproof
-#          make
-#          make install
-#          cd ..
-#          rm -rf coq-waterproof
-
-      - name: Install system utilities
-        shell: bash
-        run: |
-          brew install findutils
-          brew install coreutils
-          pip3 install macpack
-      
-      # These libraries returned {dir} not found errors, installing them seems to solve the issue.
-      # Problem with installed libraries for workflows?
-      - name: Install libraries that gave errors in installer creation
-        shell: bash
-        run: |
-          brew install adwaita-icon-theme
-          brew install gtksourceview3
-
-      - name: Opam install coq-ide
-        shell: bash
-        run: |
-          brew install expat libxml2
-          opam install -y coqide
-
-      - name: Checking glib directory and compiling?
-        shell: bash
-        run: |
-          pwd
-          cd /usr/local/share/glib-2.0/schemas
-          glib-compile-schemas .
-          pwd
-          ls
-
-      - name: Create installer (original)
-        shell: bash
-        run: |
-          cd platform
-          pwd
-          ls
-          opam switch coq_for_waterproof
-          chmod +x macos/create_installer_macos.sh
-          ./macos/create_installer_macos.sh -q
-
-      - name: Check install
-        shell: bash
-        run: |
-          cd platform/macos_installer
-          pwd
-          ls
-
-      - name: 'Upload Artifact'
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: 'MacOs installer Shell Script'
-          path: platform/macos_installer/*.dmg
-          retention-days: 5
-          
diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml
index 87788f2..05d120e 100644
--- a/.github/workflows/MacOs_8.15.yml
+++ b/.github/workflows/MacOs_8.15.yml
@@ -1,13 +1,10 @@
 # This is a basic workflow to help you get started with Actions
-
-name: MacOS
+name: MacOS 8.15
 
 # Controls when the workflow will run
 on:
  # Triggers the workflow on push or pull request events but only for the main branch
   push:
-    branches:
-      - macos
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -23,7 +20,7 @@ jobs:
   # This workflow contains a single job called "build"
   Ubuntu_platform:
     name: MacOS
-    runs-on: macos-latest
+    runs-on: macos-11
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -50,7 +47,7 @@ jobs:
       #     cache-name: cache-opam-modules
       #   with:
       #     path: ~/.opam
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-8.15
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-8.15-Waterproof
 
       - name: Install homebrew and make
         shell: bash
@@ -65,7 +62,7 @@ jobs:
             export PATH=/opt/homebrew/bin:$PATH
           fi
 
-      #Github actions uses bash 3 instead of bash 4 which is needed for the installer script :) 
+      # Github actions uses bash 3 instead of bash 4 which is needed for the installer script :) 
       - name: Install Bash 4 and GNU sed on Mac
         run: |
           brew install bash
@@ -97,8 +94,8 @@ jobs:
         name: Install serapi
         shell: bash
         run: |
-          opam install -y coq-serapi
-          opam install -y coq-coquelicot
+          opam install -y coq-serapi.8.15.0+0.15.2
+          opam install -y coq-coquelicot.3.2.0
 
       - name: Install system utilities
         shell: bash
@@ -119,62 +116,61 @@ jobs:
         shell: bash
         run: |
           brew install expat libxml2
-          opam install -y coqide
-
-      - name: Checking glib directory and compiling?
-        shell: bash
-        run: |
-          pwd
-          cd /usr/local/share/glib-2.0/schemas
-          glib-compile-schemas .
-          pwd
-          ls
+          opam install -y coqide.8.15.2
 
-      # - name: find opam coq
+      # - name: Check versions
       #   shell: bash
       #   run: |
-      #     cd /usr/local/bin/Cellar
-      #     tree -a opam
+      #     eval $(opam env)
+      #     opam show coq
+      #     opam show coq-serapi
+      #     opam show coq-coquelicot
+      #     opam show coq-ide
 
-      - name: Check PATH
-        shell: bash
-        run: |
-          echo $PATH
-
-      - name: Install Waterproof library
-        shell: bash
-        run: |
-          git clone https://github.com/impermeable/coq-waterproof
-          cd coq-waterproof
-          make
-          make install
-          cd ..
-          rm -rf coq-waterproof
+      # - name: Install Waterproof library
+      #   shell: bash
+      #   run: |
+      #     git clone https://github.com/impermeable/coq-waterproof
+      #     cd coq-waterproof
+      #     make --version
+      #     eval $(opam env)
+      #     coqc -v || :
+      #     make
+      #     make install
+      #     cd ..
+      #     rm -rf coq-waterproof
+      #     ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib
+      #     ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib
+      #     ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || :
+      #     ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || :
+      #     ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || :
+      #     ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || :
+          
 
       - name: Install packages from cfg and add to installer
         shell: bash
         run: |
           cd main
+          opam switch coq_for_waterproof
+          eval $(opam env)
           chmod +x install_packages_macos.sh
           ./install_packages_macos.sh packages_macos.cfg
+          ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib
+          ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib
+          ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || :
+          ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || :
+          ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || :
+          ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || :
 
       - name: Create installer (original)
         shell: bash
         run: |
           cd platform
-          pwd
-          ls
           opam switch coq_for_waterproof
+          eval $(opam env)
           chmod +x macos/create_installer_macos.sh
           ./macos/create_installer_macos.sh -q
 
-      - name: Check install
-        shell: bash
-        run: |
-          cd platform/macos_installer
-          pwd
-          ls
-
       - name: 'Upload Artifact'
         if: always()
         uses: actions/upload-artifact@v2
diff --git a/install_packages_macos.sh b/install_packages_macos.sh
index e9ba41d..c9f2c45 100644
--- a/install_packages_macos.sh
+++ b/install_packages_macos.sh
@@ -70,7 +70,7 @@ grep -v '^#' $config_file | while read -r line ; do
     
     # Inject install code into installer script
     # Only testing that add_folder_recursively works, update later
-    sed -i '/^source "${HERE}".*/a add_folder_recursively "lib/coq/user-contrib/" "Waterproof" ' ../platform/macos/create_installer_macos.sh
+    sed -i '/^add_folder_recursively "${PKG_MANAGER_ROOT}".*/a add_folder_recursively "/Users/runner/.opam/coq_for_waterproof" "lib/coq/user-contrib/Waterproof" ' ../platform/macos/create_installer_macos.sh
   elif [[ $line =~ ^OPAM* ]] ; then
     opam install -y $package_name
   fi
@@ -82,7 +82,4 @@ rmdir github_packages
 # Inject install imports into create installer script
 #sed -i '/^source "${HERE}"/shell_scripts/installer_create_tree.sh/a source add_custom_macos.sh' platform/macos/create_installer_macos.sh  # Custom package functions
 
-# Unneccesary?
-#sed -i '/^###### Create the NSIS installer #####/a source unselect_packages.sh' platform/macos/create_installer_macos.sh  # Unselect package functions
-
 cat ../platform/macos/create_installer_macos.sh
\ No newline at end of file