diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 00000000..bab55386
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,8 @@
+module.exports = {
+  parserOptions: {
+    parser: "@babel/eslint-parser",
+    requireConfigFile: false,
+    ecmaVersion: "latest",
+  },
+  extends: ["plugin:prettier/recommended"],
+};
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..29eb6537
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,100 @@
+name: Draw Attention CI workflow
+
+on:
+  pull_request:
+
+concurrency:
+  group: da-ci-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
+
+env:
+  EVENT: ${{ toJSON(github.event) }}
+
+jobs:
+  # =====================================================================================#
+  # Run code through PHPCodeSniffer to conform to standards =============================#
+  # =====================================================================================#
+  # The installed coding standards are Zend, PEAR, PSR2, Squiz, PSR12, MySource, PSR1, PHPCompatibility, PHPCompatibilityParagonieRandomCompat, PHPCompatibilityParagonieSodiumCompat, PHPCompatibilityWP, WordPress, WordPress-Extra, WordPress-Core and WordPress-Docs
+  static-code-analysis:
+    name: Static Code Analysis
+    if: ${{ github.event_name == 'pull_request' }}
+    runs-on: ubuntu-latest
+    env:
+      phpcs_config_flags: --standard=WordPress --ignore=vendor,node_modules,*min.* --extensions=php --runtime-set testVersion 7.2
+    steps:
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.2
+          coverage: none
+
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+        
+      - name: Set git user information
+        run: |
+          git config --global user.email "otto@nsquared.io"
+          git config --global user.name "otto-bot-git"
+          
+      - name: Prepare environment
+        run: |
+          composer init --name nsquared-team/draw-attention --no-interaction
+          composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
+          composer require --with-all-dependencies --dev dealerdirect/phpcodesniffer-composer-installer:"*" phpcompatibility/phpcompatibility-wp:"*"
+          composer require --with-all-dependencies --dev wp-coding-standards/wpcs
+          vendor/bin/phpcs --version
+          vendor/bin/phpcs -i
+          vendor/bin/phpcs --config-set colors 1
+          
+      - name: Install dependencies
+        run: | 
+          npm install
+          npm install -g prettier
+          npm install -g eslint
+
+      # =================================================================================================#
+      # Run code through PHPCodeSniffer to conform to standards ========================================#
+      # =================================================================================================#
+      
+      - name: Fix code with PHP Code Sniffer
+        if: always()
+        continue-on-error: true
+        run: |
+          vendor/bin/phpcbf -p "." ${{ env.phpcs_config_flags }}
+
+      - name: Check any remaining errors with PHP Code Sniffer
+        if: always()
+        continue-on-error: true
+        run: |
+          vendor/bin/phpcs -p "." ${{ env.phpcs_config_flags }}
+        
+        # =================================================================================================#
+        # Run code through Prettier and ESLint to conform to standards ====================================#
+        # =================================================================================================#
+        
+      - name: Format JS files
+        run: prettier --write "**/*.js"
+        
+      # No Vue files in this project at the moment
+      # - name: Format Vue files
+      #   run: prettier --write "**/*.vue"
+        
+      - name: Lint JS files
+        run: eslint --fix "**/*.js" --ignore-pattern "**/vendor/**/*" --ignore-pattern "**/node_modules/**/*" --ignore-pattern "**/*min.*"
+        
+      # No Vue files in this project at the moment
+      # - name: Lint Vue files
+      #   run: eslint --fix "**/*.vue" --ignore-pattern "**/vendor/**/*" --ignore-pattern "**/node_modules/**/*"
+
+      - name: Revert unwanted composer changes
+        run: |
+          git checkout composer.json
+          git checkout composer.lock
+          
+      # The push below will not trigger a new workflow because it uses the default GITHUB_TOKEN
+      - name: Commit and push changes
+        run: |
+          # just a guard, we also should keep on excluding the minified files
+          git restore "*min.*"
+          `git add -A && git commit -m "Automated code formatting on branch done." > /dev/null  && git push` || true
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b5cacb13..9c89f703 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,10 +8,7 @@
 
 name: DA deploy to WordPress.org
 
-# keeping the trigger at released gives us the chance to skip deploying any releases we don't like or whatever
 on:
-  release:
-    types: [released]
   workflow_dispatch:
     inputs:
       tag_name:
@@ -99,20 +96,43 @@ jobs:
           ASSETS_DIR: assets/repo/
           BUILD_DIR: release/draw-attention
           SLUG: draw-attention
-
+          VERSION: ${{ steps.set_tag_name.outputs.tag_name }}
 
       - name: "Send Deploymnt Notification to Slack"
         if: steps.deploy.outcome == 'success'
         uses: slackapi/slack-github-action@v1.23.0
         env:
-          JSON: "{\"text\":\"\\n:large_green_circle: Draw Attention ${{ github.event.release.tag_name }}\\nSuccessfully deployed to <https://wordpress.org/plugins/draw-attention|WordPress.org>\\n\",\"blocks\":[{\"type\":\"divider\"},{\"type\":\"header\",\"text\":{\"type\":\"plain_text\",\"text\":\"\\n:large_green_circle: Draw Attention ${{ github.event.release.tag_name }}\\n\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"Successfully deployed to <https://wordpress.org/plugins/draw-attention|WordPress.org>\\n\"}}]}"
+          JSON: "{\"text\":\"\\n:large_green_circle: Draw Attention ${{ steps.set_tag_name.outputs.tag_name }}\\nSuccessfully deployed to <https://wordpress.org/plugins/draw-attention|WordPress.org>\\n\",\"blocks\":[{\"type\":\"divider\"},{\"type\":\"header\",\"text\":{\"type\":\"plain_text\",\"text\":\"\\n:large_green_circle: Draw Attention ${{ steps.set_tag_name.outputs.tag_name }}\\n\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"Successfully deployed to <https://wordpress.org/plugins/draw-attention|WordPress.org>\\n\"}}]}"
         with:
           payload: ${{ env.JSON }}
-            
+
+      - name: "Get release ID"
+        id: release-data
+        run: |
+          response=$(curl -s https://api.github.com/graphql -X POST -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -d '{ "query": "query { repository(owner: \"nsquared-team\", name: \"draw-attention\") { release(tagName: \"${{ steps.set_tag_name.outputs.tag_name }}\") { databaseId createdAt } } }" }')
+          databaseId=$(echo "$response" | jq -r '.data.repository.release.databaseId')
+          if [[ -z "$databaseId" ]]; then
+            echo "Error: databaseId is empty"
+            exit 1
+          fi
+          echo "release-id=$databaseId" >> $GITHUB_OUTPUT
+          
+          
+      - name: "Update release to be latest"
+        if: steps.deploy.outcome == 'success'
+        run: |
+          curl -L \
+              -X PATCH \
+              -H "Accept: application/vnd.github+json" \
+              -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"\
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              https://api.github.com/repos/$GITHUB_REPOSITORY/releases/${{ steps.release-data.outputs.release-id }} \
+              -d '{"make_latest":true}'
+
       - name: "Send WP Deployment Failure Warning to Slack"
         if: steps.deploy.outcome != 'success'
         uses: slackapi/slack-github-action@v1.23.0
         env:
-          JSON: "{\"text\":\"\\n:red_circle: Draw Attention ${{ github.event.release.tag_name }}\\nFailed to deploy.\\n\\nKindly check if the official version is affected and attempt a fix / another release. <https://wordpress.org/plugins/draw-attention|WordPress.org>\\n\",\"blocks\":[{\"type\":\"divider\"},{\"type\":\"header\",\"text\":{\"type\":\"plain_text\",\"text\":\"\\n:red_circle: Draw Attention ${{ github.event.release.tag_name }}\\n\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"Failed to deploy.\\n\\nKindly check if the official version is affected and attempt a fix / another release. <https://wordpress.org/plugins/draw-attention|WordPress.org>\\n\"}}]}"
+          JSON: "{\"text\":\"\\n:red_circle: Draw Attention ${{ steps.set_tag_name.outputs.tag_name }}\\nFailed to deploy.\\n\\nKindly check if the official version is affected and attempt a fix / another release. <https://wordpress.org/plugins/draw-attention|WordPress.org>\\n\",\"blocks\":[{\"type\":\"divider\"},{\"type\":\"header\",\"text\":{\"type\":\"plain_text\",\"text\":\"\\n:red_circle: Draw Attention ${{ steps.set_tag_name.outputs.tag_name }}\\n\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"Failed to deploy.\\n\\nKindly check if the official version is affected and attempt a fix / another release. <https://wordpress.org/plugins/draw-attention|WordPress.org>\\n\"}}]}"
         with:
           payload: ${{ env.JSON }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f3ba24ff..a17474cb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,19 +17,25 @@ env:
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   
 on:
+  schedule:
+    # release every Tuesday at 5pm UTC, LA time 9am
+    - cron: '0 17 * * 2'
   workflow_dispatch:
     inputs:
       version_type:
         description: "Version type (major, minor, patch or leave empty to release current master branch)"
         required: false
         default: ""
-    
+      deploy:
+          description: "Deploy to WordPress.org (true or false)"
+          required: false
+          default: "false"
 
 jobs:
   github-release:
     name: "Create a GitHub Release"
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 10
     steps:
       - name: "Dump GitHub Context"
         env:
@@ -46,7 +52,9 @@ jobs:
       - name: "Check defined version type"
         id: version
         run: |
-          if [ "${{ github.event.inputs.version_type }}" == "major" ]; then
+          if [ "${{ github.event_name }}" == "schedule" ]; then
+            echo "version=patch" >> $GITHUB_OUTPUT
+          elif [ "${{ github.event.inputs.version_type }}" == "major" ]; then
             echo "version=major" >> $GITHUB_OUTPUT
           elif [ "${{ github.event.inputs.version_type }}" == "minor" ]; then
             echo "version=minor" >> $GITHUB_OUTPUT
@@ -83,7 +91,7 @@ jobs:
       # Build Dev Changelog =================
       # =====================================
       - name: "Build Dev Changelog"
-        uses: mikepenz/release-changelog-builder-action@v3
+        uses: mikepenz/release-changelog-builder-action@v4.0.0-b02
         id: build_dev_changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -91,11 +99,21 @@ jobs:
           toTag: ${{ github.ref }}
           configuration: "./.github/config/dev_changelog_configuration.json"
 
+      # if scheduled and no pull requests caught in changelog, exit
+      - name: "Exit if no pull requests caught in changelog"
+        if: github.event_name == 'schedule' && steps.build_dev_changelog.outputs.pull_requests == ''
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "No pull requests caught in changelog. Exiting."
+          gh run cancel ${{ github.run_id }}
+          gh run watch ${{ github.run_id }}
+          
       # =====================================
       # Build Changelog =====================
       # =====================================
       - name: "Build Changelog"
-        uses: mikepenz/release-changelog-builder-action@v3
+        uses: mikepenz/release-changelog-builder-action@v4.0.0-b02
         id: build_changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -196,6 +214,29 @@ jobs:
           files: |
             ${{ env.ZIP_FILENAME }}
 
+
+      - name: "Get release ID"
+        id: release-data
+        run: |
+          response=$(curl -s https://api.github.com/graphql -X POST -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -d '{ "query": "query { repository(owner: \"nsquared-team\", name: \"draw-attention\") { release(tagName: \"${{ steps.package-version.outputs.current-version }}\") { databaseId createdAt } } }" }')
+          databaseId=$(echo "$response" | jq -r '.data.repository.release.databaseId')
+          if [[ -z "$databaseId" ]]; then
+              echo "Error: databaseId is empty"
+              exit 1
+          fi
+          echo "release-id=$databaseId" >> $GITHUB_OUTPUT
+    
+      - name: "Update release to be latest"
+        run: |
+          curl -L \
+              -X PATCH \
+              -H "Accept: application/vnd.github+json" \
+              -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"\
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              https://api.github.com/repos/$GITHUB_REPOSITORY/releases/${{ steps.release-data.outputs.release-id }} \
+              -d '{"make_latest":true}'
+    
+    
       # =====================================
       # Send Failure Warning to Slack =======
       # =====================================
@@ -211,20 +252,32 @@ jobs:
       # Send Dev Changelog Notification =====
       # =====================================
       - name: "Format changelog for slack"
-        id: format-changelog
+        id: format-dev-changelog
         env:
-          CHANGELOG: ${{ toJson(steps.build_dev_changelog.outputs.changelog) }}
+          CHANGELOG_JSON: ${{ steps.build_dev_changelog.outputs.categorized }}
+          CHANGELOG_STRING: ${{ steps.build_dev_changelog.outputs.changelog }}
+          PROJECT: "Draw Attention"
         run: |
-          no_newline_string=$(echo "$CHANGELOG" | tr -d '\n')
-          single_quote_string=$(echo "$no_newline_string" | sed "s/\"/'/g")
-          single_quote_string=$(echo "$single_quote_string" | sed 's/\\\([^n]\)/\1/g')
-          echo "formatted_changelog=$single_quote_string" >> $GITHUB_OUTPUT
-          
+          php "external/actions-scripts/format-changelog.php" --version=${{ steps.package-version.outputs.current-version }} --repo=${{ github.repository }} --out="formatted-dev-changelog.json"
+
+      - name: "View JSON file"
+        run: |
+          cat "formatted-dev-changelog.json"
+  
       - name: "Send Dev Changelog Notification to Slack"
         if: success()
-        uses: slackapi/slack-github-action@v1.23.0
+        run: |
+          json_content=$(cat "formatted-dev-changelog.json")
+          curl -X POST -H "Content-type: application/json" --data "$json_content" "${{ env.SLACK_WEBHOOK_URL }}"
+          
+      # ===================================================================
+      # Trigger deploy workflow only if the workflow was triggered on cron
+      # ===================================================================
+      - name: "Trigger deploying to WordPress.org"
         env:
-          JSON: "{\"text\":\"\\n:large_green_circle: Draw Attention ${{ steps.package-version.outputs.current-version }}\\nSuccessfully Prepared GitHub release.:fox-dance:\\nChangelog:\\n${{steps.format-changelog.outputs.formatted_changelog}}\\n\",\"blocks\":[{\"type\":\"divider\"},{\"type\":\"header\",\"text\":{\"type\":\"plain_text\",\"text\":\"\\n:large_green_circle: Draw Attention ${{ steps.package-version.outputs.current-version }}\\n\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"Successfully Prepared GitHub release.:fox-dance:\\nChangelog:\\n${{steps.format-changelog.outputs.formatted_changelog}}\\n\"}}]}"
-        with:
-          payload: ${{ env.JSON }}
-            
\ No newline at end of file
+          GH_TOKEN: ${{ github.token }}
+        if: success() && ( github.event_name == 'schedule' || github.event.inputs.deploy == 'true' )
+        run: |
+          echo 'Sleeping for 5 minutes to allow GitHub to create the release'
+          sleep 300
+          gh workflow run deploy.yml -f tag_name="${{ steps.package-version.outputs.current-version }}"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a81060c5..06568d81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ wp-config.php
 wp-content/plugins/akismet/.htaccess
 public/assets/config.codekit3
 
+vendor/
 # Needed for WP release
 node_modules/
 release/
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..ba648ddd
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,2 @@
+*min.*
+public/assets/js/leaflet.js
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6df167e8..d4209897 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,45 @@
 # Changelog
 
+## 2.0.17 - 2023-11-07
+
+### Features and Improvements
+
+- Tested up to WP 6.4
+
+## 2.0.16 - 2023-10-29
+
+### Features and Improvements
+
+- Add nonce checks for additional security
+
+## 2.0.15 - 2023-10-19
+
+### Fixes
+
+- Fix disclosed vulnerability affecting Contributor-level users
+
+## 2.0.14 - 2023-08-12
+
+### Features and Improvements
+
+- Tested up to WP 6.3
+
+## 2.0.13 - 2023-06-25
+
+### Fixes
+
+- Fix PHP warning in CMB2 library
+
+### Features and Improvements
+
+- Prevent conflicts with other plugins that use the leaflet library
+
+## 2.0.12 - 2023-05-26
+
+### Features and Improvements
+
+- Improved nonce verification and capability checks
+
 ## 2.0.11 - 2023-05-12
 
 ### Fixes
diff --git a/Gruntfile.js b/Gruntfile.js
index 0cf0cefb..b67aa6db 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,196 +1,214 @@
-module.exports = function( grunt ) {
-
-	require('load-grunt-tasks')(grunt);
-
-	var pkg = grunt.file.readJSON( 'package.json' );
-
-	var bannerTemplate = '/**\n' +
-		' * <%= pkg.title %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
-		' * <%= pkg.author.url %>\n' +
-		' *\n' +
-		' * Copyright (c) <%= grunt.template.today("yyyy") %>;\n' +
-		' * Licensed GPLv2+\n' +
-		' */\n';
-
-	var compactBannerTemplate = '/** ' +
-		'<%= pkg.title %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %> | <%= pkg.author.url %> | Copyright (c) <%= grunt.template.today("yyyy") %>; | Licensed GPLv2+' +
-		' **/\n';
-
-	// Project configuration
-	grunt.initConfig( {
-
-		pkg: pkg,
-		watch:  {
-			styles: {
-				files: ['assets/**/*.css','assets/**/*.scss'],
-				tasks: ['styles'],
-				options: {
-					spawn: false,
-					livereload: true,
-					debounceDelay: 500
-				}
-			},
-			scripts: {
-				files: ['assets/**/*.js'],
-				tasks: ['scripts'],
-				options: {
-					spawn: false,
-					livereload: true,
-					debounceDelay: 500
-				}
-			},
-			php: {
-				files: ['**/*.php', '!vendor/**.*.php'],
-				tasks: ['php'],
-				options: {
-					spawn: false,
-					debounceDelay: 500
-				}
-			}
-		},
-
-		makepot: {
-			dist: {
-				options: {
-					domainPath: '/languages/',
-					potFilename: pkg.name + '.pot',
-					type: 'wp-plugin'
-				}
-			}
-		},
-
-		addtextdomain: {
-			dist: {
-				options: {
-					textdomain: pkg.name
-				},
-				target: {
-					files: {
-						src: ['**/*.php']
-					}
-				}
-			}
-		},
-
-		replace: {
-			version_php: {
-				src: [
-					'**/*.php',
-					'!public/includes/lib/**',
-				],
-				overwrite: true,
-				replacements: [ {
-						from: /Version:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
-						to: 'Version:$1' + pkg.version
-				}, {
-						from: /@version(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
-						to: '@version$1' + pkg.version
-				}, {
-						from: /@since(.*?)NEXT/mg,
-						to: '@since$1' + pkg.version
-				}, {
-						from: /VERSION(\s*?)=(\s*?['"])[a-zA-Z0-9\.\-\+]+/mg,
-						to: 'VERSION$1=$2' + pkg.version
-				} ]
-			},
-			version_readme: {
-				src: 'readme.txt',
-				overwrite: true,
-				replacements: [ {
-					from: /^Stable tag:(\s*?)[a-zA-Z0-9.-]+(\s*?)$/mi,
-					to: 'Stable tag:$1<%= pkg.version %>$2'
-				} ]
-			},
-			readme_txt: {
-				src: 'readme.txt',
-				dest:  'release/' + pkg.version + '/readme.txt',
-				replacements: [ {
-						from: /^# (.*?)( #+)?$/mg,
-						to: '=== $1 ==='
-					}, {
-						from: /^## (.*?)( ##+)?$/mg,
-						to: '== $1 =='
-					}, {
-						from: /^### (.*?)( ###+)?$/mg,
-						to: '= $1 ='
-					}, {
-						from: /^\*\*(.*?):\*\*/mg,
-						to: '$1:'
-				} ]
-			}
-		},
-
-		copy: {
-			release: {
-				src: [
-					'**',
-					'!.git',
-					'!.github',
-					'!.gitignore',
-					'!CHANGELOG.md',
-					'!CODEOWNERS',
-					'!Gruntfile.js',
-					'!package.json',
-					'!package-lock.json',
-					
-					'!assets/repo/**',
-
-					'!**/*.scss',
-					'!**/node_modules/**'
-
-				],
-				dest: 'release/' + pkg.version + '/'
-			},
-            svn: {
-                cwd: 'release/<%= pkg.version %>/',
-                expand: true,
-                src: '**',
-                dest: 'release/svn/'
-            }
-		},
-
-		compress: {
-            dist: {
-                options: {
-                    mode: 'zip',
-                    archive: './release/<%= pkg.name %>.<%= pkg.version %>.zip'
-                },
-                expand: true,
-                cwd: 'release/<%= pkg.version %>',
-                src: ['**/*'],
-                dest: '<%= pkg.name %>'
-            }
+module.exports = function (grunt) {
+  require("load-grunt-tasks")(grunt);
+
+  var pkg = grunt.file.readJSON("package.json");
+
+  var bannerTemplate =
+    "/**\n" +
+    ' * <%= pkg.title %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
+    " * <%= pkg.author.url %>\n" +
+    " *\n" +
+    ' * Copyright (c) <%= grunt.template.today("yyyy") %>;\n' +
+    " * Licensed GPLv2+\n" +
+    " */\n";
+
+  var compactBannerTemplate =
+    "/** " +
+    '<%= pkg.title %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %> | <%= pkg.author.url %> | Copyright (c) <%= grunt.template.today("yyyy") %>; | Licensed GPLv2+' +
+    " **/\n";
+
+  // Project configuration
+  grunt.initConfig({
+    pkg: pkg,
+    watch: {
+      styles: {
+        files: ["assets/**/*.css", "assets/**/*.scss"],
+        tasks: ["styles"],
+        options: {
+          spawn: false,
+          livereload: true,
+          debounceDelay: 500,
         },
-
-        wp_deploy: {
-            dist: {
-                options: {
-                    plugin_slug: '<%= pkg.name %>',
-                    svn_user: "croixhaug",
-                    build_dir: 'release/svn/',
-                    assets_dir: 'assets/repo/'
-                }
-            }
+      },
+      scripts: {
+        files: ["assets/**/*.js"],
+        tasks: ["scripts"],
+        options: {
+          spawn: false,
+          livereload: true,
+          debounceDelay: 500,
         },
+      },
+      php: {
+        files: ["**/*.php", "!vendor/**.*.php"],
+        tasks: ["php"],
+        options: {
+          spawn: false,
+          debounceDelay: 500,
+        },
+      },
+    },
+
+    makepot: {
+      dist: {
+        options: {
+          domainPath: "/languages/",
+          potFilename: pkg.name + ".pot",
+          type: "wp-plugin",
+        },
+      },
+    },
 
-        clean: {
-            release: [
-                'release/<%= pkg.version %>/',
-                'release/svn/'
-            ]
-        }
-
-	} );
-
-	grunt.registerTask( 'scripts', [] );
-	grunt.registerTask( 'styles', [] );
-	grunt.registerTask( 'php', [ 'addtextdomain', 'makepot' ] );
-	grunt.registerTask( 'default', ['styles', 'scripts', 'php'] );
-
-	grunt.registerTask( 'version', [ 'default', 'replace:version_php', 'replace:version_readme' ] );
-	grunt.registerTask( 'release', [ 'clean:release', 'replace:readme_txt', 'copy', 'compress' ] );
-	grunt.registerTask( 'wporg', [ 'clean:release', 'replace:readme_txt', 'copy' ] );
-	grunt.registerTask( 'increment-version', [ 'replace:version_php', 'replace:version_readme' ] );
-
-	grunt.util.linefeed = '\n';
+    addtextdomain: {
+      dist: {
+        options: {
+          textdomain: pkg.name,
+        },
+        target: {
+          files: {
+            src: ["**/*.php"],
+          },
+        },
+      },
+    },
+
+    replace: {
+      version_php: {
+        src: ["**/*.php", "!public/includes/lib/**"],
+        overwrite: true,
+        replacements: [
+          {
+            from: /Version:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
+            to: "Version:$1" + pkg.version,
+          },
+          {
+            from: /@version(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
+            to: "@version$1" + pkg.version,
+          },
+          {
+            from: /@since(.*?)NEXT/gm,
+            to: "@since$1" + pkg.version,
+          },
+          {
+            from: /VERSION(\s*?)=(\s*?['"])[a-zA-Z0-9\.\-\+]+/gm,
+            to: "VERSION$1=$2" + pkg.version,
+          },
+        ],
+      },
+      version_readme: {
+        src: "readme.txt",
+        overwrite: true,
+        replacements: [
+          {
+            from: /^Stable tag:(\s*?)[a-zA-Z0-9.-]+(\s*?)$/im,
+            to: "Stable tag:$1<%= pkg.version %>$2",
+          },
+        ],
+      },
+      readme_txt: {
+        src: "readme.txt",
+        dest: "release/" + pkg.version + "/readme.txt",
+        replacements: [
+          {
+            from: /^# (.*?)( #+)?$/gm,
+            to: "=== $1 ===",
+          },
+          {
+            from: /^## (.*?)( ##+)?$/gm,
+            to: "== $1 ==",
+          },
+          {
+            from: /^### (.*?)( ###+)?$/gm,
+            to: "= $1 =",
+          },
+          {
+            from: /^\*\*(.*?):\*\*/gm,
+            to: "$1:",
+          },
+        ],
+      },
+    },
+
+    copy: {
+      release: {
+        src: [
+          "**",
+          "!.git",
+          "!.github",
+          "!external",
+          "!.gitignore",
+          "!CHANGELOG.md",
+          "!CODEOWNERS",
+          "!Gruntfile.js",
+          "!package.json",
+          "!package-lock.json",
+
+          "!assets/repo/**",
+
+          "!**/*.scss",
+          "!**/node_modules/**",
+          "!release/**",
+        ],
+        dest: "release/" + pkg.version + "/",
+      },
+      svn: {
+        cwd: "release/<%= pkg.version %>/",
+        expand: true,
+        src: "**",
+        dest: "release/svn/",
+      },
+    },
+
+    compress: {
+      dist: {
+        options: {
+          mode: "zip",
+          archive: "./release/<%= pkg.name %>.<%= pkg.version %>.zip",
+        },
+        expand: true,
+        cwd: "release/<%= pkg.version %>",
+        src: ["**/*"],
+        dest: "<%= pkg.name %>",
+      },
+    },
+
+    wp_deploy: {
+      dist: {
+        options: {
+          plugin_slug: "<%= pkg.name %>",
+          svn_user: "croixhaug",
+          build_dir: "release/svn/",
+          assets_dir: "assets/repo/",
+        },
+      },
+    },
+
+    clean: {
+      release: ["release/<%= pkg.version %>/", "release/svn/"],
+    },
+  });
+
+  grunt.registerTask("scripts", []);
+  grunt.registerTask("styles", []);
+  grunt.registerTask("php", ["addtextdomain", "makepot"]);
+  grunt.registerTask("default", ["styles", "scripts", "php"]);
+
+  grunt.registerTask("version", [
+    "default",
+    "replace:version_php",
+    "replace:version_readme",
+  ]);
+  grunt.registerTask("release", [
+    "clean:release",
+    "replace:readme_txt",
+    "copy",
+    "compress",
+  ]);
+  grunt.registerTask("wporg", ["clean:release", "replace:readme_txt", "copy"]);
+  grunt.registerTask("increment-version", [
+    "replace:version_php",
+    "replace:version_readme",
+  ]);
+
+  grunt.util.linefeed = "\n";
 };
diff --git a/admin/assets/js/draw-attention-block.js b/admin/assets/js/draw-attention-block.js
index cd580f6e..15a375c0 100644
--- a/admin/assets/js/draw-attention-block.js
+++ b/admin/assets/js/draw-attention-block.js
@@ -1,31 +1,30 @@
-(function(blocks, element, serverSideRender, blockEditor )
-	{
-	var el = element.createElement,
-		registerBlockType = blocks.registerBlockType,
-		ServerSideRender = serverSideRender,
-		useBlockProps = blockEditor.useBlockProps;
+(function (blocks, element, serverSideRender, blockEditor) {
+  var el = element.createElement,
+    registerBlockType = blocks.registerBlockType,
+    ServerSideRender = serverSideRender,
+    useBlockProps = blockEditor.useBlockProps;
 
-	registerBlockType( 'draw-attention/image', {
-		apiVersion: 2,
-		title: 'Draw Attention Image',
-		icon: 'images-alt2',
-		category: 'widgets',
+  registerBlockType("draw-attention/image", {
+    apiVersion: 2,
+    title: "Draw Attention Image",
+    icon: "images-alt2",
+    category: "widgets",
 
-		edit: function(props) {
-			var blockProps = useBlockProps();
-			return el(
-				'div',
-				blockProps,
-				el(ServerSideRender, {
-					block: 'draw-attention/image',
-					attributes: props.attributes,
-				})
-			);
-		},
-	} );
+    edit: function (props) {
+      var blockProps = useBlockProps();
+      return el(
+        "div",
+        blockProps,
+        el(ServerSideRender, {
+          block: "draw-attention/image",
+          attributes: props.attributes,
+        }),
+      );
+    },
+  });
 })(
-	window.wp.blocks,
-	window.wp.element,
-	window.wp.serverSideRender,
-	window.wp.blockEditor
-);
\ No newline at end of file
+  window.wp.blocks,
+  window.wp.element,
+  window.wp.serverSideRender,
+  window.wp.blockEditor,
+);
diff --git a/admin/assets/js/leaflet.draw.js b/admin/assets/js/leaflet.draw.js
index 2fe040b0..e56a5b2c 100644
--- a/admin/assets/js/leaflet.draw.js
+++ b/admin/assets/js/leaflet.draw.js
@@ -5,6 +5,2941 @@
  https://github.com/Leaflet/Leaflet.draw
  http://leafletjs.com
  */
-!function(t,e,i){function o(t,e){for(;(t=t.parentElement)&&!t.classList.contains(e););return t}L.drawVersion="0.4.14",L.Draw={},L.drawLocal={draw:{toolbar:{actions:{title:"Cancel drawing",text:"Cancel"},finish:{title:"Finish drawing",text:"Finish"},undo:{title:"Delete last point drawn",text:"Delete last point"},buttons:{polyline:"Draw a polyline",polygon:"Draw a polygon",rectangle:"Draw a rectangle",circle:"Draw a circle",marker:"Draw a marker",circlemarker:"Draw a circlemarker"}},handlers:{circle:{tooltip:{start:"Click and drag to draw circle."},radius:"Radius"},circlemarker:{tooltip:{start:"Click map to place circle marker."}},marker:{tooltip:{start:"Click map to place marker."}},polygon:{tooltip:{start:"Click to start drawing shape.",cont:"Click to continue drawing shape.",end:"Click first point to close this shape."}},polyline:{error:"<strong>Error:</strong> shape edges cannot cross!",tooltip:{start:"Click to start drawing line.",cont:"Click to continue drawing line.",end:"Click last point to finish line."}},rectangle:{tooltip:{start:"Click and drag to draw rectangle."}},simpleshape:{tooltip:{end:"Release mouse to finish drawing."}}}},edit:{toolbar:{actions:{save:{title:"Save changes",text:"Save"},cancel:{title:"Cancel editing, discards all changes",text:"Cancel"},clearAll:{title:"Clear all layers",text:"Clear All"}},buttons:{edit:"Edit layers",editDisabled:"No layers to edit",remove:"Delete layers",removeDisabled:"No layers to delete"}},handlers:{edit:{tooltip:{text:"Drag handles or markers to edit features.",subtext:"Click cancel to undo changes."}},remove:{tooltip:{text:"Click on a feature to remove."}}}}},L.Draw.Event={},L.Draw.Event.CREATED="draw:created",L.Draw.Event.EDITED="draw:edited",L.Draw.Event.DELETED="draw:deleted",L.Draw.Event.DRAWSTART="draw:drawstart",L.Draw.Event.DRAWSTOP="draw:drawstop",L.Draw.Event.DRAWVERTEX="draw:drawvertex",L.Draw.Event.EDITSTART="draw:editstart",L.Draw.Event.EDITMOVE="draw:editmove",L.Draw.Event.EDITRESIZE="draw:editresize",L.Draw.Event.EDITVERTEX="draw:editvertex",L.Draw.Event.EDITSTOP="draw:editstop",L.Draw.Event.DELETESTART="draw:deletestart",L.Draw.Event.DELETESTOP="draw:deletestop",L.Draw.Event.TOOLBAROPENED="draw:toolbaropened",L.Draw.Event.TOOLBARCLOSED="draw:toolbarclosed",L.Draw.Event.MARKERCONTEXT="draw:markercontext",L.Draw=L.Draw||{},L.Draw.Feature=L.Handler.extend({initialize:function(t,e){this._map=t,this._container=t._container,this._overlayPane=t._panes.overlayPane,this._popupPane=t._panes.popupPane,e&&e.shapeOptions&&(e.shapeOptions=L.Util.extend({},this.options.shapeOptions,e.shapeOptions)),L.setOptions(this,e);var i=L.version.split(".");1===parseInt(i[0],10)&&parseInt(i[1],10)>=2?L.Draw.Feature.include(L.Evented.prototype):L.Draw.Feature.include(L.Mixin.Events)},enable:function(){this._enabled||(L.Handler.prototype.enable.call(this),this.fire("enabled",{handler:this.type}),this._map.fire(L.Draw.Event.DRAWSTART,{layerType:this.type}))},disable:function(){this._enabled&&(L.Handler.prototype.disable.call(this),this._map.fire(L.Draw.Event.DRAWSTOP,{layerType:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(L.DomUtil.disableTextSelection(),t.getContainer().focus(),this._tooltip=new L.Draw.Tooltip(this._map),L.DomEvent.on(this._container,"keyup",this._cancelDrawing,this))},removeHooks:function(){this._map&&(L.DomUtil.enableTextSelection(),this._tooltip.dispose(),this._tooltip=null,L.DomEvent.off(this._container,"keyup",this._cancelDrawing,this))},setOptions:function(t){L.setOptions(this,t)},_fireCreatedEvent:function(t){this._map.fire(L.Draw.Event.CREATED,{layer:t,layerType:this.type})},_cancelDrawing:function(t){27===t.keyCode&&(this._map.fire("draw:canceled",{layerType:this.type}),this.disable())}}),L.Draw.Polyline=L.Draw.Feature.extend({statics:{TYPE:"polyline"},Poly:L.Polyline,options:{allowIntersection:!0,repeatMode:!1,drawError:{color:"#b00b00",timeout:2500},icon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon"}),touchIcon:new L.DivIcon({iconSize:new L.Point(20,20),className:"leaflet-div-icon leaflet-editing-icon leaflet-touch-icon"}),guidelineDistance:20,maxGuideLineLength:4e3,shapeOptions:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!1,clickable:!0},metric:!0,feet:!0,nautic:!1,showLength:!0,zIndexOffset:2e3,factor:1,maxPoints:0},initialize:function(t,e){L.Browser.touch&&(this.options.icon=this.options.touchIcon),this.options.drawError.message=L.drawLocal.draw.handlers.polyline.error,e&&e.drawError&&(e.drawError=L.Util.extend({},this.options.drawError,e.drawError)),this.type=L.Draw.Polyline.TYPE,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._markers=[],this._markerGroup=new L.LayerGroup,this._map.addLayer(this._markerGroup),this._poly=new L.Polyline([],this.options.shapeOptions),this._tooltip.updateContent(this._getTooltipText()),this._mouseMarker||(this._mouseMarker=L.marker(this._map.getCenter(),{icon:L.divIcon({className:"leaflet-mouse-marker",iconAnchor:[20,20],iconSize:[40,40]}),opacity:0,zIndexOffset:this.options.zIndexOffset})),this._mouseMarker.on("mouseout",this._onMouseOut,this).on("mousemove",this._onMouseMove,this).on("mousedown",this._onMouseDown,this).on("mouseup",this._onMouseUp,this).addTo(this._map),this._map.on("mouseup",this._onMouseUp,this).on("mousemove",this._onMouseMove,this).on("zoomlevelschange",this._onZoomEnd,this).on("touchstart",this._onTouch,this).on("zoomend",this._onZoomEnd,this))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._clearHideErrorTimeout(),this._cleanUpShape(),this._map.removeLayer(this._markerGroup),delete this._markerGroup,delete this._markers,this._map.removeLayer(this._poly),delete this._poly,this._mouseMarker.off("mousedown",this._onMouseDown,this).off("mouseout",this._onMouseOut,this).off("mouseup",this._onMouseUp,this).off("mousemove",this._onMouseMove,this),this._map.removeLayer(this._mouseMarker),delete this._mouseMarker,this._clearGuides(),this._map.off("mouseup",this._onMouseUp,this).off("mousemove",this._onMouseMove,this).off("zoomlevelschange",this._onZoomEnd,this).off("zoomend",this._onZoomEnd,this).off("touchstart",this._onTouch,this).off("click",this._onTouch,this)},deleteLastVertex:function(){if(!(this._markers.length<=1)){var t=this._markers.pop(),e=this._poly,i=e.getLatLngs(),o=i.splice(-1,1)[0];this._poly.setLatLngs(i),this._markerGroup.removeLayer(t),e.getLatLngs().length<2&&this._map.removeLayer(e),this._vertexChanged(o,!1)}},addVertex:function(t){if(this._markers.length>=2&&!this.options.allowIntersection&&this._poly.newLatLngIntersects(t))return void this._showErrorTooltip();this._errorShown&&this._hideErrorTooltip(),this._markers.push(this._createMarker(t)),this._poly.addLatLng(t),2===this._poly.getLatLngs().length&&this._map.addLayer(this._poly),this._vertexChanged(t,!0)},completeShape:function(){this._markers.length<=1||(this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable())},_finishShape:function(){var t=this._poly._defaultShape?this._poly._defaultShape():this._poly.getLatLngs(),e=this._poly.newLatLngIntersects(t[t.length-1]);if(!this.options.allowIntersection&&e||!this._shapeIsValid())return void this._showErrorTooltip();this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable()},_shapeIsValid:function(){return!0},_onZoomEnd:function(){null!==this._markers&&this._updateGuide()},_onMouseMove:function(t){var e=this._map.mouseEventToLayerPoint(t.originalEvent),i=this._map.layerPointToLatLng(e);this._currentLatLng=i,this._updateTooltip(i),this._updateGuide(e),this._mouseMarker.setLatLng(i),L.DomEvent.preventDefault(t.originalEvent)},_vertexChanged:function(t,e){this._map.fire(L.Draw.Event.DRAWVERTEX,{layers:this._markerGroup}),this._updateFinishHandler(),this._updateRunningMeasure(t,e),this._clearGuides(),this._updateTooltip()},_onMouseDown:function(t){if(!this._clickHandled&&!this._touchHandled&&!this._disableMarkers){this._onMouseMove(t),this._clickHandled=!0,this._disableNewMarkers();var e=t.originalEvent,i=e.clientX,o=e.clientY;this._startPoint.call(this,i,o)}},_startPoint:function(t,e){this._mouseDownOrigin=L.point(t,e)},_onMouseUp:function(t){var e=t.originalEvent,i=e.clientX,o=e.clientY;this._endPoint.call(this,i,o,t),this._clickHandled=null},_endPoint:function(e,i,o){if(this._mouseDownOrigin){var n=L.point(e,i).distanceTo(this._mouseDownOrigin),a=this._calculateFinishDistance(o.latlng);this.options.maxPoints>1&&this.options.maxPoints==this._markers.length+1?(this.addVertex(o.latlng),this._finishShape()):a<10&&L.Browser.touch?this._finishShape():Math.abs(n)<9*(t.devicePixelRatio||1)&&this.addVertex(o.latlng),this._enableNewMarkers()}this._mouseDownOrigin=null},_onTouch:function(t){var e,i,o=t.originalEvent;!o.touches||!o.touches[0]||this._clickHandled||this._touchHandled||this._disableMarkers||(e=o.touches[0].clientX,i=o.touches[0].clientY,this._disableNewMarkers(),this._touchHandled=!0,this._startPoint.call(this,e,i),this._endPoint.call(this,e,i,t),this._touchHandled=null),this._clickHandled=null},_onMouseOut:function(){this._tooltip&&this._tooltip._onMouseOut.call(this._tooltip)},_calculateFinishDistance:function(t){var e;if(this._markers.length>0){var i;if(this.type===L.Draw.Polyline.TYPE)i=this._markers[this._markers.length-1];else{if(this.type!==L.Draw.Polygon.TYPE)return 1/0;i=this._markers[0]}var o=this._map.latLngToContainerPoint(i.getLatLng()),n=new L.Marker(t,{icon:this.options.icon,zIndexOffset:2*this.options.zIndexOffset}),a=this._map.latLngToContainerPoint(n.getLatLng());e=o.distanceTo(a)}else e=1/0;return e},_updateFinishHandler:function(){var t=this._markers.length;t>1&&this._markers[t-1].on("click",this._finishShape,this),t>2&&this._markers[t-2].off("click",this._finishShape,this)},_createMarker:function(t){var e=new L.Marker(t,{icon:this.options.icon,zIndexOffset:2*this.options.zIndexOffset});return this._markerGroup.addLayer(e),e},_updateGuide:function(t){var e=this._markers?this._markers.length:0;e>0&&(t=t||this._map.latLngToLayerPoint(this._currentLatLng),this._clearGuides(),this._drawGuide(this._map.latLngToLayerPoint(this._markers[e-1].getLatLng()),t))},_updateTooltip:function(t){var e=this._getTooltipText();t&&this._tooltip.updatePosition(t),this._errorShown||this._tooltip.updateContent(e)},_drawGuide:function(t,e){var i,o,n,a=Math.floor(Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))),s=this.options.guidelineDistance,r=this.options.maxGuideLineLength,l=a>r?a-r:s;for(this._guidesContainer||(this._guidesContainer=L.DomUtil.create("div","leaflet-draw-guides",this._overlayPane));l<a;l+=this.options.guidelineDistance)i=l/a,o={x:Math.floor(t.x*(1-i)+i*e.x),y:Math.floor(t.y*(1-i)+i*e.y)},n=L.DomUtil.create("div","leaflet-draw-guide-dash",this._guidesContainer),n.style.backgroundColor=this._errorShown?this.options.drawError.color:this.options.shapeOptions.color,L.DomUtil.setPosition(n,o)},_updateGuideColor:function(t){if(this._guidesContainer)for(var e=0,i=this._guidesContainer.childNodes.length;e<i;e++)this._guidesContainer.childNodes[e].style.backgroundColor=t},_clearGuides:function(){if(this._guidesContainer)for(;this._guidesContainer.firstChild;)this._guidesContainer.removeChild(this._guidesContainer.firstChild)},_getTooltipText:function(){var t,e,i=this.options.showLength;return 0===this._markers.length?t={text:L.drawLocal.draw.handlers.polyline.tooltip.start}:(e=i?this._getMeasurementString():"",t=1===this._markers.length?{text:L.drawLocal.draw.handlers.polyline.tooltip.cont,subtext:e}:{text:L.drawLocal.draw.handlers.polyline.tooltip.end,subtext:e}),t},_updateRunningMeasure:function(t,e){var i,o,n=this._markers.length;1===this._markers.length?this._measurementRunningTotal=0:(i=n-(e?2:1),o=L.GeometryUtil.isVersion07x()?t.distanceTo(this._markers[i].getLatLng())*(this.options.factor||1):this._map.distance(t,this._markers[i].getLatLng())*(this.options.factor||1),this._measurementRunningTotal+=o*(e?1:-1))},_getMeasurementString:function(){var t,e=this._currentLatLng,i=this._markers[this._markers.length-1].getLatLng();return t=L.GeometryUtil.isVersion07x()?i&&e&&e.distanceTo?this._measurementRunningTotal+e.distanceTo(i)*(this.options.factor||1):this._measurementRunningTotal||0:i&&e?this._measurementRunningTotal+this._map.distance(e,i)*(this.options.factor||1):this._measurementRunningTotal||0,L.GeometryUtil.readableDistance(t,this.options.metric,this.options.feet,this.options.nautic,this.options.precision)},_showErrorTooltip:function(){this._errorShown=!0,this._tooltip.showAsError().updateContent({text:this.options.drawError.message}),this._updateGuideColor(this.options.drawError.color),this._poly.setStyle({color:this.options.drawError.color}),this._clearHideErrorTimeout(),this._hideErrorTimeout=setTimeout(L.Util.bind(this._hideErrorTooltip,this),this.options.drawError.timeout)},_hideErrorTooltip:function(){this._errorShown=!1,this._clearHideErrorTimeout(),this._tooltip.removeError().updateContent(this._getTooltipText()),this._updateGuideColor(this.options.shapeOptions.color),this._poly.setStyle({color:this.options.shapeOptions.color})},_clearHideErrorTimeout:function(){this._hideErrorTimeout&&(clearTimeout(this._hideErrorTimeout),this._hideErrorTimeout=null)},_disableNewMarkers:function(){this._disableMarkers=!0},_enableNewMarkers:function(){setTimeout(function(){this._disableMarkers=!1}.bind(this),50)},_cleanUpShape:function(){this._markers.length>1&&this._markers[this._markers.length-1].off("click",this._finishShape,this)},_fireCreatedEvent:function(){var t=new this.Poly(this._poly.getLatLngs(),this.options.shapeOptions);L.Draw.Feature.prototype._fireCreatedEvent.call(this,t)}}),L.Draw.Polygon=L.Draw.Polyline.extend({statics:{TYPE:"polygon"},Poly:L.Polygon,options:{showArea:!1,showLength:!1,shapeOptions:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0},metric:!0,feet:!0,nautic:!1,precision:{}},initialize:function(t,e){L.Draw.Polyline.prototype.initialize.call(this,t,e),this.type=L.Draw.Polygon.TYPE},_updateFinishHandler:function(){var t=this._markers.length;1===t&&this._markers[0].on("click",this._finishShape,this),t>2&&(this._markers[t-1].on("dblclick",this._finishShape,this),t>3&&this._markers[t-2].off("dblclick",this._finishShape,this))},_getTooltipText:function(){var t,e;return 0===this._markers.length?t=L.drawLocal.draw.handlers.polygon.tooltip.start:this._markers.length<3?(t=L.drawLocal.draw.handlers.polygon.tooltip.cont,e=this._getMeasurementString()):(t=L.drawLocal.draw.handlers.polygon.tooltip.end,e=this._getMeasurementString()),{text:t,subtext:e}},_getMeasurementString:function(){var t=this._area,e="";return t||this.options.showLength?(this.options.showLength&&(e=L.Draw.Polyline.prototype._getMeasurementString.call(this)),t&&(e+="<br>"+L.GeometryUtil.readableArea(t,this.options.metric,this.options.precision)),e):null},_shapeIsValid:function(){return this._markers.length>=3},_vertexChanged:function(t,e){var i;!this.options.allowIntersection&&this.options.showArea&&(i=this._poly.getLatLngs(),this._area=L.GeometryUtil.geodesicArea(i)),L.Draw.Polyline.prototype._vertexChanged.call(this,t,e)},_cleanUpShape:function(){var t=this._markers.length;t>0&&(this._markers[0].off("click",this._finishShape,this),t>2&&this._markers[t-1].off("dblclick",this._finishShape,this))}}),L.SimpleShape={},L.Draw.SimpleShape=L.Draw.Feature.extend({options:{repeatMode:!1},initialize:function(t,e){this._endLabelText=L.drawLocal.draw.handlers.simpleshape.tooltip.end,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._mapDraggable=this._map.dragging.enabled(),this._mapDraggable&&this._map.dragging.disable(),this._container.style.cursor="crosshair",this._tooltip.updateContent({text:this._initialLabelText}),this._map.on("mousedown",this._onMouseDown,this).on("mousemove",this._onMouseMove,this).on("touchstart",this._onMouseDown,this).on("touchmove",this._onMouseMove,this),e.addEventListener("touchstart",L.DomEvent.preventDefault,{passive:!1}))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._map&&(this._mapDraggable&&this._map.dragging.enable(),this._container.style.cursor="",this._map.off("mousedown",this._onMouseDown,this).off("mousemove",this._onMouseMove,this).off("touchstart",this._onMouseDown,this).off("touchmove",this._onMouseMove,this),L.DomEvent.off(e,"mouseup",this._onMouseUp,this),L.DomEvent.off(e,"touchend",this._onMouseUp,this),e.removeEventListener("touchstart",L.DomEvent.preventDefault),this._shape&&(this._map.removeLayer(this._shape),delete this._shape)),this._isDrawing=!1},_getTooltipText:function(){return{text:this._endLabelText}},_onMouseDown:function(t){this._isDrawing=!0,this._startLatLng=t.latlng,L.DomEvent.on(e,"mouseup",this._onMouseUp,this).on(e,"touchend",this._onMouseUp,this).preventDefault(t.originalEvent)},_onMouseMove:function(t){var e=t.latlng;this._tooltip.updatePosition(e),this._isDrawing&&(this._tooltip.updateContent(this._getTooltipText()),this._drawShape(e))},_onMouseUp:function(){this._shape&&this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable()}}),L.Draw.Rectangle=L.Draw.SimpleShape.extend({statics:{TYPE:"rectangle"},options:{shapeOptions:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,showArea:!0,clickable:!0},metric:!0},initialize:function(t,e){this.type=L.Draw.Rectangle.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.rectangle.tooltip.start,L.Draw.SimpleShape.prototype.initialize.call(this,t,e)},disable:function(){this._enabled&&(this._isCurrentlyTwoClickDrawing=!1,L.Draw.SimpleShape.prototype.disable.call(this))},_onMouseUp:function(t){if(!this._shape&&!this._isCurrentlyTwoClickDrawing)return void(this._isCurrentlyTwoClickDrawing=!0);this._isCurrentlyTwoClickDrawing&&!o(t.target,"leaflet-pane")||L.Draw.SimpleShape.prototype._onMouseUp.call(this)},_drawShape:function(t){this._shape?this._shape.setBounds(new L.LatLngBounds(this._startLatLng,t)):(this._shape=new L.Rectangle(new L.LatLngBounds(this._startLatLng,t),this.options.shapeOptions),this._map.addLayer(this._shape))},_fireCreatedEvent:function(){var t=new L.Rectangle(this._shape.getBounds(),this.options.shapeOptions);L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this,t)},_getTooltipText:function(){var t,e,i,o=L.Draw.SimpleShape.prototype._getTooltipText.call(this),n=this._shape,a=this.options.showArea;return n&&(t=this._shape._defaultShape?this._shape._defaultShape():this._shape.getLatLngs(),e=L.GeometryUtil.geodesicArea(t),i=a?L.GeometryUtil.readableArea(e,this.options.metric):""),{text:o.text,subtext:i}}}),L.Draw.Marker=L.Draw.Feature.extend({statics:{TYPE:"marker"},options:{icon:new L.Icon.Default,repeatMode:!1,zIndexOffset:2e3},initialize:function(t,e){this.type=L.Draw.Marker.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.marker.tooltip.start,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._tooltip.updateContent({text:this._initialLabelText}),this._mouseMarker||(this._mouseMarker=L.marker(this._map.getCenter(),{icon:L.divIcon({className:"leaflet-mouse-marker",iconAnchor:[20,20],iconSize:[40,40]}),opacity:0,zIndexOffset:this.options.zIndexOffset})),this._mouseMarker.on("click",this._onClick,this).addTo(this._map),this._map.on("mousemove",this._onMouseMove,this),this._map.on("click",this._onTouch,this))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._map&&(this._map.off("click",this._onClick,this).off("click",this._onTouch,this),this._marker&&(this._marker.off("click",this._onClick,this),this._map.removeLayer(this._marker),delete this._marker),this._mouseMarker.off("click",this._onClick,this),this._map.removeLayer(this._mouseMarker),delete this._mouseMarker,this._map.off("mousemove",this._onMouseMove,this))},_onMouseMove:function(t){var e=t.latlng;this._tooltip.updatePosition(e),this._mouseMarker.setLatLng(e),this._marker?(e=this._mouseMarker.getLatLng(),this._marker.setLatLng(e)):(this._marker=this._createMarker(e),this._marker.on("click",this._onClick,this),this._map.on("click",this._onClick,this).addLayer(this._marker))},_createMarker:function(t){return new L.Marker(t,{icon:this.options.icon,zIndexOffset:this.options.zIndexOffset})},_onClick:function(){this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable()},_onTouch:function(t){this._onMouseMove(t),this._onClick()},_fireCreatedEvent:function(){var t=new L.Marker.Touch(this._marker.getLatLng(),{icon:this.options.icon});L.Draw.Feature.prototype._fireCreatedEvent.call(this,t)}}),L.Draw.CircleMarker=L.Draw.Marker.extend({statics:{TYPE:"circlemarker"},options:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0,zIndexOffset:2e3},initialize:function(t,e){this.type=L.Draw.CircleMarker.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.circlemarker.tooltip.start,L.Draw.Feature.prototype.initialize.call(this,t,e)},_fireCreatedEvent:function(){var t=new L.CircleMarker(this._marker.getLatLng(),this.options);L.Draw.Feature.prototype._fireCreatedEvent.call(this,t)},_createMarker:function(t){return new L.CircleMarker(t,this.options)}}),L.Draw.Circle=L.Draw.SimpleShape.extend({statics:{TYPE:"circle"},options:{shapeOptions:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0},showRadius:!0,metric:!0,feet:!0,nautic:!1},initialize:function(t,e){this.type=L.Draw.Circle.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.circle.tooltip.start,L.Draw.SimpleShape.prototype.initialize.call(this,t,e)},_drawShape:function(t){if(L.GeometryUtil.isVersion07x())var e=this._startLatLng.distanceTo(t);else var e=this._map.distance(this._startLatLng,t);this._shape?this._shape.setRadius(e):(this._shape=new L.Circle(this._startLatLng,e,this.options.shapeOptions),this._map.addLayer(this._shape))},_fireCreatedEvent:function(){var t=new L.Circle(this._startLatLng,this._shape.getRadius(),this.options.shapeOptions);L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this,t)},_onMouseMove:function(t){var e,i=t.latlng,o=this.options.showRadius,n=this.options.metric;if(this._tooltip.updatePosition(i),this._isDrawing){this._drawShape(i),e=this._shape.getRadius().toFixed(1);var a="";o&&(a=L.drawLocal.draw.handlers.circle.radius+": "+L.GeometryUtil.readableDistance(e,n,this.options.feet,this.options.nautic)),this._tooltip.updateContent({text:this._endLabelText,subtext:a})}}}),L.Edit=L.Edit||{},L.Edit.Marker=L.Handler.extend({initialize:function(t,e){this._marker=t,L.setOptions(this,e)},addHooks:function(){var t=this._marker;t.dragging.enable(),t.on("dragend",this._onDragEnd,t),this._toggleMarkerHighlight()},removeHooks:function(){var t=this._marker;t.dragging.disable(),t.off("dragend",this._onDragEnd,t),this._toggleMarkerHighlight()},_onDragEnd:function(t){var e=t.target;e.edited=!0,this._map.fire(L.Draw.Event.EDITMOVE,{layer:e})},_toggleMarkerHighlight:function(){var t=this._marker._icon;t&&(t.style.display="none",L.DomUtil.hasClass(t,"leaflet-edit-marker-selected")?(L.DomUtil.removeClass(t,"leaflet-edit-marker-selected"),this._offsetMarker(t,-4)):(L.DomUtil.addClass(t,"leaflet-edit-marker-selected"),this._offsetMarker(t,4)),t.style.display="")},_offsetMarker:function(t,e){var i=parseInt(t.style.marginTop,10)-e,o=parseInt(t.style.marginLeft,10)-e;t.style.marginTop=i+"px",t.style.marginLeft=o+"px"}}),L.Marker.addInitHook(function(){L.Edit.Marker&&(this.editing=new L.Edit.Marker(this),this.options.editable&&this.editing.enable())}),L.Edit=L.Edit||{},L.Edit.Poly=L.Handler.extend({initialize:function(t){this.latlngs=[t._latlngs],t._holes&&(this.latlngs=this.latlngs.concat(t._holes)),this._poly=t,this._poly.on("revert-edited",this._updateLatLngs,this)},_defaultShape:function(){return L.Polyline._flat?L.Polyline._flat(this._poly._latlngs)?this._poly._latlngs:this._poly._latlngs[0]:this._poly._latlngs},_eachVertexHandler:function(t){for(var e=0;e<this._verticesHandlers.length;e++)t(this._verticesHandlers[e])},addHooks:function(){this._initHandlers(),this._eachVertexHandler(function(t){t.addHooks()})},removeHooks:function(){this._eachVertexHandler(function(t){t.removeHooks()})},updateMarkers:function(){this._eachVertexHandler(function(t){t.updateMarkers()})},_initHandlers:function(){this._verticesHandlers=[];for(var t=0;t<this.latlngs.length;t++)this._verticesHandlers.push(new L.Edit.PolyVerticesEdit(this._poly,this.latlngs[t],this._poly.options.poly))},_updateLatLngs:function(t){this.latlngs=[t.layer._latlngs],t.layer._holes&&(this.latlngs=this.latlngs.concat(t.layer._holes))}}),L.Edit.PolyVerticesEdit=L.Handler.extend({options:{icon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon"}),touchIcon:new L.DivIcon({iconSize:new L.Point(20,20),className:"leaflet-div-icon leaflet-editing-icon leaflet-touch-icon"}),drawError:{color:"#b00b00",timeout:1e3}},initialize:function(t,e,i){L.Browser.touch&&(this.options.icon=this.options.touchIcon),this._poly=t,i&&i.drawError&&(i.drawError=L.Util.extend({},this.options.drawError,i.drawError)),this._latlngs=e,L.setOptions(this,i)},_defaultShape:function(){return L.Polyline._flat?L.Polyline._flat(this._latlngs)?this._latlngs:this._latlngs[0]:this._latlngs},addHooks:function(){var t=this._poly,e=t._path;t instanceof L.Polygon||(t.options.fill=!1,t.options.editing&&(t.options.editing.fill=!1)),e&&t.options.editing.className&&(t.options.original.className&&t.options.original.className.split(" ").forEach(function(t){L.DomUtil.removeClass(e,t)}),t.options.editing.className.split(" ").forEach(function(t){L.DomUtil.addClass(e,t)})),t.setStyle(t.options.editing),this._poly._map&&(this._map=this._poly._map,this._markerGroup||this._initMarkers(),this._poly._map.addLayer(this._markerGroup))},removeHooks:function(){var t=this._poly,e=t._path;e&&t.options.editing.className&&(t.options.editing.className.split(" ").forEach(function(t){L.DomUtil.removeClass(e,t)}),t.options.original.className&&t.options.original.className.split(" ").forEach(function(t){L.DomUtil.addClass(e,t)})),t.setStyle(t.options.original),t._map&&(t._map.removeLayer(this._markerGroup),delete this._markerGroup,delete this._markers)},updateMarkers:function(){this._markerGroup.clearLayers(),this._initMarkers()},_initMarkers:function(){this._markerGroup||(this._markerGroup=new L.LayerGroup),this._markers=[];var t,e,i,o,n=this._defaultShape();for(t=0,i=n.length;t<i;t++)o=this._createMarker(n[t],t),o.on("click",this._onMarkerClick,this),o.on("contextmenu",this._onContextMenu,this),this._markers.push(o);var a,s;for(t=0,e=i-1;t<i;e=t++)(0!==t||L.Polygon&&this._poly instanceof L.Polygon)&&(a=this._markers[e],s=this._markers[t],this._createMiddleMarker(a,s),this._updatePrevNext(a,s))},_createMarker:function(t,e){var i=new L.Marker.Touch(t,{draggable:!0,icon:this.options.icon});return i._origLatLng=t,i._index=e,i.on("dragstart",this._onMarkerDragStart,this).on("drag",this._onMarkerDrag,this).on("dragend",this._fireEdit,this).on("touchmove",this._onTouchMove,this).on("touchend",this._fireEdit,this).on("MSPointerMove",this._onTouchMove,this).on("MSPointerUp",this._fireEdit,this),this._markerGroup.addLayer(i),i},_onMarkerDragStart:function(){this._poly.fire("editstart")},_spliceLatLngs:function(){var t=this._defaultShape(),e=[].splice.apply(t,arguments);return this._poly._convertLatLngs(t,!0),this._poly.redraw(),e},_removeMarker:function(t){var e=t._index;this._markerGroup.removeLayer(t),this._markers.splice(e,1),this._spliceLatLngs(e,1),this._updateIndexes(e,-1),t.off("dragstart",this._onMarkerDragStart,this).off("drag",this._onMarkerDrag,this).off("dragend",this._fireEdit,this).off("touchmove",this._onMarkerDrag,this).off("touchend",this._fireEdit,this).off("click",this._onMarkerClick,this).off("MSPointerMove",this._onTouchMove,this).off("MSPointerUp",this._fireEdit,this)},_fireEdit:function(){this._poly.edited=!0,this._poly.fire("edit"),this._poly._map.fire(L.Draw.Event.EDITVERTEX,{layers:this._markerGroup,poly:this._poly})},_onMarkerDrag:function(t){var e=t.target,i=this._poly;if(L.extend(e._origLatLng,e._latlng),e._middleLeft&&e._middleLeft.setLatLng(this._getMiddleLatLng(e._prev,e)),e._middleRight&&e._middleRight.setLatLng(this._getMiddleLatLng(e,e._next)),i.options.poly){var o=i._map._editTooltip;if(!i.options.poly.allowIntersection&&i.intersects()){var n=i.options.color;i.setStyle({color:this.options.drawError.color}),0!==L.version.indexOf("0.7")&&e.dragging._draggable._onUp(t),this._onMarkerClick(t),o&&o.updateContent({text:L.drawLocal.draw.handlers.polyline.error}),setTimeout(function(){i.setStyle({color:n}),o&&o.updateContent({text:L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.edit.handlers.edit.tooltip.subtext})},1e3)}}this._poly._bounds._southWest=L.latLng(1/0,1/0),this._poly._bounds._northEast=L.latLng(-1/0,-1/0);var a=this._poly.getLatLngs();this._poly._convertLatLngs(a,!0),this._poly.redraw(),this._poly.fire("editdrag")},_onMarkerClick:function(t){var e=L.Polygon&&this._poly instanceof L.Polygon?4:3,i=t.target;this._defaultShape().length<e||(this._removeMarker(i),this._updatePrevNext(i._prev,i._next),i._middleLeft&&this._markerGroup.removeLayer(i._middleLeft),i._middleRight&&this._markerGroup.removeLayer(i._middleRight),i._prev&&i._next?this._createMiddleMarker(i._prev,i._next):i._prev?i._next||(i._prev._middleRight=null):i._next._middleLeft=null,this._fireEdit())},_onContextMenu:function(t){var e=t.target;this._poly;this._poly._map.fire(L.Draw.Event.MARKERCONTEXT,{marker:e,layers:this._markerGroup,poly:this._poly}),L.DomEvent.stopPropagation},_onTouchMove:function(t){var e=this._map.mouseEventToLayerPoint(t.originalEvent.touches[0]),i=this._map.layerPointToLatLng(e),o=t.target;L.extend(o._origLatLng,i),o._middleLeft&&o._middleLeft.setLatLng(this._getMiddleLatLng(o._prev,o)),o._middleRight&&o._middleRight.setLatLng(this._getMiddleLatLng(o,o._next)),this._poly.redraw(),this.updateMarkers()},_updateIndexes:function(t,e){this._markerGroup.eachLayer(function(i){i._index>t&&(i._index+=e)})},_createMiddleMarker:function(t,e){var i,o,n,a=this._getMiddleLatLng(t,e),s=this._createMarker(a);s.setOpacity(.8),t._middleRight=e._middleLeft=s,o=function(){s.off("touchmove",o,this);var n=e._index;s._index=n,s.off("click",i,this).on("click",this._onMarkerClick,this),a.lat=s.getLatLng().lat,a.lng=s.getLatLng().lng,this._spliceLatLngs(n,0,a),this._markers.splice(n,0,s),s.setOpacity(1),s._icon.classList.remove('leaflet-middle-icon'),this._updateIndexes(n,1),e._index++,this._updatePrevNext(t,s),this._updatePrevNext(s,e),this._poly.fire("editstart")},n=function(){s.off("dragstart",o,this),s.off("dragend",n,this),s.off("touchmove",o,this),this._createMiddleMarker(t,s),this._createMiddleMarker(s,e)},i=function(){o.call(this),n.call(this),this._fireEdit()},s.on("click",i,this).on("dragstart",o,this).on("dragend",n,this).on("touchmove",o,this),this._markerGroup.addLayer(s);setTimeout(() => {s._icon.classList.add('leaflet-middle-icon')}, 100);},_updatePrevNext:function(t,e){t&&(t._next=e),e&&(e._prev=t)},_getMiddleLatLng:function(t,e){var i=this._poly._map,o=i.project(t.getLatLng()),n=i.project(e.getLatLng());return i.unproject(o._add(n)._divideBy(2))}}),L.Polyline.addInitHook(function(){this.editing||(L.Edit.Poly&&(this.editing=new L.Edit.Poly(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()}))}),L.Edit=L.Edit||{},L.Edit.SimpleShape=L.Handler.extend({options:{moveIcon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-move"}),resizeIcon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-resize"}),touchMoveIcon:new L.DivIcon({
-iconSize:new L.Point(20,20),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-move leaflet-touch-icon"}),touchResizeIcon:new L.DivIcon({iconSize:new L.Point(20,20),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-resize leaflet-touch-icon"})},initialize:function(t,e){L.Browser.touch&&(this.options.moveIcon=this.options.touchMoveIcon,this.options.resizeIcon=this.options.touchResizeIcon),this._shape=t,L.Util.setOptions(this,e)},addHooks:function(){var t=this._shape;this._shape._map&&(this._map=this._shape._map,t.setStyle(t.options.editing),t._map&&(this._map=t._map,this._markerGroup||this._initMarkers(),this._map.addLayer(this._markerGroup)))},removeHooks:function(){var t=this._shape;if(t.setStyle(t.options.original),t._map){this._unbindMarker(this._moveMarker);for(var e=0,i=this._resizeMarkers.length;e<i;e++)this._unbindMarker(this._resizeMarkers[e]);this._resizeMarkers=null,this._map.removeLayer(this._markerGroup),delete this._markerGroup}this._map=null},updateMarkers:function(){this._markerGroup.clearLayers(),this._initMarkers()},_initMarkers:function(){this._markerGroup||(this._markerGroup=new L.LayerGroup),this._createMoveMarker(),this._createResizeMarker()},_createMoveMarker:function(){},_createResizeMarker:function(){},_createMarker:function(t,e){var i=new L.Marker.Touch(t,{draggable:!0,icon:e,zIndexOffset:10});return this._bindMarker(i),this._markerGroup.addLayer(i),i},_bindMarker:function(t){t.on("dragstart",this._onMarkerDragStart,this).on("drag",this._onMarkerDrag,this).on("dragend",this._onMarkerDragEnd,this).on("touchstart",this._onTouchStart,this).on("touchmove",this._onTouchMove,this).on("MSPointerMove",this._onTouchMove,this).on("touchend",this._onTouchEnd,this).on("MSPointerUp",this._onTouchEnd,this)},_unbindMarker:function(t){t.off("dragstart",this._onMarkerDragStart,this).off("drag",this._onMarkerDrag,this).off("dragend",this._onMarkerDragEnd,this).off("touchstart",this._onTouchStart,this).off("touchmove",this._onTouchMove,this).off("MSPointerMove",this._onTouchMove,this).off("touchend",this._onTouchEnd,this).off("MSPointerUp",this._onTouchEnd,this)},_onMarkerDragStart:function(t){t.target.setOpacity(0),this._shape.fire("editstart")},_fireEdit:function(){this._shape.edited=!0,this._shape.fire("edit")},_onMarkerDrag:function(t){var e=t.target,i=e.getLatLng();e===this._moveMarker?this._move(i):this._resize(i),this._shape.redraw(),this._shape.fire("editdrag")},_onMarkerDragEnd:function(t){t.target.setOpacity(1),this._fireEdit()},_onTouchStart:function(t){if(L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this,t),"function"==typeof this._getCorners){var e=this._getCorners(),i=t.target,o=i._cornerIndex;i.setOpacity(0),this._oppositeCorner=e[(o+2)%4],this._toggleCornerMarkers(0,o)}this._shape.fire("editstart")},_onTouchMove:function(t){var e=this._map.mouseEventToLayerPoint(t.originalEvent.touches[0]),i=this._map.layerPointToLatLng(e);return t.target===this._moveMarker?this._move(i):this._resize(i),this._shape.redraw(),!1},_onTouchEnd:function(t){t.target.setOpacity(1),this.updateMarkers(),this._fireEdit()},_move:function(){},_resize:function(){}}),L.Edit=L.Edit||{},L.Edit.Rectangle=L.Edit.SimpleShape.extend({_createMoveMarker:function(){var t=this._shape.getBounds(),e=t.getCenter();this._moveMarker=this._createMarker(e,this.options.moveIcon)},_createResizeMarker:function(){var t=this._getCorners();this._resizeMarkers=[];for(var e=0,i=t.length;e<i;e++)this._resizeMarkers.push(this._createMarker(t[e],this.options.resizeIcon)),this._resizeMarkers[e]._cornerIndex=e},_onMarkerDragStart:function(t){L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this,t);var e=this._getCorners(),i=t.target,o=i._cornerIndex;this._oppositeCorner=e[(o+2)%4],this._toggleCornerMarkers(0,o)},_onMarkerDragEnd:function(t){var e,i,o=t.target;o===this._moveMarker&&(e=this._shape.getBounds(),i=e.getCenter(),o.setLatLng(i)),this._toggleCornerMarkers(1),this._repositionCornerMarkers(),L.Edit.SimpleShape.prototype._onMarkerDragEnd.call(this,t)},_move:function(t){for(var e,i=this._shape._defaultShape?this._shape._defaultShape():this._shape.getLatLngs(),o=this._shape.getBounds(),n=o.getCenter(),a=[],s=0,r=i.length;s<r;s++)e=[i[s].lat-n.lat,i[s].lng-n.lng],a.push([t.lat+e[0],t.lng+e[1]]);this._shape.setLatLngs(a),this._repositionCornerMarkers(),this._map.fire(L.Draw.Event.EDITMOVE,{layer:this._shape})},_resize:function(t){var e;this._shape.setBounds(L.latLngBounds(t,this._oppositeCorner)),e=this._shape.getBounds(),this._moveMarker.setLatLng(e.getCenter()),this._map.fire(L.Draw.Event.EDITRESIZE,{layer:this._shape})},_getCorners:function(){var t=this._shape.getBounds();return[t.getNorthWest(),t.getNorthEast(),t.getSouthEast(),t.getSouthWest()]},_toggleCornerMarkers:function(t){for(var e=0,i=this._resizeMarkers.length;e<i;e++)this._resizeMarkers[e].setOpacity(t)},_repositionCornerMarkers:function(){for(var t=this._getCorners(),e=0,i=this._resizeMarkers.length;e<i;e++)this._resizeMarkers[e].setLatLng(t[e])}}),L.Rectangle.addInitHook(function(){L.Edit.Rectangle&&(this.editing=new L.Edit.Rectangle(this),this.options.editable&&this.editing.enable())}),L.Edit=L.Edit||{},L.Edit.CircleMarker=L.Edit.SimpleShape.extend({_createMoveMarker:function(){var t=this._shape.getLatLng();this._moveMarker=this._createMarker(t,this.options.moveIcon)},_createResizeMarker:function(){this._resizeMarkers=[]},_move:function(t){if(this._resizeMarkers.length){var e=this._getResizeMarkerPoint(t);this._resizeMarkers[0].setLatLng(e)}this._shape.setLatLng(t),this._map.fire(L.Draw.Event.EDITMOVE,{layer:this._shape})}}),L.CircleMarker.addInitHook(function(){L.Edit.CircleMarker&&(this.editing=new L.Edit.CircleMarker(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()})}),L.Edit=L.Edit||{},L.Edit.Circle=L.Edit.CircleMarker.extend({_createResizeMarker:function(){var t=this._shape.getLatLng(),e=this._getResizeMarkerPoint(t);this._resizeMarkers=[],this._resizeMarkers.push(this._createMarker(e,this.options.resizeIcon))},_getResizeMarkerPoint:function(t){var e=this._shape._radius*Math.cos(Math.PI/4),i=this._map.project(t);return this._map.unproject([i.x+e,i.y-e])},_resize:function(t){var e=this._moveMarker.getLatLng();L.GeometryUtil.isVersion07x()?radius=e.distanceTo(t):radius=this._map.distance(e,t),this._shape.setRadius(radius),this._map._editTooltip.updateContent({text:L.drawLocal.edit.handlers.edit.tooltip.subtext+"<br />"+L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.draw.handlers.circle.radius+": "+L.GeometryUtil.readableDistance(radius,!0,this.options.feet,this.options.nautic)}),this._shape.setRadius(radius),this._map.fire(L.Draw.Event.EDITRESIZE,{layer:this._shape})}}),L.Circle.addInitHook(function(){L.Edit.Circle&&(this.editing=new L.Edit.Circle(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()})}),L.Map.mergeOptions({touchExtend:!0}),L.Map.TouchExtend=L.Handler.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane},addHooks:function(){L.DomEvent.on(this._container,"touchstart",this._onTouchStart,this),L.DomEvent.on(this._container,"touchend",this._onTouchEnd,this),L.DomEvent.on(this._container,"touchmove",this._onTouchMove,this),this._detectIE()?(L.DomEvent.on(this._container,"MSPointerDown",this._onTouchStart,this),L.DomEvent.on(this._container,"MSPointerUp",this._onTouchEnd,this),L.DomEvent.on(this._container,"MSPointerMove",this._onTouchMove,this),L.DomEvent.on(this._container,"MSPointerCancel",this._onTouchCancel,this)):(L.DomEvent.on(this._container,"touchcancel",this._onTouchCancel,this),L.DomEvent.on(this._container,"touchleave",this._onTouchLeave,this))},removeHooks:function(){L.DomEvent.off(this._container,"touchstart",this._onTouchStart),L.DomEvent.off(this._container,"touchend",this._onTouchEnd),L.DomEvent.off(this._container,"touchmove",this._onTouchMove),this._detectIE()?(L.DomEvent.off(this._container,"MSPointerDowm",this._onTouchStart),L.DomEvent.off(this._container,"MSPointerUp",this._onTouchEnd),L.DomEvent.off(this._container,"MSPointerMove",this._onTouchMove),L.DomEvent.off(this._container,"MSPointerCancel",this._onTouchCancel)):(L.DomEvent.off(this._container,"touchcancel",this._onTouchCancel),L.DomEvent.off(this._container,"touchleave",this._onTouchLeave))},_touchEvent:function(t,e){var i={};if(void 0!==t.touches){if(!t.touches.length)return;i=t.touches[0]}else{if("touch"!==t.pointerType)return;if(i=t,!this._filterClick(t))return}var o=this._map.mouseEventToContainerPoint(i),n=this._map.mouseEventToLayerPoint(i),a=this._map.layerPointToLatLng(n);this._map.fire(e,{latlng:a,layerPoint:n,containerPoint:o,pageX:i.pageX,pageY:i.pageY,originalEvent:t})},_filterClick:function(t){var e=t.timeStamp||t.originalEvent.timeStamp,i=L.DomEvent._lastClick&&e-L.DomEvent._lastClick;return i&&i>100&&i<500||t.target._simulatedClick&&!t._simulated?(L.DomEvent.stop(t),!1):(L.DomEvent._lastClick=e,!0)},_onTouchStart:function(t){if(this._map._loaded){this._touchEvent(t,"touchstart")}},_onTouchEnd:function(t){if(this._map._loaded){this._touchEvent(t,"touchend")}},_onTouchCancel:function(t){if(this._map._loaded){var e="touchcancel";this._detectIE()&&(e="pointercancel"),this._touchEvent(t,e)}},_onTouchLeave:function(t){if(this._map._loaded){this._touchEvent(t,"touchleave")}},_onTouchMove:function(t){if(this._map._loaded){this._touchEvent(t,"touchmove")}},_detectIE:function(){var e=t.navigator.userAgent,i=e.indexOf("MSIE ");if(i>0)return parseInt(e.substring(i+5,e.indexOf(".",i)),10);if(e.indexOf("Trident/")>0){var o=e.indexOf("rv:");return parseInt(e.substring(o+3,e.indexOf(".",o)),10)}var n=e.indexOf("Edge/");return n>0&&parseInt(e.substring(n+5,e.indexOf(".",n)),10)}}),L.Map.addInitHook("addHandler","touchExtend",L.Map.TouchExtend),L.Marker.Touch=L.Marker.extend({_initInteraction:function(){return this.addInteractiveTarget?L.Marker.prototype._initInteraction.apply(this):this._initInteractionLegacy()},_initInteractionLegacy:function(){if(this.options.clickable){var t=this._icon,e=["dblclick","mousedown","mouseover","mouseout","contextmenu","touchstart","touchend","touchmove"];this._detectIE?e.concat(["MSPointerDown","MSPointerUp","MSPointerMove","MSPointerCancel"]):e.concat(["touchcancel"]),L.DomUtil.addClass(t,"leaflet-clickable"),L.DomEvent.on(t,"click",this._onMouseClick,this),L.DomEvent.on(t,"keypress",this._onKeyPress,this);for(var i=0;i<e.length;i++)L.DomEvent.on(t,e[i],this._fireMouseEvent,this);L.Handler.MarkerDrag&&(this.dragging=new L.Handler.MarkerDrag(this),this.options.draggable&&this.dragging.enable())}},_detectIE:function(){var e=t.navigator.userAgent,i=e.indexOf("MSIE ");if(i>0)return parseInt(e.substring(i+5,e.indexOf(".",i)),10);if(e.indexOf("Trident/")>0){var o=e.indexOf("rv:");return parseInt(e.substring(o+3,e.indexOf(".",o)),10)}var n=e.indexOf("Edge/");return n>0&&parseInt(e.substring(n+5,e.indexOf(".",n)),10)}}),L.LatLngUtil={cloneLatLngs:function(t){for(var e=[],i=0,o=t.length;i<o;i++)Array.isArray(t[i])?e.push(L.LatLngUtil.cloneLatLngs(t[i])):e.push(this.cloneLatLng(t[i]));return e},cloneLatLng:function(t){return L.latLng(t.lat,t.lng)}},function(){var t={km:2,ha:2,m:0,mi:2,ac:2,yd:0,ft:0,nm:2};L.GeometryUtil=L.extend(L.GeometryUtil||{},{geodesicArea:function(t){var e,i,o=t.length,n=0,a=Math.PI/180;if(o>2){for(var s=0;s<o;s++)e=t[s],i=t[(s+1)%o],n+=(i.lng-e.lng)*a*(2+Math.sin(e.lat*a)+Math.sin(i.lat*a));n=6378137*n*6378137/2}return Math.abs(n)},formattedNumber:function(t,e){var i=parseFloat(t).toFixed(e),o=L.drawLocal.format&&L.drawLocal.format.numeric,n=o&&o.delimiters,a=n&&n.thousands,s=n&&n.decimal;if(a||s){var r=i.split(".");i=a?r[0].replace(/(\d)(?=(\d{3})+(?!\d))/g,"$1"+a):r[0],s=s||".",r.length>1&&(i=i+s+r[1])}return i},readableArea:function(e,i,o){var n,a,o=L.Util.extend({},t,o);return i?(a=["ha","m"],type=typeof i,"string"===type?a=[i]:"boolean"!==type&&(a=i),n=e>=1e6&&-1!==a.indexOf("km")?L.GeometryUtil.formattedNumber(1e-6*e,o.km)+" km²":e>=1e4&&-1!==a.indexOf("ha")?L.GeometryUtil.formattedNumber(1e-4*e,o.ha)+" ha":L.GeometryUtil.formattedNumber(e,o.m)+" m²"):(e/=.836127,n=e>=3097600?L.GeometryUtil.formattedNumber(e/3097600,o.mi)+" mi²":e>=4840?L.GeometryUtil.formattedNumber(e/4840,o.ac)+" acres":L.GeometryUtil.formattedNumber(e,o.yd)+" yd²"),n},readableDistance:function(e,i,o,n,a){var s,a=L.Util.extend({},t,a);switch(i?"string"==typeof i?i:"metric":o?"feet":n?"nauticalMile":"yards"){case"metric":s=e>1e3?L.GeometryUtil.formattedNumber(e/1e3,a.km)+" km":L.GeometryUtil.formattedNumber(e,a.m)+" m";break;case"feet":e*=3.28083,s=L.GeometryUtil.formattedNumber(e,a.ft)+" ft";break;case"nauticalMile":e*=.53996,s=L.GeometryUtil.formattedNumber(e/1e3,a.nm)+" nm";break;case"yards":default:e*=1.09361,s=e>1760?L.GeometryUtil.formattedNumber(e/1760,a.mi)+" miles":L.GeometryUtil.formattedNumber(e,a.yd)+" yd"}return s},isVersion07x:function(){var t=L.version.split(".");return 0===parseInt(t[0],10)&&7===parseInt(t[1],10)}})}(),L.Util.extend(L.LineUtil,{segmentsIntersect:function(t,e,i,o){return this._checkCounterclockwise(t,i,o)!==this._checkCounterclockwise(e,i,o)&&this._checkCounterclockwise(t,e,i)!==this._checkCounterclockwise(t,e,o)},_checkCounterclockwise:function(t,e,i){return(i.y-t.y)*(e.x-t.x)>(e.y-t.y)*(i.x-t.x)}}),L.Polyline.include({intersects:function(){var t,e,i,o=this._getProjectedPoints(),n=o?o.length:0;if(this._tooFewPointsForIntersection())return!1;for(t=n-1;t>=3;t--)if(e=o[t-1],i=o[t],this._lineSegmentsIntersectsRange(e,i,t-2))return!0;return!1},newLatLngIntersects:function(t,e){return!!this._map&&this.newPointIntersects(this._map.latLngToLayerPoint(t),e)},newPointIntersects:function(t,e){var i=this._getProjectedPoints(),o=i?i.length:0,n=i?i[o-1]:null,a=o-2;return!this._tooFewPointsForIntersection(1)&&this._lineSegmentsIntersectsRange(n,t,a,e?1:0)},_tooFewPointsForIntersection:function(t){var e=this._getProjectedPoints(),i=e?e.length:0;return i+=t||0,!e||i<=3},_lineSegmentsIntersectsRange:function(t,e,i,o){var n,a,s=this._getProjectedPoints();o=o||0;for(var r=i;r>o;r--)if(n=s[r-1],a=s[r],L.LineUtil.segmentsIntersect(t,e,n,a))return!0;return!1},_getProjectedPoints:function(){if(!this._defaultShape)return this._originalPoints;for(var t=[],e=this._defaultShape(),i=0;i<e.length;i++)t.push(this._map.latLngToLayerPoint(e[i]));return t}}),L.Polygon.include({intersects:function(){var t,e,i,o,n=this._getProjectedPoints();return!this._tooFewPointsForIntersection()&&(!!L.Polyline.prototype.intersects.call(this)||(t=n.length,e=n[0],i=n[t-1],o=t-2,this._lineSegmentsIntersectsRange(i,e,o,1)))}}),L.Control.Draw=L.Control.extend({options:{position:"topleft",draw:{},edit:!1},initialize:function(t){if(L.version<"0.7")throw new Error("Leaflet.draw 0.2.3+ requires Leaflet 0.7.0+. Download latest from https://github.com/Leaflet/Leaflet/");L.Control.prototype.initialize.call(this,t);var e;this._toolbars={},L.DrawToolbar&&this.options.draw&&(e=new L.DrawToolbar(this.options.draw),this._toolbars[L.DrawToolbar.TYPE]=e,this._toolbars[L.DrawToolbar.TYPE].on("enable",this._toolbarEnabled,this)),L.EditToolbar&&this.options.edit&&(e=new L.EditToolbar(this.options.edit),this._toolbars[L.EditToolbar.TYPE]=e,this._toolbars[L.EditToolbar.TYPE].on("enable",this._toolbarEnabled,this)),L.toolbar=this},onAdd:function(t){var e,i=L.DomUtil.create("div","leaflet-draw"),o=!1;for(var n in this._toolbars)this._toolbars.hasOwnProperty(n)&&(e=this._toolbars[n].addToolbar(t))&&(o||(L.DomUtil.hasClass(e,"leaflet-draw-toolbar-top")||L.DomUtil.addClass(e.childNodes[0],"leaflet-draw-toolbar-top"),o=!0),i.appendChild(e));return i},onRemove:function(){for(var t in this._toolbars)this._toolbars.hasOwnProperty(t)&&this._toolbars[t].removeToolbar()},setDrawingOptions:function(t){for(var e in this._toolbars)this._toolbars[e]instanceof L.DrawToolbar&&this._toolbars[e].setOptions(t)},_toolbarEnabled:function(t){var e=t.target;for(var i in this._toolbars)this._toolbars[i]!==e&&this._toolbars[i].disable()}}),L.Map.mergeOptions({drawControlTooltips:!0,drawControl:!1}),L.Map.addInitHook(function(){this.options.drawControl&&(this.drawControl=new L.Control.Draw,this.addControl(this.drawControl))}),L.Toolbar=L.Class.extend({initialize:function(t){L.setOptions(this,t),this._modes={},this._actionButtons=[],this._activeMode=null;var e=L.version.split(".");1===parseInt(e[0],10)&&parseInt(e[1],10)>=2?L.Toolbar.include(L.Evented.prototype):L.Toolbar.include(L.Mixin.Events)},enabled:function(){return null!==this._activeMode},disable:function(){this.enabled()&&this._activeMode.handler.disable()},addToolbar:function(t){var e,i=L.DomUtil.create("div","leaflet-draw-section"),o=0,n=this._toolbarClass||"",a=this.getModeHandlers(t);for(this._toolbarContainer=L.DomUtil.create("div","leaflet-draw-toolbar leaflet-bar"),this._map=t,e=0;e<a.length;e++)a[e].enabled&&this._initModeHandler(a[e].handler,this._toolbarContainer,o++,n,a[e].title);if(o)return this._lastButtonIndex=--o,this._actionsContainer=L.DomUtil.create("ul","leaflet-draw-actions"),i.appendChild(this._toolbarContainer),i.appendChild(this._actionsContainer),i},removeToolbar:function(){for(var t in this._modes)this._modes.hasOwnProperty(t)&&(this._disposeButton(this._modes[t].button,this._modes[t].handler.enable,this._modes[t].handler),this._modes[t].handler.disable(),this._modes[t].handler.off("enabled",this._handlerActivated,this).off("disabled",this._handlerDeactivated,this));this._modes={};for(var e=0,i=this._actionButtons.length;e<i;e++)this._disposeButton(this._actionButtons[e].button,this._actionButtons[e].callback,this);this._actionButtons=[],this._actionsContainer=null},_initModeHandler:function(t,e,i,o,n){var a=t.type;this._modes[a]={},this._modes[a].handler=t,this._modes[a].button=this._createButton({type:a,title:n,className:o+"-"+a,container:e,callback:this._modes[a].handler.enable,context:this._modes[a].handler}),this._modes[a].buttonIndex=i,this._modes[a].handler.on("enabled",this._handlerActivated,this).on("disabled",this._handlerDeactivated,this)},_detectIOS:function(){return/iPad|iPhone|iPod/.test(navigator.userAgent)&&!t.MSStream},_createButton:function(t){var e=L.DomUtil.create("a",t.className||"",t.container),i=L.DomUtil.create("span","sr-only",t.container);e.href="#",e.appendChild(i),t.title&&(e.title=t.title,i.innerHTML=t.title),t.text&&(e.innerHTML=t.text,i.innerHTML=t.text);var o=this._detectIOS()?"touchstart":"click";return L.DomEvent.on(e,"click",L.DomEvent.stopPropagation).on(e,"mousedown",L.DomEvent.stopPropagation).on(e,"dblclick",L.DomEvent.stopPropagation).on(e,"touchstart",L.DomEvent.stopPropagation).on(e,"click",L.DomEvent.preventDefault).on(e,o,t.callback,t.context),e},_disposeButton:function(t,e){var i=this._detectIOS()?"touchstart":"click";L.DomEvent.off(t,"click",L.DomEvent.stopPropagation).off(t,"mousedown",L.DomEvent.stopPropagation).off(t,"dblclick",L.DomEvent.stopPropagation).off(t,"touchstart",L.DomEvent.stopPropagation).off(t,"click",L.DomEvent.preventDefault).off(t,i,e)},_handlerActivated:function(t){this.disable(),this._activeMode=this._modes[t.handler],L.DomUtil.addClass(this._activeMode.button,"leaflet-draw-toolbar-button-enabled"),this._showActionsToolbar(),this.fire("enable")},_handlerDeactivated:function(){this._hideActionsToolbar(),L.DomUtil.removeClass(this._activeMode.button,"leaflet-draw-toolbar-button-enabled"),this._activeMode=null,this.fire("disable")},_createActions:function(t){var e,i,o,n,a=this._actionsContainer,s=this.getActions(t),r=s.length;for(i=0,o=this._actionButtons.length;i<o;i++)this._disposeButton(this._actionButtons[i].button,this._actionButtons[i].callback);for(this._actionButtons=[];a.firstChild;)a.removeChild(a.firstChild);for(var l=0;l<r;l++)"enabled"in s[l]&&!s[l].enabled||(e=L.DomUtil.create("li","",a),n=this._createButton({title:s[l].title,text:s[l].text,container:e,callback:s[l].callback,context:s[l].context}),this._actionButtons.push({button:n,callback:s[l].callback}))},_showActionsToolbar:function(){var t=this._activeMode.buttonIndex,e=this._lastButtonIndex,i=this._activeMode.button.offsetTop-1;this._createActions(this._activeMode.handler),this._actionsContainer.style.top=i+"px",0===t&&(L.DomUtil.addClass(this._toolbarContainer,"leaflet-draw-toolbar-notop"),L.DomUtil.addClass(this._actionsContainer,"leaflet-draw-actions-top")),t===e&&(L.DomUtil.addClass(this._toolbarContainer,"leaflet-draw-toolbar-nobottom"),L.DomUtil.addClass(this._actionsContainer,"leaflet-draw-actions-bottom")),this._actionsContainer.style.display="block",this._map.fire(L.Draw.Event.TOOLBAROPENED)},_hideActionsToolbar:function(){this._actionsContainer.style.display="none",L.DomUtil.removeClass(this._toolbarContainer,"leaflet-draw-toolbar-notop"),L.DomUtil.removeClass(this._toolbarContainer,"leaflet-draw-toolbar-nobottom"),L.DomUtil.removeClass(this._actionsContainer,"leaflet-draw-actions-top"),L.DomUtil.removeClass(this._actionsContainer,"leaflet-draw-actions-bottom"),this._map.fire(L.Draw.Event.TOOLBARCLOSED)}}),L.Draw=L.Draw||{},L.Draw.Tooltip=L.Class.extend({initialize:function(t){this._map=t,this._popupPane=t._panes.popupPane,this._visible=!1,this._container=t.options.drawControlTooltips?L.DomUtil.create("div","leaflet-draw-tooltip",this._popupPane):null,this._singleLineLabel=!1,this._map.on("mouseout",this._onMouseOut,this)},dispose:function(){this._map.off("mouseout",this._onMouseOut,this),this._container&&(this._popupPane.removeChild(this._container),this._container=null)},updateContent:function(t){return this._container?(t.subtext=t.subtext||"",0!==t.subtext.length||this._singleLineLabel?t.subtext.length>0&&this._singleLineLabel&&(L.DomUtil.removeClass(this._container,"leaflet-draw-tooltip-single"),this._singleLineLabel=!1):(L.DomUtil.addClass(this._container,"leaflet-draw-tooltip-single"),this._singleLineLabel=!0),this._container.innerHTML=(t.subtext.length>0?'<span class="leaflet-draw-tooltip-subtext">'+t.subtext+"</span><br />":"")+"<span>"+t.text+"</span>",t.text||t.subtext?(this._visible=!0,this._container.style.visibility="inherit"):(this._visible=!1,this._container.style.visibility="hidden"),this):this},updatePosition:function(t){var e=this._map.latLngToLayerPoint(t),i=this._container;return this._container&&(this._visible&&(i.style.visibility="inherit"),L.DomUtil.setPosition(i,e)),this},showAsError:function(){return this._container&&L.DomUtil.addClass(this._container,"leaflet-error-draw-tooltip"),this},removeError:function(){return this._container&&L.DomUtil.removeClass(this._container,"leaflet-error-draw-tooltip"),this},_onMouseOut:function(){this._container&&(this._container.style.visibility="hidden")}}),L.DrawToolbar=L.Toolbar.extend({statics:{TYPE:"draw"},options:{polyline:{},polygon:{},rectangle:{},circle:{},marker:{},circlemarker:{}},initialize:function(t){for(var e in this.options)this.options.hasOwnProperty(e)&&t[e]&&(t[e]=L.extend({},this.options[e],t[e]));this._toolbarClass="leaflet-draw-draw",L.Toolbar.prototype.initialize.call(this,t)},getModeHandlers:function(t){return[{enabled:this.options.polyline,handler:new L.Draw.Polyline(t,this.options.polyline),title:L.drawLocal.draw.toolbar.buttons.polyline},{enabled:this.options.polygon,handler:new L.Draw.Polygon(t,this.options.polygon),title:L.drawLocal.draw.toolbar.buttons.polygon},{enabled:this.options.rectangle,handler:new L.Draw.Rectangle(t,this.options.rectangle),title:L.drawLocal.draw.toolbar.buttons.rectangle},{enabled:this.options.circle,handler:new L.Draw.Circle(t,this.options.circle),title:L.drawLocal.draw.toolbar.buttons.circle},{enabled:this.options.marker,handler:new L.Draw.Marker(t,this.options.marker),title:L.drawLocal.draw.toolbar.buttons.marker},{enabled:this.options.circlemarker,handler:new L.Draw.CircleMarker(t,this.options.circlemarker),title:L.drawLocal.draw.toolbar.buttons.circlemarker}]},getActions:function(t){return[{enabled:t.completeShape,title:L.drawLocal.draw.toolbar.finish.title,text:L.drawLocal.draw.toolbar.finish.text,callback:t.completeShape,context:t},{enabled:t.deleteLastVertex,title:L.drawLocal.draw.toolbar.undo.title,text:L.drawLocal.draw.toolbar.undo.text,callback:t.deleteLastVertex,context:t},{title:L.drawLocal.draw.toolbar.actions.title,text:L.drawLocal.draw.toolbar.actions.text,callback:this.disable,context:this}]},setOptions:function(t){L.setOptions(this,t);for(var e in this._modes)this._modes.hasOwnProperty(e)&&t.hasOwnProperty(e)&&this._modes[e].handler.setOptions(t[e])}}),L.EditToolbar=L.Toolbar.extend({statics:{TYPE:"edit"},options:{edit:{selectedPathOptions:{dashArray:"10, 10",fill:!0,fillColor:"#fe57a1",fillOpacity:.1,maintainColor:!1}},remove:{},poly:null,featureGroup:null},initialize:function(t){t.edit&&(void 0===t.edit.selectedPathOptions&&(t.edit.selectedPathOptions=this.options.edit.selectedPathOptions),t.edit.selectedPathOptions=L.extend({},this.options.edit.selectedPathOptions,t.edit.selectedPathOptions)),t.remove&&(t.remove=L.extend({},this.options.remove,t.remove)),t.poly&&(t.poly=L.extend({},this.options.poly,t.poly)),this._toolbarClass="leaflet-draw-edit",L.Toolbar.prototype.initialize.call(this,t),this._selectedFeatureCount=0},getModeHandlers:function(t){var e=this.options.featureGroup;return[{enabled:this.options.edit,handler:new L.EditToolbar.Edit(t,{featureGroup:e,selectedPathOptions:this.options.edit.selectedPathOptions,poly:this.options.poly}),title:L.drawLocal.edit.toolbar.buttons.edit},{enabled:this.options.remove,handler:new L.EditToolbar.Delete(t,{featureGroup:e}),title:L.drawLocal.edit.toolbar.buttons.remove}]},getActions:function(t){var e=[{title:L.drawLocal.edit.toolbar.actions.save.title,text:L.drawLocal.edit.toolbar.actions.save.text,callback:this._save,context:this},{title:L.drawLocal.edit.toolbar.actions.cancel.title,text:L.drawLocal.edit.toolbar.actions.cancel.text,callback:this.disable,context:this}];return t.removeAllLayers&&e.push({title:L.drawLocal.edit.toolbar.actions.clearAll.title,text:L.drawLocal.edit.toolbar.actions.clearAll.text,callback:this._clearAllLayers,context:this}),e},addToolbar:function(t){var e=L.Toolbar.prototype.addToolbar.call(this,t);return this._checkDisabled(),this.options.featureGroup.on("layeradd layerremove",this._checkDisabled,this),e},removeToolbar:function(){this.options.featureGroup.off("layeradd layerremove",this._checkDisabled,this),L.Toolbar.prototype.removeToolbar.call(this)},disable:function(){this.enabled()&&(this._activeMode.handler.revertLayers(),L.Toolbar.prototype.disable.call(this))},_save:function(){this._activeMode.handler.save(),this._activeMode&&this._activeMode.handler.disable()},_clearAllLayers:function(){this._activeMode.handler.removeAllLayers(),this._activeMode&&this._activeMode.handler.disable()},_checkDisabled:function(){var t,e=this.options.featureGroup,i=0!==e.getLayers().length;this.options.edit&&(t=this._modes[L.EditToolbar.Edit.TYPE].button,i?L.DomUtil.removeClass(t,"leaflet-disabled"):L.DomUtil.addClass(t,"leaflet-disabled"),t.setAttribute("title",i?L.drawLocal.edit.toolbar.buttons.edit:L.drawLocal.edit.toolbar.buttons.editDisabled)),this.options.remove&&(t=this._modes[L.EditToolbar.Delete.TYPE].button,i?L.DomUtil.removeClass(t,"leaflet-disabled"):L.DomUtil.addClass(t,"leaflet-disabled"),t.setAttribute("title",i?L.drawLocal.edit.toolbar.buttons.remove:L.drawLocal.edit.toolbar.buttons.removeDisabled))}}),L.EditToolbar.Edit=L.Handler.extend({statics:{TYPE:"edit"},initialize:function(t,e){if(L.Handler.prototype.initialize.call(this,t),L.setOptions(this,e),this._featureGroup=e.featureGroup,!(this._featureGroup instanceof L.FeatureGroup))throw new Error("options.featureGroup must be a L.FeatureGroup");this._uneditedLayerProps={},this.type=L.EditToolbar.Edit.TYPE;var i=L.version.split(".");1===parseInt(i[0],10)&&parseInt(i[1],10)>=2?L.EditToolbar.Edit.include(L.Evented.prototype):L.EditToolbar.Edit.include(L.Mixin.Events)},enable:function(){!this._enabled&&this._hasAvailableLayers()&&(this.fire("enabled",{handler:this.type}),this._map.fire(L.Draw.Event.EDITSTART,{handler:this.type}),L.Handler.prototype.enable.call(this),this._featureGroup.on("layeradd",this._enableLayerEdit,this).on("layerremove",this._disableLayerEdit,this))},disable:function(){this._enabled&&(this._featureGroup.off("layeradd",this._enableLayerEdit,this).off("layerremove",this._disableLayerEdit,this),L.Handler.prototype.disable.call(this),this._map.fire(L.Draw.Event.EDITSTOP,{handler:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(t.getContainer().focus(),this._featureGroup.eachLayer(this._enableLayerEdit,this),this._tooltip=new L.Draw.Tooltip(this._map),this._tooltip.updateContent({text:L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.edit.handlers.edit.tooltip.subtext}),t._editTooltip=this._tooltip,this._updateTooltip(),this._map.on("mousemove",this._onMouseMove,this).on("touchmove",this._onMouseMove,this).on("MSPointerMove",this._onMouseMove,this).on(L.Draw.Event.EDITVERTEX,this._updateTooltip,this))},removeHooks:function(){this._map&&(this._featureGroup.eachLayer(this._disableLayerEdit,this),this._uneditedLayerProps={},this._tooltip.dispose(),this._tooltip=null,this._map.off("mousemove",this._onMouseMove,this).off("touchmove",this._onMouseMove,this).off("MSPointerMove",this._onMouseMove,this).off(L.Draw.Event.EDITVERTEX,this._updateTooltip,this))},revertLayers:function(){this._featureGroup.eachLayer(function(t){this._revertLayer(t)},this)},save:function(){var t=new L.LayerGroup;this._featureGroup.eachLayer(function(e){e.edited&&(t.addLayer(e),e.edited=!1)}),this._map.fire(L.Draw.Event.EDITED,{layers:t})},_backupLayer:function(t){var e=L.Util.stamp(t);this._uneditedLayerProps[e]||(t instanceof L.Polyline||t instanceof L.Polygon||t instanceof L.Rectangle?this._uneditedLayerProps[e]={latlngs:L.LatLngUtil.cloneLatLngs(t.getLatLngs())}:t instanceof L.Circle?this._uneditedLayerProps[e]={latlng:L.LatLngUtil.cloneLatLng(t.getLatLng()),radius:t.getRadius()}:(t instanceof L.Marker||t instanceof L.CircleMarker)&&(this._uneditedLayerProps[e]={latlng:L.LatLngUtil.cloneLatLng(t.getLatLng())}))},_getTooltipText:function(){return{text:L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.edit.handlers.edit.tooltip.subtext}},_updateTooltip:function(){this._tooltip.updateContent(this._getTooltipText())},_revertLayer:function(t){var e=L.Util.stamp(t);t.edited=!1,this._uneditedLayerProps.hasOwnProperty(e)&&(t instanceof L.Polyline||t instanceof L.Polygon||t instanceof L.Rectangle?t.setLatLngs(this._uneditedLayerProps[e].latlngs):t instanceof L.Circle?(t.setLatLng(this._uneditedLayerProps[e].latlng),t.setRadius(this._uneditedLayerProps[e].radius)):(t instanceof L.Marker||t instanceof L.CircleMarker)&&t.setLatLng(this._uneditedLayerProps[e].latlng),t.fire("revert-edited",{layer:t}))},_enableLayerEdit:function(t){var e,i,o=t.layer||t.target||t;this._backupLayer(o),this.options.poly&&(i=L.Util.extend({},this.options.poly),o.options.poly=i),this.options.selectedPathOptions&&(e=L.Util.extend({},this.options.selectedPathOptions),e.maintainColor&&(e.color=o.options.color,e.fillColor=o.options.fillColor),o.options.original=L.extend({},o.options),o.options.editing=e),o instanceof L.Marker?(o.editing&&o.editing.enable(),o.dragging.enable(),o.on("dragend",this._onMarkerDragEnd).on("touchmove",this._onTouchMove,this).on("MSPointerMove",this._onTouchMove,this).on("touchend",this._onMarkerDragEnd,this).on("MSPointerUp",this._onMarkerDragEnd,this)):o.editing.enable()},_disableLayerEdit:function(t){var e=t.layer||t.target||t;e.edited=!1,e.editing&&e.editing.disable(),delete e.options.editing,delete e.options.original,
-this._selectedPathOptions&&(e instanceof L.Marker?this._toggleMarkerHighlight(e):(e.setStyle(e.options.previousOptions),delete e.options.previousOptions)),e instanceof L.Marker?(e.dragging.disable(),e.off("dragend",this._onMarkerDragEnd,this).off("touchmove",this._onTouchMove,this).off("MSPointerMove",this._onTouchMove,this).off("touchend",this._onMarkerDragEnd,this).off("MSPointerUp",this._onMarkerDragEnd,this)):e.editing.disable()},_onMouseMove:function(t){this._tooltip.updatePosition(t.latlng)},_onMarkerDragEnd:function(t){var e=t.target;e.edited=!0,this._map.fire(L.Draw.Event.EDITMOVE,{layer:e})},_onTouchMove:function(t){var e=t.originalEvent.changedTouches[0],i=this._map.mouseEventToLayerPoint(e),o=this._map.layerPointToLatLng(i);t.target.setLatLng(o)},_hasAvailableLayers:function(){return 0!==this._featureGroup.getLayers().length}}),L.EditToolbar.Delete=L.Handler.extend({statics:{TYPE:"remove"},initialize:function(t,e){if(L.Handler.prototype.initialize.call(this,t),L.Util.setOptions(this,e),this._deletableLayers=this.options.featureGroup,!(this._deletableLayers instanceof L.FeatureGroup))throw new Error("options.featureGroup must be a L.FeatureGroup");this.type=L.EditToolbar.Delete.TYPE;var i=L.version.split(".");1===parseInt(i[0],10)&&parseInt(i[1],10)>=2?L.EditToolbar.Delete.include(L.Evented.prototype):L.EditToolbar.Delete.include(L.Mixin.Events)},enable:function(){!this._enabled&&this._hasAvailableLayers()&&(this.fire("enabled",{handler:this.type}),this._map.fire(L.Draw.Event.DELETESTART,{handler:this.type}),L.Handler.prototype.enable.call(this),this._deletableLayers.on("layeradd",this._enableLayerDelete,this).on("layerremove",this._disableLayerDelete,this))},disable:function(){this._enabled&&(this._deletableLayers.off("layeradd",this._enableLayerDelete,this).off("layerremove",this._disableLayerDelete,this),L.Handler.prototype.disable.call(this),this._map.fire(L.Draw.Event.DELETESTOP,{handler:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(t.getContainer().focus(),this._deletableLayers.eachLayer(this._enableLayerDelete,this),this._deletedLayers=new L.LayerGroup,this._tooltip=new L.Draw.Tooltip(this._map),this._tooltip.updateContent({text:L.drawLocal.edit.handlers.remove.tooltip.text}),this._map.on("mousemove",this._onMouseMove,this))},removeHooks:function(){this._map&&(this._deletableLayers.eachLayer(this._disableLayerDelete,this),this._deletedLayers=null,this._tooltip.dispose(),this._tooltip=null,this._map.off("mousemove",this._onMouseMove,this))},revertLayers:function(){this._deletedLayers.eachLayer(function(t){this._deletableLayers.addLayer(t),t.fire("revert-deleted",{layer:t})},this)},save:function(){this._map.fire(L.Draw.Event.DELETED,{layers:this._deletedLayers})},removeAllLayers:function(){this._deletableLayers.eachLayer(function(t){this._removeLayer({layer:t})},this),this.save()},_enableLayerDelete:function(t){(t.layer||t.target||t).on("click",this._removeLayer,this)},_disableLayerDelete:function(t){var e=t.layer||t.target||t;e.off("click",this._removeLayer,this),this._deletedLayers.removeLayer(e)},_removeLayer:function(t){var e=t.layer||t.target||t;this._deletableLayers.removeLayer(e),this._deletedLayers.addLayer(e),e.fire("deleted")},_onMouseMove:function(t){this._tooltip.updatePosition(t.latlng)},_hasAvailableLayers:function(){return 0!==this._deletableLayers.getLayers().length}})}(window,document);
\ No newline at end of file
+!(function (t, e, i) {
+  function o(t, e) {
+    for (; (t = t.parentElement) && !t.classList.contains(e); );
+    return t;
+  }
+  (L.drawVersion = "0.4.14"),
+    (L.Draw = {}),
+    (L.drawLocal = {
+      draw: {
+        toolbar: {
+          actions: { title: "Cancel drawing", text: "Cancel" },
+          finish: { title: "Finish drawing", text: "Finish" },
+          undo: { title: "Delete last point drawn", text: "Delete last point" },
+          buttons: {
+            polyline: "Draw a polyline",
+            polygon: "Draw a polygon",
+            rectangle: "Draw a rectangle",
+            circle: "Draw a circle",
+            marker: "Draw a marker",
+            circlemarker: "Draw a circlemarker",
+          },
+        },
+        handlers: {
+          circle: {
+            tooltip: { start: "Click and drag to draw circle." },
+            radius: "Radius",
+          },
+          circlemarker: {
+            tooltip: { start: "Click map to place circle marker." },
+          },
+          marker: { tooltip: { start: "Click map to place marker." } },
+          polygon: {
+            tooltip: {
+              start: "Click to start drawing shape.",
+              cont: "Click to continue drawing shape.",
+              end: "Click first point to close this shape.",
+            },
+          },
+          polyline: {
+            error: "<strong>Error:</strong> shape edges cannot cross!",
+            tooltip: {
+              start: "Click to start drawing line.",
+              cont: "Click to continue drawing line.",
+              end: "Click last point to finish line.",
+            },
+          },
+          rectangle: {
+            tooltip: { start: "Click and drag to draw rectangle." },
+          },
+          simpleshape: { tooltip: { end: "Release mouse to finish drawing." } },
+        },
+      },
+      edit: {
+        toolbar: {
+          actions: {
+            save: { title: "Save changes", text: "Save" },
+            cancel: {
+              title: "Cancel editing, discards all changes",
+              text: "Cancel",
+            },
+            clearAll: { title: "Clear all layers", text: "Clear All" },
+          },
+          buttons: {
+            edit: "Edit layers",
+            editDisabled: "No layers to edit",
+            remove: "Delete layers",
+            removeDisabled: "No layers to delete",
+          },
+        },
+        handlers: {
+          edit: {
+            tooltip: {
+              text: "Drag handles or markers to edit features.",
+              subtext: "Click cancel to undo changes.",
+            },
+          },
+          remove: { tooltip: { text: "Click on a feature to remove." } },
+        },
+      },
+    }),
+    (L.Draw.Event = {}),
+    (L.Draw.Event.CREATED = "draw:created"),
+    (L.Draw.Event.EDITED = "draw:edited"),
+    (L.Draw.Event.DELETED = "draw:deleted"),
+    (L.Draw.Event.DRAWSTART = "draw:drawstart"),
+    (L.Draw.Event.DRAWSTOP = "draw:drawstop"),
+    (L.Draw.Event.DRAWVERTEX = "draw:drawvertex"),
+    (L.Draw.Event.EDITSTART = "draw:editstart"),
+    (L.Draw.Event.EDITMOVE = "draw:editmove"),
+    (L.Draw.Event.EDITRESIZE = "draw:editresize"),
+    (L.Draw.Event.EDITVERTEX = "draw:editvertex"),
+    (L.Draw.Event.EDITSTOP = "draw:editstop"),
+    (L.Draw.Event.DELETESTART = "draw:deletestart"),
+    (L.Draw.Event.DELETESTOP = "draw:deletestop"),
+    (L.Draw.Event.TOOLBAROPENED = "draw:toolbaropened"),
+    (L.Draw.Event.TOOLBARCLOSED = "draw:toolbarclosed"),
+    (L.Draw.Event.MARKERCONTEXT = "draw:markercontext"),
+    (L.Draw = L.Draw || {}),
+    (L.Draw.Feature = L.Handler.extend({
+      initialize: function (t, e) {
+        (this._map = t),
+          (this._container = t._container),
+          (this._overlayPane = t._panes.overlayPane),
+          (this._popupPane = t._panes.popupPane),
+          e &&
+            e.shapeOptions &&
+            (e.shapeOptions = L.Util.extend(
+              {},
+              this.options.shapeOptions,
+              e.shapeOptions,
+            )),
+          L.setOptions(this, e);
+        var i = L.version.split(".");
+        1 === parseInt(i[0], 10) && parseInt(i[1], 10) >= 2
+          ? L.Draw.Feature.include(L.Evented.prototype)
+          : L.Draw.Feature.include(L.Mixin.Events);
+      },
+      enable: function () {
+        this._enabled ||
+          (L.Handler.prototype.enable.call(this),
+          this.fire("enabled", { handler: this.type }),
+          this._map.fire(L.Draw.Event.DRAWSTART, { layerType: this.type }));
+      },
+      disable: function () {
+        this._enabled &&
+          (L.Handler.prototype.disable.call(this),
+          this._map.fire(L.Draw.Event.DRAWSTOP, { layerType: this.type }),
+          this.fire("disabled", { handler: this.type }));
+      },
+      addHooks: function () {
+        var t = this._map;
+        t &&
+          (L.DomUtil.disableTextSelection(),
+          t.getContainer().focus(),
+          (this._tooltip = new L.Draw.Tooltip(this._map)),
+          L.DomEvent.on(this._container, "keyup", this._cancelDrawing, this));
+      },
+      removeHooks: function () {
+        this._map &&
+          (L.DomUtil.enableTextSelection(),
+          this._tooltip.dispose(),
+          (this._tooltip = null),
+          L.DomEvent.off(this._container, "keyup", this._cancelDrawing, this));
+      },
+      setOptions: function (t) {
+        L.setOptions(this, t);
+      },
+      _fireCreatedEvent: function (t) {
+        this._map.fire(L.Draw.Event.CREATED, {
+          layer: t,
+          layerType: this.type,
+        });
+      },
+      _cancelDrawing: function (t) {
+        27 === t.keyCode &&
+          (this._map.fire("draw:canceled", { layerType: this.type }),
+          this.disable());
+      },
+    })),
+    (L.Draw.Polyline = L.Draw.Feature.extend({
+      statics: { TYPE: "polyline" },
+      Poly: L.Polyline,
+      options: {
+        allowIntersection: !0,
+        repeatMode: !1,
+        drawError: { color: "#b00b00", timeout: 2500 },
+        icon: new L.DivIcon({
+          iconSize: new L.Point(8, 8),
+          className: "leaflet-div-icon leaflet-editing-icon",
+        }),
+        touchIcon: new L.DivIcon({
+          iconSize: new L.Point(20, 20),
+          className: "leaflet-div-icon leaflet-editing-icon leaflet-touch-icon",
+        }),
+        guidelineDistance: 20,
+        maxGuideLineLength: 4e3,
+        shapeOptions: {
+          stroke: !0,
+          color: "#3388ff",
+          weight: 4,
+          opacity: 0.5,
+          fill: !1,
+          clickable: !0,
+        },
+        metric: !0,
+        feet: !0,
+        nautic: !1,
+        showLength: !0,
+        zIndexOffset: 2e3,
+        factor: 1,
+        maxPoints: 0,
+      },
+      initialize: function (t, e) {
+        L.Browser.touch && (this.options.icon = this.options.touchIcon),
+          (this.options.drawError.message =
+            L.drawLocal.draw.handlers.polyline.error),
+          e &&
+            e.drawError &&
+            (e.drawError = L.Util.extend(
+              {},
+              this.options.drawError,
+              e.drawError,
+            )),
+          (this.type = L.Draw.Polyline.TYPE),
+          L.Draw.Feature.prototype.initialize.call(this, t, e);
+      },
+      addHooks: function () {
+        L.Draw.Feature.prototype.addHooks.call(this),
+          this._map &&
+            ((this._markers = []),
+            (this._markerGroup = new L.LayerGroup()),
+            this._map.addLayer(this._markerGroup),
+            (this._poly = new L.Polyline([], this.options.shapeOptions)),
+            this._tooltip.updateContent(this._getTooltipText()),
+            this._mouseMarker ||
+              (this._mouseMarker = L.marker(this._map.getCenter(), {
+                icon: L.divIcon({
+                  className: "leaflet-mouse-marker",
+                  iconAnchor: [20, 20],
+                  iconSize: [40, 40],
+                }),
+                opacity: 0,
+                zIndexOffset: this.options.zIndexOffset,
+              })),
+            this._mouseMarker
+              .on("mouseout", this._onMouseOut, this)
+              .on("mousemove", this._onMouseMove, this)
+              .on("mousedown", this._onMouseDown, this)
+              .on("mouseup", this._onMouseUp, this)
+              .addTo(this._map),
+            this._map
+              .on("mouseup", this._onMouseUp, this)
+              .on("mousemove", this._onMouseMove, this)
+              .on("zoomlevelschange", this._onZoomEnd, this)
+              .on("touchstart", this._onTouch, this)
+              .on("zoomend", this._onZoomEnd, this));
+      },
+      removeHooks: function () {
+        L.Draw.Feature.prototype.removeHooks.call(this),
+          this._clearHideErrorTimeout(),
+          this._cleanUpShape(),
+          this._map.removeLayer(this._markerGroup),
+          delete this._markerGroup,
+          delete this._markers,
+          this._map.removeLayer(this._poly),
+          delete this._poly,
+          this._mouseMarker
+            .off("mousedown", this._onMouseDown, this)
+            .off("mouseout", this._onMouseOut, this)
+            .off("mouseup", this._onMouseUp, this)
+            .off("mousemove", this._onMouseMove, this),
+          this._map.removeLayer(this._mouseMarker),
+          delete this._mouseMarker,
+          this._clearGuides(),
+          this._map
+            .off("mouseup", this._onMouseUp, this)
+            .off("mousemove", this._onMouseMove, this)
+            .off("zoomlevelschange", this._onZoomEnd, this)
+            .off("zoomend", this._onZoomEnd, this)
+            .off("touchstart", this._onTouch, this)
+            .off("click", this._onTouch, this);
+      },
+      deleteLastVertex: function () {
+        if (!(this._markers.length <= 1)) {
+          var t = this._markers.pop(),
+            e = this._poly,
+            i = e.getLatLngs(),
+            o = i.splice(-1, 1)[0];
+          this._poly.setLatLngs(i),
+            this._markerGroup.removeLayer(t),
+            e.getLatLngs().length < 2 && this._map.removeLayer(e),
+            this._vertexChanged(o, !1);
+        }
+      },
+      addVertex: function (t) {
+        if (
+          this._markers.length >= 2 &&
+          !this.options.allowIntersection &&
+          this._poly.newLatLngIntersects(t)
+        )
+          return void this._showErrorTooltip();
+        this._errorShown && this._hideErrorTooltip(),
+          this._markers.push(this._createMarker(t)),
+          this._poly.addLatLng(t),
+          2 === this._poly.getLatLngs().length &&
+            this._map.addLayer(this._poly),
+          this._vertexChanged(t, !0);
+      },
+      completeShape: function () {
+        this._markers.length <= 1 ||
+          (this._fireCreatedEvent(),
+          this.disable(),
+          this.options.repeatMode && this.enable());
+      },
+      _finishShape: function () {
+        var t = this._poly._defaultShape
+            ? this._poly._defaultShape()
+            : this._poly.getLatLngs(),
+          e = this._poly.newLatLngIntersects(t[t.length - 1]);
+        if ((!this.options.allowIntersection && e) || !this._shapeIsValid())
+          return void this._showErrorTooltip();
+        this._fireCreatedEvent(),
+          this.disable(),
+          this.options.repeatMode && this.enable();
+      },
+      _shapeIsValid: function () {
+        return !0;
+      },
+      _onZoomEnd: function () {
+        null !== this._markers && this._updateGuide();
+      },
+      _onMouseMove: function (t) {
+        var e = this._map.mouseEventToLayerPoint(t.originalEvent),
+          i = this._map.layerPointToLatLng(e);
+        (this._currentLatLng = i),
+          this._updateTooltip(i),
+          this._updateGuide(e),
+          this._mouseMarker.setLatLng(i),
+          L.DomEvent.preventDefault(t.originalEvent);
+      },
+      _vertexChanged: function (t, e) {
+        this._map.fire(L.Draw.Event.DRAWVERTEX, { layers: this._markerGroup }),
+          this._updateFinishHandler(),
+          this._updateRunningMeasure(t, e),
+          this._clearGuides(),
+          this._updateTooltip();
+      },
+      _onMouseDown: function (t) {
+        if (
+          !this._clickHandled &&
+          !this._touchHandled &&
+          !this._disableMarkers
+        ) {
+          this._onMouseMove(t),
+            (this._clickHandled = !0),
+            this._disableNewMarkers();
+          var e = t.originalEvent,
+            i = e.clientX,
+            o = e.clientY;
+          this._startPoint.call(this, i, o);
+        }
+      },
+      _startPoint: function (t, e) {
+        this._mouseDownOrigin = L.point(t, e);
+      },
+      _onMouseUp: function (t) {
+        var e = t.originalEvent,
+          i = e.clientX,
+          o = e.clientY;
+        this._endPoint.call(this, i, o, t), (this._clickHandled = null);
+      },
+      _endPoint: function (e, i, o) {
+        if (this._mouseDownOrigin) {
+          var n = L.point(e, i).distanceTo(this._mouseDownOrigin),
+            a = this._calculateFinishDistance(o.latlng);
+          this.options.maxPoints > 1 &&
+          this.options.maxPoints == this._markers.length + 1
+            ? (this.addVertex(o.latlng), this._finishShape())
+            : a < 10 && L.Browser.touch
+              ? this._finishShape()
+              : Math.abs(n) < 9 * (t.devicePixelRatio || 1) &&
+                this.addVertex(o.latlng),
+            this._enableNewMarkers();
+        }
+        this._mouseDownOrigin = null;
+      },
+      _onTouch: function (t) {
+        var e,
+          i,
+          o = t.originalEvent;
+        !o.touches ||
+          !o.touches[0] ||
+          this._clickHandled ||
+          this._touchHandled ||
+          this._disableMarkers ||
+          ((e = o.touches[0].clientX),
+          (i = o.touches[0].clientY),
+          this._disableNewMarkers(),
+          (this._touchHandled = !0),
+          this._startPoint.call(this, e, i),
+          this._endPoint.call(this, e, i, t),
+          (this._touchHandled = null)),
+          (this._clickHandled = null);
+      },
+      _onMouseOut: function () {
+        this._tooltip && this._tooltip._onMouseOut.call(this._tooltip);
+      },
+      _calculateFinishDistance: function (t) {
+        var e;
+        if (this._markers.length > 0) {
+          var i;
+          if (this.type === L.Draw.Polyline.TYPE)
+            i = this._markers[this._markers.length - 1];
+          else {
+            if (this.type !== L.Draw.Polygon.TYPE) return 1 / 0;
+            i = this._markers[0];
+          }
+          var o = this._map.latLngToContainerPoint(i.getLatLng()),
+            n = new L.Marker(t, {
+              icon: this.options.icon,
+              zIndexOffset: 2 * this.options.zIndexOffset,
+            }),
+            a = this._map.latLngToContainerPoint(n.getLatLng());
+          e = o.distanceTo(a);
+        } else e = 1 / 0;
+        return e;
+      },
+      _updateFinishHandler: function () {
+        var t = this._markers.length;
+        t > 1 && this._markers[t - 1].on("click", this._finishShape, this),
+          t > 2 && this._markers[t - 2].off("click", this._finishShape, this);
+      },
+      _createMarker: function (t) {
+        var e = new L.Marker(t, {
+          icon: this.options.icon,
+          zIndexOffset: 2 * this.options.zIndexOffset,
+        });
+        return this._markerGroup.addLayer(e), e;
+      },
+      _updateGuide: function (t) {
+        var e = this._markers ? this._markers.length : 0;
+        e > 0 &&
+          ((t = t || this._map.latLngToLayerPoint(this._currentLatLng)),
+          this._clearGuides(),
+          this._drawGuide(
+            this._map.latLngToLayerPoint(this._markers[e - 1].getLatLng()),
+            t,
+          ));
+      },
+      _updateTooltip: function (t) {
+        var e = this._getTooltipText();
+        t && this._tooltip.updatePosition(t),
+          this._errorShown || this._tooltip.updateContent(e);
+      },
+      _drawGuide: function (t, e) {
+        var i,
+          o,
+          n,
+          a = Math.floor(
+            Math.sqrt(Math.pow(e.x - t.x, 2) + Math.pow(e.y - t.y, 2)),
+          ),
+          s = this.options.guidelineDistance,
+          r = this.options.maxGuideLineLength,
+          l = a > r ? a - r : s;
+        for (
+          this._guidesContainer ||
+          (this._guidesContainer = L.DomUtil.create(
+            "div",
+            "leaflet-draw-guides",
+            this._overlayPane,
+          ));
+          l < a;
+          l += this.options.guidelineDistance
+        )
+          (i = l / a),
+            (o = {
+              x: Math.floor(t.x * (1 - i) + i * e.x),
+              y: Math.floor(t.y * (1 - i) + i * e.y),
+            }),
+            (n = L.DomUtil.create(
+              "div",
+              "leaflet-draw-guide-dash",
+              this._guidesContainer,
+            )),
+            (n.style.backgroundColor = this._errorShown
+              ? this.options.drawError.color
+              : this.options.shapeOptions.color),
+            L.DomUtil.setPosition(n, o);
+      },
+      _updateGuideColor: function (t) {
+        if (this._guidesContainer)
+          for (
+            var e = 0, i = this._guidesContainer.childNodes.length;
+            e < i;
+            e++
+          )
+            this._guidesContainer.childNodes[e].style.backgroundColor = t;
+      },
+      _clearGuides: function () {
+        if (this._guidesContainer)
+          for (; this._guidesContainer.firstChild; )
+            this._guidesContainer.removeChild(this._guidesContainer.firstChild);
+      },
+      _getTooltipText: function () {
+        var t,
+          e,
+          i = this.options.showLength;
+        return (
+          0 === this._markers.length
+            ? (t = { text: L.drawLocal.draw.handlers.polyline.tooltip.start })
+            : ((e = i ? this._getMeasurementString() : ""),
+              (t =
+                1 === this._markers.length
+                  ? {
+                      text: L.drawLocal.draw.handlers.polyline.tooltip.cont,
+                      subtext: e,
+                    }
+                  : {
+                      text: L.drawLocal.draw.handlers.polyline.tooltip.end,
+                      subtext: e,
+                    })),
+          t
+        );
+      },
+      _updateRunningMeasure: function (t, e) {
+        var i,
+          o,
+          n = this._markers.length;
+        1 === this._markers.length
+          ? (this._measurementRunningTotal = 0)
+          : ((i = n - (e ? 2 : 1)),
+            (o = L.GeometryUtil.isVersion07x()
+              ? t.distanceTo(this._markers[i].getLatLng()) *
+                (this.options.factor || 1)
+              : this._map.distance(t, this._markers[i].getLatLng()) *
+                (this.options.factor || 1)),
+            (this._measurementRunningTotal += o * (e ? 1 : -1)));
+      },
+      _getMeasurementString: function () {
+        var t,
+          e = this._currentLatLng,
+          i = this._markers[this._markers.length - 1].getLatLng();
+        return (
+          (t = L.GeometryUtil.isVersion07x()
+            ? i && e && e.distanceTo
+              ? this._measurementRunningTotal +
+                e.distanceTo(i) * (this.options.factor || 1)
+              : this._measurementRunningTotal || 0
+            : i && e
+              ? this._measurementRunningTotal +
+                this._map.distance(e, i) * (this.options.factor || 1)
+              : this._measurementRunningTotal || 0),
+          L.GeometryUtil.readableDistance(
+            t,
+            this.options.metric,
+            this.options.feet,
+            this.options.nautic,
+            this.options.precision,
+          )
+        );
+      },
+      _showErrorTooltip: function () {
+        (this._errorShown = !0),
+          this._tooltip
+            .showAsError()
+            .updateContent({ text: this.options.drawError.message }),
+          this._updateGuideColor(this.options.drawError.color),
+          this._poly.setStyle({ color: this.options.drawError.color }),
+          this._clearHideErrorTimeout(),
+          (this._hideErrorTimeout = setTimeout(
+            L.Util.bind(this._hideErrorTooltip, this),
+            this.options.drawError.timeout,
+          ));
+      },
+      _hideErrorTooltip: function () {
+        (this._errorShown = !1),
+          this._clearHideErrorTimeout(),
+          this._tooltip.removeError().updateContent(this._getTooltipText()),
+          this._updateGuideColor(this.options.shapeOptions.color),
+          this._poly.setStyle({ color: this.options.shapeOptions.color });
+      },
+      _clearHideErrorTimeout: function () {
+        this._hideErrorTimeout &&
+          (clearTimeout(this._hideErrorTimeout),
+          (this._hideErrorTimeout = null));
+      },
+      _disableNewMarkers: function () {
+        this._disableMarkers = !0;
+      },
+      _enableNewMarkers: function () {
+        setTimeout(
+          function () {
+            this._disableMarkers = !1;
+          }.bind(this),
+          50,
+        );
+      },
+      _cleanUpShape: function () {
+        this._markers.length > 1 &&
+          this._markers[this._markers.length - 1].off(
+            "click",
+            this._finishShape,
+            this,
+          );
+      },
+      _fireCreatedEvent: function () {
+        var t = new this.Poly(
+          this._poly.getLatLngs(),
+          this.options.shapeOptions,
+        );
+        L.Draw.Feature.prototype._fireCreatedEvent.call(this, t);
+      },
+    })),
+    (L.Draw.Polygon = L.Draw.Polyline.extend({
+      statics: { TYPE: "polygon" },
+      Poly: L.Polygon,
+      options: {
+        showArea: !1,
+        showLength: !1,
+        shapeOptions: {
+          stroke: !0,
+          color: "#3388ff",
+          weight: 4,
+          opacity: 0.5,
+          fill: !0,
+          fillColor: null,
+          fillOpacity: 0.2,
+          clickable: !0,
+        },
+        metric: !0,
+        feet: !0,
+        nautic: !1,
+        precision: {},
+      },
+      initialize: function (t, e) {
+        L.Draw.Polyline.prototype.initialize.call(this, t, e),
+          (this.type = L.Draw.Polygon.TYPE);
+      },
+      _updateFinishHandler: function () {
+        var t = this._markers.length;
+        1 === t && this._markers[0].on("click", this._finishShape, this),
+          t > 2 &&
+            (this._markers[t - 1].on("dblclick", this._finishShape, this),
+            t > 3 &&
+              this._markers[t - 2].off("dblclick", this._finishShape, this));
+      },
+      _getTooltipText: function () {
+        var t, e;
+        return (
+          0 === this._markers.length
+            ? (t = L.drawLocal.draw.handlers.polygon.tooltip.start)
+            : this._markers.length < 3
+              ? ((t = L.drawLocal.draw.handlers.polygon.tooltip.cont),
+                (e = this._getMeasurementString()))
+              : ((t = L.drawLocal.draw.handlers.polygon.tooltip.end),
+                (e = this._getMeasurementString())),
+          { text: t, subtext: e }
+        );
+      },
+      _getMeasurementString: function () {
+        var t = this._area,
+          e = "";
+        return t || this.options.showLength
+          ? (this.options.showLength &&
+              (e = L.Draw.Polyline.prototype._getMeasurementString.call(this)),
+            t &&
+              (e +=
+                "<br>" +
+                L.GeometryUtil.readableArea(
+                  t,
+                  this.options.metric,
+                  this.options.precision,
+                )),
+            e)
+          : null;
+      },
+      _shapeIsValid: function () {
+        return this._markers.length >= 3;
+      },
+      _vertexChanged: function (t, e) {
+        var i;
+        !this.options.allowIntersection &&
+          this.options.showArea &&
+          ((i = this._poly.getLatLngs()),
+          (this._area = L.GeometryUtil.geodesicArea(i))),
+          L.Draw.Polyline.prototype._vertexChanged.call(this, t, e);
+      },
+      _cleanUpShape: function () {
+        var t = this._markers.length;
+        t > 0 &&
+          (this._markers[0].off("click", this._finishShape, this),
+          t > 2 &&
+            this._markers[t - 1].off("dblclick", this._finishShape, this));
+      },
+    })),
+    (L.SimpleShape = {}),
+    (L.Draw.SimpleShape = L.Draw.Feature.extend({
+      options: { repeatMode: !1 },
+      initialize: function (t, e) {
+        (this._endLabelText =
+          L.drawLocal.draw.handlers.simpleshape.tooltip.end),
+          L.Draw.Feature.prototype.initialize.call(this, t, e);
+      },
+      addHooks: function () {
+        L.Draw.Feature.prototype.addHooks.call(this),
+          this._map &&
+            ((this._mapDraggable = this._map.dragging.enabled()),
+            this._mapDraggable && this._map.dragging.disable(),
+            (this._container.style.cursor = "crosshair"),
+            this._tooltip.updateContent({ text: this._initialLabelText }),
+            this._map
+              .on("mousedown", this._onMouseDown, this)
+              .on("mousemove", this._onMouseMove, this)
+              .on("touchstart", this._onMouseDown, this)
+              .on("touchmove", this._onMouseMove, this),
+            e.addEventListener("touchstart", L.DomEvent.preventDefault, {
+              passive: !1,
+            }));
+      },
+      removeHooks: function () {
+        L.Draw.Feature.prototype.removeHooks.call(this),
+          this._map &&
+            (this._mapDraggable && this._map.dragging.enable(),
+            (this._container.style.cursor = ""),
+            this._map
+              .off("mousedown", this._onMouseDown, this)
+              .off("mousemove", this._onMouseMove, this)
+              .off("touchstart", this._onMouseDown, this)
+              .off("touchmove", this._onMouseMove, this),
+            L.DomEvent.off(e, "mouseup", this._onMouseUp, this),
+            L.DomEvent.off(e, "touchend", this._onMouseUp, this),
+            e.removeEventListener("touchstart", L.DomEvent.preventDefault),
+            this._shape &&
+              (this._map.removeLayer(this._shape), delete this._shape)),
+          (this._isDrawing = !1);
+      },
+      _getTooltipText: function () {
+        return { text: this._endLabelText };
+      },
+      _onMouseDown: function (t) {
+        (this._isDrawing = !0),
+          (this._startLatLng = t.latlng),
+          L.DomEvent.on(e, "mouseup", this._onMouseUp, this)
+            .on(e, "touchend", this._onMouseUp, this)
+            .preventDefault(t.originalEvent);
+      },
+      _onMouseMove: function (t) {
+        var e = t.latlng;
+        this._tooltip.updatePosition(e),
+          this._isDrawing &&
+            (this._tooltip.updateContent(this._getTooltipText()),
+            this._drawShape(e));
+      },
+      _onMouseUp: function () {
+        this._shape && this._fireCreatedEvent(),
+          this.disable(),
+          this.options.repeatMode && this.enable();
+      },
+    })),
+    (L.Draw.Rectangle = L.Draw.SimpleShape.extend({
+      statics: { TYPE: "rectangle" },
+      options: {
+        shapeOptions: {
+          stroke: !0,
+          color: "#3388ff",
+          weight: 4,
+          opacity: 0.5,
+          fill: !0,
+          fillColor: null,
+          fillOpacity: 0.2,
+          showArea: !0,
+          clickable: !0,
+        },
+        metric: !0,
+      },
+      initialize: function (t, e) {
+        (this.type = L.Draw.Rectangle.TYPE),
+          (this._initialLabelText =
+            L.drawLocal.draw.handlers.rectangle.tooltip.start),
+          L.Draw.SimpleShape.prototype.initialize.call(this, t, e);
+      },
+      disable: function () {
+        this._enabled &&
+          ((this._isCurrentlyTwoClickDrawing = !1),
+          L.Draw.SimpleShape.prototype.disable.call(this));
+      },
+      _onMouseUp: function (t) {
+        if (!this._shape && !this._isCurrentlyTwoClickDrawing)
+          return void (this._isCurrentlyTwoClickDrawing = !0);
+        (this._isCurrentlyTwoClickDrawing && !o(t.target, "leaflet-pane")) ||
+          L.Draw.SimpleShape.prototype._onMouseUp.call(this);
+      },
+      _drawShape: function (t) {
+        this._shape
+          ? this._shape.setBounds(new L.LatLngBounds(this._startLatLng, t))
+          : ((this._shape = new L.Rectangle(
+              new L.LatLngBounds(this._startLatLng, t),
+              this.options.shapeOptions,
+            )),
+            this._map.addLayer(this._shape));
+      },
+      _fireCreatedEvent: function () {
+        var t = new L.Rectangle(
+          this._shape.getBounds(),
+          this.options.shapeOptions,
+        );
+        L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this, t);
+      },
+      _getTooltipText: function () {
+        var t,
+          e,
+          i,
+          o = L.Draw.SimpleShape.prototype._getTooltipText.call(this),
+          n = this._shape,
+          a = this.options.showArea;
+        return (
+          n &&
+            ((t = this._shape._defaultShape
+              ? this._shape._defaultShape()
+              : this._shape.getLatLngs()),
+            (e = L.GeometryUtil.geodesicArea(t)),
+            (i = a ? L.GeometryUtil.readableArea(e, this.options.metric) : "")),
+          { text: o.text, subtext: i }
+        );
+      },
+    })),
+    (L.Draw.Marker = L.Draw.Feature.extend({
+      statics: { TYPE: "marker" },
+      options: {
+        icon: new L.Icon.Default(),
+        repeatMode: !1,
+        zIndexOffset: 2e3,
+      },
+      initialize: function (t, e) {
+        (this.type = L.Draw.Marker.TYPE),
+          (this._initialLabelText =
+            L.drawLocal.draw.handlers.marker.tooltip.start),
+          L.Draw.Feature.prototype.initialize.call(this, t, e);
+      },
+      addHooks: function () {
+        L.Draw.Feature.prototype.addHooks.call(this),
+          this._map &&
+            (this._tooltip.updateContent({ text: this._initialLabelText }),
+            this._mouseMarker ||
+              (this._mouseMarker = L.marker(this._map.getCenter(), {
+                icon: L.divIcon({
+                  className: "leaflet-mouse-marker",
+                  iconAnchor: [20, 20],
+                  iconSize: [40, 40],
+                }),
+                opacity: 0,
+                zIndexOffset: this.options.zIndexOffset,
+              })),
+            this._mouseMarker.on("click", this._onClick, this).addTo(this._map),
+            this._map.on("mousemove", this._onMouseMove, this),
+            this._map.on("click", this._onTouch, this));
+      },
+      removeHooks: function () {
+        L.Draw.Feature.prototype.removeHooks.call(this),
+          this._map &&
+            (this._map
+              .off("click", this._onClick, this)
+              .off("click", this._onTouch, this),
+            this._marker &&
+              (this._marker.off("click", this._onClick, this),
+              this._map.removeLayer(this._marker),
+              delete this._marker),
+            this._mouseMarker.off("click", this._onClick, this),
+            this._map.removeLayer(this._mouseMarker),
+            delete this._mouseMarker,
+            this._map.off("mousemove", this._onMouseMove, this));
+      },
+      _onMouseMove: function (t) {
+        var e = t.latlng;
+        this._tooltip.updatePosition(e),
+          this._mouseMarker.setLatLng(e),
+          this._marker
+            ? ((e = this._mouseMarker.getLatLng()), this._marker.setLatLng(e))
+            : ((this._marker = this._createMarker(e)),
+              this._marker.on("click", this._onClick, this),
+              this._map
+                .on("click", this._onClick, this)
+                .addLayer(this._marker));
+      },
+      _createMarker: function (t) {
+        return new L.Marker(t, {
+          icon: this.options.icon,
+          zIndexOffset: this.options.zIndexOffset,
+        });
+      },
+      _onClick: function () {
+        this._fireCreatedEvent(),
+          this.disable(),
+          this.options.repeatMode && this.enable();
+      },
+      _onTouch: function (t) {
+        this._onMouseMove(t), this._onClick();
+      },
+      _fireCreatedEvent: function () {
+        var t = new L.Marker.Touch(this._marker.getLatLng(), {
+          icon: this.options.icon,
+        });
+        L.Draw.Feature.prototype._fireCreatedEvent.call(this, t);
+      },
+    })),
+    (L.Draw.CircleMarker = L.Draw.Marker.extend({
+      statics: { TYPE: "circlemarker" },
+      options: {
+        stroke: !0,
+        color: "#3388ff",
+        weight: 4,
+        opacity: 0.5,
+        fill: !0,
+        fillColor: null,
+        fillOpacity: 0.2,
+        clickable: !0,
+        zIndexOffset: 2e3,
+      },
+      initialize: function (t, e) {
+        (this.type = L.Draw.CircleMarker.TYPE),
+          (this._initialLabelText =
+            L.drawLocal.draw.handlers.circlemarker.tooltip.start),
+          L.Draw.Feature.prototype.initialize.call(this, t, e);
+      },
+      _fireCreatedEvent: function () {
+        var t = new L.CircleMarker(this._marker.getLatLng(), this.options);
+        L.Draw.Feature.prototype._fireCreatedEvent.call(this, t);
+      },
+      _createMarker: function (t) {
+        return new L.CircleMarker(t, this.options);
+      },
+    })),
+    (L.Draw.Circle = L.Draw.SimpleShape.extend({
+      statics: { TYPE: "circle" },
+      options: {
+        shapeOptions: {
+          stroke: !0,
+          color: "#3388ff",
+          weight: 4,
+          opacity: 0.5,
+          fill: !0,
+          fillColor: null,
+          fillOpacity: 0.2,
+          clickable: !0,
+        },
+        showRadius: !0,
+        metric: !0,
+        feet: !0,
+        nautic: !1,
+      },
+      initialize: function (t, e) {
+        (this.type = L.Draw.Circle.TYPE),
+          (this._initialLabelText =
+            L.drawLocal.draw.handlers.circle.tooltip.start),
+          L.Draw.SimpleShape.prototype.initialize.call(this, t, e);
+      },
+      _drawShape: function (t) {
+        if (L.GeometryUtil.isVersion07x())
+          var e = this._startLatLng.distanceTo(t);
+        else var e = this._map.distance(this._startLatLng, t);
+        this._shape
+          ? this._shape.setRadius(e)
+          : ((this._shape = new L.Circle(
+              this._startLatLng,
+              e,
+              this.options.shapeOptions,
+            )),
+            this._map.addLayer(this._shape));
+      },
+      _fireCreatedEvent: function () {
+        var t = new L.Circle(
+          this._startLatLng,
+          this._shape.getRadius(),
+          this.options.shapeOptions,
+        );
+        L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this, t);
+      },
+      _onMouseMove: function (t) {
+        var e,
+          i = t.latlng,
+          o = this.options.showRadius,
+          n = this.options.metric;
+        if ((this._tooltip.updatePosition(i), this._isDrawing)) {
+          this._drawShape(i), (e = this._shape.getRadius().toFixed(1));
+          var a = "";
+          o &&
+            (a =
+              L.drawLocal.draw.handlers.circle.radius +
+              ": " +
+              L.GeometryUtil.readableDistance(
+                e,
+                n,
+                this.options.feet,
+                this.options.nautic,
+              )),
+            this._tooltip.updateContent({
+              text: this._endLabelText,
+              subtext: a,
+            });
+        }
+      },
+    })),
+    (L.Edit = L.Edit || {}),
+    (L.Edit.Marker = L.Handler.extend({
+      initialize: function (t, e) {
+        (this._marker = t), L.setOptions(this, e);
+      },
+      addHooks: function () {
+        var t = this._marker;
+        t.dragging.enable(),
+          t.on("dragend", this._onDragEnd, t),
+          this._toggleMarkerHighlight();
+      },
+      removeHooks: function () {
+        var t = this._marker;
+        t.dragging.disable(),
+          t.off("dragend", this._onDragEnd, t),
+          this._toggleMarkerHighlight();
+      },
+      _onDragEnd: function (t) {
+        var e = t.target;
+        (e.edited = !0), this._map.fire(L.Draw.Event.EDITMOVE, { layer: e });
+      },
+      _toggleMarkerHighlight: function () {
+        var t = this._marker._icon;
+        t &&
+          ((t.style.display = "none"),
+          L.DomUtil.hasClass(t, "leaflet-edit-marker-selected")
+            ? (L.DomUtil.removeClass(t, "leaflet-edit-marker-selected"),
+              this._offsetMarker(t, -4))
+            : (L.DomUtil.addClass(t, "leaflet-edit-marker-selected"),
+              this._offsetMarker(t, 4)),
+          (t.style.display = ""));
+      },
+      _offsetMarker: function (t, e) {
+        var i = parseInt(t.style.marginTop, 10) - e,
+          o = parseInt(t.style.marginLeft, 10) - e;
+        (t.style.marginTop = i + "px"), (t.style.marginLeft = o + "px");
+      },
+    })),
+    L.Marker.addInitHook(function () {
+      L.Edit.Marker &&
+        ((this.editing = new L.Edit.Marker(this)),
+        this.options.editable && this.editing.enable());
+    }),
+    (L.Edit = L.Edit || {}),
+    (L.Edit.Poly = L.Handler.extend({
+      initialize: function (t) {
+        (this.latlngs = [t._latlngs]),
+          t._holes && (this.latlngs = this.latlngs.concat(t._holes)),
+          (this._poly = t),
+          this._poly.on("revert-edited", this._updateLatLngs, this);
+      },
+      _defaultShape: function () {
+        return L.Polyline._flat
+          ? L.Polyline._flat(this._poly._latlngs)
+            ? this._poly._latlngs
+            : this._poly._latlngs[0]
+          : this._poly._latlngs;
+      },
+      _eachVertexHandler: function (t) {
+        for (var e = 0; e < this._verticesHandlers.length; e++)
+          t(this._verticesHandlers[e]);
+      },
+      addHooks: function () {
+        this._initHandlers(),
+          this._eachVertexHandler(function (t) {
+            t.addHooks();
+          });
+      },
+      removeHooks: function () {
+        this._eachVertexHandler(function (t) {
+          t.removeHooks();
+        });
+      },
+      updateMarkers: function () {
+        this._eachVertexHandler(function (t) {
+          t.updateMarkers();
+        });
+      },
+      _initHandlers: function () {
+        this._verticesHandlers = [];
+        for (var t = 0; t < this.latlngs.length; t++)
+          this._verticesHandlers.push(
+            new L.Edit.PolyVerticesEdit(
+              this._poly,
+              this.latlngs[t],
+              this._poly.options.poly,
+            ),
+          );
+      },
+      _updateLatLngs: function (t) {
+        (this.latlngs = [t.layer._latlngs]),
+          t.layer._holes &&
+            (this.latlngs = this.latlngs.concat(t.layer._holes));
+      },
+    })),
+    (L.Edit.PolyVerticesEdit = L.Handler.extend({
+      options: {
+        icon: new L.DivIcon({
+          iconSize: new L.Point(8, 8),
+          className: "leaflet-div-icon leaflet-editing-icon",
+        }),
+        touchIcon: new L.DivIcon({
+          iconSize: new L.Point(20, 20),
+          className: "leaflet-div-icon leaflet-editing-icon leaflet-touch-icon",
+        }),
+        drawError: { color: "#b00b00", timeout: 1e3 },
+      },
+      initialize: function (t, e, i) {
+        L.Browser.touch && (this.options.icon = this.options.touchIcon),
+          (this._poly = t),
+          i &&
+            i.drawError &&
+            (i.drawError = L.Util.extend(
+              {},
+              this.options.drawError,
+              i.drawError,
+            )),
+          (this._latlngs = e),
+          L.setOptions(this, i);
+      },
+      _defaultShape: function () {
+        return L.Polyline._flat
+          ? L.Polyline._flat(this._latlngs)
+            ? this._latlngs
+            : this._latlngs[0]
+          : this._latlngs;
+      },
+      addHooks: function () {
+        var t = this._poly,
+          e = t._path;
+        t instanceof L.Polygon ||
+          ((t.options.fill = !1),
+          t.options.editing && (t.options.editing.fill = !1)),
+          e &&
+            t.options.editing.className &&
+            (t.options.original.className &&
+              t.options.original.className.split(" ").forEach(function (t) {
+                L.DomUtil.removeClass(e, t);
+              }),
+            t.options.editing.className.split(" ").forEach(function (t) {
+              L.DomUtil.addClass(e, t);
+            })),
+          t.setStyle(t.options.editing),
+          this._poly._map &&
+            ((this._map = this._poly._map),
+            this._markerGroup || this._initMarkers(),
+            this._poly._map.addLayer(this._markerGroup));
+      },
+      removeHooks: function () {
+        var t = this._poly,
+          e = t._path;
+        e &&
+          t.options.editing.className &&
+          (t.options.editing.className.split(" ").forEach(function (t) {
+            L.DomUtil.removeClass(e, t);
+          }),
+          t.options.original.className &&
+            t.options.original.className.split(" ").forEach(function (t) {
+              L.DomUtil.addClass(e, t);
+            })),
+          t.setStyle(t.options.original),
+          t._map &&
+            (t._map.removeLayer(this._markerGroup),
+            delete this._markerGroup,
+            delete this._markers);
+      },
+      updateMarkers: function () {
+        this._markerGroup.clearLayers(), this._initMarkers();
+      },
+      _initMarkers: function () {
+        this._markerGroup || (this._markerGroup = new L.LayerGroup()),
+          (this._markers = []);
+        var t,
+          e,
+          i,
+          o,
+          n = this._defaultShape();
+        for (t = 0, i = n.length; t < i; t++)
+          (o = this._createMarker(n[t], t)),
+            o.on("click", this._onMarkerClick, this),
+            o.on("contextmenu", this._onContextMenu, this),
+            this._markers.push(o);
+        var a, s;
+        for (t = 0, e = i - 1; t < i; e = t++)
+          (0 !== t || (L.Polygon && this._poly instanceof L.Polygon)) &&
+            ((a = this._markers[e]),
+            (s = this._markers[t]),
+            this._createMiddleMarker(a, s),
+            this._updatePrevNext(a, s));
+      },
+      _createMarker: function (t, e) {
+        var i = new L.Marker.Touch(t, {
+          draggable: !0,
+          icon: this.options.icon,
+        });
+        return (
+          (i._origLatLng = t),
+          (i._index = e),
+          i
+            .on("dragstart", this._onMarkerDragStart, this)
+            .on("drag", this._onMarkerDrag, this)
+            .on("dragend", this._fireEdit, this)
+            .on("touchmove", this._onTouchMove, this)
+            .on("touchend", this._fireEdit, this)
+            .on("MSPointerMove", this._onTouchMove, this)
+            .on("MSPointerUp", this._fireEdit, this),
+          this._markerGroup.addLayer(i),
+          i
+        );
+      },
+      _onMarkerDragStart: function () {
+        this._poly.fire("editstart");
+      },
+      _spliceLatLngs: function () {
+        var t = this._defaultShape(),
+          e = [].splice.apply(t, arguments);
+        return this._poly._convertLatLngs(t, !0), this._poly.redraw(), e;
+      },
+      _removeMarker: function (t) {
+        var e = t._index;
+        this._markerGroup.removeLayer(t),
+          this._markers.splice(e, 1),
+          this._spliceLatLngs(e, 1),
+          this._updateIndexes(e, -1),
+          t
+            .off("dragstart", this._onMarkerDragStart, this)
+            .off("drag", this._onMarkerDrag, this)
+            .off("dragend", this._fireEdit, this)
+            .off("touchmove", this._onMarkerDrag, this)
+            .off("touchend", this._fireEdit, this)
+            .off("click", this._onMarkerClick, this)
+            .off("MSPointerMove", this._onTouchMove, this)
+            .off("MSPointerUp", this._fireEdit, this);
+      },
+      _fireEdit: function () {
+        (this._poly.edited = !0),
+          this._poly.fire("edit"),
+          this._poly._map.fire(L.Draw.Event.EDITVERTEX, {
+            layers: this._markerGroup,
+            poly: this._poly,
+          });
+      },
+      _onMarkerDrag: function (t) {
+        var e = t.target,
+          i = this._poly;
+        if (
+          (L.extend(e._origLatLng, e._latlng),
+          e._middleLeft &&
+            e._middleLeft.setLatLng(this._getMiddleLatLng(e._prev, e)),
+          e._middleRight &&
+            e._middleRight.setLatLng(this._getMiddleLatLng(e, e._next)),
+          i.options.poly)
+        ) {
+          var o = i._map._editTooltip;
+          if (!i.options.poly.allowIntersection && i.intersects()) {
+            var n = i.options.color;
+            i.setStyle({ color: this.options.drawError.color }),
+              0 !== L.version.indexOf("0.7") && e.dragging._draggable._onUp(t),
+              this._onMarkerClick(t),
+              o &&
+                o.updateContent({
+                  text: L.drawLocal.draw.handlers.polyline.error,
+                }),
+              setTimeout(function () {
+                i.setStyle({ color: n }),
+                  o &&
+                    o.updateContent({
+                      text: L.drawLocal.edit.handlers.edit.tooltip.text,
+                      subtext: L.drawLocal.edit.handlers.edit.tooltip.subtext,
+                    });
+              }, 1e3);
+          }
+        }
+        (this._poly._bounds._southWest = L.latLng(1 / 0, 1 / 0)),
+          (this._poly._bounds._northEast = L.latLng(-1 / 0, -1 / 0));
+        var a = this._poly.getLatLngs();
+        this._poly._convertLatLngs(a, !0),
+          this._poly.redraw(),
+          this._poly.fire("editdrag");
+      },
+      _onMarkerClick: function (t) {
+        var e = L.Polygon && this._poly instanceof L.Polygon ? 4 : 3,
+          i = t.target;
+        this._defaultShape().length < e ||
+          (this._removeMarker(i),
+          this._updatePrevNext(i._prev, i._next),
+          i._middleLeft && this._markerGroup.removeLayer(i._middleLeft),
+          i._middleRight && this._markerGroup.removeLayer(i._middleRight),
+          i._prev && i._next
+            ? this._createMiddleMarker(i._prev, i._next)
+            : i._prev
+              ? i._next || (i._prev._middleRight = null)
+              : (i._next._middleLeft = null),
+          this._fireEdit());
+      },
+      _onContextMenu: function (t) {
+        var e = t.target;
+        this._poly;
+        this._poly._map.fire(L.Draw.Event.MARKERCONTEXT, {
+          marker: e,
+          layers: this._markerGroup,
+          poly: this._poly,
+        }),
+          L.DomEvent.stopPropagation;
+      },
+      _onTouchMove: function (t) {
+        var e = this._map.mouseEventToLayerPoint(t.originalEvent.touches[0]),
+          i = this._map.layerPointToLatLng(e),
+          o = t.target;
+        L.extend(o._origLatLng, i),
+          o._middleLeft &&
+            o._middleLeft.setLatLng(this._getMiddleLatLng(o._prev, o)),
+          o._middleRight &&
+            o._middleRight.setLatLng(this._getMiddleLatLng(o, o._next)),
+          this._poly.redraw(),
+          this.updateMarkers();
+      },
+      _updateIndexes: function (t, e) {
+        this._markerGroup.eachLayer(function (i) {
+          i._index > t && (i._index += e);
+        });
+      },
+      _createMiddleMarker: function (t, e) {
+        var i,
+          o,
+          n,
+          a = this._getMiddleLatLng(t, e),
+          s = this._createMarker(a);
+        s.setOpacity(0.8),
+          (t._middleRight = e._middleLeft = s),
+          (o = function () {
+            s.off("touchmove", o, this);
+            var n = e._index;
+            (s._index = n),
+              s.off("click", i, this).on("click", this._onMarkerClick, this),
+              (a.lat = s.getLatLng().lat),
+              (a.lng = s.getLatLng().lng),
+              this._spliceLatLngs(n, 0, a),
+              this._markers.splice(n, 0, s),
+              s.setOpacity(1),
+              s._icon.classList.remove("leaflet-middle-icon"),
+              this._updateIndexes(n, 1),
+              e._index++,
+              this._updatePrevNext(t, s),
+              this._updatePrevNext(s, e),
+              this._poly.fire("editstart");
+          }),
+          (n = function () {
+            s.off("dragstart", o, this),
+              s.off("dragend", n, this),
+              s.off("touchmove", o, this),
+              this._createMiddleMarker(t, s),
+              this._createMiddleMarker(s, e);
+          }),
+          (i = function () {
+            o.call(this), n.call(this), this._fireEdit();
+          }),
+          s
+            .on("click", i, this)
+            .on("dragstart", o, this)
+            .on("dragend", n, this)
+            .on("touchmove", o, this),
+          this._markerGroup.addLayer(s);
+        setTimeout(() => {
+          s._icon.classList.add("leaflet-middle-icon");
+        }, 100);
+      },
+      _updatePrevNext: function (t, e) {
+        t && (t._next = e), e && (e._prev = t);
+      },
+      _getMiddleLatLng: function (t, e) {
+        var i = this._poly._map,
+          o = i.project(t.getLatLng()),
+          n = i.project(e.getLatLng());
+        return i.unproject(o._add(n)._divideBy(2));
+      },
+    })),
+    L.Polyline.addInitHook(function () {
+      this.editing ||
+        (L.Edit.Poly &&
+          ((this.editing = new L.Edit.Poly(this)),
+          this.options.editable && this.editing.enable()),
+        this.on("add", function () {
+          this.editing && this.editing.enabled() && this.editing.addHooks();
+        }),
+        this.on("remove", function () {
+          this.editing && this.editing.enabled() && this.editing.removeHooks();
+        }));
+    }),
+    (L.Edit = L.Edit || {}),
+    (L.Edit.SimpleShape = L.Handler.extend({
+      options: {
+        moveIcon: new L.DivIcon({
+          iconSize: new L.Point(8, 8),
+          className: "leaflet-div-icon leaflet-editing-icon leaflet-edit-move",
+        }),
+        resizeIcon: new L.DivIcon({
+          iconSize: new L.Point(8, 8),
+          className:
+            "leaflet-div-icon leaflet-editing-icon leaflet-edit-resize",
+        }),
+        touchMoveIcon: new L.DivIcon({
+          iconSize: new L.Point(20, 20),
+          className:
+            "leaflet-div-icon leaflet-editing-icon leaflet-edit-move leaflet-touch-icon",
+        }),
+        touchResizeIcon: new L.DivIcon({
+          iconSize: new L.Point(20, 20),
+          className:
+            "leaflet-div-icon leaflet-editing-icon leaflet-edit-resize leaflet-touch-icon",
+        }),
+      },
+      initialize: function (t, e) {
+        L.Browser.touch &&
+          ((this.options.moveIcon = this.options.touchMoveIcon),
+          (this.options.resizeIcon = this.options.touchResizeIcon)),
+          (this._shape = t),
+          L.Util.setOptions(this, e);
+      },
+      addHooks: function () {
+        var t = this._shape;
+        this._shape._map &&
+          ((this._map = this._shape._map),
+          t.setStyle(t.options.editing),
+          t._map &&
+            ((this._map = t._map),
+            this._markerGroup || this._initMarkers(),
+            this._map.addLayer(this._markerGroup)));
+      },
+      removeHooks: function () {
+        var t = this._shape;
+        if ((t.setStyle(t.options.original), t._map)) {
+          this._unbindMarker(this._moveMarker);
+          for (var e = 0, i = this._resizeMarkers.length; e < i; e++)
+            this._unbindMarker(this._resizeMarkers[e]);
+          (this._resizeMarkers = null),
+            this._map.removeLayer(this._markerGroup),
+            delete this._markerGroup;
+        }
+        this._map = null;
+      },
+      updateMarkers: function () {
+        this._markerGroup.clearLayers(), this._initMarkers();
+      },
+      _initMarkers: function () {
+        this._markerGroup || (this._markerGroup = new L.LayerGroup()),
+          this._createMoveMarker(),
+          this._createResizeMarker();
+      },
+      _createMoveMarker: function () {},
+      _createResizeMarker: function () {},
+      _createMarker: function (t, e) {
+        var i = new L.Marker.Touch(t, {
+          draggable: !0,
+          icon: e,
+          zIndexOffset: 10,
+        });
+        return this._bindMarker(i), this._markerGroup.addLayer(i), i;
+      },
+      _bindMarker: function (t) {
+        t.on("dragstart", this._onMarkerDragStart, this)
+          .on("drag", this._onMarkerDrag, this)
+          .on("dragend", this._onMarkerDragEnd, this)
+          .on("touchstart", this._onTouchStart, this)
+          .on("touchmove", this._onTouchMove, this)
+          .on("MSPointerMove", this._onTouchMove, this)
+          .on("touchend", this._onTouchEnd, this)
+          .on("MSPointerUp", this._onTouchEnd, this);
+      },
+      _unbindMarker: function (t) {
+        t.off("dragstart", this._onMarkerDragStart, this)
+          .off("drag", this._onMarkerDrag, this)
+          .off("dragend", this._onMarkerDragEnd, this)
+          .off("touchstart", this._onTouchStart, this)
+          .off("touchmove", this._onTouchMove, this)
+          .off("MSPointerMove", this._onTouchMove, this)
+          .off("touchend", this._onTouchEnd, this)
+          .off("MSPointerUp", this._onTouchEnd, this);
+      },
+      _onMarkerDragStart: function (t) {
+        t.target.setOpacity(0), this._shape.fire("editstart");
+      },
+      _fireEdit: function () {
+        (this._shape.edited = !0), this._shape.fire("edit");
+      },
+      _onMarkerDrag: function (t) {
+        var e = t.target,
+          i = e.getLatLng();
+        e === this._moveMarker ? this._move(i) : this._resize(i),
+          this._shape.redraw(),
+          this._shape.fire("editdrag");
+      },
+      _onMarkerDragEnd: function (t) {
+        t.target.setOpacity(1), this._fireEdit();
+      },
+      _onTouchStart: function (t) {
+        if (
+          (L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this, t),
+          "function" == typeof this._getCorners)
+        ) {
+          var e = this._getCorners(),
+            i = t.target,
+            o = i._cornerIndex;
+          i.setOpacity(0),
+            (this._oppositeCorner = e[(o + 2) % 4]),
+            this._toggleCornerMarkers(0, o);
+        }
+        this._shape.fire("editstart");
+      },
+      _onTouchMove: function (t) {
+        var e = this._map.mouseEventToLayerPoint(t.originalEvent.touches[0]),
+          i = this._map.layerPointToLatLng(e);
+        return (
+          t.target === this._moveMarker ? this._move(i) : this._resize(i),
+          this._shape.redraw(),
+          !1
+        );
+      },
+      _onTouchEnd: function (t) {
+        t.target.setOpacity(1), this.updateMarkers(), this._fireEdit();
+      },
+      _move: function () {},
+      _resize: function () {},
+    })),
+    (L.Edit = L.Edit || {}),
+    (L.Edit.Rectangle = L.Edit.SimpleShape.extend({
+      _createMoveMarker: function () {
+        var t = this._shape.getBounds(),
+          e = t.getCenter();
+        this._moveMarker = this._createMarker(e, this.options.moveIcon);
+      },
+      _createResizeMarker: function () {
+        var t = this._getCorners();
+        this._resizeMarkers = [];
+        for (var e = 0, i = t.length; e < i; e++)
+          this._resizeMarkers.push(
+            this._createMarker(t[e], this.options.resizeIcon),
+          ),
+            (this._resizeMarkers[e]._cornerIndex = e);
+      },
+      _onMarkerDragStart: function (t) {
+        L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this, t);
+        var e = this._getCorners(),
+          i = t.target,
+          o = i._cornerIndex;
+        (this._oppositeCorner = e[(o + 2) % 4]),
+          this._toggleCornerMarkers(0, o);
+      },
+      _onMarkerDragEnd: function (t) {
+        var e,
+          i,
+          o = t.target;
+        o === this._moveMarker &&
+          ((e = this._shape.getBounds()), (i = e.getCenter()), o.setLatLng(i)),
+          this._toggleCornerMarkers(1),
+          this._repositionCornerMarkers(),
+          L.Edit.SimpleShape.prototype._onMarkerDragEnd.call(this, t);
+      },
+      _move: function (t) {
+        for (
+          var e,
+            i = this._shape._defaultShape
+              ? this._shape._defaultShape()
+              : this._shape.getLatLngs(),
+            o = this._shape.getBounds(),
+            n = o.getCenter(),
+            a = [],
+            s = 0,
+            r = i.length;
+          s < r;
+          s++
+        )
+          (e = [i[s].lat - n.lat, i[s].lng - n.lng]),
+            a.push([t.lat + e[0], t.lng + e[1]]);
+        this._shape.setLatLngs(a),
+          this._repositionCornerMarkers(),
+          this._map.fire(L.Draw.Event.EDITMOVE, { layer: this._shape });
+      },
+      _resize: function (t) {
+        var e;
+        this._shape.setBounds(L.latLngBounds(t, this._oppositeCorner)),
+          (e = this._shape.getBounds()),
+          this._moveMarker.setLatLng(e.getCenter()),
+          this._map.fire(L.Draw.Event.EDITRESIZE, { layer: this._shape });
+      },
+      _getCorners: function () {
+        var t = this._shape.getBounds();
+        return [
+          t.getNorthWest(),
+          t.getNorthEast(),
+          t.getSouthEast(),
+          t.getSouthWest(),
+        ];
+      },
+      _toggleCornerMarkers: function (t) {
+        for (var e = 0, i = this._resizeMarkers.length; e < i; e++)
+          this._resizeMarkers[e].setOpacity(t);
+      },
+      _repositionCornerMarkers: function () {
+        for (
+          var t = this._getCorners(), e = 0, i = this._resizeMarkers.length;
+          e < i;
+          e++
+        )
+          this._resizeMarkers[e].setLatLng(t[e]);
+      },
+    })),
+    L.Rectangle.addInitHook(function () {
+      L.Edit.Rectangle &&
+        ((this.editing = new L.Edit.Rectangle(this)),
+        this.options.editable && this.editing.enable());
+    }),
+    (L.Edit = L.Edit || {}),
+    (L.Edit.CircleMarker = L.Edit.SimpleShape.extend({
+      _createMoveMarker: function () {
+        var t = this._shape.getLatLng();
+        this._moveMarker = this._createMarker(t, this.options.moveIcon);
+      },
+      _createResizeMarker: function () {
+        this._resizeMarkers = [];
+      },
+      _move: function (t) {
+        if (this._resizeMarkers.length) {
+          var e = this._getResizeMarkerPoint(t);
+          this._resizeMarkers[0].setLatLng(e);
+        }
+        this._shape.setLatLng(t),
+          this._map.fire(L.Draw.Event.EDITMOVE, { layer: this._shape });
+      },
+    })),
+    L.CircleMarker.addInitHook(function () {
+      L.Edit.CircleMarker &&
+        ((this.editing = new L.Edit.CircleMarker(this)),
+        this.options.editable && this.editing.enable()),
+        this.on("add", function () {
+          this.editing && this.editing.enabled() && this.editing.addHooks();
+        }),
+        this.on("remove", function () {
+          this.editing && this.editing.enabled() && this.editing.removeHooks();
+        });
+    }),
+    (L.Edit = L.Edit || {}),
+    (L.Edit.Circle = L.Edit.CircleMarker.extend({
+      _createResizeMarker: function () {
+        var t = this._shape.getLatLng(),
+          e = this._getResizeMarkerPoint(t);
+        (this._resizeMarkers = []),
+          this._resizeMarkers.push(
+            this._createMarker(e, this.options.resizeIcon),
+          );
+      },
+      _getResizeMarkerPoint: function (t) {
+        var e = this._shape._radius * Math.cos(Math.PI / 4),
+          i = this._map.project(t);
+        return this._map.unproject([i.x + e, i.y - e]);
+      },
+      _resize: function (t) {
+        var e = this._moveMarker.getLatLng();
+        L.GeometryUtil.isVersion07x()
+          ? (radius = e.distanceTo(t))
+          : (radius = this._map.distance(e, t)),
+          this._shape.setRadius(radius),
+          this._map._editTooltip.updateContent({
+            text:
+              L.drawLocal.edit.handlers.edit.tooltip.subtext +
+              "<br />" +
+              L.drawLocal.edit.handlers.edit.tooltip.text,
+            subtext:
+              L.drawLocal.draw.handlers.circle.radius +
+              ": " +
+              L.GeometryUtil.readableDistance(
+                radius,
+                !0,
+                this.options.feet,
+                this.options.nautic,
+              ),
+          }),
+          this._shape.setRadius(radius),
+          this._map.fire(L.Draw.Event.EDITRESIZE, { layer: this._shape });
+      },
+    })),
+    L.Circle.addInitHook(function () {
+      L.Edit.Circle &&
+        ((this.editing = new L.Edit.Circle(this)),
+        this.options.editable && this.editing.enable()),
+        this.on("add", function () {
+          this.editing && this.editing.enabled() && this.editing.addHooks();
+        }),
+        this.on("remove", function () {
+          this.editing && this.editing.enabled() && this.editing.removeHooks();
+        });
+    }),
+    L.Map.mergeOptions({ touchExtend: !0 }),
+    (L.Map.TouchExtend = L.Handler.extend({
+      initialize: function (t) {
+        (this._map = t),
+          (this._container = t._container),
+          (this._pane = t._panes.overlayPane);
+      },
+      addHooks: function () {
+        L.DomEvent.on(this._container, "touchstart", this._onTouchStart, this),
+          L.DomEvent.on(this._container, "touchend", this._onTouchEnd, this),
+          L.DomEvent.on(this._container, "touchmove", this._onTouchMove, this),
+          this._detectIE()
+            ? (L.DomEvent.on(
+                this._container,
+                "MSPointerDown",
+                this._onTouchStart,
+                this,
+              ),
+              L.DomEvent.on(
+                this._container,
+                "MSPointerUp",
+                this._onTouchEnd,
+                this,
+              ),
+              L.DomEvent.on(
+                this._container,
+                "MSPointerMove",
+                this._onTouchMove,
+                this,
+              ),
+              L.DomEvent.on(
+                this._container,
+                "MSPointerCancel",
+                this._onTouchCancel,
+                this,
+              ))
+            : (L.DomEvent.on(
+                this._container,
+                "touchcancel",
+                this._onTouchCancel,
+                this,
+              ),
+              L.DomEvent.on(
+                this._container,
+                "touchleave",
+                this._onTouchLeave,
+                this,
+              ));
+      },
+      removeHooks: function () {
+        L.DomEvent.off(this._container, "touchstart", this._onTouchStart),
+          L.DomEvent.off(this._container, "touchend", this._onTouchEnd),
+          L.DomEvent.off(this._container, "touchmove", this._onTouchMove),
+          this._detectIE()
+            ? (L.DomEvent.off(
+                this._container,
+                "MSPointerDowm",
+                this._onTouchStart,
+              ),
+              L.DomEvent.off(this._container, "MSPointerUp", this._onTouchEnd),
+              L.DomEvent.off(
+                this._container,
+                "MSPointerMove",
+                this._onTouchMove,
+              ),
+              L.DomEvent.off(
+                this._container,
+                "MSPointerCancel",
+                this._onTouchCancel,
+              ))
+            : (L.DomEvent.off(
+                this._container,
+                "touchcancel",
+                this._onTouchCancel,
+              ),
+              L.DomEvent.off(
+                this._container,
+                "touchleave",
+                this._onTouchLeave,
+              ));
+      },
+      _touchEvent: function (t, e) {
+        var i = {};
+        if (void 0 !== t.touches) {
+          if (!t.touches.length) return;
+          i = t.touches[0];
+        } else {
+          if ("touch" !== t.pointerType) return;
+          if (((i = t), !this._filterClick(t))) return;
+        }
+        var o = this._map.mouseEventToContainerPoint(i),
+          n = this._map.mouseEventToLayerPoint(i),
+          a = this._map.layerPointToLatLng(n);
+        this._map.fire(e, {
+          latlng: a,
+          layerPoint: n,
+          containerPoint: o,
+          pageX: i.pageX,
+          pageY: i.pageY,
+          originalEvent: t,
+        });
+      },
+      _filterClick: function (t) {
+        var e = t.timeStamp || t.originalEvent.timeStamp,
+          i = L.DomEvent._lastClick && e - L.DomEvent._lastClick;
+        return (i && i > 100 && i < 500) ||
+          (t.target._simulatedClick && !t._simulated)
+          ? (L.DomEvent.stop(t), !1)
+          : ((L.DomEvent._lastClick = e), !0);
+      },
+      _onTouchStart: function (t) {
+        if (this._map._loaded) {
+          this._touchEvent(t, "touchstart");
+        }
+      },
+      _onTouchEnd: function (t) {
+        if (this._map._loaded) {
+          this._touchEvent(t, "touchend");
+        }
+      },
+      _onTouchCancel: function (t) {
+        if (this._map._loaded) {
+          var e = "touchcancel";
+          this._detectIE() && (e = "pointercancel"), this._touchEvent(t, e);
+        }
+      },
+      _onTouchLeave: function (t) {
+        if (this._map._loaded) {
+          this._touchEvent(t, "touchleave");
+        }
+      },
+      _onTouchMove: function (t) {
+        if (this._map._loaded) {
+          this._touchEvent(t, "touchmove");
+        }
+      },
+      _detectIE: function () {
+        var e = t.navigator.userAgent,
+          i = e.indexOf("MSIE ");
+        if (i > 0) return parseInt(e.substring(i + 5, e.indexOf(".", i)), 10);
+        if (e.indexOf("Trident/") > 0) {
+          var o = e.indexOf("rv:");
+          return parseInt(e.substring(o + 3, e.indexOf(".", o)), 10);
+        }
+        var n = e.indexOf("Edge/");
+        return n > 0 && parseInt(e.substring(n + 5, e.indexOf(".", n)), 10);
+      },
+    })),
+    L.Map.addInitHook("addHandler", "touchExtend", L.Map.TouchExtend),
+    (L.Marker.Touch = L.Marker.extend({
+      _initInteraction: function () {
+        return this.addInteractiveTarget
+          ? L.Marker.prototype._initInteraction.apply(this)
+          : this._initInteractionLegacy();
+      },
+      _initInteractionLegacy: function () {
+        if (this.options.clickable) {
+          var t = this._icon,
+            e = [
+              "dblclick",
+              "mousedown",
+              "mouseover",
+              "mouseout",
+              "contextmenu",
+              "touchstart",
+              "touchend",
+              "touchmove",
+            ];
+          this._detectIE
+            ? e.concat([
+                "MSPointerDown",
+                "MSPointerUp",
+                "MSPointerMove",
+                "MSPointerCancel",
+              ])
+            : e.concat(["touchcancel"]),
+            L.DomUtil.addClass(t, "leaflet-clickable"),
+            L.DomEvent.on(t, "click", this._onMouseClick, this),
+            L.DomEvent.on(t, "keypress", this._onKeyPress, this);
+          for (var i = 0; i < e.length; i++)
+            L.DomEvent.on(t, e[i], this._fireMouseEvent, this);
+          L.Handler.MarkerDrag &&
+            ((this.dragging = new L.Handler.MarkerDrag(this)),
+            this.options.draggable && this.dragging.enable());
+        }
+      },
+      _detectIE: function () {
+        var e = t.navigator.userAgent,
+          i = e.indexOf("MSIE ");
+        if (i > 0) return parseInt(e.substring(i + 5, e.indexOf(".", i)), 10);
+        if (e.indexOf("Trident/") > 0) {
+          var o = e.indexOf("rv:");
+          return parseInt(e.substring(o + 3, e.indexOf(".", o)), 10);
+        }
+        var n = e.indexOf("Edge/");
+        return n > 0 && parseInt(e.substring(n + 5, e.indexOf(".", n)), 10);
+      },
+    })),
+    (L.LatLngUtil = {
+      cloneLatLngs: function (t) {
+        for (var e = [], i = 0, o = t.length; i < o; i++)
+          Array.isArray(t[i])
+            ? e.push(L.LatLngUtil.cloneLatLngs(t[i]))
+            : e.push(this.cloneLatLng(t[i]));
+        return e;
+      },
+      cloneLatLng: function (t) {
+        return L.latLng(t.lat, t.lng);
+      },
+    }),
+    (function () {
+      var t = { km: 2, ha: 2, m: 0, mi: 2, ac: 2, yd: 0, ft: 0, nm: 2 };
+      L.GeometryUtil = L.extend(L.GeometryUtil || {}, {
+        geodesicArea: function (t) {
+          var e,
+            i,
+            o = t.length,
+            n = 0,
+            a = Math.PI / 180;
+          if (o > 2) {
+            for (var s = 0; s < o; s++)
+              (e = t[s]),
+                (i = t[(s + 1) % o]),
+                (n +=
+                  (i.lng - e.lng) *
+                  a *
+                  (2 + Math.sin(e.lat * a) + Math.sin(i.lat * a)));
+            n = (6378137 * n * 6378137) / 2;
+          }
+          return Math.abs(n);
+        },
+        formattedNumber: function (t, e) {
+          var i = parseFloat(t).toFixed(e),
+            o = L.drawLocal.format && L.drawLocal.format.numeric,
+            n = o && o.delimiters,
+            a = n && n.thousands,
+            s = n && n.decimal;
+          if (a || s) {
+            var r = i.split(".");
+            (i = a ? r[0].replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1" + a) : r[0]),
+              (s = s || "."),
+              r.length > 1 && (i = i + s + r[1]);
+          }
+          return i;
+        },
+        readableArea: function (e, i, o) {
+          var n,
+            a,
+            o = L.Util.extend({}, t, o);
+          return (
+            i
+              ? ((a = ["ha", "m"]),
+                (type = typeof i),
+                "string" === type ? (a = [i]) : "boolean" !== type && (a = i),
+                (n =
+                  e >= 1e6 && -1 !== a.indexOf("km")
+                    ? L.GeometryUtil.formattedNumber(1e-6 * e, o.km) + " km²"
+                    : e >= 1e4 && -1 !== a.indexOf("ha")
+                      ? L.GeometryUtil.formattedNumber(1e-4 * e, o.ha) + " ha"
+                      : L.GeometryUtil.formattedNumber(e, o.m) + " m²"))
+              : ((e /= 0.836127),
+                (n =
+                  e >= 3097600
+                    ? L.GeometryUtil.formattedNumber(e / 3097600, o.mi) + " mi²"
+                    : e >= 4840
+                      ? L.GeometryUtil.formattedNumber(e / 4840, o.ac) +
+                        " acres"
+                      : L.GeometryUtil.formattedNumber(e, o.yd) + " yd²")),
+            n
+          );
+        },
+        readableDistance: function (e, i, o, n, a) {
+          var s,
+            a = L.Util.extend({}, t, a);
+          switch (
+            i
+              ? "string" == typeof i
+                ? i
+                : "metric"
+              : o
+                ? "feet"
+                : n
+                  ? "nauticalMile"
+                  : "yards"
+          ) {
+            case "metric":
+              s =
+                e > 1e3
+                  ? L.GeometryUtil.formattedNumber(e / 1e3, a.km) + " km"
+                  : L.GeometryUtil.formattedNumber(e, a.m) + " m";
+              break;
+            case "feet":
+              (e *= 3.28083),
+                (s = L.GeometryUtil.formattedNumber(e, a.ft) + " ft");
+              break;
+            case "nauticalMile":
+              (e *= 0.53996),
+                (s = L.GeometryUtil.formattedNumber(e / 1e3, a.nm) + " nm");
+              break;
+            case "yards":
+            default:
+              (e *= 1.09361),
+                (s =
+                  e > 1760
+                    ? L.GeometryUtil.formattedNumber(e / 1760, a.mi) + " miles"
+                    : L.GeometryUtil.formattedNumber(e, a.yd) + " yd");
+          }
+          return s;
+        },
+        isVersion07x: function () {
+          var t = L.version.split(".");
+          return 0 === parseInt(t[0], 10) && 7 === parseInt(t[1], 10);
+        },
+      });
+    })(),
+    L.Util.extend(L.LineUtil, {
+      segmentsIntersect: function (t, e, i, o) {
+        return (
+          this._checkCounterclockwise(t, i, o) !==
+            this._checkCounterclockwise(e, i, o) &&
+          this._checkCounterclockwise(t, e, i) !==
+            this._checkCounterclockwise(t, e, o)
+        );
+      },
+      _checkCounterclockwise: function (t, e, i) {
+        return (i.y - t.y) * (e.x - t.x) > (e.y - t.y) * (i.x - t.x);
+      },
+    }),
+    L.Polyline.include({
+      intersects: function () {
+        var t,
+          e,
+          i,
+          o = this._getProjectedPoints(),
+          n = o ? o.length : 0;
+        if (this._tooFewPointsForIntersection()) return !1;
+        for (t = n - 1; t >= 3; t--)
+          if (
+            ((e = o[t - 1]),
+            (i = o[t]),
+            this._lineSegmentsIntersectsRange(e, i, t - 2))
+          )
+            return !0;
+        return !1;
+      },
+      newLatLngIntersects: function (t, e) {
+        return (
+          !!this._map &&
+          this.newPointIntersects(this._map.latLngToLayerPoint(t), e)
+        );
+      },
+      newPointIntersects: function (t, e) {
+        var i = this._getProjectedPoints(),
+          o = i ? i.length : 0,
+          n = i ? i[o - 1] : null,
+          a = o - 2;
+        return (
+          !this._tooFewPointsForIntersection(1) &&
+          this._lineSegmentsIntersectsRange(n, t, a, e ? 1 : 0)
+        );
+      },
+      _tooFewPointsForIntersection: function (t) {
+        var e = this._getProjectedPoints(),
+          i = e ? e.length : 0;
+        return (i += t || 0), !e || i <= 3;
+      },
+      _lineSegmentsIntersectsRange: function (t, e, i, o) {
+        var n,
+          a,
+          s = this._getProjectedPoints();
+        o = o || 0;
+        for (var r = i; r > o; r--)
+          if (
+            ((n = s[r - 1]),
+            (a = s[r]),
+            L.LineUtil.segmentsIntersect(t, e, n, a))
+          )
+            return !0;
+        return !1;
+      },
+      _getProjectedPoints: function () {
+        if (!this._defaultShape) return this._originalPoints;
+        for (var t = [], e = this._defaultShape(), i = 0; i < e.length; i++)
+          t.push(this._map.latLngToLayerPoint(e[i]));
+        return t;
+      },
+    }),
+    L.Polygon.include({
+      intersects: function () {
+        var t,
+          e,
+          i,
+          o,
+          n = this._getProjectedPoints();
+        return (
+          !this._tooFewPointsForIntersection() &&
+          (!!L.Polyline.prototype.intersects.call(this) ||
+            ((t = n.length),
+            (e = n[0]),
+            (i = n[t - 1]),
+            (o = t - 2),
+            this._lineSegmentsIntersectsRange(i, e, o, 1)))
+        );
+      },
+    }),
+    (L.Control.Draw = L.Control.extend({
+      options: { position: "topleft", draw: {}, edit: !1 },
+      initialize: function (t) {
+        if (L.version < "0.7")
+          throw new Error(
+            "Leaflet.draw 0.2.3+ requires Leaflet 0.7.0+. Download latest from https://github.com/Leaflet/Leaflet/",
+          );
+        L.Control.prototype.initialize.call(this, t);
+        var e;
+        (this._toolbars = {}),
+          L.DrawToolbar &&
+            this.options.draw &&
+            ((e = new L.DrawToolbar(this.options.draw)),
+            (this._toolbars[L.DrawToolbar.TYPE] = e),
+            this._toolbars[L.DrawToolbar.TYPE].on(
+              "enable",
+              this._toolbarEnabled,
+              this,
+            )),
+          L.EditToolbar &&
+            this.options.edit &&
+            ((e = new L.EditToolbar(this.options.edit)),
+            (this._toolbars[L.EditToolbar.TYPE] = e),
+            this._toolbars[L.EditToolbar.TYPE].on(
+              "enable",
+              this._toolbarEnabled,
+              this,
+            )),
+          (L.toolbar = this);
+      },
+      onAdd: function (t) {
+        var e,
+          i = L.DomUtil.create("div", "leaflet-draw"),
+          o = !1;
+        for (var n in this._toolbars)
+          this._toolbars.hasOwnProperty(n) &&
+            (e = this._toolbars[n].addToolbar(t)) &&
+            (o ||
+              (L.DomUtil.hasClass(e, "leaflet-draw-toolbar-top") ||
+                L.DomUtil.addClass(e.childNodes[0], "leaflet-draw-toolbar-top"),
+              (o = !0)),
+            i.appendChild(e));
+        return i;
+      },
+      onRemove: function () {
+        for (var t in this._toolbars)
+          this._toolbars.hasOwnProperty(t) && this._toolbars[t].removeToolbar();
+      },
+      setDrawingOptions: function (t) {
+        for (var e in this._toolbars)
+          this._toolbars[e] instanceof L.DrawToolbar &&
+            this._toolbars[e].setOptions(t);
+      },
+      _toolbarEnabled: function (t) {
+        var e = t.target;
+        for (var i in this._toolbars)
+          this._toolbars[i] !== e && this._toolbars[i].disable();
+      },
+    })),
+    L.Map.mergeOptions({ drawControlTooltips: !0, drawControl: !1 }),
+    L.Map.addInitHook(function () {
+      this.options.drawControl &&
+        ((this.drawControl = new L.Control.Draw()),
+        this.addControl(this.drawControl));
+    }),
+    (L.Toolbar = L.Class.extend({
+      initialize: function (t) {
+        L.setOptions(this, t),
+          (this._modes = {}),
+          (this._actionButtons = []),
+          (this._activeMode = null);
+        var e = L.version.split(".");
+        1 === parseInt(e[0], 10) && parseInt(e[1], 10) >= 2
+          ? L.Toolbar.include(L.Evented.prototype)
+          : L.Toolbar.include(L.Mixin.Events);
+      },
+      enabled: function () {
+        return null !== this._activeMode;
+      },
+      disable: function () {
+        this.enabled() && this._activeMode.handler.disable();
+      },
+      addToolbar: function (t) {
+        var e,
+          i = L.DomUtil.create("div", "leaflet-draw-section"),
+          o = 0,
+          n = this._toolbarClass || "",
+          a = this.getModeHandlers(t);
+        for (
+          this._toolbarContainer = L.DomUtil.create(
+            "div",
+            "leaflet-draw-toolbar leaflet-bar",
+          ),
+            this._map = t,
+            e = 0;
+          e < a.length;
+          e++
+        )
+          a[e].enabled &&
+            this._initModeHandler(
+              a[e].handler,
+              this._toolbarContainer,
+              o++,
+              n,
+              a[e].title,
+            );
+        if (o)
+          return (
+            (this._lastButtonIndex = --o),
+            (this._actionsContainer = L.DomUtil.create(
+              "ul",
+              "leaflet-draw-actions",
+            )),
+            i.appendChild(this._toolbarContainer),
+            i.appendChild(this._actionsContainer),
+            i
+          );
+      },
+      removeToolbar: function () {
+        for (var t in this._modes)
+          this._modes.hasOwnProperty(t) &&
+            (this._disposeButton(
+              this._modes[t].button,
+              this._modes[t].handler.enable,
+              this._modes[t].handler,
+            ),
+            this._modes[t].handler.disable(),
+            this._modes[t].handler
+              .off("enabled", this._handlerActivated, this)
+              .off("disabled", this._handlerDeactivated, this));
+        this._modes = {};
+        for (var e = 0, i = this._actionButtons.length; e < i; e++)
+          this._disposeButton(
+            this._actionButtons[e].button,
+            this._actionButtons[e].callback,
+            this,
+          );
+        (this._actionButtons = []), (this._actionsContainer = null);
+      },
+      _initModeHandler: function (t, e, i, o, n) {
+        var a = t.type;
+        (this._modes[a] = {}),
+          (this._modes[a].handler = t),
+          (this._modes[a].button = this._createButton({
+            type: a,
+            title: n,
+            className: o + "-" + a,
+            container: e,
+            callback: this._modes[a].handler.enable,
+            context: this._modes[a].handler,
+          })),
+          (this._modes[a].buttonIndex = i),
+          this._modes[a].handler
+            .on("enabled", this._handlerActivated, this)
+            .on("disabled", this._handlerDeactivated, this);
+      },
+      _detectIOS: function () {
+        return /iPad|iPhone|iPod/.test(navigator.userAgent) && !t.MSStream;
+      },
+      _createButton: function (t) {
+        var e = L.DomUtil.create("a", t.className || "", t.container),
+          i = L.DomUtil.create("span", "sr-only", t.container);
+        (e.href = "#"),
+          e.appendChild(i),
+          t.title && ((e.title = t.title), (i.innerHTML = t.title)),
+          t.text && ((e.innerHTML = t.text), (i.innerHTML = t.text));
+        var o = this._detectIOS() ? "touchstart" : "click";
+        return (
+          L.DomEvent.on(e, "click", L.DomEvent.stopPropagation)
+            .on(e, "mousedown", L.DomEvent.stopPropagation)
+            .on(e, "dblclick", L.DomEvent.stopPropagation)
+            .on(e, "touchstart", L.DomEvent.stopPropagation)
+            .on(e, "click", L.DomEvent.preventDefault)
+            .on(e, o, t.callback, t.context),
+          e
+        );
+      },
+      _disposeButton: function (t, e) {
+        var i = this._detectIOS() ? "touchstart" : "click";
+        L.DomEvent.off(t, "click", L.DomEvent.stopPropagation)
+          .off(t, "mousedown", L.DomEvent.stopPropagation)
+          .off(t, "dblclick", L.DomEvent.stopPropagation)
+          .off(t, "touchstart", L.DomEvent.stopPropagation)
+          .off(t, "click", L.DomEvent.preventDefault)
+          .off(t, i, e);
+      },
+      _handlerActivated: function (t) {
+        this.disable(),
+          (this._activeMode = this._modes[t.handler]),
+          L.DomUtil.addClass(
+            this._activeMode.button,
+            "leaflet-draw-toolbar-button-enabled",
+          ),
+          this._showActionsToolbar(),
+          this.fire("enable");
+      },
+      _handlerDeactivated: function () {
+        this._hideActionsToolbar(),
+          L.DomUtil.removeClass(
+            this._activeMode.button,
+            "leaflet-draw-toolbar-button-enabled",
+          ),
+          (this._activeMode = null),
+          this.fire("disable");
+      },
+      _createActions: function (t) {
+        var e,
+          i,
+          o,
+          n,
+          a = this._actionsContainer,
+          s = this.getActions(t),
+          r = s.length;
+        for (i = 0, o = this._actionButtons.length; i < o; i++)
+          this._disposeButton(
+            this._actionButtons[i].button,
+            this._actionButtons[i].callback,
+          );
+        for (this._actionButtons = []; a.firstChild; )
+          a.removeChild(a.firstChild);
+        for (var l = 0; l < r; l++)
+          ("enabled" in s[l] && !s[l].enabled) ||
+            ((e = L.DomUtil.create("li", "", a)),
+            (n = this._createButton({
+              title: s[l].title,
+              text: s[l].text,
+              container: e,
+              callback: s[l].callback,
+              context: s[l].context,
+            })),
+            this._actionButtons.push({ button: n, callback: s[l].callback }));
+      },
+      _showActionsToolbar: function () {
+        var t = this._activeMode.buttonIndex,
+          e = this._lastButtonIndex,
+          i = this._activeMode.button.offsetTop - 1;
+        this._createActions(this._activeMode.handler),
+          (this._actionsContainer.style.top = i + "px"),
+          0 === t &&
+            (L.DomUtil.addClass(
+              this._toolbarContainer,
+              "leaflet-draw-toolbar-notop",
+            ),
+            L.DomUtil.addClass(
+              this._actionsContainer,
+              "leaflet-draw-actions-top",
+            )),
+          t === e &&
+            (L.DomUtil.addClass(
+              this._toolbarContainer,
+              "leaflet-draw-toolbar-nobottom",
+            ),
+            L.DomUtil.addClass(
+              this._actionsContainer,
+              "leaflet-draw-actions-bottom",
+            )),
+          (this._actionsContainer.style.display = "block"),
+          this._map.fire(L.Draw.Event.TOOLBAROPENED);
+      },
+      _hideActionsToolbar: function () {
+        (this._actionsContainer.style.display = "none"),
+          L.DomUtil.removeClass(
+            this._toolbarContainer,
+            "leaflet-draw-toolbar-notop",
+          ),
+          L.DomUtil.removeClass(
+            this._toolbarContainer,
+            "leaflet-draw-toolbar-nobottom",
+          ),
+          L.DomUtil.removeClass(
+            this._actionsContainer,
+            "leaflet-draw-actions-top",
+          ),
+          L.DomUtil.removeClass(
+            this._actionsContainer,
+            "leaflet-draw-actions-bottom",
+          ),
+          this._map.fire(L.Draw.Event.TOOLBARCLOSED);
+      },
+    })),
+    (L.Draw = L.Draw || {}),
+    (L.Draw.Tooltip = L.Class.extend({
+      initialize: function (t) {
+        (this._map = t),
+          (this._popupPane = t._panes.popupPane),
+          (this._visible = !1),
+          (this._container = t.options.drawControlTooltips
+            ? L.DomUtil.create("div", "leaflet-draw-tooltip", this._popupPane)
+            : null),
+          (this._singleLineLabel = !1),
+          this._map.on("mouseout", this._onMouseOut, this);
+      },
+      dispose: function () {
+        this._map.off("mouseout", this._onMouseOut, this),
+          this._container &&
+            (this._popupPane.removeChild(this._container),
+            (this._container = null));
+      },
+      updateContent: function (t) {
+        return this._container
+          ? ((t.subtext = t.subtext || ""),
+            0 !== t.subtext.length || this._singleLineLabel
+              ? t.subtext.length > 0 &&
+                this._singleLineLabel &&
+                (L.DomUtil.removeClass(
+                  this._container,
+                  "leaflet-draw-tooltip-single",
+                ),
+                (this._singleLineLabel = !1))
+              : (L.DomUtil.addClass(
+                  this._container,
+                  "leaflet-draw-tooltip-single",
+                ),
+                (this._singleLineLabel = !0)),
+            (this._container.innerHTML =
+              (t.subtext.length > 0
+                ? '<span class="leaflet-draw-tooltip-subtext">' +
+                  t.subtext +
+                  "</span><br />"
+                : "") +
+              "<span>" +
+              t.text +
+              "</span>"),
+            t.text || t.subtext
+              ? ((this._visible = !0),
+                (this._container.style.visibility = "inherit"))
+              : ((this._visible = !1),
+                (this._container.style.visibility = "hidden")),
+            this)
+          : this;
+      },
+      updatePosition: function (t) {
+        var e = this._map.latLngToLayerPoint(t),
+          i = this._container;
+        return (
+          this._container &&
+            (this._visible && (i.style.visibility = "inherit"),
+            L.DomUtil.setPosition(i, e)),
+          this
+        );
+      },
+      showAsError: function () {
+        return (
+          this._container &&
+            L.DomUtil.addClass(this._container, "leaflet-error-draw-tooltip"),
+          this
+        );
+      },
+      removeError: function () {
+        return (
+          this._container &&
+            L.DomUtil.removeClass(
+              this._container,
+              "leaflet-error-draw-tooltip",
+            ),
+          this
+        );
+      },
+      _onMouseOut: function () {
+        this._container && (this._container.style.visibility = "hidden");
+      },
+    })),
+    (L.DrawToolbar = L.Toolbar.extend({
+      statics: { TYPE: "draw" },
+      options: {
+        polyline: {},
+        polygon: {},
+        rectangle: {},
+        circle: {},
+        marker: {},
+        circlemarker: {},
+      },
+      initialize: function (t) {
+        for (var e in this.options)
+          this.options.hasOwnProperty(e) &&
+            t[e] &&
+            (t[e] = L.extend({}, this.options[e], t[e]));
+        (this._toolbarClass = "leaflet-draw-draw"),
+          L.Toolbar.prototype.initialize.call(this, t);
+      },
+      getModeHandlers: function (t) {
+        return [
+          {
+            enabled: this.options.polyline,
+            handler: new L.Draw.Polyline(t, this.options.polyline),
+            title: L.drawLocal.draw.toolbar.buttons.polyline,
+          },
+          {
+            enabled: this.options.polygon,
+            handler: new L.Draw.Polygon(t, this.options.polygon),
+            title: L.drawLocal.draw.toolbar.buttons.polygon,
+          },
+          {
+            enabled: this.options.rectangle,
+            handler: new L.Draw.Rectangle(t, this.options.rectangle),
+            title: L.drawLocal.draw.toolbar.buttons.rectangle,
+          },
+          {
+            enabled: this.options.circle,
+            handler: new L.Draw.Circle(t, this.options.circle),
+            title: L.drawLocal.draw.toolbar.buttons.circle,
+          },
+          {
+            enabled: this.options.marker,
+            handler: new L.Draw.Marker(t, this.options.marker),
+            title: L.drawLocal.draw.toolbar.buttons.marker,
+          },
+          {
+            enabled: this.options.circlemarker,
+            handler: new L.Draw.CircleMarker(t, this.options.circlemarker),
+            title: L.drawLocal.draw.toolbar.buttons.circlemarker,
+          },
+        ];
+      },
+      getActions: function (t) {
+        return [
+          {
+            enabled: t.completeShape,
+            title: L.drawLocal.draw.toolbar.finish.title,
+            text: L.drawLocal.draw.toolbar.finish.text,
+            callback: t.completeShape,
+            context: t,
+          },
+          {
+            enabled: t.deleteLastVertex,
+            title: L.drawLocal.draw.toolbar.undo.title,
+            text: L.drawLocal.draw.toolbar.undo.text,
+            callback: t.deleteLastVertex,
+            context: t,
+          },
+          {
+            title: L.drawLocal.draw.toolbar.actions.title,
+            text: L.drawLocal.draw.toolbar.actions.text,
+            callback: this.disable,
+            context: this,
+          },
+        ];
+      },
+      setOptions: function (t) {
+        L.setOptions(this, t);
+        for (var e in this._modes)
+          this._modes.hasOwnProperty(e) &&
+            t.hasOwnProperty(e) &&
+            this._modes[e].handler.setOptions(t[e]);
+      },
+    })),
+    (L.EditToolbar = L.Toolbar.extend({
+      statics: { TYPE: "edit" },
+      options: {
+        edit: {
+          selectedPathOptions: {
+            dashArray: "10, 10",
+            fill: !0,
+            fillColor: "#fe57a1",
+            fillOpacity: 0.1,
+            maintainColor: !1,
+          },
+        },
+        remove: {},
+        poly: null,
+        featureGroup: null,
+      },
+      initialize: function (t) {
+        t.edit &&
+          (void 0 === t.edit.selectedPathOptions &&
+            (t.edit.selectedPathOptions =
+              this.options.edit.selectedPathOptions),
+          (t.edit.selectedPathOptions = L.extend(
+            {},
+            this.options.edit.selectedPathOptions,
+            t.edit.selectedPathOptions,
+          ))),
+          t.remove && (t.remove = L.extend({}, this.options.remove, t.remove)),
+          t.poly && (t.poly = L.extend({}, this.options.poly, t.poly)),
+          (this._toolbarClass = "leaflet-draw-edit"),
+          L.Toolbar.prototype.initialize.call(this, t),
+          (this._selectedFeatureCount = 0);
+      },
+      getModeHandlers: function (t) {
+        var e = this.options.featureGroup;
+        return [
+          {
+            enabled: this.options.edit,
+            handler: new L.EditToolbar.Edit(t, {
+              featureGroup: e,
+              selectedPathOptions: this.options.edit.selectedPathOptions,
+              poly: this.options.poly,
+            }),
+            title: L.drawLocal.edit.toolbar.buttons.edit,
+          },
+          {
+            enabled: this.options.remove,
+            handler: new L.EditToolbar.Delete(t, { featureGroup: e }),
+            title: L.drawLocal.edit.toolbar.buttons.remove,
+          },
+        ];
+      },
+      getActions: function (t) {
+        var e = [
+          {
+            title: L.drawLocal.edit.toolbar.actions.save.title,
+            text: L.drawLocal.edit.toolbar.actions.save.text,
+            callback: this._save,
+            context: this,
+          },
+          {
+            title: L.drawLocal.edit.toolbar.actions.cancel.title,
+            text: L.drawLocal.edit.toolbar.actions.cancel.text,
+            callback: this.disable,
+            context: this,
+          },
+        ];
+        return (
+          t.removeAllLayers &&
+            e.push({
+              title: L.drawLocal.edit.toolbar.actions.clearAll.title,
+              text: L.drawLocal.edit.toolbar.actions.clearAll.text,
+              callback: this._clearAllLayers,
+              context: this,
+            }),
+          e
+        );
+      },
+      addToolbar: function (t) {
+        var e = L.Toolbar.prototype.addToolbar.call(this, t);
+        return (
+          this._checkDisabled(),
+          this.options.featureGroup.on(
+            "layeradd layerremove",
+            this._checkDisabled,
+            this,
+          ),
+          e
+        );
+      },
+      removeToolbar: function () {
+        this.options.featureGroup.off(
+          "layeradd layerremove",
+          this._checkDisabled,
+          this,
+        ),
+          L.Toolbar.prototype.removeToolbar.call(this);
+      },
+      disable: function () {
+        this.enabled() &&
+          (this._activeMode.handler.revertLayers(),
+          L.Toolbar.prototype.disable.call(this));
+      },
+      _save: function () {
+        this._activeMode.handler.save(),
+          this._activeMode && this._activeMode.handler.disable();
+      },
+      _clearAllLayers: function () {
+        this._activeMode.handler.removeAllLayers(),
+          this._activeMode && this._activeMode.handler.disable();
+      },
+      _checkDisabled: function () {
+        var t,
+          e = this.options.featureGroup,
+          i = 0 !== e.getLayers().length;
+        this.options.edit &&
+          ((t = this._modes[L.EditToolbar.Edit.TYPE].button),
+          i
+            ? L.DomUtil.removeClass(t, "leaflet-disabled")
+            : L.DomUtil.addClass(t, "leaflet-disabled"),
+          t.setAttribute(
+            "title",
+            i
+              ? L.drawLocal.edit.toolbar.buttons.edit
+              : L.drawLocal.edit.toolbar.buttons.editDisabled,
+          )),
+          this.options.remove &&
+            ((t = this._modes[L.EditToolbar.Delete.TYPE].button),
+            i
+              ? L.DomUtil.removeClass(t, "leaflet-disabled")
+              : L.DomUtil.addClass(t, "leaflet-disabled"),
+            t.setAttribute(
+              "title",
+              i
+                ? L.drawLocal.edit.toolbar.buttons.remove
+                : L.drawLocal.edit.toolbar.buttons.removeDisabled,
+            ));
+      },
+    })),
+    (L.EditToolbar.Edit = L.Handler.extend({
+      statics: { TYPE: "edit" },
+      initialize: function (t, e) {
+        if (
+          (L.Handler.prototype.initialize.call(this, t),
+          L.setOptions(this, e),
+          (this._featureGroup = e.featureGroup),
+          !(this._featureGroup instanceof L.FeatureGroup))
+        )
+          throw new Error("options.featureGroup must be a L.FeatureGroup");
+        (this._uneditedLayerProps = {}), (this.type = L.EditToolbar.Edit.TYPE);
+        var i = L.version.split(".");
+        1 === parseInt(i[0], 10) && parseInt(i[1], 10) >= 2
+          ? L.EditToolbar.Edit.include(L.Evented.prototype)
+          : L.EditToolbar.Edit.include(L.Mixin.Events);
+      },
+      enable: function () {
+        !this._enabled &&
+          this._hasAvailableLayers() &&
+          (this.fire("enabled", { handler: this.type }),
+          this._map.fire(L.Draw.Event.EDITSTART, { handler: this.type }),
+          L.Handler.prototype.enable.call(this),
+          this._featureGroup
+            .on("layeradd", this._enableLayerEdit, this)
+            .on("layerremove", this._disableLayerEdit, this));
+      },
+      disable: function () {
+        this._enabled &&
+          (this._featureGroup
+            .off("layeradd", this._enableLayerEdit, this)
+            .off("layerremove", this._disableLayerEdit, this),
+          L.Handler.prototype.disable.call(this),
+          this._map.fire(L.Draw.Event.EDITSTOP, { handler: this.type }),
+          this.fire("disabled", { handler: this.type }));
+      },
+      addHooks: function () {
+        var t = this._map;
+        t &&
+          (t.getContainer().focus(),
+          this._featureGroup.eachLayer(this._enableLayerEdit, this),
+          (this._tooltip = new L.Draw.Tooltip(this._map)),
+          this._tooltip.updateContent({
+            text: L.drawLocal.edit.handlers.edit.tooltip.text,
+            subtext: L.drawLocal.edit.handlers.edit.tooltip.subtext,
+          }),
+          (t._editTooltip = this._tooltip),
+          this._updateTooltip(),
+          this._map
+            .on("mousemove", this._onMouseMove, this)
+            .on("touchmove", this._onMouseMove, this)
+            .on("MSPointerMove", this._onMouseMove, this)
+            .on(L.Draw.Event.EDITVERTEX, this._updateTooltip, this));
+      },
+      removeHooks: function () {
+        this._map &&
+          (this._featureGroup.eachLayer(this._disableLayerEdit, this),
+          (this._uneditedLayerProps = {}),
+          this._tooltip.dispose(),
+          (this._tooltip = null),
+          this._map
+            .off("mousemove", this._onMouseMove, this)
+            .off("touchmove", this._onMouseMove, this)
+            .off("MSPointerMove", this._onMouseMove, this)
+            .off(L.Draw.Event.EDITVERTEX, this._updateTooltip, this));
+      },
+      revertLayers: function () {
+        this._featureGroup.eachLayer(function (t) {
+          this._revertLayer(t);
+        }, this);
+      },
+      save: function () {
+        var t = new L.LayerGroup();
+        this._featureGroup.eachLayer(function (e) {
+          e.edited && (t.addLayer(e), (e.edited = !1));
+        }),
+          this._map.fire(L.Draw.Event.EDITED, { layers: t });
+      },
+      _backupLayer: function (t) {
+        var e = L.Util.stamp(t);
+        this._uneditedLayerProps[e] ||
+          (t instanceof L.Polyline ||
+          t instanceof L.Polygon ||
+          t instanceof L.Rectangle
+            ? (this._uneditedLayerProps[e] = {
+                latlngs: L.LatLngUtil.cloneLatLngs(t.getLatLngs()),
+              })
+            : t instanceof L.Circle
+              ? (this._uneditedLayerProps[e] = {
+                  latlng: L.LatLngUtil.cloneLatLng(t.getLatLng()),
+                  radius: t.getRadius(),
+                })
+              : (t instanceof L.Marker || t instanceof L.CircleMarker) &&
+                (this._uneditedLayerProps[e] = {
+                  latlng: L.LatLngUtil.cloneLatLng(t.getLatLng()),
+                }));
+      },
+      _getTooltipText: function () {
+        return {
+          text: L.drawLocal.edit.handlers.edit.tooltip.text,
+          subtext: L.drawLocal.edit.handlers.edit.tooltip.subtext,
+        };
+      },
+      _updateTooltip: function () {
+        this._tooltip.updateContent(this._getTooltipText());
+      },
+      _revertLayer: function (t) {
+        var e = L.Util.stamp(t);
+        (t.edited = !1),
+          this._uneditedLayerProps.hasOwnProperty(e) &&
+            (t instanceof L.Polyline ||
+            t instanceof L.Polygon ||
+            t instanceof L.Rectangle
+              ? t.setLatLngs(this._uneditedLayerProps[e].latlngs)
+              : t instanceof L.Circle
+                ? (t.setLatLng(this._uneditedLayerProps[e].latlng),
+                  t.setRadius(this._uneditedLayerProps[e].radius))
+                : (t instanceof L.Marker || t instanceof L.CircleMarker) &&
+                  t.setLatLng(this._uneditedLayerProps[e].latlng),
+            t.fire("revert-edited", { layer: t }));
+      },
+      _enableLayerEdit: function (t) {
+        var e,
+          i,
+          o = t.layer || t.target || t;
+        this._backupLayer(o),
+          this.options.poly &&
+            ((i = L.Util.extend({}, this.options.poly)), (o.options.poly = i)),
+          this.options.selectedPathOptions &&
+            ((e = L.Util.extend({}, this.options.selectedPathOptions)),
+            e.maintainColor &&
+              ((e.color = o.options.color),
+              (e.fillColor = o.options.fillColor)),
+            (o.options.original = L.extend({}, o.options)),
+            (o.options.editing = e)),
+          o instanceof L.Marker
+            ? (o.editing && o.editing.enable(),
+              o.dragging.enable(),
+              o
+                .on("dragend", this._onMarkerDragEnd)
+                .on("touchmove", this._onTouchMove, this)
+                .on("MSPointerMove", this._onTouchMove, this)
+                .on("touchend", this._onMarkerDragEnd, this)
+                .on("MSPointerUp", this._onMarkerDragEnd, this))
+            : o.editing.enable();
+      },
+      _disableLayerEdit: function (t) {
+        var e = t.layer || t.target || t;
+        (e.edited = !1),
+          e.editing && e.editing.disable(),
+          delete e.options.editing,
+          delete e.options.original,
+          this._selectedPathOptions &&
+            (e instanceof L.Marker
+              ? this._toggleMarkerHighlight(e)
+              : (e.setStyle(e.options.previousOptions),
+                delete e.options.previousOptions)),
+          e instanceof L.Marker
+            ? (e.dragging.disable(),
+              e
+                .off("dragend", this._onMarkerDragEnd, this)
+                .off("touchmove", this._onTouchMove, this)
+                .off("MSPointerMove", this._onTouchMove, this)
+                .off("touchend", this._onMarkerDragEnd, this)
+                .off("MSPointerUp", this._onMarkerDragEnd, this))
+            : e.editing.disable();
+      },
+      _onMouseMove: function (t) {
+        this._tooltip.updatePosition(t.latlng);
+      },
+      _onMarkerDragEnd: function (t) {
+        var e = t.target;
+        (e.edited = !0), this._map.fire(L.Draw.Event.EDITMOVE, { layer: e });
+      },
+      _onTouchMove: function (t) {
+        var e = t.originalEvent.changedTouches[0],
+          i = this._map.mouseEventToLayerPoint(e),
+          o = this._map.layerPointToLatLng(i);
+        t.target.setLatLng(o);
+      },
+      _hasAvailableLayers: function () {
+        return 0 !== this._featureGroup.getLayers().length;
+      },
+    })),
+    (L.EditToolbar.Delete = L.Handler.extend({
+      statics: { TYPE: "remove" },
+      initialize: function (t, e) {
+        if (
+          (L.Handler.prototype.initialize.call(this, t),
+          L.Util.setOptions(this, e),
+          (this._deletableLayers = this.options.featureGroup),
+          !(this._deletableLayers instanceof L.FeatureGroup))
+        )
+          throw new Error("options.featureGroup must be a L.FeatureGroup");
+        this.type = L.EditToolbar.Delete.TYPE;
+        var i = L.version.split(".");
+        1 === parseInt(i[0], 10) && parseInt(i[1], 10) >= 2
+          ? L.EditToolbar.Delete.include(L.Evented.prototype)
+          : L.EditToolbar.Delete.include(L.Mixin.Events);
+      },
+      enable: function () {
+        !this._enabled &&
+          this._hasAvailableLayers() &&
+          (this.fire("enabled", { handler: this.type }),
+          this._map.fire(L.Draw.Event.DELETESTART, { handler: this.type }),
+          L.Handler.prototype.enable.call(this),
+          this._deletableLayers
+            .on("layeradd", this._enableLayerDelete, this)
+            .on("layerremove", this._disableLayerDelete, this));
+      },
+      disable: function () {
+        this._enabled &&
+          (this._deletableLayers
+            .off("layeradd", this._enableLayerDelete, this)
+            .off("layerremove", this._disableLayerDelete, this),
+          L.Handler.prototype.disable.call(this),
+          this._map.fire(L.Draw.Event.DELETESTOP, { handler: this.type }),
+          this.fire("disabled", { handler: this.type }));
+      },
+      addHooks: function () {
+        var t = this._map;
+        t &&
+          (t.getContainer().focus(),
+          this._deletableLayers.eachLayer(this._enableLayerDelete, this),
+          (this._deletedLayers = new L.LayerGroup()),
+          (this._tooltip = new L.Draw.Tooltip(this._map)),
+          this._tooltip.updateContent({
+            text: L.drawLocal.edit.handlers.remove.tooltip.text,
+          }),
+          this._map.on("mousemove", this._onMouseMove, this));
+      },
+      removeHooks: function () {
+        this._map &&
+          (this._deletableLayers.eachLayer(this._disableLayerDelete, this),
+          (this._deletedLayers = null),
+          this._tooltip.dispose(),
+          (this._tooltip = null),
+          this._map.off("mousemove", this._onMouseMove, this));
+      },
+      revertLayers: function () {
+        this._deletedLayers.eachLayer(function (t) {
+          this._deletableLayers.addLayer(t),
+            t.fire("revert-deleted", { layer: t });
+        }, this);
+      },
+      save: function () {
+        this._map.fire(L.Draw.Event.DELETED, { layers: this._deletedLayers });
+      },
+      removeAllLayers: function () {
+        this._deletableLayers.eachLayer(function (t) {
+          this._removeLayer({ layer: t });
+        }, this),
+          this.save();
+      },
+      _enableLayerDelete: function (t) {
+        (t.layer || t.target || t).on("click", this._removeLayer, this);
+      },
+      _disableLayerDelete: function (t) {
+        var e = t.layer || t.target || t;
+        e.off("click", this._removeLayer, this),
+          this._deletedLayers.removeLayer(e);
+      },
+      _removeLayer: function (t) {
+        var e = t.layer || t.target || t;
+        this._deletableLayers.removeLayer(e),
+          this._deletedLayers.addLayer(e),
+          e.fire("deleted");
+      },
+      _onMouseMove: function (t) {
+        this._tooltip.updatePosition(t.latlng);
+      },
+      _hasAvailableLayers: function () {
+        return 0 !== this._deletableLayers.getLayers().length;
+      },
+    }));
+})(window, document);
diff --git a/admin/class-drawattention-admin.php b/admin/class-drawattention-admin.php
index a5838415..40da6fe3 100644
--- a/admin/class-drawattention-admin.php
+++ b/admin/class-drawattention-admin.php
@@ -26,6 +26,7 @@ class DrawAttention_Admin {
 
 		public $upsell;
 		public $script_handle_whitelist;
+		public $plugin_slug;
 
 		/**
 		 * Instance of this class.
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..cbec3397
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+    "name": "nsquared-team/draw-attention",
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
+    "require-dev": {
+        "dealerdirect/phpcodesniffer-composer-installer": "*",
+        "phpcompatibility/phpcompatibility-wp": "*",
+        "wp-coding-standards/wpcs": "^3.0"
+    }
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 00000000..0468ac84
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,583 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "5d5de8a92f9262f412f4846d91031d5e",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/composer-installer.git",
+                "reference": "4be43904336affa5c2f70744a348312336afd0da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/4be43904336affa5c2f70744a348312336afd0da",
+                "reference": "4be43904336affa5c2f70744a348312336afd0da",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "ext-json": "*",
+                "ext-zip": "*",
+                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "yoast/phpunit-polyfills": "^1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcbf",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCSStandards/composer-installer/issues",
+                "source": "https://github.com/PHPCSStandards/composer-installer"
+            },
+            "time": "2023-01-05T11:28:13+00:00"
+        },
+        {
+            "name": "phpcompatibility/php-compatibility",
+            "version": "9.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+            },
+            "conflict": {
+                "squizlabs/php_codesniffer": "2.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Wim Godden",
+                    "homepage": "https://github.com/wimg",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
+                }
+            ],
+            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
+            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
+            "keywords": [
+                "compatibility",
+                "phpcs",
+                "standards"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibility"
+            },
+            "time": "2019-12-27T09:44:58+00:00"
+        },
+        {
+            "name": "phpcompatibility/phpcompatibility-paragonie",
+            "version": "1.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git",
+                "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/bba5a9dfec7fcfbd679cfaf611d86b4d3759da26",
+                "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26",
+                "shasum": ""
+            },
+            "require": {
+                "phpcompatibility/php-compatibility": "^9.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+                "paragonie/random_compat": "dev-master",
+                "paragonie/sodium_compat": "dev-master"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Wim Godden",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "lead"
+                }
+            ],
+            "description": "A set of rulesets for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by the Paragonie polyfill libraries.",
+            "homepage": "http://phpcompatibility.com/",
+            "keywords": [
+                "compatibility",
+                "paragonie",
+                "phpcs",
+                "polyfill",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie"
+            },
+            "time": "2022-10-25T01:46:02+00:00"
+        },
+        {
+            "name": "phpcompatibility/phpcompatibility-wp",
+            "version": "2.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git",
+                "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5",
+                "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5",
+                "shasum": ""
+            },
+            "require": {
+                "phpcompatibility/php-compatibility": "^9.0",
+                "phpcompatibility/phpcompatibility-paragonie": "^1.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Wim Godden",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "lead"
+                }
+            ],
+            "description": "A ruleset for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by WordPress.",
+            "homepage": "http://phpcompatibility.com/",
+            "keywords": [
+                "compatibility",
+                "phpcs",
+                "standards",
+                "static analysis",
+                "wordpress"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP"
+            },
+            "time": "2022-10-24T09:00:36+00:00"
+        },
+        {
+            "name": "phpcsstandards/phpcsextra",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/PHPCSExtra.git",
+                "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/11d387c6642b6e4acaf0bd9bf5203b8cca1ec489",
+                "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "phpcsstandards/phpcsutils": "^1.0.9",
+                "squizlabs/php_codesniffer": "^3.8.0"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-console-highlighter": "^1.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                "phpcsstandards/phpcsdevcs": "^1.1.6",
+                "phpcsstandards/phpcsdevtools": "^1.2.1",
+                "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "type": "phpcodesniffer-standard",
+            "extra": {
+                "branch-alias": {
+                    "dev-stable": "1.x-dev",
+                    "dev-develop": "1.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHPCSExtra/graphs/contributors"
+                }
+            ],
+            "description": "A collection of sniffs and standards for use with PHP_CodeSniffer.",
+            "keywords": [
+                "PHP_CodeSniffer",
+                "phpcbf",
+                "phpcodesniffer-standard",
+                "phpcs",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCSStandards/PHPCSExtra/issues",
+                "security": "https://github.com/PHPCSStandards/PHPCSExtra/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHPCSExtra"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-12-08T16:49:07+00:00"
+        },
+        {
+            "name": "phpcsstandards/phpcsutils",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
+                "reference": "908247bc65010c7b7541a9551e002db12e9dae70"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/908247bc65010c7b7541a9551e002db12e9dae70",
+                "reference": "908247bc65010c7b7541a9551e002db12e9dae70",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^3.8.0 || 4.0.x-dev@dev"
+            },
+            "require-dev": {
+                "ext-filter": "*",
+                "php-parallel-lint/php-console-highlighter": "^1.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                "phpcsstandards/phpcsdevcs": "^1.1.6",
+                "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0"
+            },
+            "type": "phpcodesniffer-standard",
+            "extra": {
+                "branch-alias": {
+                    "dev-stable": "1.x-dev",
+                    "dev-develop": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHPCSUtils/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHPCSUtils/graphs/contributors"
+                }
+            ],
+            "description": "A suite of utility functions for use with PHP_CodeSniffer",
+            "homepage": "https://phpcsutils.com/",
+            "keywords": [
+                "PHP_CodeSniffer",
+                "phpcbf",
+                "phpcodesniffer-standard",
+                "phpcs",
+                "phpcs3",
+                "standards",
+                "static analysis",
+                "tokens",
+                "utility"
+            ],
+            "support": {
+                "docs": "https://phpcsutils.com/",
+                "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues",
+                "security": "https://github.com/PHPCSStandards/PHPCSUtils/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHPCSUtils"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-12-08T14:50:00+00:00"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
+            },
+            "bin": [
+                "bin/phpcbf",
+                "bin/phpcs"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-01-11T20:47:48+00:00"
+        },
+        {
+            "name": "wp-coding-standards/wpcs",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
+                "reference": "b4caf9689f1a0e4a4c632679a44e638c1c67aff1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/b4caf9689f1a0e4a4c632679a44e638c1c67aff1",
+                "reference": "b4caf9689f1a0e4a4c632679a44e638c1c67aff1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-filter": "*",
+                "ext-libxml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlreader": "*",
+                "php": ">=5.4",
+                "phpcsstandards/phpcsextra": "^1.1.0",
+                "phpcsstandards/phpcsutils": "^1.0.8",
+                "squizlabs/php_codesniffer": "^3.7.2"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "phpcsstandards/phpcsdevtools": "^1.2.0",
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "ext-iconv": "For improved results",
+                "ext-mbstring": "For improved results"
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/WordPress/WordPress-Coding-Standards/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "static analysis",
+                "wordpress"
+            ],
+            "support": {
+                "issues": "https://github.com/WordPress/WordPress-Coding-Standards/issues",
+                "source": "https://github.com/WordPress/WordPress-Coding-Standards",
+                "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/thewpcc/contribute/wp-php-63406",
+                    "type": "custom"
+                }
+            ],
+            "time": "2023-09-14T07:06:09+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.3.0"
+}
diff --git a/draw-attention.php b/draw-attention.php
index a602d6d6..106b7d85 100644
--- a/draw-attention.php
+++ b/draw-attention.php
@@ -9,7 +9,7 @@
 Plugin Name:       Draw Attention
 Plugin URI:        https://wpdrawattention.com
 Description:       Create interactive images in WordPress
-Version:           2.0.11
+Version:           2.0.21
 Author:            N Squared
 Author URI:        https://nsqua.red
 Text Domain:       draw-attention
@@ -24,7 +24,8 @@
 	die;
 }
 
-/*----------------------------------------------------------------------------*
+/*
+----------------------------------------------------------------------------*
  * Public-Facing Functionality
  *----------------------------------------------------------------------------*/
 
@@ -34,7 +35,7 @@
  * - replace `class-drawattention.php` with the name of the plugin's class file
  *
  */
-require_once( plugin_dir_path( __FILE__ ) . 'public/class-drawattention.php' );
+require_once plugin_dir_path( __FILE__ ) . 'public/class-drawattention.php';
 
 /*
  * Register hooks that are fired when the plugin is activated or deactivated.
@@ -56,7 +57,8 @@
  */
 add_action( 'plugins_loaded', array( 'DrawAttention', 'get_instance' ) );
 
-/*----------------------------------------------------------------------------*
+/*
+----------------------------------------------------------------------------*
  * Dashboard and Administrative Functionality
  *----------------------------------------------------------------------------*/
 
@@ -78,7 +80,7 @@
  */
 if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
 
-	require_once( plugin_dir_path( __FILE__ ) . 'admin/class-drawattention-admin.php' );
+	require_once plugin_dir_path( __FILE__ ) . 'admin/class-drawattention-admin.php';
 	add_action( 'plugins_loaded', array( 'DrawAttention_Admin', 'get_instance' ) );
 
 }
@@ -90,13 +92,12 @@
  * Please check your list of active plugins to see if you have the Responsive Image Maps plugin installed and activated. If so, we regretfully recommend deactivating this plugin.
  * It has been abandoned and has not been updated since 2015.
  * Here is a link to our public ticket asking the plugin author to update their plugin: https://wordpress.org/support/topic/conflict-with-draw-attention-plugin-2/
- * 
+ *
  * Our final solution is to dequeue the Responsive Image Maps plugin’s script if it is active.
  * And tell WordPress to not load RIM plugin
- * 
  */
-function da_dequeue_conflicting_rim_scripts(){
-	
+function da_dequeue_conflicting_rim_scripts() {
+
 	if ( ! function_exists( 'pn_rim_enqueue_scripts' ) ) {
 		return;
 	}
@@ -104,14 +105,14 @@ function da_dequeue_conflicting_rim_scripts(){
 	wp_dequeue_script( 'jQuery.rwd_image_maps' );
 }
 
-function da_disable_rim_plugin(){
-	
+function da_disable_rim_plugin() {
+
 	if ( ! function_exists( 'pn_rim_enqueue_scripts' ) ) {
 		return;
 	}
-	
+
 	remove_action( 'wp_head', 'pn_rim_header_scripts' );
 }
 
-add_action('init', 'da_disable_rim_plugin');
-add_action('wp_enqueue_scripts', 'da_dequeue_conflicting_rim_scripts', 999 );
\ No newline at end of file
+add_action( 'init', 'da_disable_rim_plugin' );
+add_action( 'wp_enqueue_scripts', 'da_dequeue_conflicting_rim_scripts', 999 );
diff --git a/external/actions-scripts/format-changelog.php b/external/actions-scripts/format-changelog.php
new file mode 100644
index 00000000..3577b861
--- /dev/null
+++ b/external/actions-scripts/format-changelog.php
@@ -0,0 +1,99 @@
+<?php
+
+// Note: this script is expected to return a stringified JSON representation of the slack message
+// avoid any echo or print commands other than the final one
+
+define( 'CHANGELOG_JSON', getenv( 'CHANGELOG_JSON' ) );
+define( 'CHANGELOG_STRING', getenv( 'CHANGELOG_STRING' ) );
+define( 'PROJECT', getenv( 'PROJECT' ) );
+
+$values = getopt(
+	'',
+	array(
+		'version:',
+		'repo:',
+		'out:',
+	)
+);
+
+if ( ! isset( $values['version'] ) ) {
+	echo 'version is empty!';
+	exit( 1 );
+}
+
+if ( ! isset( $values['repo'] ) ) {
+	echo 'repo is empty!';
+	exit( 1 );
+}
+
+if ( ! isset( $values['out'] ) ) {
+	echo 'out is empty! please specify output filename';
+	exit( 1 );
+}
+
+$slack_payload_blocks = array(
+	array(
+		'type' => 'divider',
+	),
+	array(
+		'type' => 'header',
+		'text' => array(
+			'type' => 'plain_text',
+			'text' => PROJECT . " GitHub Release.\n",
+		),
+	),
+	array(
+		'type' => 'section',
+		'text' => array(
+			'type' => 'mrkdwn',
+			'text' => "You can <https://github.com/{$values['repo']}/releases/tag/{$values['version']}|check the release here>.\n",
+		),
+	),
+	array(
+		'type' => 'section',
+		'text' => array(
+			'type' => 'mrkdwn',
+			'text' => ":white_check_mark: 4.{$values['version']}\n:white_check_mark: 3.{$values['version']}\n:white_check_mark: 2.{$values['version']}\n:no_entry: 1.{$values['version']} (will be released separately)\n",
+		),
+	),
+);
+
+$pattern = '/PR:#(\d+)(.*)/';
+
+try {
+	foreach ( json_decode( CHANGELOG_JSON ) as $key => $array_of_prs ) {
+		$formatted_key          = str_replace( '##', '', $key );
+		$slack_payload_blocks[] = array(
+			'type' => 'header',
+			'text' => array(
+				'type' => 'plain_text',
+				'text' => $formatted_key,
+			),
+		);
+
+		foreach ( $array_of_prs as $pr ) {
+			preg_match( $pattern, $pr, $matches );
+			$pr_number              = $matches[1];
+			$pr_title               = $matches[2];
+			$slack_payload_blocks[] = array(
+				'type' => 'section',
+				'text' => array(
+					'type' => 'mrkdwn',
+					'text' => "<https://github.com/{$values['repo']}/pull/{$pr_number}|$pr_number> $pr_title",
+				),
+			);
+		}
+	}
+} catch ( \Throwable $th ) {
+	echo 'Failed to parse CHANGELOG_JSON';
+}
+
+$slack_payload = array(
+	'text'   => "\n\n\n" . PROJECT . " GitHub Release {$values['version']}\nChangelog:\n" . CHANGELOG_STRING,
+	'blocks' => $slack_payload_blocks,
+);
+
+$json = json_encode( $slack_payload, JSON_PRETTY_PRINT );
+$fp   = fopen( $values['out'], 'w' );
+fwrite( $fp, $json );
+fclose( $fp );
diff --git a/package.json b/package.json
index 6a359e38..8dbc12f9 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,21 @@
 {
   "name": "draw-attention",
   "title": "Draw Attention",
-  "version": "2.0.11",
+  "version": "2.0.21",
   "description": "Create interactive image maps for your website",
   "author": {
     "name": "NSquared",
     "url": "https://nsqua.red"
   },
   "devDependencies": {
+    "eslint": "^8.53.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-config-prettier": "^9.0.0",
+    "babel-eslint": "^10.1.0",
     "grunt": "^1.6.1",
     "grunt-cli": "^1.4.3",
-    "grunt-contrib-copy": "latest",
     "grunt-contrib-clean": "latest",
+    "grunt-contrib-copy": "latest",
     "grunt-text-replace": "latest",
     "load-grunt-tasks": "^5.1.0"
   }
diff --git a/public/assets/js/leaflet.responsive.popup.js b/public/assets/js/leaflet.responsive.popup.js
index 7070f883..16e4a9c4 100644
--- a/public/assets/js/leaflet.responsive.popup.js
+++ b/public/assets/js/leaflet.responsive.popup.js
@@ -1,270 +1,360 @@
-/*
- leaflet.responsive.popup 0.6.4
- (c) 2019 https://github.com/yafred
-*/
-
-L.ResponsivePopup = L.Popup.extend({
-
-	options: {
-		hasTip: true
-		/*
-		 * Inherited from L.Popup
-		 *
-		 * - offset
-		 *
-		 * - autoPanPadding
-		 * - autoPanPaddingTopLeft
-		 * - autoPanPaddingBottomRight
-		 */
-	},
-
-	/**
-	 * Overrides https://github.com/Leaflet/Leaflet/blob/v1.3.4/src/layer/Popup.js#L176
-	 * This is to add hasTip option
-	 */
-	_initLayout: function () {
-
-		var prefix = 'leaflet-rrose',
-		    container = this._container = L.DomUtil.create('div',
-			prefix + ' ' + (this.options.className || '') +
-			' leaflet-zoom-animated');
-
-		var wrapper = this._wrapper = L.DomUtil.create('div', prefix + '-content-wrapper', container);
-		this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
-
-		L.DomEvent.disableClickPropagation(wrapper);
-		L.DomEvent.disableScrollPropagation(this._contentNode);
-		L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation);
-
-		this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
-  		if(!this.options.hasTip) {
-  			this._tipContainer.style.visibility = 'hidden';
-  		}
-		this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
-
-		if (this.options.closeButton) {
-			var closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);
-			closeButton.href = '#close';
-			closeButton.innerHTML = '&#215;';
-
-			L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
-		}
-	},
-
-
-
-	/**
-	 * Overrides https://github.com/Leaflet/Leaflet/blob/v1.3.4/src/layer/DivOverlay.js#L178
-	 */
-	_updatePosition: function () {
-
-		if (!this._map) { return; }
-
-		var pos = this._map.latLngToLayerPoint(this._latlng),
-	        basePoint = this._map.layerPointToContainerPoint(pos),
-	        containerWidth = this._container.offsetWidth,
-	        containerHeight = this._container.offsetHeight,
-		    padding = L.point(this.options.autoPanPadding),
-		    paddingTL = L.point(this.options.autoPanPaddingTopLeft || padding),
-		    paddingBR = L.point(this.options.autoPanPaddingBottomRight || padding),
-	        mapSize = this._map.getSize(),
-	        anchor = this._getAnchor(),  // popup anchor
-        	offset = L.point(this.options.offset); // offset relative to anchor (option from L.DivOverlay. We only use absolute values).
-
-		// Leaflet default dimensions (should not be hard coded in the future)
-  		var tipHeight = 11; //px
-  		var tipWidth = 22; //px
-  		var containerRadius = 12; //px
-
-  		// Tweak offset to include tip dimensions
-  		var offsetX = Math.abs(offset.x);
-   		var offsetY = Math.abs(offset.y);
-   		if(this.options.hasTip) {
-  			offsetX += tipHeight;
-  			offsetY += tipHeight;
-
-  			// clear CSS
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-north');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-south');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-east');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-west');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-north-east');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-north-west');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-south-east');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-south-west');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-east-north');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-east-south');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-west-north');
-  			L.DomUtil.removeClass(this._container, 'leaflet-resp-popup-west-south');
-  			// this._container.style.display = 'initial'; // this does not work
-  		}
-
-		// Where can we fit the popup ?
-		var canGoTop = true,
-		    canGoBottom = true,
-		    canGoLeft = true,
-		    canGoRight = true,
-		    containerPos = false;
-
-		if(basePoint.y + anchor.y - offsetY - containerHeight - Math.abs(paddingTL.y) < 0) {
-			canGoTop = false;
-		}
-		if(basePoint.y + anchor.y + offsetY + containerHeight + Math.abs(paddingBR.y) > mapSize.y) {
-			canGoBottom = false;
-		}
-		if(basePoint.x + anchor.x - offsetX - containerWidth - Math.abs(paddingTL.x) < 0) {
-			canGoLeft = false;
-		}
-		if(basePoint.x + anchor.x + offsetX + containerWidth + Math.abs(paddingBR.x) > mapSize.x) {
-			canGoRight = false;
-		}
-
-		// manage overflows
-		var subtractX = containerWidth / 2 - anchor.x,
-		    subtractY = containerHeight / 2 - anchor.y;
-
-		if(canGoTop || canGoBottom) {
-			var containerLeft = basePoint.x + anchor.x - (containerWidth / 2);
-			var containerRight = basePoint.x + anchor.x + (containerWidth / 2);
-			if(containerLeft < Math.abs(paddingTL.x)) { // left overflow
-				subtractX = containerWidth / 2 - anchor.x - Math.abs(paddingTL.x) + containerLeft;
-			}
-			if(containerRight > mapSize.x - Math.abs(paddingBR.x)) { // right overflow
-				subtractX = containerWidth / 2 - anchor.x + containerRight - mapSize.x + Math.abs(paddingBR.x);
-			}
-		}
-		if(canGoLeft || canGoRight) {
-			var containerTop = basePoint.y + anchor.y - (containerHeight / 2);
-			var containerBottom = basePoint.y + anchor.y + (containerHeight / 2);
-			if(containerTop < Math.abs(paddingTL.y)) { // top overflow
-				subtractY = containerHeight / 2 - anchor.y - Math.abs(paddingTL.y) + containerTop;
-			}
-			if(containerBottom > mapSize.y - Math.abs(paddingBR.y)) { // bottom overflow
-				subtractY = containerHeight / 2 - anchor.y + containerBottom - mapSize.y + Math.abs(paddingBR.y);
-			}
-		}
-
-		// position the popup (order of preference is: top, left, bottom, right, centerOnMap)
-		if(canGoTop) {
-			containerPos = pos.subtract(L.point(subtractX, -anchor.y + containerHeight + offsetY, true));
-			if(this.options.hasTip) {
-				if(basePoint.x + anchor.x < paddingTL.x + containerRadius + tipWidth/2) {
-					containerPos.x = pos.x + anchor.x;
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-north-east');
-					this._tipContainer.style.top = containerHeight + 'px';
-					this._tipContainer.style.left = '0px';
-				}
-				else if(basePoint.x + anchor.x > mapSize.x - paddingBR.x - containerRadius - tipWidth/2) {
-					containerPos.x = pos.x + anchor.x - containerWidth;
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-north-west');
-					this._tipContainer.style.top = containerHeight + 'px';
-					this._tipContainer.style.left = containerWidth + 'px';
-				}
-				else {
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-north');
-					this._tipContainer.style.top = containerHeight + 'px';
-					this._tipContainer.style.left = (pos.x + anchor.x - containerPos.x) + 'px';
-				}
-			}
-		}
-		else if(canGoLeft) {
-			containerPos = pos.subtract(L.point(-anchor.x + containerWidth + offsetX, subtractY, true));
-			if(this.options.hasTip) {
-				if(basePoint.y + anchor.y < paddingTL.y + containerRadius + tipWidth/2) {
-					containerPos.y = pos.y + anchor.y;
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-west-south');
-					this._tipContainer.style.top = '0px';
-					this._tipContainer.style.left = containerWidth + 'px';
-				}
-				else if(basePoint.y + anchor.y > mapSize.y - paddingBR.y - containerRadius - tipWidth/2) {
-					containerPos.y = pos.y + anchor.y - containerHeight;
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-west-north');
-					this._tipContainer.style.top = containerHeight + 'px';
-					this._tipContainer.style.left = containerWidth + 'px';
-				}
-				else {
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-west');
-					this._tipContainer.style.top = (pos.y + anchor.y - containerPos.y) + 'px';
-					this._tipContainer.style.left = containerWidth + 'px';
-				}
-			}
-		}
-		else if(canGoBottom) {
-			containerPos = pos.subtract(L.point(subtractX, -anchor.y - offsetY, true));
-			if(this.options.hasTip) {
-				if(basePoint.x + anchor.x < paddingTL.x + containerRadius + tipWidth/2) {
-					containerPos.x = pos.x + anchor.x;
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-south-east');
-					this._tipContainer.style.top = '1px';
-					this._tipContainer.style.left = '0px';
-				}
-				else if(basePoint.x + anchor.x > mapSize.x - paddingBR.x - containerRadius - tipWidth/2) {
-					containerPos.x = pos.x + anchor.x - containerWidth;
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-south-west');
-					this._tipContainer.style.top = '0px';
-					this._tipContainer.style.left = containerWidth + 'px';
-				}
-				else {
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-south');
-					this._tipContainer.style.top = '2px';
-					this._tipContainer.style.left = (pos.x + anchor.x - containerPos.x) + 'px';
-				}
-			}
-		}
-		else if(canGoRight) {
-			containerPos = pos.subtract(L.point(-anchor.x - offsetX, subtractY, true));
-			if(this.options.hasTip) {
-				if(basePoint.y + anchor.y < paddingTL.y + containerRadius + tipWidth/2) {
-					containerPos.y = pos.y + anchor.y;
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-east-south');
-					this._tipContainer.style.top = '0px';
-					this._tipContainer.style.left = '0px';
-				}
-				else if(basePoint.y + anchor.y > mapSize.y - paddingBR.y - containerRadius - tipWidth/2) {
-					containerPos.y = pos.y + anchor.y - containerHeight;
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-east-north');
-					this._tipContainer.style.top = containerHeight + 'px';
-					this._tipContainer.style.left = '0px';
-				}
-				else {
-					L.DomUtil.addClass(this._container, 'leaflet-resp-popup-east');
-					this._tipContainer.style.top = (pos.y + anchor.y - containerPos.y) + 'px';
-					this._tipContainer.style.left = '4px';
-				}
-			}
-		}
-		else {
-			var pos = this._map.latLngToLayerPoint(this._map.getCenter());
-			containerPos = pos.subtract(L.point(containerWidth / 2, containerHeight / 2));
-			if(this.options.hasTip) {
-				// this._tipContainer.style.display = 'none'; // this does not work
-			}
-		}
-
-
-		// if point is not visible, just hide the popup
-		if(basePoint.x < 0 || basePoint.y < 0 || basePoint.x > mapSize.x || basePoint.y > mapSize.y) {
-			// this._container.style.display = 'none';  // this does not work
-		}
-
-		// if container is too big, just hide the popup
-		if(containerWidth - Math.abs(paddingTL.x) - Math.abs(paddingBR.x) > mapSize.x || containerHeight - Math.abs(paddingTL.y) - Math.abs(paddingBR.y) > mapSize.y) {
-			// this._container.style.display = 'none'; // this does not work
-		}
-
-		L.DomUtil.setPosition(this._container, containerPos);
-	}
-
-});
-
-
-//Instantiates a `ResponsivePopup` object given an optional `options` object that describes its appearance and location and an optional `source` object that is used to tag the popup with a reference to the Layer to which it refers.
-L.responsivePopup = function (options, source) {
-	return new L.ResponsivePopup(options, source);
-};
-
-//Adds Angular support
-if( typeof exports === 'object' && typeof module !== 'undefined') {
-	exports.responsivePopup = L.responsivePopup;
-	exports.ResponsivePopup = L.ResponsivePopup;
-}
\ No newline at end of file
+/*
+ leaflet.responsive.popup 0.6.4
+ (c) 2019 https://github.com/yafred
+*/
+
+L.ResponsivePopup = L.Popup.extend({
+  options: {
+    hasTip: true,
+    /*
+     * Inherited from L.Popup
+     *
+     * - offset
+     *
+     * - autoPanPadding
+     * - autoPanPaddingTopLeft
+     * - autoPanPaddingBottomRight
+     */
+  },
+
+  /**
+   * Overrides https://github.com/Leaflet/Leaflet/blob/v1.3.4/src/layer/Popup.js#L176
+   * This is to add hasTip option
+   */
+  _initLayout: function () {
+    var prefix = "leaflet-rrose",
+      container = (this._container = L.DomUtil.create(
+        "div",
+        prefix +
+          " " +
+          (this.options.className || "") +
+          " leaflet-zoom-animated",
+      ));
+
+    var wrapper = (this._wrapper = L.DomUtil.create(
+      "div",
+      prefix + "-content-wrapper",
+      container,
+    ));
+    this._contentNode = L.DomUtil.create("div", prefix + "-content", wrapper);
+
+    L.DomEvent.disableClickPropagation(wrapper);
+    L.DomEvent.disableScrollPropagation(this._contentNode);
+    L.DomEvent.on(wrapper, "contextmenu", L.DomEvent.stopPropagation);
+
+    this._tipContainer = L.DomUtil.create(
+      "div",
+      prefix + "-tip-container",
+      container,
+    );
+    if (!this.options.hasTip) {
+      this._tipContainer.style.visibility = "hidden";
+    }
+    this._tip = L.DomUtil.create("div", prefix + "-tip", this._tipContainer);
+
+    if (this.options.closeButton) {
+      var closeButton = (this._closeButton = L.DomUtil.create(
+        "a",
+        prefix + "-close-button",
+        container,
+      ));
+      closeButton.href = "#close";
+      closeButton.innerHTML = "&#215;";
+
+      L.DomEvent.on(closeButton, "click", this._onCloseButtonClick, this);
+    }
+  },
+
+  /**
+   * Overrides https://github.com/Leaflet/Leaflet/blob/v1.3.4/src/layer/DivOverlay.js#L178
+   */
+  _updatePosition: function () {
+    if (!this._map) {
+      return;
+    }
+
+    var pos = this._map.latLngToLayerPoint(this._latlng),
+      basePoint = this._map.layerPointToContainerPoint(pos),
+      containerWidth = this._container.offsetWidth,
+      containerHeight = this._container.offsetHeight,
+      padding = L.point(this.options.autoPanPadding),
+      paddingTL = L.point(this.options.autoPanPaddingTopLeft || padding),
+      paddingBR = L.point(this.options.autoPanPaddingBottomRight || padding),
+      mapSize = this._map.getSize(),
+      anchor = this._getAnchor(), // popup anchor
+      offset = L.point(this.options.offset); // offset relative to anchor (option from L.DivOverlay. We only use absolute values).
+
+    // Leaflet default dimensions (should not be hard coded in the future)
+    var tipHeight = 11; //px
+    var tipWidth = 22; //px
+    var containerRadius = 12; //px
+
+    // Tweak offset to include tip dimensions
+    var offsetX = Math.abs(offset.x);
+    var offsetY = Math.abs(offset.y);
+    if (this.options.hasTip) {
+      offsetX += tipHeight;
+      offsetY += tipHeight;
+
+      // clear CSS
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-north");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-south");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-east");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-west");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-north-east");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-north-west");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-south-east");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-south-west");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-east-north");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-east-south");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-west-north");
+      L.DomUtil.removeClass(this._container, "leaflet-resp-popup-west-south");
+      // this._container.style.display = 'initial'; // this does not work
+    }
+
+    // Where can we fit the popup ?
+    var canGoTop = true,
+      canGoBottom = true,
+      canGoLeft = true,
+      canGoRight = true,
+      containerPos = false;
+
+    if (
+      basePoint.y +
+        anchor.y -
+        offsetY -
+        containerHeight -
+        Math.abs(paddingTL.y) <
+      0
+    ) {
+      canGoTop = false;
+    }
+    if (
+      basePoint.y +
+        anchor.y +
+        offsetY +
+        containerHeight +
+        Math.abs(paddingBR.y) >
+      mapSize.y
+    ) {
+      canGoBottom = false;
+    }
+    if (
+      basePoint.x +
+        anchor.x -
+        offsetX -
+        containerWidth -
+        Math.abs(paddingTL.x) <
+      0
+    ) {
+      canGoLeft = false;
+    }
+    if (
+      basePoint.x +
+        anchor.x +
+        offsetX +
+        containerWidth +
+        Math.abs(paddingBR.x) >
+      mapSize.x
+    ) {
+      canGoRight = false;
+    }
+
+    // manage overflows
+    var subtractX = containerWidth / 2 - anchor.x,
+      subtractY = containerHeight / 2 - anchor.y;
+
+    if (canGoTop || canGoBottom) {
+      var containerLeft = basePoint.x + anchor.x - containerWidth / 2;
+      var containerRight = basePoint.x + anchor.x + containerWidth / 2;
+      if (containerLeft < Math.abs(paddingTL.x)) {
+        // left overflow
+        subtractX =
+          containerWidth / 2 - anchor.x - Math.abs(paddingTL.x) + containerLeft;
+      }
+      if (containerRight > mapSize.x - Math.abs(paddingBR.x)) {
+        // right overflow
+        subtractX =
+          containerWidth / 2 -
+          anchor.x +
+          containerRight -
+          mapSize.x +
+          Math.abs(paddingBR.x);
+      }
+    }
+    if (canGoLeft || canGoRight) {
+      var containerTop = basePoint.y + anchor.y - containerHeight / 2;
+      var containerBottom = basePoint.y + anchor.y + containerHeight / 2;
+      if (containerTop < Math.abs(paddingTL.y)) {
+        // top overflow
+        subtractY =
+          containerHeight / 2 - anchor.y - Math.abs(paddingTL.y) + containerTop;
+      }
+      if (containerBottom > mapSize.y - Math.abs(paddingBR.y)) {
+        // bottom overflow
+        subtractY =
+          containerHeight / 2 -
+          anchor.y +
+          containerBottom -
+          mapSize.y +
+          Math.abs(paddingBR.y);
+      }
+    }
+
+    // position the popup (order of preference is: top, left, bottom, right, centerOnMap)
+    if (canGoTop) {
+      containerPos = pos.subtract(
+        L.point(subtractX, -anchor.y + containerHeight + offsetY, true),
+      );
+      if (this.options.hasTip) {
+        if (
+          basePoint.x + anchor.x <
+          paddingTL.x + containerRadius + tipWidth / 2
+        ) {
+          containerPos.x = pos.x + anchor.x;
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-north-east");
+          this._tipContainer.style.top = containerHeight + "px";
+          this._tipContainer.style.left = "0px";
+        } else if (
+          basePoint.x + anchor.x >
+          mapSize.x - paddingBR.x - containerRadius - tipWidth / 2
+        ) {
+          containerPos.x = pos.x + anchor.x - containerWidth;
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-north-west");
+          this._tipContainer.style.top = containerHeight + "px";
+          this._tipContainer.style.left = containerWidth + "px";
+        } else {
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-north");
+          this._tipContainer.style.top = containerHeight + "px";
+          this._tipContainer.style.left =
+            pos.x + anchor.x - containerPos.x + "px";
+        }
+      }
+    } else if (canGoLeft) {
+      containerPos = pos.subtract(
+        L.point(-anchor.x + containerWidth + offsetX, subtractY, true),
+      );
+      if (this.options.hasTip) {
+        if (
+          basePoint.y + anchor.y <
+          paddingTL.y + containerRadius + tipWidth / 2
+        ) {
+          containerPos.y = pos.y + anchor.y;
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-west-south");
+          this._tipContainer.style.top = "0px";
+          this._tipContainer.style.left = containerWidth + "px";
+        } else if (
+          basePoint.y + anchor.y >
+          mapSize.y - paddingBR.y - containerRadius - tipWidth / 2
+        ) {
+          containerPos.y = pos.y + anchor.y - containerHeight;
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-west-north");
+          this._tipContainer.style.top = containerHeight + "px";
+          this._tipContainer.style.left = containerWidth + "px";
+        } else {
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-west");
+          this._tipContainer.style.top =
+            pos.y + anchor.y - containerPos.y + "px";
+          this._tipContainer.style.left = containerWidth + "px";
+        }
+      }
+    } else if (canGoBottom) {
+      containerPos = pos.subtract(
+        L.point(subtractX, -anchor.y - offsetY, true),
+      );
+      if (this.options.hasTip) {
+        if (
+          basePoint.x + anchor.x <
+          paddingTL.x + containerRadius + tipWidth / 2
+        ) {
+          containerPos.x = pos.x + anchor.x;
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-south-east");
+          this._tipContainer.style.top = "1px";
+          this._tipContainer.style.left = "0px";
+        } else if (
+          basePoint.x + anchor.x >
+          mapSize.x - paddingBR.x - containerRadius - tipWidth / 2
+        ) {
+          containerPos.x = pos.x + anchor.x - containerWidth;
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-south-west");
+          this._tipContainer.style.top = "0px";
+          this._tipContainer.style.left = containerWidth + "px";
+        } else {
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-south");
+          this._tipContainer.style.top = "2px";
+          this._tipContainer.style.left =
+            pos.x + anchor.x - containerPos.x + "px";
+        }
+      }
+    } else if (canGoRight) {
+      containerPos = pos.subtract(
+        L.point(-anchor.x - offsetX, subtractY, true),
+      );
+      if (this.options.hasTip) {
+        if (
+          basePoint.y + anchor.y <
+          paddingTL.y + containerRadius + tipWidth / 2
+        ) {
+          containerPos.y = pos.y + anchor.y;
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-east-south");
+          this._tipContainer.style.top = "0px";
+          this._tipContainer.style.left = "0px";
+        } else if (
+          basePoint.y + anchor.y >
+          mapSize.y - paddingBR.y - containerRadius - tipWidth / 2
+        ) {
+          containerPos.y = pos.y + anchor.y - containerHeight;
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-east-north");
+          this._tipContainer.style.top = containerHeight + "px";
+          this._tipContainer.style.left = "0px";
+        } else {
+          L.DomUtil.addClass(this._container, "leaflet-resp-popup-east");
+          this._tipContainer.style.top =
+            pos.y + anchor.y - containerPos.y + "px";
+          this._tipContainer.style.left = "4px";
+        }
+      }
+    } else {
+      var pos = this._map.latLngToLayerPoint(this._map.getCenter());
+      containerPos = pos.subtract(
+        L.point(containerWidth / 2, containerHeight / 2),
+      );
+      if (this.options.hasTip) {
+        // this._tipContainer.style.display = 'none'; // this does not work
+      }
+    }
+
+    // if point is not visible, just hide the popup
+    if (
+      basePoint.x < 0 ||
+      basePoint.y < 0 ||
+      basePoint.x > mapSize.x ||
+      basePoint.y > mapSize.y
+    ) {
+      // this._container.style.display = 'none';  // this does not work
+    }
+
+    // if container is too big, just hide the popup
+    if (
+      containerWidth - Math.abs(paddingTL.x) - Math.abs(paddingBR.x) >
+        mapSize.x ||
+      containerHeight - Math.abs(paddingTL.y) - Math.abs(paddingBR.y) >
+        mapSize.y
+    ) {
+      // this._container.style.display = 'none'; // this does not work
+    }
+
+    L.DomUtil.setPosition(this._container, containerPos);
+  },
+});
+
+//Instantiates a `ResponsivePopup` object given an optional `options` object that describes its appearance and location and an optional `source` object that is used to tag the popup with a reference to the Layer to which it refers.
+L.responsivePopup = function (options, source) {
+  return new L.ResponsivePopup(options, source);
+};
+
+//Adds Angular support
+if (typeof exports === "object" && typeof module !== "undefined") {
+  exports.responsivePopup = L.responsivePopup;
+  exports.ResponsivePopup = L.ResponsivePopup;
+}
diff --git a/public/assets/js/public.js b/public/assets/js/public.js
index 1fc931b5..473bbafd 100644
--- a/public/assets/js/public.js
+++ b/public/assets/js/public.js
@@ -1,800 +1,893 @@
-;(function ($, hotspots, undefined) {
-	"use strict";
-
-	var ua = window.navigator.userAgent,
-		isiOS = !!ua.match(/iPad/i) || !!ua.match(/iPhone/i),
-		isWebkit = !!ua.match(/WebKit/i),
-		isWebkitiOS = isiOS && isWebkit,
-		isMobileSafari = isiOS && isWebkit && !ua.match(/CriOS/i),
-		getBrowserVersion = function(){
-			var temp,
-				M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
-
-			M = M[2] ? [M[1], M[2]] : [navigator.appName, navigator.appVersion, '-?'];
-    	if ((temp = ua.match(/version\/(\d+)/i)) != null) {
-    		M.splice(1, 1, temp[1]);
-    	}
-    	return parseInt(M[1]);
-		}
-
-	// Store all the leaflets on the page in an array for access later
-	var leaflets = [];
-
-	// Store all image maps on the page in an object for access later
-	var imageMaps = {};
-
-	// Store all the more info area hotspots in an object for access later
-	hotspots.infoSpots = {};
-
-	var mapSetup = function(){
-		$('.da-error').hide();
-		$('.hotspot-info').addClass('da-hidden');
-
-		var images = $('img.hotspots-image, picture.hotspots-image img'); // Select images as well as images inside picture elements
-
-		images.each(function(){
-			var img = $(this);
-
-			var tester = new Image();
-
-			tester.onload = function(){
-				markLoaded(img);
-				moreInfoSetup(img);
-				leafletSetup(img);
-			};
-			tester.src = img.attr('src');
-		});
-
-		if (isMobileSafari) {
-			window.onpageshow = function(event){
-				if (event.persisted) {
-					window.location.reload();
-				}
-			};
-		}
-	};
-
-	var markLoaded = function(img) {
-		img.data('status', 'loaded');
-		var container = img.parents('.hotspots-container').addClass('loaded');
-		img.attr('aria-hidden', true);
-	};
-
-	var stopAudioVideo = function(el) {
-    var iframe = el.querySelector( 'iframe[src*=youtube]');
-    var video = el.querySelector( 'video' );
-    var audio = el.querySelector( 'audio' );
+(function ($, hotspots, undefined) {
+  "use strict";
+
+  var Leaflet = L.noConflict();
+
+  var ua = window.navigator.userAgent,
+    isiOS = !!ua.match(/iPad/i) || !!ua.match(/iPhone/i),
+    isWebkit = !!ua.match(/WebKit/i),
+    isWebkitiOS = isiOS && isWebkit,
+    isMobileSafari = isiOS && isWebkit && !ua.match(/CriOS/i),
+    getBrowserVersion = function () {
+      var temp,
+        M =
+          ua.match(
+            /(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i,
+          ) || [];
+
+      M = M[2] ? [M[1], M[2]] : [navigator.appName, navigator.appVersion, "-?"];
+      if ((temp = ua.match(/version\/(\d+)/i)) != null) {
+        M.splice(1, 1, temp[1]);
+      }
+      return parseInt(M[1]);
+    };
+
+  // Store all the leaflets on the page in an array for access later
+  var leaflets = [];
+
+  // Store all image maps on the page in an object for access later
+  var imageMaps = {};
+
+  // Store all the more info area hotspots in an object for access later
+  hotspots.infoSpots = {};
+
+  var mapSetup = function () {
+    $(".da-error").hide();
+    $(".hotspot-info").addClass("da-hidden");
+
+    var images = $("img.hotspots-image, picture.hotspots-image img"); // Select images as well as images inside picture elements
+
+    images.each(function () {
+      var img = $(this);
+
+      var tester = new Image();
+
+      tester.onload = function () {
+        markLoaded(img);
+        moreInfoSetup(img);
+        leafletSetup(img);
+      };
+      tester.src = img.attr("src");
+    });
+
+    if (isMobileSafari) {
+      window.onpageshow = function (event) {
+        if (event.persisted) {
+          window.location.reload();
+        }
+      };
+    }
+  };
+
+  var markLoaded = function (img) {
+    img.data("status", "loaded");
+    var container = img.parents(".hotspots-container").addClass("loaded");
+    img.attr("aria-hidden", true);
+  };
+
+  var stopAudioVideo = function (el) {
+    var iframe = el.querySelector("iframe[src*=youtube]");
+    var video = el.querySelector("video");
+    var audio = el.querySelector("audio");
     if (iframe) {
-    	var iframeSrc = iframe.src;
-    	iframe.src = iframeSrc;
+      var iframeSrc = iframe.src;
+      iframe.src = iframeSrc;
     }
     if (video) {
-    	video.pause();
+      video.pause();
     }
     if (audio) {
-    	audio.pause();
+      audio.pause();
+    }
+  };
+
+  var moreInfoSetup = function (img) {
+    var container = img.parents(".hotspots-container");
+
+    if (container.data("layout") == "tooltip") {
+      return;
+    }
+
+    if (container.data("layout") == "lightbox") {
+      lightboxSetup(container, img);
+      return;
+    }
+
+    infoboxSetup(container, img);
+  };
+
+  var infoboxSetup = function (container, img) {
+    var initial = container.find(".hotspot-initial");
+    var content = container.find(".hotspots-placeholder");
+    initial.addClass("visible");
+    container.on("active.responsilight inactive.responsilight", function (e) {
+      var data = $(e.target).data("areaData");
+      var info;
+      if (e.type === "active") {
+        info = $(data.href);
+      } else {
+        info = initial;
+      }
+
+      var visibleContent = content.children(".visible");
+      stopAudioVideo(visibleContent.get(0));
+      visibleContent.removeClass("visible");
+      info.removeClass("da-hidden").addClass("visible").appendTo(content);
+
+      // Check for an embedded video player
+      var video = info.find(".wp-video");
+      if (video.length) {
+        if (!info.data("video-resized")) {
+          info.data("video-resized", true);
+          window.dispatchEvent(new Event("resize"));
+        }
+      }
+    });
+  };
+
+  var lightboxSetup = function (container, img) {
+    container.on("active.responsilight", function (e) {
+      var data = $(e.target).data("areaData"),
+        info = $(data.href),
+        container = info.parent(),
+        target = $(e.target),
+        currentLightbox = $(".featherlight");
+
+      if (e.type === "active" && currentLightbox.length === 0) {
+        $.featherlight('<div class="hotspot-info"></div>', {
+          closeLabel: drawattentionData.closeLabel,
+          closeSpeed: 250,
+          closeOnEsc: false,
+          afterContent: function () {
+            var content = $(".featherlight-inner"),
+              lb = $(".featherlight-content"),
+              mapNo = img.data("id");
+
+            info.appendTo(content).show();
+            lb.addClass("lightbox-" + mapNo);
+
+            // Fix accessibility issue - links not focusable by keyboard
+            var untabbables = info.find("a[tabindex=-1]");
+            untabbables.attr("tabindex", 0);
+
+            setTimeout(function () {
+              var img = content.find("img"),
+                contentHeight = content.get(0).scrollHeight,
+                imgHeight = img.height(),
+                lbHeight = lb.outerHeight();
+
+              if (contentHeight > lbHeight) {
+                var diff = contentHeight - lbHeight + 50,
+                  newHeight = imgHeight - diff,
+                  minHeight = $(window).innerHeight() / 2;
+
+                newHeight = newHeight < minHeight ? minHeight : newHeight;
+
+                var naturalHeight = img.prop("naturalHeight");
+
+                if (newHeight < naturalHeight) {
+                  img.css({ width: "auto" });
+                  img.animate(
+                    {
+                      height: newHeight,
+                    },
+                    200,
+                  );
+                }
+              }
+            }, 100);
+
+            lightboxAnchorLinks(content, target);
+            window.dispatchEvent(new Event("resize")); // Trigger window resize event for [video] shortcode JS
+          },
+          afterOpen: function () {
+            $("body").on("keyup", documentEsc);
+          },
+          afterClose: function () {
+            target.removeClass("hotspot-active");
+            $("body").off("keyup", documentEsc);
+          },
+          beforeClose: function () {
+            stopAudioVideo(document.querySelector(".featherlight-content"));
+            setTimeout(function () {
+              info.hide().appendTo(container);
+            }, 500); // delay hiding content and moving it back outside the lightbox
+          },
+        });
+      }
+    });
+  };
+
+  var documentEsc = function (e) {
+    if (e.keyCode === 27) {
+      $.featherlight.current().close();
     }
-	}
-
-	var moreInfoSetup = function(img) {
-		var container = img.parents('.hotspots-container');
-
-		if (container.data('layout') == 'tooltip') {
-			return;
-		}
-
-		if (container.data('layout') == 'lightbox') {
-			lightboxSetup(container, img);
-			return;
-		}
-
-		infoboxSetup(container, img);
-	};
-
-	var infoboxSetup = function(container, img) {
-		var initial = container.find('.hotspot-initial');
-		var content = container.find('.hotspots-placeholder');
-		initial.addClass('visible');
-		container.on('active.responsilight inactive.responsilight', function(e){
-			var data = $(e.target).data('areaData');
-			var info;
-			if (e.type === 'active') {
-				info = $(data.href);
-			} else {
-				info = initial;
-			}
-
-			var visibleContent = content.children('.visible');
-			stopAudioVideo(visibleContent.get(0));
-			visibleContent.removeClass('visible');
-			info.removeClass('da-hidden').addClass('visible').appendTo(content);
-
-
-			// Check for an embedded video player
-			var video = info.find('.wp-video');
-			if (video.length) {
-				if (!info.data('video-resized')) {
-					info.data('video-resized', true);
-					window.dispatchEvent(new Event('resize'));
-				}
-			}
-		});
-	};
-
-	var lightboxSetup = function(container, img) {
-		container.on('active.responsilight', function(e){
-			var data = $(e.target).data('areaData'),
-				info = $(data.href),
-				container = info.parent(),
-				target = $(e.target),
-				currentLightbox = $('.featherlight');
-
-			if (e.type === 'active' && currentLightbox.length === 0) {
-				$.featherlight('<div class="hotspot-info"></div>', {
-					closeLabel: drawattentionData.closeLabel,
-					closeSpeed: 250,
-					closeOnEsc: false,
-					afterContent: function(){
-						var content = $('.featherlight-inner'),
-							lb = $('.featherlight-content'),
-							mapNo = img.data('id');
-
-						info.appendTo(content).show();
-						lb.addClass('lightbox-' + mapNo);
-
-						// Fix accessibility issue - links not focusable by keyboard
-						var untabbables = info.find('a[tabindex=-1]');
-						untabbables.attr('tabindex', 0);
-
-						setTimeout(function(){
-							var img = content.find('img'),
-								contentHeight = content.get(0).scrollHeight,
-								imgHeight = img.height(),
-								lbHeight = lb.outerHeight();
-
-							if (contentHeight > lbHeight) {
-								var diff = contentHeight - lbHeight + 50,
-									newHeight = imgHeight - diff,
-									minHeight = $(window).innerHeight()/2;
-
-								newHeight = newHeight < minHeight ? minHeight : newHeight;
-
-								var naturalHeight = img.prop('naturalHeight');
-
-								if (newHeight < naturalHeight) {
-									img.css({'width': 'auto'});
-									img.animate({
-										'height': newHeight
-									}, 200);
-								}
-							}
-						}, 100);
-
-						lightboxAnchorLinks(content, target);
-						window.dispatchEvent(new Event('resize')); // Trigger window resize event for [video] shortcode JS
-					},
-					afterOpen: function() {
-						$('body').on('keyup', documentEsc);
-					},
-					afterClose: function(){
-						target.removeClass('hotspot-active');
-						$('body').off('keyup', documentEsc);
-					},
-					beforeClose: function(){
-						stopAudioVideo(document.querySelector('.featherlight-content'));
-						setTimeout(function(){
-							info.hide().appendTo(container);
-						}, 500); // delay hiding content and moving it back outside the lightbox
-					}
-				});
-			}
-		});
-	};
-
-	var documentEsc = function(e) {
-		if (e.keyCode === 27) {
-			$.featherlight.current().close();
-		}
-	};
-
-	var lightboxAnchorLinks = function(content, hotspot){
-		var links = content.find('.hotspot-content a[href^="#"]');
-		links.on('click', function(e){
-			e.preventDefault();
-			var targetEl = $(e.target.hash);
-			var current = $.featherlight.current();
-			if (!current) return
-			current.afterClose = function(){
-				hotspot.removeClass('hotspot-active');
-				$('html').removeClass('with-featherlight');
-				$('html, body').animate({
-					scrollTop: targetEl.offset().top
-				}, 500);
-			}
-			current.close();
-		});
-	};
-
-	var showTooltip = function(shape, areaData) {
-		var container = $(shape._map._container);
-		var content = $(areaData.href).html();
-
-		var tip = L.responsivePopup({
-			autoPan: false,
-			closeButton: areaData.trigger == 'click',
-			hasTip: container.width() > 840,
-			maxHeight: container.height() * .9,
-			offset: new L.Point(0,0)
-		});
-
-		tip.setContent(content);
-		shape.bindPopup(tip);
-
-		if (areaData.trigger === 'click') {
-			shape.on('click', function(e){
-				if (shape._path.classList.contains('hotspot-active')) {
-					shape.closePopup()
-				} else {
-					shape.openPopup();
-				}
-			});
-		} else {
-			shape.on('mouseover', function(){
-				shape.openPopup();
-			});
-			shape.on('mouseout', function(){
-				shape.closePopup();
-			});
-		}
-
-		container.on('click', function(e){
-			e.stopPropagation();
-		});
-		$(document).on('click', function(e){
-			shape.closePopup();
-			shape._path.classList.remove('hotspot-active');
-		});
-	};
-
-	var leafletSetup = function(img) {
-		var id = img.data('id');
-		var container = $('<div id="hotspots-map-container-' + id + '" class="hotspots-map-container"></div>');
-		var imgWidth = img.width();
-		var imgHeight = img.height();
-
-		container.css({
-			'width': imgWidth + 'px',
-			'height': imgHeight + 'px'
-		});
-		img.after(container);
-
-		// Check to be sure the container is on the page
-		// To prevent errors when loaded in Elementor popup
-		var containerTest = $('#hotspots-map-container-' + id);
-		if (!containerTest.length) {
-			return
-		}
-
-		var map = L.map('hotspots-map-container-' + id, {
-			attributionControl: false,
-			boxZoom: false,
-			crs: L.CRS.Simple,
-			doubleClickZoom: false,
-			dragging: false,
-			keyboard: false,
-			minZoom: -20,
-			scrollWheelZoom: false,
-			// tap: !isWebkitiOS,
-			tap: true,
-			touchZoom: false,
-			zoomControl: false,
-			zoomSnap: 0,
-		});
-
-		var domImg = img.get(0);
-		var natHeight = domImg.naturalHeight;
-		var natWidth = domImg.naturalWidth;
-		img.data('natW', natWidth);
-		img.data('natH', natHeight);
-		var bounds = [[0,0], [natHeight, natWidth]];
-		var imageLayer = L.imageOverlay(img.attr('src'), bounds).addTo(map);
-		map.fitBounds(bounds);
-
-		leaflets.push({
-			map: map,
-			img: img
-		});
-
-		drawSpots(img, map);
-	};
-
-	var showContextMenu = function(shape, areaData, e) {
-		var hash = areaData.href;
-		var container = $(shape._map._container);
-
-		if (!hash) {
-			return;
-		}
-
-		$('.da-address-wrapper').remove();
-
-		var windowAddress = window.location.href.split('#')[0];
-		var shapeAddress = windowAddress + hash;
+  };
+
+  var lightboxAnchorLinks = function (content, hotspot) {
+    var links = content.find('.hotspot-content a[href^="#"]');
+    links.on("click", function (e) {
+      e.preventDefault();
+      var targetEl = $(e.target.hash);
+      var current = $.featherlight.current();
+      if (!current) return;
+      current.afterClose = function () {
+        hotspot.removeClass("hotspot-active");
+        $("html").removeClass("with-featherlight");
+        $("html, body").animate(
+          {
+            scrollTop: targetEl.offset().top,
+          },
+          500,
+        );
+      };
+      current.close();
+    });
+  };
+
+  var showTooltip = function (shape, areaData) {
+    var container = $(shape._map._container);
+    var content = $(areaData.href).html();
+
+    var tip = Leaflet.responsivePopup({
+      autoPan: false,
+      closeButton: areaData.trigger == "click",
+      hasTip: container.width() > 840,
+      maxHeight: container.height() * 0.9,
+      offset: new Leaflet.Point(0, 0),
+    });
+
+    tip.setContent(content);
+    shape.bindPopup(tip);
+
+    if (areaData.trigger === "click") {
+      shape.on("click", function (e) {
+        if (shape._path.classList.contains("hotspot-active")) {
+          shape.closePopup();
+        } else {
+          shape.openPopup();
+        }
+      });
+    } else {
+      shape.on("mouseover", function () {
+        shape.openPopup();
+      });
+      shape.on("mouseout", function () {
+        shape.closePopup();
+      });
+    }
+
+    container.on("click", function (e) {
+      e.stopPropagation();
+    });
+    $(document).on("click", function (e) {
+      shape.closePopup();
+      shape._path.classList.remove("hotspot-active");
+    });
+  };
+
+  var leafletSetup = function (img) {
+    var id = img.data("id");
+    var container = $(
+      '<div id="hotspots-map-container-' +
+        id +
+        '" class="hotspots-map-container"></div>',
+    );
+    var imgWidth = img.width();
+    var imgHeight = img.height();
+
+    container.css({
+      width: imgWidth + "px",
+      height: imgHeight + "px",
+    });
+    img.after(container);
+
+    // Check to be sure the container is on the page
+    // To prevent errors when loaded in Elementor popup
+    var containerTest = $("#hotspots-map-container-" + id);
+    if (!containerTest.length) {
+      return;
+    }
+
+    var map = Leaflet.map("hotspots-map-container-" + id, {
+      attributionControl: false,
+      boxZoom: false,
+      crs: Leaflet.CRS.Simple,
+      doubleClickZoom: false,
+      dragging: false,
+      keyboard: false,
+      minZoom: -20,
+      scrollWheelZoom: false,
+      // tap: !isWebkitiOS,
+      tap: true,
+      touchZoom: false,
+      zoomControl: false,
+      zoomSnap: 0,
+    });
+
+    var domImg = img.get(0);
+    var natHeight = domImg.naturalHeight;
+    var natWidth = domImg.naturalWidth;
+    img.data("natW", natWidth);
+    img.data("natH", natHeight);
+    var bounds = [
+      [0, 0],
+      [natHeight, natWidth],
+    ];
+    var imageLayer = Leaflet.imageOverlay(img.attr("src"), bounds).addTo(map);
+    map.fitBounds(bounds);
+
+    leaflets.push({
+      map: map,
+      img: img,
+    });
+
+    drawSpots(img, map);
+  };
+
+  var showContextMenu = function (shape, areaData, e) {
+    var hash = areaData.href;
+    var container = $(shape._map._container);
+
+    if (!hash) {
+      return;
+    }
+
+    $(".da-address-wrapper").remove();
+
+    var windowAddress = window.location.href.split("#")[0];
+    var shapeAddress = windowAddress + hash;
     var div = $('<div class="da-address-wrapper"></div>')
-        .css({
-            'left': e.originalEvent.pageX + 'px',
-            'top': e.originalEvent.pageY + 'px'
-        })
-        .append('<p>' + shapeAddress + '</p>')
-        .append('<span class="da-address-close">&times;</span>')
-        .appendTo(document.body);
-
-    div.find('.da-address-close').on('click', function(){
-    	div.remove();
-    });
-	};
-
-	var drawSpots = function(img, map) {
-		var id = img.data('id');
-
-		/* If the image has a usemap attribute, detach the map and store it in the imageMaps object */
-		if (img[0].hasAttribute('usemap')) {
-			var mapName = img.attr('usemap').replace('#', '');
-			var imageMap = $('map[name="' + mapName + '"]');
-			imageMaps[id] = imageMap.detach();
-			img.removeAttr('usemap');
-		} else { /* Else we've already removed the image map, so we just need to get it */
-			var imageMap = imageMaps[id];
-		}
-
-		var areas = imageMap.find('area');
-		var container = img.parents('.hotspots-container');
-
-		areas.each(function(){
-			var area = $(this);
-			var shape = area.attr('shape');
-			var coords = area.attr('coords').split(',');
-			var areaData = {
-				style: area.data('color-scheme') ? area.data('color-scheme') : 'default',
-				title: area.attr('title'),
-				href: area.attr('href'),
-				spot: area.data('id'),
-				target: area.attr('target'),
-				action: area.data('action'),
-				layout: container.data('layout'),
-				trigger: container.data('trigger')
-			};
-			switch(shape) {
-				case 'circle':
-					renderCircle(coords, map, img, areaData);
-					break;
-				case 'rect':
-					renderPoly(coords, map, img, areaData);
-					break
-				case 'polygon':
-					renderPoly(coords, map, img, areaData);
-					break;
-				case 'poly': // Leaving this here for backward compatibility
-					renderPoly(coords, map, img, areaData);
-					break;
-			}
-		});
-		// A11y fixes after all the spots are drawn
-		a11yFixes(img, map);
-
-		// Link to area after all the spots are drawn
-		hotspots.linkToArea();
-	};
-
-	var renderCircle = function(coords, map, img, areaData) {
-		var x = coords[0];
-		var y = img.data('natH') - coords[1];
-		var rad = coords[2];
-		var circle = L.circle([y,x], {
-			radius: rad,
-			className: 'hotspot-' + areaData.style,
-			title: areaData.title
-		});
-
-		circle.on('add', function(e) {
-			var $circle = $(e.target.getElement());
-			$circle.data('areaData', areaData);
-			$circle.attr('tabindex', '0');
-			$circle.attr('aria-label', areaData.title);
-			$circle.attr('name', areaData.title);
-		});
-
-		circle.addTo(map);
-
-		// If this is a more info hotspot, add it to the infoSpots object
-		if (areaData.href.charAt(0) === '#') {
-			var spotName = areaData.href.replace('#', '');
-			hotspots.infoSpots[spotName] = circle;
-		}
-
-		shapeEvents(circle, areaData);
-	};
-
-	var renderPoly = function (coords, map, img, areaData) {
-		var xCoords = [];
-		var yCoords = [];
-		for (var i = 0; i < coords.length; i++) {
-			if (i % 2 == 0) {
-				xCoords.push(coords[i]);
-			} else {
-				yCoords.push(coords[i]);
-			}
-		}
-
-		var polyCoords = yCoords.map(function(coord, index) {
-			return [img.data('natH') - coord, xCoords[index]];
-		});
-
-		var poly = L.polygon(polyCoords, {
-			className: 'hotspot-' + areaData.style,
-			title: areaData.title
-		});
-
-		// Attach the area data to the path as soon as it's added to the map, a11y attributes
-		poly.on('add', function(e) {
-			var $poly = $(e.target.getElement());
-			$poly.data('areaData', areaData);
-			$poly.attr('tabindex', '0');
-			$poly.attr('aria-label', areaData.title);
-			$poly.attr('name', areaData.title);
-		});
-
-		poly.addTo(map);
-
-		// If this is a more info hotspot, add it to the infoSpots object
-		if (areaData.href.charAt(0) === '#') {
-			var spotName = areaData.href.replace('#', '');
-			hotspots.infoSpots[spotName] = poly;
-		}
-
-		shapeEvents(poly, areaData);
-	};
-
-	var shapeOver = function(shape, areaData, e) {
-		var $shape = $(e.target.getElement());
-		$shape.trigger('over.responsilight');
-		if (areaData.trigger === 'hover' && e.type !== 'touchstart' & e.type !== 'keypress') {
-			$shape.addClass('hotspot-active');
-			$shape.trigger('active.responsilight');
-		}
-	};
-
-	var shapeOut = function(shape, areaData, e) {
-		var $shape = $(e.target.getElement());
-		$shape.trigger('out.responsilight');
-		if (areaData.trigger === 'hover' && e.type !== 'keypress') {
-			$shape.removeClass('hotspot-active');
-			$shape.trigger('inactive.responsilight');
-			// If mouse user, blur hover spots when mouse moves out
-			if (e.type === 'mouseout') {
-				$shape.trigger('blur');
-			}
-		}
-	};
-
-	var shapeClick = function(shape, areaData, e) {
-		var $shape = $(e.target.getElement());
-		$shape.trigger('areaClick.responsilight');
-		if (areaData.trigger === 'hover' && e.type !== 'touchstart' && e.type !== 'keypress' && !isMobileSafari) {
-			return;
-		}
-		$shape.toggleClass('hotspot-active');
-		if ($shape.hasClass('hotspot-active')) {
-			$shape.trigger('active.responsilight');
-		} else {
-			$shape.trigger('inactive.responsilight');
-		}
-		var oldActive = $shape.siblings('.hotspot-active');
-		if (oldActive.length) {
-			oldActive.removeClass('hotspot-active');
-		}
-	};
-
-	var shapeEvents = function(shape, areaData) {
-		// Handle URL spots
-		if (areaData.action == 'url') {
-			if (areaData.title) {
-				shape.bindTooltip(areaData.title);
-			}
-			shape.on('click', function(e) {
-				if (areaData.target == '_new' && !isMobileSafari) { // new window
-					window.open(areaData.href, '_blank');
-				} else { // same window
-					var first = areaData.href.charAt(0);
-					var targetElem;
-					try {
-						targetElem = first === '#' ? $(areaData.href) : null;
-					} catch (error) {
-						targetElem = null
-					}
-					if (targetElem && targetElem.length) { // hash link to existing target
-						$('html, body').animate({
-							scrollTop: targetElem.offset().top - 50
-						}, 750, function(){ // callback after scrolling
-							history.pushState({}, '', areaData.href);
-						})
-					} else {
-						window.location = areaData.href;
-					}
-				}
-			});
-			return;
-		}
-
-		// Show right-click context menu for logged-in admins only
-		if (drawattentionData.isLoggedIn && drawattentionData.isAdmin) {
-			shape.on('contextmenu', function(e){
-				showContextMenu(shape, areaData, e);
-			});
-		}
-
-		// Handle tooltip spots
-		if (areaData.layout === 'tooltip') {
-			showTooltip(shape, areaData);
-		}
-
-		// Add styled tooltip to all non-hover areas
-		if (areaData.action === 'url' || areaData.trigger === 'click' && areaData.layout !== 'tooltip') {
-			if (areaData.title) {
-				shape.bindTooltip(areaData.title);
-			}
-		}
-
-		// Handle all other spots
-		var moved = false;
-
-		shape.on('touchstart touchmove touchend click mouseover mouseout keypress focus blur', function(e){
-			switch(e.type) {
-				case 'touchstart':
-					moved = false;
-					break;
-				case 'touchmove':
-					moved = true;
-					break;
-				case 'touchend':
-					if (moved) {
-						return;
-					}
-					shapeOver(shape, areaData, e);
-					shapeClick(shape, areaData, e);
-					break;
-				case 'click':
-					shapeClick(shape, areaData, e);
-					break;
-				case 'keypress':
-					var key = e.originalEvent.which;
-					if ( key == 13 || key == 32) {
-						e.originalEvent.preventDefault();
-						shapeClick(shape, areaData, e);
-					}
-					break;
-				case 'mouseover':
-					if (!isMobileSafari || (isMobileSafari && getBrowserVersion < 13)) {
-						shapeOver(shape, areaData, e);
-					}
-					if (isMobileSafari && !(getBrowserVersion() >= 12)) {
-						shapeClick(shape, areaData, e);
-					}
-					break;
-				case 'focus':
-					shapeOver(shape, areaData, e);
-					break;
-				case 'blur':
-					shapeOut(shape, areaData, e);
-					break;
-				case 'mouseout':
-					shapeOut(shape, areaData, e);
-					break;
-			}
-		});
-	};
-
-	var a11yFixes = function(img, map){
-		let svg = img.siblings('.leaflet-container').find('.leaflet-overlay-pane svg');
-		let id = img.data('id');
-
-		// Add title and description to SVG
-		svg.prepend('<desc id="img-desc-' + id + '">' + img.data('image-description') + '</desc>');
-		svg.prepend('<title id="img-title-' + id + '">' + img.data('image-title') + '</title>');
-
-		// Use title and desc to describe the svg
-		svg.attr('aria-labelledby', 'img-title-' + id);
-		svg.attr('aria-describedby', 'img-desc-' + id);
-
-		// Make svg screen reader traversable
-		svg.attr('role', 'group');
-
-		// Create a traversable list
-		var group = svg.find('g').attr('role', 'list');
-		group.children().attr('role', 'listitem');
-
-		// Handle tooltips for the map
-		map.on('popupopen',function(popup) {
-		  // shift focus to the popup when it opens
-		  $(popup.popup._container).find('.leaflet-rrose-content').attr('tabindex','-1').focus();
-
-		  // move the close button to the end of the popup content so screen readers reach it
-		  // after the main popup content, not before
-		  var close = $(popup.popup._container).find('.leaflet-rrose-close-button').detach();
-		  close.attr('aria-label','Close item');
-		  $(popup.popup._container).append(close);
-
-			$(document).on('keydown', function(e){
-				if (e.which == 27) {
-					map.closePopup();
-				}
-			});
-
-		});
-
-		// return focus to the icon we started from before opening the pop up
-		map.on('popupclose',function(popup) {
-			$(document).off('keydown');
-			$(popup.popup._source._path).focus();
-		});
-
-	};
-
-	hotspots.linkToArea = function(){ // Called after the shapes are drawn
-		var hash = window.location.hash;
-		if (!hash) return;
-
-		var spotName = hash.replace('#', '');
-		if (!hotspots.infoSpots.hasOwnProperty(spotName)) return;
-
-		Object.keys(hotspots.infoSpots).forEach(function(key) {
-			hotspots.infoSpots[key].closeTooltip()
-		})
-
-		hotspots.infoSpots[spotName].fire('click')
-	};
-
-	hotspots.setup = function(){
-		mapSetup();
-	};
-
-	hotspots.resizeTimer = null;
-	hotspots.resizing = false;
-
-	hotspots.init = function(){ // For backward compatibility - resets the size of the leaflet on demand
-		leaflets.forEach(function(item){
-			var isLoaded = item.img.data('status') === 'loaded';
-
-			if (!isLoaded) {
-				return;
-			}
-
-			item.img.next('.hotspots-map-container').css({
-				'width': item.img.width() + 'px',
-				'height': item.img.height() + 'px'
-			});
-			item.map.invalidateSize(true);
-			item.map.fitBounds([[0,0], [item.img.data('natH'), item.img.data('natW')]]);
-		});
-	};
-
-	hotspots.compatibilityFixes = function(){
-		if (window.Foundation) { /* Fix for Foundation firing tag change event indiscriminately when some items are clicked on the page */
-			$(window).on('change.zf.tabs', function(e) {
-				if (e.target.tagName !== 'INPUT') {
-					hotspots.init();
-				}
-			});
-		}
-
-		$(window).on('pageloaded load', function() { /* Listen for pageloaded and load events on the window */
-			hotspots.init();
-		});
-
-		$(window).on('et_hashchange', function() { /* Listen for Divi hashchange */
-			setTimeout(function() {
-				hotspots.init();
-			}, 1000);
-		});
-
-		$('.ult_tabs').on('click', '.ult_tab a', function() { /* Ultimate tabs */
-			setTimeout(function() {
-				hotspots.init();
-			}, 2000);
-		});
-
-		$('a[data-vc-accordion], .et_pb_tabs .et_pb_tabs_controls li, .et_pb_toggle_title').on('click', function() { /* Divi tabs, accordion, toggle */
-			setTimeout(function() {
-				hotspots.init();
-			}, 1000);
-		});
-		$('.vc_tta-tabs-container').on('click', '.vc_tta-tab', function() { /* Visual composer tabs */
-			setTimeout(function() {
-				hotspots.init();
-			}, 1000);
-		});
-
-		$('.ui-tabs-anchor, .nav-tabs > li').on('click', function() { /* UI Tabs */
-			setTimeout(function() {
-				hotspots.init();
-			}, 750);
-		});
-
-		$('.fl-accordion-button').on('click', function() { /* Beaver Builder accordion */
-			setTimeout(function() {
-				hotspots.init();
-			}, 500);
-		});
-
-		$('.responsive-tabs').on('click', '.responsive-tabs__list__item', function() { /* Responsive tabs */
-			hotspots.init();
-		});
-
-		$('.elementor-tabs').on('click', '.elementor-tab-title', function() { /* Elementor tabs */
-			hotspots.init();
-		});
-
-		$('.fl-tabs').on('click', 'a.fl-tabs-label', function() { /* Beaver Builder tabs */
-			hotspots.init();
-		});
-
-		$('.uabb-adv-accordion-button .uabb-tabs').on('click', function() { /* Ultimate Beaver Builder addons accordion and tabs */
-			setTimeout(function() {
-				hotspots.init();
-			}, 250);
-		});
-		$('.w-tabs-item').on('click', function() { /* Custom Woocommerce tabs */
-			setTimeout(function() {
-				hotspots.init();
-			}, 1000);
-		});
-	};
-
-}(jQuery, window.hotspots = window.hotspots || {}));
-
-jQuery(function(){
-	hotspots.setup();
-	hotspots.compatibilityFixes();
+      .css({
+        left: e.originalEvent.pageX + "px",
+        top: e.originalEvent.pageY + "px",
+      })
+      .append("<p>" + shapeAddress + "</p>")
+      .append('<span class="da-address-close">&times;</span>')
+      .appendTo(document.body);
+
+    div.find(".da-address-close").on("click", function () {
+      div.remove();
+    });
+  };
+
+  var drawSpots = function (img, map) {
+    var id = img.data("id");
+
+    /* If the image has a usemap attribute, detach the map and store it in the imageMaps object */
+    if (img[0].hasAttribute("usemap")) {
+      var mapName = img.attr("usemap").replace("#", "");
+      var imageMap = $('map[name="' + mapName + '"]');
+      imageMaps[id] = imageMap.detach();
+      img.removeAttr("usemap");
+    } else {
+      /* Else we've already removed the image map, so we just need to get it */
+      var imageMap = imageMaps[id];
+    }
+
+    var areas = imageMap.find("area");
+    var container = img.parents(".hotspots-container");
+
+    areas.each(function () {
+      var area = $(this);
+      var shape = area.attr("shape");
+      var coords = area.attr("coords").split(",");
+      var areaData = {
+        style: area.data("color-scheme")
+          ? area.data("color-scheme")
+          : "default",
+        title: area.attr("title"),
+        href: area.attr("href"),
+        spot: area.data("id"),
+        target: area.attr("target"),
+        action: area.data("action"),
+        layout: container.data("layout"),
+        trigger: container.data("trigger"),
+      };
+      switch (shape) {
+        case "circle":
+          renderCircle(coords, map, img, areaData);
+          break;
+        case "rect":
+          renderPoly(coords, map, img, areaData);
+          break;
+        case "polygon":
+          renderPoly(coords, map, img, areaData);
+          break;
+        case "poly": // Leaving this here for backward compatibility
+          renderPoly(coords, map, img, areaData);
+          break;
+      }
+    });
+    // A11y fixes after all the spots are drawn
+    a11yFixes(img, map);
+
+    // Link to area after all the spots are drawn
+    hotspots.linkToArea();
+  };
+
+  var renderCircle = function (coords, map, img, areaData) {
+    var x = coords[0];
+    var y = img.data("natH") - coords[1];
+    var rad = coords[2];
+    var circle = Leaflet.circle([y, x], {
+      radius: rad,
+      className: "hotspot-" + areaData.style,
+      title: areaData.title,
+    });
+
+    circle.on("add", function (e) {
+      var $circle = $(e.target.getElement());
+      $circle.data("areaData", areaData);
+      $circle.attr("tabindex", "0");
+      $circle.attr("aria-label", areaData.title);
+      $circle.attr("name", areaData.title);
+    });
+
+    circle.addTo(map);
+
+    // If this is a more info hotspot, add it to the infoSpots object
+    if (areaData.href.charAt(0) === "#") {
+      var spotName = areaData.href.replace("#", "");
+      hotspots.infoSpots[spotName] = circle;
+    }
+
+    shapeEvents(circle, areaData);
+  };
+
+  var renderPoly = function (coords, map, img, areaData) {
+    var xCoords = [];
+    var yCoords = [];
+    for (var i = 0; i < coords.length; i++) {
+      if (i % 2 == 0) {
+        xCoords.push(coords[i]);
+      } else {
+        yCoords.push(coords[i]);
+      }
+    }
+
+    var polyCoords = yCoords.map(function (coord, index) {
+      return [img.data("natH") - coord, xCoords[index]];
+    });
+
+    var poly = Leaflet.polygon(polyCoords, {
+      className: "hotspot-" + areaData.style,
+      title: areaData.title,
+    });
+
+    // Attach the area data to the path as soon as it's added to the map, a11y attributes
+    poly.on("add", function (e) {
+      var $poly = $(e.target.getElement());
+      $poly.data("areaData", areaData);
+      $poly.attr("tabindex", "0");
+      $poly.attr("aria-label", areaData.title);
+      $poly.attr("name", areaData.title);
+    });
+
+    poly.addTo(map);
+
+    // If this is a more info hotspot, add it to the infoSpots object
+    if (areaData.href.charAt(0) === "#") {
+      var spotName = areaData.href.replace("#", "");
+      hotspots.infoSpots[spotName] = poly;
+    }
+
+    shapeEvents(poly, areaData);
+  };
+
+  var shapeOver = function (shape, areaData, e) {
+    var $shape = $(e.target.getElement());
+    $shape.trigger("over.responsilight");
+    if (
+      areaData.trigger === "hover" &&
+      (e.type !== "touchstart") & (e.type !== "keypress")
+    ) {
+      $shape.addClass("hotspot-active");
+      $shape.trigger("active.responsilight");
+    }
+  };
+
+  var shapeOut = function (shape, areaData, e) {
+    var $shape = $(e.target.getElement());
+    $shape.trigger("out.responsilight");
+    if (areaData.trigger === "hover" && e.type !== "keypress") {
+      $shape.removeClass("hotspot-active");
+      $shape.trigger("inactive.responsilight");
+      // If mouse user, blur hover spots when mouse moves out
+      if (e.type === "mouseout") {
+        $shape.trigger("blur");
+      }
+    }
+  };
+
+  var shapeClick = function (shape, areaData, e) {
+    var $shape = $(e.target.getElement());
+    $shape.trigger("areaClick.responsilight");
+    if (
+      areaData.trigger === "hover" &&
+      e.type !== "touchstart" &&
+      e.type !== "keypress" &&
+      !isMobileSafari
+    ) {
+      return;
+    }
+    $shape.toggleClass("hotspot-active");
+    if ($shape.hasClass("hotspot-active")) {
+      $shape.trigger("active.responsilight");
+    } else {
+      $shape.trigger("inactive.responsilight");
+    }
+    var oldActive = $shape.siblings(".hotspot-active");
+    if (oldActive.length) {
+      oldActive.removeClass("hotspot-active");
+    }
+  };
+
+  var shapeEvents = function (shape, areaData) {
+    // Handle URL spots
+    if (areaData.action == "url") {
+      if (areaData.title) {
+        shape.bindTooltip(areaData.title);
+      }
+      shape.on("click", function (e) {
+        if (areaData.target == "_new" && !isMobileSafari) {
+          // new window
+          window.open(areaData.href, "_blank");
+        } else {
+          // same window
+          var first = areaData.href.charAt(0);
+          var targetElem;
+          try {
+            targetElem = first === "#" ? $(areaData.href) : null;
+          } catch (error) {
+            targetElem = null;
+          }
+          if (targetElem && targetElem.length) {
+            // hash link to existing target
+            $("html, body").animate(
+              {
+                scrollTop: targetElem.offset().top - 50,
+              },
+              750,
+              function () {
+                // callback after scrolling
+                history.pushState({}, "", areaData.href);
+              },
+            );
+          } else {
+            window.location = areaData.href;
+          }
+        }
+      });
+      return;
+    }
+
+    // Show right-click context menu for logged-in admins only
+    if (drawattentionData.isLoggedIn && drawattentionData.isAdmin) {
+      shape.on("contextmenu", function (e) {
+        showContextMenu(shape, areaData, e);
+      });
+    }
+
+    // Handle tooltip spots
+    if (areaData.layout === "tooltip") {
+      showTooltip(shape, areaData);
+    }
+
+    // Add styled tooltip to all non-hover areas
+    if (
+      areaData.action === "url" ||
+      (areaData.trigger === "click" && areaData.layout !== "tooltip")
+    ) {
+      if (areaData.title) {
+        shape.bindTooltip(areaData.title);
+      }
+    }
+
+    // Handle all other spots
+    var moved = false;
+
+    shape.on(
+      "touchstart touchmove touchend click mouseover mouseout keypress focus blur",
+      function (e) {
+        switch (e.type) {
+          case "touchstart":
+            moved = false;
+            break;
+          case "touchmove":
+            moved = true;
+            break;
+          case "touchend":
+            if (moved) {
+              return;
+            }
+            shapeOver(shape, areaData, e);
+            shapeClick(shape, areaData, e);
+            break;
+          case "click":
+            shapeClick(shape, areaData, e);
+            break;
+          case "keypress":
+            var key = e.originalEvent.which;
+            if (key == 13 || key == 32) {
+              e.originalEvent.preventDefault();
+              shapeClick(shape, areaData, e);
+            }
+            break;
+          case "mouseover":
+            if (!isMobileSafari || (isMobileSafari && getBrowserVersion < 13)) {
+              shapeOver(shape, areaData, e);
+            }
+            if (isMobileSafari && !(getBrowserVersion() >= 12)) {
+              shapeClick(shape, areaData, e);
+            }
+            break;
+          case "focus":
+            shapeOver(shape, areaData, e);
+            break;
+          case "blur":
+            shapeOut(shape, areaData, e);
+            break;
+          case "mouseout":
+            shapeOut(shape, areaData, e);
+            break;
+        }
+      },
+    );
+  };
+
+  var a11yFixes = function (img, map) {
+    let svg = img
+      .siblings(".leaflet-container")
+      .find(".leaflet-overlay-pane svg");
+    let id = img.data("id");
+
+    // Add title and description to SVG
+    svg.prepend(
+      '<desc id="img-desc-' +
+        id +
+        '">' +
+        img.data("image-description") +
+        "</desc>",
+    );
+    svg.prepend(
+      '<title id="img-title-' +
+        id +
+        '">' +
+        img.data("image-title") +
+        "</title>",
+    );
+
+    // Use title and desc to describe the svg
+    svg.attr("aria-labelledby", "img-title-" + id);
+    svg.attr("aria-describedby", "img-desc-" + id);
+
+    // Make svg screen reader traversable
+    svg.attr("role", "group");
+
+    // Create a traversable list
+    var group = svg.find("g").attr("role", "list");
+    group.children().attr("role", "listitem");
+
+    // Handle tooltips for the map
+    map.on("popupopen", function (popup) {
+      // shift focus to the popup when it opens
+      $(popup.popup._container)
+        .find(".leaflet-rrose-content")
+        .attr("tabindex", "-1")
+        .focus();
+
+      // move the close button to the end of the popup content so screen readers reach it
+      // after the main popup content, not before
+      var close = $(popup.popup._container)
+        .find(".leaflet-rrose-close-button")
+        .detach();
+      close.attr("aria-label", "Close item");
+      $(popup.popup._container).append(close);
+
+      $(document).on("keydown", function (e) {
+        if (e.which == 27) {
+          map.closePopup();
+        }
+      });
+    });
+
+    // return focus to the icon we started from before opening the pop up
+    map.on("popupclose", function (popup) {
+      $(document).off("keydown");
+      $(popup.popup._source._path).focus();
+    });
+  };
+
+  hotspots.linkToArea = function () {
+    // Called after the shapes are drawn
+    var hash = window.location.hash;
+    if (!hash) return;
+
+    var spotName = hash.replace("#", "");
+    if (!hotspots.infoSpots.hasOwnProperty(spotName)) return;
+
+    Object.keys(hotspots.infoSpots).forEach(function (key) {
+      hotspots.infoSpots[key].closeTooltip();
+    });
+
+    hotspots.infoSpots[spotName].fire("click");
+  };
+
+  hotspots.setup = function () {
+    mapSetup();
+  };
+
+  hotspots.resizeTimer = null;
+  hotspots.resizing = false;
+
+  hotspots.init = function () {
+    // For backward compatibility - resets the size of the leaflet on demand
+    leaflets.forEach(function (item) {
+      var isLoaded = item.img.data("status") === "loaded";
+
+      if (!isLoaded) {
+        return;
+      }
+
+      item.img.next(".hotspots-map-container").css({
+        width: item.img.width() + "px",
+        height: item.img.height() + "px",
+      });
+      item.map.invalidateSize(true);
+      item.map.fitBounds([
+        [0, 0],
+        [item.img.data("natH"), item.img.data("natW")],
+      ]);
+    });
+  };
+
+  hotspots.compatibilityFixes = function () {
+    if (window.Foundation) {
+      /* Fix for Foundation firing tag change event indiscriminately when some items are clicked on the page */
+      $(window).on("change.zf.tabs", function (e) {
+        if (e.target.tagName !== "INPUT") {
+          hotspots.init();
+        }
+      });
+    }
+
+    $(window).on("pageloaded load", function () {
+      /* Listen for pageloaded and load events on the window */
+      hotspots.init();
+    });
+
+    $(window).on("et_hashchange", function () {
+      /* Listen for Divi hashchange */
+      setTimeout(function () {
+        hotspots.init();
+      }, 1000);
+    });
+
+    $(".ult_tabs").on("click", ".ult_tab a", function () {
+      /* Ultimate tabs */
+      setTimeout(function () {
+        hotspots.init();
+      }, 2000);
+    });
+
+    $(
+      "a[data-vc-accordion], .et_pb_tabs .et_pb_tabs_controls li, .et_pb_toggle_title",
+    ).on("click", function () {
+      /* Divi tabs, accordion, toggle */
+      setTimeout(function () {
+        hotspots.init();
+      }, 1000);
+    });
+    $(".vc_tta-tabs-container").on("click", ".vc_tta-tab", function () {
+      /* Visual composer tabs */
+      setTimeout(function () {
+        hotspots.init();
+      }, 1000);
+    });
+
+    $(".ui-tabs-anchor, .nav-tabs > li").on("click", function () {
+      /* UI Tabs */
+      setTimeout(function () {
+        hotspots.init();
+      }, 750);
+    });
+
+    $(".fl-accordion-button").on("click", function () {
+      /* Beaver Builder accordion */
+      setTimeout(function () {
+        hotspots.init();
+      }, 500);
+    });
+
+    $(".responsive-tabs").on(
+      "click",
+      ".responsive-tabs__list__item",
+      function () {
+        /* Responsive tabs */
+        hotspots.init();
+      },
+    );
+
+    $(".elementor-tabs").on("click", ".elementor-tab-title", function () {
+      /* Elementor tabs */
+      hotspots.init();
+    });
+
+    $(".fl-tabs").on("click", "a.fl-tabs-label", function () {
+      /* Beaver Builder tabs */
+      hotspots.init();
+    });
+
+    $(".uabb-adv-accordion-button .uabb-tabs").on("click", function () {
+      /* Ultimate Beaver Builder addons accordion and tabs */
+      setTimeout(function () {
+        hotspots.init();
+      }, 250);
+    });
+    $(".w-tabs-item").on("click", function () {
+      /* Custom Woocommerce tabs */
+      setTimeout(function () {
+        hotspots.init();
+      }, 1000);
+    });
+  };
+})(jQuery, (window.hotspots = window.hotspots || {}));
+
+jQuery(function () {
+  hotspots.setup();
+  hotspots.compatibilityFixes();
 });
 
-jQuery(document).on('elementor/popup/show', function(){
-	hotspots.setup();
-	hotspots.compatibilityFixes();
+jQuery(document).on("elementor/popup/show", function () {
+  hotspots.setup();
+  hotspots.compatibilityFixes();
 });
 
-jQuery(window).on('resize orientationchange', function(e){
-	var $window = jQuery(this);
-	if (!hotspots.resizing) {
-		$window.trigger('resizeStart.responsilight');
-		hotspots.resizing = true;
-	}
-	clearTimeout(hotspots.resizeTimer);
-	hotspots.resizeTimer = setTimeout(function(){
-		hotspots.init();
-		$window.trigger('resizeComplete.responsilight');
-		hotspots.resizing = false;
-	}, 250);
+jQuery(window).on("resize orientationchange", function (e) {
+  var $window = jQuery(this);
+  if (!hotspots.resizing) {
+    $window.trigger("resizeStart.responsilight");
+    hotspots.resizing = true;
+  }
+  clearTimeout(hotspots.resizeTimer);
+  hotspots.resizeTimer = setTimeout(function () {
+    hotspots.init();
+    $window.trigger("resizeComplete.responsilight");
+    hotspots.resizing = false;
+  }, 250);
 });
 
-jQuery(window).on('hashchange', function(){
-	hotspots.linkToArea();
+jQuery(window).on("hashchange", function () {
+  hotspots.linkToArea();
 });
 
-window.onerror = function(errorMsg, url, lineNumber) { // This should be a fun little experiement!
-	var errorBox = jQuery('.da-error').show();
-	if (errorBox.length) {
-		var contents = errorBox.html();
-		errorBox.html(contents + '<br/><br/><strong>Error:</strong> ' + errorMsg + '<br/>Line ' + lineNumber + ': ' + url);
-	}
-	return false;
-}
+window.onerror = function (errorMsg, url, lineNumber) {
+  // This should be a fun little experiement!
+  var errorBox = jQuery(".da-error").show();
+  if (errorBox.length) {
+    var contents = errorBox.html();
+    errorBox.html(
+      contents +
+        "<br/><br/><strong>Error:</strong> " +
+        errorMsg +
+        "<br/>Line " +
+        lineNumber +
+        ": " +
+        url,
+    );
+  }
+  return false;
+};
 
 /* Fix for Elementor bug - duplicating DA images when popup opens */
-jQuery(document).on('elementor/popup/show', () => {
-	setTimeout(function(){
-		var imageContainers = jQuery('.hotspots-image-container');
-		imageContainers.each(function(){
-			var extraMapContainers = jQuery(this).find('.hotspots-map-container:not(:first)').remove(); // find all but the first one and remove them
-		});
-	}, 250);
-} );
+jQuery(document).on("elementor/popup/show", () => {
+  setTimeout(function () {
+    var imageContainers = jQuery(".hotspots-image-container");
+    imageContainers.each(function () {
+      var extraMapContainers = jQuery(this)
+        .find(".hotspots-map-container:not(:first)")
+        .remove(); // find all but the first one and remove them
+    });
+  }, 250);
+});
diff --git a/public/class-drawattention.php b/public/class-drawattention.php
index 8c8a8b04..d778af95 100644
--- a/public/class-drawattention.php
+++ b/public/class-drawattention.php
@@ -21,7 +21,7 @@
  * @package DrawAttention
  * @author  Nathan Tyler <support@wpdrawattention.com>
  */
-if ( !class_exists( 'DrawAttention' ) ) {
+if ( ! class_exists( 'DrawAttention' ) ) {
 	class DrawAttention {
 
 		/**
@@ -31,10 +31,10 @@ class DrawAttention {
 		 *
 		 * @var     string
 		 */
-		const VERSION = '2.0.11';
-		const file = __FILE__;
-		const name = 'Draw Attention';
-		const slug = 'drawattention';
+		const VERSION = '2.0.21';
+		const file    = __FILE__;
+		const name    = 'Draw Attention';
+		const slug    = 'drawattention';
 		/**
 		 * @TODO - Rename "hotspots" to the name of your plugin
 		 *
@@ -62,6 +62,7 @@ class DrawAttention {
 
 		/**
 		 * Instance of class to register CPT and taxonomies
+		 *
 		 * @var DrawAttention_CPT
 		 */
 		public $cpt;
@@ -70,6 +71,7 @@ class DrawAttention {
 		public $themes;
 		public $block_image;
 		public $photon_excluded_images = array();
+		public $import_export;
 
 		/**
 		 * Initialize the plugin by setting localization and loading public scripts
@@ -99,28 +101,28 @@ private function __construct() {
 
 			add_action( 'template_include', array( $this, 'single_template' ) );
 
-			add_filter( 'jetpack_photon_skip_image', array ($this, 'jetpack_photon_skip_image' ), 10, 3 );
+			add_filter( 'jetpack_photon_skip_image', array( $this, 'jetpack_photon_skip_image' ), 10, 3 );
 
 			add_filter( 'cmb2_meta_box_url', array( $this, 'cmb2_meta_box_url' ) );
 
-		/**
-		 * @TODO - Uncomment requried features
-		 *
-		 * Various functionality is separated into external files
-		 */
-			include_once( 'includes/cpt.php' );
+			/**
+			 * @TODO - Uncomment requried features
+			 *
+			 * Various functionality is separated into external files
+			 */
+			include_once __DIR__ . '/includes/cpt.php';
 			$this->cpt = new DrawAttention_CPT( $this );
 
-			include_once( 'includes/custom_fields.php' );
+			include_once __DIR__ . '/includes/custom_fields.php';
 			$this->custom_fields = new DrawAttention_CustomFields( $this );
 
-			include_once( 'includes/themes.php' );
+			include_once __DIR__ . '/includes/themes.php';
 			$this->themes = new DrawAttention_Themes( $this );
 
-			include_once( 'includes/class-block-image.php' );
+			include_once __DIR__ . '/includes/class-block-image.php';
 			$this->block_image = new DrawAttention_Block_Image( $this );
 
-			include_once( 'includes/import-export.php' );
+			include_once __DIR__ . '/includes/import-export.php';
 			$this->import_export = new DrawAttention_ImportExport( $this );
 		}
 
@@ -146,7 +148,7 @@ public static function get_instance() {
 
 			// If the single instance hasn't been set, set it now.
 			if ( null == self::$instance ) {
-				self::$instance = new self;
+				self::$instance = new self();
 			}
 
 			return self::$instance;
@@ -157,16 +159,16 @@ public static function get_instance() {
 		 *
 		 * @since    1.0.0
 		 *
-		 * @param    boolean    $network_wide    True if WPMU superadmin uses
-		 *                                       "Network Activate" action, false if
-		 *                                       WPMU is disabled or plugin is
-		 *                                       activated on an individual blog.
+		 * @param    boolean $network_wide    True if WPMU superadmin uses
+		 *                                    "Network Activate" action, false if
+		 *                                    WPMU is disabled or plugin is
+		 *                                    activated on an individual blog.
 		 */
 		public static function activate( $network_wide ) {
 
 			if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 
-				if ( $network_wide  ) {
+				if ( $network_wide ) {
 
 					// Get all blog ids
 					$blog_ids = self::get_blog_ids();
@@ -178,15 +180,12 @@ public static function activate( $network_wide ) {
 
 						restore_current_blog();
 					}
-
 				} else {
 					self::single_activate();
 				}
-
 			} else {
 				self::single_activate();
 			}
-
 		}
 
 		/**
@@ -194,10 +193,10 @@ public static function activate( $network_wide ) {
 		 *
 		 * @since    1.0.0
 		 *
-		 * @param    boolean    $network_wide    True if WPMU superadmin uses
-		 *                                       "Network Deactivate" action, false if
-		 *                                       WPMU is disabled or plugin is
-		 *                                       deactivated on an individual blog.
+		 * @param    boolean $network_wide    True if WPMU superadmin uses
+		 *                                    "Network Deactivate" action, false if
+		 *                                    WPMU is disabled or plugin is
+		 *                                    deactivated on an individual blog.
 		 */
 		public static function deactivate( $network_wide ) {
 
@@ -216,15 +215,12 @@ public static function deactivate( $network_wide ) {
 						restore_current_blog();
 
 					}
-
 				} else {
 					self::single_deactivate();
 				}
-
 			} else {
 				self::single_deactivate();
 			}
-
 		}
 
 		/**
@@ -232,7 +228,7 @@ public static function deactivate( $network_wide ) {
 		 *
 		 * @since    1.0.0
 		 *
-		 * @param    int    $blog_id    ID of the new blog.
+		 * @param    int $blog_id    ID of the new blog.
 		 */
 		public function activate_new_site( $blog_id ) {
 
@@ -243,7 +239,6 @@ public function activate_new_site( $blog_id ) {
 			switch_to_blog( $blog_id );
 			self::single_activate();
 			restore_current_blog();
-
 		}
 
 		/**
@@ -266,7 +261,6 @@ private static function get_blog_ids() {
 				AND deleted = '0'";
 
 			return $wpdb->get_col( $sql );
-
 		}
 
 		/**
@@ -295,19 +289,17 @@ private static function single_deactivate() {
 		 */
 		public function load_plugin_textdomain() {
 
-
 			$domain = 'drawattention';
 			$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
 
 			load_textdomain( $domain, trailingslashit( WP_LANG_DIR ) . $domain . '/' . $domain . '-' . $locale . '.mo' );
-			load_plugin_textdomain( $domain, FALSE, basename( plugin_dir_path( dirname( __FILE__ ) ) ) . '/languages/' );
+			load_plugin_textdomain( $domain, false, basename( plugin_dir_path( __DIR__ ) ) . '/languages/' );
 
 			$domain = 'draw-attention';
 			$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
 
 			load_textdomain( $domain, trailingslashit( WP_LANG_DIR ) . $domain . '/' . $domain . '-' . $locale . '.mo' );
-			load_plugin_textdomain( $domain, FALSE, basename( plugin_dir_path( dirname( __FILE__ ) ) ) . '/languages/' );
-
+			load_plugin_textdomain( $domain, false, basename( plugin_dir_path( __DIR__ ) ) . '/languages/' );
 		}
 
 		/**
@@ -329,25 +321,33 @@ public function enqueue_scripts() {
 			wp_register_script( $this->plugin_slug . '-leaflet-responsive-popup', plugins_url( 'assets/js/leaflet.responsive.popup-min.js', __FILE__ ), array( $this->plugin_slug . '-leaflet' ), '0.6.4', $in_footer = true );
 			wp_register_script( $this->plugin_slug . '-plugin-script', plugins_url( 'assets/js/public.js', __FILE__ ), array( $this->plugin_slug . '-leaflet-responsive-popup', 'jquery' ), self::VERSION, true );
 
-			wp_localize_script( $this->plugin_slug . '-plugin-script', 'drawattentionData', array(
-				'isLoggedIn' => is_user_logged_in(),
-				'closeLabel' => __('Close', 'draw-attention'),
-				'isAdmin' => current_user_can( 'administrator' ),
-			) );
+			wp_localize_script(
+				$this->plugin_slug . '-plugin-script',
+				'drawattentionData',
+				array(
+					'isLoggedIn' => is_user_logged_in(),
+					'closeLabel' => __( 'Close', 'draw-attention' ),
+					'isAdmin'    => current_user_can( 'administrator' ),
+				)
+			);
 
 			$enqueue = apply_filters( 'da_enqueue_scripts_everywhere', false );
-			if ( !empty( $enqueue ) ) {
+			if ( ! empty( $enqueue ) ) {
 				wp_enqueue_script( $this->plugin_slug . '-plugin-script' );
 			}
 		}
 
 		function php_52_notice() {
 			global $pagenow;
-			if ( $pagenow != 'post.php' ) return;
-			if ( get_post_type() != 'da_image' ) return;
+			if ( $pagenow != 'post.php' ) {
+				return;
+			}
+			if ( get_post_type() != 'da_image' ) {
+				return;
+			}
 
-			if ( version_compare( phpversion(), '5.2.99') <= 0 ) {
-				$class = "error";
+			if ( version_compare( phpversion(), '5.2.99' ) <= 0 ) {
+				$class   = 'error';
 				$message = "<p>
 				<h3>Your server is out of date</h3>
 				Draw Attention (and many other WP plugins) <strong>requires PHP version 5.3 or higher</strong>. PHP 5.2 was released back in 2006 and support was officially terminated in 2011.
@@ -364,9 +364,9 @@ function php_52_notice() {
 					<li><a href='http://php.net/releases/'>http://php.net/releases/</a></li>
 				</ul>
 				</p>";
-				echo"<div class=\"$class\"> <p>$message</p></div>";
-			} else if ( version_compare( phpversion(), '5.5.99' ) <= 0 ) {
-				$class = "error";
+				echo "<div class=\"$class\"> <p>$message</p></div>";
+			} elseif ( version_compare( phpversion(), '5.5.99' ) <= 0 ) {
+				$class   = 'error';
 				$message = "<p>
 				<h3>Your server is out of date</h3>
 				Draw Attention (and many other WP plugins) <strong>requires PHP version 5.6 or higher</strong>. PHP 5.5 support was officially terminated in 2016, and to use Draw Attention you need to at least upgrade to PHP 5.6. We recommend PHP 7.1 or higher for best performance.
@@ -383,7 +383,7 @@ function php_52_notice() {
 					<li><a href='http://php.net/releases/'>http://php.net/releases/</a></li>
 				</ul>
 				</p>";
-				echo"<div class=\"$class\"> <p>$message</p></div>";
+				echo "<div class=\"$class\"> <p>$message</p></div>";
 			}
 		}
 
@@ -397,12 +397,12 @@ public function cmb2_meta_box_url( $url ) {
 				return $url;
 			}
 
-			$url = self::get_plugin_url().'/public/includes/lib/CMB2/';
+			$url = self::get_plugin_url() . '/public/includes/lib/CMB2/';
 			return $url;
 		}
 
 		public function jetpack_photon_skip_image( $val, $src, $tag ) {
-			foreach ($this->photon_excluded_images as $key => $photon_excluded_image) {
+			foreach ( $this->photon_excluded_images as $key => $photon_excluded_image ) {
 				if ( strpos( $src, $photon_excluded_image ) !== false ) {
 					return true;
 				}
@@ -419,32 +419,31 @@ public function jetpack_photon_skip_image( $val, $src, $tag ) {
 		public function shortcode( $atts ) {
 			// Begin settings array
 			$settings = array(
-				'has_photon' => class_exists( 'Jetpack_Photon' ),
+				'has_photon'   => class_exists( 'Jetpack_Photon' ),
 				'url_hotspots' => array(),
-				'urls_only' => false,
-				'urls_class' => '',
+				'urls_only'    => false,
+				'urls_class'   => '',
 			);
 
 			// Get the DA image ID
 			$image_args = array(
-				'post_status' => 'any',
-				'post_type' => $this->cpt->post_type,
+				'post_status'    => 'any',
+				'post_type'      => $this->cpt->post_type,
 				'posts_per_page' => 1,
-				'order' => 'DESC',
-				'orderby' => 'ID',
+				'order'          => 'DESC',
+				'orderby'        => 'ID',
 			);
-			$image = new WP_Query($image_args);
+			$image      = new WP_Query( $image_args );
 			if ( ! empty( $image->post ) ) {
 				$settings['image_id'] = $image->post->ID;
 			} else {
-				$latest_da = get_posts('post_type=' . $this->cpt->post_type . '&numberposts=1');
+				$latest_da            = get_posts( 'post_type=' . $this->cpt->post_type . '&numberposts=1' );
 				$settings['image_id'] = $latest_da[0]->ID;
 			}
 
-
 			// WPML Support
-			if ( function_exists ( 'icl_object_id' ) ) {
-				$settings['image_id'] = icl_object_id($settings['image_id'], 'da_image', true);
+			if ( function_exists( 'icl_object_id' ) ) {
+				$settings['image_id'] = icl_object_id( $settings['image_id'], 'da_image', true );
 			}
 
 			// Get and set DA settings
@@ -456,10 +455,10 @@ public function shortcode( $atts ) {
 
 			// Add hotspots to settings
 			$settings['hotspots'] = get_post_meta( $settings['image_id'], $this->custom_fields->prefix . 'hotspots', true );
-			if ( ! empty( $settings['hotspots']) ) {				
-				foreach( $settings['hotspots'] as $hotspot_key => $hotspot ) {
-					if ( empty( $settings['hotspots'][$hotspot_key]['shape'] ) ) {
-						$settings['hotspots'][$hotspot_key]['shape'] = 'polygon';
+			if ( ! empty( $settings['hotspots'] ) ) {
+				foreach ( $settings['hotspots'] as $hotspot_key => $hotspot ) {
+					if ( empty( $settings['hotspots'][ $hotspot_key ]['shape'] ) ) {
+						$settings['hotspots'][ $hotspot_key ]['shape'] = 'polygon';
 					}
 				}
 			}
@@ -467,79 +466,82 @@ public function shortcode( $atts ) {
 			if ( empty( $settings['hotspots'] ) ) {
 				$settings['url_hotspots'] = array();
 			} else {
-				$settings['url_hotspots'] = array_filter($settings['hotspots'], function($var){
-					if ( empty( $var['action'] ) ) {
-						return false;
+				$settings['url_hotspots'] = array_filter(
+					$settings['hotspots'],
+					function ( $var ) {
+						if ( empty( $var['action'] ) ) {
+							return false;
+						}
+
+						return $var['action'] == 'url';
 					}
-
-					return $var['action'] == 'url';
-				});
+				);
 				if ( count( $settings['hotspots'] ) == count( $settings['url_hotspots'] ) ) {
-					$settings['urls_only'] = true;
+					$settings['urls_only']  = true;
 					$settings['urls_class'] = 'links-only';
 				}
 			}
 
 			// Set default values for free settings
-			$settings['layout'] = 'left';
-			$settings['event_trigger'] = 'click';
+			$settings['layout']         = 'left';
+			$settings['event_trigger']  = 'click';
 			$settings['always_visible'] = 'false';
 
 			// Add styles to settings
-			$settings['border_width'] = $settings['img_settings'][$this->custom_fields->prefix.'map_border_width'][0];
-			$settings['border_opacity'] = $settings['img_settings'][$this->custom_fields->prefix.'map_border_opacity'][0];
-			$settings['more_info_bg'] = ( !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_background_color'][0] ) ) ? $settings['img_settings'][$this->custom_fields->prefix.'map_background_color'][0] : '';
-			$settings['more_info_text'] = ( !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_text_color'][0] ) ) ? $settings['img_settings'][$this->custom_fields->prefix.'map_text_color'][0] : '';
-			$settings['more_info_title'] = ( !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_title_color'][0] ) ) ? $settings['img_settings'][$this->custom_fields->prefix.'map_title_color'][0] : '';
-			$settings['img_bg'] = ( !empty( $settings['img_settings'][$this->custom_fields->prefix.'image_background_color'][0] ) ) ? $settings['img_settings'][$this->custom_fields->prefix.'image_background_color'][0] : '#efefef';
+			$settings['border_width']    = $settings['img_settings'][ $this->custom_fields->prefix . 'map_border_width' ][0];
+			$settings['border_opacity']  = $settings['img_settings'][ $this->custom_fields->prefix . 'map_border_opacity' ][0];
+			$settings['more_info_bg']    = ( ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_background_color' ][0] ) ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'map_background_color' ][0] : '';
+			$settings['more_info_text']  = ( ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_text_color' ][0] ) ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'map_text_color' ][0] : '';
+			$settings['more_info_title'] = ( ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_title_color' ][0] ) ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'map_title_color' ][0] : '';
+			$settings['img_bg']          = ( ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'image_background_color' ][0] ) ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'image_background_color' ][0] : '#efefef';
 
 			// Create hotspot style
 			if ( empty( $settings['styles'] ) ) {
 				$settings['styles'] = array();
 			}
 			$settings['styles'][] = array(
-				'title' => 'default',
-				'map_highlight_color' => !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_highlight_color'][0] ) ? $settings['img_settings'][$this->custom_fields->prefix.'map_highlight_color'][0] : '',
-				'map_highlight_opacity' => !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_highlight_opacity'][0] ) ? $settings['img_settings'][$this->custom_fields->prefix.'map_highlight_opacity'][0] : '',
-				'map_border_color' => !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_border_color'][0] ) ? $settings['img_settings'][$this->custom_fields->prefix.'map_border_color'][0] : '',
-				'_da_map_hover_color' => !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_hover_color'][0] ) ? $settings['img_settings'][$this->custom_fields->prefix.'map_hover_color'][0] : '',
-				'_da_map_hover_opacity' => !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_hover_opacity'][0] ) ? $settings['img_settings'][$this->custom_fields->prefix.'map_hover_opacity'][0] : ''
+				'title'                 => 'default',
+				'map_highlight_color'   => ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_highlight_color' ][0] ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'map_highlight_color' ][0] : '',
+				'map_highlight_opacity' => ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_highlight_opacity' ][0] ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'map_highlight_opacity' ][0] : '',
+				'map_border_color'      => ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_border_color' ][0] ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'map_border_color' ][0] : '',
+				'_da_map_hover_color'   => ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_hover_color' ][0] ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'map_hover_color' ][0] : '',
+				'_da_map_hover_opacity' => ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_hover_opacity' ][0] ) ? $settings['img_settings'][ $this->custom_fields->prefix . 'map_hover_opacity' ][0] : '',
 			);
 
 			// Create formatted array of styles
 			$formatted_styles = array();
-			foreach ($settings['styles'] as $key => $style) {
+			foreach ( $settings['styles'] as $key => $style ) {
 				if ( empty( $style['title'] ) ) {
 					$style['title'] = 'Custom';
 				}
 
 				$new_style = array(
-					'name' => 'default',
+					'name'        => 'default',
 					'borderWidth' => $settings['border_width'],
 				);
 
 				$new_style['display'] = array(
-					'fillColor' => '#ffffff',
-					'fillOpacity' => 0,
-					'borderColor' => '#ffffff',
+					'fillColor'     => '#ffffff',
+					'fillOpacity'   => 0,
+					'borderColor'   => '#ffffff',
 					'borderOpacity' => 0,
 				);
-				$new_style['hover'] = array(
-					'fillColor' => $style['map_highlight_color'],
-					'fillOpacity' => $style['map_highlight_opacity'],
-					'borderColor' => $style['map_border_color'],
+				$new_style['hover']   = array(
+					'fillColor'     => $style['map_highlight_color'],
+					'fillOpacity'   => $style['map_highlight_opacity'],
+					'borderColor'   => $style['map_border_color'],
 					'borderOpacity' => $settings['border_opacity'],
 				);
-				array_push($formatted_styles, $new_style);
+				array_push( $formatted_styles, $new_style );
 			}
 
 			// Get image post, src, and meta
-			$settings['img_post'] = get_post($settings['image_id']);
-			$settings['img_src'] = wp_get_attachment_image_src( get_post_thumbnail_id( $settings['image_id'] ), 'full' );
-			$settings['img_url'] = $settings['img_src'][0];
-			$settings['img_width'] = $settings['img_src'][1];
+			$settings['img_post']   = get_post( $settings['image_id'] );
+			$settings['img_src']    = wp_get_attachment_image_src( get_post_thumbnail_id( $settings['image_id'] ), 'full' );
+			$settings['img_url']    = $settings['img_src'][0];
+			$settings['img_width']  = $settings['img_src'][1];
 			$settings['img_height'] = $settings['img_src'][2];
-			$settings['img_alt'] = get_post_meta( get_post_thumbnail_id( $settings['img_post'] ), '_wp_attachment_image_alt', true );
+			$settings['img_alt']    = get_post_meta( get_post_thumbnail_id( $settings['img_post'] ), '_wp_attachment_image_alt', true );
 			if ( empty( $settings['img_alt'] ) ) {
 				$settings['img_alt'] = get_the_title( $settings['img_post'] );
 			}
@@ -554,13 +556,13 @@ public function shortcode( $atts ) {
 
 			ob_start();
 
-			require( $this->get_plugin_dir() . '/public/views/shortcode_template.php' );
+			require $this->get_plugin_dir() . '/public/views/shortcode_template.php';
 
 			return ob_get_clean();
 		}
 
 		function add_shortcode_metabox() {
-			add_meta_box( 'da_shortcode', __('Copy Shortcode', 'draw-attention' ), array( $this, 'display_shortcode_metabox' ), $this->cpt->post_type, 'side', 'low');
+			add_meta_box( 'da_shortcode', __( 'Copy Shortcode', 'draw-attention' ), array( $this, 'display_shortcode_metabox' ), $this->cpt->post_type, 'side', 'low' );
 		}
 
 		function display_shortcode_metabox() {
@@ -588,16 +590,16 @@ public static function locate_template( $template_name, $template_path = '', $de
 			$template = locate_template(
 				array(
 					trailingslashit( $template_path ) . $template_name,
-					$template_name
-					)
-				);
+					$template_name,
+				)
+			);
 
 			// Get default template
 			if ( ! $template ) {
 				$template = $default_path . $template_name;
 			}
 			// Return what we found
-			return apply_filters( self::slug.'_locate_template', $template, $template_name, $template_path );
+			return apply_filters( self::slug . '_locate_template', $template, $template_name, $template_path );
 		}
 
 		public static function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
@@ -613,13 +615,13 @@ public static function get_template( $template_name, $args = array(), $template_
 			}
 
 			// Allow 3rd party plugin filter template file from their plugin
-			$located = apply_filters( self::slug.'get_template', $located, $template_name, $args, $template_path, $default_path );
+			$located = apply_filters( self::slug . 'get_template', $located, $template_name, $args, $template_path, $default_path );
 
-			do_action( self::slug.'_before_template_part', $template_name, $template_path, $located, $args );
+			do_action( self::slug . '_before_template_part', $template_name, $template_path, $located, $args );
 
-			include( $located );
+			include $located;
 
-			do_action( self::slug.'_after_template_part', $template_name, $template_path, $located, $args );
+			do_action( self::slug . '_after_template_part', $template_name, $template_path, $located, $args );
 		}
 
 		public static function get_template_part( $slug, $name = '' ) {
@@ -642,7 +644,7 @@ public static function get_template_part( $slug, $name = '' ) {
 
 			// Allow 3rd party plugin filter template file from their plugin
 			if ( $template ) {
-				$template = apply_filters( self::slug.'_get_template_part', $template, $slug, $name );
+				$template = apply_filters( self::slug . '_get_template_part', $template, $slug, $name );
 			}
 
 			if ( $template ) {
@@ -655,13 +657,12 @@ public static function template_path() {
 		}
 
 		public static function get_plugin_dir() {
-			return dirname( dirname( __FILE__ ) );
+			return dirname( __DIR__ );
 		}
 
 		public static function get_plugin_url() {
 			return dirname( plugin_dir_url( __FILE__ ) );
 		}
-
 	}
 } elseif ( function_exists( 'da_deactivate_free_version' ) ) {
 	add_action( 'init', 'da_deactivate_free_version' );
diff --git a/public/includes/actions/action-bigcommerce.php b/public/includes/actions/action-bigcommerce.php
index c7492f41..5f02b4ff 100644
--- a/public/includes/actions/action-bigcommerce.php
+++ b/public/includes/actions/action-bigcommerce.php
@@ -7,7 +7,7 @@ public static function is_active() {
 			'\BigCommerce\Templates\Quick_View_Image',
 		);
 
-		foreach ( $classes as $class ) {		
+		foreach ( $classes as $class ) {
 			if ( ! class_exists( $class ) ) {
 				return false;
 			}
@@ -25,23 +25,25 @@ function add_action_fields( $group_details ) {
 
 		$product_options = get_transient( 'da_bc_product_options' );
 		if ( empty( $product_options ) ) {
-			$products = new WP_Query(array(
-				'post_type' => 'bigcommerce_product',
-				'posts_per_page' => -1,
-			) );
+			$products        = new WP_Query(
+				array(
+					'post_type'      => 'bigcommerce_product',
+					'posts_per_page' => -1,
+				)
+			);
 			$product_options = wp_list_pluck( $products->posts, 'post_title', 'ID' );
 
 			set_transient( 'da_bc_product_options', $product_options, 3600 );
 		}
-		
+
 		$select_options = array( '' => 'Select a Product...' );
 		$select_options = array_replace( $select_options, $product_options );
 
 		$group_details['fields'][0]['fields']['action-bigcommerce-product-id'] = array(
-			'name' => __('Big Commerce Product', 'draw-attention' ),
-			'id'   => 'action-bigcommerce-product-id',
-			'type' => 'select',
-			'options' => $select_options,
+			'name'       => __( 'Big Commerce Product', 'draw-attention' ),
+			'id'         => 'action-bigcommerce-product-id',
+			'type'       => 'select',
+			'options'    => $select_options,
 			'attributes' => array(
 				'data-action' => 'bigcommerce',
 			),
@@ -49,19 +51,19 @@ function add_action_fields( $group_details ) {
 
 		// TODO: Add display options
 		// $group_details['fields'][0]['fields']['action-bigcommerce-display-parts'] = array(
-		// 	'name' => __('BigCommerce Sections to Display', 'draw-attention' ),
-		// 	'id'   => 'action-bigcommerce-display-parts',
-		// 	'type' => 'multicheck',
-		// 	'options' => array(
-		// 		'image' => __( 'Image', 'draw-attention' ),
-		// 		'title' => __( 'Title', 'draw-attention' ),
-		// 		'description' => __( 'Description', 'draw-attention' ),
-		// 		'reviews' => __( 'Reviews', 'draw-attention' ),
-		// 		'add_to_cart' => __( 'Add to Cart', 'draw-attention' ),
-		// 	),
-		// 	'attributes' => array(
-		// 		'data-action' => 'bigcommerce',
-		// 	),
+		// 'name' => __('BigCommerce Sections to Display', 'draw-attention' ),
+		// 'id'   => 'action-bigcommerce-display-parts',
+		// 'type' => 'multicheck',
+		// 'options' => array(
+		// 'image' => __( 'Image', 'draw-attention' ),
+		// 'title' => __( 'Title', 'draw-attention' ),
+		// 'description' => __( 'Description', 'draw-attention' ),
+		// 'reviews' => __( 'Reviews', 'draw-attention' ),
+		// 'add_to_cart' => __( 'Add to Cart', 'draw-attention' ),
+		// ),
+		// 'attributes' => array(
+		// 'data-action' => 'bigcommerce',
+		// ),
 		// );
 
 		return $group_details;
@@ -76,27 +78,30 @@ public static function render_hotspot_content( $hotspot, $settings ) {
 			return;
 		}
 
-		$product_post_id = (int)$hotspot['action-bigcommerce-product-id'];
-		$product_post = get_post( $product_post_id );
+		$product_post_id = (int) $hotspot['action-bigcommerce-product-id'];
+		$product_post    = get_post( $product_post_id );
 		if ( empty( $product_post->ID ) ) {
 			return;
 		}
 
-		$product = new \BigCommerce\Post_Types\Product\Product( $product_post_id );
-		$image_component = \BigCommerce\Templates\Product_Featured_Image::factory( [
-			\BigCommerce\Templates\Product_Featured_Image::PRODUCT => $product,
-		] );
-		$attributes = array();
-
-		$quick_view_component = \BigCommerce\Templates\Quick_View_Image::factory( [
-			\BigCommerce\Templates\Quick_View_Image::PRODUCT    => $product,
-			\BigCommerce\Templates\Quick_View_Image::IMAGE      => $image_component->render(),
-			\BigCommerce\Templates\Quick_View_Image::ATTRIBUTES => $attributes,
-		] );
+		$product         = new \BigCommerce\Post_Types\Product\Product( $product_post_id );
+		$image_component = \BigCommerce\Templates\Product_Featured_Image::factory(
+			array(
+				\BigCommerce\Templates\Product_Featured_Image::PRODUCT => $product,
+			)
+		);
+		$attributes      = array();
+
+		$quick_view_component = \BigCommerce\Templates\Quick_View_Image::factory(
+			array(
+				\BigCommerce\Templates\Quick_View_Image::PRODUCT => $product,
+				\BigCommerce\Templates\Quick_View_Image::IMAGE => $image_component->render(),
+				\BigCommerce\Templates\Quick_View_Image::ATTRIBUTES => $attributes,
+			)
+		);
 
 		$data = $quick_view_component->get_data();
 
 		return $data['quick_view'];
-
 	}
-}
\ No newline at end of file
+}
diff --git a/public/includes/actions/action-url.php b/public/includes/actions/action-url.php
index c7d10272..5974809e 100644
--- a/public/includes/actions/action-url.php
+++ b/public/includes/actions/action-url.php
@@ -4,13 +4,13 @@ function add_action_fields( $group_details ) {
 		if ( ! $this->is_active() ) {
 			return $group_details;
 		}
-		
+
 		$group_details['fields'][0]['fields']['action']['options']['url'] = __( 'Go to URL', 'draw-attention' );
 
 		$group_details['fields'][0]['fields']['action-url-url'] = array(
-			'name' => __('URL', 'draw-attention' ),
-			'id'   => 'action-url-url',
-			'type' => 'text_url',
+			'name'       => __( 'URL', 'draw-attention' ),
+			'id'         => 'action-url-url',
+			'type'       => 'text_url',
 			'attributes' => array(
 				'placeholder' => site_url( 'custom/url/' ),
 				'data-action' => 'url',
@@ -18,14 +18,14 @@ function add_action_fields( $group_details ) {
 		);
 
 		$group_details['fields'][0]['fields']['action-url-open-in-window'] = array(
-			'name' => __('Open in New Window', 'draw-attention' ),
-			'id'   => 'action-url-open-in-window',
-			'type' => 'checkbox',
+			'name'       => __( 'Open in New Window', 'draw-attention' ),
+			'id'         => 'action-url-open-in-window',
+			'type'       => 'checkbox',
 			'attributes' => array(
 				'data-action' => 'url',
 			),
 		);
 
 		return $group_details;
-	}	
-}
\ No newline at end of file
+	}
+}
diff --git a/public/includes/actions/action.php b/public/includes/actions/action.php
index 880c92ce..5f406594 100644
--- a/public/includes/actions/action.php
+++ b/public/includes/actions/action.php
@@ -15,4 +15,4 @@ function add_action_fields( $group_details ) {
 
 		return $group_details;
 	}
-}
\ No newline at end of file
+}
diff --git a/public/includes/class-block-image.php b/public/includes/class-block-image.php
index 5a3386be..93d8fc17 100644
--- a/public/includes/class-block-image.php
+++ b/public/includes/class-block-image.php
@@ -43,7 +43,7 @@ public function hooks() {
 	}
 
 	function register_image_block() {
-		if( function_exists('register_block_type') ){
+		if ( function_exists( 'register_block_type' ) ) {
 			wp_register_script(
 				'drawattention-image-block-js',
 				trailingslashit( $this->plugin->get_plugin_url() ) . 'admin/assets/js/draw-attention-block.js',
@@ -55,19 +55,21 @@ function register_image_block() {
 				trailingslashit( $this->plugin->get_plugin_url() ) . 'admin/assets/css/draw-attention-block.css'
 			);
 
-			register_block_type( 'draw-attention/image', array(
-				'api_version' => 2,
-				'editor_script' => 'drawattention-image-block-js',
-				'editor_style' => 'drawattention-image-block-css',
-				'keywords' => array( 'image', 'hotspot', 'map' ),
+			register_block_type(
+				'draw-attention/image',
+				array(
+					'api_version'     => 2,
+					'editor_script'   => 'drawattention-image-block-js',
+					'editor_style'    => 'drawattention-image-block-css',
+					'keywords'        => array( 'image', 'hotspot', 'map' ),
 
-				'render_callback' => array( $this, 'render' ),
-			) );
+					'render_callback' => array( $this, 'render' ),
+				)
+			);
 		}
 	}
 
 	function render( $atts ) {
 		return $this->plugin->shortcode( $atts );
 	}
-
 }
diff --git a/public/includes/cpt.php b/public/includes/cpt.php
index a90027bf..76ba9352 100644
--- a/public/includes/cpt.php
+++ b/public/includes/cpt.php
@@ -1,24 +1,26 @@
 <?php
 class DrawAttention_CPT {
-	public $post_type = 'da_image';
+	public $post_type     = 'da_image';
 	public $singular_name = 'Image';
 
 	function __construct( $parent ) {
 
-		add_action( 'init' , array( $this, 'register_cpt' ) );
+		add_action( 'init', array( $this, 'register_cpt' ) );
 		// add_filter( 'manage_edit-' . $this->post_type . '_columns', array( $this, 'register_custom_column_headings' ), 10, 1 );
 		// add_action( 'manage_' . $this->post_type .'_posts_custom_column', array( $this, 'register_custom_columns' ), 10, 2 );
 
 		add_action( 'init', array( $this, 'load_drag_drop_featured_image' ) );
-		remove_filter( 'post_type_link', array('MWCPPost', 'post_type_link'), 10, 4 );
+		remove_filter( 'post_type_link', array( 'MWCPPost', 'post_type_link' ), 10, 4 );
 	}
 
 	function load_drag_drop_featured_image() {
 		global $drag_drop_featured_image_map;
-		if ( empty( $drag_drop_featured_image_map ) || !class_exists( 'WP_Drag_Drop_Featured_Image_Map' ) ) {
-			include_once( 'lib/drag-drop-featured-image/index.php' );
-			if ( !class_exists( 'WP_Drag_Drop_Featured_Image_Map' ) ) return;
-			$drag_drop_featured_image_map = new WP_Drag_Drop_Featured_Image_Map;
+		if ( empty( $drag_drop_featured_image_map ) || ! class_exists( 'WP_Drag_Drop_Featured_Image_Map' ) ) {
+			include_once 'lib/drag-drop-featured-image/index.php';
+			if ( ! class_exists( 'WP_Drag_Drop_Featured_Image_Map' ) ) {
+				return;
+			}
+			$drag_drop_featured_image_map = new WP_Drag_Drop_Featured_Image_Map();
 		}
 	}
 
@@ -26,51 +28,54 @@ function load_drag_drop_featured_image() {
 
 
 	function register_cpt() {
-		$result = register_post_type( $this->post_type, /* (http://codex.wordpress.org/Function_Reference/register_post_type) */
-		 	// let's now add all the options for this post type
-			array('labels' => array(
-				'name' => __('Draw Attention', $this->post_type.' general name', 'draw-attention' ), /* This is the Title of the Group */
-				'singular_name' => __('Image', $this->post_type.' singular name', 'draw-attention' ), /* This is the individual type */
-				'all_items' => __('All Images', 'draw-attention' ), /* the all items menu item */
-				'add_new' => __('Add New', 'custom '.$this->post_type.' item', 'draw-attention' ), /* The add new menu item */
-				'add_new_item' => __('Add New Image', 'draw-attention' ), /* Add New Display Title */
-				'edit' => __( 'Edit' ), /* Edit Dialog */
-				'edit_item' => __('Edit Image', 'draw-attention' ), /* Edit Display Title */
-				'new_item' => __('New Image', 'draw-attention' ), /* New Display Title */
-				'view_item' => __('View Image', 'draw-attention' ), /* View Display Title */
-				'search_items' => __('Search Images', 'draw-attention' ), /* Search CPT_SINGULAR_NAME Title */
-				'not_found' =>  __('Nothing found in the Database.', 'draw-attention' ), /* This displays if there are no entries yet */
-				'not_found_in_trash' => __('Nothing found in Trash', 'draw-attention' ), /* This displays if there is nothing in the trash */
-				'parent_item_colon' => ''
+		$result = register_post_type(
+			$this->post_type, /*
+			(http://codex.wordpress.org/Function_Reference/register_post_type) */
+			// let's now add all the options for this post type
+			array(
+				'labels'              => array(
+					'name'               => __( 'Draw Attention', $this->post_type . ' general name', 'draw-attention' ), /* This is the Title of the Group */
+					'singular_name'      => __( 'Image', $this->post_type . ' singular name', 'draw-attention' ), /* This is the individual type */
+					'all_items'          => __( 'All Images', 'draw-attention' ), /* the all items menu item */
+					'add_new'            => __( 'Add New', 'custom ' . $this->post_type . ' item', 'draw-attention' ), /* The add new menu item */
+					'add_new_item'       => __( 'Add New Image', 'draw-attention' ), /* Add New Display Title */
+					'edit'               => __( 'Edit' ), /* Edit Dialog */
+					'edit_item'          => __( 'Edit Image', 'draw-attention' ), /* Edit Display Title */
+					'new_item'           => __( 'New Image', 'draw-attention' ), /* New Display Title */
+					'view_item'          => __( 'View Image', 'draw-attention' ), /* View Display Title */
+					'search_items'       => __( 'Search Images', 'draw-attention' ), /* Search CPT_SINGULAR_NAME Title */
+					'not_found'          => __( 'Nothing found in the Database.', 'draw-attention' ), /* This displays if there are no entries yet */
+					'not_found_in_trash' => __( 'Nothing found in Trash', 'draw-attention' ), /* This displays if there is nothing in the trash */
+					'parent_item_colon'  => '',
 				), /* end of arrays */
-				'description' => __( 'Stores '.$this->post_type.'s in the database', 'draw-attention' ), /* CPT_SINGULAR_NAME Description */
-				'public' => true,
-				'publicly_queryable' => true,
+				'description'         => __( 'Stores ' . $this->post_type . 's in the database', 'draw-attention' ), /* CPT_SINGULAR_NAME Description */
+				'public'              => true,
+				'publicly_queryable'  => true,
 				'exclude_from_search' => true,
-				'show_ui' => true,
-				'query_var' => true,
-				'menu_position' => 8, /* this is what order you want it to appear in on the left hand side menu */
-				'menu_icon' => 'dashicons-images-alt2', /* the icon for the custom post type menu */
-				'rewrite'	=> false,
-				'has_archive' => $this->post_type.'s', /* you can rename the slug here */
-				'capabilities' => array(
-					'edit_post' => 'edit_others_posts',
-					'edit_posts' => 'edit_others_posts',
-					'edit_others_posts' => 'edit_others_posts',
-					'publish_posts' => 'edit_others_posts',
-					'read_post' => 'edit_others_posts',
+				'show_ui'             => true,
+				'query_var'           => true,
+				'menu_position'       => 8, /* this is what order you want it to appear in on the left hand side menu */
+				'menu_icon'           => 'dashicons-images-alt2', /* the icon for the custom post type menu */
+				'rewrite'             => false,
+				'has_archive'         => $this->post_type . 's', /* you can rename the slug here */
+				'capabilities'        => array(
+					'edit_post'          => 'edit_others_posts',
+					'edit_posts'         => 'edit_others_posts',
+					'edit_others_posts'  => 'edit_others_posts',
+					'publish_posts'      => 'edit_others_posts',
+					'read_post'          => 'edit_others_posts',
 					'read_private_posts' => 'edit_others_posts',
-					'delete_post' => 'edit_others_posts'
+					'delete_post'        => 'edit_others_posts',
 				),
 
-				'hierarchical' => false,
+				'hierarchical'        => false,
 				/* the next one is important, it tells what's enabled in the post editor */
-				'supports' => array( 'title', 'thumbnail' ),
-		 	) /* end of options */
+				'supports'            => array( 'title', 'thumbnail' ),
+			) /* end of options */
 		); /* end of register post type */
 	}
 
-	function get_image ( $id, $size = 'projects-thumbnail' ) {
+	function get_image( $id, $size = 'projects-thumbnail' ) {
 		$response = '';
 
 		if ( has_post_thumbnail( $id ) ) {
@@ -91,11 +96,11 @@ function get_image ( $id, $size = 'projects-thumbnail' ) {
 	 *
 	 * @access public
 	 * @param string $column_name
-	 * @param int $id
+	 * @param int    $id
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function register_custom_columns ( $column_name, $id ) {
+	public function register_custom_columns( $column_name, $id ) {
 		global $wpdb, $post;
 
 		$meta = get_post_custom( $id );
@@ -103,15 +108,15 @@ public function register_custom_columns ( $column_name, $id ) {
 		switch ( $column_name ) {
 
 			case 'image':
-			$value = '';
+				$value = '';
 
-			$value = $this->get_image( $id, 120 );
+				$value = $this->get_image( $id, 120 );
 
-			echo $value;
-			break;
+				echo $value;
+				break;
 
 			default:
-			break;
+				break;
 
 		}
 	} // End register_custom_columns()
@@ -124,7 +129,7 @@ public function register_custom_columns ( $column_name, $id ) {
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function register_custom_column_headings ( $defaults ) {
+	public function register_custom_column_headings( $defaults ) {
 
 		$new_columns          = array();
 		$new_columns['cb']    = $defaults['cb'];
@@ -132,7 +137,8 @@ public function register_custom_column_headings ( $defaults ) {
 
 		$last_item = '';
 
-		if ( isset( $defaults['date'] ) ) { unset( $defaults['date'] ); }
+		if ( isset( $defaults['date'] ) ) {
+			unset( $defaults['date'] ); }
 
 		if ( count( $defaults ) > 2 ) {
 			$last_item = array_slice( $defaults, -1 );
@@ -143,7 +149,7 @@ public function register_custom_column_headings ( $defaults ) {
 
 		if ( $last_item != '' ) {
 			foreach ( $last_item as $k => $v ) {
-				$defaults[$k] = $v;
+				$defaults[ $k ] = $v;
 				break;
 			}
 		}
diff --git a/public/includes/custom_fields.php b/public/includes/custom_fields.php
index 3b2d81e7..3f99228a 100644
--- a/public/includes/custom_fields.php
+++ b/public/includes/custom_fields.php
@@ -1,16 +1,16 @@
 <?php
 class DrawAttention_CustomFields {
 	public $parent;
-	public $prefix = '_da_';
+	public $prefix  = '_da_';
 	public $actions = array();
 
 	function __construct( $parent ) {
 		$this->parent = $parent;
-		if ( !class_exists( 'CMB2' ) ) {
-			if ( file_exists(  __DIR__ .'/lib/cmb2/init.php' ) ) {
-				require_once  __DIR__ .'/lib/cmb2/init.php';
-			} elseif ( file_exists(  __DIR__ .'/lib/CMB2/init.php' ) ) {
-				require_once  __DIR__ .'/lib/CMB2/init.php';
+		if ( ! class_exists( 'CMB2' ) ) {
+			if ( file_exists( __DIR__ . '/lib/cmb2/init.php' ) ) {
+				require_once __DIR__ . '/lib/cmb2/init.php';
+			} elseif ( file_exists( __DIR__ . '/lib/CMB2/init.php' ) ) {
+				require_once __DIR__ . '/lib/CMB2/init.php';
 			}
 		}
 
@@ -36,61 +36,82 @@ function __construct( $parent ) {
 	}
 
 	function cmb2_render_text_number( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {
-		if ( $escaped_value == "-1" ) $escaped_value = 0;
-		if ( $escaped_value === '' ) $escaped_value = 1;
-		echo $field_type_object->input( array( 'class' => 'cmb2-text-small', 'type' => 'number', 'value' => $escaped_value, ) ).'px';
+		if ( $escaped_value == '-1' ) {
+			$escaped_value = 0;
+		}
+		if ( $escaped_value === '' ) {
+			$escaped_value = 1;
+		}
+		echo $field_type_object->input(
+			array(
+				'class' => 'cmb2-text-small',
+				'type'  => 'number',
+				'value' => $escaped_value,
+			)
+		) . 'px';
 	}
 	function cmb2_sanitize_text_number( $new, $value, $object_id, $args, $field ) {
-		$new = preg_replace( "/[^0-9]/", "", $value );
-		if ( empty( $new ) ) $new = -1;
+		$new = preg_replace( '/[^0-9]/', '', $value );
+		if ( empty( $new ) ) {
+			$new = -1;
+		}
 
 		return $new;
 	}
 
 	function cmb2_render_opacity( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {
-		echo $field_type_object->input( array( 'class' => 'cmb2-text-small', 'type' => 'range', 'min' => 0.01, 'max' => 1.01, 'step' => 0.05, ) );
-		echo '<span class="opacity-percentage-value">'.( ( $escaped_value - .01 ) * 100).'</span>%';
+		echo $field_type_object->input(
+			array(
+				'class' => 'cmb2-text-small',
+				'type'  => 'range',
+				'min'   => 0.01,
+				'max'   => 1.01,
+				'step'  => 0.05,
+			)
+		);
+		echo '<span class="opacity-percentage-value">' . ( ( $escaped_value - .01 ) * 100 ) . '</span>%';
 	}
 	function cmb2_sanitize_opacity( $new ) {
 		return $new;
 	}
 
 	public function add_hotspot_area_details_table_metabox() {
-		add_meta_box( 'hotspot_area_details_table',
-			__('Hotspot Areas', 'draw-attention' ),
+		add_meta_box(
+			'hotspot_area_details_table',
+			__( 'Hotspot Areas', 'draw-attention' ),
 			array( $this, 'hotspot_area_details_table_metabox_callback' ),
 			$page,
 			'normal',
 			'default'
-		) ;
+		);
 	}
 
 	function highlight_styling_metabox( $metaboxes ) {
 		if ( ! is_array( $metaboxes ) ) {
 			$metaboxes = array();
 		}
-		
+
 		$metaboxes['highlight_styling'] = array(
-			'id' => 'highlight_styling_metabox',
-			'title' => __( 'Highlight Styling', 'draw-attention' ),
-			'object_types' => array( $this->parent->cpt->post_type, ),
-			'context'       => 'normal',
-			'priority'      => 'high',
-			'fields' => array(
+			'id'           => 'highlight_styling_metabox',
+			'title'        => __( 'Highlight Styling', 'draw-attention' ),
+			'object_types' => array( $this->parent->cpt->post_type ),
+			'context'      => 'normal',
+			'priority'     => 'high',
+			'fields'       => array(
 
 				array(
 					'name'    => __( 'Highlight Color', 'draw-attention' ),
 					'desc'    => '',
 					'id'      => $this->prefix . 'map_highlight_color',
 					'type'    => 'colorpicker',
-					'default' => '#ffffff'
+					'default' => '#ffffff',
 				),
 				array(
-					'name'    => __( 'Highlight Opacity', 'draw-attention' ),
-					'desc'    => '',
-					'id'      => $this->prefix . 'map_highlight_opacity',
-					'type'    => 'opacity',
-					'default' => '0.81',
+					'name'      => __( 'Highlight Opacity', 'draw-attention' ),
+					'desc'      => '',
+					'id'        => $this->prefix . 'map_highlight_opacity',
+					'type'      => 'opacity',
+					'default'   => '0.81',
 					'escape_cb' => array( $this, 'cmb2_allow_0_value' ),
 				),
 				array(
@@ -98,23 +119,22 @@ function highlight_styling_metabox( $metaboxes ) {
 					'desc'    => '',
 					'id'      => $this->prefix . 'map_border_color',
 					'type'    => 'colorpicker',
-					'default' => '#ffffff'
+					'default' => '#ffffff',
 				),
 				array(
 					'name'    => __( 'Border Opacity', 'draw-attention' ),
 					'desc'    => '',
 					'id'      => $this->prefix . 'map_border_opacity',
 					'type'    => 'opacity',
-					'default' => '0.81'
+					'default' => '0.81',
 				),
 				array(
-					'name'    => __( 'Border Width', 'draw-attention' ),
-					'desc'    => '',
-					'id'      => $this->prefix . 'map_border_width',
-					'type'    => 'text_number',
+					'name' => __( 'Border Width', 'draw-attention' ),
+					'desc' => '',
+					'id'   => $this->prefix . 'map_border_width',
+					'type' => 'text_number',
 				),
 
-
 			),
 		);
 
@@ -122,28 +142,28 @@ function highlight_styling_metabox( $metaboxes ) {
 	}
 
 	// function cmb2_allow_0_value( $meta_value, $args, $field ) {
-	// 	return $meta_value;
+	// return $meta_value;
 	// }
 
 	function moreinfo_metabox( $metaboxes ) {
 		if ( ! is_array( $metaboxes ) ) {
 			$metaboxes = array();
 		}
-		
+
 		$metaboxes['moreinfo'] = array(
-			'id' => 'moreinfo_metabox',
-			'title' => __( 'More Info Box Styling', 'draw-attention' ),
-			'object_types' => array( $this->parent->cpt->post_type, ),
-			'context'       => 'normal',
-			'priority'      => 'high',
-			'fields' => array(
+			'id'           => 'moreinfo_metabox',
+			'title'        => __( 'More Info Box Styling', 'draw-attention' ),
+			'object_types' => array( $this->parent->cpt->post_type ),
+			'context'      => 'normal',
+			'priority'     => 'high',
+			'fields'       => array(
 
 				array(
 					'name'    => __( 'Image Background Color', 'draw-attention' ),
 					'desc'    => __( 'Set the background color of behind the image', 'draw-attention' ),
 					'id'      => $this->prefix . 'image_background_color',
 					'type'    => 'colorpicker',
-					'default' => '#efefef'
+					'default' => '#efefef',
 				),
 
 				array(
@@ -151,7 +171,7 @@ function moreinfo_metabox( $metaboxes ) {
 					'desc'    => __( 'Set the color of titles in More Info box', 'draw-attention' ),
 					'id'      => $this->prefix . 'map_title_color',
 					'type'    => 'colorpicker',
-					'default' => '#000000'
+					'default' => '#000000',
 				),
 
 				array(
@@ -159,7 +179,7 @@ function moreinfo_metabox( $metaboxes ) {
 					'desc'    => __( 'Set the color of body text in More Info box', 'draw-attention' ),
 					'id'      => $this->prefix . 'map_text_color',
 					'type'    => 'colorpicker',
-					'default' => '#000000'
+					'default' => '#000000',
 				),
 
 				array(
@@ -167,16 +187,16 @@ function moreinfo_metabox( $metaboxes ) {
 					'desc'    => __( 'Set the background color of the More Info box', 'draw-attention' ),
 					'id'      => $this->prefix . 'map_background_color',
 					'type'    => 'colorpicker',
-					'default' => '#ffffff'
+					'default' => '#ffffff',
 				),
 
 				array(
-					'name'    => __( 'Default More Info', 'draw-attention' ),
-					'desc'    => __( 'Set the text to show up in the more info box (when no area is selected)', 'draw-attention' ),
-					'id'      => $this->prefix . 'map_more_info',
-					'type'    => 'textarea_small',
+					'name' => __( 'Default More Info', 'draw-attention' ),
+					'desc' => __( 'Set the text to show up in the more info box (when no area is selected)', 'draw-attention' ),
+					'id'   => $this->prefix . 'map_more_info',
+					'type' => 'textarea_small',
 				),
-				
+
 			),
 		);
 
@@ -187,142 +207,163 @@ function hotspot_area_group_details_metabox( $metaboxes ) {
 		if ( ! is_array( $metaboxes ) ) {
 			$metaboxes = array();
 		}
-		
-		if ( empty( $_REQUEST['post'] ) && empty( $_POST ) ) { return $metaboxes; }
 
-		if ( !empty( $_REQUEST['post'] ) ) {
+		if ( empty( $_REQUEST['post'] ) && empty( $_POST ) ) {
+			return $metaboxes; }
+
+		if ( ! empty( $_REQUEST['post'] ) ) {
 			$thumbnail_src = wp_get_attachment_image_src( get_post_thumbnail_id( esc_attr( $_REQUEST['post'] ) ), 'full' );
 		}
 
-		$metaboxes['field_group'] = apply_filters( 'da_hotspot_area_group_details', array(
-			'id'           => 'field_group',
-			'title'        => __( 'Hotspot Areas', 'draw-attention' ),
-			'object_types' => array( $this->parent->cpt->post_type, ),
-			'fields'       => array(
-				array(
-					'id'          => $this->prefix . 'hotspots',
-					'type'        => 'group',
-					'description' => __( 'Draw the clickable areas of your image', 'draw-attention' ),
-					'options'     => array(
-						'group_title'   => __( 'Clickable Area #{#}', 'draw-attention' ), // {#} gets replaced by row number
-						'add_button'    => __( 'Add Another Area', 'draw-attention' ),
-						'remove_button' => __( 'Remove Area', 'draw-attention' ),
-						'sortable'      => false, // beta
-				        'remove_confirm' => esc_html__( 'Are you sure you want to delete this? There is no undo.', 'draw-attention' ), // Performs confirmation before removing group
-					),
-					// Fields array works the same, except id's only need to be unique for this group. Prefix is not needed.
-					'fields'      => array(
-						'coordinates' => array(
-							'name' => __( 'Coordinates', 'draw-attention' ),
-							'id'   => 'coordinates',
-							'type' => 'text',
-							'attributes' => array(
-								'data-image-url' => ( !empty( $thumbnail_src[0] ) ) ? $thumbnail_src[0] : '',
-							),
-						),
-						'shape' => array(
-							'name' => __( 'Shape', 'draw-attention' ),
-							'id'   => 'shape',
-							'type' => 'text',
-							'default' => 'polygon'
+		$metaboxes['field_group'] = apply_filters(
+			'da_hotspot_area_group_details',
+			array(
+				'id'           => 'field_group',
+				'title'        => __( 'Hotspot Areas', 'draw-attention' ),
+				'object_types' => array( $this->parent->cpt->post_type ),
+				'fields'       => array(
+					array(
+						'id'          => $this->prefix . 'hotspots',
+						'type'        => 'group',
+						'description' => __( 'Draw the clickable areas of your image', 'draw-attention' ),
+						'options'     => array(
+							'group_title'    => __( 'Clickable Area #{#}', 'draw-attention' ), // {#} gets replaced by row number
+							'add_button'     => __( 'Add Another Area', 'draw-attention' ),
+							'remove_button'  => __( 'Remove Area', 'draw-attention' ),
+							'sortable'       => false, // beta
+							'remove_confirm' => esc_html__( 'Are you sure you want to delete this? There is no undo.', 'draw-attention' ), // Performs confirmation before removing group
 						),
-						'title' => array(
-							'name' => __('Title', 'draw-attention' ),
-							'id'   => 'title',
-							'type' => 'text',
-						),
-						'action' => array(
-							'name' => __('Action', 'draw-attention' ),
-							'description' => '',
-							'id'   => 'action',
-							'attributes' => array(
-								'class' => 'cmb2_select action',
+						// Fields array works the same, except id's only need to be unique for this group. Prefix is not needed.
+						'fields'      => array(
+							'coordinates'  => array(
+								'name'       => __( 'Coordinates', 'draw-attention' ),
+								'id'         => 'coordinates',
+								'type'       => 'text',
+								'attributes' => array(
+									'data-image-url' => ( ! empty( $thumbnail_src[0] ) ) ? $thumbnail_src[0] : '',
+								),
 							),
-							// 'type' => 'textarea_small',
-							'type' => 'select',
-							'options' => array(
-								'' => 'Show More Info',
+							'shape'        => array(
+								'name'    => __( 'Shape', 'draw-attention' ),
+								'id'      => 'shape',
+								'type'    => 'text',
+								'default' => 'polygon',
 							),
-						),
-						'description' => array(
-							'name' => __('Description', 'draw-attention' ),
-							'description' => '',
-							'id'   => 'description',
-							// 'type' => 'textarea_small',
-							'type' => 'wysiwyg',
-							'options' => array(
-								// 'wpautop' => true, // use wpautop?
-								'media_buttons' => false, // show insert/upload button(s)
-								// 'textarea_name' => $editor_id, // set the textarea name to something different, square brackets [] can be used here
-								'textarea_rows' => get_option('default_post_edit_rows', 7), // rows="..."
-								// 'tabindex' => '',
-								// 'editor_css' => '', // intended for extra styles for both visual and HTML editors buttons, needs to include the `<style>` tags, can use "scoped".
-								// 'editor_class' => '', // add extra class(es) to the editor textarea
-								'teeny' => true, // output the minimal editor config used in Press This
-								// 'dfw' => false, // replace the default fullscreen with DFW (needs specific css)
-								// 'tinymce' => true, // load TinyMCE, can be used to pass settings directly to TinyMCE using an array()
-								// 'quicktags' => true // load Quicktags, can be used to pass settings directly to Quicktags using an array()
+							'title'        => array(
+								'name' => __( 'Title', 'draw-attention' ),
+								'id'   => 'title',
+								'type' => 'text',
 							),
-							'attributes' => array(
-								'data-action' => 'more-info',
+							'action'       => array(
+								'name'        => __( 'Action', 'draw-attention' ),
+								'description' => '',
+								'id'          => 'action',
+								'attributes'  => array(
+									'class' => 'cmb2_select action',
+								),
+								// 'type' => 'textarea_small',
+								'type'        => 'select',
+								'options'     => array(
+									'' => 'Show More Info',
+								),
 							),
-						),
-						'detail_image' => array(
-							'name' => __( 'Detail Image', 'draw-attention' ),
-							'desc' => __( 'Upload an image or enter a URL to show in the more info box', 'draw-attention' ),
-							'id'   => 'detail_image',
-							'type' => 'file',
-							'attributes' => array(
-								'data-action' => 'more-info',
+							'description'  => array(
+								'name'        => __( 'Description', 'draw-attention' ),
+								'description' => '',
+								'id'          => 'description',
+								// 'type' => 'textarea_small',
+								'type'        => 'wysiwyg',
+								'options'     => array(
+									// 'wpautop' => true, // use wpautop?
+									'media_buttons' => false, // show insert/upload button(s)
+									// 'textarea_name' => $editor_id, // set the textarea name to something different, square brackets [] can be used here
+									'textarea_rows' => get_option( 'default_post_edit_rows', 7 ), // rows="..."
+									// 'tabindex' => '',
+									// 'editor_css' => '', // intended for extra styles for both visual and HTML editors buttons, needs to include the `<style>` tags, can use "scoped".
+									// 'editor_class' => '', // add extra class(es) to the editor textarea
+									'teeny'         => true, // output the minimal editor config used in Press This
+									// 'dfw' => false, // replace the default fullscreen with DFW (needs specific css)
+									// 'tinymce' => true, // load TinyMCE, can be used to pass settings directly to TinyMCE using an array()
+									// 'quicktags' => true // load Quicktags, can be used to pass settings directly to Quicktags using an array()
+								),
+								'attributes'  => array(
+									'data-action' => 'more-info',
+								),
+							),
+							'detail_image' => array(
+								'name'       => __( 'Detail Image', 'draw-attention' ),
+								'desc'       => __( 'Upload an image or enter a URL to show in the more info box', 'draw-attention' ),
+								'id'         => 'detail_image',
+								'type'       => 'file',
+								'attributes' => array(
+									'data-action' => 'more-info',
+								),
 							),
 						),
 					),
 				),
-			),
-		) );
-  
+			)
+		);
+
 		return $metaboxes;
 	}
 
 	function hotspot_area_override_title_and_content( $value, $object_id, $args, $field ) {
-		if ( $value != 'cmb2_field_no_override_val' ) return $value; // don't modify already overridden values
+		if ( $value != 'cmb2_field_no_override_val' ) {
+			return $value; // don't modify already overridden values
+		}
 
 		if ( $args['id'] == '_title' ) {
 			$post = get_post( $object_id );
-			if ( !empty( $post->post_title ) ) return $post->post_title;
+			if ( ! empty( $post->post_title ) ) {
+				return $post->post_title;
+			}
 		}
 		if ( $args['id'] == '_content' ) {
 			$post = get_post( $object_id );
-			if ( !empty( $post->post_content ) ) return $post->post_content;
+			if ( ! empty( $post->post_content ) ) {
+				return $post->post_content;
+			}
 		}
 
 		return $value;
 	}
 
 	function update_hotspot_area_details() {
-		if ( !isset( $_POST['_pid'] ) ) return;
-		check_ajax_referer( 'update-hotspot_'.$_POST['_pid'], 'ajaxnonce' );
+		if ( ! isset( $_POST['_pid'] ) ) {
+			return;
+		}
+		check_ajax_referer( 'update-hotspot_' . $_POST['_pid'], 'ajaxnonce' );
+
+		if ( ! current_user_can( 'delete_others_posts' ) ) {
+			status_header( 403 );
+			nocache_headers();
+			wp_die( 'Bad Request: You do not have permission to access this page' );
+		}
 
 		if ( isset( $_POST['_title'] ) ) {
 			$_POST['_title'] = wp_filter_nohtml_kses( $_POST['_title'] ); // also expects & returns slashes
-			$title = $_POST['_title'];
-			wp_update_post( array(
-				'ID' => $_POST['_pid'],
-				'post_title' => $_POST['_title'],
-			) );
+			$title           = $_POST['_title'];
+			wp_update_post(
+				array(
+					'ID'         => $_POST['_pid'],
+					'post_title' => $_POST['_title'],
+				)
+			);
 		}
 
 		if ( isset( $_POST['_content'] ) ) {
 			$_POST['_content'] = wp_filter_kses( $_POST['_content'] );
-			$title = $_POST['_content'];
-			wp_update_post( array(
-				'ID' => $_POST['_pid'],
-				'post_content' => $_POST['_content'],
-			) );
+			$title             = $_POST['_content'];
+			wp_update_post(
+				array(
+					'ID'           => $_POST['_pid'],
+					'post_content' => $_POST['_content'],
+				)
+			);
 		}
 
-		$coordinates = $_POST[$this->prefix.'coordinates'];
-		update_post_meta( $_POST['_pid'], $this->prefix.'coordinates', $coordinates );
+		$coordinates = $_POST[ $this->prefix . 'coordinates' ];
+		update_post_meta( $_POST['_pid'], $this->prefix . 'coordinates', $coordinates );
 	}
-
 }
diff --git a/public/includes/import-export.php b/public/includes/import-export.php
index 440430a1..816df75e 100644
--- a/public/includes/import-export.php
+++ b/public/includes/import-export.php
@@ -1,7 +1,7 @@
 <?php
 
 // uncomment this line for testing
-//set_site_transient( 'update_plugins', null );
+// set_site_transient( 'update_plugins', null );
 
 class DrawAttention_ImportExport {
 	public $parent;
@@ -13,7 +13,7 @@ function __construct( $parent ) {
 	}
 
 	public function is_action( $action ) {
-		if ( !empty( $_POST['action'] ) && $_POST['action'] === $action ) {
+		if ( ! empty( $_POST['action'] ) && $_POST['action'] === $action ) {
 			return true;
 		}
 
@@ -21,28 +21,36 @@ public function is_action( $action ) {
 	}
 
 	public function process_import() {
-		if ( !$this->is_action( 'import' ) ) {
+		if ( ! $this->is_action( 'import' ) ) {
 			return;
 		}
-		
+
 		if ( empty( $_POST['import_code'] ) ) {
 			return;
 		}
-		$import_code = stripslashes($_POST['import_code']);
+
+		// verify nonce
+		if ( ! wp_verify_nonce( $_POST['_wpnonce'], 'da_import_nonce' ) || ! current_user_can( 'delete_others_posts' ) ) {
+			status_header( 403 );
+			nocache_headers();
+			wp_die( 'Bad Request: You do not have permission to access this page' );
+		}
+
+		$import_code  = stripslashes( $_POST['import_code'] );
 		$import_array = json_decode( $import_code, true );
 		if ( empty( $import_array['0']['post']['ID'] ) ) {
 			return false;
 		}
 
 		$imported = array();
-		$errors = array();
+		$errors   = array();
 
-		foreach ($import_array as $key => $to_import) {
-			unset($to_import['post']['ID']);
+		foreach ( $import_array as $key => $to_import ) {
+			unset( $to_import['post']['ID'] );
 			$insert_id = wp_insert_post( $to_import['post'], false );
-			if ( !empty( $insert_id ) ) {
+			if ( ! empty( $insert_id ) ) {
 				$imported[] = array(
-					'ID' => $insert_id,
+					'ID'         => $insert_id,
 					'post_title' => $to_import['post']['post_title'],
 				);
 			} else {
@@ -52,35 +60,42 @@ public function process_import() {
 
 		return array(
 			'imported' => $imported,
-			'errors' => $errors,
+			'errors'   => $errors,
 		);
 	}
 
-	public function get_export_array( $ids=array() ) {
+	public function get_export_array( $ids = array() ) {
 		$response = array();
-		foreach ($ids as $key => $id) {
+		foreach ( $ids as $key => $id ) {
 			$post = get_post( $id );
 			if ( empty( $post->post_type ) || $post->post_type !== 'da_image' ) {
 				continue;
 			}
 
-			$response[$key] = array(
-				'id' => $id,
-				'post' => (array)$post,
+			$response[ $key ] = array(
+				'id'   => $id,
+				'post' => (array) $post,
 			);
-			$metadata = get_post_meta( $id, '', true );
-			foreach ($metadata as $meta_key => $meta_value) {
+			$metadata         = get_post_meta( $id, '', true );
+			foreach ( $metadata as $meta_key => $meta_value ) {
 				if ( strpos( $meta_key, '_da_' ) !== 0 ) {
 					continue;
 				}
-				$response[$key]['post']['meta_input'][$meta_key] = maybe_unserialize( $meta_value[0] );
+				$response[ $key ]['post']['meta_input'][ $meta_key ] = maybe_unserialize( $meta_value[0] );
 			}
 		}
 
 		return $response;
 	}
 
-	public function get_export_json( $ids=array() ) {
+	public function get_export_json( $ids = array() ) {
+		// verify nonce
+		if ( ! wp_verify_nonce( $_POST['_wpnonce'], 'da_export_nonce' ) || ! current_user_can( 'delete_others_posts' ) ) {
+			status_header( 403 );
+			nocache_headers();
+			wp_die( 'Bad Request: You do not have permission to access this page' );
+		}
+
 		$export_array = $this->get_export_array( $ids );
 		return json_encode( $export_array );
 	}
@@ -88,25 +103,31 @@ public function get_export_json( $ids=array() ) {
 	public function admin_menu() {
 		global $submenu;
 
-		add_submenu_page( 'edit.php?post_type=da_image', __( 'Import / Export', 'draw-attention' ), __( 'Import / Export', 'draw-attention' ), 'edit_posts', 'import_export', array( $this, 'output_import_export_page' ) );
+		add_submenu_page( 'edit.php?post_type=da_image', __( 'Import / Export', 'draw-attention' ), __( 'Import / Export', 'draw-attention' ), 'delete_others_posts', 'import_export', array( $this, 'output_import_export_page' ) );
 	}
 
 	public function output_import_export_page() {
+		if ( ! current_user_can( 'delete_others_posts' ) ) {
+			status_header( 403 );
+			nocache_headers();
+			wp_die( 'Bad Request: You do not have permission to access this page' );
+		}
 		?>
 		<div class="import">
 			<h3>Import</h3>
 			<p>If you've already exported from another site, paste the export code below:</p>
 			<form method="POST" name="import" action="edit.php?post_type=da_image&page=import_export">
+				<?php wp_nonce_field( 'da_import_nonce' ); ?>
 				<input type="hidden" name="action" value="import" />
 				<textarea name="import_code" cols="100" rows="5" placeholder=""></textarea><br />
 				<input type="submit" value="Import" />
 			</form>
 			<?php $response = $this->process_import(); ?>
-			<?php if ( !empty( $response ) ): ?>
-				<?php foreach ($response['imported'] as $key => $value): ?>
+			<?php if ( ! empty( $response ) ) : ?>
+				<?php foreach ( $response['imported'] as $key => $value ) : ?>
 					<h4>
 						Successfully imported 
-						<a href="<?php echo admin_url( 'post.php?post='.$value['ID'].'&action=edit' ); ?>">
+						<a href="<?php echo admin_url( 'post.php?post=' . $value['ID'] . '&action=edit' ); ?>">
 							<?php echo $value['post_title']; ?>
 						</a>
 					</h4>
@@ -120,31 +141,40 @@ public function output_import_export_page() {
 			<p>Choose images to export</p>
 			<form method="POST" name="export" action="edit.php?post_type=da_image&page=import_export">
 				<input type="hidden" name="action" value="export" />
+				<?php wp_nonce_field( 'da_export_nonce' ); ?>
 				<?php
-				$da_images = new WP_Query( array(
-					'post_type' => 'da_image',
-					'post_status' => 'any',
-					'posts_per_page' => 1,
-					'order' => 'DESC',
-					'orderby' => 'ID',
-				) );
-				$export_ids = ( empty( $_POST['export_ids'] ) ) ? array() : (array)$_POST['export_ids'];
-				foreach ($da_images->posts as $key => $da_image): ?>
-					<input type="checkbox" name="export_ids[]" value="<?php echo $da_image->ID; ?>" id="export_id_<?php echo $da_image->ID; ?>" <?php if( in_array( $da_image->ID, $export_ids ) ) echo 'checked="checked"'; ?> /> <label for="export_id_<?php echo $da_image->ID; ?>"><?php echo $da_image->post_title; ?></label><br />
+				$da_images  = new WP_Query(
+					array(
+						'post_type'      => 'da_image',
+						'post_status'    => 'any',
+						'posts_per_page' => 1,
+						'order'          => 'DESC',
+						'orderby'        => 'ID',
+					)
+				);
+				$export_ids = ( empty( $_POST['export_ids'] ) ) ? array() : (array) $_POST['export_ids'];
+				foreach ( $da_images->posts as $key => $da_image ) :
+					?>
+					<input type="checkbox" name="export_ids[]" value="<?php echo $da_image->ID; ?>" id="export_id_<?php echo $da_image->ID; ?>" 
+																				<?php
+																				if ( in_array( $da_image->ID, $export_ids ) ) {
+																					echo 'checked="checked"';}
+																				?>
+					/> <label for="export_id_<?php echo $da_image->ID; ?>"><?php echo $da_image->post_title; ?></label><br />
 				<?php endforeach; ?>
 				<input type="submit" value="Generate Export Code" />
 			</form>
 
-			<?php if ( $this->is_action( 'export' ) ): ?>
-				<?php if ( empty( $_POST['export_ids'] ) ): ?>
+			<?php if ( $this->is_action( 'export' ) ) : ?>
+				<?php if ( empty( $_POST['export_ids'] ) ) : ?>
 					Please select one or more images above to export
-				<?php else: ?>
+				<?php else : ?>
 					<?php
 					$export_ids = $_POST['export_ids'];
-					if ( !is_array( $export_ids ) ) {
+					if ( ! is_array( $export_ids ) ) {
 						$export_ids = array();
 					}
-					$export_ids = array_map( 'esc_attr', $export_ids );
+					$export_ids  = array_map( 'esc_attr', $export_ids );
 					$export_json = $this->get_export_json( $export_ids );
 					?>
 					<textarea cols="100" rows="20"><?php echo $export_json; ?></textarea>
@@ -153,5 +183,4 @@ public function output_import_export_page() {
 		</div>
 		<?php
 	}
-
 }
\ No newline at end of file
diff --git a/public/includes/lib/CMB2/example-functions.php b/public/includes/lib/CMB2/example-functions.php
index 0c78aaff..0bd4b25c 100755
--- a/public/includes/lib/CMB2/example-functions.php
+++ b/public/includes/lib/CMB2/example-functions.php
@@ -15,10 +15,10 @@
  * Get the bootstrap! If using the plugin from wordpress.org, REMOVE THIS!
  */
 
-if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) {
-	require_once dirname( __FILE__ ) . '/cmb2/init.php';
-} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) {
-	require_once dirname( __FILE__ ) . '/CMB2/init.php';
+if ( file_exists( __DIR__ . '/cmb2/init.php' ) ) {
+	require_once __DIR__ . '/cmb2/init.php';
+} elseif ( file_exists( __DIR__ . '/CMB2/init.php' ) ) {
+	require_once __DIR__ . '/CMB2/init.php';
 }
 
 /**
@@ -110,10 +110,11 @@ function yourprefix_register_demo_metabox() {
 	/**
 	 * Sample metabox to demonstrate each field type included
 	 */
-	$cmb_demo = new_cmb2_box( array(
-		'id'            => 'yourprefix_demo_metabox',
-		'title'         => esc_html__( 'Test Metabox', 'cmb2' ),
-		'object_types'  => array( 'page' ), // Post type
+	$cmb_demo = new_cmb2_box(
+		array(
+			'id'           => 'yourprefix_demo_metabox',
+			'title'        => esc_html__( 'Test Metabox', 'cmb2' ),
+			'object_types' => array( 'page' ), // Post type
 		// 'show_on_cb' => 'yourprefix_show_if_front_page', // function should return a bool value
 		// 'context'    => 'normal',
 		// 'priority'   => 'high',
@@ -142,329 +143,391 @@ function yourprefix_register_demo_metabox() {
 		 * More: https://wordpress.org/gutenberg/handbook/extensibility/meta-box/
 		 */
 		// 'mb_callback_args' => array( '__block_editor_compatible_meta_box' => false ),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'       => esc_html__( 'Test Text', 'cmb2' ),
-		'desc'       => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'         => 'yourprefix_demo_text',
-		'type'       => 'text',
-		'show_on_cb' => 'yourprefix_hide_if_no_cats', // function should return a bool value
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'       => esc_html__( 'Test Text', 'cmb2' ),
+			'desc'       => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'         => 'yourprefix_demo_text',
+			'type'       => 'text',
+			'show_on_cb' => 'yourprefix_hide_if_no_cats', // function should return a bool value
 		// 'sanitization_cb' => 'my_custom_sanitization', // custom sanitization callback parameter
 		// 'escape_cb'       => 'my_custom_escaping',  // custom escaping callback parameter
 		// 'on_front'        => false, // Optionally designate a field to wp-admin only
 		// 'repeatable'      => true,
 		// 'column'          => true, // Display field value in the admin post-listing columns
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Text Small', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_textsmall',
-		'type' => 'text_small',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Text Small', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_textsmall',
+			'type' => 'text_small',
 		// 'repeatable' => true,
 		// 'column' => array(
-		// 	'name'     => esc_html__( 'Column Title', 'cmb2' ), // Set the admin column title
-		// 	'position' => 2, // Set as the second column.
+		// 'name'     => esc_html__( 'Column Title', 'cmb2' ), // Set the admin column title
+		// 'position' => 2, // Set as the second column.
 		// );
 		// 'display_cb' => 'yourprefix_display_text_small_column', // Output the display of the column values through a callback.
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Text Medium', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_textmedium',
-		'type' => 'text_medium',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'       => esc_html__( 'Read-only Disabled Field', 'cmb2' ),
-		'desc'       => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'         => 'yourprefix_demo_readonly',
-		'type'       => 'text_medium',
-		'default'    => esc_attr__( 'Hey there, I\'m a read-only field', 'cmb2' ),
-		'save_field' => false, // Disables the saving of this field.
-		'attributes' => array(
-			'disabled' => 'disabled',
-			'readonly' => 'readonly',
-		),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Custom Rendered Field', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_render_row_cb',
-		'type' => 'text',
-		'render_row_cb' => 'yourprefix_render_row_cb',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Website URL', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_url',
-		'type' => 'text_url',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Text Medium', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_textmedium',
+			'type' => 'text_medium',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'       => esc_html__( 'Read-only Disabled Field', 'cmb2' ),
+			'desc'       => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'         => 'yourprefix_demo_readonly',
+			'type'       => 'text_medium',
+			'default'    => esc_attr__( 'Hey there, I\'m a read-only field', 'cmb2' ),
+			'save_field' => false, // Disables the saving of this field.
+			'attributes' => array(
+				'disabled' => 'disabled',
+				'readonly' => 'readonly',
+			),
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'          => esc_html__( 'Custom Rendered Field', 'cmb2' ),
+			'desc'          => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'            => 'yourprefix_demo_render_row_cb',
+			'type'          => 'text',
+			'render_row_cb' => 'yourprefix_render_row_cb',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Website URL', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_url',
+			'type' => 'text_url',
 		// 'protocols' => array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet'), // Array of allowed protocols
 		// 'repeatable' => true,
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Text Email', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_email',
-		'type' => 'text_email',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Text Email', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_email',
+			'type' => 'text_email',
 		// 'repeatable' => true,
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Time', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_time',
-		'type' => 'text_time',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Time', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_time',
+			'type' => 'text_time',
 		// 'time_format' => 'H:i', // Set to 24hr format
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Time zone', 'cmb2' ),
-		'desc' => esc_html__( 'Time zone', 'cmb2' ),
-		'id'   => 'yourprefix_demo_timezone',
-		'type' => 'select_timezone',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Date Picker', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_textdate',
-		'type' => 'text_date',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Time zone', 'cmb2' ),
+			'desc' => esc_html__( 'Time zone', 'cmb2' ),
+			'id'   => 'yourprefix_demo_timezone',
+			'type' => 'select_timezone',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Date Picker', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_textdate',
+			'type' => 'text_date',
 		// 'date_format' => 'Y-m-d',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Date Picker (UNIX timestamp)', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_textdate_timestamp',
-		'type' => 'text_date_timestamp',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Date Picker (UNIX timestamp)', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_textdate_timestamp',
+			'type' => 'text_date_timestamp',
 		// 'timezone_meta_key' => 'yourprefix_demo_timezone', // Optionally make this field honor the timezone selected in the select_timezone specified above
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Date/Time Picker Combo (UNIX timestamp)', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_datetime_timestamp',
-		'type' => 'text_datetime_timestamp',
-	) );
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Date/Time Picker Combo (UNIX timestamp)', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_datetime_timestamp',
+			'type' => 'text_datetime_timestamp',
+		)
+	);
 
 	// This text_datetime_timestamp_timezone field type
 	// is only compatible with PHP versions 5.3 or above.
 	// Feel free to uncomment and use if your server meets the requirement
 	// $cmb_demo->add_field( array(
-	// 	'name' => esc_html__( 'Test Date/Time Picker/Time zone Combo (serialized DateTime object)', 'cmb2' ),
-	// 	'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-	// 	'id'   => 'yourprefix_demo_datetime_timestamp_timezone',
-	// 	'type' => 'text_datetime_timestamp_timezone',
+	// 'name' => esc_html__( 'Test Date/Time Picker/Time zone Combo (serialized DateTime object)', 'cmb2' ),
+	// 'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+	// 'id'   => 'yourprefix_demo_datetime_timestamp_timezone',
+	// 'type' => 'text_datetime_timestamp_timezone',
 	// ) );
 
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Money', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_textmoney',
-		'type' => 'text_money',
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Money', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_textmoney',
+			'type' => 'text_money',
 		// 'before_field' => '£', // override '$' symbol if needed
 		// 'repeatable' => true,
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'    => esc_html__( 'Test Color Picker', 'cmb2' ),
-		'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'      => 'yourprefix_demo_colorpicker',
-		'type'    => 'colorpicker',
-		'default' => '#ffffff',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'    => esc_html__( 'Test Color Picker', 'cmb2' ),
+			'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'      => 'yourprefix_demo_colorpicker',
+			'type'    => 'colorpicker',
+			'default' => '#ffffff',
 		// 'options' => array(
-		// 	'alpha' => true, // Make this a rgba color picker.
+		// 'alpha' => true, // Make this a rgba color picker.
 		// ),
 		// 'attributes' => array(
-		// 	'data-colorpicker' => json_encode( array(
-		// 		'palettes' => array( '#3dd0cc', '#ff834c', '#4fa2c0', '#0bc991', ),
-		// 	) ),
+		// 'data-colorpicker' => json_encode( array(
+		// 'palettes' => array( '#3dd0cc', '#ff834c', '#4fa2c0', '#0bc991', ),
+		// ) ),
 		// ),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Text Area', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_textarea',
-		'type' => 'textarea',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Text Area Small', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_textareasmall',
-		'type' => 'textarea_small',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Text Area for Code', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_textarea_code',
-		'type' => 'textarea_code',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Text Area', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_textarea',
+			'type' => 'textarea',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Text Area Small', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_textareasmall',
+			'type' => 'textarea_small',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Text Area for Code', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_textarea_code',
+			'type' => 'textarea_code',
 		// 'attributes' => array(
-		// 	// Optionally override the code editor defaults.
-		// 	'data-codeeditor' => json_encode( array(
-		// 		'codemirror' => array(
-		// 			'lineNumbers' => false,
-		// 			'mode' => 'css',
-		// 		),
-		// 	) ),
+		// Optionally override the code editor defaults.
+		// 'data-codeeditor' => json_encode( array(
+		// 'codemirror' => array(
+		// 'lineNumbers' => false,
+		// 'mode' => 'css',
+		// ),
+		// ) ),
 		// ),
 		// To keep the previous formatting, you can disable codemirror.
 		// 'options' => array( 'disable_codemirror' => true ),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Title Weeeee', 'cmb2' ),
-		'desc' => esc_html__( 'This is a title description', 'cmb2' ),
-		'id'   => 'yourprefix_demo_title',
-		'type' => 'title',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'             => esc_html__( 'Test Select', 'cmb2' ),
-		'desc'             => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'               => 'yourprefix_demo_select',
-		'type'             => 'select',
-		'show_option_none' => true,
-		'options'          => array(
-			'standard' => esc_html__( 'Option One', 'cmb2' ),
-			'custom'   => esc_html__( 'Option Two', 'cmb2' ),
-			'none'     => esc_html__( 'Option Three', 'cmb2' ),
-		),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'             => esc_html__( 'Test Radio inline', 'cmb2' ),
-		'desc'             => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'               => 'yourprefix_demo_radio_inline',
-		'type'             => 'radio_inline',
-		'show_option_none' => 'No Selection',
-		'options'          => array(
-			'standard' => esc_html__( 'Option One', 'cmb2' ),
-			'custom'   => esc_html__( 'Option Two', 'cmb2' ),
-			'none'     => esc_html__( 'Option Three', 'cmb2' ),
-		),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'    => esc_html__( 'Test Radio', 'cmb2' ),
-		'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'      => 'yourprefix_demo_radio',
-		'type'    => 'radio',
-		'options' => array(
-			'option1' => esc_html__( 'Option One', 'cmb2' ),
-			'option2' => esc_html__( 'Option Two', 'cmb2' ),
-			'option3' => esc_html__( 'Option Three', 'cmb2' ),
-		),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'     => esc_html__( 'Test Taxonomy Radio', 'cmb2' ),
-		'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'       => 'yourprefix_demo_text_taxonomy_radio',
-		'type'     => 'taxonomy_radio', // Or `taxonomy_radio_inline`/`taxonomy_radio_hierarchical`
-		'taxonomy' => 'category', // Taxonomy Slug
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Title Weeeee', 'cmb2' ),
+			'desc' => esc_html__( 'This is a title description', 'cmb2' ),
+			'id'   => 'yourprefix_demo_title',
+			'type' => 'title',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'             => esc_html__( 'Test Select', 'cmb2' ),
+			'desc'             => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'               => 'yourprefix_demo_select',
+			'type'             => 'select',
+			'show_option_none' => true,
+			'options'          => array(
+				'standard' => esc_html__( 'Option One', 'cmb2' ),
+				'custom'   => esc_html__( 'Option Two', 'cmb2' ),
+				'none'     => esc_html__( 'Option Three', 'cmb2' ),
+			),
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'             => esc_html__( 'Test Radio inline', 'cmb2' ),
+			'desc'             => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'               => 'yourprefix_demo_radio_inline',
+			'type'             => 'radio_inline',
+			'show_option_none' => 'No Selection',
+			'options'          => array(
+				'standard' => esc_html__( 'Option One', 'cmb2' ),
+				'custom'   => esc_html__( 'Option Two', 'cmb2' ),
+				'none'     => esc_html__( 'Option Three', 'cmb2' ),
+			),
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'    => esc_html__( 'Test Radio', 'cmb2' ),
+			'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'      => 'yourprefix_demo_radio',
+			'type'    => 'radio',
+			'options' => array(
+				'option1' => esc_html__( 'Option One', 'cmb2' ),
+				'option2' => esc_html__( 'Option Two', 'cmb2' ),
+				'option3' => esc_html__( 'Option Three', 'cmb2' ),
+			),
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'       => esc_html__( 'Test Taxonomy Radio', 'cmb2' ),
+			'desc'       => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'         => 'yourprefix_demo_text_taxonomy_radio',
+			'type'       => 'taxonomy_radio', // Or `taxonomy_radio_inline`/`taxonomy_radio_hierarchical`
+			'taxonomy'   => 'category', // Taxonomy Slug
 		// 'inline'  => true, // Toggles display to inline
 		// Optionally override the args sent to the WordPress get_terms function.
-		'query_args' => array(
+			'query_args' => array(
 			// 'orderby' => 'slug',
 			// 'hide_empty' => true,
-		),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'     => esc_html__( 'Test Taxonomy Select', 'cmb2' ),
-		'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'       => 'yourprefix_demo_taxonomy_select',
-		'type'     => 'taxonomy_select', // Or `taxonomy_select_hierarchical`
-		'taxonomy' => 'category', // Taxonomy Slug
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'     => esc_html__( 'Test Taxonomy Multi Checkbox', 'cmb2' ),
-		'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'       => 'yourprefix_demo_multitaxonomy',
-		'type'     => 'taxonomy_multicheck', // Or `taxonomy_multicheck_inline`/`taxonomy_multicheck_hierarchical`
-		'taxonomy' => 'post_tag', // Taxonomy Slug
+			),
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'     => esc_html__( 'Test Taxonomy Select', 'cmb2' ),
+			'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'       => 'yourprefix_demo_taxonomy_select',
+			'type'     => 'taxonomy_select', // Or `taxonomy_select_hierarchical`
+			'taxonomy' => 'category', // Taxonomy Slug
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'     => esc_html__( 'Test Taxonomy Multi Checkbox', 'cmb2' ),
+			'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'       => 'yourprefix_demo_multitaxonomy',
+			'type'     => 'taxonomy_multicheck', // Or `taxonomy_multicheck_inline`/`taxonomy_multicheck_hierarchical`
+			'taxonomy' => 'post_tag', // Taxonomy Slug
 		// 'inline'  => true, // Toggles display to inline
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Checkbox', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_demo_checkbox',
-		'type' => 'checkbox',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'    => esc_html__( 'Test Multi Checkbox', 'cmb2' ),
-		'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'      => 'yourprefix_demo_multicheckbox',
-		'type'    => 'multicheck',
-		// 'multiple' => true, // Store values in individual rows
-		'options' => array(
-			'check1' => esc_html__( 'Check One', 'cmb2' ),
-			'check2' => esc_html__( 'Check Two', 'cmb2' ),
-			'check3' => esc_html__( 'Check Three', 'cmb2' ),
-		),
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Checkbox', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_demo_checkbox',
+			'type' => 'checkbox',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'    => esc_html__( 'Test Multi Checkbox', 'cmb2' ),
+			'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'      => 'yourprefix_demo_multicheckbox',
+			'type'    => 'multicheck',
+			// 'multiple' => true, // Store values in individual rows
+			'options' => array(
+				'check1' => esc_html__( 'Check One', 'cmb2' ),
+				'check2' => esc_html__( 'Check Two', 'cmb2' ),
+				'check3' => esc_html__( 'Check Three', 'cmb2' ),
+			),
 		// 'inline'  => true, // Toggles display to inline
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'    => esc_html__( 'Test wysiwyg', 'cmb2' ),
-		'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'      => 'yourprefix_demo_wysiwyg',
-		'type'    => 'wysiwyg',
-		'options' => array(
-			'textarea_rows' => 5,
-		),
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'Test Image', 'cmb2' ),
-		'desc' => esc_html__( 'Upload an image or enter a URL.', 'cmb2' ),
-		'id'   => 'yourprefix_demo_image',
-		'type' => 'file',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'         => esc_html__( 'Multiple Files', 'cmb2' ),
-		'desc'         => esc_html__( 'Upload or add multiple images/attachments.', 'cmb2' ),
-		'id'           => 'yourprefix_demo_file_list',
-		'type'         => 'file_list',
-		'preview_size' => array( 100, 100 ), // Default: array( 50, 50 )
-	) );
-
-	$cmb_demo->add_field( array(
-		'name' => esc_html__( 'oEmbed', 'cmb2' ),
-		'desc' => sprintf(
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'    => esc_html__( 'Test wysiwyg', 'cmb2' ),
+			'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'      => 'yourprefix_demo_wysiwyg',
+			'type'    => 'wysiwyg',
+			'options' => array(
+				'textarea_rows' => 5,
+			),
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'Test Image', 'cmb2' ),
+			'desc' => esc_html__( 'Upload an image or enter a URL.', 'cmb2' ),
+			'id'   => 'yourprefix_demo_image',
+			'type' => 'file',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'         => esc_html__( 'Multiple Files', 'cmb2' ),
+			'desc'         => esc_html__( 'Upload or add multiple images/attachments.', 'cmb2' ),
+			'id'           => 'yourprefix_demo_file_list',
+			'type'         => 'file_list',
+			'preview_size' => array( 100, 100 ), // Default: array( 50, 50 )
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name' => esc_html__( 'oEmbed', 'cmb2' ),
+			'desc' => sprintf(
 			/* translators: %s: link to codex.wordpress.org/Embeds */
-			esc_html__( 'Enter a youtube, twitter, or instagram URL. Supports services listed at %s.', 'cmb2' ),
-			'<a href="https://wordpress.org/support/article/embeds/">codex.wordpress.org/Embeds</a>'
-		),
-		'id'   => 'yourprefix_demo_embed',
-		'type' => 'oembed',
-	) );
-
-	$cmb_demo->add_field( array(
-		'name'         => 'Testing Field Parameters',
-		'id'           => 'yourprefix_demo_parameters',
-		'type'         => 'text',
-		'before_row'   => 'yourprefix_before_row_if_2', // callback.
-		'before'       => '<p>Testing <b>"before"</b> parameter</p>',
-		'before_field' => '<p>Testing <b>"before_field"</b> parameter</p>',
-		'after_field'  => '<p>Testing <b>"after_field"</b> parameter</p>',
-		'after'        => '<p>Testing <b>"after"</b> parameter</p>',
-		'after_row'    => '<p>Testing <b>"after_row"</b> parameter</p>',
-	) );
-
+				esc_html__( 'Enter a youtube, twitter, or instagram URL. Supports services listed at %s.', 'cmb2' ),
+				'<a href="https://wordpress.org/support/article/embeds/">codex.wordpress.org/Embeds</a>'
+			),
+			'id'   => 'yourprefix_demo_embed',
+			'type' => 'oembed',
+		)
+	);
+
+	$cmb_demo->add_field(
+		array(
+			'name'         => 'Testing Field Parameters',
+			'id'           => 'yourprefix_demo_parameters',
+			'type'         => 'text',
+			'before_row'   => 'yourprefix_before_row_if_2', // callback.
+			'before'       => '<p>Testing <b>"before"</b> parameter</p>',
+			'before_field' => '<p>Testing <b>"before_field"</b> parameter</p>',
+			'after_field'  => '<p>Testing <b>"after_field"</b> parameter</p>',
+			'after'        => '<p>Testing <b>"after"</b> parameter</p>',
+			'after_row'    => '<p>Testing <b>"after_row"</b> parameter</p>',
+		)
+	);
 }
 
 add_action( 'cmb2_admin_init', 'yourprefix_register_about_page_metabox' );
@@ -476,25 +539,28 @@ function yourprefix_register_about_page_metabox() {
 	/**
 	 * Metabox to be displayed on a single page ID
 	 */
-	$cmb_about_page = new_cmb2_box( array(
-		'id'           => 'yourprefix_about_metabox',
-		'title'        => esc_html__( 'About Page Metabox', 'cmb2' ),
-		'object_types' => array( 'page' ), // Post type
-		'context'      => 'normal',
-		'priority'     => 'high',
-		'show_names'   => true, // Show field names on the left
-		'show_on'      => array(
-			'id' => array( 2 ),
-		), // Specific post IDs to display this metabox
-	) );
-
-	$cmb_about_page->add_field( array(
-		'name' => esc_html__( 'Test Text', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_about_text',
-		'type' => 'text',
-	) );
-
+	$cmb_about_page = new_cmb2_box(
+		array(
+			'id'           => 'yourprefix_about_metabox',
+			'title'        => esc_html__( 'About Page Metabox', 'cmb2' ),
+			'object_types' => array( 'page' ), // Post type
+			'context'      => 'normal',
+			'priority'     => 'high',
+			'show_names'   => true, // Show field names on the left
+			'show_on'      => array(
+				'id' => array( 2 ),
+			), // Specific post IDs to display this metabox
+		)
+	);
+
+	$cmb_about_page->add_field(
+		array(
+			'name' => esc_html__( 'Test Text', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_about_text',
+			'type' => 'text',
+		)
+	);
 }
 
 add_action( 'cmb2_admin_init', 'yourprefix_register_repeatable_group_field_metabox' );
@@ -506,26 +572,30 @@ function yourprefix_register_repeatable_group_field_metabox() {
 	/**
 	 * Repeatable Field Groups
 	 */
-	$cmb_group = new_cmb2_box( array(
-		'id'           => 'yourprefix_group_metabox',
-		'title'        => esc_html__( 'Repeating Field Group', 'cmb2' ),
-		'object_types' => array( 'page' ),
-	) );
+	$cmb_group = new_cmb2_box(
+		array(
+			'id'           => 'yourprefix_group_metabox',
+			'title'        => esc_html__( 'Repeating Field Group', 'cmb2' ),
+			'object_types' => array( 'page' ),
+		)
+	);
 
 	// $group_field_id is the field id string, so in this case: 'yourprefix_group_demo'
-	$group_field_id = $cmb_group->add_field( array(
-		'id'          => 'yourprefix_group_demo',
-		'type'        => 'group',
-		'description' => esc_html__( 'Generates reusable form entries', 'cmb2' ),
-		'options'     => array(
-			'group_title'    => esc_html__( 'Entry {#}', 'cmb2' ), // {#} gets replaced by row number
-			'add_button'     => esc_html__( 'Add Another Entry', 'cmb2' ),
-			'remove_button'  => esc_html__( 'Remove Entry', 'cmb2' ),
-			'sortable'       => true,
+	$group_field_id = $cmb_group->add_field(
+		array(
+			'id'          => 'yourprefix_group_demo',
+			'type'        => 'group',
+			'description' => esc_html__( 'Generates reusable form entries', 'cmb2' ),
+			'options'     => array(
+				'group_title'   => esc_html__( 'Entry {#}', 'cmb2' ), // {#} gets replaced by row number
+				'add_button'    => esc_html__( 'Add Another Entry', 'cmb2' ),
+				'remove_button' => esc_html__( 'Remove Entry', 'cmb2' ),
+				'sortable'      => true,
 			// 'closed'      => true, // true to have the groups closed by default
 			// 'remove_confirm' => esc_html__( 'Are you sure you want to remove?', 'cmb2' ), // Performs confirmation before removing group.
-		),
-	) );
+			),
+		)
+	);
 
 	/**
 	 * Group fields works the same, except ids only need
@@ -533,32 +603,43 @@ function yourprefix_register_repeatable_group_field_metabox() {
 	 *
 	 * The parent field's id needs to be passed as the first argument.
 	 */
-	$cmb_group->add_group_field( $group_field_id, array(
-		'name'       => esc_html__( 'Entry Title', 'cmb2' ),
-		'id'         => 'title',
-		'type'       => 'text',
+	$cmb_group->add_group_field(
+		$group_field_id,
+		array(
+			'name' => esc_html__( 'Entry Title', 'cmb2' ),
+			'id'   => 'title',
+			'type' => 'text',
 		// 'repeatable' => true, // Repeatable fields are supported w/in repeatable groups (for most types)
-	) );
-
-	$cmb_group->add_group_field( $group_field_id, array(
-		'name'        => esc_html__( 'Description', 'cmb2' ),
-		'description' => esc_html__( 'Write a short description for this entry', 'cmb2' ),
-		'id'          => 'description',
-		'type'        => 'textarea_small',
-	) );
-
-	$cmb_group->add_group_field( $group_field_id, array(
-		'name' => esc_html__( 'Entry Image', 'cmb2' ),
-		'id'   => 'image',
-		'type' => 'file',
-	) );
-
-	$cmb_group->add_group_field( $group_field_id, array(
-		'name' => esc_html__( 'Image Caption', 'cmb2' ),
-		'id'   => 'image_caption',
-		'type' => 'text',
-	) );
-
+		)
+	);
+
+	$cmb_group->add_group_field(
+		$group_field_id,
+		array(
+			'name'        => esc_html__( 'Description', 'cmb2' ),
+			'description' => esc_html__( 'Write a short description for this entry', 'cmb2' ),
+			'id'          => 'description',
+			'type'        => 'textarea_small',
+		)
+	);
+
+	$cmb_group->add_group_field(
+		$group_field_id,
+		array(
+			'name' => esc_html__( 'Entry Image', 'cmb2' ),
+			'id'   => 'image',
+			'type' => 'file',
+		)
+	);
+
+	$cmb_group->add_group_field(
+		$group_field_id,
+		array(
+			'name' => esc_html__( 'Image Caption', 'cmb2' ),
+			'id'   => 'image_caption',
+			'type' => 'text',
+		)
+	);
 }
 
 add_action( 'cmb2_admin_init', 'yourprefix_register_user_profile_metabox' );
@@ -570,64 +651,79 @@ function yourprefix_register_user_profile_metabox() {
 	/**
 	 * Metabox for the user profile screen
 	 */
-	$cmb_user = new_cmb2_box( array(
-		'id'               => 'yourprefix_user_edit',
-		'title'            => esc_html__( 'User Profile Metabox', 'cmb2' ), // Doesn't output for user boxes
-		'object_types'     => array( 'user' ), // Tells CMB2 to use user_meta vs post_meta
-		'show_names'       => true,
-		'new_user_section' => 'add-new-user', // where form will show on new user page. 'add-existing-user' is only other valid option.
-	) );
-
-	$cmb_user->add_field( array(
-		'name'     => esc_html__( 'Extra Info', 'cmb2' ),
-		'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'       => 'yourprefix_user_extra_info',
-		'type'     => 'title',
-		'on_front' => false,
-	) );
-
-	$cmb_user->add_field( array(
-		'name'    => esc_html__( 'Avatar', 'cmb2' ),
-		'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'      => 'yourprefix_user_avatar',
-		'type'    => 'file',
-	) );
-
-	$cmb_user->add_field( array(
-		'name' => esc_html__( 'Facebook URL', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_user_facebookurl',
-		'type' => 'text_url',
-	) );
-
-	$cmb_user->add_field( array(
-		'name' => esc_html__( 'Twitter URL', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_user_twitterurl',
-		'type' => 'text_url',
-	) );
-
-	$cmb_user->add_field( array(
-		'name' => esc_html__( 'Google+ URL', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_user_googleplusurl',
-		'type' => 'text_url',
-	) );
-
-	$cmb_user->add_field( array(
-		'name' => esc_html__( 'Linkedin URL', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_user_linkedinurl',
-		'type' => 'text_url',
-	) );
-
-	$cmb_user->add_field( array(
-		'name' => esc_html__( 'User Field', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_user_user_text_field',
-		'type' => 'text',
-	) );
-
+	$cmb_user = new_cmb2_box(
+		array(
+			'id'               => 'yourprefix_user_edit',
+			'title'            => esc_html__( 'User Profile Metabox', 'cmb2' ), // Doesn't output for user boxes
+			'object_types'     => array( 'user' ), // Tells CMB2 to use user_meta vs post_meta
+			'show_names'       => true,
+			'new_user_section' => 'add-new-user', // where form will show on new user page. 'add-existing-user' is only other valid option.
+		)
+	);
+
+	$cmb_user->add_field(
+		array(
+			'name'     => esc_html__( 'Extra Info', 'cmb2' ),
+			'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'       => 'yourprefix_user_extra_info',
+			'type'     => 'title',
+			'on_front' => false,
+		)
+	);
+
+	$cmb_user->add_field(
+		array(
+			'name' => esc_html__( 'Avatar', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_user_avatar',
+			'type' => 'file',
+		)
+	);
+
+	$cmb_user->add_field(
+		array(
+			'name' => esc_html__( 'Facebook URL', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_user_facebookurl',
+			'type' => 'text_url',
+		)
+	);
+
+	$cmb_user->add_field(
+		array(
+			'name' => esc_html__( 'Twitter URL', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_user_twitterurl',
+			'type' => 'text_url',
+		)
+	);
+
+	$cmb_user->add_field(
+		array(
+			'name' => esc_html__( 'Google+ URL', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_user_googleplusurl',
+			'type' => 'text_url',
+		)
+	);
+
+	$cmb_user->add_field(
+		array(
+			'name' => esc_html__( 'Linkedin URL', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_user_linkedinurl',
+			'type' => 'text_url',
+		)
+	);
+
+	$cmb_user->add_field(
+		array(
+			'name' => esc_html__( 'User Field', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_user_user_text_field',
+			'type' => 'text',
+		)
+	);
 }
 
 add_action( 'cmb2_admin_init', 'yourprefix_register_taxonomy_metabox' );
@@ -639,36 +735,43 @@ function yourprefix_register_taxonomy_metabox() {
 	/**
 	 * Metabox to add fields to categories and tags
 	 */
-	$cmb_term = new_cmb2_box( array(
-		'id'               => 'yourprefix_term_edit',
-		'title'            => esc_html__( 'Category Metabox', 'cmb2' ), // Doesn't output for term boxes
-		'object_types'     => array( 'term' ), // Tells CMB2 to use term_meta vs post_meta
-		'taxonomies'       => array( 'category', 'post_tag' ), // Tells CMB2 which taxonomies should have these fields
+	$cmb_term = new_cmb2_box(
+		array(
+			'id'           => 'yourprefix_term_edit',
+			'title'        => esc_html__( 'Category Metabox', 'cmb2' ), // Doesn't output for term boxes
+			'object_types' => array( 'term' ), // Tells CMB2 to use term_meta vs post_meta
+			'taxonomies'   => array( 'category', 'post_tag' ), // Tells CMB2 which taxonomies should have these fields
 		// 'new_term_section' => true, // Will display in the "Add New Category" section
-	) );
-
-	$cmb_term->add_field( array(
-		'name'     => esc_html__( 'Extra Info', 'cmb2' ),
-		'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'       => 'yourprefix_term_extra_info',
-		'type'     => 'title',
-		'on_front' => false,
-	) );
-
-	$cmb_term->add_field( array(
-		'name' => esc_html__( 'Term Image', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_term_avatar',
-		'type' => 'file',
-	) );
-
-	$cmb_term->add_field( array(
-		'name' => esc_html__( 'Arbitrary Term Field', 'cmb2' ),
-		'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'   => 'yourprefix_term_term_text_field',
-		'type' => 'text',
-	) );
-
+		)
+	);
+
+	$cmb_term->add_field(
+		array(
+			'name'     => esc_html__( 'Extra Info', 'cmb2' ),
+			'desc'     => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'       => 'yourprefix_term_extra_info',
+			'type'     => 'title',
+			'on_front' => false,
+		)
+	);
+
+	$cmb_term->add_field(
+		array(
+			'name' => esc_html__( 'Term Image', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_term_avatar',
+			'type' => 'file',
+		)
+	);
+
+	$cmb_term->add_field(
+		array(
+			'name' => esc_html__( 'Arbitrary Term Field', 'cmb2' ),
+			'desc' => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'   => 'yourprefix_term_term_text_field',
+			'type' => 'text',
+		)
+	);
 }
 
 add_action( 'cmb2_admin_init', 'yourprefix_register_theme_options_metabox' );
@@ -680,18 +783,19 @@ function yourprefix_register_theme_options_metabox() {
 	/**
 	 * Registers options page menu item and form.
 	 */
-	$cmb_options = new_cmb2_box( array(
-		'id'           => 'yourprefix_theme_options_page',
-		'title'        => esc_html__( 'Theme Options', 'cmb2' ),
-		'object_types' => array( 'options-page' ),
-
-		/*
-		 * The following parameters are specific to the options-page box
-		 * Several of these parameters are passed along to add_menu_page()/add_submenu_page().
-		 */
-
-		'option_key'      => 'yourprefix_theme_options', // The option key and admin menu page slug.
-		'icon_url'        => 'dashicons-palmtree', // Menu icon. Only applicable if 'parent_slug' is left empty.
+	$cmb_options = new_cmb2_box(
+		array(
+			'id'           => 'yourprefix_theme_options_page',
+			'title'        => esc_html__( 'Theme Options', 'cmb2' ),
+			'object_types' => array( 'options-page' ),
+
+			/*
+			 * The following parameters are specific to the options-page box
+			 * Several of these parameters are passed along to add_menu_page()/add_submenu_page().
+			 */
+
+			'option_key'   => 'yourprefix_theme_options', // The option key and admin menu page slug.
+			'icon_url'     => 'dashicons-palmtree', // Menu icon. Only applicable if 'parent_slug' is left empty.
 		// 'menu_title'      => esc_html__( 'Options', 'cmb2' ), // Falls back to 'title' (above).
 		// 'parent_slug'     => 'themes.php', // Make options page a submenu item of the themes menu.
 		// 'capability'      => 'manage_options', // Cap required to view options-page.
@@ -704,21 +808,23 @@ function yourprefix_register_theme_options_metabox() {
 		// 'tab_group'       => '', // Tab-group identifier, enables options page tab navigation.
 		// 'tab_title'       => null, // Falls back to 'title' (above).
 		// 'autoload'        => false, // Defaults to true, the options-page option will be autloaded.
-	) );
+		)
+	);
 
 	/**
 	 * Options fields ids only need
 	 * to be unique within this box.
 	 * Prefix is not needed.
 	 */
-	$cmb_options->add_field( array(
-		'name'    => esc_html__( 'Site Background Color', 'cmb2' ),
-		'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
-		'id'      => 'bg_color',
-		'type'    => 'colorpicker',
-		'default' => '#ffffff',
-	) );
-
+	$cmb_options->add_field(
+		array(
+			'name'    => esc_html__( 'Site Background Color', 'cmb2' ),
+			'desc'    => esc_html__( 'field description (optional)', 'cmb2' ),
+			'id'      => 'bg_color',
+			'type'    => 'colorpicker',
+			'default' => '#ffffff',
+		)
+	);
 }
 
 /**
@@ -779,28 +885,34 @@ function yourprefix_limit_rest_view_to_logged_in_users( $is_allowed, $cmb_contro
  * More info: https://github.com/CMB2/CMB2/wiki/REST-API
  */
 function yourprefix_register_rest_api_box() {
-	$cmb_rest = new_cmb2_box( array(
-		'id'            => 'yourprefix_rest_metabox',
-		'title'         => esc_html__( 'REST Test Box', 'cmb2' ),
-		'object_types'  => array( 'page' ), // Post type
-		'show_in_rest' => WP_REST_Server::ALLMETHODS, // WP_REST_Server::READABLE|WP_REST_Server::EDITABLE, // Determines which HTTP methods the box is visible in.
+	$cmb_rest = new_cmb2_box(
+		array(
+			'id'           => 'yourprefix_rest_metabox',
+			'title'        => esc_html__( 'REST Test Box', 'cmb2' ),
+			'object_types' => array( 'page' ), // Post type
+			'show_in_rest' => WP_REST_Server::ALLMETHODS, // WP_REST_Server::READABLE|WP_REST_Server::EDITABLE, // Determines which HTTP methods the box is visible in.
 		// Optional callback to limit box visibility.
 		// See: https://github.com/CMB2/CMB2/wiki/REST-API#permissions
 		// 'get_box_permissions_check_cb' => 'yourprefix_limit_rest_view_to_logged_in_users',
-	) );
-
-	$cmb_rest->add_field( array(
-		'name'       => esc_html__( 'REST Test Text', 'cmb2' ),
-		'desc'       => esc_html__( 'Will show in the REST API for this box and for pages.', 'cmb2' ),
-		'id'         => 'yourprefix_rest_text',
-		'type'       => 'text',
-	) );
-
-	$cmb_rest->add_field( array(
-		'name'       => esc_html__( 'REST Editable Test Text', 'cmb2' ),
-		'desc'       => esc_html__( 'Will show in REST API "editable" contexts only (`POST` requests).', 'cmb2' ),
-		'id'         => 'yourprefix_rest_editable_text',
-		'type'       => 'text',
-		'show_in_rest' => WP_REST_Server::EDITABLE,// WP_REST_Server::ALLMETHODS|WP_REST_Server::READABLE, // Determines which HTTP methods the field is visible in. Will override the cmb2_box 'show_in_rest' param.
-	) );
+		)
+	);
+
+	$cmb_rest->add_field(
+		array(
+			'name' => esc_html__( 'REST Test Text', 'cmb2' ),
+			'desc' => esc_html__( 'Will show in the REST API for this box and for pages.', 'cmb2' ),
+			'id'   => 'yourprefix_rest_text',
+			'type' => 'text',
+		)
+	);
+
+	$cmb_rest->add_field(
+		array(
+			'name'         => esc_html__( 'REST Editable Test Text', 'cmb2' ),
+			'desc'         => esc_html__( 'Will show in REST API "editable" contexts only (`POST` requests).', 'cmb2' ),
+			'id'           => 'yourprefix_rest_editable_text',
+			'type'         => 'text',
+			'show_in_rest' => WP_REST_Server::EDITABLE, // WP_REST_Server::ALLMETHODS|WP_REST_Server::READABLE, // Determines which HTTP methods the field is visible in. Will override the cmb2_box 'show_in_rest' param.
+		)
+	);
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2.php b/public/includes/lib/CMB2/includes/CMB2.php
index 8052cb1a..92bd9458 100755
--- a/public/includes/lib/CMB2/includes/CMB2.php
+++ b/public/includes/lib/CMB2/includes/CMB2.php
@@ -199,8 +199,8 @@ public function __construct( $config, $object_id = 0 ) {
 			wp_die( esc_html__( 'Metabox configuration is required to have an ID parameter.', 'cmb2' ) );
 		}
 
-		$this->cmb_id = $config['id'];
-		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
+		$this->cmb_id             = $config['id'];
+		$this->meta_box           = wp_parse_args( $config, $this->mb_defaults );
 		$this->meta_box['fields'] = array();
 
 		// Ensures object_types is an array.
@@ -266,7 +266,7 @@ public function show_form( $object_id = 0, $object_type = '' ) {
 	 */
 	public function render_form_open( $object_id = 0, $object_type = '' ) {
 		$object_type = $this->object_type( $object_type );
-		$object_id = $this->object_id( $object_id );
+		$object_id   = $this->object_id( $object_id );
 
 		echo "\n<!-- Begin CMB2 Fields -->\n";
 
@@ -317,12 +317,12 @@ public function box_classes() {
 		// Use the callback to fetch classes.
 		if ( $added_classes = $this->get_param_callback_result( 'classes_cb' ) ) {
 			$added_classes = is_array( $added_classes ) ? $added_classes : array( $added_classes );
-			$classes = array_merge( $classes, $added_classes );
+			$classes       = array_merge( $classes, $added_classes );
 		}
 
 		if ( $added_classes = $this->prop( 'classes' ) ) {
 			$added_classes = is_array( $added_classes ) ? $added_classes : array( $added_classes );
-			$classes = array_merge( $classes, $added_classes );
+			$classes       = array_merge( $classes, $added_classes );
 		}
 
 		/**
@@ -389,7 +389,7 @@ public function box_classes() {
 	 */
 	public function render_form_close( $object_id = 0, $object_type = '' ) {
 		$object_type = $this->object_type( $object_type );
-		$object_id = $this->object_id( $object_id );
+		$object_id   = $this->object_id( $object_id );
 
 		echo '</div></div>';
 
@@ -525,7 +525,7 @@ public function render_group_callback( $field_args, $field_group ) {
 		if ( ! empty( $group_val ) ) {
 			foreach ( $group_val as $group_key => $field_id ) {
 				$this->render_group_row( $field_group );
-				$field_group->index++;
+				++$field_group->index;
 			}
 		} else {
 			$this->render_group_row( $field_group );
@@ -550,7 +550,7 @@ public function render_group_callback( $field_args, $field_group ) {
 	 * @return string                  The attributes string.
 	 */
 	public function group_wrap_attributes( $field_group ) {
-		$classes = 'cmb-nested cmb-field-list cmb-repeatable-group';
+		$classes  = 'cmb-nested cmb-field-list cmb-repeatable-group';
 		$classes .= $field_group->options( 'sortable' ) ? ' sortable' : ' non-sortable';
 		$classes .= $field_group->args( 'repeatable' ) ? ' repeatable' : ' non-repeatable';
 
@@ -606,7 +606,7 @@ public function render_group_row( $field_group ) {
 		}
 
 			echo '
-			<div class="cmbhandle" title="' , esc_attr__( 'Click to toggle', 'cmb2' ), '"><br></div>
+			<div class="cmbhandle" title="', esc_attr__( 'Click to toggle', 'cmb2' ), '"><br></div>
 			<h3 class="cmb-group-title cmbhandle-title"><span>', $field_group->replace_hash( $field_group->options( 'group_title' ) ), '</span></h3>
 
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
@@ -742,8 +742,8 @@ public function save_fields( $object_id = 0, $object_type = '', $data_to_save =
 
 		// Fall-back to $_POST data.
 		$this->data_to_save = ! empty( $data_to_save ) ? $data_to_save : $_POST;
-		$object_id = $this->object_id( $object_id );
-		$object_type = $this->object_type( $object_type );
+		$object_id          = $this->object_id( $object_id );
+		$object_type        = $this->object_type( $object_type );
 
 		$this->process_fields();
 
@@ -918,12 +918,12 @@ public function save_group_field( $field_group ) {
 			return;
 		}
 
-		$old        = $field_group->get_data();
+		$old = $field_group->get_data();
 		// Check if group field has sanitization_cb.
 		$group_vals = $field_group->sanitization_cb( $this->data_to_save[ $base_id ] );
 		$saved      = array();
 
-		$field_group->index = 0;
+		$field_group->index        = 0;
 		$field_group->data_to_save = $this->data_to_save;
 
 		foreach ( array_values( $field_group->fields() ) as $field_args ) {
@@ -1121,7 +1121,7 @@ public function is_box_type( $object_types = array(), $fallback = array() ) {
 
 		if ( in_array( 'term', $box_types, true ) ) {
 			$taxonomies = CMB2_Utils::ensure_array( $this->prop( 'taxonomies' ) );
-			$box_types = array_merge( $box_types, $taxonomies );
+			$box_types  = array_merge( $box_types, $taxonomies );
 		}
 
 		$found = array_intersect( $object_types, $box_types );
@@ -1141,7 +1141,7 @@ public function init_options_mb() {
 		$types = $this->box_types();
 
 		if ( empty( $keys ) ) {
-			$keys = '';
+			$keys  = '';
 			$types = $this->deinit_options_mb( $types );
 		} else {
 
@@ -1219,7 +1219,7 @@ public function is_old_school_options_page_mb() {
 	 */
 	public function doing_options_page() {
 		$found_key = false;
-		$keys = $this->options_page_keys();
+		$keys      = $this->options_page_keys();
 
 		if ( empty( $keys ) ) {
 			return $found_key;
@@ -1375,7 +1375,7 @@ public function get_field( $field, $field_group = null, $reset_cached = false )
 		$field_id = is_string( $field ) ? $field : $field['id'];
 
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
-		$ids = $this->get_field_ids( $field_id, $parent_field_id );
+		$ids             = $this->get_field_ids( $field_id, $parent_field_id );
 
 		if ( ! $ids ) {
 			return false;
@@ -1544,7 +1544,6 @@ protected function field_actions( $field ) {
 		switch ( $field['type'] ) {
 			case 'file':
 			case 'file_list':
-
 				// Initiate attachment JS hooks.
 				add_filter( 'wp_prepare_attachment_for_js', array( 'CMB2_Type_File_Base', 'prepare_image_sizes_for_js' ), 10, 3 );
 				break;
@@ -1560,7 +1559,6 @@ protected function field_actions( $field ) {
 				}
 				break;
 			case 'colorpicker':
-
 				// https://github.com/JayWood/CMB2_RGBa_Picker
 				// Dequeue the rgba_colorpicker custom field script if it is used,
 				// since we now enqueue our own more current version.
@@ -1591,10 +1589,13 @@ protected function define_field_column( array $field ) {
 
 		$column = is_array( $field['column'] ) ? $field['column'] : array();
 
-		$field['column'] = wp_parse_args( $column, array(
-			'name'     => isset( $field['name'] ) ? $field['name'] : '',
-			'position' => false,
-		) );
+		$field['column'] = wp_parse_args(
+			$column,
+			array(
+				'name'     => isset( $field['name'] ) ? $field['name'] : '',
+				'position' => false,
+			)
+		);
 
 		return $field;
 	}
@@ -1724,7 +1725,7 @@ public function get_field_ids( $field_id, $parent_field_id = '' ) {
 	 * @return mixed            Field index or false.
 	 */
 	public function search_old_school_array( $field_id, $fields ) {
-		$ids = wp_list_pluck( $fields, 'id' );
+		$ids   = wp_list_pluck( $fields, 'id' );
 		$index = array_search( $field_id, $ids );
 		return false !== $index ? $index : false;
 	}
@@ -1804,5 +1805,4 @@ public function __get( $property ) {
 				return parent::__get( $property );
 		}
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Ajax.php b/public/includes/lib/CMB2/includes/CMB2_Ajax.php
index 0df93147..99680f97 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Ajax.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Ajax.php
@@ -89,13 +89,15 @@ public function oembed_handler() {
 		$this->ajax_update = true;
 
 		// Get embed code (or fallback link).
-		$html = $this->get_oembed( array(
-			'url'         => $oembed_url,
-			'object_id'   => $_REQUEST['object_id'],
-			'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
-			'oembed_args' => $embed_args,
-			'field_id'    => $_REQUEST['field_id'],
-		) );
+		$html = $this->get_oembed(
+			array(
+				'url'         => $oembed_url,
+				'object_id'   => $_REQUEST['object_id'],
+				'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
+				'oembed_args' => $embed_args,
+				'field_id'    => $_REQUEST['field_id'],
+			)
+		);
 
 		wp_send_json_success( $html );
 	}
@@ -115,12 +117,15 @@ public function get_oembed_no_edit( $args ) {
 		// Sanitize object_id.
 		$this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] );
 
-		$args = wp_parse_args( $args, array(
-			'object_type' => 'post',
-			'oembed_args' => array(),
-			'field_id'    => false,
-			'wp_error'    => false,
-		) );
+		$args = wp_parse_args(
+			$args,
+			array(
+				'object_type' => 'post',
+				'oembed_args' => array(),
+				'field_id'    => false,
+				'wp_error'    => false,
+			)
+		);
 
 		$this->embed_args =& $args;
 
@@ -140,7 +145,7 @@ public function get_oembed_no_edit( $args ) {
 			}
 
 			// Ok, we need to hijack the oembed cache system.
-			$this->hijack = true;
+			$this->hijack      = true;
 			$this->object_type = $args['object_type'];
 
 			// Gets ombed cache from our object's meta (vs postmeta).
@@ -268,7 +273,7 @@ protected function cache_action( $meta_key ) {
 			$status = call_user_func_array( array( cmb2_options( $this->object_id ), $action ), $args );
 		} else {
 
-			$args = array( $this->object_type, $this->object_id, $meta_key );
+			$args   = array( $this->object_type, $this->object_id, $meta_key );
 			$args[] = 'update' === $action ? $func_args[1] : true;
 
 			// Cache the result to our metadata.
@@ -287,7 +292,7 @@ protected function cache_action( $meta_key ) {
 	 * @return void
 	 */
 	public static function clean_stale_options_page_oembeds( $option_key ) {
-		$options = cmb2_options( $option_key )->get_options();
+		$options  = cmb2_options( $option_key )->get_options();
 		$modified = false;
 		if ( is_array( $options ) ) {
 
@@ -319,5 +324,4 @@ public static function clean_stale_options_page_oembeds( $option_key ) {
 			$updated = cmb2_options( $option_key )->set( $options );
 		}
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Base.php b/public/includes/lib/CMB2/includes/CMB2_Base.php
index cd5ff2bb..e95790cb 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Base.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Base.php
@@ -457,12 +457,10 @@ protected function deprecated_param( $function, $version, $message = null ) {
 				} else {
 					trigger_error( sprintf( __( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', 'cmb2' ), $function, $version ) );
 				}
-			} else {
-				if ( ! is_null( $message ) ) {
+			} elseif ( ! is_null( $message ) ) {
 					trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
-				} else {
-					trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
-				}
+			} else {
+				trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
 			}
 		}
 	}
diff --git a/public/includes/lib/CMB2/includes/CMB2_Field.php b/public/includes/lib/CMB2/includes/CMB2_Field.php
index c223c9e0..c784825d 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Field.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Field.php
@@ -312,9 +312,11 @@ public function get_data( $field_id = '', $args = array() ) {
 	 * @return mixed
 	 */
 	public function update_data( $new_value, $single = true ) {
-		$a = $this->data_args( array(
-			'single' => $single,
-		) );
+		$a = $this->data_args(
+			array(
+				'single' => $single,
+			)
+		);
 
 		$a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value;
 
@@ -386,9 +388,11 @@ public function update_data( $new_value, $single = true ) {
 	 * @return mixed
 	 */
 	public function remove_data( $old = '' ) {
-		$a = $this->data_args( array(
-			'old' => $old,
-		) );
+		$a = $this->data_args(
+			array(
+				'old' => $old,
+			)
+		);
 
 		/**
 		 * Filter whether to override removing of meta value.
@@ -452,13 +456,16 @@ public function remove_data( $old = '' ) {
 	 * @return array       Updated arguments
 	 */
 	public function data_args( $args = array() ) {
-		$args = wp_parse_args( $args, array(
-			'type'     => $this->object_type,
-			'id'       => $this->object_id,
-			'field_id' => $this->id( true ),
-			'repeat'   => $this->args( 'repeatable' ),
-			'single'   => ! $this->args( 'multiple' ),
-		) );
+		$args = wp_parse_args(
+			$args,
+			array(
+				'type'     => $this->object_type,
+				'id'       => $this->object_id,
+				'field_id' => $this->id( true ),
+				'repeat'   => $this->args( 'repeatable' ),
+				'single'   => ! $this->args( 'multiple' ),
+			)
+		);
 		return $args;
 	}
 
@@ -486,7 +493,7 @@ public function sanitization_cb( $meta_value ) {
 			return call_user_func( $cb, $meta_value, $this->args(), $this );
 		}
 
-		$sanitizer = new CMB2_Sanitize( $this, $meta_value );
+		$sanitizer  = new CMB2_Sanitize( $this, $meta_value );
 		$field_type = $this->type();
 
 		/**
@@ -557,7 +564,7 @@ public function save_field( $meta_value ) {
 			if ( ! empty( $new_value ) ) {
 				foreach ( $new_value as $add_new ) {
 					if ( $this->update_data( $add_new, false ) ) {
-						$count++;
+						++$count;
 					}
 				}
 			}
@@ -574,7 +581,7 @@ public function save_field( $meta_value ) {
 		}
 
 		if ( $updated ) {
-			$this->value = $this->get_data();
+			$this->value         = $this->get_data();
 			$this->escaped_value = null;
 		}
 
@@ -617,11 +624,14 @@ public function save_field( $meta_value ) {
 	 */
 	public function escaping_exception() {
 		// These types cannot be escaped.
-		return in_array( $this->type(), array(
-			'file_list',
-			'multicheck',
-			'text_datetime_timestamp_timezone',
-		) );
+		return in_array(
+			$this->type(),
+			array(
+				'file_list',
+				'multicheck',
+				'text_datetime_timestamp_timezone',
+			)
+		);
 	}
 
 	/**
@@ -685,16 +695,22 @@ public function has_args_method( $type ) {
 			return $type_methods[ $type ];
 		}
 
-		$all_or_nothing_types = array_flip( apply_filters( 'cmb2_all_or_nothing_types', array(
-			'select',
-			'radio',
-			'radio_inline',
-			'taxonomy_select',
-			'taxonomy_select_hierarchical',
-			'taxonomy_radio',
-			'taxonomy_radio_inline',
-			'taxonomy_radio_hierarchical',
-		), $this ) );
+		$all_or_nothing_types = array_flip(
+			apply_filters(
+				'cmb2_all_or_nothing_types',
+				array(
+					'select',
+					'radio',
+					'radio_inline',
+					'taxonomy_select',
+					'taxonomy_select_hierarchical',
+					'taxonomy_radio',
+					'taxonomy_radio_inline',
+					'taxonomy_radio_hierarchical',
+				),
+				$this
+			)
+		);
 
 		if ( isset( $all_or_nothing_types[ $type ] ) ) {
 			return 'set_field_defaults_all_or_nothing_types';
@@ -987,14 +1003,17 @@ public function row_classes() {
 		 *
 		 * @param array $field_types The types of fields which should get the 'table-layout' class
 		 */
-		$repeat_table_rows_types = apply_filters( 'cmb2_repeat_table_row_types', array(
-			'text_url',
-			'text',
-		) );
+		$repeat_table_rows_types = apply_filters(
+			'cmb2_repeat_table_row_types',
+			array(
+				'text_url',
+				'text',
+			)
+		);
 
 		$conditional_classes = array(
 			'cmb-type-' . str_replace( '_', '-', sanitize_html_class( $this->type() ) ) => true,
-			'cmb2-id-' . str_replace( '_', '-', sanitize_html_class( $this->id() ) )    => true,
+			'cmb2-id-' . str_replace( '_', '-', sanitize_html_class( $this->id() ) ) => true,
 			'cmb-repeat'             => $this->args( 'repeatable' ),
 			'cmb-repeat-group-field' => $this->group,
 			'cmb-inline'             => $this->args( 'inline' ),
@@ -1105,10 +1124,12 @@ public function get_supporting_field() {
 			return false;
 		}
 
-		return $this->get_field_clone( array(
-			'id' => $this->_id( '', false ) . $suffix,
-			'sanitization_cb' => false,
-		) );
+		return $this->get_field_clone(
+			array(
+				'id'              => $this->_id( '', false ) . $suffix,
+				'sanitization_cb' => false,
+			)
+		);
 	}
 
 	/**
@@ -1122,7 +1143,7 @@ public function display_value_callback() {
 			return;
 		}
 
-		$display = new CMB2_Field_Display( $this );
+		$display    = new CMB2_Field_Display( $this );
 		$field_type = $this->type();
 
 		/**
@@ -1336,7 +1357,7 @@ public function get_default() {
 			return apply_filters( 'cmb2_default_filter', $default, $this );
 		}
 
-		$param = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default';
+		$param   = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default';
 		$default = $this->args['default'] = $this->get_param_callback_result( $param );
 
 		// Allow a filter override of the default value.
@@ -1401,7 +1422,7 @@ public function _set_field_defaults( $args ) {
 
 		$with_supporting = array(
 			// CMB2_Sanitize::_save_file_id_value()/CMB2_Sanitize::_get_group_file_value_array().
-			'file' => '_id',
+			'file'                             => '_id',
 			// See CMB2_Sanitize::_save_utc_value().
 			'text_datetime_timestamp_timezone' => '_utc',
 		);
@@ -1434,11 +1455,14 @@ public function _set_field_defaults( $args ) {
 	 * @return array        Modified field config array.
 	 */
 	protected function set_field_defaults_group( $args ) {
-		$args['options'] = wp_parse_args( $args['options'], array(
-			'add_button'     => esc_html__( 'Add Group', 'cmb2' ),
-			'remove_button'  => esc_html__( 'Remove Group', 'cmb2' ),
-			'remove_confirm' => '',
-		) );
+		$args['options'] = wp_parse_args(
+			$args['options'],
+			array(
+				'add_button'     => esc_html__( 'Add Group', 'cmb2' ),
+				'remove_button'  => esc_html__( 'Remove Group', 'cmb2' ),
+				'remove_confirm' => '',
+			)
+		);
 
 		return $args;
 	}
@@ -1452,7 +1476,7 @@ protected function set_field_defaults_group( $args ) {
 	 * @return array        Modified field config array.
 	 */
 	protected function set_field_defaults_wysiwyg( $args ) {
-		$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
+		$args['id']                       = strtolower( str_ireplace( '-', '_', $args['id'] ) );
 		$args['options']['textarea_name'] = $args['_name'];
 
 		return $args;
@@ -1471,7 +1495,7 @@ protected function set_field_defaults_all_or_nothing_types( $args ) {
 		$args['show_option_none'] = true === $args['show_option_none'] ? esc_html__( 'None', 'cmb2' ) : $args['show_option_none'];
 
 		if ( null === $args['show_option_none'] ) {
-			$off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
+			$off_by_default           = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
 			$args['show_option_none'] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
 		}
 
@@ -1611,7 +1635,7 @@ protected function convert_deprecated_params( $args ) {
 				$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'row_classes', 'classes_cb' );
 
 				$args['classes_cb'] = $args['row_classes'];
-				$args['classes'] = null;
+				$args['classes']    = null;
 			} else {
 
 				$args['classes'] = $args['row_classes'];
@@ -1626,7 +1650,7 @@ protected function convert_deprecated_params( $args ) {
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'default', 'default_cb' );
 
 			$args['default_cb'] = $args['default'];
-			$args['default'] = null;
+			$args['default']    = null;
 		}
 
 		// options param can be passed a callback as well.
@@ -1635,10 +1659,9 @@ protected function convert_deprecated_params( $args ) {
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'options', 'options_cb' );
 
 			$args['options_cb'] = $args['options'];
-			$args['options'] = array();
+			$args['options']    = array();
 		}
 
 		return $args;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Field_Display.php b/public/includes/lib/CMB2/includes/CMB2_Field_Display.php
index 0d1c582f..15864803 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Field_Display.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Field_Display.php
@@ -154,7 +154,6 @@ public function display() {
 				foreach ( $this->field->value as $val ) {
 					$this->value = $val;
 					echo '<li>', $this->_display(), '</li>';
-					;
 				}
 				echo '</ul>';
 			}
@@ -324,13 +323,13 @@ protected function _display() {
 			return;
 		}
 
-		$datetime = maybe_unserialize( $this->value );
+		$datetime    = maybe_unserialize( $this->value );
 		$this->value = $tzstring = '';
 
 		if ( $datetime && $datetime instanceof DateTime ) {
-			$tz       = $datetime->getTimezone();
-			$tzstring = $tz->getName();
-			$this->value    = $datetime->getTimestamp();
+			$tz          = $datetime->getTimezone();
+			$tzstring    = $tz->getName();
+			$this->value = $datetime->getTimestamp();
 		}
 
 		$date = $this->field->get_timestamp_format( 'date_format', $this->value );
@@ -393,7 +392,7 @@ protected function _display() {
 
 			$links = array();
 			foreach ( $terms as $term ) {
-				$link = get_edit_term_link( $term->term_id, $taxonomy );
+				$link    = get_edit_term_link( $term->term_id, $taxonomy );
 				$links[] = '<a href="' . esc_url( $link ) . '">' . esc_html( $term->name ) . '</a>';
 			}
 			// Then loop and output.
@@ -420,9 +419,11 @@ protected function _display() {
 		$types = new CMB2_Types( $this->field );
 		$type  = $types->get_new_render_type( $this->field->type(), 'CMB2_Type_File_Base' );
 
-		$id = $this->field->get_field_clone( array(
-			'id' => $this->field->_id( '', false ) . '_id',
-		) )->escaped_value( 'absint' );
+		$id = $this->field->get_field_clone(
+			array(
+				'id' => $this->field->_id( '', false ) . '_id',
+			)
+		)->escaped_value( 'absint' );
 
 		$this->file_output( $this->value, $id, $type );
 	}
@@ -437,11 +438,16 @@ protected function file_output( $url_value, $id, CMB2_Type_File_Base $field_type
 			$img_size = $this->field->args( 'preview_size' );
 
 			if ( $id ) {
-				$image = wp_get_attachment_image( $id, $img_size, null, array(
-					'class' => 'cmb-image-display',
-				) );
+				$image = wp_get_attachment_image(
+					$id,
+					$img_size,
+					null,
+					array(
+						'class' => 'cmb-image-display',
+					)
+				);
 			} else {
-				$size = is_array( $img_size ) ? $img_size[0] : 200;
+				$size  = is_array( $img_size ) ? $img_size[0] : 200;
 				$image = '<img class="cmb-image-display" style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . esc_url( $url_value ) . '" alt="" />';
 			}
 
@@ -449,7 +455,8 @@ protected function file_output( $url_value, $id, CMB2_Type_File_Base $field_type
 
 		} else {
 
-			printf( '<div class="file-status"><span>%1$s <strong><a href="%2$s">%3$s</a></strong></span></div>',
+			printf(
+				'<div class="file-status"><span>%1$s <strong><a href="%2$s">%3$s</a></strong></span></div>',
 				esc_html( $field_type->_text( 'file_text', __( 'File:', 'cmb2' ) ) ),
 				esc_url( $url_value ),
 				esc_html( CMB2_Utils::get_file_name_from_path( $url_value ) )
@@ -492,14 +499,16 @@ protected function _display() {
 			return;
 		}
 
-		cmb2_do_oembed( array(
-			'url'         => $this->value,
-			'object_id'   => $this->field->object_id,
-			'object_type' => $this->field->object_type,
-			'oembed_args' => array(
-				'width' => '300',
-			),
-			'field_id'    => $this->field->id(),
-		) );
+		cmb2_do_oembed(
+			array(
+				'url'         => $this->value,
+				'object_id'   => $this->field->object_id,
+				'object_type' => $this->field->object_type,
+				'oembed_args' => array(
+					'width' => '300',
+				),
+				'field_id'    => $this->field->id(),
+			)
+		);
 	}
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Hookup.php b/public/includes/lib/CMB2/includes/CMB2_Hookup.php
index a8c4d35b..037cd099 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Hookup.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Hookup.php
@@ -155,7 +155,7 @@ public function comment_hooks() {
 		if ( $this->cmb->has_columns ) {
 			add_filter( 'manage_edit-comments_columns', array( $this, 'register_column_headers' ) );
 			add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 );
-			add_filter( "manage_edit-comments_sortable_columns", array( $this, 'columns_sortable' ) );
+			add_filter( 'manage_edit-comments_sortable_columns', array( $this, 'columns_sortable' ) );
 			add_action( 'pre_get_posts', array( $this, 'columns_sortable_orderby' ) );
 		}
 
@@ -176,7 +176,7 @@ public function user_hooks() {
 		if ( $this->cmb->has_columns ) {
 			add_filter( 'manage_users_columns', array( $this, 'register_column_headers' ) );
 			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 );
-			add_filter( "manage_users_sortable_columns", array( $this, 'columns_sortable' ) );
+			add_filter( 'manage_users_sortable_columns', array( $this, 'columns_sortable' ) );
 			add_action( 'pre_get_posts', array( $this, 'columns_sortable_orderby' ) );
 		}
 
@@ -350,12 +350,12 @@ public function register_column_headers( $columns ) {
 			if ( false === $column['position'] ) {
 				$columns[ $field['id'] ] = $column['name'];
 			} else {
-				$before = array_slice( $columns, 0, absint( $column['position'] ) );
+				$before                 = array_slice( $columns, 0, absint( $column['position'] ) );
 				$before[ $field['id'] ] = $column['name'];
-				$columns = $before + $columns;
+				$columns                = $before + $columns;
 			}
 
-			$column['field'] = $field;
+			$column['field']               = $field;
 			$this->columns[ $field['id'] ] = $column;
 		}
 
@@ -372,12 +372,14 @@ public function register_column_headers( $columns ) {
 	 */
 	public function column_display( $column_name, $object_id ) {
 		if ( isset( $this->columns[ $column_name ] ) ) {
-			$field = new CMB2_Field( array(
-				'field_args'  => $this->columns[ $column_name ]['field'],
-				'object_type' => $this->object_type,
-				'object_id'   => $this->cmb->object_id( $object_id ),
-				'cmb_id'      => $this->cmb->cmb_id,
-			) );
+			$field = new CMB2_Field(
+				array(
+					'field_args'  => $this->columns[ $column_name ]['field'],
+					'object_type' => $this->object_type,
+					'object_id'   => $this->cmb->object_id( $object_id ),
+					'cmb_id'      => $this->cmb->cmb_id,
+				)
+			);
 
 			$this->cmb->get_field( $field )->render_column();
 		}
@@ -517,7 +519,7 @@ public function output_context_metabox() {
 		 * To output the fields 'naked' (without a postbox wrapper/style), then
 		 * add a `'remove_box_wrap' => true` to your metabox registration array.
 		 */
-		$add_wrap = ! empty( $title ) || ! $this->cmb->prop( 'remove_box_wrap' );
+		$add_wrap   = ! empty( $title ) || ! $this->cmb->prop( 'remove_box_wrap' );
 		$add_handle = $add_wrap && ! empty( $title );
 
 		// Open the context-box wrap.
@@ -616,7 +618,6 @@ public function add_metaboxes() {
 	 * Remove the specified default taxonomy metaboxes for a post-type.
 	 *
 	 * @since 2.2.3
-	 *
 	 */
 	public function remove_default_tax_metaboxes() {
 		$to_remove = array_filter( (array) $this->cmb->tax_metaboxes_to_remove, 'taxonomy_exists' );
@@ -910,6 +911,8 @@ public function can_save( $type = '' ) {
 			// check nonce.
 			&& isset( $_POST[ $this->cmb->nonce() ] )
 			&& wp_verify_nonce( $_POST[ $this->cmb->nonce() ], $this->cmb->nonce() )
+			// check permissions.
+			&& current_user_can( 'delete_others_posts' )
 			// check if autosave.
 			&& ! ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
 			// get the metabox types & compare it to this type.
@@ -1013,5 +1016,4 @@ public static function enqueue_cmb_js() {
 		self::register_js();
 		return true;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Hookup_Base.php b/public/includes/lib/CMB2/includes/CMB2_Hookup_Base.php
index 7a847819..dd2e9e21 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Hookup_Base.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Hookup_Base.php
@@ -51,7 +51,7 @@ public static function maybe_init_and_hookup( CMB2 $cmb ) {
 	 * @param CMB2 $cmb The CMB2 object to hookup.
 	 */
 	public function __construct( CMB2 $cmb ) {
-		$this->cmb = $cmb;
+		$this->cmb         = $cmb;
 		$this->object_type = $this->cmb->mb_object_type();
 	}
 
diff --git a/public/includes/lib/CMB2/includes/CMB2_JS.php b/public/includes/lib/CMB2/includes/CMB2_JS.php
index e6746344..a457c75b 100755
--- a/public/includes/lib/CMB2/includes/CMB2_JS.php
+++ b/public/includes/lib/CMB2/includes/CMB2_JS.php
@@ -141,7 +141,7 @@ public static function enqueue() {
 	 */
 	public static function register_colorpicker_alpha( $enqueue = false ) {
 		// Only use minified files if SCRIPT_DEBUG is off.
-		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$min  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 		$func = $enqueue ? 'wp_enqueue_script' : 'wp_register_script';
 		$func( 'wp-color-picker-alpha', CMB2_Utils::url( "js/wp-color-picker-alpha{$min}.js" ), array( 'wp-color-picker' ), '2.1.3' );
 	}
@@ -168,12 +168,16 @@ public static function register_datetimepicker( $enqueue = false ) {
 	protected static function colorpicker_frontend() {
 		wp_register_script( 'iris', admin_url( 'js/iris.min.js' ), array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), CMB2_VERSION );
 		wp_register_script( 'wp-color-picker', admin_url( 'js/color-picker.min.js' ), array( 'iris' ), CMB2_VERSION );
-		wp_localize_script( 'wp-color-picker', 'wpColorPickerL10n', array(
-			'clear'         => esc_html__( 'Clear', 'cmb2' ),
-			'defaultString' => esc_html__( 'Default', 'cmb2' ),
-			'pick'          => esc_html__( 'Select Color', 'cmb2' ),
-			'current'       => esc_html__( 'Current Color', 'cmb2' ),
-		) );
+		wp_localize_script(
+			'wp-color-picker',
+			'wpColorPickerL10n',
+			array(
+				'clear'         => esc_html__( 'Clear', 'cmb2' ),
+				'defaultString' => esc_html__( 'Default', 'cmb2' ),
+				'pick'          => esc_html__( 'Select Color', 'cmb2' ),
+				'current'       => esc_html__( 'Current Color', 'cmb2' ),
+			)
+		);
 	}
 
 	/**
@@ -190,7 +194,7 @@ protected static function localize( $debug ) {
 		}
 
 		$localized = true;
-		$l10n = array(
+		$l10n      = array(
 			'fields'            => self::$fields,
 			'ajax_nonce'        => wp_create_nonce( 'ajax_nonce' ),
 			'ajaxurl'           => admin_url( '/admin-ajax.php' ),
@@ -229,7 +233,7 @@ protected static function localize( $debug ) {
 					'stepMinute'    => 5,
 				),
 			),
-			'strings' => array(
+			'strings'           => array(
 				'upload_file'  => esc_html__( 'Use this file', 'cmb2' ),
 				'upload_files' => esc_html__( 'Use these files', 'cmb2' ),
 				'remove_image' => esc_html__( 'Remove Image', 'cmb2' ),
@@ -241,12 +245,13 @@ protected static function localize( $debug ) {
 		);
 
 		if ( isset( self::$dependencies['code-editor'] ) && function_exists( 'wp_enqueue_code_editor' ) ) {
-			$l10n['defaults']['code_editor'] = wp_enqueue_code_editor( array(
-				'type' => 'text/html',
-			) );
+			$l10n['defaults']['code_editor'] = wp_enqueue_code_editor(
+				array(
+					'type' => 'text/html',
+				)
+			);
 		}
 
 		wp_localize_script( self::$handle, self::$js_variable, apply_filters( 'cmb2_localized_data', $l10n ) );
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Options.php b/public/includes/lib/CMB2/includes/CMB2_Options.php
index 3aa18ce2..d5740e2a 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Options.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Options.php
@@ -75,7 +75,7 @@ public function __construct( $option_key = '' ) {
 	 * @return mixed Delete success or failure
 	 */
 	public function delete_option() {
-		$deleted = $this->key ? delete_option( $this->key ) : true;
+		$deleted       = $this->key ? delete_option( $this->key ) : true;
 		$this->options = $deleted ? array() : $this->options;
 		return $this->options;
 	}
diff --git a/public/includes/lib/CMB2/includes/CMB2_Options_Hookup.php b/public/includes/lib/CMB2/includes/CMB2_Options_Hookup.php
index c260f415..abf0ded4 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Options_Hookup.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Options_Hookup.php
@@ -37,7 +37,7 @@ class CMB2_Options_Hookup extends CMB2_Hookup {
 	 * @param string $option_key Option key to use.
 	 */
 	public function __construct( CMB2 $cmb, $option_key ) {
-		$this->cmb = $cmb;
+		$this->cmb        = $cmb;
 		$this->option_key = $option_key;
 	}
 
@@ -203,7 +203,11 @@ public function options_page_output() {
 			<?php if ( ! empty( $tabs ) ) : ?>
 				<h2 class="nav-tab-wrapper">
 					<?php foreach ( $tabs as $option_key => $tab_title ) : ?>
-						<a class="nav-tab<?php if ( self::is_page( $option_key ) ) : ?> nav-tab-active<?php endif; ?>" href="<?php menu_page_url( $option_key ); ?>"><?php echo wp_kses_post( $tab_title ); ?></a>
+						<a class="nav-tab
+						<?php
+						if ( self::is_page( $option_key ) ) :
+							?>
+							nav-tab-active<?php endif; ?>" href="<?php menu_page_url( $option_key ); ?>"><?php echo wp_kses_post( $tab_title ); ?></a>
 					<?php endforeach; ?>
 				</h2>
 			<?php endif; ?>
diff --git a/public/includes/lib/CMB2/includes/CMB2_Sanitize.php b/public/includes/lib/CMB2/includes/CMB2_Sanitize.php
index e7f818b3..57cbdf40 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Sanitize.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Sanitize.php
@@ -200,7 +200,7 @@ public function text_url() {
 	public function colorpicker() {
 		// for repeatable.
 		if ( is_array( $this->value ) ) {
-			$check = $this->value;
+			$check       = $this->value;
 			$this->value = array();
 			foreach ( $check as $key => $val ) {
 				if ( $val && '#' != $val ) {
@@ -223,7 +223,7 @@ public function text_email() {
 		// for repeatable.
 		if ( is_array( $this->value ) ) {
 			foreach ( $this->value as $key => $val ) {
-				$val = trim( $val );
+				$val                 = trim( $val );
 				$this->value[ $key ] = is_email( $val ) ? $val : '';
 			}
 		} else {
@@ -247,7 +247,7 @@ public function text_money() {
 
 		global $wp_locale;
 
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
+		$search  = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
 		$replace = array( '', '.' );
 
 		// Strip slashes. Example: 2\'180.00.
@@ -468,7 +468,7 @@ public function _get_group_file_value_array( $id_key ) {
 		$i       = $this->field->group->index;
 
 		// Check group $alldata data.
-		$id_val  = isset( $alldata[ $base_id ][ $i ][ $id_key ] )
+		$id_val = isset( $alldata[ $base_id ][ $i ][ $id_key ] )
 			? absint( $alldata[ $base_id ][ $i ][ $id_key ] )
 			: '';
 
@@ -478,7 +478,7 @@ public function _get_group_file_value_array( $id_key ) {
 		}
 
 		return array(
-			'value' => $this->text_url(),
+			'value'                  => $this->text_url(),
 			'supporting_field_value' => $id_val,
 			'supporting_field_id'    => $id_key,
 		);
@@ -504,7 +504,7 @@ public function _save_file_id_value( $file_id_key ) {
 		if ( $this->value && ! $id_val ) {
 			$id_val = CMB2_Utils::image_id_from_url( $this->value );
 
-		// If there is an ID but user emptied the input value, remove the ID.
+			// If there is an ID but user emptied the input value, remove the ID.
 		} elseif ( ! $this->value && $id_val ) {
 			$id_val = null;
 		}
@@ -534,10 +534,12 @@ public function _save_utc_value( $utc_key, $utc_stamp ) {
 	 * @return CMB2_Field
 	 */
 	public function _new_supporting_field( $new_field_id ) {
-		return $this->field->get_field_clone( array(
-			'id' => $new_field_id,
-			'sanitization_cb' => false,
-		) );
+		return $this->field->get_field_clone(
+			array(
+				'id'              => $new_field_id,
+				'sanitization_cb' => false,
+			)
+		);
 	}
 
 	/**
@@ -584,5 +586,4 @@ public function _is_empty_array( $to_check ) {
 		}
 		return false;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Show_Filters.php b/public/includes/lib/CMB2/includes/CMB2_Show_Filters.php
index 5fb257e6..e0d2df56 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Show_Filters.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Show_Filters.php
@@ -162,10 +162,8 @@ public static function check_admin_page( $display, $meta_box_args ) {
 						return true;
 					}
 				}
-			} else {
-				if ( $_GET['page'] == $show_on ) {
+			} elseif ( $_GET['page'] == $show_on ) {
 					return true;
-				}
 			}
 
 			return false;
@@ -175,5 +173,4 @@ public static function check_admin_page( $display, $meta_box_args ) {
 		// Allow options-page metaboxes to be displayed anywhere on the front-end.
 		return true;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Types.php b/public/includes/lib/CMB2/includes/CMB2_Types.php
index 8482c591..4cb96d9d 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Types.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Types.php
@@ -244,7 +244,7 @@ public function maybe_custom_field_object( $fieldtype, $args = array() ) {
 	 */
 	public function get_new_render_type( $fieldtype, $render_class_name = null, $args = array(), $additional = '' ) {
 		$render_class_name = $this->get_render_type_class( $fieldtype, $render_class_name );
-		$this->type = new $render_class_name( $this, $args, $additional );
+		$this->type        = new $render_class_name( $this, $args, $additional );
 
 		return $this->type;
 	}
@@ -357,7 +357,7 @@ public function render_repeatable_field() {
 	public function repeatable_rows() {
 		$meta_value = array_filter( (array) $this->field->escaped_value() );
 		// check for default content
-		$default    = $this->field->get_default();
+		$default = $this->field->get_default();
 
 		// check for saved data
 		if ( ! empty( $meta_value ) ) {
@@ -372,7 +372,7 @@ public function repeatable_rows() {
 			foreach ( (array) $meta_value as $val ) {
 				$this->field->escaped_value = $val;
 				$this->repeat_row();
-				$this->iterator++;
+				++$this->iterator;
 			}
 		} else {
 
@@ -385,7 +385,7 @@ public function repeatable_rows() {
 
 		// Then add an empty row
 		$this->field->escaped_value = $default;
-		$this->iterator = $this->iterator ? $this->iterator : 1;
+		$this->iterator             = $this->iterator ? $this->iterator : 1;
 		$this->repeat_row( 'empty-row hidden' );
 	}
 
@@ -433,7 +433,7 @@ public function _desc( $paragraph = false, $echo = false, $repeat_group = false
 			return;
 		}
 
-		$tag = $paragraph ? 'p' : 'span';
+		$tag  = $paragraph ? 'p' : 'span';
 		$desc = sprintf( "\n" . '<%1$s class="cmb2-metabox-description">%2$s</%1$s>' . "\n", $tag, $desc );
 
 		if ( $echo ) {
@@ -498,7 +498,6 @@ public function textarea( $args = array() ) {
 	/**
 	 * Begin Field Types
 	 */
-
 	public function text() {
 		return $this->input();
 	}
@@ -510,7 +509,7 @@ public function hidden() {
 			'class' => 'cmb2-hidden',
 		);
 		if ( $this->field->group ) {
-			$args['data-groupid'] = $this->field->group->id();
+			$args['data-groupid']  = $this->field->group->id();
 			$args['data-iterator'] = $this->iterator;
 		}
 
@@ -518,46 +517,75 @@ public function hidden() {
 	}
 
 	public function text_small() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
-			'class' => 'cmb2-text-small',
-			'desc'  => $this->_desc(),
-		), 'input' )->render();
+		return $this->get_new_render_type(
+			__FUNCTION__,
+			'CMB2_Type_Text',
+			array(
+				'class' => 'cmb2-text-small',
+				'desc'  => $this->_desc(),
+			),
+			'input'
+		)->render();
 	}
 
 	public function text_medium() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
-			'class' => 'cmb2-text-medium',
-			'desc'  => $this->_desc(),
-		), 'input' )->render();
+		return $this->get_new_render_type(
+			__FUNCTION__,
+			'CMB2_Type_Text',
+			array(
+				'class' => 'cmb2-text-medium',
+				'desc'  => $this->_desc(),
+			),
+			'input'
+		)->render();
 	}
 
 	public function text_email() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
-			'class' => 'cmb2-text-email cmb2-text-medium',
-			'type'  => 'email',
-		), 'input' )->render();
+		return $this->get_new_render_type(
+			__FUNCTION__,
+			'CMB2_Type_Text',
+			array(
+				'class' => 'cmb2-text-email cmb2-text-medium',
+				'type'  => 'email',
+			),
+			'input'
+		)->render();
 	}
 
 	public function text_url() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
-			'class' => 'cmb2-text-url cmb2-text-medium regular-text',
-			'value' => $this->field->escaped_value( 'esc_url' ),
-		), 'input' )->render();
+		return $this->get_new_render_type(
+			__FUNCTION__,
+			'CMB2_Type_Text',
+			array(
+				'class' => 'cmb2-text-url cmb2-text-medium regular-text',
+				'value' => $this->field->escaped_value( 'esc_url' ),
+			),
+			'input'
+		)->render();
 	}
 
 	public function text_money() {
-		$input = $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
-			'class' => 'cmb2-text-money',
-			'desc'  => $this->_desc(),
-		), 'input' )->render();
+		$input = $this->get_new_render_type(
+			__FUNCTION__,
+			'CMB2_Type_Text',
+			array(
+				'class' => 'cmb2-text-money',
+				'desc'  => $this->_desc(),
+			),
+			'input'
+		)->render();
 		return ( ! $this->field->get_param_callback_result( 'before_field' ) ? '$ ' : ' ' ) . $input;
 	}
 
 	public function textarea_small() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Textarea', array(
-			'class' => 'cmb2-textarea-small',
-			'rows'  => 4,
-		) )->render();
+		return $this->get_new_render_type(
+			__FUNCTION__,
+			'CMB2_Type_Textarea',
+			array(
+				'class' => 'cmb2-textarea-small',
+				'rows'  => 4,
+			)
+		)->render();
 	}
 
 	public function textarea_code( $args = array() ) {
@@ -632,7 +660,7 @@ public function multicheck_inline() {
 	public function checkbox( $args = array(), $is_checked = null ) {
 		// Avoid get_new_render_type since we need a different default for the 3rd argument than ''.
 		$render_class_name = $this->get_render_type_class( __FUNCTION__, 'CMB2_Type_Checkbox' );
-		$this->type = new $render_class_name( $this, $args, $is_checked );
+		$this->type        = new $render_class_name( $this, $args, $is_checked );
 		return $this->type->render();
 	}
 
@@ -671,5 +699,4 @@ public function file_list( $args = array() ) {
 	public function file( $args = array() ) {
 		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_File', $args )->render();
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/CMB2_Utils.php b/public/includes/lib/CMB2/includes/CMB2_Utils.php
index b7b00a46..84a4603a 100755
--- a/public/includes/lib/CMB2/includes/CMB2_Utils.php
+++ b/public/includes/lib/CMB2/includes/CMB2_Utils.php
@@ -37,7 +37,7 @@ class CMB2_Utils {
 	 */
 	public static function image_id_from_url( $img_url ) {
 		$attachment_id = 0;
-		$dir = wp_upload_dir();
+		$dir           = wp_upload_dir();
 
 		// Is URL in uploads directory?
 		if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) {
@@ -64,7 +64,7 @@ public static function image_id_from_url( $img_url ) {
 		if ( $query->have_posts() ) {
 
 			foreach ( $query->posts as $post_id ) {
-				$meta = wp_get_attachment_metadata( $post_id );
+				$meta                = wp_get_attachment_metadata( $post_id );
 				$original_file       = basename( $meta['file'] );
 				$cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array();
 				if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) {
@@ -123,7 +123,7 @@ public static function get_named_size( $size ) {
 		// Find the best match when '$size' is an array.
 		if ( is_array( $size ) ) {
 			$image_sizes = self::get_available_image_sizes();
-			$candidates = array();
+			$candidates  = array();
 
 			foreach ( $image_sizes as $_size => $data ) {
 
@@ -142,10 +142,10 @@ public static function get_named_size( $size ) {
 					 */
 					if ( $data['width'] > $size[0] ) {
 						$constrained_size = wp_constrain_dimensions( $data['width'], $data['height'], $size[0] );
-						$expected_size = array( $size[0], $size[1] );
+						$expected_size    = array( $size[0], $size[1] );
 					} else {
 						$constrained_size = wp_constrain_dimensions( $size[0], $size[1], $data['width'] );
-						$expected_size = array( $data['width'], $data['height'] );
+						$expected_size    = array( $data['width'], $data['height'] );
 					}
 
 					// If the image dimensions are within 1px of the expected size, we consider it a match.
@@ -204,7 +204,7 @@ public static function timezone_offset( $tzstring ) {
 
 			try {
 				$date_time_zone_selected = new DateTimeZone( $tzstring );
-				$tz_offset = timezone_offset_get( $date_time_zone_selected, date_create() );
+				$tz_offset               = timezone_offset_get( $date_time_zone_selected, date_create() );
 			} catch ( Exception $e ) {
 				self::log_if_debug( __METHOD__, __LINE__, $e->getMessage() );
 			}
@@ -591,7 +591,7 @@ public static function concat_attrs( $attrs, $attr_exclude = array() ) {
 			$empty    = false === $val && 'value' !== $attr;
 			if ( ! $excluded && ! $empty ) {
 				// if data attribute, use single quote wraps, else double.
-				$quotes = self::is_data_attribute( $attr ) ? "'" : '"';
+				$quotes      = self::is_data_attribute( $attr ) ? "'" : '"';
 				$attributes .= sprintf( ' %1$s=%3$s%2$s%3$s', $attr, $val, $quotes );
 			}
 		}
@@ -665,5 +665,4 @@ public static function normalize_if_numeric( $value ) {
 	public static function generate_hash( $string ) {
 		return substr( base_convert( md5( $string ), 16, 32 ), 0, 12 );
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/helper-functions.php b/public/includes/lib/CMB2/includes/helper-functions.php
index 67043551..8846d6b8 100755
--- a/public/includes/lib/CMB2/includes/helper-functions.php
+++ b/public/includes/lib/CMB2/includes/helper-functions.php
@@ -41,7 +41,7 @@ function cmb2_autoload_classes( $class_name ) {
 		$path .= '/rest-api';
 	}
 
-	include_once( cmb2_dir( "$path/{$class_name}.php" ) );
+	include_once cmb2_dir( "$path/{$class_name}.php" );
 }
 
 /**
@@ -175,7 +175,7 @@ function cmb2_update_option( $option_key, $field_id, $value, $single = true ) {
 function cmb2_get_field( $meta_box, $field_id, $object_id = 0, $object_type = '' ) {
 
 	$object_id = $object_id ? $object_id : get_the_ID();
-	$cmb = $meta_box instanceof CMB2 ? $meta_box : cmb2_get_metabox( $meta_box, $object_id );
+	$cmb       = $meta_box instanceof CMB2 ? $meta_box : cmb2_get_metabox( $meta_box, $object_id );
 
 	if ( ! $cmb ) {
 		return;
@@ -295,20 +295,23 @@ function cmb2_get_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
 function cmb2_print_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
 
 	$object_id = $object_id ? $object_id : get_the_ID();
-	$cmb = cmb2_get_metabox( $meta_box, $object_id );
+	$cmb       = cmb2_get_metabox( $meta_box, $object_id );
 
 	// if passing a metabox ID, and that ID was not found.
 	if ( ! $cmb ) {
 		return;
 	}
 
-	$args = wp_parse_args( $args, array(
-		'form_format' => '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="object_id" value="%2$s">%3$s<input type="submit" name="submit-cmb" value="%4$s" class="button-primary"></form>',
-		'save_button' => esc_html__( 'Save', 'cmb2' ),
-		'object_type' => $cmb->mb_object_type(),
-		'cmb_styles'  => $cmb->prop( 'cmb_styles' ),
-		'enqueue_js'  => $cmb->prop( 'enqueue_js' ),
-	) );
+	$args = wp_parse_args(
+		$args,
+		array(
+			'form_format' => '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="object_id" value="%2$s">%3$s<input type="submit" name="submit-cmb" value="%4$s" class="button-primary"></form>',
+			'save_button' => esc_html__( 'Save', 'cmb2' ),
+			'object_type' => $cmb->mb_object_type(),
+			'cmb_styles'  => $cmb->prop( 'cmb_styles' ),
+			'enqueue_js'  => $cmb->prop( 'enqueue_js' ),
+		)
+	);
 
 	// Set object type explicitly (rather than trying to guess from context).
 	$cmb->object_type( $args['object_type'] );
@@ -346,7 +349,6 @@ function cmb2_print_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
 	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
 		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), esc_attr( $args['save_button'] ) );
 	}
-
 }
 
 /**
diff --git a/public/includes/lib/CMB2/includes/rest-api/CMB2_REST.php b/public/includes/lib/CMB2/includes/rest-api/CMB2_REST.php
index 1af78a06..f8c64028 100755
--- a/public/includes/lib/CMB2/includes/rest-api/CMB2_REST.php
+++ b/public/includes/lib/CMB2/includes/rest-api/CMB2_REST.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Handles hooking CMB2 objects/fields into the WordPres REST API
+ * Handles hooking CMB2 objects/fields into the WordPress REST API
  * which can allow fields to be read and/or updated.
  *
  * @since  2.2.3
@@ -51,10 +51,10 @@ class CMB2_REST extends CMB2_Hookup_Base {
 	 * @since 2.2.3
 	 */
 	protected static $type_boxes = array(
-		'post' => array(),
-		'user' => array(),
+		'post'    => array(),
+		'user'    => array(),
 		'comment' => array(),
-		'term' => array(),
+		'term'    => array(),
 	);
 
 	/**
@@ -115,7 +115,7 @@ public static function maybe_init_and_hookup( CMB2 $cmb ) {
 	 * @param CMB2 $cmb The CMB2 object to be registered for the API.
 	 */
 	public function __construct( CMB2 $cmb ) {
-		$this->cmb = $cmb;
+		$this->cmb                   = $cmb;
 		self::$boxes[ $cmb->cmb_id ] = $this;
 
 		$show_value = $this->cmb->prop( 'show_in_rest' );
@@ -206,7 +206,7 @@ public static function register_cmb2_fields() {
 			}
 
 			if ( ! empty( $types ) ) {
-				$alltypes = array_merge( $alltypes, array_flip( $types ) );
+				$alltypes                            = array_merge( $alltypes, array_flip( $types ) );
 				self::$type_boxes['post'][ $cmb_id ] = $cmb_id;
 			}
 		}
@@ -242,11 +242,15 @@ public static function register_cmb2_fields() {
 	 * @return void
 	 */
 	protected static function register_rest_field( $object_types, $object_type ) {
-		register_rest_field( $object_types, 'cmb2', array(
-			'get_callback'    => array( __CLASS__, "get_{$object_type}_rest_values" ),
-			'update_callback' => array( __CLASS__, "update_{$object_type}_rest_values" ),
-			'schema'          => null, // @todo add schema
-		) );
+		register_rest_field(
+			$object_types,
+			'cmb2',
+			array(
+				'get_callback'    => array( __CLASS__, "get_{$object_type}_rest_values" ),
+				'update_callback' => array( __CLASS__, "update_{$object_type}_rest_values" ),
+				'schema'          => null, // @todo add schema
+			)
+		);
 	}
 
 	/**
@@ -453,7 +457,7 @@ public static function get_box_rest_values( $rest_box, $object_id = 0, $main_obj
 			$values[ $field->id( true ) ] = $field->get_rest_value();
 
 			if ( $field->args( 'has_supporting_data' ) ) {
-				$field = $field->get_supporting_field();
+				$field                        = $field->get_supporting_field();
 				$values[ $field->id( true ) ] = $field->get_rest_value();
 			}
 		}
@@ -761,7 +765,7 @@ public function field_can_edit( $field_id, $return_object = false ) {
 	 *
 	 * @return mixed                            False if field can't be read or edited or true|CMB2_Field object.
 	 */
-	protected function field_can( $type = 'read_fields', $field_id=null, $return_object = false ) {
+	protected function field_can( $type = 'read_fields', $field_id = null, $return_object = false ) {
 		if ( ! in_array( $field_id instanceof CMB2_Field ? $field_id->id() : $field_id, $this->{$type}, true ) ) {
 			return false;
 		}
@@ -817,11 +821,15 @@ public static function get_all() {
 	 * @return boolean       Whether value is considered readable.
 	 */
 	public static function is_readable( $value ) {
-		return ! empty( $value ) && ! in_array( $value, array(
-			WP_REST_Server::CREATABLE,
-			WP_REST_Server::EDITABLE,
-			WP_REST_Server::DELETABLE,
-		), true );
+		return ! empty( $value ) && ! in_array(
+			$value,
+			array(
+				WP_REST_Server::CREATABLE,
+				WP_REST_Server::EDITABLE,
+				WP_REST_Server::DELETABLE,
+			),
+			true
+		);
 	}
 
 	/**
@@ -836,10 +844,14 @@ public static function is_readable( $value ) {
 	 * @return boolean       Whether value is considered editable.
 	 */
 	public static function is_editable( $value ) {
-		return in_array( $value, array(
-			WP_REST_Server::EDITABLE,
-			WP_REST_Server::ALLMETHODS,
-		), true );
+		return in_array(
+			$value,
+			array(
+				WP_REST_Server::EDITABLE,
+				WP_REST_Server::ALLMETHODS,
+			),
+			true
+		);
 	}
 
 	/**
@@ -861,5 +873,4 @@ public function __get( $field ) {
 				throw new Exception( 'Invalid ' . __CLASS__ . ' property: ' . $field );
 		}
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller.php b/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller.php
index 618d8034..a39ee6ff 100755
--- a/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller.php
+++ b/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller.php
@@ -5,7 +5,7 @@
 }
 
 /**
- * Creates CMB2 objects/fields endpoint for WordPres REST API.
+ * Creates CMB2 objects/fields endpoint for WordPress REST API.
  * Allows access to fields registered to a specific post type and more.
  *
  * @todo  Add better documentation.
@@ -254,9 +254,13 @@ protected function initiate_rest_read_box( $request, $request_type ) {
 		$this->initiate_rest_box( $request, $request_type );
 
 		if ( ! is_wp_error( $this->rest_box ) && ! $this->rest_box->rest_read ) {
-			$this->rest_box = new WP_Error( 'cmb2_rest_no_read_error', __( 'This box does not have read permissions.', 'cmb2' ), array(
-				'status' => 403,
-			) );
+			$this->rest_box = new WP_Error(
+				'cmb2_rest_no_read_error',
+				__( 'This box does not have read permissions.', 'cmb2' ),
+				array(
+					'status' => 403,
+				)
+			);
 		}
 	}
 
@@ -274,9 +278,13 @@ protected function initiate_rest_edit_box( $request, $request_type ) {
 		$this->initiate_rest_box( $request, $request_type );
 
 		if ( ! is_wp_error( $this->rest_box ) && ! $this->rest_box->rest_edit ) {
-			$this->rest_box = new WP_Error( 'cmb2_rest_no_write_error', __( 'This box does not have write permissions.', 'cmb2' ), array(
-				'status' => 403,
-			) );
+			$this->rest_box = new WP_Error(
+				'cmb2_rest_no_write_error',
+				__( 'This box does not have write permissions.', 'cmb2' ),
+				array(
+					'status' => 403,
+				)
+			);
 		}
 	}
 
@@ -297,9 +305,13 @@ protected function initiate_rest_box( $request, $request_type ) {
 
 		if ( ! $this->rest_box ) {
 
-			$this->rest_box = new WP_Error( 'cmb2_rest_box_not_found_error', __( 'No box found by that id. A box needs to be registered with the "show_in_rest" parameter configured.', 'cmb2' ), array(
-				'status' => 403,
-			) );
+			$this->rest_box = new WP_Error(
+				'cmb2_rest_box_not_found_error',
+				__( 'No box found by that id. A box needs to be registered with the "show_in_rest" parameter configured.', 'cmb2' ),
+				array(
+					'status' => 403,
+				)
+			);
 
 		} else {
 
@@ -370,10 +382,10 @@ public static function get_intial_route() {
 	 */
 	public function get_item_schema() {
 		$schema = array(
-			'$schema'              => 'http://json-schema.org/draft-04/schema#',
-			'title'                => 'CMB2',
-			'type'                 => 'object',
-			'properties'           => array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'CMB2',
+			'type'       => 'object',
+			'properties' => array(
 				'description' => array(
 					'description' => __( 'A human-readable description of the object.', 'cmb2' ),
 					'type'        => 'string',
@@ -381,14 +393,14 @@ public function get_item_schema() {
 						'view',
 					),
 				),
-				'name' => array(
+				'name'        => array(
 					'description' => __( 'The id for the object.', 'cmb2' ),
 					'type'        => 'integer',
 					'context'     => array(
 						'view',
 					),
 				),
-				'name' => array(
+				'name'        => array(
 					'description' => __( 'The title for the object.', 'cmb2' ),
 					'type'        => 'string',
 					'context'     => array(
@@ -444,5 +456,4 @@ public function get_query_string() {
 
 		return $query_string;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller_Boxes.php b/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller_Boxes.php
index 195f3c17..0f0cd2bc 100755
--- a/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller_Boxes.php
+++ b/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller_Boxes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CMB2 objects/boxes endpoint for WordPres REST API.
+ * CMB2 objects/boxes endpoint for WordPress REST API.
  * Allows access to boxes configuration data.
  *
  * @todo  Add better documentation.
@@ -58,30 +58,38 @@ public function register_routes() {
 		// $args['context']['default'] = 'view';
 		// $args['context']['enum'] = array( 'view', 'embed' );
 		// Returns all boxes data.
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base,
 			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'callback'            => array( $this, 'get_items' ),
-				'args'                => $args,
-			),
-			'schema' => array( $this, 'get_item_schema' ),
-		) );
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array( $this, 'get_items' ),
+					'args'                => $args,
+				),
+				'schema' => array( $this, 'get_item_schema' ),
+			)
+		);
 
 		$args['_rendered'] = array(
 			'description' => __( 'Includes the fully rendered attributes, \'form_open\', \'form_close\', as well as the enqueued \'js_dependencies\' script handles, and \'css_dependencies\' stylesheet handles.', 'cmb2' ),
 		);
 
 		// Returns specific box's data.
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<cmb_id>[\w-]+)', array(
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<cmb_id>[\w-]+)',
 			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'callback'            => array( $this, 'get_item' ),
-				'args'                => $args,
-			),
-			'schema' => array( $this, 'get_item_schema' ),
-		) );
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'callback'            => array( $this, 'get_item' ),
+					'args'                => $args,
+				),
+				'schema' => array( $this, 'get_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -119,9 +127,13 @@ public function get_items( $request ) {
 
 		$boxes = CMB2_REST::get_all();
 		if ( empty( $boxes ) ) {
-			return new WP_Error( 'cmb2_rest_no_boxes', __( 'No boxes found.', 'cmb2' ), array(
-				'status' => 403,
-			) );
+			return new WP_Error(
+				'cmb2_rest_no_boxes',
+				__( 'No boxes found.', 'cmb2' ),
+				array(
+					'status' => 403,
+				)
+			);
 		}
 
 		$boxes_data = array();
@@ -211,16 +223,16 @@ public function get_rest_box() {
 		$boxes_data = $cmb->meta_box;
 
 		if ( isset( $this->request['_rendered'] ) && $this->namespace_base !== ltrim( CMB2_REST_Controller::get_intial_route(), '/' ) ) {
-			$boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
+			$boxes_data['form_open']  = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
 			$boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
 
 			global $wp_scripts, $wp_styles;
 			$before_css = $wp_styles->queue;
-			$before_js = $wp_scripts->queue;
+			$before_js  = $wp_scripts->queue;
 
 			CMB2_JS::enqueue();
 
-			$boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
+			$boxes_data['js_dependencies']  = array_values( array_diff( $wp_scripts->queue, $before_js ) );
 			$boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) );
 		}
 
@@ -252,19 +264,18 @@ protected function prepare_links( $cmb ) {
 
 		return array(
 			// Standard Link Relations -- http://v2.wp-api.org/extending/linking/
-			'self' => array(
+			'self'                   => array(
 				'href' => rest_url( $boxbase . $query_string ),
 			),
-			'collection' => array(
+			'collection'             => array(
 				'href' => rest_url( $this->namespace_base . $query_string ),
 			),
 			// Custom Link Relations -- http://v2.wp-api.org/extending/linking/
 			// TODO URL should document relationship.
 			'https://cmb2.io/fields' => array(
-				'href' => rest_url( trailingslashit( $boxbase ) . 'fields' . $query_string ),
+				'href'       => rest_url( trailingslashit( $boxbase ) . 'fields' . $query_string ),
 				'embeddable' => true,
 			),
 		);
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller_Fields.php b/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller_Fields.php
index 6a25b716..b856dd85 100755
--- a/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller_Fields.php
+++ b/public/includes/lib/CMB2/includes/rest-api/CMB2_REST_Controller_Fields.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CMB2 objects/fields endpoint for WordPres REST API.
+ * CMB2 objects/fields endpoint for WordPress REST API.
  * Allows access to fields registered to a specific box.
  *
  * @todo  Add better documentation.
@@ -23,13 +23,13 @@ class CMB2_REST_Controller_Fields extends CMB2_REST_Controller_Boxes {
 	 */
 	public function register_routes() {
 		$args = array(
-			'_embed' => array(
+			'_embed'      => array(
 				'description' => __( 'Includes the box object which the fields are registered to in the response.', 'cmb2' ),
 			),
-			'_rendered' => array(
+			'_rendered'   => array(
 				'description' => __( 'When the \'_rendered\' argument is passed, the renderable field attributes will be returned fully rendered. By default, the names of the callback handers for the renderable attributes will be returned.', 'cmb2' ),
 			),
-			'object_id' => array(
+			'object_id'   => array(
 				'description' => __( 'To view or modify the field\'s value, the \'object_id\' and \'object_type\' arguments are required.', 'cmb2' ),
 			),
 			'object_type' => array(
@@ -38,43 +38,51 @@ public function register_routes() {
 		);
 
 		// Returns specific box's fields.
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<cmb_id>[\w-]+)/fields/', array(
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<cmb_id>[\w-]+)/fields/',
 			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'callback'            => array( $this, 'get_items' ),
-				'args'                => $args,
-			),
-			'schema' => array( $this, 'get_item_schema' ),
-		) );
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array( $this, 'get_items' ),
+					'args'                => $args,
+				),
+				'schema' => array( $this, 'get_item_schema' ),
+			)
+		);
 
-		$delete_args = $args;
-		$delete_args['object_id']['required'] = true;
+		$delete_args                            = $args;
+		$delete_args['object_id']['required']   = true;
 		$delete_args['object_type']['required'] = true;
 
 		// Returns specific field data.
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<cmb_id>[\w-]+)/fields/(?P<field_id>[\w-]+)', array(
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<cmb_id>[\w-]+)/fields/(?P<field_id>[\w-]+)',
 			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'callback'            => array( $this, 'get_item' ),
-				'args'                => $args,
-			),
-			array(
-				'methods'             => WP_REST_Server::EDITABLE,
-				'permission_callback' => array( $this, 'update_item_permissions_check' ),
-				'callback'            => array( $this, 'update_item' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-				'args'                => $args,
-			),
-			array(
-				'methods'             => WP_REST_Server::DELETABLE,
-				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
-				'callback'            => array( $this, 'delete_item' ),
-				'args'                => $delete_args,
-			),
-			'schema' => array( $this, 'get_item_schema' ),
-		) );
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'callback'            => array( $this, 'get_item' ),
+					'args'                => $args,
+				),
+				array(
+					'methods'             => WP_REST_Server::EDITABLE,
+					'permission_callback' => array( $this, 'update_item_permissions_check' ),
+					'callback'            => array( $this, 'update_item' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+					'args'                => $args,
+				),
+				array(
+					'methods'             => WP_REST_Server::DELETABLE,
+					'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+					'callback'            => array( $this, 'delete_item' ),
+					'args'                => $delete_args,
+				),
+				'schema' => array( $this, 'get_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -233,9 +241,13 @@ public function update_item( $request ) {
 		$this->initiate_rest_read_box( $request, 'field_value_update' );
 
 		if ( ! $this->request['value'] ) {
-			return new WP_Error( 'cmb2_rest_update_field_error', __( 'CMB2 Field value cannot be updated without the value parameter specified.', 'cmb2' ), array(
-				'status' => 400,
-			) );
+			return new WP_Error(
+				'cmb2_rest_update_field_error',
+				__( 'CMB2 Field value cannot be updated without the value parameter specified.', 'cmb2' ),
+				array(
+					'status' => 400,
+				)
+			);
 		}
 
 		return $this->modify_field_value( 'updated' );
@@ -294,9 +306,13 @@ public function delete_item( $request ) {
 	public function modify_field_value( $activity ) {
 
 		if ( ! $this->request['object_id'] || ! $this->request['object_type'] ) {
-			return new WP_Error( 'cmb2_rest_modify_field_value_error', __( 'CMB2 Field value cannot be modified without the object_id and object_type parameters specified.', 'cmb2' ), array(
-				'status' => 400,
-			) );
+			return new WP_Error(
+				'cmb2_rest_modify_field_value_error',
+				__( 'CMB2 Field value cannot be modified without the object_id and object_type parameters specified.', 'cmb2' ),
+				array(
+					'status' => 400,
+				)
+			);
 		}
 
 		if ( is_wp_error( $this->rest_box ) ) {
@@ -309,9 +325,13 @@ public function modify_field_value( $activity ) {
 		);
 
 		if ( ! $this->field ) {
-			return new WP_Error( 'cmb2_rest_no_field_by_id_error', __( 'No field found by that id.', 'cmb2' ), array(
-				'status' => 403,
-			) );
+			return new WP_Error(
+				'cmb2_rest_no_field_by_id_error',
+				__( 'No field found by that id.', 'cmb2' ),
+				array(
+					'status' => 403,
+				)
+			);
 		}
 
 		$this->field->args[ "value_{$activity}" ] = (bool) 'deleted' === $activity
@@ -338,9 +358,13 @@ public function prepare_read_field( $field ) {
 		$this->field = $this->rest_box->field_can_read( $field, true );
 
 		if ( ! $this->field ) {
-			return new WP_Error( 'cmb2_rest_no_field_by_id_error', __( 'No field found by that id.', 'cmb2' ), array(
-				'status' => 403,
-			) );
+			return new WP_Error(
+				'cmb2_rest_no_field_by_id_error',
+				__( 'No field found by that id.', 'cmb2' ),
+				array(
+					'status' => 403,
+				)
+			);
 		}
 
 		return $this->prepare_item( $this->prepare_field_response() );
@@ -356,7 +380,7 @@ public function prepare_read_field( $field ) {
 	 */
 	public function prepare_field_response() {
 		$field_data = $this->prepare_field_data( $this->field );
-		$response = rest_ensure_response( $field_data );
+		$response   = rest_ensure_response( $field_data );
 
 		$response->add_links( $this->prepare_links( $this->field ) );
 
@@ -373,10 +397,10 @@ public function prepare_field_response() {
 	 * @return array             Array of field data.
 	 */
 	protected function prepare_field_data( CMB2_Field $field ) {
-		$field_data = array();
+		$field_data       = array();
 		$params_to_ignore = array( 'show_in_rest', 'options' );
 		$params_to_rename = array(
-			'label_cb' => 'label',
+			'label_cb'   => 'label',
 			'options_cb' => 'options',
 		);
 
@@ -443,7 +467,7 @@ public function get_supporting_data( $field_data, $field ) {
 		unset( $field_data['has_supporting_data'] );
 		$field_data['has_supporting_data'] = true;
 
-		$field = $field->get_supporting_field();
+		$field                         = $field->get_supporting_field();
 		$field_data['supporting_data'] = array(
 			'id' => $field->_id( '', false ),
 		);
@@ -469,15 +493,15 @@ protected function prepare_links( $field ) {
 		$query_string = $this->get_query_string();
 
 		$links = array(
-			'self' => array(
+			'self'       => array(
 				'href' => rest_url( trailingslashit( $boxbase ) . 'fields/' . $field->_id( '', false ) . $query_string ),
 			),
 			'collection' => array(
 				'href' => rest_url( trailingslashit( $boxbase ) . 'fields' . $query_string ),
 			),
-			'up' => array(
+			'up'         => array(
 				'embeddable' => true,
-				'href' => rest_url( $boxbase . $query_string ),
+				'href'       => rest_url( $boxbase . $query_string ),
 			),
 		);
 
@@ -530,5 +554,4 @@ public function maybe_unhook_registered_callback( $filter ) {
 			$this->field->maybe_hook_parameter( $filter, null, 'remove_filter' );
 		}
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/shim/WP_REST_Controller.php b/public/includes/lib/CMB2/includes/shim/WP_REST_Controller.php
index 871d2a75..e397b448 100755
--- a/public/includes/lib/CMB2/includes/shim/WP_REST_Controller.php
+++ b/public/includes/lib/CMB2/includes/shim/WP_REST_Controller.php
@@ -32,9 +32,13 @@ public function register_routes() {
 	 * @return WP_Error|boolean
 	 */
 	public function get_items_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -44,9 +48,13 @@ public function get_items_permissions_check( $request ) {
 	 * @return WP_Error|WP_REST_Response
 	 */
 	public function get_items( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -56,9 +64,13 @@ public function get_items( $request ) {
 	 * @return WP_Error|boolean
 	 */
 	public function get_item_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -68,9 +80,13 @@ public function get_item_permissions_check( $request ) {
 	 * @return WP_Error|WP_REST_Response
 	 */
 	public function get_item( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -80,9 +96,13 @@ public function get_item( $request ) {
 	 * @return WP_Error|boolean
 	 */
 	public function create_item_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -92,9 +112,13 @@ public function create_item_permissions_check( $request ) {
 	 * @return WP_Error|WP_REST_Response
 	 */
 	public function create_item( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -104,9 +128,13 @@ public function create_item( $request ) {
 	 * @return WP_Error|boolean
 	 */
 	public function update_item_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -116,9 +144,13 @@ public function update_item_permissions_check( $request ) {
 	 * @return WP_Error|WP_REST_Response
 	 */
 	public function update_item( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -128,9 +160,13 @@ public function update_item( $request ) {
 	 * @return WP_Error|boolean
 	 */
 	public function delete_item_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -140,9 +176,13 @@ public function delete_item_permissions_check( $request ) {
 	 * @return WP_Error|WP_REST_Response
 	 */
 	public function delete_item( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -152,9 +192,13 @@ public function delete_item( $request ) {
 	 * @return WP_Error|object $prepared_item
 	 */
 	protected function prepare_item_for_database( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -165,9 +209,13 @@ protected function prepare_item_for_database( $request ) {
 	 * @return WP_REST_Response $response
 	 */
 	public function prepare_item_for_response( $item, $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
-			'status' => 405,
-		) );
+		return new WP_Error(
+			'invalid-method',
+			sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ),
+			array(
+				'status' => 405,
+			)
+		);
 	}
 
 	/**
@@ -181,7 +229,7 @@ public function prepare_response_for_collection( $response ) {
 			return $response;
 		}
 
-		$data = (array) $response->get_data();
+		$data   = (array) $response->get_data();
 		$server = rest_get_server();
 
 		if ( method_exists( $server, 'get_compact_response_links' ) ) {
@@ -268,29 +316,29 @@ public function get_public_item_schema() {
 	 */
 	public function get_collection_params() {
 		return array(
-			'context'                => $this->get_context_param(),
-			'page'                   => array(
-				'description'        => __( 'Current page of the collection.' ),
-				'type'               => 'integer',
-				'default'            => 1,
-				'sanitize_callback'  => 'absint',
-				'validate_callback'  => 'rest_validate_request_arg',
-				'minimum'            => 1,
+			'context'  => $this->get_context_param(),
+			'page'     => array(
+				'description'       => __( 'Current page of the collection.' ),
+				'type'              => 'integer',
+				'default'           => 1,
+				'sanitize_callback' => 'absint',
+				'validate_callback' => 'rest_validate_request_arg',
+				'minimum'           => 1,
 			),
-			'per_page'               => array(
-				'description'        => __( 'Maximum number of items to be returned in result set.' ),
-				'type'               => 'integer',
-				'default'            => 10,
-				'minimum'            => 1,
-				'maximum'            => 100,
-				'sanitize_callback'  => 'absint',
-				'validate_callback'  => 'rest_validate_request_arg',
+			'per_page' => array(
+				'description'       => __( 'Maximum number of items to be returned in result set.' ),
+				'type'              => 'integer',
+				'default'           => 10,
+				'minimum'           => 1,
+				'maximum'           => 100,
+				'sanitize_callback' => 'absint',
+				'validate_callback' => 'rest_validate_request_arg',
 			),
-			'search'                 => array(
-				'description'        => __( 'Limit results to those matching a string.' ),
-				'type'               => 'string',
-				'sanitize_callback'  => 'sanitize_text_field',
-				'validate_callback'  => 'rest_validate_request_arg',
+			'search'   => array(
+				'description'       => __( 'Limit results to those matching a string.' ),
+				'type'              => 'string',
+				'sanitize_callback' => 'sanitize_text_field',
+				'validate_callback' => 'rest_validate_request_arg',
 			),
 		);
 	}
@@ -305,12 +353,12 @@ public function get_collection_params() {
 	 */
 	public function get_context_param( $args = array() ) {
 		$param_details = array(
-			'description'        => __( 'Scope under which the request is made; determines fields present in response.' ),
-			'type'               => 'string',
-			'sanitize_callback'  => 'sanitize_key',
-			'validate_callback'  => 'rest_validate_request_arg',
+			'description'       => __( 'Scope under which the request is made; determines fields present in response.' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
 		);
-		$schema = $this->get_item_schema();
+		$schema        = $this->get_item_schema();
 		if ( empty( $schema['properties'] ) ) {
 			return array_merge( $param_details, $args );
 		}
@@ -457,9 +505,9 @@ protected function get_object_type() {
 	 */
 	public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) {
 
-		$schema                = $this->get_item_schema();
-		$schema_properties     = ! empty( $schema['properties'] ) ? $schema['properties'] : array();
-		$endpoint_args = array();
+		$schema            = $this->get_item_schema();
+		$schema_properties = ! empty( $schema['properties'] ) ? $schema['properties'] : array();
+		$endpoint_args     = array();
 
 		foreach ( $schema_properties as $field_id => $params ) {
 
@@ -496,10 +544,13 @@ public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CRE
 
 				// Only use required / default from arg_options on CREATABLE endpoints.
 				if ( WP_REST_Server::CREATABLE !== $method ) {
-					$params['arg_options'] = array_diff_key( $params['arg_options'], array(
-						'required' => '',
-						'default' => '',
-					) );
+					$params['arg_options'] = array_diff_key(
+						$params['arg_options'],
+						array(
+							'required' => '',
+							'default'  => '',
+						)
+					);
 				}
 
 				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params['arg_options'] );
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Base.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Base.php
index 1507f410..3afbbb5e 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Base.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Base.php
@@ -173,5 +173,4 @@ public function __get( $field ) {
 				throw new Exception( sprintf( esc_html__( 'Invalid %1$s property: %2$s', 'cmb2' ), __CLASS__, $field ) );
 		}
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Checkbox.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Checkbox.php
index ebc6fbf1..d9224cf3 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Checkbox.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Checkbox.php
@@ -70,5 +70,4 @@ public function render( $args = array() ) {
 			)
 		);
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Colorpicker.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Colorpicker.php
index 7cbc8d5b..e0844e72 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Colorpicker.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Colorpicker.php
@@ -61,9 +61,12 @@ public function render( $args = array() ) {
 
 		wp_enqueue_style( 'wp-color-picker' );
 
-		$args = wp_parse_args( $args, array(
-			'class' => 'cmb2-text-small',
-		) );
+		$args = wp_parse_args(
+			$args,
+			array(
+				'class' => 'cmb2-text-small',
+			)
+		);
 
 		$args['class']          .= ' cmb2-colorpicker';
 		$args['value']           = $meta_value;
@@ -90,5 +93,4 @@ public static function dequeue_rgba_colorpicker_script() {
 			CMB2_JS::register_colorpicker_alpha( true );
 		}
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Counter_Base.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Counter_Base.php
index d8d0715c..6bfd9b82 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Counter_Base.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Counter_Base.php
@@ -80,11 +80,13 @@ public function char_counter_markup( $val ) {
 		$markup .= '</p>';
 
 		// Enqueue the required JS.
-		$this->field->add_js_dependencies( array(
-			'word-count',
-			'wp-util',
-			'cmb2-char-counter',
-		) );
+		$this->field->add_js_dependencies(
+			array(
+				'word-count',
+				'wp-util',
+				'cmb2-char-counter',
+			)
+		);
 
 		$this->has_counter = true;
 
@@ -96,7 +98,7 @@ public function char_counter_markup( $val ) {
 	 *
 	 * @since  2.7.0
 	 *
-	 * @param  array  $attributes Array of parsed attributes.
+	 * @param  array $attributes Array of parsed attributes.
 	 *
 	 * @return array              Potentially modified attributes.
 	 */
@@ -134,5 +136,4 @@ public function enforce_max() {
 			? $char_max
 			: false;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_File.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_File.php
index d1b9cbd2..e45d005d 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_File.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_File.php
@@ -23,23 +23,27 @@ public function render( $args = array() ) {
 		$field   = $this->field;
 		$options = (array) $field->options();
 
-		$a = $this->args = $this->parse_args( 'file', array(
-			'class'           => 'cmb2-upload-file regular-text',
-			'id'              => $this->_id(),
-			'name'            => $this->_name(),
-			'value'           => $field->escaped_value(),
-			'id_value'        => null,
-			'desc'            => $this->_desc( true ),
-			'size'            => 45,
-			'js_dependencies' => 'media-editor',
-			'preview_size'    => $field->args( 'preview_size' ),
-			'query_args'      => $field->args( 'query_args' ),
-
-			// if options array and 'url' => false, then hide the url field.
-			'type'            => array_key_exists( 'url', $options ) && false === $options['url']
-				? 'hidden'
-				: 'text',
-		), $args );
+		$a = $this->args = $this->parse_args(
+			'file',
+			array(
+				'class'           => 'cmb2-upload-file regular-text',
+				'id'              => $this->_id(),
+				'name'            => $this->_name(),
+				'value'           => $field->escaped_value(),
+				'id_value'        => null,
+				'desc'            => $this->_desc( true ),
+				'size'            => 45,
+				'js_dependencies' => 'media-editor',
+				'preview_size'    => $field->args( 'preview_size' ),
+				'query_args'      => $field->args( 'query_args' ),
+
+				// if options array and 'url' => false, then hide the url field.
+				'type'            => array_key_exists( 'url', $options ) && false === $options['url']
+					? 'hidden'
+					: 'text',
+			),
+			$args
+		);
 
 		// get an array of image size meta data, fallback to 'large'.
 		$this->args['img_size_data'] = $img_size_data = parent::get_image_size_data(
@@ -49,19 +53,21 @@ public function render( $args = array() ) {
 
 		$output = '';
 
-		$output .= parent::render( array(
-			'type'             => $a['type'],
-			'class'            => $a['class'],
-			'value'            => $a['value'],
-			'id'               => $a['id'],
-			'name'             => $a['name'],
-			'size'             => $a['size'],
-			'desc'             => '',
-			'data-previewsize' => sprintf( '[%d,%d]', $img_size_data['width'], $img_size_data['height'] ),
-			'data-sizename'    => $img_size_data['name'],
-			'data-queryargs'   => ! empty( $a['query_args'] ) ? json_encode( $a['query_args'] ) : '',
-			'js_dependencies'  => $a['js_dependencies'],
-		) );
+		$output .= parent::render(
+			array(
+				'type'             => $a['type'],
+				'class'            => $a['class'],
+				'value'            => $a['value'],
+				'id'               => $a['id'],
+				'name'             => $a['name'],
+				'size'             => $a['size'],
+				'desc'             => '',
+				'data-previewsize' => sprintf( '[%d,%d]', $img_size_data['width'], $img_size_data['height'] ),
+				'data-sizename'    => $img_size_data['name'],
+				'data-queryargs'   => ! empty( $a['query_args'] ) ? json_encode( $a['query_args'] ) : '',
+				'js_dependencies'  => $a['js_dependencies'],
+			)
+		);
 
 		// Now remove the data-iterator attribute if it exists.
 		// (Possible if being used within a custom field)
@@ -98,26 +104,35 @@ public function render( $args = array() ) {
 	public function get_file_preview_output() {
 		if ( ! $this->is_valid_img_ext( $this->args['value'] ) ) {
 
-			return $this->file_status_output( array(
-				'value'     => $this->args['value'],
-				'tag'       => 'div',
-				'cached_id' => $this->args['id'],
-			) );
+			return $this->file_status_output(
+				array(
+					'value'     => $this->args['value'],
+					'tag'       => 'div',
+					'cached_id' => $this->args['id'],
+				)
+			);
 		}
 
 		if ( $this->args['id_value'] ) {
-			$image = wp_get_attachment_image( $this->args['id_value'], $this->args['preview_size'], null, array(
-				'class' => 'cmb-file-field-image',
-			) );
+			$image = wp_get_attachment_image(
+				$this->args['id_value'],
+				$this->args['preview_size'],
+				null,
+				array(
+					'class' => 'cmb-file-field-image',
+				)
+			);
 		} else {
 			$image = '<img style="max-width: ' . absint( $this->args['img_size_data']['width'] ) . 'px; width: 100%;" src="' . esc_url( $this->args['value'] ) . '" class="cmb-file-field-image" alt="" />';
 		}
 
-		return $this->img_status_output( array(
-			'image'     => $image,
-			'tag'       => 'div',
-			'cached_id' => $this->args['id'],
-		) );
+		return $this->img_status_output(
+			array(
+				'image'     => $image,
+				'tag'       => 'div',
+				'cached_id' => $this->args['id'],
+			)
+		);
 	}
 
 	/**
@@ -136,12 +151,14 @@ public function get_id_field_output() {
 		 */
 		$this->types->field = $this->get_id_field();
 
-		$output = parent::render( array(
-			'type'  => 'hidden',
-			'class' => 'cmb2-upload-file-id',
-			'value' => $this->types->field->value,
-			'desc'  => '',
-		) );
+		$output = parent::render(
+			array(
+				'type'  => 'hidden',
+				'class' => 'cmb2-upload-file-id',
+				'value' => $this->types->field->value,
+				'desc'  => '',
+			)
+		);
 
 		// We need to put the original field object back
 		// or other fields in a custom field will be broken.
@@ -162,7 +179,7 @@ public function get_id_field() {
 		// reset field args for attachment id.
 		$args = array(
 			// if we're looking at a file in a group, we need to get the non-prefixed id.
-			'id' => ( $this->field->group ? $this->field->args( '_id' ) : $this->args['id'] ) . '_id',
+			'id'                          => ( $this->field->group ? $this->field->args( '_id' ) : $this->args['id'] ) . '_id',
 			'disable_hash_data_attribute' => true,
 		);
 
@@ -186,5 +203,4 @@ public function get_id_field() {
 
 		return $id_field;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_File_Base.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_File_Base.php
index 37568169..f76cac64 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_File_Base.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_File_Base.php
@@ -32,8 +32,8 @@ public function is_valid_img_ext( $file, $blah = false ) {
 		 * @param array $valid_types The valid image file extensions.
 		 */
 		$is_valid_types = apply_filters( 'cmb2_valid_img_types', $valid_types );
-		$is_valid = $file_ext && in_array( $file_ext, (array) $is_valid_types );
-		$field_id = $this->field->id();
+		$is_valid       = $file_ext && in_array( $file_ext, (array) $is_valid_types );
+		$field_id       = $this->field->id();
 
 		/**
 		 * Filter for determining if a field value has a valid image file-type extension.
@@ -57,7 +57,8 @@ public function is_valid_img_ext( $file, $blah = false ) {
 	 * @return string       Image wrap output
 	 */
 	public function img_status_output( $args ) {
-		return sprintf( '<%1$s class="img-status cmb2-media-item">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
+		return sprintf(
+			'<%1$s class="img-status cmb2-media-item">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
 			$args['tag'],
 			$args['image'],
 			isset( $args['cached_id'] ) ? ' rel="' . esc_attr( $args['cached_id'] ) . '"' : '',
@@ -74,7 +75,8 @@ public function img_status_output( $args ) {
 	 * @return string       File wrap output
 	 */
 	public function file_status_output( $args ) {
-		return sprintf( '<%1$s class="file-status cmb2-media-item"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
+		return sprintf(
+			'<%1$s class="file-status cmb2-media-item"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
 			$args['tag'],
 			esc_html( $this->_text( 'file_text', esc_html__( 'File:', 'cmb2' ) ) ),
 			esc_html( CMB2_Utils::get_file_name_from_path( $args['value'] ) ),
@@ -192,8 +194,8 @@ public static function prepare_image_sizes_for_js( $response, $attachment, $meta
 			if ( isset( $meta['sizes'][ $size ] ) ) {
 
 				$attachment_url = wp_get_attachment_url( $attachment->ID );
-				$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
-				$size_meta = $meta['sizes'][ $size ];
+				$base_url       = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+				$size_meta      = $meta['sizes'][ $size ];
 
 				$response['sizes'][ $size ] = array(
 					'url'         => $base_url . $size_meta['file'],
@@ -206,5 +208,4 @@ public static function prepare_image_sizes_for_js( $response, $attachment, $meta
 
 		return $response;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_File_List.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_File_List.php
index dac41096..cfbac424 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_File_List.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_File_List.php
@@ -23,56 +23,66 @@ public function render( $args = array() ) {
 		// get an array of image size meta data, fallback to 'thumbnail'
 		$img_size_data = parent::get_image_size_data( $img_size, 'thumbnail' );
 
-		$output .= parent::render( array(
-			'type'  => 'hidden',
-			'class' => 'cmb2-upload-file cmb2-upload-list',
-			'size'  => 45,
-			'desc'  => '',
-			'value'  => '',
-			'data-previewsize' => sprintf( '[%d,%d]', $img_size_data['width'], $img_size_data['height'] ),
-			'data-sizename'    => $img_size_data['name'],
-			'data-queryargs'   => ! empty( $query_args ) ? json_encode( $query_args ) : '',
-			'js_dependencies'  => 'media-editor',
-		) );
+		$output .= parent::render(
+			array(
+				'type'             => 'hidden',
+				'class'            => 'cmb2-upload-file cmb2-upload-list',
+				'size'             => 45,
+				'desc'             => '',
+				'value'            => '',
+				'data-previewsize' => sprintf( '[%d,%d]', $img_size_data['width'], $img_size_data['height'] ),
+				'data-sizename'    => $img_size_data['name'],
+				'data-queryargs'   => ! empty( $query_args ) ? json_encode( $query_args ) : '',
+				'js_dependencies'  => 'media-editor',
+			)
+		);
 
-		$output .= parent::render( array(
-			'type'  => 'button',
-			'class' => 'cmb2-upload-button button-secondary cmb2-upload-list',
-			'value' => esc_attr( $this->_text( 'add_upload_files_text', esc_html__( 'Add or Upload Files', 'cmb2' ) ) ),
-			'name'  => '',
-			'id'  => '',
-		) );
+		$output .= parent::render(
+			array(
+				'type'  => 'button',
+				'class' => 'cmb2-upload-button button-secondary cmb2-upload-list',
+				'value' => esc_attr( $this->_text( 'add_upload_files_text', esc_html__( 'Add or Upload Files', 'cmb2' ) ) ),
+				'name'  => '',
+				'id'    => '',
+			)
+		);
 
 		$output .= '<ul id="' . $this->_id( '-status', false ) . '" class="cmb2-media-status cmb-attach-list">';
 
 		if ( $meta_value && is_array( $meta_value ) ) {
 
 			foreach ( $meta_value as $id => $fullurl ) {
-				$id_input = parent::render( array(
-					'type'    => 'hidden',
-					'value'   => $fullurl,
-					'name'    => $name . '[' . $id . ']',
-					'id'      => 'filelist-' . $id,
-					'data-id' => $id,
-					'desc'    => '',
-					'class'   => false,
-				) );
+				$id_input = parent::render(
+					array(
+						'type'    => 'hidden',
+						'value'   => $fullurl,
+						'name'    => $name . '[' . $id . ']',
+						'id'      => 'filelist-' . $id,
+						'data-id' => $id,
+						'desc'    => '',
+						'class'   => false,
+					)
+				);
 
 				if ( $this->is_valid_img_ext( $fullurl ) ) {
 
-					$output .= $this->img_status_output( array(
-						'image'    => wp_get_attachment_image( $id, $img_size ),
-						'tag'      => 'li',
-						'id_input' => $id_input,
-					) );
+					$output .= $this->img_status_output(
+						array(
+							'image'    => wp_get_attachment_image( $id, $img_size ),
+							'tag'      => 'li',
+							'id_input' => $id_input,
+						)
+					);
 
 				} else {
 
-					$output .= $this->file_status_output( array(
-						'value'    => $fullurl,
-						'tag'      => 'li',
-						'id_input' => $id_input,
-					) );
+					$output .= $this->file_status_output(
+						array(
+							'value'    => $fullurl,
+							'tag'      => 'li',
+							'id_input' => $id_input,
+						)
+					);
 
 				}
 			}
@@ -82,5 +92,4 @@ public function render( $args = array() ) {
 
 		return $this->rendered( $output );
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Multi_Base.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Multi_Base.php
index 652c92c4..c9157996 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Multi_Base.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Multi_Base.php
@@ -31,15 +31,19 @@ public function select_option( $args = array() ) {
 	 * @param  int   $i    Iterator value
 	 * @return string       Gnerated list item html
 	 */
-	public function list_input( $args = array(), $i ) {
-		$a = $this->parse_args( 'list_input', array(
-			'type'  => 'radio',
-			'class' => 'cmb2-option',
-			'name'  => $this->_name(),
-			'id'    => $this->_id( $i ),
-			'value' => $this->field->escaped_value(),
-			'label' => '',
-		), $args );
+	public function list_input( $args = array(), $i = 0 ) {
+		$a = $this->parse_args(
+			'list_input',
+			array(
+				'type'  => 'radio',
+				'class' => 'cmb2-option',
+				'name'  => $this->_name(),
+				'id'    => $this->_id( $i ),
+				'value' => $this->field->escaped_value(),
+				'label' => '',
+			),
+			$args
+		);
 
 		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
 	}
@@ -81,7 +85,7 @@ public function concat_items( $args = array() ) {
 		$value = CMB2_Utils::normalize_if_numeric( $value );
 
 		$concatenated_items = '';
-		$i = 1;
+		$i                  = 1;
 
 		$options = array();
 		if ( $option_none = $field->args( 'show_option_none' ) ) {
@@ -106,5 +110,4 @@ public function concat_items( $args = array() ) {
 
 		return $concatenated_items;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Multicheck.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Multicheck.php
index a9c078be..d2fabf1d 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Multicheck.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Multicheck.php
@@ -24,16 +24,20 @@ public function render( $args = array() ) {
 			? 'cmb2-checkbox-list no-select-all cmb2-list'
 			: 'cmb2-checkbox-list cmb2-list';
 
-		$args = $this->parse_args( $this->type, array(
-			'class'   => $classes,
-			'options' => $this->concat_items( array(
-				'name'   => $this->_name() . '[]',
-				'method' => 'list_input_checkbox',
-			) ),
-			'desc' => $this->_desc( true ),
-		) );
+		$args = $this->parse_args(
+			$this->type,
+			array(
+				'class'   => $classes,
+				'options' => $this->concat_items(
+					array(
+						'name'   => $this->_name() . '[]',
+						'method' => 'list_input_checkbox',
+					)
+				),
+				'desc'    => $this->_desc( true ),
+			)
+		);
 
 		return $this->rendered( $this->ul( $args ) );
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Oembed.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Oembed.php
index 62b4c34a..5d12866c 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Oembed.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Oembed.php
@@ -18,24 +18,27 @@ public function render( $args = array() ) {
 		$meta_value = trim( $field->escaped_value() );
 
 		$oembed = ! empty( $meta_value )
-			? cmb2_ajax()->get_oembed( array(
-				'url'         => $field->escaped_value(),
-				'object_id'   => $field->object_id,
-				'object_type' => $field->object_type,
-				'oembed_args' => array(
-					'width' => '640',
-				),
-				'field_id'    => $this->_id( '', false ),
-			) )
+			? cmb2_ajax()->get_oembed(
+				array(
+					'url'         => $field->escaped_value(),
+					'object_id'   => $field->object_id,
+					'object_type' => $field->object_type,
+					'oembed_args' => array(
+						'width' => '640',
+					),
+					'field_id'    => $this->_id( '', false ),
+				)
+			)
 			: '';
 
-		return parent::render( array(
-			'class'           => 'cmb2-oembed regular-text',
-			'data-objectid'   => $field->object_id,
-			'data-objecttype' => $field->object_type,
-		) )
+		return parent::render(
+			array(
+				'class'           => 'cmb2-oembed regular-text',
+				'data-objectid'   => $field->object_id,
+				'data-objecttype' => $field->object_type,
+			)
+		)
 		. '<p class="cmb-spinner spinner"></p>'
 		. '<div id="' . $this->_id( '-status' ) . '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>';
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Picker_Base.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Picker_Base.php
index 581ecb85..556fc3a8 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Picker_Base.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Picker_Base.php
@@ -42,7 +42,7 @@ public function parse_picker_options( $arg = 'date', $args = array() ) {
 				: array();
 
 			$data[ $arg . 'Format' ] = $js_format;
-			$atts[ $att ] = function_exists( 'wp_json_encode' )
+			$atts[ $att ]            = function_exists( 'wp_json_encode' )
 				? wp_json_encode( $data )
 				: json_encode( $data );
 		}
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Radio.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Radio.php
index d91bcc39..d2914d05 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Radio.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Radio.php
@@ -33,14 +33,19 @@ public function __construct( CMB2_Types $types, $args = array(), $type = '' ) {
 	}
 
 	public function render() {
-		$args = $this->parse_args( $this->type, array(
-			'class'   => 'cmb2-radio-list cmb2-list',
-			'options' => $this->concat_items( array(
-				'label'  => 'test',
-				'method' => 'list_input',
-			) ),
-			'desc' => $this->_desc( true ),
-		) );
+		$args = $this->parse_args(
+			$this->type,
+			array(
+				'class'   => 'cmb2-radio-list cmb2-list',
+				'options' => $this->concat_items(
+					array(
+						'label'  => 'test',
+						'method' => 'list_input',
+					)
+				),
+				'desc'    => $this->_desc( true ),
+			)
+		);
 
 		return $this->rendered( $this->ul( $args ) );
 	}
@@ -48,5 +53,4 @@ public function render() {
 	protected function ul( $a ) {
 		return sprintf( '<ul class="%s">%s</ul>%s', $a['class'], $a['options'], $a['desc'] );
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Select.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Select.php
index 655cf11b..89c4cfd4 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Select.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Select.php
@@ -13,13 +13,16 @@
 class CMB2_Type_Select extends CMB2_Type_Multi_Base {
 
 	public function render() {
-		$a = $this->parse_args( 'select', array(
-			'class'   => 'cmb2_select',
-			'name'    => $this->_name(),
-			'id'      => $this->_id(),
-			'desc'    => $this->_desc( true ),
-			'options' => $this->concat_items(),
-		) );
+		$a = $this->parse_args(
+			'select',
+			array(
+				'class'   => 'cmb2_select',
+				'name'    => $this->_name(),
+				'id'      => $this->_id(),
+				'desc'    => $this->_desc( true ),
+				'options' => $this->concat_items(),
+			)
+		);
 
 		$attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) );
 
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Select_Timezone.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Select_Timezone.php
index 5a333a38..b1b95ecd 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Select_Timezone.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Select_Timezone.php
@@ -18,11 +18,14 @@ public function render() {
 			? $this->field->get_default()
 			: CMB2_Utils::timezone_string();
 
-		$this->args = wp_parse_args( $this->args, array(
-			'class'   => 'cmb2_select cmb2-select-timezone',
-			'options' => wp_timezone_choice( $this->field->escaped_value() ),
-			'desc'    => $this->_desc(),
-		) );
+		$this->args = wp_parse_args(
+			$this->args,
+			array(
+				'class'   => 'cmb2_select cmb2-select-timezone',
+				'options' => wp_timezone_choice( $this->field->escaped_value() ),
+				'desc'    => $this->_desc(),
+			)
+		);
 
 		return parent::render();
 	}
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Base.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Base.php
index fd8b43fa..dfab3fd5 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Base.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Base.php
@@ -67,7 +67,7 @@ public function options_terms() {
 	 */
 	public function non_post_object_terms() {
 		$object_id = $this->field->object_id;
-		$taxonomy = $this->field->args( 'taxonomy' );
+		$taxonomy  = $this->field->args( 'taxonomy' );
 
 		$cache_key = "cmb-cache-{$taxonomy}-{$object_id}";
 
@@ -110,10 +110,10 @@ public function get_terms() {
 	protected function no_terms_result( $error, $tag = 'li' ) {
 		if ( is_wp_error( $error ) ) {
 			$message = $error->get_error_message();
-			$data = 'data-error="' . esc_attr( $error->get_error_code() ) . '"';
+			$data    = 'data-error="' . esc_attr( $error->get_error_code() ) . '"';
 		} else {
 			$message = $this->_text( 'no_terms_text', esc_html__( 'No terms', 'cmb2' ) );
-			$data = '';
+			$data    = '';
 		}
 
 		$this->field->args['select_all_button'] = false;
@@ -134,7 +134,7 @@ public function get_object_term_or_default() {
 	 *
 	 * @since  2.2.5
 	 *
-	 * @param  array  $all_terms   Array of all terms.
+	 * @param  array        $all_terms   Array of all terms.
 	 * @param  array|string $saved Array of terms set to the object, or single term slug.
 	 *
 	 * @return string              List of terms.
@@ -179,11 +179,10 @@ protected function build_children( $parent_term, $saved ) {
 	 * @return string              Child option output.
 	 */
 	public function child_option_output( $terms, $saved ) {
-		$output = '<li class="cmb2-indented-hierarchy"><ul>';
+		$output  = '<li class="cmb2-indented-hierarchy"><ul>';
 		$output .= $this->loop_terms( $terms, $saved );
 		$output .= '</ul></li>';
 
 		return $output;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck.php
index ce5a3ef5..6c6756ee 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck.php
@@ -15,10 +15,13 @@ class CMB2_Type_Taxonomy_Multicheck extends CMB2_Type_Taxonomy_Base {
 
 	public function render() {
 		return $this->rendered(
-			$this->types->radio( array(
-				'class'   => $this->get_wrapper_classes(),
-				'options' => $this->get_term_options(),
-			), 'taxonomy_multicheck' )
+			$this->types->radio(
+				array(
+					'class'   => $this->get_wrapper_classes(),
+					'options' => $this->get_term_options(),
+				),
+				'taxonomy_multicheck'
+			)
 		);
 	}
 
@@ -72,5 +75,4 @@ protected function get_wrapper_classes() {
 
 		return $classes;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck_Hierarchical.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck_Hierarchical.php
index 2d00d55b..c6760749 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck_Hierarchical.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Multicheck_Hierarchical.php
@@ -21,15 +21,18 @@ class CMB2_Type_Taxonomy_Multicheck_Hierarchical extends CMB2_Type_Taxonomy_Mult
 
 	public function render() {
 		return $this->rendered(
-			$this->types->radio( array(
-				'class'   => $this->get_wrapper_classes(),
-				'options' => $this->get_term_options(),
-			), 'taxonomy_multicheck_hierarchical' )
+			$this->types->radio(
+				array(
+					'class'   => $this->get_wrapper_classes(),
+					'options' => $this->get_term_options(),
+				),
+				'taxonomy_multicheck_hierarchical'
+			)
 		);
 	}
 
 	protected function list_term_input( $term, $saved_terms ) {
-		$options = parent::list_term_input( $term, $saved_terms );
+		$options  = parent::list_term_input( $term, $saved_terms );
 		$children = $this->build_children( $term, $saved_terms );
 
 		if ( ! empty( $children ) ) {
@@ -38,5 +41,4 @@ protected function list_term_input( $term, $saved_terms ) {
 
 		return $options;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Radio.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Radio.php
index 5421fd46..446e0619 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Radio.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Radio.php
@@ -15,9 +15,12 @@ class CMB2_Type_Taxonomy_Radio extends CMB2_Type_Taxonomy_Base {
 
 	public function render() {
 		return $this->rendered(
-			$this->types->radio( array(
-				'options' => $this->get_term_options(),
-			), 'taxonomy_radio' )
+			$this->types->radio(
+				array(
+					'options' => $this->get_term_options(),
+				),
+				'taxonomy_radio'
+			)
 		);
 	}
 
@@ -56,10 +59,13 @@ protected function get_term_options() {
 			 */
 			$option_none_value = apply_filters( "cmb2_taxonomy_radio_{$field_id}_default_value", $option_none_value );
 
-			$options .= $this->list_term_input( (object) array(
-				'slug' => $option_none_value,
-				'name' => $option_none,
-			), $saved_term );
+			$options .= $this->list_term_input(
+				(object) array(
+					'slug' => $option_none_value,
+					'name' => $option_none,
+				),
+				$saved_term
+			);
 		}
 
 		$options .= $this->loop_terms( $all_terms, $saved_term );
@@ -88,5 +94,4 @@ protected function list_term_input( $term, $saved_term ) {
 
 		return $this->list_input( $args, ++$this->counter );
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Radio_Hierarchical.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Radio_Hierarchical.php
index 9fd4b789..2da03885 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Radio_Hierarchical.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Radio_Hierarchical.php
@@ -21,14 +21,17 @@ class CMB2_Type_Taxonomy_Radio_Hierarchical extends CMB2_Type_Taxonomy_Radio {
 
 	public function render() {
 		return $this->rendered(
-			$this->types->radio( array(
-				'options' => $this->get_term_options(),
-			), 'taxonomy_radio_hierarchical' )
+			$this->types->radio(
+				array(
+					'options' => $this->get_term_options(),
+				),
+				'taxonomy_radio_hierarchical'
+			)
 		);
 	}
 
 	protected function list_term_input( $term, $saved_term ) {
-		$options = parent::list_term_input( $term, $saved_term );
+		$options  = parent::list_term_input( $term, $saved_term );
 		$children = $this->build_children( $term, $saved_term );
 
 		if ( ! empty( $children ) ) {
@@ -37,5 +40,4 @@ protected function list_term_input( $term, $saved_term ) {
 
 		return $options;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Select.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Select.php
index 125ba640..600baceb 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Select.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Select.php
@@ -32,9 +32,11 @@ class CMB2_Type_Taxonomy_Select extends CMB2_Type_Taxonomy_Base {
 
 	public function render() {
 		return $this->rendered(
-			$this->types->select( array(
-				'options' => $this->get_term_options(),
-			) )
+			$this->types->select(
+				array(
+					'options' => $this->get_term_options(),
+				)
+			)
 		);
 	}
 
@@ -45,9 +47,9 @@ protected function get_term_options() {
 			return $this->no_terms_result( $all_terms, 'strong' );
 		}
 
-		$this->saved_term  = $this->get_object_term_or_default();
-		$option_none = $this->field->args( 'show_option_none' );
-		$options     = '';
+		$this->saved_term = $this->get_object_term_or_default();
+		$option_none      = $this->field->args( 'show_option_none' );
+		$options          = '';
 
 		if ( ! empty( $option_none ) ) {
 
@@ -73,11 +75,13 @@ protected function get_term_options() {
 			 */
 			$option_none_value = apply_filters( "cmb2_taxonomy_select_{$field_id}_default_value", $option_none_value );
 
-			$options .= $this->select_option( array(
-				'label'   => $option_none,
-				'value'   => $option_none_value,
-				'checked' => $this->saved_term == $option_none_value,
-			) );
+			$options .= $this->select_option(
+				array(
+					'label'   => $option_none,
+					'value'   => $option_none_value,
+					'checked' => $this->saved_term == $option_none_value,
+				)
+			);
 		}
 
 		$options .= $this->loop_terms( $all_terms, $this->saved_term );
@@ -90,11 +94,13 @@ protected function loop_terms( $all_terms, $saved_term ) {
 
 		foreach ( $all_terms as $term ) {
 			$this->current_term = $term;
-			$options .= $this->select_option( array(
-				'label'   => $term->name,
-				'value'   => $term->slug,
-				'checked' => $this->saved_term === $term->slug,
-			) );
+			$options           .= $this->select_option(
+				array(
+					'label'   => $term->name,
+					'value'   => $term->slug,
+					'checked' => $this->saved_term === $term->slug,
+				)
+			);
 		}
 
 		return $options;
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Select_Hierarchical.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Select_Hierarchical.php
index c7afa469..9a6ecc61 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Select_Hierarchical.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Taxonomy_Select_Hierarchical.php
@@ -32,9 +32,12 @@ class CMB2_Type_Taxonomy_Select_Hierarchical extends CMB2_Type_Taxonomy_Select {
 
 	public function render() {
 		return $this->rendered(
-			$this->types->select( array(
-				'options' => $this->get_term_options(),
-			), 'taxonomy_select_hierarchical' )
+			$this->types->select(
+				array(
+					'options' => $this->get_term_options(),
+				),
+				'taxonomy_select_hierarchical'
+			)
 		);
 	}
 
@@ -42,7 +45,7 @@ public function select_option( $args = array() ) {
 		if ( $this->level > 0 ) {
 			$args['label'] = str_repeat( '&nbsp;&nbsp;&nbsp;&nbsp;', $this->level ) . $args['label'];
 		}
-		$option = parent::select_option( $args );
+		$option   = parent::select_option( $args );
 		$children = $this->build_children( $this->current_term, $this->saved_term );
 
 		if ( ! empty( $children ) ) {
@@ -63,11 +66,10 @@ public function select_option( $args = array() ) {
 	 * @return string              Child option output.
 	 */
 	public function child_option_output( $terms, $saved ) {
-		$this->level++;
+		++$this->level;
 		$output = $this->loop_terms( $terms, $saved );
-		$this->level--;
+		--$this->level;
 
 		return $output;
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text.php
index 163e1eba..a61d4f71 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text.php
@@ -41,15 +41,19 @@ public function __construct( CMB2_Types $types, $args = array(), $type = '' ) {
 	 */
 	public function render( $args = array() ) {
 		$args = empty( $args ) ? $this->args : $args;
-		$a = $this->parse_args( $this->type, array(
-			'type'            => 'text',
-			'class'           => 'regular-text',
-			'name'            => $this->_name(),
-			'id'              => $this->_id(),
-			'value'           => $this->field->escaped_value(),
-			'desc'            => $this->_desc( true ),
-			'js_dependencies' => array(),
-		), $args );
+		$a    = $this->parse_args(
+			$this->type,
+			array(
+				'type'            => 'text',
+				'class'           => 'regular-text',
+				'name'            => $this->_name(),
+				'id'              => $this->_id(),
+				'value'           => $this->field->escaped_value(),
+				'desc'            => $this->_desc( true ),
+				'js_dependencies' => array(),
+			),
+			$args
+		);
 
 		// Add character counter?
 		$a = $this->maybe_update_attributes_for_char_counter( $a );
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Date.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Date.php
index 225c643f..56f015a5 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Date.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Date.php
@@ -13,12 +13,15 @@
 class CMB2_Type_Text_Date extends CMB2_Type_Picker_Base {
 
 	public function render( $args = array() ) {
-		$args = $this->parse_args( 'text_date', array(
-			'class'           => 'cmb2-text-small cmb2-datepicker',
-			'value'           => $this->field->get_timestamp_format(),
-			'desc'            => $this->_desc(),
-			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
-		) );
+		$args = $this->parse_args(
+			'text_date',
+			array(
+				'class'           => 'cmb2-text-small cmb2-datepicker',
+				'value'           => $this->field->get_timestamp_format(),
+				'desc'            => $this->_desc(),
+				'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
+			)
+		);
 
 		if ( false === strpos( $args['class'], 'timepicker' ) ) {
 			$this->parse_picker_options( 'date' );
@@ -26,5 +29,4 @@ public function render( $args = array() ) {
 
 		return parent::render( $args );
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp.php
index 1886b9a5..61e5763f 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp.php
@@ -20,12 +20,15 @@ public function render( $args = array() ) {
 			$value = $field->get_default();
 		}
 
-		$args = wp_parse_args( $this->args, array(
-			'value'      => $value,
-			'desc'       => $this->_desc(),
-			'datepicker' => array(),
-			'timepicker' => array(),
-		) );
+		$args = wp_parse_args(
+			$this->args,
+			array(
+				'value'      => $value,
+				'desc'       => $this->_desc(),
+				'datepicker' => array(),
+				'timepicker' => array(),
+			)
+		);
 
 		if ( empty( $args['value'] ) ) {
 			$args['value'] = $value;
@@ -45,13 +48,16 @@ public function render( $args = array() ) {
 	}
 
 	public function date_args( $args, $has_good_value ) {
-		$date_args = wp_parse_args( $args['datepicker'], array(
-			'class' => 'cmb2-text-small cmb2-datepicker',
-			'name'  => $this->_name( '[date]' ),
-			'id'    => $this->_id( '_date' ),
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
-			'desc'  => '',
-		) );
+		$date_args = wp_parse_args(
+			$args['datepicker'],
+			array(
+				'class' => 'cmb2-text-small cmb2-datepicker',
+				'name'  => $this->_name( '[date]' ),
+				'id'    => $this->_id( '_date' ),
+				'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
+				'desc'  => '',
+			)
+		);
 
 		$date_args['rendered'] = true;
 
@@ -60,19 +66,21 @@ public function date_args( $args, $has_good_value ) {
 	}
 
 	public function time_args( $args, $has_good_value ) {
-		$time_args = wp_parse_args( $args['timepicker'], array(
-			'class' => 'cmb2-timepicker text-time',
-			'name'  => $this->_name( '[time]' ),
-			'id'    => $this->_id( '_time' ),
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
-			'desc'  => $args['desc'],
-			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
-		) );
+		$time_args = wp_parse_args(
+			$args['timepicker'],
+			array(
+				'class'           => 'cmb2-timepicker text-time',
+				'name'            => $this->_name( '[time]' ),
+				'id'              => $this->_id( '_time' ),
+				'value'           => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
+				'desc'            => $args['desc'],
+				'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
+			)
+		);
 
 		$time_args['rendered'] = true;
 
 		// Let's get the time-format, and set it up as a data attr for the field.
 		return $this->parse_picker_options( 'time', $time_args );
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php
index b30e82cc..09ea963d 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php
@@ -20,12 +20,15 @@ public function render( $args = array() ) {
 			$value = $field->get_default();
 		}
 
-		$args = wp_parse_args( $this->args, array(
-			'value'                   => $value,
-			'desc'                    => $this->_desc( true ),
-			'text_datetime_timestamp' => array(),
-			'select_timezone'         => array(),
-		) );
+		$args = wp_parse_args(
+			$this->args,
+			array(
+				'value'                   => $value,
+				'desc'                    => $this->_desc( true ),
+				'text_datetime_timestamp' => array(),
+				'select_timezone'         => array(),
+			)
+		);
 
 		$args['value'] = $value;
 		if ( is_array( $args['value'] ) ) {
@@ -33,7 +36,7 @@ public function render( $args = array() ) {
 		}
 
 		$datetime = maybe_unserialize( $args['value'] );
-		$value = $tzstring = '';
+		$value    = $tzstring = '';
 
 		if ( $datetime && $datetime instanceof DateTime ) {
 			$tz       = $datetime->getTimezone();
@@ -41,26 +44,31 @@ public function render( $args = array() ) {
 			$value    = $datetime->getTimestamp();
 		}
 
-		$timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array(
-			'desc'     => '',
-			'value'    => $value,
-			'rendered' => true,
-		) );
+		$timestamp_args     = wp_parse_args(
+			$args['text_datetime_timestamp'],
+			array(
+				'desc'     => '',
+				'value'    => $value,
+				'rendered' => true,
+			)
+		);
 		$datetime_timestamp = $this->types->text_datetime_timestamp( $timestamp_args );
 
-		$timezone_select_args = wp_parse_args( $args['select_timezone'], array(
-			'class'    => 'cmb2_select cmb2-select-timezone',
-			'name'     => $this->_name( '[timezone]' ),
-			'id'       => $this->_id( '_timezone' ),
-			'options'  => wp_timezone_choice( $tzstring ),
-			'desc'     => $args['desc'],
-			'rendered' => true,
-		) );
-		$select = $this->types->select( $timezone_select_args );
+		$timezone_select_args = wp_parse_args(
+			$args['select_timezone'],
+			array(
+				'class'    => 'cmb2_select cmb2-select-timezone',
+				'name'     => $this->_name( '[timezone]' ),
+				'id'       => $this->_id( '_timezone' ),
+				'options'  => wp_timezone_choice( $tzstring ),
+				'desc'     => $args['desc'],
+				'rendered' => true,
+			)
+		);
+		$select               = $this->types->select( $timezone_select_args );
 
 		return $this->rendered(
 			$datetime_timestamp . "\n" . $select
 		);
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Time.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Time.php
index 8ce6b1fa..0b943090 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Time.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Text_Time.php
@@ -13,13 +13,18 @@
 class CMB2_Type_Text_Time extends CMB2_Type_Text_Date {
 
 	public function render( $args = array() ) {
-		$this->args = $this->parse_picker_options( 'time', wp_parse_args( $this->args, array(
-			'class'           => 'cmb2-timepicker text-time',
-			'value'           => $this->field->get_timestamp_format( 'time_format' ),
-			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
-		) ) );
+		$this->args = $this->parse_picker_options(
+			'time',
+			wp_parse_args(
+				$this->args,
+				array(
+					'class'           => 'cmb2-timepicker text-time',
+					'value'           => $this->field->get_timestamp_format( 'time_format' ),
+					'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
+				)
+			)
+		);
 
 		return parent::render();
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Textarea.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Textarea.php
index 564288d8..1a8dabaa 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Textarea.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Textarea.php
@@ -21,15 +21,19 @@ class CMB2_Type_Textarea extends CMB2_Type_Counter_Base {
 	 */
 	public function render( $args = array() ) {
 		$args = empty( $args ) ? $this->args : $args;
-		$a = $this->parse_args( 'textarea', array(
-			'class' => 'cmb2_textarea',
-			'name'  => $this->_name(),
-			'id'    => $this->_id(),
-			'cols'  => 60,
-			'rows'  => 10,
-			'value' => $this->field->escaped_value( 'esc_textarea' ),
-			'desc'  => $this->_desc( true ),
-		), $args );
+		$a    = $this->parse_args(
+			'textarea',
+			array(
+				'class' => 'cmb2_textarea',
+				'name'  => $this->_name(),
+				'id'    => $this->_id(),
+				'cols'  => 60,
+				'rows'  => 10,
+				'value' => $this->field->escaped_value( 'esc_textarea' ),
+				'desc'  => $this->_desc( true ),
+			),
+			$args
+		);
 
 		// Add character counter?
 		$a = $this->maybe_update_attributes_for_char_counter( $a );
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Textarea_Code.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Textarea_Code.php
index ee36c01c..48e61153 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Textarea_Code.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Textarea_Code.php
@@ -20,10 +20,13 @@ class CMB2_Type_Textarea_Code extends CMB2_Type_Textarea {
 	 * @return string       Form textarea element
 	 */
 	public function render( $args = array() ) {
-		$args = wp_parse_args( $args, array(
-			'class' => 'cmb2-textarea-code',
-			'desc'  => '</pre>' . $this->_desc( true ),
-		) );
+		$args = wp_parse_args(
+			$args,
+			array(
+				'class' => 'cmb2-textarea-code',
+				'desc'  => '</pre>' . $this->_desc( true ),
+			)
+		);
 
 		if ( true !== $this->field->options( 'disable_codemirror' )
 			&& function_exists( 'wp_enqueue_code_editor' ) ) {
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Title.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Title.php
index a90fdb52..e68efbbf 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Title.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Title.php
@@ -25,13 +25,16 @@ public function render() {
 			$tag = $this->field->object_type == 'post' ? 'h5' : 'h3';
 		}
 
-		$a = $this->parse_args( 'title', array(
-			'tag'   => $tag,
-			'class' => empty( $name ) ? 'cmb2-metabox-title-anchor' : 'cmb2-metabox-title',
-			'name'  => $name,
-			'desc'  => $this->_desc( true ),
-			'id'    => str_replace( '_', '-', sanitize_html_class( $this->field->id() ) ),
-		) );
+		$a = $this->parse_args(
+			'title',
+			array(
+				'tag'   => $tag,
+				'class' => empty( $name ) ? 'cmb2-metabox-title-anchor' : 'cmb2-metabox-title',
+				'name'  => $name,
+				'desc'  => $this->_desc( true ),
+				'id'    => str_replace( '_', '-', sanitize_html_class( $this->field->id() ) ),
+			)
+		);
 
 		return $this->rendered(
 			sprintf(
@@ -43,5 +46,4 @@ public function render() {
 			)
 		);
 	}
-
 }
diff --git a/public/includes/lib/CMB2/includes/types/CMB2_Type_Wysiwyg.php b/public/includes/lib/CMB2/includes/types/CMB2_Type_Wysiwyg.php
index 353830b7..14b360b6 100755
--- a/public/includes/lib/CMB2/includes/types/CMB2_Type_Wysiwyg.php
+++ b/public/includes/lib/CMB2/includes/types/CMB2_Type_Wysiwyg.php
@@ -17,17 +17,21 @@ class CMB2_Type_Wysiwyg extends CMB2_Type_Textarea {
 
 	/**
 	 * Handles outputting a 'wysiwyg' element
+	 *
 	 * @since  1.1.0
 	 * @return string Form wysiwyg element
 	 */
 	public function render( $args = array() ) {
 		$field = $this->field;
-		$a = $this->parse_args( 'wysiwyg', array(
-			'id'      => $this->_id( '', false ),
-			'value'   => $field->escaped_value( 'stripslashes' ),
-			'desc'    => $this->_desc( true ),
-			'options' => $field->options(),
-		) );
+		$a     = $this->parse_args(
+			'wysiwyg',
+			array(
+				'id'      => $this->_id( '', false ),
+				'value'   => $field->escaped_value( 'stripslashes' ),
+				'desc'    => $this->_desc( true ),
+				'options' => $field->options(),
+			)
+		);
 
 		if ( ! $field->group ) {
 
@@ -52,13 +56,18 @@ public function render( $args = array() ) {
 		add_action( is_admin() ? 'admin_footer' : 'wp_footer', array( $this, 'add_wysiwyg_template_for_group' ) );
 
 		return $this->rendered(
-			sprintf( '<div class="cmb2-wysiwyg-wrap">%s', parent::render( array(
-				'class'         => 'cmb2_textarea cmb2-wysiwyg-placeholder',
-				'data-groupid'  => $field->group->id(),
-				'data-iterator' => $field->group->index,
-				'data-fieldid'  => $field->id( true ),
-				'desc'          => '</div>' . $this->_desc( true ),
-			) ) )
+			sprintf(
+				'<div class="cmb2-wysiwyg-wrap">%s',
+				parent::render(
+					array(
+						'class'         => 'cmb2_textarea cmb2-wysiwyg-placeholder',
+						'data-groupid'  => $field->group->id(),
+						'data-iterator' => $field->group->index,
+						'data-fieldid'  => $field->id( true ),
+						'desc'          => '</div>' . $this->_desc( true ),
+					)
+				)
+			)
 		);
 	}
 
@@ -69,29 +78,35 @@ protected function get_wp_editor( $args ) {
 	}
 
 	public function add_wysiwyg_template_for_group() {
-		$group_id = $this->field->group->id();
-		$field_id = $this->field->id( true );
-		$hash     = $this->field->hash_id();
-		$options  = $this->field->options();
+		$group_id                 = $this->field->group->id();
+		$field_id                 = $this->field->id( true );
+		$hash                     = $this->field->hash_id();
+		$options                  = $this->field->options();
 		$options['textarea_name'] = 'cmb2_n_' . $group_id . $field_id;
 
 		// Initate the editor with special id/value/name so we can retrieve the options in JS.
-		$editor = $this->get_wp_editor( array(
-			'value'   => 'cmb2_v_' . $group_id . $field_id,
-			'id'      => 'cmb2_i_' . $group_id . $field_id,
-			'options' => $options,
-		) );
+		$editor = $this->get_wp_editor(
+			array(
+				'value'   => 'cmb2_v_' . $group_id . $field_id,
+				'id'      => 'cmb2_i_' . $group_id . $field_id,
+				'options' => $options,
+			)
+		);
 
 		// Then replace the special id/value/name with underscore placeholders.
-		$editor = str_replace( array(
-			'cmb2_n_' . $group_id . $field_id,
-			'cmb2_v_' . $group_id . $field_id,
-			'cmb2_i_' . $group_id . $field_id,
-			), array(
-			'{{ data.name }}',
-			'{{{ data.value }}}',
-			'{{ data.id }}',
-		), $editor );
+		$editor = str_replace(
+			array(
+				'cmb2_n_' . $group_id . $field_id,
+				'cmb2_v_' . $group_id . $field_id,
+				'cmb2_i_' . $group_id . $field_id,
+			),
+			array(
+				'{{ data.name }}',
+				'{{{ data.value }}}',
+				'{{ data.id }}',
+			),
+			$editor
+		);
 
 		// And put the editor instance in a JS template wrapper.
 		echo '<script type="text/template" id="tmpl-cmb2-wysiwyg-' . $group_id . '-' . $field_id . '">';
@@ -99,5 +114,4 @@ public function add_wysiwyg_template_for_group() {
 		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="' . $group_id . '" data-id="' . $field_id . '" data-hash="' . $hash . '">' . $editor . '</div>';
 		echo '</script>';
 	}
-
 }
diff --git a/public/includes/lib/CMB2/init.php b/public/includes/lib/CMB2/init.php
index 1aebf728..92275e5c 100755
--- a/public/includes/lib/CMB2/init.php
+++ b/public/includes/lib/CMB2/init.php
@@ -147,7 +147,7 @@ public function include_cmb() {
 			}
 
 			if ( ! defined( 'CMB2_DIR' ) ) {
-				define( 'CMB2_DIR', trailingslashit( dirname( __FILE__ ) ) );
+				define( 'CMB2_DIR', trailingslashit( __DIR__ ) );
 			}
 
 			$this->l10ni18n();
@@ -161,7 +161,7 @@ public function include_cmb() {
 			spl_autoload_register( 'cmb2_autoload_classes' );
 
 			// Kick the whole thing off.
-			require_once( cmb2_dir( 'bootstrap.php' ) );
+			require_once cmb2_dir( 'bootstrap.php' );
 			cmb2_bootstrap();
 		}
 
@@ -184,12 +184,10 @@ public function l10ni18n() {
 
 			if ( ! $loaded ) {
 				$locale = apply_filters( 'plugin_locale', function_exists( 'determine_locale' ) ? determine_locale() : get_locale(), 'cmb2' );
-				$mofile = dirname( __FILE__ ) . '/languages/cmb2-' . $locale . '.mo';
+				$mofile = __DIR__ . '/languages/cmb2-' . $locale . '.mo';
 				load_textdomain( 'cmb2', $mofile );
 			}
-
 		}
-
 	}
 
 	// Make it so...
diff --git a/public/includes/lib/CMB2/js/cmb2-char-counter.js b/public/includes/lib/CMB2/js/cmb2-char-counter.js
index 4174649f..42cc852c 100755
--- a/public/includes/lib/CMB2/js/cmb2-char-counter.js
+++ b/public/includes/lib/CMB2/js/cmb2-char-counter.js
@@ -4,208 +4,207 @@
 window.CMB2 = window.CMB2 || {};
 window.CMB2.charcounter = window.CMB2.charcounter || {};
 
-( function(window, document, $, cmb, counter ) {
-	'use strict';
-
-	if ( ! wp.utils || ! wp.utils.WordCounter ) {
-		return cmb.log( 'Cannot find wp.utils!' );
-	}
-
-	// Private variables
-	counter.counters = {};
-	var counters     = counter.counters;
-	var wpCounter    = new wp.utils.WordCounter();
-
-	/**
-	 * Update a field's character counter
-	 *
-	 * @since  2.7.0
-	 *
-	 * @param {string} field_id
-	 *
-	 * @return {int}
-	 */
-	counter.updateCounter = function( field_id ) {
-		// No counter?
-		if ( ! counters.hasOwnProperty( field_id ) ) {
-			return null;
-		}
-
-		var instance = counters[ field_id ];
-		var wysiwyg  = instance.editor && ! instance.editor.isHidden();
-
-		// Are we dealing with WYSIWYG visual editor, or textarea / WYSIWYG textarea?
-		var text     = wysiwyg ? instance.editor.getContent( { format: 'raw' } ) : cmb.$id( field_id ).val().trim();
-		var count    = wpCounter.count( text, instance.type );
-		var exceeded = instance.max && count > instance.max;
-
-		// Number remaining when max is defined
-		var val      = instance.max ? instance.max - count : count;
-
-		// Over maximum?
-		instance.$el.parents( '.cmb2-char-counter-wrap' )[ exceeded ? 'addClass' : 'removeClass' ]( 'cmb2-max-exceeded' );
-
-		// Update counter, and update counter input width.
-		instance.$el.val( val ).outerWidth( ( ( 8 * String( val ).length ) + 15 ) + 'px' );
-
-		return count;
-	};
-
-	counter.instantiate = function( $el ) {
-		var data = $el.data();
-
-		// Add counter details if not already done
-		if ( ! ( data.fieldId in counters ) ) {
-
-			var instance = {
-				$el    : $el,
-				max    : data.max,
-				type   : 'words' === data.counterType ? 'words' : 'characters_including_spaces',
-				editor : false,
-			};
-
-			counters[ data.fieldId ] = instance;
-
-			// Initialise counter
-			counter.updateCounter( data.fieldId );
-		}
-	};
-
-	/**
-	 * Initializes all character counters. Hooked to cmb_init.
-	 *
-	 * @since  2.7.0
-	 *
-	 * @param {bool} init First init?
-	 *
-	 * @return {void}
-	 */
-	counter.initAll = function() {
-
-		// Gather counters and initialise
-		$( '.cmb2-char-counter' ).each( function() {
-			counter.instantiate( $( this ) );
-		});
-	};
-
-	/**
-	 * Initializes WYSIWYG editors. Hooked to tinymce-editor-init
-	 *
-	 * @since  2.7.0
-	 *
-	 * @param {object} evt
-	 * @param {object} editor
-	 *
-	 * @return {void}
-	 */
-	counter.initWysiwyg = function( evt, editor ) {
-
-		// Check if it's one of our WYSIWYGs
-		// Should have already been registered in counters via hidden textarea
-		if ( editor.id in counters ) {
-
-			// Add editor to counter
-			counters[ editor.id ].editor = editor;
-
-			// Add nodechange event
-			editor.on( 'nodechange keyup', counter.countWysiwyg );
-		}
-	};
-
-	/**
-	 * Initializes after a new repeatable row has been added. Hooked to cmb2_add_row
-	 *
-	 * @since  2.7.0
-	 *
-	 * @param  {object} evt A jQuery-normalized event object.
-	 * @param  {object} $row A jQuery dom element object for the group row.
-	 *
-	 * @return {void}
-	 */
-	counter.addRow = function( evt, $row ) {
-
-		// Character counters in row?
-		$row.find( '.cmb2-char-counter' ).each( function() {
-
-			// Update attributes
-			var $this    = $( this );
-			var id       = $this.attr( 'id' );
-			var field_id = id.replace( /^char-counter-/, '' );
-			$this.attr( 'data-field-id', field_id ).data( 'field-id', field_id );
-
-			counter.instantiate( $this );
-		});
-	};
-
-	/**
-	 * Clean the counters array.
-	 * Removes counters after a repeatable row has been removed. Hooked to cmb2_remove_row.
-	 *
-	 * @since  2.7.0
-	 *
-	 * @return {void}
-	 */
-	counter.cleanCounters = function() {
-		var field_id, remove = [];
-
-		// Got through counters
-		for ( field_id in counters ) {
-			// Check for element, gather for removal
-			if ( ! document.getElementById( field_id ) ) {
-				remove.push( field_id );
-			}
-		}
-
-		// Anything to remove?
-		if ( remove.length ) {
-			_.each( remove, function( field_id ) {
-				delete counters[ field_id ];
-			});
-		}
-	};
-
-	/**
-	 * Counts the value of wysiwyg on the keyup event.
-	 *
-	 * @since  2.7.0
-	 *
-	 * @param  {object} evt
-	 *
-	 * @return {void}
-	 */
-	counter.countWysiwyg = _.throttle( function( evt ) {
-
-		// Init event
-		if ( evt.hasOwnProperty( 'element' ) ) {
-			return counter.updateCounter( $( evt.element ).data( 'id' ) );
-		}
-
-		// Nodechange event
-		if ( evt.hasOwnProperty( 'currentTarget' ) ) {
-			return counter.updateCounter( $( evt.currentTarget ).data( 'id' ) );
-		}
-
-	} );
-
-	/**
-	 * Counts the value of textarea on the keyup event.
-	 *
-	 * @since  2.7.0
-	 *
-	 * @param  {object} evt
-	 *
-	 * @return {void}
-	 */
-	counter.countTextarea = _.throttle( function(evt) {
-		counter.updateCounter( evt.currentTarget.id );
-	}, 400 );
-
-	// Hook in our event callbacks.
-	$( document )
-		.on( 'cmb_init', counter.initAll )
-		.on( 'tinymce-editor-init', counter.initWysiwyg )
-		.on( 'cmb2_add_row', counter.addRow )
-		.on( 'cmb2_remove_row', counter.cleanCounters )
-		.on( 'input keyup', '.cmb2-count-chars', counter.countTextarea );
-
-} )( window, document, jQuery, window.CMB2, window.CMB2.charcounter );
+(function (window, document, $, cmb, counter) {
+  "use strict";
+
+  if (!wp.utils || !wp.utils.WordCounter) {
+    return cmb.log("Cannot find wp.utils!");
+  }
+
+  // Private variables
+  counter.counters = {};
+  var counters = counter.counters;
+  var wpCounter = new wp.utils.WordCounter();
+
+  /**
+   * Update a field's character counter
+   *
+   * @since  2.7.0
+   *
+   * @param {string} field_id
+   *
+   * @return {int}
+   */
+  counter.updateCounter = function (field_id) {
+    // No counter?
+    if (!counters.hasOwnProperty(field_id)) {
+      return null;
+    }
+
+    var instance = counters[field_id];
+    var wysiwyg = instance.editor && !instance.editor.isHidden();
+
+    // Are we dealing with WYSIWYG visual editor, or textarea / WYSIWYG textarea?
+    var text = wysiwyg
+      ? instance.editor.getContent({ format: "raw" })
+      : cmb.$id(field_id).val().trim();
+    var count = wpCounter.count(text, instance.type);
+    var exceeded = instance.max && count > instance.max;
+
+    // Number remaining when max is defined
+    var val = instance.max ? instance.max - count : count;
+
+    // Over maximum?
+    instance.$el
+      .parents(".cmb2-char-counter-wrap")
+      [exceeded ? "addClass" : "removeClass"]("cmb2-max-exceeded");
+
+    // Update counter, and update counter input width.
+    instance.$el.val(val).outerWidth(8 * String(val).length + 15 + "px");
+
+    return count;
+  };
+
+  counter.instantiate = function ($el) {
+    var data = $el.data();
+
+    // Add counter details if not already done
+    if (!(data.fieldId in counters)) {
+      var instance = {
+        $el: $el,
+        max: data.max,
+        type:
+          "words" === data.counterType
+            ? "words"
+            : "characters_including_spaces",
+        editor: false,
+      };
+
+      counters[data.fieldId] = instance;
+
+      // Initialise counter
+      counter.updateCounter(data.fieldId);
+    }
+  };
+
+  /**
+   * Initializes all character counters. Hooked to cmb_init.
+   *
+   * @since  2.7.0
+   *
+   * @param {bool} init First init?
+   *
+   * @return {void}
+   */
+  counter.initAll = function () {
+    // Gather counters and initialise
+    $(".cmb2-char-counter").each(function () {
+      counter.instantiate($(this));
+    });
+  };
+
+  /**
+   * Initializes WYSIWYG editors. Hooked to tinymce-editor-init
+   *
+   * @since  2.7.0
+   *
+   * @param {object} evt
+   * @param {object} editor
+   *
+   * @return {void}
+   */
+  counter.initWysiwyg = function (evt, editor) {
+    // Check if it's one of our WYSIWYGs
+    // Should have already been registered in counters via hidden textarea
+    if (editor.id in counters) {
+      // Add editor to counter
+      counters[editor.id].editor = editor;
+
+      // Add nodechange event
+      editor.on("nodechange keyup", counter.countWysiwyg);
+    }
+  };
+
+  /**
+   * Initializes after a new repeatable row has been added. Hooked to cmb2_add_row
+   *
+   * @since  2.7.0
+   *
+   * @param  {object} evt A jQuery-normalized event object.
+   * @param  {object} $row A jQuery dom element object for the group row.
+   *
+   * @return {void}
+   */
+  counter.addRow = function (evt, $row) {
+    // Character counters in row?
+    $row.find(".cmb2-char-counter").each(function () {
+      // Update attributes
+      var $this = $(this);
+      var id = $this.attr("id");
+      var field_id = id.replace(/^char-counter-/, "");
+      $this.attr("data-field-id", field_id).data("field-id", field_id);
+
+      counter.instantiate($this);
+    });
+  };
+
+  /**
+   * Clean the counters array.
+   * Removes counters after a repeatable row has been removed. Hooked to cmb2_remove_row.
+   *
+   * @since  2.7.0
+   *
+   * @return {void}
+   */
+  counter.cleanCounters = function () {
+    var field_id,
+      remove = [];
+
+    // Got through counters
+    for (field_id in counters) {
+      // Check for element, gather for removal
+      if (!document.getElementById(field_id)) {
+        remove.push(field_id);
+      }
+    }
+
+    // Anything to remove?
+    if (remove.length) {
+      _.each(remove, function (field_id) {
+        delete counters[field_id];
+      });
+    }
+  };
+
+  /**
+   * Counts the value of wysiwyg on the keyup event.
+   *
+   * @since  2.7.0
+   *
+   * @param  {object} evt
+   *
+   * @return {void}
+   */
+  counter.countWysiwyg = _.throttle(function (evt) {
+    // Init event
+    if (evt.hasOwnProperty("element")) {
+      return counter.updateCounter($(evt.element).data("id"));
+    }
+
+    // Nodechange event
+    if (evt.hasOwnProperty("currentTarget")) {
+      return counter.updateCounter($(evt.currentTarget).data("id"));
+    }
+  });
+
+  /**
+   * Counts the value of textarea on the keyup event.
+   *
+   * @since  2.7.0
+   *
+   * @param  {object} evt
+   *
+   * @return {void}
+   */
+  counter.countTextarea = _.throttle(function (evt) {
+    counter.updateCounter(evt.currentTarget.id);
+  }, 400);
+
+  // Hook in our event callbacks.
+  $(document)
+    .on("cmb_init", counter.initAll)
+    .on("tinymce-editor-init", counter.initWysiwyg)
+    .on("cmb2_add_row", counter.addRow)
+    .on("cmb2_remove_row", counter.cleanCounters)
+    .on("input keyup", ".cmb2-count-chars", counter.countTextarea);
+})(window, document, jQuery, window.CMB2, window.CMB2.charcounter);
diff --git a/public/includes/lib/CMB2/js/cmb2-wysiwyg.js b/public/includes/lib/CMB2/js/cmb2-wysiwyg.js
index 111e7ea0..cf1fbfe9 100755
--- a/public/includes/lib/CMB2/js/cmb2-wysiwyg.js
+++ b/public/includes/lib/CMB2/js/cmb2-wysiwyg.js
@@ -4,342 +4,360 @@
 window.CMB2 = window.CMB2 || {};
 window.CMB2.wysiwyg = window.CMB2.wysiwyg || {};
 
-( function(window, document, $, cmb, wysiwyg, undefined ) {
-	'use strict';
-
-	// Private variables
-	var toBeDestroyed = [];
-	var toBeInitialized = [];
-	var all = wysiwyg.all = {};
-
-	// Private functions
-
-	/**
-	 * Initializes any editors that weren't initialized because they didn't exist yet.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @return {void}
-	 */
-	function delayedInit() {
-
-		// Don't initialize until they've all been destroyed.
-		if ( 0 === toBeDestroyed.length ) {
-			toBeInitialized.forEach( function ( toInit ) {
-				toBeInitialized.splice( toBeInitialized.indexOf( toInit ), 1 );
-				wysiwyg.init.apply( wysiwyg, toInit );
-			} );
-		} else {
-			window.setTimeout( delayedInit, 100 );
-		}
-	}
-
-	/**
-	 * Destroys any editors that weren't destroyed because they didn't exist yet.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @return {void}
-	 */
-	function delayedDestroy() {
-		toBeDestroyed.forEach( function( id ) {
-			toBeDestroyed.splice( toBeDestroyed.indexOf( id ), 1 );
-			wysiwyg.destroy( id );
-		} );
-	}
-
-	/**
-	 * Gets the option data for a group (and initializes that data if it doesn't exist).
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} data The group/field data.
-	 *
-	 * @return {object}      Options data object for a group.
-	 */
-	function getGroupData( data ) {
-		var groupid = data.groupid;
-		var fieldid = data.fieldid;
-
-		if ( ! all[ groupid ] || ! all[ groupid ][ fieldid ] ) {
-			all[ groupid ] = all[ groupid ] || {};
-			all[ groupid ][ fieldid ] = {
-				template : wp.template( 'cmb2-wysiwyg-' + groupid + '-' + fieldid ),
-				defaults : {
-
-					// Get the data from the template-wysiwyg initiation.
-					mce : $.extend( {}, tinyMCEPreInit.mceInit[ 'cmb2_i_' + groupid + fieldid ] ),
-					qt  : $.extend( {}, tinyMCEPreInit.qtInit[ 'cmb2_i_' + groupid + fieldid ] )
-				}
-			};
-			// This is the template-wysiwyg data, and we do not want that to be initiated.
-			delete tinyMCEPreInit.mceInit[ 'cmb2_i_' + groupid + fieldid ];
-			delete tinyMCEPreInit.qtInit[ 'cmb2_i_' + groupid + fieldid ];
-		}
-
-		return all[ groupid ][ fieldid ];
-	}
-
-	/**
-	 * Initiates the tinyMCEPreInit options for a wysiwyg editor instance.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} options Options data object for the wysiwyg editor instance.
-	 *
-	 * @return {void}
-	 */
-	function initOptions( options ) {
-		var nameRegex = new RegExp( 'cmb2_n_' + options.groupid + options.fieldid, 'g' );
-		var idRegex   = new RegExp( 'cmb2_i_' + options.groupid + options.fieldid, 'g' );
-		var prop, newSettings, newQTS;
-
-		// If no settings for this field. Clone from placeholder.
-		if ( 'undefined' === typeof( tinyMCEPreInit.mceInit[ options.id ] ) ) {
-			newSettings = $.extend( {}, options.defaults.mce );
-			for ( prop in newSettings ) {
-				if ( 'string' === typeof( newSettings[ prop ] ) ) {
-					newSettings[ prop ] = newSettings[ prop ]
-						.replace( idRegex, options.id )
-						.replace( nameRegex, options.name );
-				}
-			}
-			tinyMCEPreInit.mceInit[ options.id ] = newSettings;
-		}
-
-		// If no Quicktag settings for this field. Clone from placeholder.
-		if ( 'undefined' === typeof( tinyMCEPreInit.qtInit[ options.id ] ) ) {
-			newQTS = $.extend( {}, options.defaults.qt );
-			for ( prop in newQTS ) {
-				if ( 'string' === typeof( newQTS[ prop ] ) ) {
-					newQTS[ prop ] = newQTS[ prop ]
-						.replace( idRegex, options.id )
-						.replace( nameRegex, options.name );
-				}
-			}
-			tinyMCEPreInit.qtInit[ options.id ] = newQTS;
-		}
-	}
-
-	/**
-	 * Initializes all group wysiwyg editors. Hooked to cmb_init.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @return {void}
-	 */
-	wysiwyg.initAll = function() {
-		var $this,data,initiated;
-
-		$( '.cmb2-wysiwyg-placeholder' ).each( function() {
-			$this = $( this );
-			data  = $this.data();
-
-			if ( data.groupid ) {
-
-				data.id    = $this.attr( 'id' );
-				data.name  = $this.attr( 'name' );
-				data.value = $this.val();
-
-				wysiwyg.init( $this, data, false );
-				initiated = true;
-			}
-		} );
-
-		if ( true === initiated ) {
-			if ( 'undefined' !== typeof window.QTags ) {
-				window.QTags._buttonsInit();
-			}
-
-			// Hook in our event callbacks.
-			$( document )
-				.on( 'cmb2_add_row', wysiwyg.addRow )
-				.on( 'cmb2_remove_group_row_start', wysiwyg.destroyRowEditors )
-				.on( 'cmb2_shift_rows_start', wysiwyg.shiftStart )
-				.on( 'cmb2_shift_rows_complete', wysiwyg.shiftComplete );
-		}
-	};
-
-	/**
-	 * Initiates wysiwyg editors in a new group row. Hooked to cmb2_add_row.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} evt A jQuery-normalized event object.
-	 * @param  {object} $row A jQuery dom element object for the group row.
-	 *
-	 * @return {void}
-	 */
-	wysiwyg.addRow = function( evt, $row ) {
-		wysiwyg.initRow( $row, evt );
-	};
-
-	/**
-	 * Destroys wysiwyg editors in a group row when that row is removed. Hooked to cmb2_remove_group_row_start.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} evt A jQuery-normalized event object.
-	 * @param  {object} $btn A jQuery dom element object for the remove-row button.
-	 *
-	 * @return {void}
-	 */
-	wysiwyg.destroyRowEditors = function( evt, $btn ) {
-		wysiwyg.destroy( $btn.parents( '.cmb-repeatable-grouping' ).find( '.wp-editor-area' ).attr( 'id' ) );
-	};
-
-	/**
-	 * When a row-shift starts, we need to destroy the wysiwyg editors for the group-rows being shuffled.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} evt   A jQuery-normalized event object.
-	 * @param  {object} $btn  A jQuery dom element object for the remove-row button.
-	 * @param  {object} $from A jQuery dom element object for the row being shifted from.
-	 * @param  {object} $to   A jQuery dom element object for the row being shifted to.
-	 *
-	 * @return {void}
-	 */
-	wysiwyg.shiftStart = function( evt, $btn, $from, $to ) {
-		$from.add( $to ).find( '.wp-editor-wrap textarea' ).each( function() {
-			wysiwyg.destroy( $( this ).attr( 'id' ) );
-		} );
-	};
-
-	/**
-	 * When a row-shift completes, we need to re-init the wysiwyg editors for the group-rows being shuffled.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} evt   A jQuery-normalized event object.
-	 * @param  {object} $btn  A jQuery dom element object for the remove-row button.
-	 * @param  {object} $from A jQuery dom element object for the row being shifted from.
-	 * @param  {object} $to   A jQuery dom element object for the row being shifted to.
-	 *
-	 * @return {void}
-	 */
-	wysiwyg.shiftComplete = function( evt, $btn, $from, $to ) {
-		$from.add( $to ).each( function() {
-			wysiwyg.initRow( $( this ), evt );
-		} );
-	};
-
-	/**
-	 * Initializes editors for a new CMB row.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} $row A jQuery dom element object for the group row.
-	 * @param  {object} evt  A jQuery-normalized event object.
-	 *
-	 * @return {void}
-	 */
-	wysiwyg.initRow = function( $row, evt ) {
-		var $toReplace, data, defVal;
-
-		$row.find( '.cmb2-wysiwyg-inner-wrap' ).each( function() {
-			$toReplace    = $( this );
-			data          = $toReplace.data();
-			defVal        = cmb.getFieldArg( data.hash, 'default', '' );
-			defVal        = 'undefined' !== typeof defVal && false !== defVal ? defVal : '';
-
-			data.iterator = $row.data( 'iterator' );
-			data.fieldid  = data.id;
-			data.id       = data.groupid + '_' + data.iterator + '_' + data.fieldid;
-			data.name     = data.groupid + '[' + data.iterator + '][' + data.fieldid + ']';
-			data.value    = 'cmb2_add_row' !== evt.type && $toReplace.find( '.wp-editor-area' ).length ? $toReplace.find( '.wp-editor-area' ).val() : defVal;
-
-			// The destroys might not have happened yet.  Don't init until they have.
-			if ( 0 === toBeDestroyed.length ) {
-
-				wysiwyg.init( $toReplace, data );
-
-			} else {
-				toBeInitialized.push( [$toReplace, data] );
-				window.setTimeout( delayedInit, 100 );
-			}
-		} );
-
-	};
-
-	/**
-	 * Initiates a wysiwyg editor instance and replaces the passed dom element w/ the editor html.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} $toReplace A jQuery dom element which will be replaced with the wysiwyg editor.
-	 * @param  {object} data        Data used to initate the editor.
-	 * @param  {bool}   buttonsInit Whether to run QTags._buttonsInit()
-	 *
-	 * @return {void}
-	 */
-	wysiwyg.init = function( $toReplace, data, buttonsInit ) {
-		if ( ! data.groupid ) {
-			return false;
-		}
-
-		var mceActive = cmb.canTinyMCE();
-		var qtActive = 'function' === typeof window.quicktags;
-		$.extend( data, getGroupData( data ) );
-
-		initOptions( data );
-
-		$toReplace.replaceWith( data.template( data ) );
-
-		if ( mceActive ) {
-			window.tinyMCE.init( tinyMCEPreInit.mceInit[ data.id ] );
-		}
-
-		if ( qtActive ) {
-			window.quicktags( tinyMCEPreInit.qtInit[ data.id ] );
-		}
-
-		if ( mceActive ) {
-			$( document.getElementById( data.id ) ).parents( '.wp-editor-wrap' ).removeClass( 'html-active' ).addClass( 'tmce-active' );
-		}
-
-		if ( false !== buttonsInit && 'undefined' !== typeof window.QTags ) {
-			window.QTags._buttonsInit();
-		}
-
-	};
-
-	/**
-	 * Destroys a wysiwyg editor instance.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {string} id Editor id.
-	 *
-	 * @return {void}
-	 */
-	wysiwyg.destroy = function( id ) {
-		if ( ! cmb.canTinyMCE() ) {
-			// Nothing to see here.
-			return;
-		}
-
-		// The editor might not be initialized yet.  But we need to destroy it once it is.
-		var editor = tinyMCE.get( id );
-
-		if ( editor !== null && typeof( editor ) !== 'undefined' ) {
-			editor.destroy();
-
-			if ( 'undefined' === typeof( tinyMCEPreInit.mceInit[ id ] ) ) {
-				delete tinyMCEPreInit.mceInit[ id ];
-			}
-
-			if ( 'undefined' === typeof( tinyMCEPreInit.qtInit[ id ] ) ) {
-				delete tinyMCEPreInit.qtInit[ id ];
-			}
-
-		} else if ( -1 === toBeDestroyed.indexOf( id ) ) {
-			toBeDestroyed.push( id );
-			window.setTimeout( delayedDestroy, 100 );
-		}
-	};
-
-	// Hook in our event callbacks.
-	$( document ).on( 'cmb_init', wysiwyg.initAll );
-
-} )( window, document, jQuery, window.CMB2, window.CMB2.wysiwyg );
+(function (window, document, $, cmb, wysiwyg, undefined) {
+  "use strict";
+
+  // Private variables
+  var toBeDestroyed = [];
+  var toBeInitialized = [];
+  var all = (wysiwyg.all = {});
+
+  // Private functions
+
+  /**
+   * Initializes any editors that weren't initialized because they didn't exist yet.
+   *
+   * @since  2.2.3
+   *
+   * @return {void}
+   */
+  function delayedInit() {
+    // Don't initialize until they've all been destroyed.
+    if (0 === toBeDestroyed.length) {
+      toBeInitialized.forEach(function (toInit) {
+        toBeInitialized.splice(toBeInitialized.indexOf(toInit), 1);
+        wysiwyg.init.apply(wysiwyg, toInit);
+      });
+    } else {
+      window.setTimeout(delayedInit, 100);
+    }
+  }
+
+  /**
+   * Destroys any editors that weren't destroyed because they didn't exist yet.
+   *
+   * @since  2.2.3
+   *
+   * @return {void}
+   */
+  function delayedDestroy() {
+    toBeDestroyed.forEach(function (id) {
+      toBeDestroyed.splice(toBeDestroyed.indexOf(id), 1);
+      wysiwyg.destroy(id);
+    });
+  }
+
+  /**
+   * Gets the option data for a group (and initializes that data if it doesn't exist).
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} data The group/field data.
+   *
+   * @return {object}      Options data object for a group.
+   */
+  function getGroupData(data) {
+    var groupid = data.groupid;
+    var fieldid = data.fieldid;
+
+    if (!all[groupid] || !all[groupid][fieldid]) {
+      all[groupid] = all[groupid] || {};
+      all[groupid][fieldid] = {
+        template: wp.template("cmb2-wysiwyg-" + groupid + "-" + fieldid),
+        defaults: {
+          // Get the data from the template-wysiwyg initiation.
+          mce: $.extend(
+            {},
+            tinyMCEPreInit.mceInit["cmb2_i_" + groupid + fieldid],
+          ),
+          qt: $.extend(
+            {},
+            tinyMCEPreInit.qtInit["cmb2_i_" + groupid + fieldid],
+          ),
+        },
+      };
+      // This is the template-wysiwyg data, and we do not want that to be initiated.
+      delete tinyMCEPreInit.mceInit["cmb2_i_" + groupid + fieldid];
+      delete tinyMCEPreInit.qtInit["cmb2_i_" + groupid + fieldid];
+    }
+
+    return all[groupid][fieldid];
+  }
+
+  /**
+   * Initiates the tinyMCEPreInit options for a wysiwyg editor instance.
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} options Options data object for the wysiwyg editor instance.
+   *
+   * @return {void}
+   */
+  function initOptions(options) {
+    var nameRegex = new RegExp(
+      "cmb2_n_" + options.groupid + options.fieldid,
+      "g",
+    );
+    var idRegex = new RegExp(
+      "cmb2_i_" + options.groupid + options.fieldid,
+      "g",
+    );
+    var prop, newSettings, newQTS;
+
+    // If no settings for this field. Clone from placeholder.
+    if ("undefined" === typeof tinyMCEPreInit.mceInit[options.id]) {
+      newSettings = $.extend({}, options.defaults.mce);
+      for (prop in newSettings) {
+        if ("string" === typeof newSettings[prop]) {
+          newSettings[prop] = newSettings[prop]
+            .replace(idRegex, options.id)
+            .replace(nameRegex, options.name);
+        }
+      }
+      tinyMCEPreInit.mceInit[options.id] = newSettings;
+    }
+
+    // If no Quicktag settings for this field. Clone from placeholder.
+    if ("undefined" === typeof tinyMCEPreInit.qtInit[options.id]) {
+      newQTS = $.extend({}, options.defaults.qt);
+      for (prop in newQTS) {
+        if ("string" === typeof newQTS[prop]) {
+          newQTS[prop] = newQTS[prop]
+            .replace(idRegex, options.id)
+            .replace(nameRegex, options.name);
+        }
+      }
+      tinyMCEPreInit.qtInit[options.id] = newQTS;
+    }
+  }
+
+  /**
+   * Initializes all group wysiwyg editors. Hooked to cmb_init.
+   *
+   * @since  2.2.3
+   *
+   * @return {void}
+   */
+  wysiwyg.initAll = function () {
+    var $this, data, initiated;
+
+    $(".cmb2-wysiwyg-placeholder").each(function () {
+      $this = $(this);
+      data = $this.data();
+
+      if (data.groupid) {
+        data.id = $this.attr("id");
+        data.name = $this.attr("name");
+        data.value = $this.val();
+
+        wysiwyg.init($this, data, false);
+        initiated = true;
+      }
+    });
+
+    if (true === initiated) {
+      if ("undefined" !== typeof window.QTags) {
+        window.QTags._buttonsInit();
+      }
+
+      // Hook in our event callbacks.
+      $(document)
+        .on("cmb2_add_row", wysiwyg.addRow)
+        .on("cmb2_remove_group_row_start", wysiwyg.destroyRowEditors)
+        .on("cmb2_shift_rows_start", wysiwyg.shiftStart)
+        .on("cmb2_shift_rows_complete", wysiwyg.shiftComplete);
+    }
+  };
+
+  /**
+   * Initiates wysiwyg editors in a new group row. Hooked to cmb2_add_row.
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} evt A jQuery-normalized event object.
+   * @param  {object} $row A jQuery dom element object for the group row.
+   *
+   * @return {void}
+   */
+  wysiwyg.addRow = function (evt, $row) {
+    wysiwyg.initRow($row, evt);
+  };
+
+  /**
+   * Destroys wysiwyg editors in a group row when that row is removed. Hooked to cmb2_remove_group_row_start.
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} evt A jQuery-normalized event object.
+   * @param  {object} $btn A jQuery dom element object for the remove-row button.
+   *
+   * @return {void}
+   */
+  wysiwyg.destroyRowEditors = function (evt, $btn) {
+    wysiwyg.destroy(
+      $btn
+        .parents(".cmb-repeatable-grouping")
+        .find(".wp-editor-area")
+        .attr("id"),
+    );
+  };
+
+  /**
+   * When a row-shift starts, we need to destroy the wysiwyg editors for the group-rows being shuffled.
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} evt   A jQuery-normalized event object.
+   * @param  {object} $btn  A jQuery dom element object for the remove-row button.
+   * @param  {object} $from A jQuery dom element object for the row being shifted from.
+   * @param  {object} $to   A jQuery dom element object for the row being shifted to.
+   *
+   * @return {void}
+   */
+  wysiwyg.shiftStart = function (evt, $btn, $from, $to) {
+    $from
+      .add($to)
+      .find(".wp-editor-wrap textarea")
+      .each(function () {
+        wysiwyg.destroy($(this).attr("id"));
+      });
+  };
+
+  /**
+   * When a row-shift completes, we need to re-init the wysiwyg editors for the group-rows being shuffled.
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} evt   A jQuery-normalized event object.
+   * @param  {object} $btn  A jQuery dom element object for the remove-row button.
+   * @param  {object} $from A jQuery dom element object for the row being shifted from.
+   * @param  {object} $to   A jQuery dom element object for the row being shifted to.
+   *
+   * @return {void}
+   */
+  wysiwyg.shiftComplete = function (evt, $btn, $from, $to) {
+    $from.add($to).each(function () {
+      wysiwyg.initRow($(this), evt);
+    });
+  };
+
+  /**
+   * Initializes editors for a new CMB row.
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} $row A jQuery dom element object for the group row.
+   * @param  {object} evt  A jQuery-normalized event object.
+   *
+   * @return {void}
+   */
+  wysiwyg.initRow = function ($row, evt) {
+    var $toReplace, data, defVal;
+
+    $row.find(".cmb2-wysiwyg-inner-wrap").each(function () {
+      $toReplace = $(this);
+      data = $toReplace.data();
+      defVal = cmb.getFieldArg(data.hash, "default", "");
+      defVal = "undefined" !== typeof defVal && false !== defVal ? defVal : "";
+
+      data.iterator = $row.data("iterator");
+      data.fieldid = data.id;
+      data.id = data.groupid + "_" + data.iterator + "_" + data.fieldid;
+      data.name =
+        data.groupid + "[" + data.iterator + "][" + data.fieldid + "]";
+      data.value =
+        "cmb2_add_row" !== evt.type && $toReplace.find(".wp-editor-area").length
+          ? $toReplace.find(".wp-editor-area").val()
+          : defVal;
+
+      // The destroys might not have happened yet.  Don't init until they have.
+      if (0 === toBeDestroyed.length) {
+        wysiwyg.init($toReplace, data);
+      } else {
+        toBeInitialized.push([$toReplace, data]);
+        window.setTimeout(delayedInit, 100);
+      }
+    });
+  };
+
+  /**
+   * Initiates a wysiwyg editor instance and replaces the passed dom element w/ the editor html.
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} $toReplace A jQuery dom element which will be replaced with the wysiwyg editor.
+   * @param  {object} data        Data used to initate the editor.
+   * @param  {bool}   buttonsInit Whether to run QTags._buttonsInit()
+   *
+   * @return {void}
+   */
+  wysiwyg.init = function ($toReplace, data, buttonsInit) {
+    if (!data.groupid) {
+      return false;
+    }
+
+    var mceActive = cmb.canTinyMCE();
+    var qtActive = "function" === typeof window.quicktags;
+    $.extend(data, getGroupData(data));
+
+    initOptions(data);
+
+    $toReplace.replaceWith(data.template(data));
+
+    if (mceActive) {
+      window.tinyMCE.init(tinyMCEPreInit.mceInit[data.id]);
+    }
+
+    if (qtActive) {
+      window.quicktags(tinyMCEPreInit.qtInit[data.id]);
+    }
+
+    if (mceActive) {
+      $(document.getElementById(data.id))
+        .parents(".wp-editor-wrap")
+        .removeClass("html-active")
+        .addClass("tmce-active");
+    }
+
+    if (false !== buttonsInit && "undefined" !== typeof window.QTags) {
+      window.QTags._buttonsInit();
+    }
+  };
+
+  /**
+   * Destroys a wysiwyg editor instance.
+   *
+   * @since  2.2.3
+   *
+   * @param  {string} id Editor id.
+   *
+   * @return {void}
+   */
+  wysiwyg.destroy = function (id) {
+    if (!cmb.canTinyMCE()) {
+      // Nothing to see here.
+      return;
+    }
+
+    // The editor might not be initialized yet.  But we need to destroy it once it is.
+    var editor = tinyMCE.get(id);
+
+    if (editor !== null && typeof editor !== "undefined") {
+      editor.destroy();
+
+      if ("undefined" === typeof tinyMCEPreInit.mceInit[id]) {
+        delete tinyMCEPreInit.mceInit[id];
+      }
+
+      if ("undefined" === typeof tinyMCEPreInit.qtInit[id]) {
+        delete tinyMCEPreInit.qtInit[id];
+      }
+    } else if (-1 === toBeDestroyed.indexOf(id)) {
+      toBeDestroyed.push(id);
+      window.setTimeout(delayedDestroy, 100);
+    }
+  };
+
+  // Hook in our event callbacks.
+  $(document).on("cmb_init", wysiwyg.initAll);
+})(window, document, jQuery, window.CMB2, window.CMB2.wysiwyg);
diff --git a/public/includes/lib/CMB2/js/cmb2.js b/public/includes/lib/CMB2/js/cmb2.js
index 53be582d..63fbd18e 100755
--- a/public/includes/lib/CMB2/js/cmb2.js
+++ b/public/includes/lib/CMB2/js/cmb2.js
@@ -9,1340 +9,1498 @@
  * Custom jQuery for Custom Metaboxes and Fields
  */
 window.CMB2 = window.CMB2 || {};
-(function(window, document, $, cmb, undefined){
-	'use strict';
-
-	// localization strings
-	var l10n = window.cmb2_l10;
-	var setTimeout = window.setTimeout;
-	var $document;
-	var $id = function( selector ) {
-		return $( document.getElementById( selector ) );
-	};
-	cmb.$id = $id;
-	var defaults = {
-		idNumber        : false,
-		repeatEls       : 'input:not([type="button"],[id^=filelist]),select,textarea,.cmb2-media-status',
-		noEmpty         : 'input:not([type="button"]):not([type="radio"]):not([type="checkbox"]),textarea',
-		repeatUpdate    : 'input:not([type="button"]),select,textarea,label',
-		styleBreakPoint : 450,
-		mediaHandlers   : {},
-		defaults : {
-			time_picker  : l10n.defaults.time_picker,
-			date_picker  : l10n.defaults.date_picker,
-			color_picker : l10n.defaults.color_picker || {},
-			code_editor  : l10n.defaults.code_editor,
-		},
-		media : {
-			frames : {},
-		},
-	};
-
-	cmb.init = function() {
-		$document = $( document );
-
-		// Setup the CMB2 object defaults.
-		$.extend( cmb, defaults );
-
-		cmb.trigger( 'cmb_pre_init' );
-
-		var $metabox     = cmb.metabox();
-		var $repeatGroup = $metabox.find('.cmb-repeatable-group');
-
-		 // Init time/date/color pickers
-		cmb.initPickers( $metabox.find('input[type="text"].cmb2-timepicker'), $metabox.find('input[type="text"].cmb2-datepicker'), $metabox.find('input[type="text"].cmb2-colorpicker') );
-
-		// Init code editors.
-		cmb.initCodeEditors( $metabox.find( '.cmb2-textarea-code:not(.disable-codemirror)' ) );
-
-		// Insert toggle button into DOM wherever there is multicheck. credit: Genesis Framework
-		$( '<p><span class="button-secondary cmb-multicheck-toggle">' + l10n.strings.check_toggle + '</span></p>' ).insertBefore( '.cmb2-checkbox-list:not(.no-select-all)' );
-
-		// Make File List drag/drop sortable:
-		cmb.makeListSortable();
-		// Make Repeatable fields drag/drop sortable:
-		cmb.makeRepeatableSortable();
-
-		$metabox
-			.on( 'change', '.cmb2_upload_file', function() {
-				cmb.media.field = $( this ).attr( 'id' );
-				$id( cmb.media.field + '_id' ).val('');
-			})
-			// Media/file management
-			.on( 'click', '.cmb-multicheck-toggle', cmb.toggleCheckBoxes )
-			.on( 'click', '.cmb2-upload-button', cmb.handleMedia )
-			.on( 'click', '.cmb-attach-list li, .cmb2-media-status .img-status img, .cmb2-media-status .file-status > span', cmb.handleFileClick )
-			.on( 'click', '.cmb2-remove-file-button', cmb.handleRemoveMedia )
-			// Repeatable content
-			.on( 'click', '.cmb-add-group-row', cmb.addGroupRow )
-			.on( 'click', '.cmb-add-row-button', cmb.addAjaxRow )
-			.on( 'click', '.cmb-remove-group-row', cmb.removeGroupRow )
-			.on( 'click', '.cmb-remove-row-button', cmb.removeAjaxRow )
-			// Ajax oEmbed display
-			.on( 'keyup paste focusout', '.cmb2-oembed', cmb.maybeOembed )
-			// Reset titles when removing a row
-			.on( 'cmb2_remove_row', '.cmb-repeatable-group', cmb.resetTitlesAndIterator )
-			.on( 'click', '.cmbhandle, .cmbhandle + .cmbhandle-title', cmb.toggleHandle );
-
-		if ( $repeatGroup.length ) {
-			$repeatGroup
-				.on( 'cmb2_add_row', cmb.emptyValue )
-				.on( 'cmb2_add_row', cmb.setDefaults )
-				.filter('.sortable').each( function() {
-					// Add sorting arrows
-					$( this ).find( '.cmb-remove-group-row-button' ).before( '<a class="button-secondary cmb-shift-rows move-up alignleft" href="#"><span class="'+ l10n.up_arrow_class +'"></span></a> <a class="button-secondary cmb-shift-rows move-down alignleft" href="#"><span class="'+ l10n.down_arrow_class +'"></span></a>' );
-				})
-				.on( 'click', '.cmb-shift-rows', cmb.shiftRows );
-		}
-
-		// on pageload
-		setTimeout( cmb.resizeoEmbeds, 500);
-		// and on window resize
-		$( window ).on( 'resize', cmb.resizeoEmbeds );
-
-		if ( $id( 'addtag' ).length ) {
-			cmb.listenTagAdd();
-		}
-
-		$( document ).on( 'cmb_init', cmb.mceEnsureSave );
-
-		cmb.trigger( 'cmb_init' );
-	};
-
-	// Handles updating tiny mce instances when saving a gutenberg post.
-	// https://github.com/CMB2/CMB2/issues/1156
-	cmb.mceEnsureSave = function() {
-		// If no wp.data, do not proceed (no gutenberg)
-		if ( ! wp.data || ! wp.data.hasOwnProperty('subscribe') ) {
-			return;
-		}
-
-		// If the current user cannot richedit, or MCE is not available, bail.
-		if ( ! cmb.canTinyMCE() ) {
-			return;
-		}
-
-		wp.data.subscribe( function() {
-			var editor = wp.data.hasOwnProperty('select') ? wp.data.select( 'core/editor' ) : null;
-
-			// the post is currently being saved && we have tinymce editors
-			if ( editor && editor.isSavingPost && editor.isSavingPost() && window.tinyMCE.editors.length ) {
-				for ( var i = 0; i < window.tinyMCE.editors.length; i++ ) {
-					if ( window.tinyMCE.activeEditor !== window.tinyMCE.editors[i] ) {
-						window.tinyMCE.editors[i].save();
-					}
-				}
-			}
-		});
-	};
-
-	cmb.canTinyMCE = function() {
-		return l10n.user_can_richedit && window.tinyMCE;
-	};
-
-	cmb.listenTagAdd = function() {
-		$document.ajaxSuccess( function( evt, xhr, settings ) {
-			if ( settings.data && settings.data.length && -1 !== settings.data.indexOf( 'action=add-tag' ) ) {
-				cmb.resetBoxes( $id( 'addtag' ).find( '.cmb2-wrap > .cmb2-metabox' ) );
-			}
-		});
-	};
-
-	cmb.resetBoxes = function( $boxes ) {
-		$.each( $boxes, function() {
-			cmb.resetBox( $( this ) );
-		});
-	};
-
-	cmb.resetBox = function( $box ) {
-		$box.find( '.wp-picker-clear' ).trigger( 'click' );
-		$box.find( '.cmb2-remove-file-button' ).trigger( 'click' );
-		$box.find( '.cmb-row.cmb-repeatable-grouping:not(:first-of-type) .cmb-remove-group-row' ).click();
-		$box.find( '.cmb-repeat-row:not(:first-child)' ).remove();
-
-		$box.find( 'input:not([type="button"]),select,textarea' ).each( function() {
-			var $element = $( this );
-			var tagName = $element.prop('tagName');
-
-			if ( 'INPUT' === tagName ) {
-				var elType = $element.attr( 'type' );
-				if ( 'checkbox' === elType || 'radio' === elType ) {
-					$element.prop( 'checked', false );
-				} else {
-					$element.val( '' );
-				}
-			}
-			if ( 'SELECT' === tagName ) {
-				$( 'option:selected', this ).prop( 'selected', false );
-			}
-			if ( 'TEXTAREA' === tagName ) {
-				$element.html( '' );
-			}
-		});
-	};
-
-	cmb.resetTitlesAndIterator = function( evt ) {
-		if ( ! evt.group ) {
-			return;
-		}
-
-		// Loop repeatable group tables
-		$( '.cmb-repeatable-group.repeatable' ).each( function() {
-			var $table = $( this );
-			var groupTitle = $table.find( '.cmb-add-group-row' ).data( 'grouptitle' );
-
-			// Loop repeatable group table rows
-			$table.find( '.cmb-repeatable-grouping' ).each( function( rowindex ) {
-				var $row = $( this );
-				var $rowTitle = $row.find( 'h3.cmb-group-title' );
-				// Reset rows iterator
-				$row.data( 'iterator', rowindex );
-				// Reset rows title
-				if ( $rowTitle.length ) {
-					$rowTitle.text( groupTitle.replace( '{#}', ( rowindex + 1 ) ) );
-				}
-			});
-		});
-	};
-
-	cmb.toggleHandle = function( evt ) {
-		evt.preventDefault();
-		cmb.trigger( 'postbox-toggled', $( this ).parent('.postbox').toggleClass('closed') );
-	};
-
-	cmb.toggleCheckBoxes = function( evt ) {
-		evt.preventDefault();
-		var $this = $( this );
-		var $multicheck = $this.closest( '.cmb-td' ).find( 'input[type=checkbox]:not([disabled])' );
-
-		// If the button has already been clicked once...
-		if ( $this.data( 'checked' ) ) {
-			// clear the checkboxes and remove the flag
-			$multicheck.prop( 'checked', false );
-			$this.data( 'checked', false );
-		}
-		// Otherwise mark the checkboxes and add a flag
-		else {
-			$multicheck.prop( 'checked', true );
-			$this.data( 'checked', true );
-		}
-	};
-
-	cmb.handleMedia = function( evt ) {
-		evt.preventDefault();
-
-		var $el = $( this );
-		cmb.attach_id = ! $el.hasClass( 'cmb2-upload-list' ) ? $el.closest( '.cmb-td' ).find( '.cmb2-upload-file-id' ).val() : false;
-		// Clean up default 0 value
-		cmb.attach_id = '0' !== cmb.attach_id ? cmb.attach_id : false;
-
-		cmb._handleMedia( $el.prev('input.cmb2-upload-file').attr('id'), $el.hasClass( 'cmb2-upload-list' ) );
-	};
-
-	cmb.handleFileClick = function( evt ) {
-		if ( $( evt.target ).is( 'a' ) ) {
-			return;
-		}
-
-		evt.preventDefault();
-
-		var $el    = $( this );
-		var $td    = $el.closest( '.cmb-td' );
-		var isList = $td.find( '.cmb2-upload-button' ).hasClass( 'cmb2-upload-list' );
-		cmb.attach_id = isList ? $el.find( 'input[type="hidden"]' ).data( 'id' ) : $td.find( '.cmb2-upload-file-id' ).val();
-
-		if ( cmb.attach_id ) {
-			cmb._handleMedia( $td.find( 'input.cmb2-upload-file' ).attr( 'id' ), isList, cmb.attach_id );
-		}
-	};
-
-	cmb._handleMedia = function( id, isList ) {
-		if ( ! wp ) {
-			return;
-		}
-
-		var media, handlers;
-
-		handlers          = cmb.mediaHandlers;
-		media             = cmb.media;
-		media.field       = id;
-		media.$field      = $id( media.field );
-		media.fieldData   = media.$field.data();
-		media.previewSize = media.fieldData.previewsize;
-		media.sizeName    = media.fieldData.sizename;
-		media.fieldName   = media.$field.attr('name');
-		media.isList      = isList;
-
-		// If this field's media frame already exists, reopen it.
-		if ( id in media.frames ) {
-			return media.frames[ id ].open();
-		}
-
-		// Create the media frame.
-		media.frames[ id ] = wp.media( {
-			title: cmb.metabox().find('label[for="' + id + '"]').text(),
-			library : media.fieldData.queryargs || {},
-			button: {
-				text: l10n.strings[ isList ? 'upload_files' : 'upload_file' ]
-			},
-			multiple: isList ? 'add' : false
-		} );
-
-		// Enable the additional media filters: https://github.com/CMB2/CMB2/issues/873
-		media.frames[ id ].states.first().set( 'filterable', 'all' );
-
-		cmb.trigger( 'cmb_media_modal_init', media );
-
-		handlers.list = function( selection, returnIt ) {
-
-			// Setup our fileGroup array
-			var fileGroup = [];
-			var attachmentHtml;
-
-			if ( ! handlers.list.templates ) {
-				handlers.list.templates = {
-					image : wp.template( 'cmb2-list-image' ),
-					file  : wp.template( 'cmb2-list-file' ),
-				};
-			}
-
-			// Loop through each attachment
-			selection.each( function( attachment ) {
-
-				// Image preview or standard generic output if it's not an image.
-				attachmentHtml = handlers.getAttachmentHtml( attachment, 'list' );
-
-				// Add our file to our fileGroup array
-				fileGroup.push( attachmentHtml );
-			});
-
-			if ( ! returnIt ) {
-				// Append each item from our fileGroup array to .cmb2-media-status
-				media.$field.siblings( '.cmb2-media-status' ).append( fileGroup );
-			} else {
-				return fileGroup;
-			}
-
-		};
-
-		handlers.single = function( selection ) {
-			if ( ! handlers.single.templates ) {
-				handlers.single.templates = {
-					image : wp.template( 'cmb2-single-image' ),
-					file  : wp.template( 'cmb2-single-file' ),
-				};
-			}
-
-			// Only get one file from the uploader
-			var attachment = selection.first();
-
-			media.$field.val( attachment.get( 'url' ) );
-			$id( media.field +'_id' ).val( attachment.get( 'id' ) );
-
-			// Image preview or standard generic output if it's not an image.
-			var attachmentHtml = handlers.getAttachmentHtml( attachment, 'single' );
-
-			// add/display our output
-			media.$field.siblings( '.cmb2-media-status' ).slideDown().html( attachmentHtml );
-		};
-
-		handlers.getAttachmentHtml = function( attachment, templatesId ) {
-			var isImage = 'image' === attachment.get( 'type' );
-			var data    = handlers.prepareData( attachment, isImage );
-
-			// Image preview or standard generic output if it's not an image.
-			return handlers[ templatesId ].templates[ isImage ? 'image' : 'file' ]( data );
-		};
-
-		handlers.prepareData = function( data, image ) {
-			if ( image ) {
-				// Set the correct image size data
-				handlers.getImageData.call( data, 50 );
-			}
-
-			data                   = data.toJSON();
-			data.mediaField        = media.field;
-			data.mediaFieldName    = media.fieldName;
-			data.stringRemoveImage = l10n.strings.remove_image;
-			data.stringFile        = l10n.strings.file;
-			data.stringDownload    = l10n.strings.download;
-			data.stringRemoveFile  = l10n.strings.remove_file;
-
-			return data;
-		};
-
-		handlers.getImageData = function( fallbackSize ) {
-
-			// Preview size dimensions
-			var previewW = media.previewSize[0] || fallbackSize;
-			var previewH = media.previewSize[1] || fallbackSize;
-
-			// Image dimensions and url
-			var url    = this.get( 'url' );
-			var width  = this.get( 'width' );
-			var height = this.get( 'height' );
-			var sizes  = this.get( 'sizes' );
-
-			// Get the correct dimensions and url if a named size is set and exists
-			// fallback to the 'large' size
-			if ( sizes ) {
-				if ( sizes[ media.sizeName ] ) {
-					url    = sizes[ media.sizeName ].url;
-					width  = sizes[ media.sizeName ].width;
-					height = sizes[ media.sizeName ].height;
-				} else if ( sizes.large ) {
-					url    = sizes.large.url;
-					width  = sizes.large.width;
-					height = sizes.large.height;
-				}
-			}
-
-			// Fit the image in to the preview size, keeping the correct aspect ratio
-			if ( width > previewW ) {
-				height = Math.floor( previewW * height / width );
-				width = previewW;
-			}
-
-			if ( height > previewH ) {
-				width = Math.floor( previewH * width / height );
-				height = previewH;
-			}
-
-			if ( ! width ) {
-				width = previewW;
-			}
-
-			if ( ! height ) {
-				height = 'svg' === this.get( 'filename' ).split( '.' ).pop() ? '100%' : previewH;
-			}
-
-			this.set( 'sizeUrl', url );
-			this.set( 'sizeWidth', width );
-			this.set( 'sizeHeight', height );
-
-			return this;
-		};
-
-		handlers.selectFile = function() {
-			var selection = media.frames[ id ].state().get( 'selection' );
-			var type = isList ? 'list' : 'single';
-
-			if ( cmb.attach_id && isList ) {
-				$( '[data-id="'+ cmb.attach_id +'"]' ).parents( 'li' ).replaceWith( handlers.list( selection, true ) );
-			} else {
-				handlers[type]( selection );
-			}
-
-			cmb.trigger( 'cmb_media_modal_select', selection, media );
-		};
-
-		handlers.openModal = function() {
-			var selection = media.frames[ id ].state().get( 'selection' );
-			var attach;
-
-			if ( ! cmb.attach_id ) {
-				selection.reset();
-			} else {
-				attach = wp.media.attachment( cmb.attach_id );
-				attach.fetch();
-				selection.set( attach ? [ attach ] : [] );
-			}
-
-			cmb.trigger( 'cmb_media_modal_open', selection, media );
-		};
-
-		// When a file is selected, run a callback.
-		media.frames[ id ]
-			.on( 'select', handlers.selectFile )
-			.on( 'open', handlers.openModal );
-
-		// Finally, open the modal
-		media.frames[ id ].open();
-	};
-
-	cmb.handleRemoveMedia = function( evt ) {
-		evt.preventDefault();
-		var $this = $( this );
-		if ( $this.is( '.cmb-attach-list .cmb2-remove-file-button' ) ) {
-			$this.parents( '.cmb2-media-item' ).remove();
-			return false;
-		}
-
-		cmb.media.field = $this.attr('rel');
-
-		cmb.metabox().find( document.getElementById( cmb.media.field ) ).val('');
-		cmb.metabox().find( document.getElementById( cmb.media.field + '_id' ) ).val('');
-		$this.parents('.cmb2-media-status').html('');
-
-		return false;
-	};
-
-	cmb.cleanRow = function( $row, prevNum, group ) {
-		var $elements = $row.find( cmb.repeatUpdate );
-		if ( group ) {
-
-			var $other = $row.find( '[id]' ).not( cmb.repeatUpdate );
-
-			// Remove extra ajaxed rows
-			$row.find('.cmb-repeat-table .cmb-repeat-row:not(:first-child)').remove();
-
-			// Update all elements w/ an ID
-			if ( $other.length ) {
-				$other.each( function() {
-					var $_this = $( this );
-					var oldID = $_this.attr( 'id' );
-					var newID = oldID.replace( '_'+ prevNum, '_'+ cmb.idNumber );
-					var $buttons = $row.find('[data-selector="'+ oldID +'"]');
-					$_this.attr( 'id', newID );
-
-					// Replace data-selector vars
-					if ( $buttons.length ) {
-						$buttons.attr( 'data-selector', newID ).data( 'selector', newID );
-					}
-				});
-			}
-		}
-
-		$elements.filter( ':checked' ).removeAttr( 'checked' );
-		$elements.find( ':checked' ).removeAttr( 'checked' );
-		$elements.filter( ':selected' ).removeAttr( 'selected' );
-		$elements.find( ':selected' ).removeAttr( 'selected', false );
-
-		if ( $row.find('h3.cmb-group-title').length ) {
-			$row.find( 'h3.cmb-group-title' ).text( $row.data( 'title' ).replace( '{#}', ( cmb.idNumber + 1 ) ) );
-		}
-
-		$elements.each( function() {
-			cmb.elReplacements( $( this ), prevNum, group );
-		} );
-
-		return cmb;
-	};
-
-	cmb.elReplacements = function( $newInput, prevNum, group ) {
-		var oldFor    = $newInput.attr( 'for' );
-		var oldVal    = $newInput.val();
-		var type      = $newInput.prop( 'type' );
-		var defVal    = cmb.getFieldArg( $newInput, 'default' );
-		var newVal    = 'undefined' !== typeof defVal && false !== defVal ? defVal : '';
-		var tagName   = $newInput.prop('tagName');
-		var checkable = 'radio' === type || 'checkbox' === type ? oldVal : false;
-		var attrs     = {};
-		var newID, oldID;
-		if ( oldFor ) {
-			attrs = { 'for' : oldFor.replace( '_'+ prevNum, '_'+ cmb.idNumber ) };
-		} else {
-			var oldName = $newInput.attr( 'name' );
-			var newName;
-			oldID = $newInput.attr( 'id' );
-
-			// Handle adding groups vs rows.
-			if ( group ) {
-				// Expect another bracket after group's index closing bracket.
-				newName = oldName ? oldName.replace( '['+ prevNum +'][', '['+ cmb.idNumber +'][' ) : '';
-				// Expect another underscore after group's index trailing underscore.
-				newID   = oldID ? oldID.replace( '_' + prevNum + '_', '_' + cmb.idNumber + '_' ) : '';
-			}
-			else {
-				// Row indexes are at the very end of the string.
-				newName = oldName ? cmb.replaceLast( oldName, '[' + prevNum + ']', '[' + cmb.idNumber + ']' ) : '';
-				newID   = oldID ? cmb.replaceLast( oldID, '_' + prevNum, '_' + cmb.idNumber ) : '';
-			}
-
-			attrs = {
-				id: newID,
-				name: newName
-			};
-
-		}
-
-		// Clear out textarea values
-		if ( 'TEXTAREA' === tagName ) {
-			$newInput.html( newVal );
-		}
-
-		if ( 'SELECT' === tagName && 'undefined' !== typeof defVal ) {
-			var $toSelect = $newInput.find( '[value="'+ defVal + '"]' );
-			if ( $toSelect.length ) {
-				$toSelect.attr( 'selected', 'selected' ).prop( 'selected', 'selected' );
-			}
-		}
-
-		if ( checkable ) {
-			$newInput.removeAttr( 'checked' );
-			if ( 'undefined' !== typeof defVal && oldVal === defVal ) {
-				$newInput.attr( 'checked', 'checked' ).prop( 'checked', 'checked' );
-			}
-		}
-
-		if ( ! group && $newInput[0].hasAttribute( 'data-iterator' ) ) {
-			attrs['data-iterator'] = cmb.idNumber;
-		}
-
-		$newInput
-			.removeClass( 'hasDatepicker' )
-			.val( checkable ? checkable : newVal ).attr( attrs );
-
-		return $newInput;
-	};
-
-	cmb.newRowHousekeeping = function( $row ) {
-		var $colorPicker = $row.find( '.wp-picker-container' );
-		var $list        = $row.find( '.cmb2-media-status' );
-
-		if ( $colorPicker.length ) {
-			// Need to clean-up colorpicker before appending
-			$colorPicker.each( function() {
-				var $td = $( this ).parent();
-				$td.html( $td.find( 'input[type="text"].cmb2-colorpicker' ).attr('style', '') );
-			});
-		}
-
-		// Need to clean-up colorpicker before appending
-		if ( $list.length ) {
-			$list.empty();
-		}
-
-		return cmb;
-	};
-
-	cmb.afterRowInsert = function( $row ) {
-		// Init pickers from new row
-		cmb.initPickers( $row.find('input[type="text"].cmb2-timepicker'), $row.find('input[type="text"].cmb2-datepicker'), $row.find('input[type="text"].cmb2-colorpicker') );
-	};
-
-	cmb.updateNameAttr = function () {
-		var $this = $( this );
-		var name  = $this.attr( 'name' ); // get current name
-
-		// If name is defined
-		if ( 'undefined' !== typeof name ) {
-			var prevNum = parseInt( $this.parents( '.cmb-repeatable-grouping' ).data( 'iterator' ), 10 );
-			var newNum  = prevNum - 1; // Subtract 1 to get new iterator number
-
-			// Update field name attributes so data is not orphaned when a row is removed and post is saved
-			var $newName = name.replace( '[' + prevNum + ']', '[' + newNum + ']' );
-
-			// New name with replaced iterator
-			$this.attr( 'name', $newName );
-		}
-	};
-
-	cmb.emptyValue = function( evt, row ) {
-		$( cmb.noEmpty, row ).val( '' );
-	};
-
-	cmb.setDefaults = function( evt, row ) {
-		$( cmb.noEmpty, row ).each( function() {
-			var $el = $(this);
-			var defVal = cmb.getFieldArg( $el, 'default' );
-			if ( 'undefined' !== typeof defVal && false !== defVal ) {
-				$el.val( defVal );
-			}
-		});
-	};
-
-	cmb.addGroupRow = function( evt ) {
-		evt.preventDefault();
-
-		var $this = $( this );
-
-		// before anything significant happens
-		cmb.triggerElement( $this, 'cmb2_add_group_row_start', $this );
-
-		var $table   = $id( $this.data('selector') );
-		var $oldRow  = $table.find('.cmb-repeatable-grouping').last();
-		var prevNum  = parseInt( $oldRow.data('iterator'), 10 );
-		cmb.idNumber = parseInt( prevNum, 10 ) + 1;
-		var $row     = $oldRow.clone();
-		var nodeName = $row.prop('nodeName') || 'div';
-		var getRowId = function( id ) {
-			id = id.split('-');
-			id.splice(id.length - 1, 1);
-			id.push( cmb.idNumber );
-			return id.join('-');
-		};
-
-		// Make sure the next number doesn't exist.
-		while ( $table.find( '.cmb-repeatable-grouping[data-iterator="'+ cmb.idNumber +'"]' ).length > 0 ) {
-			cmb.idNumber++;
-		}
-
-		cmb.newRowHousekeeping( $row.data( 'title', $this.data( 'grouptitle' ) ) ).cleanRow( $row, prevNum, true );
-		$row.find( '.cmb-add-row-button' ).prop( 'disabled', false );
-
-		var $newRow = $( '<' + nodeName + ' id="'+ getRowId( $oldRow.attr('id') ) +'" class="postbox cmb-row cmb-repeatable-grouping" data-iterator="'+ cmb.idNumber +'">'+ $row.html() +'</' + nodeName + '>' );
-		$oldRow.after( $newRow );
-
-		cmb.afterRowInsert( $newRow );
-
-		cmb.triggerElement( $table, { type: 'cmb2_add_row', group: true }, $newRow );
-
-	};
-
-	cmb.addAjaxRow = function( evt ) {
-		evt.preventDefault();
-
-		var $this     = $( this );
-		var $table    = $id( $this.data('selector') );
-		var $row      = $table.find('.empty-row');
-		var prevNum   = parseInt( $row.find('[data-iterator]').data('iterator'), 10 );
-		cmb.idNumber  = parseInt( prevNum, 10 ) + 1;
-		var $emptyrow = $row.clone();
-
-		cmb.newRowHousekeeping( $emptyrow ).cleanRow( $emptyrow, prevNum );
-
-		$row.removeClass('empty-row hidden').addClass('cmb-repeat-row');
-		$row.after( $emptyrow );
-
-		cmb.afterRowInsert( $emptyrow );
-
-		cmb.triggerElement( $table, { type: 'cmb2_add_row', group: false }, $emptyrow, $row );
-	};
-
-	cmb.removeGroupRow = function( evt ) {
-		evt.preventDefault();
-
-		var $this        = $( this );
-		var confirmation = $this.data('confirm');
-
-		// Process further only if deletion confirmation enabled and user agreed.
-		if ( confirmation && ! window.confirm( confirmation ) ) {
-			return;
-		}
-
-		var $table  = $id( $this.data('selector') );
-		var $parent = $this.parents('.cmb-repeatable-grouping');
-		var number  = $table.find('.cmb-repeatable-grouping').length;
-
-		if ( number < 2 ) {
-			return cmb.resetRow( $parent.parents('.cmb-repeatable-group').find( '.cmb-add-group-row' ), $this );
-		}
-
-		cmb.triggerElement( $table, 'cmb2_remove_group_row_start', $this );
-
-		// When a group is removed, loop through all next groups and update fields names.
-		$parent.nextAll( '.cmb-repeatable-grouping' ).find( cmb.repeatEls ).each( cmb.updateNameAttr );
-
-		$parent.remove();
-
-		cmb.triggerElement( $table, { type: 'cmb2_remove_row', group: true } );
-	};
-
-	cmb.removeAjaxRow = function( evt ) {
-		evt.preventDefault();
-
-		var $this = $( this );
-
-		// Check if disabled
-		if ( $this.hasClass( 'button-disabled' ) ) {
-			return;
-		}
-
-		var $parent = $this.parents('.cmb-row');
-		var $table  = $this.parents('.cmb-repeat-table');
-		var number  = $table.find('.cmb-row').length;
-
-		if ( number <= 2 ) {
-			return cmb.resetRow( $parent.find( '.cmb-add-row-button' ), $this );
-		}
-
-		if ( $parent.hasClass('empty-row') ) {
-			$parent.prev().addClass( 'empty-row' ).removeClass('cmb-repeat-row');
-		}
-
-		$this.parents('.cmb-repeat-table .cmb-row').remove();
-
-
-		cmb.triggerElement( $table, { type: 'cmb2_remove_row', group: false } );
-	};
-
-	cmb.resetRow = function( $addNewBtn, $removeBtn ) {
-		// Click the "add new" button followed by the "remove this" button
-		// in order to reset the repeat row to empty values.
-		$addNewBtn.trigger( 'click' );
-		$removeBtn.trigger( 'click' );
-	};
-
-	cmb.shiftRows = function( evt ) {
-
-		evt.preventDefault();
-
-		var $this = $( this );
-		var $from = $this.parents( '.cmb-repeatable-grouping' );
-		var $goto = $this.hasClass( 'move-up' ) ? $from.prev( '.cmb-repeatable-grouping' ) : $from.next( '.cmb-repeatable-grouping' );
-
-		// Before shift occurs.
-		cmb.triggerElement( $this, 'cmb2_shift_rows_enter', $this, $from, $goto );
-
-		if ( ! $goto.length ) {
-			return;
-		}
-
-		// About to shift
-		cmb.triggerElement( $this, 'cmb2_shift_rows_start', $this, $from, $goto );
-
-		var inputVals = [];
-		// Loop this item's fields
-		$from.find( cmb.repeatEls ).each( function() {
-			var $element = $( this );
-			var elType = $element.attr( 'type' );
-			var val;
-
-			if ( $element.hasClass('cmb2-media-status') ) {
-				// special case for image previews
-				val = $element.html();
-			} else if ( 'checkbox' === elType || 'radio' === elType ) {
-				val = $element.is(':checked');
-			} else if ( 'select' === $element.prop('tagName') ) {
-				val = $element.is(':selected');
-			} else {
-				val = $element.val();
-			}
-
-			// Get all the current values per element
-			inputVals.push( { val: val, $: $element } );
-		});
-		// And swap them all
-		$goto.find( cmb.repeatEls ).each( function( index ) {
-			var $element = $( this );
-			var elType = $element.attr( 'type' );
-			var val;
-
-			if ( $element.hasClass('cmb2-media-status') ) {
-				var toRowId = $element.closest('.cmb-repeatable-grouping').attr('data-iterator');
-				var fromRowId = inputVals[ index ].$.closest('.cmb-repeatable-grouping').attr('data-iterator');
-
-				// special case for image previews
-				val = $element.html();
-				$element.html( inputVals[ index ].val );
-				inputVals[ index ].$.html( val );
-
-				inputVals[ index ].$.find( 'input' ).each(function() {
-					var name = $( this ).attr( 'name' );
-					name = name.replace( '['+toRowId+']', '['+fromRowId+']' );
-					$( this ).attr( 'name', name );
-				});
-				$element.find('input').each(function() {
-					var name = $( this ).attr('name');
-					name = name.replace('['+fromRowId+']', '['+toRowId+']');
-					$( this ).attr('name', name);
-				});
-
-			}
-			// handle checkbox swapping
-			else if ( 'checkbox' === elType  ) {
-				inputVals[ index ].$.prop( 'checked', $element.is(':checked') );
-				$element.prop( 'checked', inputVals[ index ].val );
-			}
-			// handle radio swapping
-			else if ( 'radio' === elType  ) {
-				if ( $element.is( ':checked' ) ) {
-					inputVals[ index ].$.attr( 'data-checked', 'true' );
-				}
-				if ( inputVals[ index ].$.is( ':checked' ) ) {
-					$element.attr( 'data-checked', 'true' );
-				}
-			}
-			// handle select swapping
-			else if ( 'select' === $element.prop('tagName') ) {
-				inputVals[ index ].$.prop( 'selected', $element.is(':selected') );
-				$element.prop( 'selected', inputVals[ index ].val );
-			}
-			// handle normal input swapping
-			else {
-				inputVals[ index ].$.val( $element.val() );
-				$element.val( inputVals[ index ].val );
-			}
-		});
-
-		$from.find( 'input[data-checked=true]' ).prop( 'checked', true ).removeAttr( 'data-checked' );
-		$goto.find( 'input[data-checked=true]' ).prop( 'checked', true ).removeAttr( 'data-checked' );
-
-		// trigger color picker change event
-		$from.find( 'input[type="text"].cmb2-colorpicker' ).trigger( 'change' );
-		$goto.find( 'input[type="text"].cmb2-colorpicker' ).trigger( 'change' );
-
-		// shift done
-		cmb.triggerElement( $this, 'cmb2_shift_rows_complete', $this, $from, $goto );
-	};
-
-	cmb.initPickers = function( $timePickers, $datePickers, $colorPickers ) {
-		cmb.trigger( 'cmb_init_pickers', {
-			time: $timePickers,
-			date: $datePickers,
-			color: $colorPickers
-		} );
-
-		// Initialize jQuery UI timepickers
-		cmb.initDateTimePickers( $timePickers, 'timepicker', 'time_picker' );
-		// Initialize jQuery UI datepickers
-		cmb.initDateTimePickers( $datePickers, 'datepicker', 'date_picker' );
-		// Initialize color picker
-		cmb.initColorPickers( $colorPickers );
-	};
-
-	cmb.initDateTimePickers = function( $selector, method, defaultKey ) {
-		if ( $selector.length ) {
-			$selector[ method ]( 'destroy' ).each( function() {
-				var $this     = $( this );
-				var fieldOpts = $this.data( method ) || {};
-				var options   = $.extend( {}, cmb.defaults[ defaultKey ], fieldOpts );
-				$this[ method ]( cmb.datePickerSetupOpts( fieldOpts, options, method ) );
-			} );
-		}
-	};
-
-	cmb.datePickerSetupOpts = function( fieldOpts, options, method ) {
-		var existing = $.extend( {}, options );
-
-		options.beforeShow = function( input, inst ) {
-			if ( 'timepicker' === method ) {
-				cmb.addTimePickerClasses( inst.dpDiv );
-			}
-
-			// Wrap datepicker w/ class to narrow the scope of jQuery UI CSS and prevent conflicts
-			$id( 'ui-datepicker-div' ).addClass( 'cmb2-element' );
-
-			// Let's be sure to call beforeShow if it was added
-			if ( 'function' === typeof existing.beforeShow ) {
-				existing.beforeShow( input, inst );
-			}
-		};
-
-		if ( 'timepicker' === method ) {
-			options.onChangeMonthYear = function( year, month, inst, picker ) {
-				cmb.addTimePickerClasses( inst.dpDiv );
-
-				// Let's be sure to call onChangeMonthYear if it was added
-				if ( 'function' === typeof existing.onChangeMonthYear ) {
-					existing.onChangeMonthYear( year, month, inst, picker );
-				}
-			};
-		}
-
-		options.onClose = function( dateText, inst ) {
-			// Remove the class when we're done with it (and hide to remove FOUC).
-			var $picker = $id( 'ui-datepicker-div' ).removeClass( 'cmb2-element' ).hide();
-			if ( 'timepicker' === method && ! $( inst.input ).val() ) {
-				// Set the timepicker field value if it's empty.
-				inst.input.val( $picker.find( '.ui_tpicker_time' ).text() );
-			}
-
-			// Let's be sure to call onClose if it was added
-			if ( 'function' === typeof existing.onClose ) {
-				existing.onClose( dateText, inst );
-			}
-		};
-
-		return options;
-	};
-
-	// Adds classes to timepicker buttons.
-	cmb.addTimePickerClasses = function( $picker ) {
-		var func = cmb.addTimePickerClasses;
-		func.count = func.count || 0;
-
-		// Wait a bit to let the timepicker render, since these are pre-render events.
-		setTimeout( function() {
-			if ( $picker.find( '.ui-priority-secondary' ).length ) {
-				$picker.find( '.ui-priority-secondary' ).addClass( 'button-secondary' );
-				$picker.find( '.ui-priority-primary' ).addClass( 'button-primary' );
-				func.count = 0;
-			} else if ( func.count < 5 ) {
-				func.count++;
-				func( $picker );
-			}
-		}, 10 );
-	};
-
-	cmb.initColorPickers = function( $selector ) {
-		if ( ! $selector.length ) {
-			return;
-		}
-		if ( 'object' === typeof jQuery.wp && 'function' === typeof jQuery.wp.wpColorPicker ) {
-
-			$selector.each( function() {
-				var $this = $( this );
-				var fieldOpts = $this.data( 'colorpicker' ) || {};
-				$this.wpColorPicker( $.extend( {}, cmb.defaults.color_picker, fieldOpts ) );
-			} );
-
-		} else {
-			$selector.each( function( i ) {
-				$( this ).after( '<div id="picker-' + i + '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>' );
-				$id( 'picker-' + i ).hide().farbtastic( $( this ) );
-			} )
-			.focus( function() {
-				$( this ).next().show();
-			} )
-			.blur( function() {
-				$( this ).next().hide();
-			} );
-		}
-	};
-
-	cmb.initCodeEditors = function( $selector ) {
-		cmb.trigger( 'cmb_init_code_editors', $selector );
-
-		if ( ! cmb.defaults.code_editor || ! wp || ! wp.codeEditor || ! $selector.length ) {
-			return;
-		}
-
-		$selector.each( function() {
-			wp.codeEditor.initialize(
-				this.id,
-				cmb.codeEditorArgs( $( this ).data( 'codeeditor' ) )
-			);
-		} );
-	};
-
-	cmb.codeEditorArgs = function( overrides ) {
-		var props = [ 'codemirror', 'csslint', 'jshint', 'htmlhint' ];
-		var args = $.extend( {}, cmb.defaults.code_editor );
-		overrides = overrides || {};
-
-		for ( var i = props.length - 1; i >= 0; i-- ) {
-			if ( overrides.hasOwnProperty( props[i] ) ) {
-				args[ props[i] ] = $.extend( {}, args[ props[i] ] || {}, overrides[ props[i] ] );
-			}
-		}
-
-		return args;
-	};
-
-	cmb.makeListSortable = function() {
-		var $filelist = cmb.metabox().find( '.cmb2-media-status.cmb-attach-list' );
-		if ( $filelist.length ) {
-			$filelist.sortable({ cursor: 'move' }).disableSelection();
-		}
-	};
-
-	cmb.makeRepeatableSortable = function() {
-		var $repeatables = cmb.metabox().find( '.cmb-repeat-table .cmb-field-list' );
-
-		if ( $repeatables.length ) {
-			$repeatables.sortable({
-				items : '.cmb-repeat-row',
-				cursor: 'move',
-				// The default "cancel" attributes are: "input,textarea,button,select,option".
-				// We are appending .CodeMirror.
-				// See https://api.jqueryui.com/sortable/#option-cancel
-				cancel: 'input,textarea,button,select,option,.CodeMirror'
-			});
-		}
-	};
-
-	cmb.maybeOembed = function( evt ) {
-		var $this = $( this );
-
-		var m = {
-			focusout : function() {
-				setTimeout( function() {
-					// if it's been 2 seconds, hide our spinner
-					cmb.spinner( '.cmb2-metabox', true );
-				}, 2000);
-			},
-			keyup : function() {
-				var betw = function( min, max ) {
-					return ( evt.which <= max && evt.which >= min );
-				};
-				// Only Ajax on normal keystrokes
-				if ( betw( 48, 90 ) || betw( 96, 111 ) || betw( 8, 9 ) || evt.which === 187 || evt.which === 190 ) {
-					// fire our ajax function
-					cmb.doAjax( $this, evt );
-				}
-			},
-			paste : function() {
-				// paste event is fired before the value is filled, so wait a bit
-				setTimeout( function() { cmb.doAjax( $this ); }, 100);
-			}
-		};
-
-		m[ evt.type ]();
-	};
-
-	/**
-	 * Resize oEmbed videos to fit in their respective metaboxes
-	 *
-	 * @since  0.9.4
-	 *
-	 * @return {return}
-	 */
-	cmb.resizeoEmbeds = function() {
-		cmb.metabox().each( function() {
-			var $this      = $( this );
-			var $tableWrap = $this.parents('.inside');
-			var isSide     = $this.parents('.inner-sidebar').length || $this.parents( '#side-sortables' ).length;
-			var isSmall    = isSide;
-			var isSmallest = false;
-			if ( ! $tableWrap.length )  {
-				return true; // continue
-			}
-
-			// Calculate new width
-			var tableW = $tableWrap.width();
-
-			if ( cmb.styleBreakPoint > tableW ) {
-				isSmall    = true;
-				isSmallest = ( cmb.styleBreakPoint - 62 ) > tableW;
-			}
-
-			tableW = isSmall ? tableW : Math.round(($tableWrap.width() * 0.82)*0.97);
-			var newWidth = tableW - 30;
-			if ( isSmall && ! isSide && ! isSmallest ) {
-				newWidth = newWidth - 75;
-			}
-			if ( newWidth > 639 ) {
-				return true; // continue
-			}
-
-			var $embeds   = $this.find('.cmb-type-oembed .embed-status');
-			var $children = $embeds.children().not('.cmb2-remove-wrapper');
-			if ( ! $children.length ) {
-				return true; // continue
-			}
-
-			$children.each( function() {
-				var $this     = $( this );
-				var iwidth    = $this.width();
-				var iheight   = $this.height();
-				var _newWidth = newWidth;
-				if ( $this.parents( '.cmb-repeat-row' ).length && ! isSmall ) {
-					// Make room for our repeatable "remove" button column
-					_newWidth = newWidth - 91;
-					_newWidth = 785 > tableW ? _newWidth - 15 : _newWidth;
-				}
-				// Calc new height
-				var newHeight = Math.round((_newWidth * iheight)/iwidth);
-				$this.width(_newWidth).height(newHeight);
-			});
-		});
-	};
-
-	// function for running our ajax
-	cmb.doAjax = function( $obj ) {
-		// get typed value
-		var oembed_url = $obj.val();
-		// only proceed if the field contains more than 6 characters
-		if ( oembed_url.length < 6 ) {
-			return;
-		}
-
-		// get field id
-		var field_id         = $obj.attr('id');
-		var $context         = $obj.closest( '.cmb-td' );
-		var $embed_container = $context.find( '.embed-status' );
-		var $embed_wrap      = $context.find( '.embed_wrap' );
-		var $child_el        = $embed_container.find( ':first-child' );
-		var oembed_width     = $embed_container.length && $child_el.length ? $child_el.width() : $obj.width();
-
-		cmb.log( 'oembed_url', oembed_url, field_id );
-
-		// show our spinner
-		cmb.spinner( $context );
-		// clear out previous results
-		$embed_wrap.html('');
-		// and run our ajax function
-		setTimeout( function() {
-			// if they haven't typed in 500 ms
-			if ( $( '.cmb2-oembed:focus' ).val() !== oembed_url ) {
-				return;
-			}
-			$.ajax({
-				type : 'post',
-				dataType : 'json',
-				url : l10n.ajaxurl,
-				data : {
-					'action'          : 'cmb2_oembed_handler',
-					'oembed_url'      : oembed_url,
-					'oembed_width'    : oembed_width > 300 ? oembed_width : 300,
-					'field_id'        : field_id,
-					'object_id'       : $obj.data( 'objectid' ),
-					'object_type'     : $obj.data( 'objecttype' ),
-					'cmb2_ajax_nonce' : l10n.ajax_nonce
-				},
-				success: function(response) {
-					cmb.log( response );
-					// hide our spinner
-					cmb.spinner( $context, true );
-					// and populate our results from ajax response
-					$embed_wrap.html( response.data );
-				}
-			});
-
-		}, 500);
-
-	};
-
-	/**
-	 * Gets jQuery object containing all CMB metaboxes. Caches the result.
-	 *
-	 * @since  1.0.2
-	 *
-	 * @return {Object} jQuery object containing all CMB metaboxes.
-	 */
-	cmb.metabox = function() {
-		if ( cmb.$metabox ) {
-			return cmb.$metabox;
-		}
-		cmb.$metabox = $('.cmb2-wrap > .cmb2-metabox');
-		return cmb.$metabox;
-	};
-
-	/**
-	 * Starts/stops contextual spinner.
-	 *
-	 * @since  1.0.1
-	 *
-	 * @param  {object} $context The jQuery parent/context object.
-	 * @param  {bool} hide       Whether to hide the spinner (will show by default).
-	 *
-	 * @return {void}
-	 */
-	cmb.spinner = function( $context, hide ) {
-		var m = hide ? 'removeClass' : 'addClass';
-		$('.cmb-spinner', $context )[ m ]( 'is-active' );
-	};
-
-	/**
-	 * Triggers a jQuery event on the document object.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {string} evtName The name of the event to trigger.
-	 *
-	 * @return {void}
-	 */
-	cmb.trigger = function( evtName ) {
-		var args = Array.prototype.slice.call( arguments, 1 );
-		args.push( cmb );
-		$document.trigger( evtName, args );
-	};
-
-	/**
-	 * Triggers a jQuery event on the given jQuery object.
-	 *
-	 * @since  2.2.3
-	 *
-	 * @param  {object} $el     The jQuery element object.
-	 * @param  {string} evtName The name of the event to trigger.
-	 *
-	 * @return {void}
-	 */
-	cmb.triggerElement = function( $el, evtName ) {
-		var args = Array.prototype.slice.call( arguments, 2 );
-		args.push( cmb );
-		$el.trigger( evtName, args );
-	};
-
-	/**
-	 * Get an argument for a given field.
-	 *
-	 * @since  2.5.0
-	 *
-	 * @param  {string|object} hash The field hash, id, or a jQuery object for a field.
-	 * @param  {string}        arg  The argument to get on the field.
-	 *
-	 * @return {mixed}              The argument value.
-	 */
-	cmb.getFieldArg = function( hash, arg ) {
-		return cmb.getField( hash )[ arg ];
-	};
-
-	/**
-	 * Get a field object instances. Can be filtered by passing in a filter callback function.
-	 * e.g. `const fileFields = CMB2.getFields(f => 'file' === f.type);`
-	 *
-	 * @since  2.5.0
-	 *
-	 * @param  {mixed} filterCb An optional filter callback function.
-	 *
-	 * @return array            An array of field object instances.
-	 */
-	cmb.getFields = function( filterCb ) {
-		if ( 'function' === typeof filterCb ) {
-			var fields = [];
-			$.each( l10n.fields, function( hash, field ) {
-				if ( filterCb( field, hash ) ) {
-					fields.push( field );
-				}
-			});
-			return fields;
-		}
-
-		return l10n.fields;
-	};
-
-	/**
-	 * Get a field object instance by hash or id.
-	 *
-	 * @since  2.5.0
-	 *
-	 * @param  {string|object} hash The field hash, id, or a jQuery object for a field.
-	 *
-	 * @return {object}        The field object or an empty object.
-	 */
-	cmb.getField = function( hash ) {
-		var field = {};
-		hash = hash instanceof jQuery ? hash.data( 'hash' ) : hash;
-		if ( hash ) {
-			try {
-				if ( l10n.fields[ hash ] ) {
-					throw new Error( hash );
-				}
-
-				cmb.getFields( function( field ) {
-					if ( 'function' === typeof hash ) {
-						if ( hash( field ) ) {
-							throw new Error( field.hash );
-						}
-					} else  if ( field.id && field.id === hash ) {
-						throw new Error( field.hash );
-					}
-				});
-			} catch( e ) {
-				field = l10n.fields[ e.message ];
-			}
-		}
-
-		return field;
-	};
-
-	/**
-	 * Safely log things if query var is set. Accepts same parameters as console.log.
-	 *
-	 * @since  1.0.0
-	 *
-	 * @return {void}
-	 */
-	cmb.log = function() {
-		if ( l10n.script_debug && console && 'function' === typeof console.log ) {
-			console.log.apply(console, arguments);
-		}
-	};
-
-	/**
-	 * Replace the last occurrence of a string.
-	 *
-	 * @since  2.2.6
-	 *
-	 * @param  {string} string  String to search/replace.
-	 * @param  {string} search  String to search.
-	 * @param  {string} replace String to replace search with.
-	 *
-	 * @return {string}         Possibly modified string.
-	 */
-	cmb.replaceLast = function( string, search, replace ) {
-		// find the index of last time word was used
-		var n = string.lastIndexOf( search );
-
-		// slice the string in 2, one from the start to the lastIndexOf
-		// and then replace the word in the rest
-		return string.slice( 0, n ) + string.slice( n ).replace( search, replace );
-	};
-
-	// Kick it off!
-	$( cmb.init );
-
+(function (window, document, $, cmb, undefined) {
+  "use strict";
+
+  // localization strings
+  var l10n = window.cmb2_l10;
+  var setTimeout = window.setTimeout;
+  var $document;
+  var $id = function (selector) {
+    return $(document.getElementById(selector));
+  };
+  cmb.$id = $id;
+  var defaults = {
+    idNumber: false,
+    repeatEls:
+      'input:not([type="button"],[id^=filelist]),select,textarea,.cmb2-media-status',
+    noEmpty:
+      'input:not([type="button"]):not([type="radio"]):not([type="checkbox"]),textarea',
+    repeatUpdate: 'input:not([type="button"]),select,textarea,label',
+    styleBreakPoint: 450,
+    mediaHandlers: {},
+    defaults: {
+      time_picker: l10n.defaults.time_picker,
+      date_picker: l10n.defaults.date_picker,
+      color_picker: l10n.defaults.color_picker || {},
+      code_editor: l10n.defaults.code_editor,
+    },
+    media: {
+      frames: {},
+    },
+  };
+
+  cmb.init = function () {
+    $document = $(document);
+
+    // Setup the CMB2 object defaults.
+    $.extend(cmb, defaults);
+
+    cmb.trigger("cmb_pre_init");
+
+    var $metabox = cmb.metabox();
+    var $repeatGroup = $metabox.find(".cmb-repeatable-group");
+
+    // Init time/date/color pickers
+    cmb.initPickers(
+      $metabox.find('input[type="text"].cmb2-timepicker'),
+      $metabox.find('input[type="text"].cmb2-datepicker'),
+      $metabox.find('input[type="text"].cmb2-colorpicker'),
+    );
+
+    // Init code editors.
+    cmb.initCodeEditors(
+      $metabox.find(".cmb2-textarea-code:not(.disable-codemirror)"),
+    );
+
+    // Insert toggle button into DOM wherever there is multicheck. credit: Genesis Framework
+    $(
+      '<p><span class="button-secondary cmb-multicheck-toggle">' +
+        l10n.strings.check_toggle +
+        "</span></p>",
+    ).insertBefore(".cmb2-checkbox-list:not(.no-select-all)");
+
+    // Make File List drag/drop sortable:
+    cmb.makeListSortable();
+    // Make Repeatable fields drag/drop sortable:
+    cmb.makeRepeatableSortable();
+
+    $metabox
+      .on("change", ".cmb2_upload_file", function () {
+        cmb.media.field = $(this).attr("id");
+        $id(cmb.media.field + "_id").val("");
+      })
+      // Media/file management
+      .on("click", ".cmb-multicheck-toggle", cmb.toggleCheckBoxes)
+      .on("click", ".cmb2-upload-button", cmb.handleMedia)
+      .on(
+        "click",
+        ".cmb-attach-list li, .cmb2-media-status .img-status img, .cmb2-media-status .file-status > span",
+        cmb.handleFileClick,
+      )
+      .on("click", ".cmb2-remove-file-button", cmb.handleRemoveMedia)
+      // Repeatable content
+      .on("click", ".cmb-add-group-row", cmb.addGroupRow)
+      .on("click", ".cmb-add-row-button", cmb.addAjaxRow)
+      .on("click", ".cmb-remove-group-row", cmb.removeGroupRow)
+      .on("click", ".cmb-remove-row-button", cmb.removeAjaxRow)
+      // Ajax oEmbed display
+      .on("keyup paste focusout", ".cmb2-oembed", cmb.maybeOembed)
+      // Reset titles when removing a row
+      .on(
+        "cmb2_remove_row",
+        ".cmb-repeatable-group",
+        cmb.resetTitlesAndIterator,
+      )
+      .on(
+        "click",
+        ".cmbhandle, .cmbhandle + .cmbhandle-title",
+        cmb.toggleHandle,
+      );
+
+    if ($repeatGroup.length) {
+      $repeatGroup
+        .on("cmb2_add_row", cmb.emptyValue)
+        .on("cmb2_add_row", cmb.setDefaults)
+        .filter(".sortable")
+        .each(function () {
+          // Add sorting arrows
+          $(this)
+            .find(".cmb-remove-group-row-button")
+            .before(
+              '<a class="button-secondary cmb-shift-rows move-up alignleft" href="#"><span class="' +
+                l10n.up_arrow_class +
+                '"></span></a> <a class="button-secondary cmb-shift-rows move-down alignleft" href="#"><span class="' +
+                l10n.down_arrow_class +
+                '"></span></a>',
+            );
+        })
+        .on("click", ".cmb-shift-rows", cmb.shiftRows);
+    }
+
+    // on pageload
+    setTimeout(cmb.resizeoEmbeds, 500);
+    // and on window resize
+    $(window).on("resize", cmb.resizeoEmbeds);
+
+    if ($id("addtag").length) {
+      cmb.listenTagAdd();
+    }
+
+    $(document).on("cmb_init", cmb.mceEnsureSave);
+
+    cmb.trigger("cmb_init");
+  };
+
+  // Handles updating tiny mce instances when saving a gutenberg post.
+  // https://github.com/CMB2/CMB2/issues/1156
+  cmb.mceEnsureSave = function () {
+    // If no wp.data, do not proceed (no gutenberg)
+    if (!wp.data || !wp.data.hasOwnProperty("subscribe")) {
+      return;
+    }
+
+    // If the current user cannot richedit, or MCE is not available, bail.
+    if (!cmb.canTinyMCE()) {
+      return;
+    }
+
+    wp.data.subscribe(function () {
+      var editor = wp.data.hasOwnProperty("select")
+        ? wp.data.select("core/editor")
+        : null;
+
+      // the post is currently being saved && we have tinymce editors
+      if (
+        editor &&
+        editor.isSavingPost &&
+        editor.isSavingPost() &&
+        window.tinyMCE.editors.length
+      ) {
+        for (var i = 0; i < window.tinyMCE.editors.length; i++) {
+          if (window.tinyMCE.activeEditor !== window.tinyMCE.editors[i]) {
+            window.tinyMCE.editors[i].save();
+          }
+        }
+      }
+    });
+  };
+
+  cmb.canTinyMCE = function () {
+    return l10n.user_can_richedit && window.tinyMCE;
+  };
+
+  cmb.listenTagAdd = function () {
+    $document.ajaxSuccess(function (evt, xhr, settings) {
+      if (
+        settings.data &&
+        settings.data.length &&
+        -1 !== settings.data.indexOf("action=add-tag")
+      ) {
+        cmb.resetBoxes($id("addtag").find(".cmb2-wrap > .cmb2-metabox"));
+      }
+    });
+  };
+
+  cmb.resetBoxes = function ($boxes) {
+    $.each($boxes, function () {
+      cmb.resetBox($(this));
+    });
+  };
+
+  cmb.resetBox = function ($box) {
+    $box.find(".wp-picker-clear").trigger("click");
+    $box.find(".cmb2-remove-file-button").trigger("click");
+    $box
+      .find(
+        ".cmb-row.cmb-repeatable-grouping:not(:first-of-type) .cmb-remove-group-row",
+      )
+      .click();
+    $box.find(".cmb-repeat-row:not(:first-child)").remove();
+
+    $box.find('input:not([type="button"]),select,textarea').each(function () {
+      var $element = $(this);
+      var tagName = $element.prop("tagName");
+
+      if ("INPUT" === tagName) {
+        var elType = $element.attr("type");
+        if ("checkbox" === elType || "radio" === elType) {
+          $element.prop("checked", false);
+        } else {
+          $element.val("");
+        }
+      }
+      if ("SELECT" === tagName) {
+        $("option:selected", this).prop("selected", false);
+      }
+      if ("TEXTAREA" === tagName) {
+        $element.html("");
+      }
+    });
+  };
+
+  cmb.resetTitlesAndIterator = function (evt) {
+    if (!evt.group) {
+      return;
+    }
+
+    // Loop repeatable group tables
+    $(".cmb-repeatable-group.repeatable").each(function () {
+      var $table = $(this);
+      var groupTitle = $table.find(".cmb-add-group-row").data("grouptitle");
+
+      // Loop repeatable group table rows
+      $table.find(".cmb-repeatable-grouping").each(function (rowindex) {
+        var $row = $(this);
+        var $rowTitle = $row.find("h3.cmb-group-title");
+        // Reset rows iterator
+        $row.data("iterator", rowindex);
+        // Reset rows title
+        if ($rowTitle.length) {
+          $rowTitle.text(groupTitle.replace("{#}", rowindex + 1));
+        }
+      });
+    });
+  };
+
+  cmb.toggleHandle = function (evt) {
+    evt.preventDefault();
+    cmb.trigger(
+      "postbox-toggled",
+      $(this).parent(".postbox").toggleClass("closed"),
+    );
+  };
+
+  cmb.toggleCheckBoxes = function (evt) {
+    evt.preventDefault();
+    var $this = $(this);
+    var $multicheck = $this
+      .closest(".cmb-td")
+      .find("input[type=checkbox]:not([disabled])");
+
+    // If the button has already been clicked once...
+    if ($this.data("checked")) {
+      // clear the checkboxes and remove the flag
+      $multicheck.prop("checked", false);
+      $this.data("checked", false);
+    }
+    // Otherwise mark the checkboxes and add a flag
+    else {
+      $multicheck.prop("checked", true);
+      $this.data("checked", true);
+    }
+  };
+
+  cmb.handleMedia = function (evt) {
+    evt.preventDefault();
+
+    var $el = $(this);
+    cmb.attach_id = !$el.hasClass("cmb2-upload-list")
+      ? $el.closest(".cmb-td").find(".cmb2-upload-file-id").val()
+      : false;
+    // Clean up default 0 value
+    cmb.attach_id = "0" !== cmb.attach_id ? cmb.attach_id : false;
+
+    cmb._handleMedia(
+      $el.prev("input.cmb2-upload-file").attr("id"),
+      $el.hasClass("cmb2-upload-list"),
+    );
+  };
+
+  cmb.handleFileClick = function (evt) {
+    if ($(evt.target).is("a")) {
+      return;
+    }
+
+    evt.preventDefault();
+
+    var $el = $(this);
+    var $td = $el.closest(".cmb-td");
+    var isList = $td.find(".cmb2-upload-button").hasClass("cmb2-upload-list");
+    cmb.attach_id = isList
+      ? $el.find('input[type="hidden"]').data("id")
+      : $td.find(".cmb2-upload-file-id").val();
+
+    if (cmb.attach_id) {
+      cmb._handleMedia(
+        $td.find("input.cmb2-upload-file").attr("id"),
+        isList,
+        cmb.attach_id,
+      );
+    }
+  };
+
+  cmb._handleMedia = function (id, isList) {
+    if (!wp) {
+      return;
+    }
+
+    var media, handlers;
+
+    handlers = cmb.mediaHandlers;
+    media = cmb.media;
+    media.field = id;
+    media.$field = $id(media.field);
+    media.fieldData = media.$field.data();
+    media.previewSize = media.fieldData.previewsize;
+    media.sizeName = media.fieldData.sizename;
+    media.fieldName = media.$field.attr("name");
+    media.isList = isList;
+
+    // If this field's media frame already exists, reopen it.
+    if (id in media.frames) {
+      return media.frames[id].open();
+    }
+
+    // Create the media frame.
+    media.frames[id] = wp.media({
+      title: cmb
+        .metabox()
+        .find('label[for="' + id + '"]')
+        .text(),
+      library: media.fieldData.queryargs || {},
+      button: {
+        text: l10n.strings[isList ? "upload_files" : "upload_file"],
+      },
+      multiple: isList ? "add" : false,
+    });
+
+    // Enable the additional media filters: https://github.com/CMB2/CMB2/issues/873
+    media.frames[id].states.first().set("filterable", "all");
+
+    cmb.trigger("cmb_media_modal_init", media);
+
+    handlers.list = function (selection, returnIt) {
+      // Setup our fileGroup array
+      var fileGroup = [];
+      var attachmentHtml;
+
+      if (!handlers.list.templates) {
+        handlers.list.templates = {
+          image: wp.template("cmb2-list-image"),
+          file: wp.template("cmb2-list-file"),
+        };
+      }
+
+      // Loop through each attachment
+      selection.each(function (attachment) {
+        // Image preview or standard generic output if it's not an image.
+        attachmentHtml = handlers.getAttachmentHtml(attachment, "list");
+
+        // Add our file to our fileGroup array
+        fileGroup.push(attachmentHtml);
+      });
+
+      if (!returnIt) {
+        // Append each item from our fileGroup array to .cmb2-media-status
+        media.$field.siblings(".cmb2-media-status").append(fileGroup);
+      } else {
+        return fileGroup;
+      }
+    };
+
+    handlers.single = function (selection) {
+      if (!handlers.single.templates) {
+        handlers.single.templates = {
+          image: wp.template("cmb2-single-image"),
+          file: wp.template("cmb2-single-file"),
+        };
+      }
+
+      // Only get one file from the uploader
+      var attachment = selection.first();
+
+      media.$field.val(attachment.get("url"));
+      $id(media.field + "_id").val(attachment.get("id"));
+
+      // Image preview or standard generic output if it's not an image.
+      var attachmentHtml = handlers.getAttachmentHtml(attachment, "single");
+
+      // add/display our output
+      media.$field
+        .siblings(".cmb2-media-status")
+        .slideDown()
+        .html(attachmentHtml);
+    };
+
+    handlers.getAttachmentHtml = function (attachment, templatesId) {
+      var isImage = "image" === attachment.get("type");
+      var data = handlers.prepareData(attachment, isImage);
+
+      // Image preview or standard generic output if it's not an image.
+      return handlers[templatesId].templates[isImage ? "image" : "file"](data);
+    };
+
+    handlers.prepareData = function (data, image) {
+      if (image) {
+        // Set the correct image size data
+        handlers.getImageData.call(data, 50);
+      }
+
+      data = data.toJSON();
+      data.mediaField = media.field;
+      data.mediaFieldName = media.fieldName;
+      data.stringRemoveImage = l10n.strings.remove_image;
+      data.stringFile = l10n.strings.file;
+      data.stringDownload = l10n.strings.download;
+      data.stringRemoveFile = l10n.strings.remove_file;
+
+      return data;
+    };
+
+    handlers.getImageData = function (fallbackSize) {
+      // Preview size dimensions
+      var previewW = media.previewSize[0] || fallbackSize;
+      var previewH = media.previewSize[1] || fallbackSize;
+
+      // Image dimensions and url
+      var url = this.get("url");
+      var width = this.get("width");
+      var height = this.get("height");
+      var sizes = this.get("sizes");
+
+      // Get the correct dimensions and url if a named size is set and exists
+      // fallback to the 'large' size
+      if (sizes) {
+        if (sizes[media.sizeName]) {
+          url = sizes[media.sizeName].url;
+          width = sizes[media.sizeName].width;
+          height = sizes[media.sizeName].height;
+        } else if (sizes.large) {
+          url = sizes.large.url;
+          width = sizes.large.width;
+          height = sizes.large.height;
+        }
+      }
+
+      // Fit the image in to the preview size, keeping the correct aspect ratio
+      if (width > previewW) {
+        height = Math.floor((previewW * height) / width);
+        width = previewW;
+      }
+
+      if (height > previewH) {
+        width = Math.floor((previewH * width) / height);
+        height = previewH;
+      }
+
+      if (!width) {
+        width = previewW;
+      }
+
+      if (!height) {
+        height =
+          "svg" === this.get("filename").split(".").pop() ? "100%" : previewH;
+      }
+
+      this.set("sizeUrl", url);
+      this.set("sizeWidth", width);
+      this.set("sizeHeight", height);
+
+      return this;
+    };
+
+    handlers.selectFile = function () {
+      var selection = media.frames[id].state().get("selection");
+      var type = isList ? "list" : "single";
+
+      if (cmb.attach_id && isList) {
+        $('[data-id="' + cmb.attach_id + '"]')
+          .parents("li")
+          .replaceWith(handlers.list(selection, true));
+      } else {
+        handlers[type](selection);
+      }
+
+      cmb.trigger("cmb_media_modal_select", selection, media);
+    };
+
+    handlers.openModal = function () {
+      var selection = media.frames[id].state().get("selection");
+      var attach;
+
+      if (!cmb.attach_id) {
+        selection.reset();
+      } else {
+        attach = wp.media.attachment(cmb.attach_id);
+        attach.fetch();
+        selection.set(attach ? [attach] : []);
+      }
+
+      cmb.trigger("cmb_media_modal_open", selection, media);
+    };
+
+    // When a file is selected, run a callback.
+    media.frames[id]
+      .on("select", handlers.selectFile)
+      .on("open", handlers.openModal);
+
+    // Finally, open the modal
+    media.frames[id].open();
+  };
+
+  cmb.handleRemoveMedia = function (evt) {
+    evt.preventDefault();
+    var $this = $(this);
+    if ($this.is(".cmb-attach-list .cmb2-remove-file-button")) {
+      $this.parents(".cmb2-media-item").remove();
+      return false;
+    }
+
+    cmb.media.field = $this.attr("rel");
+
+    cmb.metabox().find(document.getElementById(cmb.media.field)).val("");
+    cmb
+      .metabox()
+      .find(document.getElementById(cmb.media.field + "_id"))
+      .val("");
+    $this.parents(".cmb2-media-status").html("");
+
+    return false;
+  };
+
+  cmb.cleanRow = function ($row, prevNum, group) {
+    var $elements = $row.find(cmb.repeatUpdate);
+    if (group) {
+      var $other = $row.find("[id]").not(cmb.repeatUpdate);
+
+      // Remove extra ajaxed rows
+      $row.find(".cmb-repeat-table .cmb-repeat-row:not(:first-child)").remove();
+
+      // Update all elements w/ an ID
+      if ($other.length) {
+        $other.each(function () {
+          var $_this = $(this);
+          var oldID = $_this.attr("id");
+          var newID = oldID.replace("_" + prevNum, "_" + cmb.idNumber);
+          var $buttons = $row.find('[data-selector="' + oldID + '"]');
+          $_this.attr("id", newID);
+
+          // Replace data-selector vars
+          if ($buttons.length) {
+            $buttons.attr("data-selector", newID).data("selector", newID);
+          }
+        });
+      }
+    }
+
+    $elements.filter(":checked").removeAttr("checked");
+    $elements.find(":checked").removeAttr("checked");
+    $elements.filter(":selected").removeAttr("selected");
+    $elements.find(":selected").removeAttr("selected", false);
+
+    if ($row.find("h3.cmb-group-title").length) {
+      $row
+        .find("h3.cmb-group-title")
+        .text($row.data("title").replace("{#}", cmb.idNumber + 1));
+    }
+
+    $elements.each(function () {
+      cmb.elReplacements($(this), prevNum, group);
+    });
+
+    return cmb;
+  };
+
+  cmb.elReplacements = function ($newInput, prevNum, group) {
+    var oldFor = $newInput.attr("for");
+    var oldVal = $newInput.val();
+    var type = $newInput.prop("type");
+    var defVal = cmb.getFieldArg($newInput, "default");
+    var newVal =
+      "undefined" !== typeof defVal && false !== defVal ? defVal : "";
+    var tagName = $newInput.prop("tagName");
+    var checkable = "radio" === type || "checkbox" === type ? oldVal : false;
+    var attrs = {};
+    var newID, oldID;
+    if (oldFor) {
+      attrs = { for: oldFor.replace("_" + prevNum, "_" + cmb.idNumber) };
+    } else {
+      var oldName = $newInput.attr("name");
+      var newName;
+      oldID = $newInput.attr("id");
+
+      // Handle adding groups vs rows.
+      if (group) {
+        // Expect another bracket after group's index closing bracket.
+        newName = oldName
+          ? oldName.replace("[" + prevNum + "][", "[" + cmb.idNumber + "][")
+          : "";
+        // Expect another underscore after group's index trailing underscore.
+        newID = oldID
+          ? oldID.replace("_" + prevNum + "_", "_" + cmb.idNumber + "_")
+          : "";
+      } else {
+        // Row indexes are at the very end of the string.
+        newName = oldName
+          ? cmb.replaceLast(
+              oldName,
+              "[" + prevNum + "]",
+              "[" + cmb.idNumber + "]",
+            )
+          : "";
+        newID = oldID
+          ? cmb.replaceLast(oldID, "_" + prevNum, "_" + cmb.idNumber)
+          : "";
+      }
+
+      attrs = {
+        id: newID,
+        name: newName,
+      };
+    }
+
+    // Clear out textarea values
+    if ("TEXTAREA" === tagName) {
+      $newInput.html(newVal);
+    }
+
+    if ("SELECT" === tagName && "undefined" !== typeof defVal) {
+      var $toSelect = $newInput.find('[value="' + defVal + '"]');
+      if ($toSelect.length) {
+        $toSelect.attr("selected", "selected").prop("selected", "selected");
+      }
+    }
+
+    if (checkable) {
+      $newInput.removeAttr("checked");
+      if ("undefined" !== typeof defVal && oldVal === defVal) {
+        $newInput.attr("checked", "checked").prop("checked", "checked");
+      }
+    }
+
+    if (!group && $newInput[0].hasAttribute("data-iterator")) {
+      attrs["data-iterator"] = cmb.idNumber;
+    }
+
+    $newInput
+      .removeClass("hasDatepicker")
+      .val(checkable ? checkable : newVal)
+      .attr(attrs);
+
+    return $newInput;
+  };
+
+  cmb.newRowHousekeeping = function ($row) {
+    var $colorPicker = $row.find(".wp-picker-container");
+    var $list = $row.find(".cmb2-media-status");
+
+    if ($colorPicker.length) {
+      // Need to clean-up colorpicker before appending
+      $colorPicker.each(function () {
+        var $td = $(this).parent();
+        $td.html(
+          $td.find('input[type="text"].cmb2-colorpicker').attr("style", ""),
+        );
+      });
+    }
+
+    // Need to clean-up colorpicker before appending
+    if ($list.length) {
+      $list.empty();
+    }
+
+    return cmb;
+  };
+
+  cmb.afterRowInsert = function ($row) {
+    // Init pickers from new row
+    cmb.initPickers(
+      $row.find('input[type="text"].cmb2-timepicker'),
+      $row.find('input[type="text"].cmb2-datepicker'),
+      $row.find('input[type="text"].cmb2-colorpicker'),
+    );
+  };
+
+  cmb.updateNameAttr = function () {
+    var $this = $(this);
+    var name = $this.attr("name"); // get current name
+
+    // If name is defined
+    if ("undefined" !== typeof name) {
+      var prevNum = parseInt(
+        $this.parents(".cmb-repeatable-grouping").data("iterator"),
+        10,
+      );
+      var newNum = prevNum - 1; // Subtract 1 to get new iterator number
+
+      // Update field name attributes so data is not orphaned when a row is removed and post is saved
+      var $newName = name.replace("[" + prevNum + "]", "[" + newNum + "]");
+
+      // New name with replaced iterator
+      $this.attr("name", $newName);
+    }
+  };
+
+  cmb.emptyValue = function (evt, row) {
+    $(cmb.noEmpty, row).val("");
+  };
+
+  cmb.setDefaults = function (evt, row) {
+    $(cmb.noEmpty, row).each(function () {
+      var $el = $(this);
+      var defVal = cmb.getFieldArg($el, "default");
+      if ("undefined" !== typeof defVal && false !== defVal) {
+        $el.val(defVal);
+      }
+    });
+  };
+
+  cmb.addGroupRow = function (evt) {
+    evt.preventDefault();
+
+    var $this = $(this);
+
+    // before anything significant happens
+    cmb.triggerElement($this, "cmb2_add_group_row_start", $this);
+
+    var $table = $id($this.data("selector"));
+    var $oldRow = $table.find(".cmb-repeatable-grouping").last();
+    var prevNum = parseInt($oldRow.data("iterator"), 10);
+    cmb.idNumber = parseInt(prevNum, 10) + 1;
+    var $row = $oldRow.clone();
+    var nodeName = $row.prop("nodeName") || "div";
+    var getRowId = function (id) {
+      id = id.split("-");
+      id.splice(id.length - 1, 1);
+      id.push(cmb.idNumber);
+      return id.join("-");
+    };
+
+    // Make sure the next number doesn't exist.
+    while (
+      $table.find(
+        '.cmb-repeatable-grouping[data-iterator="' + cmb.idNumber + '"]',
+      ).length > 0
+    ) {
+      cmb.idNumber++;
+    }
+
+    cmb
+      .newRowHousekeeping($row.data("title", $this.data("grouptitle")))
+      .cleanRow($row, prevNum, true);
+    $row.find(".cmb-add-row-button").prop("disabled", false);
+
+    var $newRow = $(
+      "<" +
+        nodeName +
+        ' id="' +
+        getRowId($oldRow.attr("id")) +
+        '" class="postbox cmb-row cmb-repeatable-grouping" data-iterator="' +
+        cmb.idNumber +
+        '">' +
+        $row.html() +
+        "</" +
+        nodeName +
+        ">",
+    );
+    $oldRow.after($newRow);
+
+    cmb.afterRowInsert($newRow);
+
+    cmb.triggerElement($table, { type: "cmb2_add_row", group: true }, $newRow);
+  };
+
+  cmb.addAjaxRow = function (evt) {
+    evt.preventDefault();
+
+    var $this = $(this);
+    var $table = $id($this.data("selector"));
+    var $row = $table.find(".empty-row");
+    var prevNum = parseInt($row.find("[data-iterator]").data("iterator"), 10);
+    cmb.idNumber = parseInt(prevNum, 10) + 1;
+    var $emptyrow = $row.clone();
+
+    cmb.newRowHousekeeping($emptyrow).cleanRow($emptyrow, prevNum);
+
+    $row.removeClass("empty-row hidden").addClass("cmb-repeat-row");
+    $row.after($emptyrow);
+
+    cmb.afterRowInsert($emptyrow);
+
+    cmb.triggerElement(
+      $table,
+      { type: "cmb2_add_row", group: false },
+      $emptyrow,
+      $row,
+    );
+  };
+
+  cmb.removeGroupRow = function (evt) {
+    evt.preventDefault();
+
+    var $this = $(this);
+    var confirmation = $this.data("confirm");
+
+    // Process further only if deletion confirmation enabled and user agreed.
+    if (confirmation && !window.confirm(confirmation)) {
+      return;
+    }
+
+    var $table = $id($this.data("selector"));
+    var $parent = $this.parents(".cmb-repeatable-grouping");
+    var number = $table.find(".cmb-repeatable-grouping").length;
+
+    if (number < 2) {
+      return cmb.resetRow(
+        $parent.parents(".cmb-repeatable-group").find(".cmb-add-group-row"),
+        $this,
+      );
+    }
+
+    cmb.triggerElement($table, "cmb2_remove_group_row_start", $this);
+
+    // When a group is removed, loop through all next groups and update fields names.
+    $parent
+      .nextAll(".cmb-repeatable-grouping")
+      .find(cmb.repeatEls)
+      .each(cmb.updateNameAttr);
+
+    $parent.remove();
+
+    cmb.triggerElement($table, { type: "cmb2_remove_row", group: true });
+  };
+
+  cmb.removeAjaxRow = function (evt) {
+    evt.preventDefault();
+
+    var $this = $(this);
+
+    // Check if disabled
+    if ($this.hasClass("button-disabled")) {
+      return;
+    }
+
+    var $parent = $this.parents(".cmb-row");
+    var $table = $this.parents(".cmb-repeat-table");
+    var number = $table.find(".cmb-row").length;
+
+    if (number <= 2) {
+      return cmb.resetRow($parent.find(".cmb-add-row-button"), $this);
+    }
+
+    if ($parent.hasClass("empty-row")) {
+      $parent.prev().addClass("empty-row").removeClass("cmb-repeat-row");
+    }
+
+    $this.parents(".cmb-repeat-table .cmb-row").remove();
+
+    cmb.triggerElement($table, { type: "cmb2_remove_row", group: false });
+  };
+
+  cmb.resetRow = function ($addNewBtn, $removeBtn) {
+    // Click the "add new" button followed by the "remove this" button
+    // in order to reset the repeat row to empty values.
+    $addNewBtn.trigger("click");
+    $removeBtn.trigger("click");
+  };
+
+  cmb.shiftRows = function (evt) {
+    evt.preventDefault();
+
+    var $this = $(this);
+    var $from = $this.parents(".cmb-repeatable-grouping");
+    var $goto = $this.hasClass("move-up")
+      ? $from.prev(".cmb-repeatable-grouping")
+      : $from.next(".cmb-repeatable-grouping");
+
+    // Before shift occurs.
+    cmb.triggerElement($this, "cmb2_shift_rows_enter", $this, $from, $goto);
+
+    if (!$goto.length) {
+      return;
+    }
+
+    // About to shift
+    cmb.triggerElement($this, "cmb2_shift_rows_start", $this, $from, $goto);
+
+    var inputVals = [];
+    // Loop this item's fields
+    $from.find(cmb.repeatEls).each(function () {
+      var $element = $(this);
+      var elType = $element.attr("type");
+      var val;
+
+      if ($element.hasClass("cmb2-media-status")) {
+        // special case for image previews
+        val = $element.html();
+      } else if ("checkbox" === elType || "radio" === elType) {
+        val = $element.is(":checked");
+      } else if ("select" === $element.prop("tagName")) {
+        val = $element.is(":selected");
+      } else {
+        val = $element.val();
+      }
+
+      // Get all the current values per element
+      inputVals.push({ val: val, $: $element });
+    });
+    // And swap them all
+    $goto.find(cmb.repeatEls).each(function (index) {
+      var $element = $(this);
+      var elType = $element.attr("type");
+      var val;
+
+      if ($element.hasClass("cmb2-media-status")) {
+        var toRowId = $element
+          .closest(".cmb-repeatable-grouping")
+          .attr("data-iterator");
+        var fromRowId = inputVals[index].$.closest(
+          ".cmb-repeatable-grouping",
+        ).attr("data-iterator");
+
+        // special case for image previews
+        val = $element.html();
+        $element.html(inputVals[index].val);
+        inputVals[index].$.html(val);
+
+        inputVals[index].$.find("input").each(function () {
+          var name = $(this).attr("name");
+          name = name.replace("[" + toRowId + "]", "[" + fromRowId + "]");
+          $(this).attr("name", name);
+        });
+        $element.find("input").each(function () {
+          var name = $(this).attr("name");
+          name = name.replace("[" + fromRowId + "]", "[" + toRowId + "]");
+          $(this).attr("name", name);
+        });
+      }
+      // handle checkbox swapping
+      else if ("checkbox" === elType) {
+        inputVals[index].$.prop("checked", $element.is(":checked"));
+        $element.prop("checked", inputVals[index].val);
+      }
+      // handle radio swapping
+      else if ("radio" === elType) {
+        if ($element.is(":checked")) {
+          inputVals[index].$.attr("data-checked", "true");
+        }
+        if (inputVals[index].$.is(":checked")) {
+          $element.attr("data-checked", "true");
+        }
+      }
+      // handle select swapping
+      else if ("select" === $element.prop("tagName")) {
+        inputVals[index].$.prop("selected", $element.is(":selected"));
+        $element.prop("selected", inputVals[index].val);
+      }
+      // handle normal input swapping
+      else {
+        inputVals[index].$.val($element.val());
+        $element.val(inputVals[index].val);
+      }
+    });
+
+    $from
+      .find("input[data-checked=true]")
+      .prop("checked", true)
+      .removeAttr("data-checked");
+    $goto
+      .find("input[data-checked=true]")
+      .prop("checked", true)
+      .removeAttr("data-checked");
+
+    // trigger color picker change event
+    $from.find('input[type="text"].cmb2-colorpicker').trigger("change");
+    $goto.find('input[type="text"].cmb2-colorpicker').trigger("change");
+
+    // shift done
+    cmb.triggerElement($this, "cmb2_shift_rows_complete", $this, $from, $goto);
+  };
+
+  cmb.initPickers = function ($timePickers, $datePickers, $colorPickers) {
+    cmb.trigger("cmb_init_pickers", {
+      time: $timePickers,
+      date: $datePickers,
+      color: $colorPickers,
+    });
+
+    // Initialize jQuery UI timepickers
+    cmb.initDateTimePickers($timePickers, "timepicker", "time_picker");
+    // Initialize jQuery UI datepickers
+    cmb.initDateTimePickers($datePickers, "datepicker", "date_picker");
+    // Initialize color picker
+    cmb.initColorPickers($colorPickers);
+  };
+
+  cmb.initDateTimePickers = function ($selector, method, defaultKey) {
+    if ($selector.length) {
+      $selector[method]("destroy").each(function () {
+        var $this = $(this);
+        var fieldOpts = $this.data(method) || {};
+        var options = $.extend({}, cmb.defaults[defaultKey], fieldOpts);
+        $this[method](cmb.datePickerSetupOpts(fieldOpts, options, method));
+      });
+    }
+  };
+
+  cmb.datePickerSetupOpts = function (fieldOpts, options, method) {
+    var existing = $.extend({}, options);
+
+    options.beforeShow = function (input, inst) {
+      if ("timepicker" === method) {
+        cmb.addTimePickerClasses(inst.dpDiv);
+      }
+
+      // Wrap datepicker w/ class to narrow the scope of jQuery UI CSS and prevent conflicts
+      $id("ui-datepicker-div").addClass("cmb2-element");
+
+      // Let's be sure to call beforeShow if it was added
+      if ("function" === typeof existing.beforeShow) {
+        existing.beforeShow(input, inst);
+      }
+    };
+
+    if ("timepicker" === method) {
+      options.onChangeMonthYear = function (year, month, inst, picker) {
+        cmb.addTimePickerClasses(inst.dpDiv);
+
+        // Let's be sure to call onChangeMonthYear if it was added
+        if ("function" === typeof existing.onChangeMonthYear) {
+          existing.onChangeMonthYear(year, month, inst, picker);
+        }
+      };
+    }
+
+    options.onClose = function (dateText, inst) {
+      // Remove the class when we're done with it (and hide to remove FOUC).
+      var $picker = $id("ui-datepicker-div").removeClass("cmb2-element").hide();
+      if ("timepicker" === method && !$(inst.input).val()) {
+        // Set the timepicker field value if it's empty.
+        inst.input.val($picker.find(".ui_tpicker_time").text());
+      }
+
+      // Let's be sure to call onClose if it was added
+      if ("function" === typeof existing.onClose) {
+        existing.onClose(dateText, inst);
+      }
+    };
+
+    return options;
+  };
+
+  // Adds classes to timepicker buttons.
+  cmb.addTimePickerClasses = function ($picker) {
+    var func = cmb.addTimePickerClasses;
+    func.count = func.count || 0;
+
+    // Wait a bit to let the timepicker render, since these are pre-render events.
+    setTimeout(function () {
+      if ($picker.find(".ui-priority-secondary").length) {
+        $picker.find(".ui-priority-secondary").addClass("button-secondary");
+        $picker.find(".ui-priority-primary").addClass("button-primary");
+        func.count = 0;
+      } else if (func.count < 5) {
+        func.count++;
+        func($picker);
+      }
+    }, 10);
+  };
+
+  cmb.initColorPickers = function ($selector) {
+    if (!$selector.length) {
+      return;
+    }
+    if (
+      "object" === typeof jQuery.wp &&
+      "function" === typeof jQuery.wp.wpColorPicker
+    ) {
+      $selector.each(function () {
+        var $this = $(this);
+        var fieldOpts = $this.data("colorpicker") || {};
+        $this.wpColorPicker($.extend({}, cmb.defaults.color_picker, fieldOpts));
+      });
+    } else {
+      $selector
+        .each(function (i) {
+          $(this).after(
+            '<div id="picker-' +
+              i +
+              '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>',
+          );
+          $id("picker-" + i)
+            .hide()
+            .farbtastic($(this));
+        })
+        .focus(function () {
+          $(this).next().show();
+        })
+        .blur(function () {
+          $(this).next().hide();
+        });
+    }
+  };
+
+  cmb.initCodeEditors = function ($selector) {
+    cmb.trigger("cmb_init_code_editors", $selector);
+
+    if (
+      !cmb.defaults.code_editor ||
+      !wp ||
+      !wp.codeEditor ||
+      !$selector.length
+    ) {
+      return;
+    }
+
+    $selector.each(function () {
+      wp.codeEditor.initialize(
+        this.id,
+        cmb.codeEditorArgs($(this).data("codeeditor")),
+      );
+    });
+  };
+
+  cmb.codeEditorArgs = function (overrides) {
+    var props = ["codemirror", "csslint", "jshint", "htmlhint"];
+    var args = $.extend({}, cmb.defaults.code_editor);
+    overrides = overrides || {};
+
+    for (var i = props.length - 1; i >= 0; i--) {
+      if (overrides.hasOwnProperty(props[i])) {
+        args[props[i]] = $.extend(
+          {},
+          args[props[i]] || {},
+          overrides[props[i]],
+        );
+      }
+    }
+
+    return args;
+  };
+
+  cmb.makeListSortable = function () {
+    var $filelist = cmb.metabox().find(".cmb2-media-status.cmb-attach-list");
+    if ($filelist.length) {
+      $filelist.sortable({ cursor: "move" }).disableSelection();
+    }
+  };
+
+  cmb.makeRepeatableSortable = function () {
+    var $repeatables = cmb.metabox().find(".cmb-repeat-table .cmb-field-list");
+
+    if ($repeatables.length) {
+      $repeatables.sortable({
+        items: ".cmb-repeat-row",
+        cursor: "move",
+        // The default "cancel" attributes are: "input,textarea,button,select,option".
+        // We are appending .CodeMirror.
+        // See https://api.jqueryui.com/sortable/#option-cancel
+        cancel: "input,textarea,button,select,option,.CodeMirror",
+      });
+    }
+  };
+
+  cmb.maybeOembed = function (evt) {
+    var $this = $(this);
+
+    var m = {
+      focusout: function () {
+        setTimeout(function () {
+          // if it's been 2 seconds, hide our spinner
+          cmb.spinner(".cmb2-metabox", true);
+        }, 2000);
+      },
+      keyup: function () {
+        var betw = function (min, max) {
+          return evt.which <= max && evt.which >= min;
+        };
+        // Only Ajax on normal keystrokes
+        if (
+          betw(48, 90) ||
+          betw(96, 111) ||
+          betw(8, 9) ||
+          evt.which === 187 ||
+          evt.which === 190
+        ) {
+          // fire our ajax function
+          cmb.doAjax($this, evt);
+        }
+      },
+      paste: function () {
+        // paste event is fired before the value is filled, so wait a bit
+        setTimeout(function () {
+          cmb.doAjax($this);
+        }, 100);
+      },
+    };
+
+    m[evt.type]();
+  };
+
+  /**
+   * Resize oEmbed videos to fit in their respective metaboxes
+   *
+   * @since  0.9.4
+   *
+   * @return {return}
+   */
+  cmb.resizeoEmbeds = function () {
+    cmb.metabox().each(function () {
+      var $this = $(this);
+      var $tableWrap = $this.parents(".inside");
+      var isSide =
+        $this.parents(".inner-sidebar").length ||
+        $this.parents("#side-sortables").length;
+      var isSmall = isSide;
+      var isSmallest = false;
+      if (!$tableWrap.length) {
+        return true; // continue
+      }
+
+      // Calculate new width
+      var tableW = $tableWrap.width();
+
+      if (cmb.styleBreakPoint > tableW) {
+        isSmall = true;
+        isSmallest = cmb.styleBreakPoint - 62 > tableW;
+      }
+
+      tableW = isSmall ? tableW : Math.round($tableWrap.width() * 0.82 * 0.97);
+      var newWidth = tableW - 30;
+      if (isSmall && !isSide && !isSmallest) {
+        newWidth = newWidth - 75;
+      }
+      if (newWidth > 639) {
+        return true; // continue
+      }
+
+      var $embeds = $this.find(".cmb-type-oembed .embed-status");
+      var $children = $embeds.children().not(".cmb2-remove-wrapper");
+      if (!$children.length) {
+        return true; // continue
+      }
+
+      $children.each(function () {
+        var $this = $(this);
+        var iwidth = $this.width();
+        var iheight = $this.height();
+        var _newWidth = newWidth;
+        if ($this.parents(".cmb-repeat-row").length && !isSmall) {
+          // Make room for our repeatable "remove" button column
+          _newWidth = newWidth - 91;
+          _newWidth = 785 > tableW ? _newWidth - 15 : _newWidth;
+        }
+        // Calc new height
+        var newHeight = Math.round((_newWidth * iheight) / iwidth);
+        $this.width(_newWidth).height(newHeight);
+      });
+    });
+  };
+
+  // function for running our ajax
+  cmb.doAjax = function ($obj) {
+    // get typed value
+    var oembed_url = $obj.val();
+    // only proceed if the field contains more than 6 characters
+    if (oembed_url.length < 6) {
+      return;
+    }
+
+    // get field id
+    var field_id = $obj.attr("id");
+    var $context = $obj.closest(".cmb-td");
+    var $embed_container = $context.find(".embed-status");
+    var $embed_wrap = $context.find(".embed_wrap");
+    var $child_el = $embed_container.find(":first-child");
+    var oembed_width =
+      $embed_container.length && $child_el.length
+        ? $child_el.width()
+        : $obj.width();
+
+    cmb.log("oembed_url", oembed_url, field_id);
+
+    // show our spinner
+    cmb.spinner($context);
+    // clear out previous results
+    $embed_wrap.html("");
+    // and run our ajax function
+    setTimeout(function () {
+      // if they haven't typed in 500 ms
+      if ($(".cmb2-oembed:focus").val() !== oembed_url) {
+        return;
+      }
+      $.ajax({
+        type: "post",
+        dataType: "json",
+        url: l10n.ajaxurl,
+        data: {
+          action: "cmb2_oembed_handler",
+          oembed_url: oembed_url,
+          oembed_width: oembed_width > 300 ? oembed_width : 300,
+          field_id: field_id,
+          object_id: $obj.data("objectid"),
+          object_type: $obj.data("objecttype"),
+          cmb2_ajax_nonce: l10n.ajax_nonce,
+        },
+        success: function (response) {
+          cmb.log(response);
+          // hide our spinner
+          cmb.spinner($context, true);
+          // and populate our results from ajax response
+          $embed_wrap.html(response.data);
+        },
+      });
+    }, 500);
+  };
+
+  /**
+   * Gets jQuery object containing all CMB metaboxes. Caches the result.
+   *
+   * @since  1.0.2
+   *
+   * @return {Object} jQuery object containing all CMB metaboxes.
+   */
+  cmb.metabox = function () {
+    if (cmb.$metabox) {
+      return cmb.$metabox;
+    }
+    cmb.$metabox = $(".cmb2-wrap > .cmb2-metabox");
+    return cmb.$metabox;
+  };
+
+  /**
+   * Starts/stops contextual spinner.
+   *
+   * @since  1.0.1
+   *
+   * @param  {object} $context The jQuery parent/context object.
+   * @param  {bool} hide       Whether to hide the spinner (will show by default).
+   *
+   * @return {void}
+   */
+  cmb.spinner = function ($context, hide) {
+    var m = hide ? "removeClass" : "addClass";
+    $(".cmb-spinner", $context)[m]("is-active");
+  };
+
+  /**
+   * Triggers a jQuery event on the document object.
+   *
+   * @since  2.2.3
+   *
+   * @param  {string} evtName The name of the event to trigger.
+   *
+   * @return {void}
+   */
+  cmb.trigger = function (evtName) {
+    var args = Array.prototype.slice.call(arguments, 1);
+    args.push(cmb);
+    $document.trigger(evtName, args);
+  };
+
+  /**
+   * Triggers a jQuery event on the given jQuery object.
+   *
+   * @since  2.2.3
+   *
+   * @param  {object} $el     The jQuery element object.
+   * @param  {string} evtName The name of the event to trigger.
+   *
+   * @return {void}
+   */
+  cmb.triggerElement = function ($el, evtName) {
+    var args = Array.prototype.slice.call(arguments, 2);
+    args.push(cmb);
+    $el.trigger(evtName, args);
+  };
+
+  /**
+   * Get an argument for a given field.
+   *
+   * @since  2.5.0
+   *
+   * @param  {string|object} hash The field hash, id, or a jQuery object for a field.
+   * @param  {string}        arg  The argument to get on the field.
+   *
+   * @return {mixed}              The argument value.
+   */
+  cmb.getFieldArg = function (hash, arg) {
+    return cmb.getField(hash)[arg];
+  };
+
+  /**
+   * Get a field object instances. Can be filtered by passing in a filter callback function.
+   * e.g. `const fileFields = CMB2.getFields(f => 'file' === f.type);`
+   *
+   * @since  2.5.0
+   *
+   * @param  {mixed} filterCb An optional filter callback function.
+   *
+   * @return array            An array of field object instances.
+   */
+  cmb.getFields = function (filterCb) {
+    if ("function" === typeof filterCb) {
+      var fields = [];
+      $.each(l10n.fields, function (hash, field) {
+        if (filterCb(field, hash)) {
+          fields.push(field);
+        }
+      });
+      return fields;
+    }
+
+    return l10n.fields;
+  };
+
+  /**
+   * Get a field object instance by hash or id.
+   *
+   * @since  2.5.0
+   *
+   * @param  {string|object} hash The field hash, id, or a jQuery object for a field.
+   *
+   * @return {object}        The field object or an empty object.
+   */
+  cmb.getField = function (hash) {
+    var field = {};
+    hash = hash instanceof jQuery ? hash.data("hash") : hash;
+    if (hash) {
+      try {
+        if (l10n.fields[hash]) {
+          throw new Error(hash);
+        }
+
+        cmb.getFields(function (field) {
+          if ("function" === typeof hash) {
+            if (hash(field)) {
+              throw new Error(field.hash);
+            }
+          } else if (field.id && field.id === hash) {
+            throw new Error(field.hash);
+          }
+        });
+      } catch (e) {
+        field = l10n.fields[e.message];
+      }
+    }
+
+    return field;
+  };
+
+  /**
+   * Safely log things if query var is set. Accepts same parameters as console.log.
+   *
+   * @since  1.0.0
+   *
+   * @return {void}
+   */
+  cmb.log = function () {
+    if (l10n.script_debug && console && "function" === typeof console.log) {
+      console.log.apply(console, arguments);
+    }
+  };
+
+  /**
+   * Replace the last occurrence of a string.
+   *
+   * @since  2.2.6
+   *
+   * @param  {string} string  String to search/replace.
+   * @param  {string} search  String to search.
+   * @param  {string} replace String to replace search with.
+   *
+   * @return {string}         Possibly modified string.
+   */
+  cmb.replaceLast = function (string, search, replace) {
+    // find the index of last time word was used
+    var n = string.lastIndexOf(search);
+
+    // slice the string in 2, one from the start to the lastIndexOf
+    // and then replace the word in the rest
+    return string.slice(0, n) + string.slice(n).replace(search, replace);
+  };
+
+  // Kick it off!
+  $(cmb.init);
 })(window, document, jQuery, window.CMB2);
diff --git a/public/includes/lib/CMB2/js/wp-color-picker-alpha.js b/public/includes/lib/CMB2/js/wp-color-picker-alpha.js
index 2b4a5cbf..946f32c8 100755
--- a/public/includes/lib/CMB2/js/wp-color-picker-alpha.js
+++ b/public/includes/lib/CMB2/js/wp-color-picker-alpha.js
@@ -8,489 +8,520 @@
  * https://github.com/kallookoo/wp-color-picker-alpha
  * Licensed under the GPLv2 license.
  */
-( function( $ ) {
-	// Prevent double-init.
-	if ( $.wp.wpColorPicker.prototype._hasAlpha ) {
-		return;
-	}
-
-		// Variable for some backgrounds ( grid )
-	var image   = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAAHnlligAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHJJREFUeNpi+P///4EDBxiAGMgCCCAGFB5AADGCRBgYDh48CCRZIJS9vT2QBAggFBkmBiSAogxFBiCAoHogAKIKAlBUYTELAiAmEtABEECk20G6BOmuIl0CIMBQ/IEMkO0myiSSraaaBhZcbkUOs0HuBwDplz5uFJ3Z4gAAAABJRU5ErkJggg==',
-		// html stuff for wpColorPicker copy of the original color-picker.js
-		_after = '<div class="wp-picker-holder" />',
-		_wrap = '<div class="wp-picker-container" />',
-		_button = '<input type="button" class="button button-small" />',
-		// Prevent CSS issues in < WordPress 4.9
-		_deprecated = ( wpColorPickerL10n.current !== undefined );
-		// Declare some global variables when is deprecated or not
-		if ( _deprecated ) {
-			var _before = '<a tabindex="0" class="wp-color-result" />';
-		} else {
-			var _before = '<button type="button" class="button wp-color-result" aria-expanded="false"><span class="wp-color-result-text"></span></button>',
-				_wrappingLabel = '<label></label>',
-				_wrappingLabelText = '<span class="screen-reader-text"></span>';
-		}
-	/**
-	 * Overwrite Color
-	 * for enable support rbga
-	 */
-	Color.fn.toString = function() {
-		if ( this._alpha < 1 )
-			return this.toCSS( 'rgba', this._alpha ).replace( /\s+/g, '' );
-
-		var hex = parseInt( this._color, 10 ).toString( 16 );
-
-		if ( this.error )
-			return '';
-
-		if ( hex.length < 6 )
-			hex = ( '00000' + hex ).substr( -6 );
-
-		return '#' + hex;
-	};
-
-	/**
-	 * Overwrite wpColorPicker
-	 */
-	$.widget( 'wp.wpColorPicker', $.wp.wpColorPicker, {
-		_hasAlpha: true,
-		/**
-		 * @summary Creates the color picker.
-		 *
-		 * Creates the color picker, sets default values, css classes and wraps it all in HTML.
-		 *
-		 * @since 3.5.0
-		 *
-		 * @access private
-		 *
-		 * @returns {void}
-		 */
-		_create: function() {
-			// Return early if Iris support is missing.
-			if ( ! $.support.iris ) {
-				return;
-			}
-
-			var self = this,
-				el = self.element;
-
-			// Override default options with options bound to the element.
-			$.extend( self.options, el.data() );
-
-			// Create a color picker which only allows adjustments to the hue.
-			if ( self.options.type === 'hue' ) {
-				return self._createHueOnly();
-			}
-
-			// Bind the close event.
-			self.close = $.proxy( self.close, self );
-
-			self.initialValue = el.val();
-
-			// Add a CSS class to the input field.
-			el.addClass( 'wp-color-picker' );
-
-			if ( _deprecated ) {
-				el.hide().wrap( _wrap );
-				self.wrap            = el.parent();
-				self.toggler         = $( _before )
-					.insertBefore( el )
-					.css( { backgroundColor : self.initialValue } )
-					.attr( 'title', wpColorPickerL10n.pick )
-					.attr( 'data-current', wpColorPickerL10n.current );
-				self.pickerContainer = $( _after ).insertAfter( el );
-				self.button          = $( _button ).addClass('hidden');
-			} else {
-				/*
-				 * Check if there's already a wrapping label, e.g. in the Customizer.
-				 * If there's no label, add a default one to match the Customizer template.
-				 */
-				if ( ! el.parent( 'label' ).length ) {
-					// Wrap the input field in the default label.
-					el.wrap( _wrappingLabel );
-					// Insert the default label text.
-					self.wrappingLabelText = $( _wrappingLabelText )
-						.insertBefore( el )
-						.text( wpColorPickerL10n.defaultLabel );
-				}
-
-				/*
-				 * At this point, either it's the standalone version or the Customizer
-				 * one, we have a wrapping label to use as hook in the DOM, let's store it.
-				 */
-				self.wrappingLabel = el.parent();
-
-				// Wrap the label in the main wrapper.
-				self.wrappingLabel.wrap( _wrap );
-				// Store a reference to the main wrapper.
-				self.wrap = self.wrappingLabel.parent();
-				// Set up the toggle button and insert it before the wrapping label.
-				self.toggler = $( _before )
-					.insertBefore( self.wrappingLabel )
-					.css( { backgroundColor: self.initialValue } );
-				// Set the toggle button span element text.
-				self.toggler.find( '.wp-color-result-text' ).text( wpColorPickerL10n.pick );
-				// Set up the Iris container and insert it after the wrapping label.
-				self.pickerContainer = $( _after ).insertAfter( self.wrappingLabel );
-				// Store a reference to the Clear/Default button.
-				self.button = $( _button );
-			}
-
-			// Set up the Clear/Default button.
-			if ( self.options.defaultColor ) {
-				self.button.addClass( 'wp-picker-default' ).val( wpColorPickerL10n.defaultString );
-				if ( ! _deprecated ) {
-					self.button.attr( 'aria-label', wpColorPickerL10n.defaultAriaLabel );
-				}
-			} else {
-				self.button.addClass( 'wp-picker-clear' ).val( wpColorPickerL10n.clear );
-				if ( ! _deprecated ) {
-					self.button.attr( 'aria-label', wpColorPickerL10n.clearAriaLabel );
-				}
-			}
-
-			if ( _deprecated ) {
-				el.wrap( '<span class="wp-picker-input-wrap" />' ).after( self.button );
-			} else {
-				// Wrap the wrapping label in its wrapper and append the Clear/Default button.
-				self.wrappingLabel
-					.wrap( '<span class="wp-picker-input-wrap hidden" />' )
-					.after( self.button );
-
-				/*
-				 * The input wrapper now contains the label+input+Clear/Default button.
-				 * Store a reference to the input wrapper: we'll use this to toggle
-				 * the controls visibility.
-				 */
-				self.inputWrapper = el.closest( '.wp-picker-input-wrap' );
-			}
-
-			el.iris( {
-				target: self.pickerContainer,
-				hide: self.options.hide,
-				width: self.options.width,
-				mode: self.options.mode,
-				palettes: self.options.palettes,
-				/**
-				 * @summary Handles the onChange event if one has been defined in the options.
-				 *
-				 * Handles the onChange event if one has been defined in the options and additionally
-				 * sets the background color for the toggler element.
-				 *
-				 * @since 3.5.0
-				 *
-				 * @param {Event} event    The event that's being called.
-				 * @param {HTMLElement} ui The HTMLElement containing the color picker.
-				 *
-				 * @returns {void}
-				 */
-				change: function( event, ui ) {
-					if ( self.options.alpha ) {
-						self.toggler.css( { 'background-image' : 'url(' + image + ')' } );
-						if ( _deprecated ) {
-							self.toggler.html( '<span class="color-alpha" />' );
-						} else {
-							self.toggler.css( {
-								'position' : 'relative'
-							} );
-							if ( self.toggler.find('span.color-alpha').length == 0 ) {
-								self.toggler.append('<span class="color-alpha" />');
-							}
-						}
-
-						self.toggler.find( 'span.color-alpha' ).css( {
-							'width'                     : '30px',
-							'position'                  : 'absolute',
-							'top'                       : 0,
-							'bottom'                    : 0,
-							'left'                      : 0,
-							'border-top-left-radius'    : '2px',
-							'border-bottom-left-radius' : '2px',
-							'background'                : ui.color.toString()
-						} );
-					} else {
-						self.toggler.css( { backgroundColor : ui.color.toString() } );
-					}
-
-					if ( $.isFunction( self.options.change ) ) {
-						self.options.change.call( this, event, ui );
-					}
-				}
-			} );
-
-			el.val( self.initialValue );
-			self._addListeners();
-
-			// Force the color picker to always be closed on initial load.
-			if ( ! self.options.hide ) {
-				self.toggler.click();
-			}
-		},
-		/**
-		 * @summary Binds event listeners to the color picker.
-		 *
-		 * @since 3.5.0
-		 *
-		 * @access private
-		 *
-		 * @returns {void}
-		 */
-		_addListeners: function() {
-			var self = this;
-
-			/**
-			 * @summary Prevent any clicks inside this widget from leaking to the top and closing it.
-			 *
-			 * @since 3.5.0
-			 *
-			 * @param {Event} event The event that's being called.
-			 *
-			 * @returs {void}
-			 */
-			self.wrap.on( 'click.wpcolorpicker', function( event ) {
-				event.stopPropagation();
-			});
-
-			/**
-			 * @summary Open or close the color picker depending on the class.
-			 *
-			 * @since 3.5
-			 */
-			self.toggler.click( function(){
-				if ( self.toggler.hasClass( 'wp-picker-open' ) ) {
-					self.close();
-				} else {
-					self.open();
-				}
-			});
-
-			/**
-			 * @summary Checks if value is empty when changing the color in the color picker.
-			 *
-			 * Checks if value is empty when changing the color in the color picker.
-			 * If so, the background color is cleared.
-			 *
-			 * @since 3.5.0
-			 *
-			 * @param {Event} event The event that's being called.
-			 *
-			 * @returns {void}
-			 */
-			self.element.on( 'change', function( event ) {
-				// Empty or Error = clear
-				if ( $( this ).val() === '' || self.element.hasClass( 'iris-error' ) ) {
-					if ( self.options.alpha ) {
-						if ( _deprecated ) {
-							self.toggler.removeAttr( 'style' );
-						}
-						self.toggler.find( 'span.color-alpha' ).css( 'backgroundColor', '' );
-					} else {
-						self.toggler.css( 'backgroundColor', '' );
-					}
-
-					// fire clear callback if we have one
-					if ( $.isFunction( self.options.clear ) )
-						self.options.clear.call( this, event );
-				}
-			} );
-
-			/**
-			 * @summary Enables the user to clear or revert the color in the color picker.
-			 *
-			 * Enables the user to either clear the color in the color picker or revert back to the default color.
-			 *
-			 * @since 3.5.0
-			 *
-			 * @param {Event} event The event that's being called.
-			 *
-			 * @returns {void}
-			 */
-			self.button.on( 'click', function( event ) {
-				if ( $( this ).hasClass( 'wp-picker-clear' ) ) {
-					self.element.val( '' );
-					if ( self.options.alpha ) {
-						if ( _deprecated ) {
-							self.toggler.removeAttr( 'style' );
-						}
-						self.toggler.find( 'span.color-alpha' ).css( 'backgroundColor', '' );
-					} else {
-						self.toggler.css( 'backgroundColor', '' );
-					}
-
-					if ( $.isFunction( self.options.clear ) )
-						self.options.clear.call( this, event );
-
-				} else if ( $( this ).hasClass( 'wp-picker-default' ) ) {
-					self.element.val( self.options.defaultColor ).change();
-				}
-			});
-		},
-	});
-
-	/**
-	 * Overwrite iris
-	 */
-	$.widget( 'a8c.iris', $.a8c.iris, {
-		_create: function() {
-			this._super();
-
-			// Global option for check is mode rbga is enabled
-			this.options.alpha = this.element.data( 'alpha' ) || false;
-
-			// Is not input disabled
-			if ( ! this.element.is( ':input' ) )
-				this.options.alpha = false;
-
-			if ( typeof this.options.alpha !== 'undefined' && this.options.alpha ) {
-				var self       = this,
-					el         = self.element,
-					_html      = '<div class="iris-strip iris-slider iris-alpha-slider"><div class="iris-slider-offset iris-slider-offset-alpha"></div></div>',
-					aContainer = $( _html ).appendTo( self.picker.find( '.iris-picker-inner' ) ),
-					aSlider    = aContainer.find( '.iris-slider-offset-alpha' ),
-					controls   = {
-						aContainer : aContainer,
-						aSlider    : aSlider
-					};
-
-				if ( typeof el.data( 'custom-width' ) !== 'undefined' ) {
-					self.options.customWidth = parseInt( el.data( 'custom-width' ) ) || 0;
-				} else {
-					self.options.customWidth = 100;
-				}
-
-				// Set default width for input reset
-				self.options.defaultWidth = el.width();
-
-				// Update width for input
-				if ( self._color._alpha < 1 || self._color.toString().indexOf('rgb') != -1 )
-					el.width( parseInt( self.options.defaultWidth + self.options.customWidth ) );
-
-				// Push new controls
-				$.each( controls, function( k, v ) {
-					self.controls[k] = v;
-				} );
-
-				// Change size strip and add margin for sliders
-				self.controls.square.css( { 'margin-right': '0' } );
-				var emptyWidth   = ( self.picker.width() - self.controls.square.width() - 20 ),
-					stripsMargin = ( emptyWidth / 6 ),
-					stripsWidth  = ( ( emptyWidth / 2 ) - stripsMargin );
-
-				$.each( [ 'aContainer', 'strip' ], function( k, v ) {
-					self.controls[v].width( stripsWidth ).css( { 'margin-left' : stripsMargin + 'px' } );
-				} );
-
-				// Add new slider
-				self._initControls();
-
-				// For updated widget
-				self._change();
-			}
-		},
-		_initControls: function() {
-			this._super();
-
-			if ( this.options.alpha ) {
-				var self     = this,
-					controls = self.controls;
-
-				controls.aSlider.slider({
-					orientation : 'vertical',
-					min         : 0,
-					max         : 100,
-					step        : 1,
-					value       : parseInt( self._color._alpha * 100 ),
-					slide       : function( event, ui ) {
-						// Update alpha value
-						self._color._alpha = parseFloat( ui.value / 100 );
-						self._change.apply( self, arguments );
-					}
-				});
-			}
-		},
-		_change: function() {
-			this._super();
-
-			var self = this,
-				el   = self.element;
-
-			if ( this.options.alpha ) {
-				var	controls     = self.controls,
-					alpha        = parseInt( self._color._alpha * 100 ),
-					color        = self._color.toRgb(),
-					gradient     = [
-						'rgb(' + color.r + ',' + color.g + ',' + color.b + ') 0%',
-						'rgba(' + color.r + ',' + color.g + ',' + color.b + ', 0) 100%'
-					],
-					defaultWidth = self.options.defaultWidth,
-					customWidth  = self.options.customWidth,
-					target       = self.picker.closest( '.wp-picker-container' ).find( '.wp-color-result' );
-
-				// Generate background slider alpha, only for CSS3 old browser fuck!! :)
-				controls.aContainer.css( { 'background' : 'linear-gradient(to bottom, ' + gradient.join( ', ' ) + '), url(' + image + ')' } );
-
-				if ( target.hasClass( 'wp-picker-open' ) ) {
-					// Update alpha value
-					controls.aSlider.slider( 'value', alpha );
-
-					/**
-					 * Disabled change opacity in default slider Saturation ( only is alpha enabled )
-					 * and change input width for view all value
-					 */
-					if ( self._color._alpha < 1 ) {
-						controls.strip.attr( 'style', controls.strip.attr( 'style' ).replace( /rgba\(([0-9]+,)(\s+)?([0-9]+,)(\s+)?([0-9]+)(,(\s+)?[0-9\.]+)\)/g, 'rgb($1$3$5)' ) );
-						el.width( parseInt( defaultWidth + customWidth ) );
-					} else {
-						el.width( defaultWidth );
-					}
-				}
-			}
-
-			var reset = el.data( 'reset-alpha' ) || false;
-
-			if ( reset ) {
-				self.picker.find( '.iris-palette-container' ).on( 'click.palette', '.iris-palette', function() {
-					self._color._alpha = 1;
-					self.active        = 'external';
-					self._change();
-				} );
-			}
-		},
-		_addInputListeners: function( input ) {
-			var self            = this,
-				debounceTimeout = 100,
-				callback        = function( event ) {
-					var color = new Color( input.val() ),
-						val   = input.val();
-
-					input.removeClass( 'iris-error' );
-					// we gave a bad color
-					if ( color.error ) {
-						// don't error on an empty input
-						if ( val !== '' )
-							input.addClass( 'iris-error' );
-					} else {
-						if ( color.toString() !== self._color.toString() ) {
-							// let's not do this on keyup for hex shortcodes
-							if ( ! ( event.type === 'keyup' && val.match( /^[0-9a-fA-F]{3}$/ ) ) )
-								self._setOption( 'color', color.toString() );
-						}
-					}
-				};
-
-			input.on( 'change', callback ).on( 'keyup', self._debounce( callback, debounceTimeout ) );
-
-			// If we initialized hidden, show on first focus. The rest is up to you.
-			if ( self.options.hide ) {
-				input.on( 'focus', function() {
-					self.show();
-				} );
-			}
-		}
-	} );
-}( jQuery ) );
+(function ($) {
+  // Prevent double-init.
+  if ($.wp.wpColorPicker.prototype._hasAlpha) {
+    return;
+  }
+
+  // Variable for some backgrounds ( grid )
+  var image =
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAAHnlligAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHJJREFUeNpi+P///4EDBxiAGMgCCCAGFB5AADGCRBgYDh48CCRZIJS9vT2QBAggFBkmBiSAogxFBiCAoHogAKIKAlBUYTELAiAmEtABEECk20G6BOmuIl0CIMBQ/IEMkO0myiSSraaaBhZcbkUOs0HuBwDplz5uFJ3Z4gAAAABJRU5ErkJggg==",
+    // html stuff for wpColorPicker copy of the original color-picker.js
+    _after = '<div class="wp-picker-holder" />',
+    _wrap = '<div class="wp-picker-container" />',
+    _button = '<input type="button" class="button button-small" />',
+    // Prevent CSS issues in < WordPress 4.9
+    _deprecated = wpColorPickerL10n.current !== undefined;
+  // Declare some global variables when is deprecated or not
+  if (_deprecated) {
+    var _before = '<a tabindex="0" class="wp-color-result" />';
+  } else {
+    var _before =
+        '<button type="button" class="button wp-color-result" aria-expanded="false"><span class="wp-color-result-text"></span></button>',
+      _wrappingLabel = "<label></label>",
+      _wrappingLabelText = '<span class="screen-reader-text"></span>';
+  }
+  /**
+   * Overwrite Color
+   * for enable support rbga
+   */
+  Color.fn.toString = function () {
+    if (this._alpha < 1)
+      return this.toCSS("rgba", this._alpha).replace(/\s+/g, "");
+
+    var hex = parseInt(this._color, 10).toString(16);
+
+    if (this.error) return "";
+
+    if (hex.length < 6) hex = ("00000" + hex).substr(-6);
+
+    return "#" + hex;
+  };
+
+  /**
+   * Overwrite wpColorPicker
+   */
+  $.widget("wp.wpColorPicker", $.wp.wpColorPicker, {
+    _hasAlpha: true,
+    /**
+     * @summary Creates the color picker.
+     *
+     * Creates the color picker, sets default values, css classes and wraps it all in HTML.
+     *
+     * @since 3.5.0
+     *
+     * @access private
+     *
+     * @returns {void}
+     */
+    _create: function () {
+      // Return early if Iris support is missing.
+      if (!$.support.iris) {
+        return;
+      }
+
+      var self = this,
+        el = self.element;
+
+      // Override default options with options bound to the element.
+      $.extend(self.options, el.data());
+
+      // Create a color picker which only allows adjustments to the hue.
+      if (self.options.type === "hue") {
+        return self._createHueOnly();
+      }
+
+      // Bind the close event.
+      self.close = $.proxy(self.close, self);
+
+      self.initialValue = el.val();
+
+      // Add a CSS class to the input field.
+      el.addClass("wp-color-picker");
+
+      if (_deprecated) {
+        el.hide().wrap(_wrap);
+        self.wrap = el.parent();
+        self.toggler = $(_before)
+          .insertBefore(el)
+          .css({ backgroundColor: self.initialValue })
+          .attr("title", wpColorPickerL10n.pick)
+          .attr("data-current", wpColorPickerL10n.current);
+        self.pickerContainer = $(_after).insertAfter(el);
+        self.button = $(_button).addClass("hidden");
+      } else {
+        /*
+         * Check if there's already a wrapping label, e.g. in the Customizer.
+         * If there's no label, add a default one to match the Customizer template.
+         */
+        if (!el.parent("label").length) {
+          // Wrap the input field in the default label.
+          el.wrap(_wrappingLabel);
+          // Insert the default label text.
+          self.wrappingLabelText = $(_wrappingLabelText)
+            .insertBefore(el)
+            .text(wpColorPickerL10n.defaultLabel);
+        }
+
+        /*
+         * At this point, either it's the standalone version or the Customizer
+         * one, we have a wrapping label to use as hook in the DOM, let's store it.
+         */
+        self.wrappingLabel = el.parent();
+
+        // Wrap the label in the main wrapper.
+        self.wrappingLabel.wrap(_wrap);
+        // Store a reference to the main wrapper.
+        self.wrap = self.wrappingLabel.parent();
+        // Set up the toggle button and insert it before the wrapping label.
+        self.toggler = $(_before)
+          .insertBefore(self.wrappingLabel)
+          .css({ backgroundColor: self.initialValue });
+        // Set the toggle button span element text.
+        self.toggler.find(".wp-color-result-text").text(wpColorPickerL10n.pick);
+        // Set up the Iris container and insert it after the wrapping label.
+        self.pickerContainer = $(_after).insertAfter(self.wrappingLabel);
+        // Store a reference to the Clear/Default button.
+        self.button = $(_button);
+      }
+
+      // Set up the Clear/Default button.
+      if (self.options.defaultColor) {
+        self.button
+          .addClass("wp-picker-default")
+          .val(wpColorPickerL10n.defaultString);
+        if (!_deprecated) {
+          self.button.attr("aria-label", wpColorPickerL10n.defaultAriaLabel);
+        }
+      } else {
+        self.button.addClass("wp-picker-clear").val(wpColorPickerL10n.clear);
+        if (!_deprecated) {
+          self.button.attr("aria-label", wpColorPickerL10n.clearAriaLabel);
+        }
+      }
+
+      if (_deprecated) {
+        el.wrap('<span class="wp-picker-input-wrap" />').after(self.button);
+      } else {
+        // Wrap the wrapping label in its wrapper and append the Clear/Default button.
+        self.wrappingLabel
+          .wrap('<span class="wp-picker-input-wrap hidden" />')
+          .after(self.button);
+
+        /*
+         * The input wrapper now contains the label+input+Clear/Default button.
+         * Store a reference to the input wrapper: we'll use this to toggle
+         * the controls visibility.
+         */
+        self.inputWrapper = el.closest(".wp-picker-input-wrap");
+      }
+
+      el.iris({
+        target: self.pickerContainer,
+        hide: self.options.hide,
+        width: self.options.width,
+        mode: self.options.mode,
+        palettes: self.options.palettes,
+        /**
+         * @summary Handles the onChange event if one has been defined in the options.
+         *
+         * Handles the onChange event if one has been defined in the options and additionally
+         * sets the background color for the toggler element.
+         *
+         * @since 3.5.0
+         *
+         * @param {Event} event    The event that's being called.
+         * @param {HTMLElement} ui The HTMLElement containing the color picker.
+         *
+         * @returns {void}
+         */
+        change: function (event, ui) {
+          if (self.options.alpha) {
+            self.toggler.css({ "background-image": "url(" + image + ")" });
+            if (_deprecated) {
+              self.toggler.html('<span class="color-alpha" />');
+            } else {
+              self.toggler.css({
+                position: "relative",
+              });
+              if (self.toggler.find("span.color-alpha").length == 0) {
+                self.toggler.append('<span class="color-alpha" />');
+              }
+            }
+
+            self.toggler.find("span.color-alpha").css({
+              width: "30px",
+              position: "absolute",
+              top: 0,
+              bottom: 0,
+              left: 0,
+              "border-top-left-radius": "2px",
+              "border-bottom-left-radius": "2px",
+              background: ui.color.toString(),
+            });
+          } else {
+            self.toggler.css({ backgroundColor: ui.color.toString() });
+          }
+
+          if ($.isFunction(self.options.change)) {
+            self.options.change.call(this, event, ui);
+          }
+        },
+      });
+
+      el.val(self.initialValue);
+      self._addListeners();
+
+      // Force the color picker to always be closed on initial load.
+      if (!self.options.hide) {
+        self.toggler.click();
+      }
+    },
+    /**
+     * @summary Binds event listeners to the color picker.
+     *
+     * @since 3.5.0
+     *
+     * @access private
+     *
+     * @returns {void}
+     */
+    _addListeners: function () {
+      var self = this;
+
+      /**
+       * @summary Prevent any clicks inside this widget from leaking to the top and closing it.
+       *
+       * @since 3.5.0
+       *
+       * @param {Event} event The event that's being called.
+       *
+       * @returs {void}
+       */
+      self.wrap.on("click.wpcolorpicker", function (event) {
+        event.stopPropagation();
+      });
+
+      /**
+       * @summary Open or close the color picker depending on the class.
+       *
+       * @since 3.5
+       */
+      self.toggler.click(function () {
+        if (self.toggler.hasClass("wp-picker-open")) {
+          self.close();
+        } else {
+          self.open();
+        }
+      });
+
+      /**
+       * @summary Checks if value is empty when changing the color in the color picker.
+       *
+       * Checks if value is empty when changing the color in the color picker.
+       * If so, the background color is cleared.
+       *
+       * @since 3.5.0
+       *
+       * @param {Event} event The event that's being called.
+       *
+       * @returns {void}
+       */
+      self.element.on("change", function (event) {
+        // Empty or Error = clear
+        if ($(this).val() === "" || self.element.hasClass("iris-error")) {
+          if (self.options.alpha) {
+            if (_deprecated) {
+              self.toggler.removeAttr("style");
+            }
+            self.toggler.find("span.color-alpha").css("backgroundColor", "");
+          } else {
+            self.toggler.css("backgroundColor", "");
+          }
+
+          // fire clear callback if we have one
+          if ($.isFunction(self.options.clear))
+            self.options.clear.call(this, event);
+        }
+      });
+
+      /**
+       * @summary Enables the user to clear or revert the color in the color picker.
+       *
+       * Enables the user to either clear the color in the color picker or revert back to the default color.
+       *
+       * @since 3.5.0
+       *
+       * @param {Event} event The event that's being called.
+       *
+       * @returns {void}
+       */
+      self.button.on("click", function (event) {
+        if ($(this).hasClass("wp-picker-clear")) {
+          self.element.val("");
+          if (self.options.alpha) {
+            if (_deprecated) {
+              self.toggler.removeAttr("style");
+            }
+            self.toggler.find("span.color-alpha").css("backgroundColor", "");
+          } else {
+            self.toggler.css("backgroundColor", "");
+          }
+
+          if ($.isFunction(self.options.clear))
+            self.options.clear.call(this, event);
+        } else if ($(this).hasClass("wp-picker-default")) {
+          self.element.val(self.options.defaultColor).change();
+        }
+      });
+    },
+  });
+
+  /**
+   * Overwrite iris
+   */
+  $.widget("a8c.iris", $.a8c.iris, {
+    _create: function () {
+      this._super();
+
+      // Global option for check is mode rbga is enabled
+      this.options.alpha = this.element.data("alpha") || false;
+
+      // Is not input disabled
+      if (!this.element.is(":input")) this.options.alpha = false;
+
+      if (typeof this.options.alpha !== "undefined" && this.options.alpha) {
+        var self = this,
+          el = self.element,
+          _html =
+            '<div class="iris-strip iris-slider iris-alpha-slider"><div class="iris-slider-offset iris-slider-offset-alpha"></div></div>',
+          aContainer = $(_html).appendTo(
+            self.picker.find(".iris-picker-inner"),
+          ),
+          aSlider = aContainer.find(".iris-slider-offset-alpha"),
+          controls = {
+            aContainer: aContainer,
+            aSlider: aSlider,
+          };
+
+        if (typeof el.data("custom-width") !== "undefined") {
+          self.options.customWidth = parseInt(el.data("custom-width")) || 0;
+        } else {
+          self.options.customWidth = 100;
+        }
+
+        // Set default width for input reset
+        self.options.defaultWidth = el.width();
+
+        // Update width for input
+        if (
+          self._color._alpha < 1 ||
+          self._color.toString().indexOf("rgb") != -1
+        )
+          el.width(
+            parseInt(self.options.defaultWidth + self.options.customWidth),
+          );
+
+        // Push new controls
+        $.each(controls, function (k, v) {
+          self.controls[k] = v;
+        });
+
+        // Change size strip and add margin for sliders
+        self.controls.square.css({ "margin-right": "0" });
+        var emptyWidth =
+            self.picker.width() - self.controls.square.width() - 20,
+          stripsMargin = emptyWidth / 6,
+          stripsWidth = emptyWidth / 2 - stripsMargin;
+
+        $.each(["aContainer", "strip"], function (k, v) {
+          self.controls[v]
+            .width(stripsWidth)
+            .css({ "margin-left": stripsMargin + "px" });
+        });
+
+        // Add new slider
+        self._initControls();
+
+        // For updated widget
+        self._change();
+      }
+    },
+    _initControls: function () {
+      this._super();
+
+      if (this.options.alpha) {
+        var self = this,
+          controls = self.controls;
+
+        controls.aSlider.slider({
+          orientation: "vertical",
+          min: 0,
+          max: 100,
+          step: 1,
+          value: parseInt(self._color._alpha * 100),
+          slide: function (event, ui) {
+            // Update alpha value
+            self._color._alpha = parseFloat(ui.value / 100);
+            self._change.apply(self, arguments);
+          },
+        });
+      }
+    },
+    _change: function () {
+      this._super();
+
+      var self = this,
+        el = self.element;
+
+      if (this.options.alpha) {
+        var controls = self.controls,
+          alpha = parseInt(self._color._alpha * 100),
+          color = self._color.toRgb(),
+          gradient = [
+            "rgb(" + color.r + "," + color.g + "," + color.b + ") 0%",
+            "rgba(" + color.r + "," + color.g + "," + color.b + ", 0) 100%",
+          ],
+          defaultWidth = self.options.defaultWidth,
+          customWidth = self.options.customWidth,
+          target = self.picker
+            .closest(".wp-picker-container")
+            .find(".wp-color-result");
+
+        // Generate background slider alpha, only for CSS3 old browser fuck!! :)
+        controls.aContainer.css({
+          background:
+            "linear-gradient(to bottom, " +
+            gradient.join(", ") +
+            "), url(" +
+            image +
+            ")",
+        });
+
+        if (target.hasClass("wp-picker-open")) {
+          // Update alpha value
+          controls.aSlider.slider("value", alpha);
+
+          /**
+           * Disabled change opacity in default slider Saturation ( only is alpha enabled )
+           * and change input width for view all value
+           */
+          if (self._color._alpha < 1) {
+            controls.strip.attr(
+              "style",
+              controls.strip
+                .attr("style")
+                .replace(
+                  /rgba\(([0-9]+,)(\s+)?([0-9]+,)(\s+)?([0-9]+)(,(\s+)?[0-9\.]+)\)/g,
+                  "rgb($1$3$5)",
+                ),
+            );
+            el.width(parseInt(defaultWidth + customWidth));
+          } else {
+            el.width(defaultWidth);
+          }
+        }
+      }
+
+      var reset = el.data("reset-alpha") || false;
+
+      if (reset) {
+        self.picker
+          .find(".iris-palette-container")
+          .on("click.palette", ".iris-palette", function () {
+            self._color._alpha = 1;
+            self.active = "external";
+            self._change();
+          });
+      }
+    },
+    _addInputListeners: function (input) {
+      var self = this,
+        debounceTimeout = 100,
+        callback = function (event) {
+          var color = new Color(input.val()),
+            val = input.val();
+
+          input.removeClass("iris-error");
+          // we gave a bad color
+          if (color.error) {
+            // don't error on an empty input
+            if (val !== "") input.addClass("iris-error");
+          } else {
+            if (color.toString() !== self._color.toString()) {
+              // let's not do this on keyup for hex shortcodes
+              if (!(event.type === "keyup" && val.match(/^[0-9a-fA-F]{3}$/)))
+                self._setOption("color", color.toString());
+            }
+          }
+        };
+
+      input
+        .on("change", callback)
+        .on("keyup", self._debounce(callback, debounceTimeout));
+
+      // If we initialized hidden, show on first focus. The rest is up to you.
+      if (self.options.hide) {
+        input.on("focus", function () {
+          self.show();
+        });
+      }
+    },
+  });
+})(jQuery);
 
 // Auto Call plugin is class is color-picker
-jQuery( document ).ready( function( $ ) {
-	$( '.color-picker' ).wpColorPicker();
-} );
+jQuery(document).ready(function ($) {
+  $(".color-picker").wpColorPicker();
+});
diff --git a/public/includes/lib/drag-drop-featured-image/assets/scripts/drag-drop-uploader.js b/public/includes/lib/drag-drop-featured-image/assets/scripts/drag-drop-uploader.js
index 86f4dd99..905c5f3a 100644
--- a/public/includes/lib/drag-drop-featured-image/assets/scripts/drag-drop-uploader.js
+++ b/public/includes/lib/drag-drop-featured-image/assets/scripts/drag-drop-uploader.js
@@ -1,126 +1,120 @@
-jQuery(document).ready(function($){
-
-	var uploadContainer = $('#drag_to_upload');
-
-	// Media Library button hook (WP >= 3.5):
-	$('a#dgd_library_button').click(function(e){
-
-		// Prevent default:
-		e.preventDefault();
-
-		// Set frame object:
-		var frame = wp.media({
-			id: 'dgd_featured_image',
-			title : dgd_strings.panel.title,
-			multiple : true,
-			library : { type : 'image'},
-			button : { text : dgd_strings.panel.button }
-		});
-
-		// On select image:
-		frame.on('select', function(){
-			var attachment = frame.state().get('selection').first().toJSON();
-			doSetFeaturedImage(attachment.id);
-		});
-
-		// Display:
-		frame.open();
-
-	});
-
-
-	// Set as featured image hook (WP < 3.5):
-	$('body').on('click', 'a.wp-post-thumbnail', function(e){
-		parent.tb_remove();
-		parent.location.reload(1);
-	});
-
-	// Remove featured image:
-	uploadContainer.on('click', '#remove-post-thumbnail', function (){
-		$('#current-uploaded-image').slideUp('medium');
-		updateHotspotImages('');
-	});
-
-
-	// Set featured image:
-	function doSetFeaturedImage(attachmentID){
-		$.post(ajaxurl, {
-			action: 'dgd_set_featured_image',
-			postID: dgd_post_id,
-			attachmentID: attachmentID
-		}, function (response){
-			var response = $.parseJSON(response);
-			if (response.response_code == 200){
-
-				// Publish post:
-				if (dgd_page_reload){
-					$('div#publishing-action input#publish').trigger('click');
-				}
-
-				// Fetch image:
-				doFetchFeaturedImage();
-
-			} else {
-				alert(response.response_content);
-			}
-		});
-	}
-
-
-	// Fetch featured image function:
-	function doFetchFeaturedImage(){
-		$.post(ajaxurl, {
-			action: 'dgd_get_featured_image',
-			post_id: dgd_post_id
-		}, function (response){
-
-			// Parse response AS JSON:
-			var response = $.parseJSON(response);
-
-			// Valid response:
-			if (response.response_code == 200){
-
-				// Find current image and continue:
-				$('#current-uploaded-image').slideUp('medium', function(){
-
-					// Update image with new info:
-					var imageObject = uploadContainer.find('div.inside img.attachment-full');
-					imageObject.removeAttr('width');
-					imageObject.removeAttr('height');
-					imageObject.removeAttr('title');
-					imageObject.removeAttr('alt');
-					imageObject.removeAttr('srcset');
-					imageObject.removeAttr('sizes');
-					imageObject.attr('src', response.response_content);
-
-					// Hide container:
-					imageObject.load(function(){
-
-						// Display container:
-						$('#current-uploaded-image').slideDown('medium');
-
-						// Fade in upload container:
-						$('div#plupload-upload-ui').fadeIn('medium');
-						$('#uploaderSection .loading').fadeOut('medium');
-
-					});
-					updateHotspotImages(imageObject.attr('src'));
-				});
-			} else {
-				alert(response.response_content);
-			}
-
-		});
-	}
-
-
-	function updateHotspotImages(src) {
-		var fields = $('input[name$="[coordinates]"]');
-
-		fields.each(function(){
-			$(this).attr('data-image-url', src);
-		});
-
-	}
-
-});
\ No newline at end of file
+jQuery(document).ready(function ($) {
+  var uploadContainer = $("#drag_to_upload");
+
+  // Media Library button hook (WP >= 3.5):
+  $("a#dgd_library_button").click(function (e) {
+    // Prevent default:
+    e.preventDefault();
+
+    // Set frame object:
+    var frame = wp.media({
+      id: "dgd_featured_image",
+      title: dgd_strings.panel.title,
+      multiple: true,
+      library: { type: "image" },
+      button: { text: dgd_strings.panel.button },
+    });
+
+    // On select image:
+    frame.on("select", function () {
+      var attachment = frame.state().get("selection").first().toJSON();
+      doSetFeaturedImage(attachment.id);
+    });
+
+    // Display:
+    frame.open();
+  });
+
+  // Set as featured image hook (WP < 3.5):
+  $("body").on("click", "a.wp-post-thumbnail", function (e) {
+    parent.tb_remove();
+    parent.location.reload(1);
+  });
+
+  // Remove featured image:
+  uploadContainer.on("click", "#remove-post-thumbnail", function () {
+    $("#current-uploaded-image").slideUp("medium");
+    updateHotspotImages("");
+  });
+
+  // Set featured image:
+  function doSetFeaturedImage(attachmentID) {
+    $.post(
+      ajaxurl,
+      {
+        action: "dgd_set_featured_image",
+        postID: dgd_post_id,
+        nonce: dgd_set_featured_image_nonce,
+        attachmentID: attachmentID,
+      },
+      function (response) {
+        var response = $.parseJSON(response);
+        if (response.response_code == 200) {
+          // Publish post:
+          if (dgd_page_reload) {
+            $("div#publishing-action input#publish").trigger("click");
+          }
+
+          // Fetch image:
+          doFetchFeaturedImage();
+        } else {
+          alert(response.response_content);
+        }
+      },
+    );
+  }
+
+  // Fetch featured image function:
+  function doFetchFeaturedImage() {
+    $.post(
+      ajaxurl,
+      {
+        action: "dgd_get_featured_image",
+        post_id: dgd_post_id,
+      },
+      function (response) {
+        // Parse response AS JSON:
+        var response = $.parseJSON(response);
+
+        // Valid response:
+        if (response.response_code == 200) {
+          // Find current image and continue:
+          $("#current-uploaded-image").slideUp("medium", function () {
+            // Update image with new info:
+            var imageObject = uploadContainer.find(
+              "div.inside img.attachment-full",
+            );
+            imageObject.removeAttr("width");
+            imageObject.removeAttr("height");
+            imageObject.removeAttr("title");
+            imageObject.removeAttr("alt");
+            imageObject.removeAttr("srcset");
+            imageObject.removeAttr("sizes");
+            imageObject.attr("src", response.response_content);
+
+            // Hide container:
+            imageObject.load(function () {
+              // Display container:
+              $("#current-uploaded-image").slideDown("medium");
+
+              // Fade in upload container:
+              $("div#plupload-upload-ui").fadeIn("medium");
+              $("#uploaderSection .loading").fadeOut("medium");
+            });
+            updateHotspotImages(imageObject.attr("src"));
+          });
+        } else {
+          alert(response.response_content);
+        }
+      },
+    );
+  }
+
+  function updateHotspotImages(src) {
+    var fields = $('input[name$="[coordinates]"]');
+
+    fields.each(function () {
+      $(this).attr("data-image-url", src);
+    });
+  }
+});
diff --git a/public/includes/lib/drag-drop-featured-image/assets/scripts/drag-to-feature.js b/public/includes/lib/drag-drop-featured-image/assets/scripts/drag-to-feature.js
index f1a72908..6e3cd432 100644
--- a/public/includes/lib/drag-drop-featured-image/assets/scripts/drag-to-feature.js
+++ b/public/includes/lib/drag-drop-featured-image/assets/scripts/drag-to-feature.js
@@ -1,13 +1,14 @@
-jQuery(document).ready(function($){
-	
-	// Load iOS Switch script:
-	$('input.iOSToggle').iToggle();
-	
-	// Info panel blob jump:
-	$('div.blobContainer img').hover(function(){
-		$(this).stop(true, false).fadeTo(200, 1.0);
-	}, function(){
-		$(this).stop(true, false).fadeTo(200, 0.7);
-	});
-	
-});
\ No newline at end of file
+jQuery(document).ready(function ($) {
+  // Load iOS Switch script:
+  $("input.iOSToggle").iToggle();
+
+  // Info panel blob jump:
+  $("div.blobContainer img").hover(
+    function () {
+      $(this).stop(true, false).fadeTo(200, 1.0);
+    },
+    function () {
+      $(this).stop(true, false).fadeTo(200, 0.7);
+    },
+  );
+});
diff --git a/public/includes/lib/drag-drop-featured-image/assets/views/options.php b/public/includes/lib/drag-drop-featured-image/assets/views/options.php
index b39bf9f0..de01c297 100644
--- a/public/includes/lib/drag-drop-featured-image/assets/views/options.php
+++ b/public/includes/lib/drag-drop-featured-image/assets/views/options.php
@@ -3,46 +3,46 @@
 	<h2><?php echo get_admin_page_title(); ?></h2>
 	
 	<?php
-	
+
 		// Check for POST request:
-		if (isset($_POST['updatePluginSettings'])){
-		
-			// Check that everything is set:
-			if ($_POST['file_types'] && !empty($_POST['post_types'])){
-				
-				// Update post types:
-				$selected = $_POST['post_types'];
-				update_option('drag-drop-post-types', $selected);
-				
-				// Update formats:
-				$selected = $_POST['file_types'];
-				update_option('drag-drop-file-types', $selected);
-				
-				// Update user capability:
-				if (isset($_POST['user_capability']) && $_POST['user_capability']){
-					update_option('drag-drop-user-capability', $_POST['user_capability']);
-				} else {
-					update_option('drag-drop-user-capability', 'manage_options');
-				}
-
-				// Update page reload:
-				if (isset($_POST['page_reload']) && $_POST['page_reload'] == 'checked'){
-					update_option('drag-drop-page-reload', 1);
-				} else {
-					update_option('drag-drop-page-reload', 0);
-				}
-				
-				// Show message:
-				echo '<div id="message" style="margin-top: 10px;" class="updated"><p><strong>'.__('Success:', $this->plugin_locale).'</strong> '.__('The plugin options have been successfully updated!', $this->plugin_locale).'</p></div>';
-				
+	if ( isset( $_POST['updatePluginSettings'] ) ) {
+
+		// Check that everything is set:
+		if ( $_POST['file_types'] && ! empty( $_POST['post_types'] ) ) {
+
+			// Update post types:
+			$selected = $_POST['post_types'];
+			update_option( 'drag-drop-post-types', $selected );
+
+			// Update formats:
+			$selected = $_POST['file_types'];
+			update_option( 'drag-drop-file-types', $selected );
+
+			// Update user capability:
+			if ( isset( $_POST['user_capability'] ) && $_POST['user_capability'] ) {
+				update_option( 'drag-drop-user-capability', $_POST['user_capability'] );
 			} else {
-				
-				// Show message:
-				echo '<div id="message" style="margin-top: 10px;" class="error"><p>'.__('Please make sure you filled in all the required fields before submitting. At least <em><strong>one post type</strong></em> and <em><strong>one extension</strong></em> must be selected!', $this->plugin_locale).'</p></div>';
-				
+				update_option( 'drag-drop-user-capability', 'manage_options' );
+			}
+
+			// Update page reload:
+			if ( isset( $_POST['page_reload'] ) && $_POST['page_reload'] == 'checked' ) {
+				update_option( 'drag-drop-page-reload', 1 );
+			} else {
+				update_option( 'drag-drop-page-reload', 0 );
 			}
+
+			// Show message:
+			echo '<div id="message" style="margin-top: 10px;" class="updated"><p><strong>' . __( 'Success:', $this->plugin_locale ) . '</strong> ' . __( 'The plugin options have been successfully updated!', $this->plugin_locale ) . '</p></div>';
+
+		} else {
+
+			// Show message:
+			echo '<div id="message" style="margin-top: 10px;" class="error"><p>' . __( 'Please make sure you filled in all the required fields before submitting. At least <em><strong>one post type</strong></em> and <em><strong>one extension</strong></em> must be selected!', $this->plugin_locale ) . '</p></div>';
+
 		}
-		
+	}
+
 	?>
 	
 	<div id="drag-to-feature-image" class="metabox-holder has-right-sidebar">
@@ -51,14 +51,14 @@
 		<div class="inner-sidebar">
 		
 			<div id="contact-me" class="postbox">
-				<h3><span><?php _e('Contact me', $this->plugin_locale); ?></span></h3>
+				<h3><span><?php _e( 'Contact me', $this->plugin_locale ); ?></span></h3>
 				<div class="inside">
-					<p><?php _e('If you have any questions regarding this plugin or have ideas on how to improve it then please dont hesitate to', $this->plugin_locale); ?> <a href="mailto:info@jonathanlundstrom.me"><?php _e('contact me', $this->plugin_locale); ?>.</a></p>
+					<p><?php _e( 'If you have any questions regarding this plugin or have ideas on how to improve it then please dont hesitate to', $this->plugin_locale ); ?> <a href="mailto:info@jonathanlundstrom.me"><?php _e( 'contact me', $this->plugin_locale ); ?>.</a></p>
 					<div class="blobContainer contact-me">
-						<a href="mailto:info@jonathanlundstrom.me" title="<?php _e('Send me an email', $this->plugin_locale); ?>"><img src="<?php echo $this->plugin_directory; ?>assets/images/blob-email.png" alt="" /></a>
-						<a target="_blank" href="https://www.facebook.com/jonathanlundstrom" title="<?php _e('Find me on Facebook', $this->plugin_locale); ?>"><img src="<?php echo $this->plugin_directory; ?>assets/images/blob-facebook.png" alt="" /></a>
-						<a target="_blank" href="https://twitter.com/Plizzo" title="<?php _e('Find me on Twitter', $this->plugin_locale); ?>"><img src="<?php echo $this->plugin_directory; ?>assets/images/blob-twitter.png" alt="" /></a>
-						<a target="_blank" href="https://plus.google.com/111226368568418280015" title="<?php _e('Find me on Google+', $this->plugin_locale); ?>"><img class="last" src="<?php echo $this->plugin_directory; ?>assets/images/blob-googleplus.png" alt="" /></a>
+						<a href="mailto:info@jonathanlundstrom.me" title="<?php _e( 'Send me an email', $this->plugin_locale ); ?>"><img src="<?php echo $this->plugin_directory; ?>assets/images/blob-email.png" alt="" /></a>
+						<a target="_blank" href="https://www.facebook.com/jonathanlundstrom" title="<?php _e( 'Find me on Facebook', $this->plugin_locale ); ?>"><img src="<?php echo $this->plugin_directory; ?>assets/images/blob-facebook.png" alt="" /></a>
+						<a target="_blank" href="https://twitter.com/Plizzo" title="<?php _e( 'Find me on Twitter', $this->plugin_locale ); ?>"><img src="<?php echo $this->plugin_directory; ?>assets/images/blob-twitter.png" alt="" /></a>
+						<a target="_blank" href="https://plus.google.com/111226368568418280015" title="<?php _e( 'Find me on Google+', $this->plugin_locale ); ?>"><img class="last" src="<?php echo $this->plugin_directory; ?>assets/images/blob-googleplus.png" alt="" /></a>
 					</div>
 				</div>
 			</div>
@@ -70,22 +70,22 @@
 		
 				<!-- Meta box -->
 				<div id="manage-plugin-options" class="postbox">
-					<h3 class="hndle"><span><?php _e('Available options:', $this->plugin_locale); ?></span></h3>
+					<h3 class="hndle"><span><?php _e( 'Available options:', $this->plugin_locale ); ?></span></h3>
 					<div id="itoggle" class="inside" style="padding: 20px 30px;">
 						<form action="" method="post">
 
 							<div class="metaBoxRow">
-								<strong><?php _e('Which post types do you want the meta box to display at?', $this->plugin_locale); ?></strong><br />
+								<strong><?php _e( 'Which post types do you want the meta box to display at?', $this->plugin_locale ); ?></strong><br />
 								<div class="containerDiv" style="margin: 2px 0px 0px 0px; overflow: hidden;">
-									<?php $post_types = get_post_types(array( 'show_ui' => true )); ?>
+									<?php $post_types = get_post_types( array( 'show_ui' => true ) ); ?>
 									<?php $selected = $this->get_option_post_types(); ?>
 									<div class="objectRow">
-										<?php foreach ($post_types as $type): ?>
-											<?php if ($type !== 'attachment'): ?>
-												<?php $checked = (in_array($type, $selected)) ? 'checked="checked"' : ''; ?>
+										<?php foreach ( $post_types as $type ) : ?>
+											<?php if ( $type !== 'attachment' ) : ?>
+												<?php $checked = ( in_array( $type, $selected ) ) ? 'checked="checked"' : ''; ?>
 												<div class="toggleObject itoggle">
 													<input class="iOSToggle" name="post_types[]" <?php echo $checked; ?> type="checkbox" id="type_<?php echo $type; ?>" value="<?php echo $type; ?>" />
-													<p><?php echo ucfirst($type); ?></p>
+													<p><?php echo ucfirst( $type ); ?></p>
 												</div>
 											<?php endif; ?>
 										<?php endforeach; ?>
@@ -94,34 +94,34 @@
 							</div>
 
 							<div class="metaBoxRow">
-								<strong><?php _e('Which of the following file types should be supported?', $this->plugin_locale); ?></strong><br />
+								<strong><?php _e( 'Which of the following file types should be supported?', $this->plugin_locale ); ?></strong><br />
 								<div class="containerDiv" style="margin: 2px 0px 0px 0px; overflow: hidden;">
 									<?php $selected = $this->get_option_file_types(); ?>
-									<?php $file_types = array('jpg', 'jpeg', 'png', 'gif'); ?>
+									<?php $file_types = array( 'jpg', 'jpeg', 'png', 'gif' ); ?>
 									<div class="objectRow">
-										<?php foreach ($file_types as $ft): ?>
-											<?php $checked = (in_array($ft, $selected)) ? 'checked="checked"' : ''; ?>
+										<?php foreach ( $file_types as $ft ) : ?>
+											<?php $checked = ( in_array( $ft, $selected ) ) ? 'checked="checked"' : ''; ?>
 											<div class="toggleObject">
 												<input class="iOSToggle" name="file_types[]" <?php echo $checked; ?> type="checkbox" id="filetype_<?php echo $ft; ?>" value="<?php echo $ft; ?>" />
-												<p><?php echo strtoupper($ft); ?></p>
+												<p><?php echo strtoupper( $ft ); ?></p>
 											</div>
 										<?php endforeach; ?>
 									</div>
 								</div>
 							</div>
 
-							<?php if (current_user_can('manage_options')): ?>
+							<?php if ( current_user_can( 'manage_options' ) ) : ?>
 								<div class="metaBoxRow">
-									<strong><?php _e('Change the capability required to customize the plugin settings', $this->plugin_locale); ?></strong><br />
-									<small><em><?php _e('The default capability is <code>manage_options</code> and applies to administrators.', $this->plugin_locale); ?></em></small><br />
+									<strong><?php _e( 'Change the capability required to customize the plugin settings', $this->plugin_locale ); ?></strong><br />
+									<small><em><?php _e( 'The default capability is <code>manage_options</code> and applies to administrators.', $this->plugin_locale ); ?></em></small><br />
 									<input class="filesizeLimit" style="width: 275px;" type="text" name="user_capability" placeholder="manage_options" value="<?php echo $this->get_option_user_capability(); ?>" />
-									<small>&nbsp;&nbsp;<a href="http://codex.wordpress.org/Roles_and_Capabilities" target="_blank"><?php _e('User roles &amp; capabilities', $this->plugin_locale); ?> &raquo;</a></small>
+									<small>&nbsp;&nbsp;<a href="http://codex.wordpress.org/Roles_and_Capabilities" target="_blank"><?php _e( 'User roles &amp; capabilities', $this->plugin_locale ); ?> &raquo;</a></small>
 								</div>
 							<?php endif; ?>
 
 							<div class="metaBoxRow">
-								<strong><?php _e('Publish / update post after successful image upload?', $this->plugin_locale); ?></strong><br />
-								<small><em><?php _e('If you like some users upload the featured image as the last step when publishing a post, this option is for you.', $this->plugin_locale); ?></em></small><br />
+								<strong><?php _e( 'Publish / update post after successful image upload?', $this->plugin_locale ); ?></strong><br />
+								<small><em><?php _e( 'If you like some users upload the featured image as the last step when publishing a post, this option is for you.', $this->plugin_locale ); ?></em></small><br />
 								<div class="containerDiv" style="margin: 2px 0px 0px 0px; overflow: hidden;">
 									<div class="objectRow">
 										<?php $checked = $this->get_option_page_reload() ? 'checked="checked"' : ''; ?>
@@ -133,7 +133,7 @@
 							</div>
 
 							<div class="metaBoxRow last">
-								<input type="submit" name="updatePluginSettings" class="button-secondary" value="<?php _e('Update settings', $this->plugin_locale); ?>" />
+								<input type="submit" name="updatePluginSettings" class="button-secondary" value="<?php _e( 'Update settings', $this->plugin_locale ); ?>" />
 							</div>
 
 						</form>
diff --git a/public/includes/lib/drag-drop-featured-image/index.php b/public/includes/lib/drag-drop-featured-image/index.php
index 2b7f9221..e58a90d0 100644
--- a/public/includes/lib/drag-drop-featured-image/index.php
+++ b/public/includes/lib/drag-drop-featured-image/index.php
@@ -21,226 +21,247 @@
 	 * Initiate plugin.
 	 */
 	global $drag_drop_featured_image_map;
-	$drag_drop_featured_image_map = new WP_Drag_Drop_Featured_Image_Map;
+	$drag_drop_featured_image_map = new WP_Drag_Drop_Featured_Image_Map();
 
-	class WP_Drag_Drop_Featured_Image_Map {
+class WP_Drag_Drop_Featured_Image_Map {
 
-		/**
-		 * Plugin constructor.
-		 */
-		public function __construct(){
-
-			// Globalize:
-			global $wp_version;
+	public $plugin_locale;
+	public $plugin_options_slug;
+	public $plugin_dirname;
+	public $plugin_directory;
+	public $selected_post_types;
+	public $selected_file_types;
+	public $selected_page_reload;
+	public $wordpress_version;
 
+	/**
+	 * Plugin constructor.
+	 */
+	public function __construct() {
 
-			// Set default options
-			add_option('drag-drop-file-types', array('jpg', 'jpeg', 'png', 'gif', 'webp'));
-			add_option('drag-drop-page-reload', 0);
+		// Globalize:
+		global $wp_version;
 
-			// Bind plugin actions:
-			add_action('admin_head', array(&$this, 'print_header_post_id'));
-			add_action('plugins_loaded', array(&$this, 'load_textdomain'));
-			add_action('add_meta_boxes', array(&$this, 'toggle_meta_box_functionality'));
-			add_action('admin_enqueue_scripts', array(&$this, 'handle_plugin_script_loading'));
-			add_action('wp_ajax_dgd_upload_featured_image', array(&$this, 'ajax_upload_image_file'));
-			add_action('wp_ajax_dgd_set_featured_image', array(&$this, 'ajax_set_featured_image'));
-			add_action('wp_ajax_dgd_get_featured_image', array(&$this, 'ajax_get_featured_image'));
+		// Set default options
+		add_option( 'drag-drop-file-types', array( 'jpg', 'jpeg', 'png', 'gif', 'webp' ) );
+		add_option( 'drag-drop-page-reload', 0 );
 
-			// Bind plugin filters:
-			add_filter('admin_body_class', array(&$this, 'modify_admin_body_class'));
+		// Bind plugin actions:
+		add_action( 'admin_head', array( &$this, 'print_header_post_id' ) );
+		add_action( 'plugins_loaded', array( &$this, 'load_textdomain' ) );
+		add_action( 'add_meta_boxes', array( &$this, 'toggle_meta_box_functionality' ) );
+		add_action( 'admin_enqueue_scripts', array( &$this, 'handle_plugin_script_loading' ) );
+		add_action( 'wp_ajax_dgd_upload_featured_image', array( &$this, 'ajax_upload_image_file' ) );
+		add_action( 'wp_ajax_dgd_set_featured_image', array( &$this, 'ajax_set_featured_image' ) );
+		add_action( 'wp_ajax_dgd_get_featured_image', array( &$this, 'ajax_get_featured_image' ) );
 
-			// Set local variables:
-			$this->plugin_locale = 'drawattention-fi';
-			$this->plugin_options_slug = 'drag-drop-featured-image';
-			$this->plugin_dirname = dirname(plugin_basename(__FILE__));
-			$this->plugin_directory = DrawAttention::get_plugin_url().'/public/includes/lib/drag-drop-featured-image/';
-			$this->selected_post_types = $this->get_option_post_types();
-			$this->selected_file_types = $this->get_option_file_types();
-			$this->selected_page_reload = $this->get_option_page_reload();
+		// Bind plugin filters:
+		add_filter( 'admin_body_class', array( &$this, 'modify_admin_body_class' ) );
 
-			// Set WordPress version:
-			$this->wordpress_version = substr(str_replace('.', '', $wp_version), 0, 2);
+		// Set local variables:
+		$this->plugin_locale        = 'drawattention-fi';
+		$this->plugin_options_slug  = 'drag-drop-featured-image';
+		$this->plugin_dirname       = dirname( plugin_basename( __FILE__ ) );
+		$this->plugin_directory     = DrawAttention::get_plugin_url() . '/public/includes/lib/drag-drop-featured-image/';
+		$this->selected_post_types  = $this->get_option_post_types();
+		$this->selected_file_types  = $this->get_option_file_types();
+		$this->selected_page_reload = $this->get_option_page_reload();
 
-		}
+		// Set WordPress version:
+		$this->wordpress_version = substr( str_replace( '.', '', $wp_version ), 0, 2 );
+	}
 
 
-		/**
-		 * Get selected post types.
-		 * @return array
-		 */
-		public function get_option_post_types(){
-			return array( 'da_image' );
-		}
+	/**
+	 * Get selected post types.
+	 *
+	 * @return array
+	 */
+	public function get_option_post_types() {
+		return array( 'da_image' );
+	}
 
-		/**
-		 * Get selected file types.
-		 * @return array
-		 */
-		public function get_option_file_types(){
-			return array('jpg', 'jpeg', 'png', 'gif', 'webp');
-		}
+	/**
+	 * Get selected file types.
+	 *
+	 * @return array
+	 */
+	public function get_option_file_types() {
+		return array( 'jpg', 'jpeg', 'png', 'gif', 'webp' );
+	}
 
-		/**
-		 * Get page reload status.
-		 * @return boolean
-		 */
-		public function get_option_page_reload(){
-			return 0;
-		}
+	/**
+	 * Get page reload status.
+	 *
+	 * @return boolean
+	 */
+	public function get_option_page_reload() {
+		return 0;
+	}
 
 
-		/**
-		 * Load plugin textdomain.
-		 */
-		public function load_textdomain(){
-			load_plugin_textdomain('drawattention-fi', false, dirname(plugin_basename(__FILE__)).'/languages/');
-		}
+	/**
+	 * Load plugin textdomain.
+	 */
+	public function load_textdomain() {
+		load_plugin_textdomain( 'drawattention-fi', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+	}
 
 
-		/**
-		 * Print current post ID in header.
-		 */
-		public function print_header_post_id(){
-			global $post, $current_screen;
-			if ($current_screen->base === 'post'){
-				echo '
+	/**
+	 * Print current post ID in header.
+	 */
+	public function print_header_post_id() {
+		global $post, $current_screen;
+		if ( $current_screen->base === 'post' ) {
+			echo '
 					<script type="text/javascript">
-						var dgd_post_id = '.$post->ID.';
-						var dgd_page_reload = '.$this->get_option_page_reload().';
+						var dgd_post_id = ' . $post->ID . ';
+						var dgd_set_featured_image_nonce = "' . wp_create_nonce( 'dgd_set_featured_image_nonce' ) . '";
+						var dgd_page_reload = ' . $this->get_option_page_reload() . ';
 					</script>
 				';
-			}
 		}
+	}
 
 
-		/**
-		 * Toggle the metaboxes.
-		 */
-		public function toggle_meta_box_functionality(){
-
-			// Fetch selected post types:
-			$selected = $this->get_option_post_types();
-
-			// Add theme support:
-			add_theme_support('post-thumbnails', $selected);
-
-			// Remove default meta box:
-			foreach ($selected as $post_type){
-				add_post_type_support($post_type, 'thumbnail');
-				remove_meta_box('postimagediv', $post_type, 'side');
-				remove_meta_box('postimagediv', $post_type, 'normal');
-				remove_meta_box('postimagediv', $post_type, 'advanced');
-			}
-
-			// Add the enhanced meta box:
-			foreach ($selected as $post_type){
-				add_meta_box('drag_to_upload', __('Image'), array(&$this, 'updated_upload_meta_box'), $post_type, 'side', 'default');
+	/**
+	 * Toggle the metaboxes.
+	 */
+	public function toggle_meta_box_functionality() {
+
+		global $wp_meta_boxes;
+		// Fetch selected post types:
+		$selected = $this->get_option_post_types();
+
+		// Add theme support:
+		add_theme_support( 'post-thumbnails', $selected );
+
+		// Remove default meta box:
+		foreach ( $selected as $post_type ) {
+			add_post_type_support( $post_type, 'thumbnail' );
+			remove_meta_box( 'postimagediv', $post_type, 'side' );
+			// needed for reported conflict with plugin: conditionally-display-featured-image-on-singular-pages
+			if ( isset( $wp_meta_boxes[ $post_type ]['side']['low']['postimagediv'] ) && false === $wp_meta_boxes[ $post_type ]['side']['low']['postimagediv'] ) {
+				unset( $wp_meta_boxes[ $post_type ]['side']['low']['postimagediv'] );
 			}
-
+			remove_meta_box( 'postimagediv', $post_type, 'normal' );
+			remove_meta_box( 'postimagediv', $post_type, 'advanced' );
 		}
 
+		// Add the enhanced meta box:
+		foreach ( $selected as $post_type ) {
+			add_meta_box( 'drag_to_upload', __( 'Image' ), array( &$this, 'updated_upload_meta_box' ), $post_type, 'side', 'default' );
+		}
+	}
 
-		/**
-		 * Handle script loading.
-		 * @param $hook
-		 */
-		public function handle_plugin_script_loading($hook){
 
-			// Globalize:
-			global $post;
+	/**
+	 * Handle script loading.
+	 *
+	 * @param $hook
+	 */
+	public function handle_plugin_script_loading( $hook ) {
 
-			// Get current post type:
-			if (!is_null($post)){
-				$current_post_type = get_post_type($post->ID);
-			}
+		// Globalize:
+		global $post;
 
-			// Post edit screen:
-			if ($hook == 'post.php' || $hook == 'post-new.php'){
-				if (in_array($current_post_type, $this->selected_post_types)){
-					// Stylesheets:
-					wp_register_style('dgd_uploaderStyle', $this->plugin_directory.'assets/style/drag-drop-uploader.css', false);
-					wp_enqueue_style('dgd_uploaderStyle');
+		// Get current post type:
+		if ( ! is_null( $post ) ) {
+			$current_post_type = get_post_type( $post->ID );
+		}
 
-					// Scripts:
-					wp_enqueue_script('plupload-all');
-					wp_register_script('dgd_uploaderScript', $this->plugin_directory.'assets/scripts/drag-drop-uploader.js', 'jquery');
-					wp_enqueue_script('dgd_uploaderScript');
+		// Post edit screen:
+		if ( $hook == 'post.php' || $hook == 'post-new.php' ) {
+			if ( in_array( $current_post_type, $this->selected_post_types ) ) {
+				// Stylesheets:
+				wp_register_style( 'dgd_uploaderStyle', $this->plugin_directory . 'assets/style/drag-drop-uploader.css', false );
+				wp_enqueue_style( 'dgd_uploaderStyle' );
 
-					// Localize JavaScript:
-					wp_localize_script('dgd_uploaderScript', 'dgd_strings', array(
+				// Scripts:
+				wp_enqueue_script( 'plupload-all' );
+				wp_register_script( 'dgd_uploaderScript', $this->plugin_directory . 'assets/scripts/drag-drop-uploader.js', 'jquery' );
+				wp_enqueue_script( 'dgd_uploaderScript' );
+
+				// Localize JavaScript:
+				wp_localize_script(
+					'dgd_uploaderScript',
+					'dgd_strings',
+					array(
 						'panel' => array(
-							'title' => __('Set featured image'),
-							'button' => __('Set featured image')
-						)
-					));
+							'title'  => __( 'Set featured image' ),
+							'button' => __( 'Set featured image' ),
+						),
+					)
+				);
 
-				}
 			}
+		}
 
-			// Plugin options screen:
-			if ($hook === 'settings_page_'.$this->plugin_options_slug){
+		// Plugin options screen:
+		if ( $hook === 'settings_page_' . $this->plugin_options_slug ) {
 
-				// Stylesheets:
-				wp_register_style('itoggle_style', $this->plugin_directory.'assets/style/engage.itoggle.css', false);
-				wp_register_style('dgd_panelStyle', $this->plugin_directory.'assets/style/drag-to-feature.css', false);
-				wp_enqueue_style('itoggle_style');
-				wp_enqueue_style('dgd_panelStyle');
-
-				// Scripts:
-				wp_register_script('itoggle_script', $this->plugin_directory.'assets/scripts/engage.itoggle.1.7.min.js', 'jquery');
-				wp_register_script('dgd_panelScript', $this->plugin_directory.'assets/scripts/drag-to-feature.js', 'jquery');
-				wp_enqueue_script('itoggle_script');
-				wp_enqueue_script('dgd_panelScript');
-			}
+			// Stylesheets:
+			wp_register_style( 'itoggle_style', $this->plugin_directory . 'assets/style/engage.itoggle.css', false );
+			wp_register_style( 'dgd_panelStyle', $this->plugin_directory . 'assets/style/drag-to-feature.css', false );
+			wp_enqueue_style( 'itoggle_style' );
+			wp_enqueue_style( 'dgd_panelStyle' );
 
+			// Scripts:
+			wp_register_script( 'itoggle_script', $this->plugin_directory . 'assets/scripts/engage.itoggle.1.7.min.js', 'jquery' );
+			wp_register_script( 'dgd_panelScript', $this->plugin_directory . 'assets/scripts/drag-to-feature.js', 'jquery' );
+			wp_enqueue_script( 'itoggle_script' );
+			wp_enqueue_script( 'dgd_panelScript' );
 		}
+	}
 
 
-		/**
-		 * Render options page.
-		 */
-		public function render_options_page(){
-			require_once('assets/views/options.php');
-		}
+	/**
+	 * Render options page.
+	 */
+	public function render_options_page() {
+		require_once 'assets/views/options.php';
+	}
 
 
-		/**
-		 * Byte formatting function:
-		 * @param $bytes
-		 * @param int $precision
-		 * @return float
-		 */
-		public function format_bytes($bytes, $precision = 2) {
-			$units = array('B', 'KB', 'MB', 'GB', 'TB');
-			$bytes = max($bytes, 0);
-			$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
-			$pow = min($pow, count($units) - 1);
-			$bytes /= pow(1024, $pow);
-			return round($bytes, $precision);
-		}
+	/**
+	 * Byte formatting function:
+	 *
+	 * @param $bytes
+	 * @param int   $precision
+	 * @return float
+	 */
+	public function format_bytes( $bytes, $precision = 2 ) {
+		$units  = array( 'B', 'KB', 'MB', 'GB', 'TB' );
+		$bytes  = max( $bytes, 0 );
+		$pow    = floor( ( $bytes ? log( $bytes ) : 0 ) / log( 1024 ) );
+		$pow    = min( $pow, count( $units ) - 1 );
+		$bytes /= pow( 1024, $pow );
+		return round( $bytes, $precision );
+	}
 
 
-		/**
-		 * Uploading functionality trigger.
-		 * (Most of the code comes from media.php and handlers.js)
-		 */
-		function updated_upload_meta_box(){ ?>
+	/**
+	 * Uploading functionality trigger.
+	 * (Most of the code comes from media.php and handlers.js)
+	 */
+	function updated_upload_meta_box() {
+		?>
 			<?php global $post; ?>
 			<div id="uploadContainer" style="margin-top: 10px;">
 
 				<!-- Current image -->
 				<div id="current-uploaded-image" class="<?php echo has_post_thumbnail() ? 'open' : 'closed'; ?>">
-					<?php if (has_post_thumbnail()): ?>
-						<?php the_post_thumbnail('full'); ?>
-					<?php else: ?>
+					<?php if ( has_post_thumbnail() ) : ?>
+						<?php the_post_thumbnail( 'full' ); ?>
+					<?php else : ?>
 						<img class="attachment-full" src="" />
 					<?php endif; ?>
 
-					<?php $thumbnail_id = get_post_thumbnail_id($post->ID); ?>
-					<?php $ajax_nonce = wp_create_nonce("set_post_thumbnail-$post->ID"); ?>
+					<?php $thumbnail_id = get_post_thumbnail_id( $post->ID ); ?>
+					<?php $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$post->ID" ); ?>
 					<p class="hide-if-no-js">
-						<a class="button-secondary" href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail('<?php echo $ajax_nonce; ?>');return false;"><?php _e('Remove image'); ?></a>
+						<a class="button-secondary" href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail('<?php echo $ajax_nonce; ?>');return false;"><?php _e( 'Remove image' ); ?></a>
 					</p>
 				</div>
 
@@ -252,19 +273,19 @@ function updated_upload_meta_box(){ ?>
 					<div id="plupload-upload-ui" class="hide-if-no-js">
 						<div id="drag-drop-area">
 							<div class="drag-drop-inside">
-								<p class="drag-drop-info"><?php _e('Drop image here'); ?></p>
-								<p><?php _ex('or', 'Uploader: Drop files here - or - Select Files'); ?></p>
-								<p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Upload Image'); ?>" class="button" /></p>
-								<p><?php //_e('from', $this->plugin_locale); ?></p>
+								<p class="drag-drop-info"><?php _e( 'Drop image here' ); ?></p>
+								<p><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
+								<p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Upload Image' ); ?>" class="button" /></p>
+								<p><?php // _e('from', $this->plugin_locale); ?></p>
 								<p class="drag-drop-buttons">
-									<?php if ($this->wordpress_version >= 35): ?>
+									<?php if ( $this->wordpress_version >= 35 ) : ?>
 										<!--<a href="#" id="dgd_library_button" class="button insert-media add_media" data-editor="content" title="Add Media">-->
 										<a href="#" id="dgd_library_button" class="button" title="Add Media">
-											<span class="wp-media-buttons-icon"></span><?php _e('Media Library', $this->plugin_locale); ?>
+											<span class="wp-media-buttons-icon"></span><?php _e( 'Media Library', $this->plugin_locale ); ?>
 										</a>
-									<?php else: ?>
-										<a href="<?php bloginfo('wpurl'); ?>/wp-admin/media-upload.php?post_id=<?php echo $post->ID; ?>&amp;tab=library&amp;=&amp;post_mime_type=image&amp;TB_iframe=1&amp;width=640&amp;height=353" class="thickbox add_media button-secondary" id="content-browse_library" title="Browse Media Library" onclick="return false;">
-											<?php _e('Media Library', $this->plugin_locale); ?>
+									<?php else : ?>
+										<a href="<?php bloginfo( 'wpurl' ); ?>/wp-admin/media-upload.php?post_id=<?php echo $post->ID; ?>&amp;tab=library&amp;=&amp;post_mime_type=image&amp;TB_iframe=1&amp;width=640&amp;height=353" class="thickbox add_media button-secondary" id="content-browse_library" title="Browse Media Library" onclick="return false;">
+											<?php _e( 'Media Library', $this->plugin_locale ); ?>
 										</a>
 									<?php endif; ?>
 								</p>
@@ -276,44 +297,45 @@ function updated_upload_meta_box(){ ?>
 			</div>
 
 			<?php
-				global $post;
-				$plupload_init = array(
-					'runtimes'            => 'html5,silverlight,flash,html4',
-					'browse_button'       => 'plupload-browse-button',
-					'container'           => 'plupload-upload-ui',
-					'drop_element'        => 'drag-drop-area',
-					'file_data_name'      => 'async-upload',
-					'multiple_queues'     => false,
-					'multi_selection'	  => false,
-					'max_file_size'       => wp_max_upload_size().'b',
-					'url'                 => admin_url('admin-ajax.php'),
-					'flash_swf_url'       => includes_url('js/plupload/plupload.flash.swf'),
-					'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
-					'filters'             => array(
-						array(
-							'title' => __('Allowed Files', $this->plugin_locale),
-							'extensions' => implode(',', $this->get_option_file_types())
-						)
-					),
-					'multipart'           => true,
-					'urlstream_upload'    => true,
-
-					// Additional parameters:
-					'multipart_params'    => array(
-						'_ajax_nonce' => wp_create_nonce('photo-upload'),
-						'action'      => 'dgd_upload_featured_image',
-						'postID'	  => $post->ID
+			global $post;
+			$plupload_init = array(
+				'runtimes'            => 'html5,silverlight,flash,html4',
+				'browse_button'       => 'plupload-browse-button',
+				'container'           => 'plupload-upload-ui',
+				'drop_element'        => 'drag-drop-area',
+				'file_data_name'      => 'async-upload',
+				'multiple_queues'     => false,
+				'multi_selection'     => false,
+				'max_file_size'       => wp_max_upload_size() . 'b',
+				'url'                 => admin_url( 'admin-ajax.php' ),
+				'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
+				'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
+				'filters'             => array(
+					array(
+						'title'      => __( 'Allowed Files', $this->plugin_locale ),
+						'extensions' => implode( ',', $this->get_option_file_types() ),
 					),
-				);
+				),
+				'multipart'           => true,
+				'urlstream_upload'    => true,
+
+				// Additional parameters:
+				'multipart_params'    => array(
+					'_ajax_nonce' => wp_create_nonce( 'photo-upload' ),
+					'action'      => 'dgd_upload_featured_image',
+					'postID'      => $post->ID,
+				),
+			);
 
-				// Apply filters to initiate plupload:
-				$plupload_init = apply_filters('plupload_init', $plupload_init); ?>
+			// Apply filters to initiate plupload:
+			$plupload_init = apply_filters( 'plupload_init', $plupload_init );
+			?>
 
 				<script type="text/javascript">
 					jQuery(document).ready(function($){
 
 						// Create uploader and pass configuration:
-						var uploader = new plupload.Uploader(<?php echo json_encode($plupload_init); ?>);
+						var uploader = new plupload.Uploader(<?php echo json_encode( $plupload_init ); ?>);
 
 						// Check for drag'n'drop functionality:
 						uploader.bind('Init', function(up){
@@ -341,7 +363,7 @@ function updated_upload_meta_box(){ ?>
 
 							// Limit to one limit:
 							if (files.length > 1){
-								alert("<?php _e('You may only upload one image at a time!', $this->plugin_locale); ?>");
+								alert("<?php _e( 'You may only upload one image at a time!', $this->plugin_locale ); ?>");
 								return false;
 							}
 
@@ -356,7 +378,7 @@ function updated_upload_meta_box(){ ?>
 
 								// Handle maximum size limit:
 								if (max > hundredmb && file.size > hundredmb && up.runtime != 'html5'){
-									alert("<?php _e('The file you selected exceeds the maximum filesize limit.', $this->plugin_locale); ?>");
+									alert("<?php _e( 'The file you selected exceeds the maximum filesize limit.', $this->plugin_locale ); ?>");
 									return false;
 								}
 
@@ -433,134 +455,144 @@ function updated_upload_meta_box(){ ?>
 					});
 				</script>
 			<?php
-		}
+	}
 
 
-		/**
-		 * File upload handler.
-		 */
-		public function ajax_upload_image_file(){
+	/**
+	 * File upload handler.
+	 */
+	public function ajax_upload_image_file() {
 
-			// Check referer, die if no ajax:
-			check_ajax_referer('photo-upload');
+		// Check referer, die if no ajax:
+		check_ajax_referer( 'photo-upload' );
 
-			/// Upload file using Wordpress functions:
-			$file = $_FILES['async-upload'];
-			$status = wp_handle_upload($file, array(
+		// Upload file using WordPress functions:
+		$file   = $_FILES['async-upload'];
+		$status = wp_handle_upload(
+			$file,
+			array(
 				'test_form' => true,
-				'action' => 'dgd_upload_featured_image'
-			));
+				'action'    => 'dgd_upload_featured_image',
+			)
+		);
 
-			// Fetch post ID:
-			$post_id = $_POST['postID'];
+		// Fetch post ID:
+		$post_id = $_POST['postID'];
 
-			// Insert uploaded file as attachment:
-			$attach_id = wp_insert_attachment(array(
+		// Insert uploaded file as attachment:
+		$attach_id = wp_insert_attachment(
+			array(
 				'post_mime_type' => $status['type'],
-				'post_title' => preg_replace('/\.[^.]+$/', '', basename($file['name'])),
-				'post_content' => '',
-				'post_status' => 'inherit'
-			), $status['file'], $post_id);
-
-			// Include the image handler library:
-			require_once(ABSPATH . 'wp-admin/includes/image.php');
-
-			// Generate meta data and update attachment:
-			$attach_data = wp_generate_attachment_metadata($attach_id, $status['file']);
-			wp_update_attachment_metadata($attach_id, $attach_data);
-
-			// Check for current meta (update / add):
-			if ($prevValue = get_post_meta($post_id, '_thumbnail_id', true)){
-				update_post_meta($post_id, '_thumbnail_id', $attach_id, $prevValue);
-			} else {
-				add_post_meta($post_id, '_thumbnail_id', $attach_id);
-			}
-
-			// Get image sizes and correct thumb:
-			$croppedImage = wp_get_attachment_image_src($attach_id, 'full');
-			$imageDetails = getimagesize($croppedImage[0]);
-
-			// Create response array:
-			$uploadResponse = array(
-				'image' => $croppedImage[0],
-				'width' => $imageDetails[0],
-				'height' => $imageDetails[1],
-				'postID' => $post_id
-			);
+				'post_title'     => preg_replace( '/\.[^.]+$/', '', basename( $file['name'] ) ),
+				'post_content'   => '',
+				'post_status'    => 'inherit',
+			),
+			$status['file'],
+			$post_id
+		);
+
+		// Include the image handler library:
+		require_once ABSPATH . 'wp-admin/includes/image.php';
+
+		// Generate meta data and update attachment:
+		$attach_data = wp_generate_attachment_metadata( $attach_id, $status['file'] );
+		wp_update_attachment_metadata( $attach_id, $attach_data );
+
+		// Check for current meta (update / add):
+		if ( $prevValue = get_post_meta( $post_id, '_thumbnail_id', true ) ) {
+			update_post_meta( $post_id, '_thumbnail_id', $attach_id, $prevValue );
+		} else {
+			add_post_meta( $post_id, '_thumbnail_id', $attach_id );
+		}
 
-			// Return response and exit:
-			die(json_encode($uploadResponse));
+		// Get image sizes and correct thumb:
+		$croppedImage = wp_get_attachment_image_src( $attach_id, 'full' );
+		$imageDetails = getimagesize( $croppedImage[0] );
 
-		}
+		// Create response array:
+		$uploadResponse = array(
+			'image'  => $croppedImage[0],
+			'width'  => $imageDetails[0],
+			'height' => $imageDetails[1],
+			'postID' => $post_id,
+		);
 
+		// Return response and exit:
+		die( json_encode( $uploadResponse ) );
+	}
 
-		/**
-		 * AJAX function: Set featured image.
-		 */
-		public function ajax_set_featured_image(){
-			$postID = isset($_POST['postID']) ? (int) $_POST['postID'] : false;
-			$attachmentID = isset($_POST['attachmentID']) ? (int) $_POST['attachmentID'] : false;
-			if ($postID && $attachmentID){
 
+	/**
+	 * AJAX function: Set featured image.
+	 */
+	public function ajax_set_featured_image() {
+		$postID                       = isset( $_POST['postID'] ) ? (int) $_POST['postID'] : false;
+		$attachmentID                 = isset( $_POST['attachmentID'] ) ? (int) $_POST['attachmentID'] : false;
+		$dgd_set_featured_image_nonce = isset( $_POST['nonce'] ) ? $_POST['nonce'] : false;
+		if ( $postID && $attachmentID ) {
+			if ( current_user_can( 'edit_post', $postID ) && wp_verify_nonce( $dgd_set_featured_image_nonce, 'dgd_set_featured_image_nonce' ) ) {
 				// Update / add post meta:
-				if ($status = get_post_meta($postID, '_thumbnail_id', true)){
-					update_post_meta($postID, '_thumbnail_id', $attachmentID);
+				if ( $status = get_post_meta( $postID, '_thumbnail_id', true ) ) {
+					update_post_meta( $postID, '_thumbnail_id', $attachmentID );
 				} else {
-					add_post_meta($postID, '_thumbnail_id', $attachmentID);
+					add_post_meta( $postID, '_thumbnail_id', $attachmentID );
 				}
 
 				$response = array(
-					'response_code' => 200,
-					'response_content' => 'success'
+					'response_code'    => 200,
+					'response_content' => 'success',
 				);
-
 			} else {
 				$response = array(
-					'response_code' => 500,
-					'response_content' => __('Drag & Drop Feaured image: Unknown post och attachment ID, please try again!', $this->plugin_locale)
+					'response_code'    => 403,
+					'response_content' => __( 'Drag & Drop Feaured image: You do not have permission to edit this post!', $this->plugin_locale ),
 				);
 			}
-
-			// Return response:
-			die(json_encode($response));
-
+		} else {
+			$response = array(
+				'response_code'    => 500,
+				'response_content' => __( 'Drag & Drop Feaured image: Unknown post och attachment ID, please try again!', $this->plugin_locale ),
+			);
 		}
 
+		// Return response:
+		die( json_encode( $response ) );
+	}
 
-		/**
-		 * AJAX function: Get featured image.
-		 */
-		public function ajax_get_featured_image(){
-
-			$postID = isset($_POST['post_id']) ? (int) $_POST['post_id'] : false;
-			if ($postID){
-				$featured = wp_get_attachment_image_src(get_post_thumbnail_id($postID), 'full');
-				$response = array(
-					'response_code' => 200,
-					'response_content' => $featured[0]
-				);
-			} else {
-				$response = array(
-					'response_code' => 500,
-					'response_content' => __('Drag & Drop Feaured image: An error occured, please reload page!', $this->plugin_locale)
-				);
-			}
-
-			// Return response:
-			die(json_encode($response));
 
+	/**
+	 * AJAX function: Get featured image.
+	 */
+	public function ajax_get_featured_image() {
+
+		$postID = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : false;
+		if ( $postID ) {
+			$featured = wp_get_attachment_image_src( get_post_thumbnail_id( $postID ), 'full' );
+			$response = array(
+				'response_code'    => 200,
+				'response_content' => $featured[0],
+			);
+		} else {
+			$response = array(
+				'response_code'    => 500,
+				'response_content' => __( 'Drag & Drop Feaured image: An error occured, please reload page!', $this->plugin_locale ),
+			);
 		}
 
-
-		/**
-		 * Add body classes to the admin.
-		 * @param $classes
-		 * @return string
-		 */
-		public function modify_admin_body_class($classes){
-			if ($this->wordpress_version >= 38){ $classes .= ' wp38'; }
-			return $classes;
-		}
+		// Return response:
+		die( json_encode( $response ) );
+	}
 
 
-	}
\ No newline at end of file
+	/**
+	 * Add body classes to the admin.
+	 *
+	 * @param $classes
+	 * @return string
+	 */
+	public function modify_admin_body_class( $classes ) {
+		if ( $this->wordpress_version >= 38 ) {
+			$classes .= ' wp38'; }
+		return $classes;
+	}
+}
\ No newline at end of file
diff --git a/public/includes/themes.php b/public/includes/themes.php
index aa57ebc8..c962742f 100644
--- a/public/includes/themes.php
+++ b/public/includes/themes.php
@@ -10,13 +10,13 @@ function __construct( $parent ) {
 	}
 
 	function add_theme_pack_metabox() {
-		add_meta_box( 'da_theme_pack', __( 'Apply Color Scheme', 'draw-attention' ), array( $this, 'display_theme_pack_metabox' ), $this->parent->cpt->post_type, 'side', 'low');
+		add_meta_box( 'da_theme_pack', __( 'Apply Color Scheme', 'draw-attention' ), array( $this, 'display_theme_pack_metabox' ), $this->parent->cpt->post_type, 'side', 'low' );
 	}
-	
+
 	function display_theme_pack_metabox() {
-		echo '<p>'.__( 'Quickly apply a theme (you can adjust each color afterwards).', 'draw-attention' ).'</p>'; ?>
+		echo '<p>' . __( 'Quickly apply a theme (you can adjust each color afterwards).', 'draw-attention' ) . '</p>'; ?>
 		<select id="da-theme-pack-select">
-			<option value=""><?php  _e( 'Select a theme...', 'draw-attention' ) ?></option>
+			<option value=""><?php _e( 'Select a theme...', 'draw-attention' ); ?></option>
 			<?php foreach ( $this->get_themes() as $key => $theme ) : ?>
 			<option value="<?php echo $theme['slug']; ?>"><?php echo $theme['name']; ?></option>
 			<?php endforeach; ?>
@@ -25,70 +25,75 @@ function display_theme_pack_metabox() {
 	}
 
 	public function pass_themes_to_admin_js() {
-		wp_localize_script( $this->parent->plugin_slug . '-admin-script', 'daThemes', array(
-			'cfPrefix' => $this->parent->custom_fields->prefix,
-			'themes' => $this->get_themes(),
-		) );
+		wp_localize_script(
+			$this->parent->plugin_slug . '-admin-script',
+			'daThemes',
+			array(
+				'cfPrefix' => $this->parent->custom_fields->prefix,
+				'themes'   => $this->get_themes(),
+			)
+		);
 	}
 
 	public static function apply_theme( $post_id, $theme_slug ) {
 		$themes = self::get_themes();
-		if ( empty( $themes[$theme_slug]['values'] ) ) { return false; }
+		if ( empty( $themes[ $theme_slug ]['values'] ) ) {
+			return false; }
 
-		foreach ($themes[$theme_slug]['values'] as $key => $meta_value) {
-			update_post_meta( $post_id, '_da_'.$key, $meta_value );
+		foreach ( $themes[ $theme_slug ]['values'] as $key => $meta_value ) {
+			update_post_meta( $post_id, '_da_' . $key, $meta_value );
 			// TODO: Make prefix dynamic
 		}
 	}
 
 	public static function get_themes() {
 		$themes = array(
-			'light' => array(
-				'slug' => 'light',
-				'name' => 'Light',
+			'light'         => array(
+				'slug'   => 'light',
+				'name'   => 'Light',
 				'values' => array(
-					'map_highlight_color' => '#222222',
+					'map_highlight_color'   => '#222222',
 					'map_highlight_opacity' => 0.8,
 
-					'map_border_color' => '#000000',
-					'map_border_opacity' => 0.8,
-					'map_border_width' => 1,
+					'map_border_color'      => '#000000',
+					'map_border_opacity'    => 0.8,
+					'map_border_width'      => 1,
 
-					'map_title_color' => '#000000',
-					'map_text_color' => '#000000',
-					'map_background_color' => '#ffffff',
+					'map_title_color'       => '#000000',
+					'map_text_color'        => '#000000',
+					'map_background_color'  => '#ffffff',
 				),
 			),
-			'dark' => array(
-				'slug' => 'dark',
-				'name' => 'Dark',
+			'dark'          => array(
+				'slug'   => 'dark',
+				'name'   => 'Dark',
 				'values' => array(
-					'map_highlight_color' => '#cccccc',
+					'map_highlight_color'   => '#cccccc',
 					'map_highlight_opacity' => 0.8,
 
-					'map_border_color' => '#ffffff',
-					'map_border_opacity' => 0.8,
-					'map_border_width' => 1,
+					'map_border_color'      => '#ffffff',
+					'map_border_opacity'    => 0.8,
+					'map_border_width'      => 1,
 
-					'map_title_color' => '#ffffff',
-					'map_text_color' => '#ffffff',
-					'map_background_color' => '#000000',
+					'map_title_color'       => '#ffffff',
+					'map_text_color'        => '#ffffff',
+					'map_background_color'  => '#000000',
 				),
 			),
 			'drawattention' => array(
-				'slug' => 'drawattention',
-				'name' => 'Draw Attention',
+				'slug'   => 'drawattention',
+				'name'   => 'Draw Attention',
 				'values' => array(
-					'map_highlight_color' => '#3CA2A2',
+					'map_highlight_color'   => '#3CA2A2',
 					'map_highlight_opacity' => 0.7,
 
-					'map_border_color' => '#235B6E',
-					'map_border_opacity' => 1,
-					'map_border_width' => 2,
+					'map_border_color'      => '#235B6E',
+					'map_border_opacity'    => 1,
+					'map_border_width'      => 2,
 
-					'map_title_color' => '#93C7A4',
-					'map_text_color' => '#DFEBE5',
-					'map_background_color' => '#2E2D29',
+					'map_title_color'       => '#93C7A4',
+					'map_text_color'        => '#DFEBE5',
+					'map_background_color'  => '#2E2D29',
 				),
 			),
 
@@ -96,5 +101,4 @@ public static function get_themes() {
 
 		return apply_filters( 'da_themes', $themes );
 	}
-
 }
diff --git a/public/views/more_info_template.php b/public/views/more_info_template.php
index d2056468..d2cbaf8e 100644
--- a/public/views/more_info_template.php
+++ b/public/views/more_info_template.php
@@ -1,15 +1,15 @@
-<?php if ( $settings['layout'] != 'lightbox' && $settings['layout'] != 'tooltip') : ?>
+<?php if ( $settings['layout'] != 'lightbox' && $settings['layout'] != 'tooltip' ) : ?>
 	<div class="hotspots-placeholder" id="content-hotspot-<?php echo $settings['image_id']; ?>">
 		<div class="hotspot-initial">
 			<?php $the_title = get_the_title( $settings['image_id'] ); ?>
-			<?php if ( ! empty( $the_title ) ): ?>
+			<?php if ( ! empty( $the_title ) ) : ?>
 			<h2 class="hotspot-title">
 				<?php echo $the_title; ?>
 			</h2>
 			<?php endif; ?>
 			<div class="hotspot-content">
-				<?php if ( !empty( $settings['img_settings'][$this->custom_fields->prefix.'map_more_info'][0] ) ) : ?>
-				<?php echo apply_filters( 'da_description', do_shortcode( $wp_embed->run_shortcode( $settings['img_settings'][$this->custom_fields->prefix.'map_more_info'][0] ) ) ); ?>
+				<?php if ( ! empty( $settings['img_settings'][ $this->custom_fields->prefix . 'map_more_info' ][0] ) ) : ?>
+					<?php echo apply_filters( 'da_description', do_shortcode( $wp_embed->run_shortcode( $settings['img_settings'][ $this->custom_fields->prefix . 'map_more_info' ][0] ) ) ); ?>
 				<?php endif; ?>
 			</div>
 		</div>
diff --git a/public/views/shortcode_template.php b/public/views/shortcode_template.php
index 62aaecfb..51a1fecf 100644
--- a/public/views/shortcode_template.php
+++ b/public/views/shortcode_template.php
@@ -3,7 +3,7 @@
 // No hotspots are defined
 $has_hotspots = false;
 if ( ! empty( $settings['hotspots']['0'] ) ) {
-	foreach ($settings['hotspots'] as $key => $hotspot) {
+	foreach ( $settings['hotspots'] as $key => $hotspot ) {
 		if ( ! empty( $hotspot['coordinates'] ) ) {
 			$has_hotspots = true;
 			break;
@@ -12,17 +12,17 @@
 }
 
 if ( empty( $settings['img_url'] ) ) : ?>
-	<?php if ( current_user_can( 'edit_posts' ) ): ?>
+	<?php if ( current_user_can( 'edit_posts' ) ) : ?>
 		<p><em><?php _e( 'This interactive image doesn\'t have an image selected from the media library.', 'draw-attention' ); ?></em></p>
 		<p><?php echo edit_post_link( 'Edit Image', '', '', $settings['image_id'] ); ?></p>
 	<?php endif ?>
 <?php elseif ( empty( $has_hotspots ) ) : ?>
-	<?php if ( current_user_can( 'edit_posts' ) ): ?>
+	<?php if ( current_user_can( 'edit_posts' ) ) : ?>
 		<p><em><?php _e( 'You need to define some clickable areas for your image.', 'draw-attention' ); ?></em></p>
 		<p><?php echo edit_post_link( __( 'Edit Image', 'draw-attention' ), false, false, $settings['image_id'] ); ?></p>
 	<?php endif ?>
-<?php // In RSS feed / In page builder edit mode - just display the image ?>
-<?php elseif ( is_feed() || !empty( $_GET['fl_builder'] ) || !empty( $_GET['elementor-preview'] ) || ( !empty( $_GET['action'] ) && $_GET['action'] == 'elementor' ) ): ?>
+	<?php // In RSS feed / In page builder edit mode - just display the image ?>
+<?php elseif ( is_feed() || ! empty( $_GET['fl_builder'] ) || ! empty( $_GET['elementor-preview'] ) || ( ! empty( $_GET['action'] ) && $_GET['action'] == 'elementor' ) ) : ?>
 	<div class="hotspots-image-container">
 		<img
 			width="<?php echo $settings['img_width']; ?>"
@@ -38,7 +38,7 @@ class="hotspots-image skip-lazy"
 			data-skip-lazy="1"
 			>
 	</div>
-<?php // There are hotspots! Show the interactive image ?>
+	<?php // There are hotspots! Show the interactive image ?>
 <?php else : ?>
 
 <style>
@@ -57,7 +57,7 @@ class="hotspots-image skip-lazy"
 		color: <?php echo $settings['more_info_title']; ?>;
 	}
 
-	<?php foreach ($formatted_styles as $style) : ?>
+	<?php foreach ( $formatted_styles as $style ) : ?>
 		#<?php echo $settings['spot_id']; ?> .hotspot-<?php echo $style['name']; ?> {
 			stroke-width: <?php echo $style['borderWidth']; ?>;
 			fill: <?php echo $style['display']['fillColor']; ?>;
@@ -109,45 +109,49 @@ class="hotspots-image skip-lazy"
 	}
 </style>
 
-<?php /*
-<script>
+	<?php
+	/*
+	<script>
 	window.daStyles<?php echo $settings['image_id']; ?> = <?php echo json_encode($formatted_styles); ?>
-</script>
-*/ ?>
+	</script>
+	*/
+	?>
 
 	<div class="hotspots-container <?php echo $settings['urls_class']; ?> layout-<?php echo $settings['layout']; ?> event-<?php echo $settings['event_trigger']; ?>" id="<?php echo $settings['spot_id']; ?>" data-layout="<?php echo $settings['layout']; ?>" data-trigger="<?php echo $settings['event_trigger']; ?>">
 		<div class="hotspots-interaction">
-			<?php if ( $settings['urls_only'] ) {
-				require( $this->get_plugin_dir() . '/public/views/image_template.php' );
-			} else  {
-				require( $this->get_plugin_dir() . '/public/views/more_info_template.php' );
-				require( $this->get_plugin_dir() . '/public/views/image_template.php' );
-			} ?>
+			<?php
+			if ( $settings['urls_only'] ) {
+				require $this->get_plugin_dir() . '/public/views/image_template.php';
+			} else {
+				require $this->get_plugin_dir() . '/public/views/more_info_template.php';
+				require $this->get_plugin_dir() . '/public/views/image_template.php';
+			}
+			?>
 		</div>
 		<map name="hotspots-image-<?php echo $settings['image_id']; ?>" class="hotspots-map">
-			<?php foreach( $settings['hotspots'] as $key => $hotspot ) : ?>
+			<?php foreach ( $settings['hotspots'] as $key => $hotspot ) : ?>
 				<?php
-					$coords = $hotspot['coordinates'];
-					$target = !empty( $hotspot['action'] ) ? $hotspot['action'] : '';
-					$new_window = !empty( $hotspot['action-url-open-in-window'] ) ? $hotspot['action-url-open-in-window'] : '';
+					$coords        = $hotspot['coordinates'];
+					$target        = ! empty( $hotspot['action'] ) ? $hotspot['action'] : '';
+					$new_window    = ! empty( $hotspot['action-url-open-in-window'] ) ? $hotspot['action-url-open-in-window'] : '';
 					$target_window = $new_window == 'on' ? '_new' : '';
-					$target_url = !empty( $hotspot['action-url-url'] ) ? $hotspot['action-url-url'] : '';
-					$rel = '';
-					if ( ! empty( $hotspot['rel'] ) ) {
-						$rel = $hotspot['rel'];
-					}
+					$target_url    = ! empty( $hotspot['action-url-url'] ) ? $hotspot['action-url-url'] : '';
+					$rel           = '';
+				if ( ! empty( $hotspot['rel'] ) ) {
+					$rel = $hotspot['rel'];
+				}
 					$area_class = $target == 'url' ? 'url-area' : 'more-info-area';
-					$href = $target == 'url' ? $target_url : '#hotspot-' . $settings['spot_id'] . '-' . $key;
-					$href = !empty($href) ? $href : '#';
-					$title = !empty( $hotspot['title'] ) ? $hotspot['title'] : '';
-					if ( empty( $hotspot['description'] ) ) {
-						$hotspot['description'] = '';
-					}
-					if ( empty( $settings['img_settings']['_da_has_multiple_styles']['0'] ) || $settings['img_settings']['_da_has_multiple_styles']['0'] != 'on' || empty( $hotspot['style'] ) ) {
-						$color_scheme = '';
-					} else {
-						$color_scheme = $hotspot['style'];
-					}
+					$href       = $target == 'url' ? $target_url : '#hotspot-' . $settings['spot_id'] . '-' . $key;
+					$href       = ! empty( $href ) ? $href : '#';
+					$title      = ! empty( $hotspot['title'] ) ? $hotspot['title'] : '';
+				if ( empty( $hotspot['description'] ) ) {
+					$hotspot['description'] = '';
+				}
+				if ( empty( $settings['img_settings']['_da_has_multiple_styles']['0'] ) || $settings['img_settings']['_da_has_multiple_styles']['0'] != 'on' || empty( $hotspot['style'] ) ) {
+					$color_scheme = '';
+				} else {
+					$color_scheme = $hotspot['style'];
+				}
 
 				?>
 				<area
@@ -165,18 +169,26 @@ class="<?php echo $area_class; ?>"
 			<?php endforeach; ?>
 		</map>
 
-		<?php /* Error message for admins when there's a JS error */
-		if ( ! empty( $_GET['da_debug'] ) ) : ?>
+		<?php
+		/* Error message for admins when there's a JS error */
+		if ( ! empty( $_GET['da_debug'] ) ) :
+			?>
 			<div id="error-<?php echo $settings['spot_id']; ?>" class="da-error">
 				<p>It looks like there is a JavaScript error in a plugin or theme that is causing a conflict with Draw Attention. For more information on troubleshooting this issue, please see our <a href="https://wpdrawattention.com/document/troubleshooting-conflicts-themes-plugins/" target="_new">help page</a>.
 			</div>
 		<?php endif; ?>
 
-		<?php /* Loop through the hotspots and output the more info content for each */
-		foreach( $settings['hotspots'] as $key => $hotspot ) : ?>
-			<?php if ( ! empty( $hotspot['action'] ) && $hotspot['action'] === 'url' ) { continue; } // Skip writing out hotspots for URL only hotspots ?>
+		<?php
+		/* Loop through the hotspots and output the more info content for each */
+		foreach ( $settings['hotspots'] as $key => $hotspot ) :
+			?>
+			<?php
+			if ( ! empty( $hotspot['action'] ) && $hotspot['action'] === 'url' ) {
+				continue; } // Skip writing out hotspots for URL only hotspots
+			?>
 
-			<?php if ( empty( $settings['img_settings']['_da_has_multiple_styles']['0'] ) || $settings['img_settings']['_da_has_multiple_styles']['0'] != 'on' || empty( $hotspot['style'] ) ) {
+			<?php
+			if ( empty( $settings['img_settings']['_da_has_multiple_styles']['0'] ) || $settings['img_settings']['_da_has_multiple_styles']['0'] != 'on' || empty( $hotspot['style'] ) ) {
 				$color_scheme_class = '';
 			} else {
 				$color_scheme_class = 'da-style-' . $hotspot['style'];
@@ -189,7 +201,7 @@ class="<?php echo $area_class; ?>"
 			?>
 			<div class="hotspot-info <?php echo $color_scheme_class; ?>" id="hotspot-<?php echo $settings['spot_id']; ?>-<?php echo $key; ?>">
 				<?php
-				if ( !empty( $hotspot['action'] ) ) {
+				if ( ! empty( $hotspot['action'] ) ) {
 					if ( 'bigcommerce' === $hotspot['action'] ) {
 						echo DrawAttention_BigCommerce_Action::render_hotspot_content( $hotspot, $settings );
 						echo '</div>';
@@ -199,23 +211,26 @@ class="<?php echo $area_class; ?>"
 				?>
 
 				<?php echo apply_filters( 'drawattention_hotspot_title', '<h2 class="hotspot-title">' . $hotspot['title'] . '</h2>', $hotspot ); ?>
-				<?php if ( !empty($hotspot['detail_image_id'])) : ?>
+				<?php if ( ! empty( $hotspot['detail_image_id'] ) ) : ?>
 					<div class="hotspot-thumb">
 						<?php
 						$detail_image_img_tag = wp_get_attachment_image( $hotspot['detail_image_id'], apply_filters( 'da_detail_image_size', 'large', $hotspot, $settings['img_post'], $settings['img_settings'] ) );
 						if ( empty( $detail_image_img_tag ) && ! empty( $hotspot['detail_image'] ) ) {
-							$detail_image_img_tag = '<img src="'.$hotspot['detail_image'].'" />';
+							$detail_image_img_tag = '<img src="' . $hotspot['detail_image'] . '" />';
 						}
 						echo $detail_image_img_tag;
 						?>
 					</div>
-				<?php elseif( empty( $hotspot['detail_image_id'] ) && ! empty( $hotspot[ 'detail_image' ] ) ) : ?>
+				<?php elseif ( empty( $hotspot['detail_image_id'] ) && ! empty( $hotspot['detail_image'] ) ) : ?>
 					<div class="hotspot-thumb">
 						<img src="<?php echo $hotspot['detail_image']; ?>">
 					</div>
 				<?php endif; ?>
 				<div class="hotspot-content">
-					<?php if( !empty( $hotspot['description'] ) ) echo apply_filters( 'da_description', do_shortcode( $wp_embed->autoembed( $wp_embed->run_shortcode( $hotspot['description'] ) ) ) ); ?>
+					<?php
+					if ( ! empty( $hotspot['description'] ) ) {
+						echo apply_filters( 'da_description', do_shortcode( $wp_embed->autoembed( $wp_embed->run_shortcode( $hotspot['description'] ) ) ) );}
+					?>
 				</div>
 			</div>
 		<?php endforeach; ?>
diff --git a/public/views/single-da_image.php b/public/views/single-da_image.php
index 43d5b6f1..96601278 100644
--- a/public/views/single-da_image.php
+++ b/public/views/single-da_image.php
@@ -9,9 +9,12 @@
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
-				<?php echo do_shortcode( '[drawattention ID="'.get_the_id().'"]' ); ?>
-				<?php if ( current_user_can( 'edit_others_posts' ) ): ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+				?>
+				<?php echo do_shortcode( '[drawattention ID="' . get_the_id() . '"]' ); ?>
+				<?php if ( current_user_can( 'edit_others_posts' ) ) : ?>
 					<?php edit_post_link( __( 'Edit Interactive Image', 'draw-attention' ) ); ?>
 				<?php endif ?>
 			<?php endwhile; // end of the loop. ?>
diff --git a/readme.txt b/readme.txt
index fd285f45..bb36dec8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: tylerdigital, nataliemac, croixhaug, wpdrawattention
 Tags: image maps, image map, floor plan, interactive images, clickable images, hotspots, infographic, highlight, annotation, real estate, interactive floor plan, affiliate
 Requires at least: 3.5.1
-Tested up to: 6.2
-Stable tag: 2.0.11
+Tested up to: 6.4
+Stable tag: 2.0.21
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -14,7 +14,7 @@ Draw Attention makes it easy to create interactive image maps for your website.
 
 The image map can contain more information such as images, text, shortcodes, gallery, video, audio, and more. Reveal more information on click/tap or hover.  Create custom shapes for interactive hotspots directly on your original image.
 
-Perfect for sketch maps, interactive floor plans for real estate, clickable infographics, sketch annotations, image tutorials, product feature highlights on WooCommerce, and more.
+Perfect for sketch maps, interactive floor plans for real estate, clickable infographics, interactive affiliate content, sketch annotations, image tutorials, product feature highlights on WooCommerce, and more.
 
 Image Map Features:
 
@@ -25,7 +25,7 @@ Image Map Features:
 - **Go to a URL**: Optionally send a site visitor to another URL when clicking highlightable hotspots on your image map
 
 ### Responsive Design ###
-Interactive image maps resize to fit your theme and the available screen size. Draw Attention works on all devices and adjusts your image to screens of any size. Works great on touch screens, too!
+Interactive image maps resize to fit your theme and the available screen size. Draw Attention works on all devices and adjusts your image to screens of any size. Works great on touch screens, such as tablet and mobile, too!
 
 ### Accessible ###
 Image maps are accessible to everyone who visits your site, regardless of device or capabilities. Your content is accessible to screen readers. All highlightable hotspots can be accessed by keyboard commands. Anyone on any device can use your interactive image map.
@@ -37,7 +37,13 @@ Draw Attention is built with the principles of progressive enhancement in mind,
 Easy to draw the highlightable areas of your image map - and easy to edit the shapes later too! Create the image map right from your WordPress dashboard. Place your interactive image map into any page or post with a simple shortcode, or use our convenient Beaver Builder module or WordPress Editor Block.
 
 ### New and Improved Drawing Tool ###
-Draw complex shapes or perfect circles and rectangles. Use the new zoom and pan feature to get extra precise drawings of your clickable hotspots. Easily edit the shapes whenever you'd like or start from scratch at the click of a button.
+Draw complex shapes or perfect circles and rectangles. Use the new zoom and pan feature to get extra precise drawings of your clickable hotspots. Easily edit the shapes whenever you'd like or start from scratch at the click of a button. 
+
+The available drawing tools are:
+
+- **Polygon**: Create a custom polygon shape of your preference
+- **Rectangle**: – Create a rectangle shape of any size
+- **Circle**: Create a perfect circle
 
 [youtube https://youtu.be/NRHspIZjP-Q]
 
@@ -49,9 +55,17 @@ Need more than one interactive image map on your site? The Pro version allows un
 ### Annotation Layout Options (Pro only) ###
 Show more info about highlighted image map areas in a variety of different layouts, including lightbox and tooltip.
 
+### Always Show Hotspots (Pro only) ###
+Allow the image map hotspot areas to stay highlighted so visitors can see where they're located, even when they aren’t clicked yet. The perfect way to show off your hotspots and make it clear that your images are interactive.
+
+### Define Multiple Highlight Styles (Pro only) ###
+Use multiple highlight colors for the interactive image hotspots. If you choose to define multiple highlight styles, another section will pop up called, “Styles” where you can define your own color schemes within your image. Make each hotspot unique with it's own color, border, and opacity settings!
+
 ### 20 Pre-Defined Color Palettes (Pro only) ###
 Choose from one of 20 pre-defined color palettes or use your own custom color scheme on the image maps.
 
+[Upgrade to Draw Attention Pro Today!](https://wpdrawattention.com?utm_source=website&utm_medium=promo-link&utm_campaign=wordpress-org&utm_content=pro-cta) to get more features and customization options:
+
 ### What could you make with Draw Attention? ###
 
 * Showcase real estate or a new property development. Give your visitors a virtual tour where they can explore floor plans and photos.
@@ -104,7 +118,7 @@ To contact our support team, submit your message through our [WordPress support
 
 If you're using our Premium plugin, you can also use the `License & Support` tab within the Draw Attention Pro plugin settings to send us a direct email.
 
- [https://vimeo.com/827031888]
+ [vimeo https://vimeo.com/827031888]
 
 = How do I draw my first image? =
 We have a guide walkthrough of creating your first image available in [our documentation](https://wpdrawattention.com/guides/first-interactive-image/?utm_source=website&utm_medium=promo-link&utm_campaign=wordpress-org&utm_content=first-interactive-image).
@@ -118,73 +132,73 @@ We have a guide walkthrough of creating your first image available in [our docum
 
 # Changelog
 
-## 2.0.11 - 2023-05-12
+## 2.0.17 - 2023-11-07
 
-### Fixes
+### Features and Improvements
 
-- Fix Elementor popup duplicating DA images
+- Tested up to WP 6.4
+
+## 2.0.16 - 2023-10-29
 
 ### Features and Improvements
 
-- Update gutenberg block to use api version 2
+- Add nonce checks for additional security
 
-## 2.0.9 - 2023-04-11
+## 2.0.15 - 2023-10-19
 
 ### Fixes
 
-### Features and Improvements
+- Fix disclosed vulnerability affecting Contributor-level users
 
-## 2.0.8 - 2023-03-28
-
-### Fixes
+## 2.0.14 - 2023-08-12
 
 ### Features and Improvements
 
-## 2.0.7 - 2023-03-28
-
-- no changes
+- Tested up to WP 6.3
 
-## 2.0.6 - 2023-03-28
+## 2.0.13 - 2023-06-25
 
 ### Fixes
 
+- Fix PHP warning in CMB2 library
+
 ### Features and Improvements
 
-## 2.0.5 - 2023-03-28
+- Prevent conflicts with other plugins that use the leaflet library
 
-### Fixes
+## 2.0.12 - 2023-05-26
 
 ### Features and Improvements
 
-## 2.0.4
+- Improved nonce verification and capability checks
 
-- Fixed: SVG desc markup
+## 2.0.11 - 2023-05-12
 
-## 2.0.3
+### Fixes
 
-- Fixed: PHP Warning in import function
+- Fix Elementor popup duplicating DA images
 
-## 2.0.2
+### Features and Improvements
 
-- Improved: Accessibility (suppress hidden image from assistive technology)
+- Update gutenberg block to use api version 2
 
-## 2.0.1
+## 2.0.9 - 2023-04-11
 
-- WP 6.1 Compatibility
+### Fixes
 
-## 2.0.0
+### Features and Improvements
 
-- Improved: New drawing tool for hotspots
+## 2.0.8 - 2023-03-28
 
-## 1.9.34
+### Fixes
 
-- Improved: SEO attribute support for Google Search Console
+### Features and Improvements
 
-## 1.9.33
+## 2.0.7 - 2023-03-28
 
-- Fixed: Conflict with MainWP bug
+- no changes
 
-## 1.9.32
+## 2.0.6 - 2023-03-28
 
 
 For older changelog entries, please see the [additional changelog.txt file](https://plugins.svn.wordpress.org/draw-attention/trunk/CHANGELOG.md) delivered with the plugin.
diff --git a/uninstall.php b/uninstall.php
index fe4f1f2f..e2683e87 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -19,7 +19,8 @@
 if ( is_multisite() ) {
 
 	$blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs}", ARRAY_A );
-		/* @TODO: delete all transient, options and files you may have added
+		/*
+		@TODO: delete all transient, options and files you may have added
 		delete_transient( 'TRANSIENT_NAME' );
 		delete_option('OPTION_NAME');
 		//info: remove custom file directory for main site
@@ -34,9 +35,10 @@
 		*/
 	if ( $blogs ) {
 
-	 	foreach ( $blogs as $blog ) {
+		foreach ( $blogs as $blog ) {
 			switch_to_blog( $blog['blog_id'] );
-			/* @TODO: delete all transient, options and files you may have added
+			/*
+			@TODO: delete all transient, options and files you may have added
 			delete_transient( 'TRANSIENT_NAME' );
 			delete_option('OPTION_NAME');
 			//info: remove custom file directory for main site
@@ -55,9 +57,9 @@
 			restore_current_blog();
 		}
 	}
-
 } else {
-	/* @TODO: delete all transient, options and files you may have added
+	/*
+	@TODO: delete all transient, options and files you may have added
 	delete_transient( 'TRANSIENT_NAME' );
 	delete_option('OPTION_NAME');
 	//info: remove custom file directory for main site