diff --git a/docs/assets/scss/styles.scss b/docs/assets/scss/styles.scss
index d0c84fc4ad7..ec1869ef006 100644
--- a/docs/assets/scss/styles.scss
+++ b/docs/assets/scss/styles.scss
@@ -204,17 +204,23 @@ pre.editable {
 .bv-docs-table {
   font-size: 90%;
 
-  th,
-  td {
-    padding: 0.5rem;
+  > thead,
+  > tbody,
+  > tfoot {
+    > tr {
+      > th,
+      > td {
+        padding: 0.5rem;
+      }
+    }
   }
 
-  thead > tr > th {
+  > thead > tr > th {
     min-width: 80px;
   }
 
   code {
-    white-space: nowrap !important;
+    white-space: nowrap;
   }
 }
 
diff --git a/docs/common-props.json b/docs/common-props.json
new file mode 100644
index 00000000000..ea442f7f909
--- /dev/null
+++ b/docs/common-props.json
@@ -0,0 +1,236 @@
+{
+  "id": {
+    "description": "Used to set the 'id' attribute on the rendered content, and used as the base to generate any additional element IDs as needed"
+  },
+  "variant": {
+    "description": "Applies one of the Bootstrap theme color variants to the component"
+  },
+  "textVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the text"
+  },
+  "bgVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the background"
+  },
+  "borderVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the border"
+  },
+  "headerVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the header"
+  },
+  "headerTextVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the header text"
+  },
+  "titleTextVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the title text"
+  },
+  "subTitleTextVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the sub title text"
+  },
+  "headerBgVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the header background"
+  },
+  "headerBorderVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the header border"
+  },
+  "footerVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the footer"
+  },
+  "footerTextVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the footer text"
+  },
+  "footerBgVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the footer background"
+  },
+  "footerBorderVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the footer border"
+  },
+  "bodyVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the body"
+  },
+  "bodyTextVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the body text"
+  },
+  "bodyBgVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the body background"
+  },
+  "bodyBorderVariant": {
+    "description": "Applies one of the Bootstrap theme color variants to the body border"
+  },
+  "tag": {
+    "description": "Specify the HTML tag to render instead of the default tag"
+  },
+  "headerTag": {
+    "description": "Specify the HTML tag to render instead of the default tag for the header"
+  },
+  "footerTag": {
+    "description": "Specify the HTML tag to render instead of the default tag for the footer"
+  },
+  "bodyTag": {
+    "description": "Specify the HTML tag to render instead of the default tag for the body"
+  },
+  "titleTag": {
+    "description": "Specify the HTML tag to render instead of the default tag for the title"
+  },
+  "subTitleTag": {
+    "description": "Specify the HTML tag to render instead of the default tag for the sub title"
+  },
+  "textTag": {
+    "description": "Specify the HTML tag to render instead of the default tag for the text content"
+  },
+  "headerClass": {
+    "description": "CSS class (or classes) to apply to the header"
+  },
+  "footerClass": {
+    "description": "CSS class (or classes) to apply to the footer"
+  },
+  "bodyClass": {
+    "description": "CSS class (or classes) to apply to the body"
+  },
+  "titleClass": {
+    "description": "CSS class (or classes) to apply to the title"
+  },
+  "header": {
+    "description": "Text content to place in the header"
+  },
+  "headerHtml": {
+    "description": "HTML string content to place in the header. Use with caution"
+  },
+  "footer": {
+    "description": "Text content to place in the footer"
+  },
+  "footerHtml": {
+    "description": "HTML string content to place in the footer. Use with caution"
+  },
+  "title": {
+    "description": "Text content to place in the title"
+  },
+  "titleHtml": {
+    "description": "HTML string content to place in the title. Use with caution"
+  },
+  "subTitle": {
+    "description": "Text content to place in the sub title"
+  },
+  "size": {
+    "description": "Set the size of the component's appearance. 'sm', 'md' (default), or 'lg'"
+  },
+  "required": {
+    "description": "Adds the 'required' attribute to the form control"
+  },
+  "form": {
+    "description": "ID of the form that the form control belongs to. Sets the 'form' attribute on the control"
+  },
+  "name": {
+    "description": "Sets the value of the 'name' attribute on the form control"
+  },
+  "placeholder": {
+    "description": "Sets the 'placeholder' attribute value on the form control"
+  },
+  "readonly": {
+    "description": "Sets the 'readonly' attribute on hte form control"
+  },
+  "plaintext": {
+    "description": "Set the form control as readonly and renders the control to look like plain text (no borders)"
+  },
+  "autocomplete": {
+    "description": "Sets the 'autocomplete' attribute value on the form control"
+  },
+  "autofocus": {
+    "description": "When set to 'true', attempts to auto-focus the control when it is mounted, or re-activated when in a keep-alive. Does not set the 'autofocus' attribute on the control"
+  },
+  "state": {
+    "description": "Controls the validation state appearance of the component. 'true' for valid, 'false' for invalid', or 'null' for no validation state"
+  },
+  "options": {
+    "description": "Array of items to render in the component"
+  },
+  "valueField": {
+    "description": "Field name in the 'options' array that should be used for the value"
+  },
+  "textField": {
+    "description": "Field name in the 'options' array that should be used for the text label"
+  },
+  "htmlField": {
+    "description": "Field name in the 'options' array that should be used for the html label instead of text field. Use with caution."
+  },
+  "disabledField": {
+    "description": "Field name in the 'options' array that should be used for the disabled state"
+  },
+  "plain": {
+    "description": "Render the form control in plain mode, rather than custom styled mode"
+  },
+  "static": {
+    "description": "Renders the content of the component in-place in the DOM, rather than portalling it to be appended to the body element"
+  },
+  "src": {
+    "description": "URL to set for the 'src' attribute"
+  },
+  "alt": {
+    "description": "Value to set for the 'alt' attribute"
+  },
+  "role": {
+    "description": "Sets the ARIA attribute 'role' to a specific value"
+  },
+  "ariaRole": {
+    "description": "Sets the ARIA attribute 'role' to a specific value"
+  },
+  "ariaLabel": {
+    "description": "Sets the value of 'aria-label' attribute on the rendered element"
+  },
+  "ariaLabelledby": {
+    "description": "The ID of the element that provides a label for this component. Used as the value for the 'aria-labelledby' attribute"
+  },
+  "ariaDescribedby": {
+    "description": "The ID of the element that provides additional context for this component. Used as the value for the 'aria-describedby' attribute"
+  },
+  "ariaLive": {
+    "description": "When the rendered element is an aria-live region (for screen reader users), set to either 'polite' or 'assertive'"
+  },
+  "fade": {
+    "description": "When set to 'true', enables the fade animation/transition on the component"
+  },
+  "noFade": {
+    "description": "When set to 'true', disables the fade animation/transition on the component"
+  },
+  "disabled": {
+    "description": "When set to 'true', disables the component's functionality and places it in a disabled state"
+  },
+  "active": {
+    "description": "When set to 'true', places the component in the active state with active styling"
+  },
+  "rel": {
+    "description": "Sets the 'rel' attribute on the rendered link"
+  },
+  "target": {
+    "description": "Sets the 'target' attribute on the rendered link"
+  },
+  "href": {
+    "description": "Denotes the target URL of the link for standard a links"
+  },
+  "to": {
+    "description": "router-link prop: Denotes the target route of the link. When clicked, the value of the to prop will be passed to router.push() internally, so the value can be either a string or a Location descriptor object"
+  },
+  "replace": {
+    "description": "router-link prop: Setting the replace prop will call 'router.replace()' instead of 'router.push()' when clicked, so the navigation will not leave a history record"
+  },
+  "append": {
+    "description": "router-link prop: Setting append prop always appends the relative path to the current path"
+  },
+  "exact": {
+    "description": "router-link prop: The default active class matching behavior is inclusive match. Setting this prop forces the mode to exactly match the route"
+  },
+  "activeClass": {
+    "description": "router-link prop: Configure the active CSS class applied when the link is active. Typically you will want to set this to class name 'active'"
+  },
+  "exactActiveClass": {
+    "description": "router-link prop: Configure the active CSS class applied when the link is active with exact match. Typically you will want to set this to class name 'active'"
+  },
+  "routerTag": {
+    "description": "router-link prop: Specify which tag to render, and it will still listen to click events for navigation. 'router-tag' translates to the tag prop on the final rendered router-link. Typically you should use the default value"
+  },
+  "event": {
+    "description": "router-link prop: Specify the event that triggers the link. In most cases you should leave this as the default"
+  },
+  "noPrefetch": {
+    "description": "nuxt-link prop: To improve the responsiveness of your Nuxt.js applications, when the link will be displayed within the viewport, Nuxt.js will automatically prefetch the code splitted page. Setting 'no-prefetch' will disabled this feature for the specific link"
+  }
+}
diff --git a/docs/components/componentdoc.vue b/docs/components/componentdoc.vue
index 2d335f57c0a..dde00ca359e 100644
--- a/docs/components/componentdoc.vue
+++ b/docs/components/componentdoc.vue
@@ -31,10 +31,12 @@
           <code class="notranslate" translate="no">&lt;{{ kebabCase(alias) }}&gt;</code>
         </li>
       </ul>
-      <p class="small text-muted">
-        Note: component aliases are only available when importing all of BootstrapVue or using
-        the component group plugin.
-      </p>
+      <div class="alert alert-info">
+        <p class="mb-0 small">
+          Note: component aliases are only available when importing all of BootstrapVue or using
+          the component group plugin.
+        </p>
+      </div>
     </article>
 
     <article v-if="propsItems && propsItems.length > 0" class="bd-content">
@@ -44,20 +46,22 @@
       <b-table
         :items="propsItems"
         :fields="propsFields"
-        class="bv-docs-table"
+        primary-key="prop"
+        table-class="bv-docs-table"
         responsive="sm"
-        head-variant="default"
-        bordered
+        sort-icon-left
         striped
       >
         <template v-slot:cell(prop)="{ value, item }">
           <code class="text-nowrap notranslate" translate="no">{{ value }}</code>
           <b-badge v-if="item.required" variant="info">Required</b-badge>
-          <b-badge v-else-if="item.deprecated" variant="danger">Deprecated</b-badge>
+          <b-badge v-if="item.isVModel" variant="primary">v-model</b-badge>
+          <b-badge v-if="item.xss" variant="warning">Use with caution</b-badge>
+          <b-badge v-if="item.deprecated" variant="danger">Deprecated</b-badge>
           <b-badge v-else-if="item.deprecation" variant="warning">Deprecation</b-badge>
         </template>
         <template v-slot:cell(defaultValue)="{ value }">
-          <code v-if="value" class="notranslate" translate="no">{{ value }}</code>
+          <code v-if="value" class="word-wrap-normal notranslate" translate="no">{{ value }}</code>
         </template>
         <template v-slot:row-details="{ item }">
           <p v-if="typeof item.deprecated === 'string'" class="mb-1 small">
@@ -68,28 +72,50 @@
           </p>
         </template>
       </b-table>
+      <div v-if="hasRouterProps" class="alert alert-info">
+        <p class="mb-0 small">
+          <code class="notranslate" translate="no">{{ tag }}</code> supports generating
+          <code class="notranslate" translate="no">&lt;router-link&gt;</code> or
+          <code class="notranslate" translate="no">&lt;nuxt-link&gt;</code> component (if using Nuxt.js).
+          For more details on the router link (or nuxt link) specific props, see the
+          <b-link to="/docs/reference/router-links" class="alert-link">Router support</b-link>
+          reference section.
+        </p>
+      </div>
+      <div v-if="hasHtmlProps" class="alert alert-warning">
+        <p class="mb-0 small">
+          <strong>Caution:</strong> Props that support HTML strings
+          (<code class="notranslate" translate="no">*-html</code>) can be vulerable to
+          <b-link href="https://en.wikipedia.org/wiki/Cross-site_scripting" class="alert-link" target="_blank">
+            Cross Site Scripting (XSS) attacks
+          </b-link>
+          when passed raw user supplied values. You must properly
+          <b-link href="https://en.wikipedia.org/wiki/HTML_sanitization" class="alert-link" target="_blank">
+            sanitize
+          </b-link>
+          the user input first!
+        </p>
+      </div>
+    </article>
 
-      <template v-if="componentVModel">
-        <anchored-heading :id="`comp-ref-${componentName}-v-model`" level="4">
-          v-model
-        </anchored-heading>
-        <b-table
-          :items="[componentVModel]"
-          :fields="[{ key: 'prop', label: 'Property' }, 'event']"
-          class="bv-docs-table"
-          responsive="sm"
-          head-variant="default"
-          bordered
-          striped
-        >
-          <template v-slot:cell(prop)="{ value }">
-            <code class="notranslate" translate="no">{{ kebabCase(value) }}</code>
-          </template>
-          <template v-slot:cell(event)="{ value }">
-            <code class="notranslate" translate="no">{{ value }}</code>
-          </template>
-        </b-table>
-      </template>
+    <article v-if="componentVModel" class="bd-content">
+      <anchored-heading :id="`comp-ref-${componentName}-v-model`" level="4">
+        v-model
+      </anchored-heading>
+      <b-table-lite
+        :items="[componentVModel]"
+        :fields="[{ key: 'prop', label: 'Property' }, 'event']"
+        table-class="bv-docs-table"
+        responsive="sm"
+        striped
+      >
+        <template v-slot:cell(prop)="{ value }">
+          <code class="notranslate" translate="no">{{ kebabCase(value) }}</code>
+        </template>
+        <template v-slot:cell(event)="{ value }">
+          <code class="notranslate" translate="no">{{ value }}</code>
+        </template>
+      </b-table-lite>
     </article>
 
     <article v-if="slots && slots.length > 0" class="bd-content">
@@ -97,16 +123,61 @@
         Slots
       </anchored-heading>
       <b-table
-        :items="slots"
+        :items="slotsItems"
         :fields="slotsFields"
-        class="bv-docs-table"
+        primary-key="name"
+        table-class="bv-docs-table"
         responsive="sm"
-        head-variant="default"
-        bordered
+        sort-icon-left
         striped
       >
         <template v-slot:cell(name)="{ value }">
-          <code class="text-nowrap nostranslate" translate="no">{{ value }}</code>
+          <code class="text-nowrap notranslate" translate="no">{{ value }}</code>
+        </template>
+        <template v-slot:cell(scope)="{ value, toggleDetails }">
+          <b-button
+            v-if="value"
+            variant="info"
+            size="sm"
+            class="py-0"
+            @click="toggleDetails()"
+          >
+            Scope
+          </b-button>
+        </template>
+        <template v-slot:row-details="{ item }">
+          <b-card>
+            <b-table-lite
+              v-if="item.scope"
+              :items="item.scope"
+              :fields="[{ key: 'prop', label: 'Property' }, 'type', 'description']"
+              primary-key="prop"
+              class="mb-0"
+              head-variant="dark"
+              striped
+              small
+              caption-top
+            >
+              <template v-slot:thead-top>
+                <b-tr>
+                  <b-th colspan="3" class="text-center">
+                    Slot
+                    <code class="text-nowrap notranslate text-white" translate="no">
+                      {{ item.name }}
+                    </code>
+                    scoped properties
+                  </b-th>
+                </b-tr>
+              </template>
+              <template v-slot:cell(prop)="{ value }">
+                <code class="text-nowrap notranslate" translate="no">{{ value }}</code>
+              </template>
+              <template v-slot:cell(type)="{ value }">
+                <span v-if="value" class="text-nowrap notranslate" translate="no">{{ value }}</span>
+                <template v-else>Any</template>
+              </template>
+            </b-table-lite>
+          </b-card>
         </template>
       </b-table>
     </article>
@@ -118,14 +189,13 @@
       <b-table
         :items="events"
         :fields="eventsFields"
-        class="bv-docs-table"
+        primary-key="event"
+        table-class="bv-docs-table"
         responsive="sm"
-        head-variant="default"
-        bordered
         striped
       >
         <template v-slot:cell(event)="{ value }">
-          <code class="text-nowrap notranslate" translate="no">{{ value }}</code>
+          <code class="notranslate" translate="no">{{ value }}</code>
         </template>
         <template v-slot:cell(args)="{ value, item }">
           <p
@@ -134,7 +204,7 @@
             class="mb-1"
           >
             <template v-if="arg.arg">
-              <code class="text-nowrap notranslate" translate="no">{{ arg.arg }}</code> -
+              <code class="notranslate" translate="no">{{ arg.arg }}</code> -
             </template>
             <span>{{ arg.description }}</span>
           </p>
@@ -150,13 +220,12 @@
         You can control <code class="notranslate" translate="no">{{ tag }}</code> by emitting the
         following events on <samp class="notranslate" translate="no">$root</samp>:
       </p>
-      <b-table
+      <b-table-lite
         :items="rootEventListeners"
         :fields="rootEventListenersFields"
-        class="bv-docs-table"
+        primary-key="event"
+        table-class="bv-docs-table"
         responsive="sm"
-        head-variant="default"
-        bordered
         striped
       >
         <template v-slot:cell(event)="{ value }">
@@ -174,21 +243,43 @@
             </template>
           </p>
         </template>
-      </b-table>
+      </b-table-lite>
     </article>
   </section>
 </template>
 
+<style scoped>
+h3::before {
+  display: block;
+  height: 1.25rem;
+  margin-top: -1.25rem;
+  content: '';
+}
+
+/deep/ .word-wrap-normal {
+  white-space: normal !important;
+  word-break: normal !important;
+  overflow-wrap: normal !important;
+}
+</style>
+
 <script>
 import Vue from 'vue'
 import kebabCase from 'lodash/kebabCase'
 import AnchoredHeading from './anchored-heading'
+// Fallback descriptions for common props (mainly router-link props)
+import commonProps from '../common-props.json'
 
 export default {
   name: 'BDVComponentdoc',
   components: { AnchoredHeading },
   props: {
     component: {},
+    propsMeta: {
+      // For getting pro descriptions
+      type: Array,
+      default: () => []
+    },
     slots: {
       type: Array,
       default: () => []
@@ -234,18 +325,41 @@ export default {
       return this.componentOptions.functional
     },
     componentVModel() {
-      const model = this.componentOptions.model
-      return model && model.prop && model.event ? model : false
+      const model = this.componentOptions.model || {}
+      return model.prop && model.event ? model : false
     },
     componentProps() {
       return this.componentOptions.props || {}
     },
+    hasRouterProps() {
+      return this.propsItems.some(p => {
+        return p.prop === 'to' || p.prop === 'split-to' || p.prop === 'exact-active-class'
+      })
+    },
+    hasHtmlProps() {
+      return this.propsItems.some(p => p.xss)
+    },
+    componentPropsMetaObj() {
+      // Returns the propsMeta array in object format for easy lookups
+      return this.propsMeta.reduce((obj, propMeta) => {
+        if (propMeta.prop) {
+          obj[propMeta.prop] = propMeta
+        }
+        return obj
+      }, {})
+    },
     propsFields() {
-      return [
-        { key: 'prop', label: 'Property' },
+      const fields = [
+        { key: 'prop', label: 'Property', sortable: this.propsItems.length > 9 },
         { key: 'type', label: 'Type' },
-        { key: 'defaultValue', label: 'Default Value' }
+        { key: 'defaultValue', label: 'Default' }
       ]
+      if (this.propsItems.some(p => p.description)) {
+        // If any of the props have a description, then
+        // add the description column
+        fields.push({ key: 'description', label: 'Description' })
+      }
+      return fields
     },
     eventsFields() {
       return [
@@ -262,50 +376,69 @@ export default {
       ]
     },
     slotsFields() {
-      return [{ key: 'name', label: 'Slot' }, { key: 'description', label: 'Description' }]
+      const fields = [
+        { key: 'name', label: 'Slot Name', sortable: this.slotsItems.length > 9 },
+        { key: 'description', label: 'Description' }
+      ]
+      if (this.slots.length > 0 && this.slots.some(s => s.scope)) {
+        fields.push({ key: 'scope', label: 'Scoped' })
+      }
+      return fields
     },
     propsItems() {
       const props = this.componentProps
+      const propsMetaObj = this.componentPropsMetaObj
 
       return Object.keys(props).map(prop => {
         const p = props[prop]
+        const meta = propsMetaObj[prop] || {}
 
         // Describe type
-        let type = p.type || Object
-        let typeClass = String
+        let type = p.type
         if (Array.isArray(type)) {
-          typeClass = type[0]
           type = type.map(t => t.name).join(' or ')
+        } else if (typeof type === 'undefined') {
+          type = 'Any'
         } else {
-          typeClass = type
           type = type.name
         }
 
-        // Describe value
+        // Default value
         let defaultVal = p.default
         if (defaultVal instanceof Function && !Array.isArray(defaultVal)) {
           defaultVal = defaultVal()
         }
-        if (typeof defaultVal !== 'string') {
-          defaultVal = JSON.stringify(defaultVal)
+        if (typeof defaultVal === 'undefined' || defaultVal === null) {
+          defaultVal = ''
         }
-        if (defaultVal === '' || defaultVal === null || defaultVal === 'null') {
+        defaultVal = JSON.stringify(defaultVal).replace(/"/g, "'")
+        if (defaultVal === "''") {
           defaultVal = ''
         }
-        defaultVal = (defaultVal || '').replace(/"/g, "'")
+
+        const fallbackMeta = commonProps[prop] || {}
+        const description =
+          typeof meta.description === 'undefined' ? fallbackMeta.description : meta.description
 
         return {
           prop: kebabCase(prop),
           type,
-          typeClass,
           defaultValue: defaultVal,
           required: p.required || false,
+          description: description || '',
+          xss: /[a-z]Html$/.test(prop),
+          isVModel: this.componentVModel && this.componentVModel.prop === prop,
           deprecated: p.deprecated || false,
           deprecation: p.deprecation || false,
           _showDetails: typeof p.deprecated === 'string' || typeof p.deprecation === 'string'
         }
       })
     },
+    slotsItems() {
+      // We use object spread here so that _showDetails doesn't
+      // mutate the original array objects
+      return this.slots ? this.slots.map(s => ({ ...s })) : []
+    },
     componentName() {
       return kebabCase(this.component)
     },
diff --git a/docs/components/importdoc.vue b/docs/components/importdoc.vue
index 8d160a9c3e2..c246369c47b 100644
--- a/docs/components/importdoc.vue
+++ b/docs/components/importdoc.vue
@@ -16,10 +16,9 @@
 
         <b-table
           :items="componentImports"
-          class="bv-docs-table"
+          table-class="bv-docs-table"
           responsive="sm"
           head-variant="default"
-          bordered
           striped
         >
           <template v-slot:cell(component)="{ value }">
@@ -51,10 +50,9 @@
 
         <b-table
           :items="directiveImports"
-          class="bv-docs-table"
+          table-class="bv-docs-table"
           responsive="sm"
           head-variant="default"
-          bordered
           striped
         >
           <template v-slot:cell(directive)="{ value }">
@@ -90,11 +88,10 @@
       <b-table
         :items="pluginImports"
         :fileds="['namedExport', 'importPath']"
-        class="bv-docs-table"
+        table-class="bv-docs-table"
         responsive="sm"
         head-variant="default"
         caption-top
-        bordered
         striped
       >
         <template v-slot:cell(namedExport)="{ value }">
@@ -184,7 +181,11 @@ export default {
       return [].concat(this.meta.component, subcomponents).filter(c => c)
     },
     directives() {
-      return [].concat(this.meta.directive, this.meta.directives).filter(d => d)
+      // We just need the directive name
+      return []
+        .concat(this.meta.directive, this.meta.directives)
+        .filter(d => d)
+        .map(d => (typeof d === 'string' ? d : d.directive))
     },
     componentImportCode() {
       const firstComponent = this.components[0]
diff --git a/docs/markdown/intro/README.md b/docs/markdown/intro/README.md
index 2e4c8d25d41..ce0f90972ad 100644
--- a/docs/markdown/intro/README.md
+++ b/docs/markdown/intro/README.md
@@ -654,7 +654,6 @@ your project:
 - Convert your native Bootstrap HTML markup into the simplified BootstrapVue custom component markup
 - Start by converting only the interactive controls that require Bootstrap's javascript first.
 
-
 ## Browser support
 
 ### CSS
diff --git a/docs/pages/docs/components/_slug.js b/docs/pages/docs/components/_slug.js
index 48ec37c4e40..3dd9b6cc125 100644
--- a/docs/pages/docs/components/_slug.js
+++ b/docs/pages/docs/components/_slug.js
@@ -32,10 +32,11 @@ export default {
       // Heading
       h(AnchoredHeading, { props: { id: 'component-reference' } }, 'Component reference'),
       // Component reference information
-      ...this.meta.components.map(({ component, events, rootEventListeners, slots, aliases }) =>
-        h(Componentdoc, {
-          props: { component, events, rootEventListeners, slots, aliases }
-        })
+      ...this.meta.components.map(
+        ({ component, events, rootEventListeners, slots, aliases, props: propsMeta }) =>
+          h(Componentdoc, {
+            props: { component, events, rootEventListeners, slots, aliases, propsMeta }
+          })
       ),
       // Component importing information
       h(Importdoc, { props: { meta: this.meta } })
diff --git a/package.json b/package.json
index 95ebae9a618..95810fe05d2 100644
--- a/package.json
+++ b/package.json
@@ -123,6 +123,7 @@
     "nuxt": "^2.9.2",
     "postcss-cli": "^6.1.3",
     "prettier": "1.14.3",
+    "require-context": "^1.1.0",
     "rollup": "^1.21.4",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.1.0",
diff --git a/src/components/alert/package.json b/src/components/alert/package.json
index 910ad2dcfed..e5660eb4158 100644
--- a/src/components/alert/package.json
+++ b/src/components/alert/package.json
@@ -7,6 +7,20 @@
     "components": [
       {
         "component": "BAlert",
+        "props": [
+          {
+            "prop": "dismissible",
+            "description": "When set, enables the dismiss close button"
+          },
+          {
+            "prop": "dismissLabel",
+            "description": "Value for the 'aria-label' attribute on the dismiss button"
+          },
+          {
+            "prop": "show",
+            "description": "When set, shows the alert. Set to a number (seconds) to show and automatically dismiss the alert after the number of seconds has elapsed"
+          }
+        ],
         "events": [
           {
             "event": "dismissed",
@@ -18,9 +32,24 @@
             "args": [
               {
                 "arg": "dismissCountDown",
+                "type": "Number",
                 "description": "Time remaining to dismissed"
               }
             ]
+          },
+          {
+            "event": "input",
+            "description": "Used to update the v-model show value",
+            "args": [
+              {
+                "arg": "show",
+                "type": [
+                  "Boolean",
+                  "Number"
+                ],
+                "description": "Boolean state of alert, or Number for current countdown value"
+              }
+            ]
           }
         ],
         "slots": [
diff --git a/src/components/badge/package.json b/src/components/badge/package.json
index 2f3f34c3909..f4dc9aacf12 100644
--- a/src/components/badge/package.json
+++ b/src/components/badge/package.json
@@ -5,7 +5,15 @@
     "title": "Badge",
     "description": "Small and adaptive tag for adding context to just about any content.",
     "components": [
-      "BBadge"
+      {
+        "component": "BBadge",
+        "props": [
+          {
+            "prop": "pill",
+            "description": "When set to 'true', renders the badge in pill style"
+          }
+        ]
+      }
     ]
   }
 }
diff --git a/src/components/breadcrumb/package.json b/src/components/breadcrumb/package.json
index efa5aab131d..1207101cc6f 100644
--- a/src/components/breadcrumb/package.json
+++ b/src/components/breadcrumb/package.json
@@ -5,16 +5,39 @@
     "title": "Breadcrumb",
     "description": "Indicate the current page's location within a navigational hierarchy. Separators are automatically added in CSS through ::before and content.",
     "components": [
-      "BBreadcrumb",
+      {
+        "component": "BBreadcrumb",
+        "props": [
+          {
+            "prop": "items",
+            "description": "Array of breadcrumb items to render"
+          }
+        ]
+      },
       {
         "component": "BBreadcrumbItem",
+        "props": [
+          {
+            "prop": "text",
+            "description": "Text to render in the breadcrumb item"
+          },
+          {
+            "prop": "html",
+            "description": "HTML string to render in the breadcrumb item. Use with caution"
+          },
+          {
+            "prop": "ariaCurrent",
+            "description": "Sets the value of the 'aria-current' attribute (when the item is the active item). Supported string values are 'location', 'page', or 'true'"
+          }
+        ],
         "events": [
           {
             "event": "click",
             "description": "Emitted when clicked",
             "args": [
               {
-                "name": "event",
+                "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native click event object"
               }
             ]
diff --git a/src/components/button-group/package.json b/src/components/button-group/package.json
index 7ffa9d20704..c2cb4db5885 100644
--- a/src/components/button-group/package.json
+++ b/src/components/button-group/package.json
@@ -7,6 +7,13 @@
     "components": [
       {
         "component": "BButtonGroup",
+        "description": "Group a series of buttons together on a single line",
+        "props": [
+          {
+            "prop": "vertical",
+            "description": "When set, rendered the button group in vertical mode"
+          }
+        ],
         "aliases": [
           "BBtnGroup"
         ]
diff --git a/src/components/button-toolbar/package.json b/src/components/button-toolbar/package.json
index f0c3578d716..c02430dddee 100644
--- a/src/components/button-toolbar/package.json
+++ b/src/components/button-toolbar/package.json
@@ -7,6 +7,17 @@
     "components": [
       {
         "component": "BButtonToolbar",
+        "description": "Group a series of <b-button-group> and/or <b-input-group> together on a single line, with optional keyboard navigation.",
+        "props": [
+          {
+            "prop": "justify",
+            "description": "Make the toolbar span the maximum available width, by increasing spacing between the button groups, input groups and dropdowns"
+          },
+          {
+            "prop": "keyNav",
+            "description": "When set, enabled keyboard navigation mode for the toolbar. Do not set this prop when the toolbar has inputs"
+          }
+        ],
         "aliases": [
           "BBtnToolbar"
         ]
diff --git a/src/components/button/package.json b/src/components/button/package.json
index e2322d6b806..ec15122b210 100644
--- a/src/components/button/package.json
+++ b/src/components/button/package.json
@@ -10,6 +10,28 @@
         "aliases": [
           "BBtn"
         ],
+        "props": [
+          {
+            "prop": "block",
+            "description": "Renders a 100% width button (expands to the width of it's parent container)"
+          },
+          {
+            "prop": "type",
+            "description": "The value to set the button's 'type' attribute to. Can be one of 'button', 'submit', or 'reset'"
+          },
+          {
+            "prop": "pill",
+            "description": "Renders the button with the pill style appearance when set to 'true'"
+          },
+          {
+            "prop": "squared",
+            "description": "Renders the button with non-rounded corners when set to 'true'"
+          },
+          {
+            "prop": "pressed",
+            "description": "When set to 'true', gives the button the appearance of being pressed. Syncable with the .sync modifier"
+          }
+        ],
         "events": [
           {
             "event": "click",
@@ -17,6 +39,7 @@
             "args": [
               {
                 "name": "event",
+                "type": "MouseEvent",
                 "description": "Native click event object"
               }
             ]
@@ -35,6 +58,7 @@
             "args": [
               {
                 "name": "event",
+                "type": "MouseEvent",
                 "description": "Native click event object"
               }
             ]
diff --git a/src/components/card/card-img-lazy.js b/src/components/card/card-img-lazy.js
index 75d0713b69f..91f3d364ff7 100644
--- a/src/components/card/card-img-lazy.js
+++ b/src/components/card/card-img-lazy.js
@@ -26,23 +26,23 @@ export const props = {
     type: Boolean,
     default: false
   },
-  left: {
+  start: {
     type: Boolean,
     default: false
   },
-  start: {
+  left: {
+    // alias of 'start'
     type: Boolean,
     default: false
-    // alias of 'left'
   },
-  right: {
+  end: {
     type: Boolean,
     default: false
   },
-  end: {
+  right: {
+    // alias of 'end'
     type: Boolean,
     default: false
-    // alias of 'right'
   }
 }
 
diff --git a/src/components/card/card-img.js b/src/components/card/card-img.js
index 253f3f48294..0c830c617cc 100644
--- a/src/components/card/card-img.js
+++ b/src/components/card/card-img.js
@@ -19,30 +19,30 @@ export const props = {
     type: Boolean,
     default: false
   },
-  left: {
+  start: {
     type: Boolean,
     default: false
   },
-  start: {
+  left: {
+    // alias of 'start'
     type: Boolean,
     default: false
-    // alias of 'left'
   },
-  right: {
+  end: {
     type: Boolean,
     default: false
   },
-  end: {
+  right: {
+    // alias of 'end'
     type: Boolean,
     default: false
-    // alias of 'right'
   },
   height: {
-    type: String,
+    type: [Number, String],
     default: null
   },
   width: {
-    type: String,
+    type: [Number, String],
     default: null
   }
 }
diff --git a/src/components/card/package.json b/src/components/card/package.json
index 4785356d003..44c47a9d12a 100644
--- a/src/components/card/package.json
+++ b/src/components/card/package.json
@@ -7,6 +7,60 @@
     "components": [
       {
         "component": "BCard",
+        "props": [
+          {
+            "prop": "overlay",
+            "description": "When set, will overlay the card body on top of the image (if the card has an image)"
+          },
+          {
+            "prop": "noBody",
+            "description": "Disable rendering of the default inner card-body element"
+          },
+          {
+            "prop": "align",
+            "description": "Text alignment for the card's content: 'left', 'center' or 'right'"
+          },
+          {
+            "prop": "imgSrc",
+            "description": "URL for the optional image"
+          },
+          {
+            "prop": "imgAlt",
+            "description": "Value to set the image attribute 'alt'"
+          },
+          {
+            "prop": "imgWidth",
+            "description": "The value to set on the image's 'width' attribute"
+          },
+          {
+            "prop": "imgHeight",
+            "description": "The value to set on the image's 'height' attribute"
+          },
+          {
+            "prop": "imgTop",
+            "description": "Set if the image should appear at the top of the card"
+          },
+          {
+            "prop": "imgBottom",
+            "description": "Set if the image should appear at the bottom of the card"
+          },
+          {
+            "prop": "imgStart",
+            "description": "Set if the image should appear at the start (left) of the card"
+          },
+          {
+            "prop": "imgLeft",
+            "description": "Set if the image should appear at the start (left) of the card. Synonym for the 'left' prop"
+          },
+          {
+            "prop": "imgEnd",
+            "description": "Set if the image should appear at the end (right) of the card"
+          },
+          {
+            "prop": "imgRight",
+            "description": "Set if the image should appear at the end (right) of the card. Synonym for the 'right' prop"
+          }
+        ],
         "slots": [
           {
             "name": "header",
@@ -20,13 +74,129 @@
       },
       "BCardHeader",
       "BCardFooter",
-      "BCardBody",
+      {
+        "component": "BCardBody",
+        "props": [
+          {
+            "prop": "overlay",
+            "description": "When set, will overlay the card body on top of the image (if the card has an image)"
+          }
+        ]
+      },
       "BCardTitle",
       "BCardSubTitle",
-      "BCardImg",
-      "BCardImgLazy",
+      {
+        "component": "BCardImg",
+        "props": [
+          {
+            "prop": "width",
+            "description": "The value to set on the image's 'width' attribute"
+          },
+          {
+            "prop": "height",
+            "description": "The value to set on the image's 'height' attribute"
+          },
+          {
+            "prop": "top",
+            "description": "Set if the image will be placed at the top of the card"
+          },
+          {
+            "prop": "bottom",
+            "description": "Set if the image will be placed at the bottom of the card"
+          },
+          {
+            "prop": "start",
+            "description": "Set if the image will be placed at the start (left) of the card"
+          },
+          {
+            "prop": "left",
+            "description": "Set if the image will be placed at the start (left) of the card. Synonym for the 'left' prop"
+          },
+          {
+            "prop": "end",
+            "description": "Set if the image will be placed at the end (right) of the card"
+          },
+          {
+            "prop": "right",
+            "description": "Set if the image will be placed at the end (right) of the card. Synonym for the 'right' prop"
+          }
+        ]
+      },
+      {
+        "component": "BCardImgLazy",
+        "props": [
+          {
+            "prop": "show",
+            "description": "If set to true, will force show the image specified via the 'src' prop"
+          },
+          {
+            "prop": "offset",
+            "description": "Number of pixels away from the viewport edge before the lazy image is loaded"
+          },
+          {
+            "prop": "blankSrc",
+            "description": "URL of placeholder image. If not set, an SVG placeholder placeholder will be used"
+          },
+          {
+            "prop": "blankColor",
+            "description": "CSS color of the blank SVG placeholder image. Has no effect if 'blank-src' is set"
+          },
+          {
+            "prop": "blankWidth",
+            "description": "Value of the 'width' attribute for the placeholder image"
+          },
+          {
+            "prop": "blankHeight",
+            "description": "Value of the 'height' attribute for the placeholder image"
+          },
+          {
+            "prop": "width",
+            "description": "The value to set on the image's 'width' attribute"
+          },
+          {
+            "prop": "height",
+            "description": "The value to set on the image's 'height' attribute"
+          },
+          {
+            "prop": "top",
+            "description": "Set if the image will be placed at the top of the card"
+          },
+          {
+            "prop": "bottom",
+            "description": "Set if the image will be placed at the bottom of the card"
+          },
+          {
+            "prop": "start",
+            "description": "Set if the image will be placed at the start (left) of the card"
+          },
+          {
+            "prop": "left",
+            "description": "Set if the image will be placed at the start (left) of the card. Synonym for the 'left' prop"
+          },
+          {
+            "prop": "end",
+            "description": "Set if the image will be placed at the end (right) of the card"
+          },
+          {
+            "prop": "right",
+            "description": "Set if the image will be placed at the end (right) of the card. Synonym for the 'right' prop"
+          }
+        ]
+      },
       "BCardText",
-      "BCardGroup"
+      {
+        "component": "BCardGroup",
+        "props": [
+          {
+            "prop": "deck",
+            "description": "When set renders the card group with gutters between cards"
+          },
+          {
+            "prop": "columns",
+            "description": "When set, renders the card group in a masonry-like columnar style"
+          }
+        ]
+      }
     ]
   }
 }
diff --git a/src/components/carousel/package.json b/src/components/carousel/package.json
index 60ed915ee3f..d22cbfc449b 100644
--- a/src/components/carousel/package.json
+++ b/src/components/carousel/package.json
@@ -7,6 +7,73 @@
     "components": [
       {
         "component": "BCarousel",
+        "description": "The <b-carousel> component is a slideshow for cycling through a series of slide content",
+        "props": [
+          {
+            "prop": "fade",
+            "description": "When set, changes the slide animation to a crossfade instead of a sliding effect"
+          },
+          {
+            "prop": "noAnimation",
+            "description": "When set, disables animation when transitioning between slides"
+          },
+          {
+            "prop": "indicators",
+            "description": "Enable the indicator buttons for jumping to specific slides"
+          },
+          {
+            "prop": "controls",
+            "description": "Enable the previous and next controls"
+          },
+          {
+            "prop": "noWrap",
+            "description": "Do not restart the slide show when then end is reached"
+          },
+          {
+            "prop": "noTouch",
+            "description": "Disable controlling the slides via touch swipes"
+          },
+          {
+            "prop": "noHoverPause",
+            "description": "When set, disables the pausing of hte slide show when the current slide is hovered"
+          },
+          {
+            "prop": "interval",
+            "description": "Set the delay time (in milliseconds) between slides"
+          },
+          {
+            "prop": "imgWidth",
+            "description": "Set the default image 'width' attribute for all b-tab children"
+          },
+          {
+            "prop": "imgHeight",
+            "description": "Set the default image 'height' attribute for all b-tab children"
+          },
+          {
+            "prop": "value",
+            "description": "The currently active slide (zero-indexed)"
+          },
+          {
+            "prop": "labelPrev",
+            "description": "Sets the 'aria-label' value for the previous slide control"
+          },
+          {
+            "prop": "labelNext",
+            "description": "Sets the 'aria-label' value for the next slide control"
+          },
+          {
+            "prop": "labelGotoSlide",
+            "description": "Sets the prefix for the 'aria-label' on the slide indicator controls. Will be suffixed with the slide number (1 indexed)"
+          },
+          {
+            "prop": "labelIndicators",
+            "description": "Sets the 'aria-label' on the indicator controls wrapper"
+          },
+          {
+            "prop": "background",
+            "description": "Set the CSS color of the carousel's background"
+          }
+        ],
         "events": [
           {
             "event": "sliding-start",
@@ -14,6 +81,7 @@
             "args": [
               {
                 "arg": "slide",
+                "type": "Number",
                 "description": "Slide number that is being slid to."
               }
             ]
@@ -24,6 +92,7 @@
             "args": [
               {
                 "arg": "slide",
+                "type": "Number",
                 "description": "Slide number that was slid to."
               }
             ]
@@ -32,6 +101,65 @@
       },
       {
         "component": "BCarouselSlide",
+        "description": "The <b-carousel-slide> component is a slide to be placed in the <b-carousel>",
+        "props": [
+          {
+            "prop": "imgSrc",
+            "description": "Sets the URL of the image"
+          },
+          {
+            "prop": "imgAlt",
+            "description": "Sets the value of the 'alt' attribute on the image"
+          },
+          {
+            "prop": "imgWidth",
+            "description": "Set the default image 'width' attribute for all b-tab children"
+          },
+          {
+            "prop": "imgHeight",
+            "description": "Set the default image 'height' attribute for all b-tab children"
+          },
+          {
+            "prop": "imgBlank",
+            "description": "If set, will render a blank image instead of the img-src"
+          },
+          {
+            "prop": "imgBlankColor",
+            "description": "Set the CSS color to use as the fill of the blank image"
+          },
+          {
+            "prop": "contentTag",
+            "description": "Specify the HTML tag to render instead of the default tag for the content wrapper"
+          },
+          {
+            "prop": "captionTag",
+            "description": "Specify the HTML tag to render instead of the default tag for the caption wrapper"
+          },
+          {
+            "prop": "contentVisibleUp",
+            "description": "Specify the breakpoint that the textual content will start to be shown. Leave at default to always show the textual content"
+          },
+          {
+            "prop": "caption",
+            "description": "Text content to place in the caption"
+          },
+          {
+            "prop": "captionHtml",
+            "description": "HTML string content to place in the caption. Use with caution"
+          },
+          {
+            "prop": "text",
+            "description": "Text content to place in the text of the slide"
+          },
+          {
+            "prop": "textHtml",
+            "description": "HTML string content to place in the text of the slide. Use with caution"
+          },
+          {
+            "prop": "background",
+            "description": "CSS color to use as the slide's background color"
+          }
+        ],
         "slots": [
           {
             "name": "img",
diff --git a/src/components/collapse/package.json b/src/components/collapse/package.json
index 76c66af0f79..9be02e5dcf4 100644
--- a/src/components/collapse/package.json
+++ b/src/components/collapse/package.json
@@ -5,12 +5,48 @@
     "title": "Collapse",
     "description": "Easily toggle content visibility on your pages. Includes support for making accordions.",
     "directives": [
-      "VBToggle"
+      {
+        "directive": "VBToggle",
+        "description": "Directive for toggling a collapse by ID",
+        "expression": "String",
+        "modifiers": [
+          {
+            "name": "{collapseId}",
+            "pattern": "[a-zA-Z][a-zA-Z0-9_\\-]*",
+            "description": "Collapse ID to open. Replace `{collapseId}` with the collapse's ID"
+          }
+        ]
+      }
     ],
     "components": [
       {
         "component": "BCollapse",
+        "props": [
+          {
+            "prop": "isNav",
+            "description": "When set, signifies that hte collapse is bart of a navbar, enabling certain features for navbar support"
+          },
+          {
+            "prop": "accordion",
+            "description": "The name of the accordion group that this collapse belongs to"
+          },
+          {
+            "prop": "visible",
+            "description": "When 'true', expands the collapse"
+          }
+        ],
         "events": [
+          {
+            "event": "input",
+            "description": "Used to update the v-model",
+            "args": [
+              {
+                "arg": "visible",
+                "type": "Boolean",
+                "description": "Will be true if the collapse is visible"
+              }
+            ]
+          },
           {
             "event": "show",
             "description": "Emitted when collapse has started to open"
@@ -33,11 +69,13 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "changed state collapse id"
               },
               {
                 "arg": "state",
-                "description": "true/false, i.e. opened/closed"
+                "type": "Boolean",
+                "description": "true or false, i.e. opened or closed"
               }
             ]
           }
@@ -49,6 +87,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "collapse id to toggle"
               }
             ]
diff --git a/src/components/dropdown/package.json b/src/components/dropdown/package.json
index 3eb7e9f9db0..8464be63571 100644
--- a/src/components/dropdown/package.json
+++ b/src/components/dropdown/package.json
@@ -10,6 +10,92 @@
         "aliases": [
           "BDd"
         ],
+        "props": [
+          {
+            "prop": "text",
+            "description": "Text to place in the toggle button, or in the split button is split mode"
+          },
+          {
+            "prop": "html",
+            "description": "HTML string to place in the toggle button, or in the split button is split mode. Use with caution"
+          },
+          {
+            "prop": "dropup",
+            "description": "When set, positions the menu on the top of the button"
+          },
+          {
+            "prop": "dropright",
+            "description": "When set, positions the menu to the right of the button"
+          },
+          {
+            "prop": "dropleft",
+            "description": "When set, positions the menu to the left of the button"
+          },
+          {
+            "prop": "right",
+            "description": "Align the right edge of the menu with the right of the button"
+          },
+          {
+            "prop": "noFlip",
+            "description": "Prevent the menu from auto flipping positions"
+          },
+          {
+            "prop": "offset",
+            "description": "Specify the number of pixes to shift the menu by. Negative values supported"
+          },
+          {
+            "prop": "lazy",
+            "description": "When set, will only mount the menu content into the DOM when the menu is open"
+          },
+          {
+            "prop": "popperOpts",
+            "description": "Additional configuration to pass to Popper.js"
+          },
+          {
+            "prop": "toggleText",
+            "description": "ARIA label (sr-only) to set on the toggle when in split mode"
+          },
+          {
+            "prop": "menuClass",
+            "description": "CSS class (or classes) to add to the menu container"
+          },
+          {
+            "prop": "toggleTag",
+            "description": "Specify the HTML tag to render instead of the default tag. Use with caution"
+          },
+          {
+            "prop": "toggleClass",
+            "description": "CSS class (or classes) to add to the toggle button"
+          },
+          {
+            "prop": "noCaret",
+            "description": "Hide the caret indicator on the toggle button"
+          },
+          {
+            "prop": "split",
+            "description": "When set, renders a split button dropdown"
+          },
+          {
+            "prop": "splitHref",
+            "description": "Denotes the target URL of the link for the split button"
+          },
+          {
+            "prop": "splitTo",
+            "description": "router-link prop: Denotes the target route of the split button. When clicked, the value of the to prop will be passed to router.push() internally, so the value can be either a string or a Location descriptor object"
+          },
+          {
+            "prop": "splitVariant",
+            "description": "Applies one of the Bootstrap theme color variants to the split button. Defaults to the 'variant' prop value"
+          },
+          {
+            "prop": "splitButtonType",
+            "description": "Value to place in the 'type' attribute on the split button: 'button', 'submit', 'reset'"
+          },
+          {
+            "prop": "boundary",
+            "description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement"
+          }
+        ],
         "events": [
           {
             "event": "show",
@@ -17,6 +103,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object. Call bvEvt.preventDefault() to cancel show."
               }
             ]
@@ -31,6 +118,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object. Call bvEvt.preventDefault() to cancel hide."
               }
             ]
@@ -45,7 +133,14 @@
           },
           {
             "event": "click",
-            "description": "Emitted when split button is clicked in split mode."
+            "description": "Emitted when split button is clicked in split mode.",
+            "args": [
+              {
+                "arg": "event",
+                "type": "MouseEvent",
+                "description": "Native click event object"
+              }
+            ]
           },
           {
             "event": "bv::dropdown::show",
@@ -53,6 +148,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object. Call bvEvt.preventDefault() to cancel show."
               }
             ]
@@ -63,6 +159,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object. Call bvEvt.preventDefault() to cancel hide."
               }
             ]
@@ -72,6 +169,17 @@
           {
             "name": "button-content",
             "description": "Can be used to implement custom text with icons and more styling."
+          },
+          {
+            "name": "default",
+            "description": "Optionally scoped default slot for dropdown menu content",
+            "scope": [
+              {
+                "prop": "hide",
+                "type": "Function",
+                "description": "Can be used to close the dropdown menu. Accepts an optional boolean argument, which if true returns focus to the toggle button."
+              }
+            ]
           }
         ]
       },
@@ -87,6 +195,7 @@
             "args": [
               {
                 "name": "event",
+                "type": "MouseEvent",
                 "description": "Native click event object"
               }
             ]
@@ -107,6 +216,7 @@
             "args": [
               {
                 "name": "event",
+                "type": "MouseEvent",
                 "description": "Native click event object"
               }
             ]
@@ -123,6 +233,20 @@
         "component": "BDropdownForm",
         "aliases": [
           "BDdForm"
+        ],
+        "props": [
+          {
+            "prop": "inline",
+            "description": "When set, the form will be in inline mode which display labels, form controls, and buttons on a single horizontal row"
+          },
+          {
+            "prop": "novalidate",
+            "description": "When set, disables browser native HTML5 validation on controls in the form"
+          },
+          {
+            "prop": "validated",
+            "description": "When set, adds the Bootstrap class 'was-validated' on the form, triggering the native browser validation states"
+          }
         ]
       },
       {
@@ -136,6 +260,12 @@
         "aliases": [
           "BDdGroup"
         ],
+        "props": [
+          {
+            "prop": "headerClasses",
+            "description": "CSS class (or classes) to add to the header"
+          }
+        ],
         "slots": [
           {
             "name": "header",
diff --git a/src/components/embed/package.json b/src/components/embed/package.json
index 3f4efeacf9e..2742dea0cf5 100644
--- a/src/components/embed/package.json
+++ b/src/components/embed/package.json
@@ -5,7 +5,19 @@
     "title": "Embed",
     "description": "Create responsive video or slideshow embeds based on the width of the parent by creating an intrinsic ratio that scales on any device.",
     "components": [
-      "BEmbed"
+      {
+        "component": "BEmbed",
+        "props": [
+          {
+            "prop": "type",
+            "description": "Type of embed. Possible values are 'iframe', 'video', 'embed' and 'object'"
+          },
+          {
+            "prop": "aspect",
+            "description": "Aspect ratio of the embed. Supported values are '16by9', '21by9', '4by3', and '1by1' and are translated to CSS classes. Refer to the docs for more details"
+          }
+        ]
+      }
     ]
   }
 }
diff --git a/src/components/form-checkbox/form-checkbox-group.js b/src/components/form-checkbox/form-checkbox-group.js
index 307077258b3..aee57f2c2a2 100644
--- a/src/components/form-checkbox/form-checkbox-group.js
+++ b/src/components/form-checkbox/form-checkbox-group.js
@@ -13,7 +13,7 @@ export const props = {
     default: false
   },
   checked: {
-    type: [String, Number, Object, Array, Boolean],
+    type: Array,
     default: null
   }
 }
diff --git a/src/components/form-checkbox/form-checkbox.js b/src/components/form-checkbox/form-checkbox.js
index 19f2cb7782f..31cf9ac7aec 100644
--- a/src/components/form-checkbox/form-checkbox.js
+++ b/src/components/form-checkbox/form-checkbox.js
@@ -26,11 +26,11 @@ export const BFormCheckbox = /*#__PURE__*/ Vue.extend({
   },
   props: {
     value: {
-      // type: [Object, Boolean],
+      // type: [String, Number, Boolean, Object],
       default: true
     },
     uncheckedValue: {
-      // type: [Object, Boolean],
+      // type: [String, Number, Boolean, Object],
       // Not applicable in multi-check mode
       default: false
     },
@@ -45,8 +45,8 @@ export const BFormCheckbox = /*#__PURE__*/ Vue.extend({
       default: false
     },
     checked: {
-      // v-model
-      type: [String, Number, Object, Array, Boolean],
+      // v-model (Array when multiple checkboxes have same name)
+      // type: [String, Number, Boolean, Object, Array],
       default: null
     }
   },
diff --git a/src/components/form-checkbox/package.json b/src/components/form-checkbox/package.json
index 78fee753a87..c5c600975e2 100644
--- a/src/components/form-checkbox/package.json
+++ b/src/components/form-checkbox/package.json
@@ -11,6 +11,36 @@
           "BCheckboxGroup",
           "BCheckGroup"
         ],
+        "props": [
+          {
+            "prop": "stacked",
+            "description": "When set, renders the checkbox group in stacked mode"
+          },
+          {
+            "prop": "switches",
+            "description": "When set, renders the checkboxes in the group with switch styling"
+          },
+          {
+            "prop": "buttons",
+            "description": "When set, renderes the checkboxes in this group with button styling"
+          },
+          {
+            "prop": "buttonVariant",
+            "description": "Specifies the Bootstrap contextual color theme variant the apply to the button style checkboxes"
+          },
+          {
+            "prop": "checked",
+            "description": "The current value of the checked checkboxes in the group. Must be an array when there are multiple checkboxes"
+          },
+          {
+            "prop": "validated",
+            "description": "When set, adds the Bootstrap class 'was-validated' to the group wrapper"
+          },
+          {
+            "prop": "ariaInvalid",
+            "description": "Sets the 'aria-invalid' attribute value on the wrapper element. When not provided, the 'state' prop will control the attribute"
+          }
+        ],
         "slots": [
           {
             "name": "first",
@@ -24,6 +54,7 @@
             "args": [
               {
                 "arg": "checked",
+                "type": "Array",
                 "description": "Value of checkboxes. Value will be an array."
               }
             ]
@@ -34,6 +65,7 @@
             "args": [
               {
                 "arg": "checked",
+                "type": "Array",
                 "description": "Value of checkboxes. Value will be an array."
               }
             ]
@@ -46,6 +78,40 @@
           "BCheckbox",
           "BCheck"
         ],
+        "props": [
+          {
+            "prop": "checked",
+            "description": "The current value of the checkbox(es). Must be an array when there are multiple checkboxes bound to the same v-model"
+          },
+          {
+            "prop": "value",
+            "description": "Value returned when this checkbox is checked"
+          },
+          {
+            "prop": "uncheckedValue",
+            "description": "Value returned when this checkbox is unchecked. Note not applicable when multiple checkboxes bound to the same v-model array"
+          },
+          {
+            "prop": "inline",
+            "description": "When set, renders the checkbox as an inline element rather than as a 100% width block"
+          },
+          {
+            "prop": "switch",
+            "description": "When set, renders the checkbox with the appearance of a switch"
+          },
+          {
+            "prop": "button",
+            "description": "When set, renders the checkbox with the appearance of a button"
+          },
+          {
+            "prop": "buttonVariant",
+            "description": "Applies on of Bootstrap's theme colors when in 'button' mode"
+          },
+          {
+            "prop": "indeterminate",
+            "description": "Renders the checkbox in an indeterminate state. Syncable via the .sync modifier"
+          }
+        ],
         "events": [
           {
             "event": "input",
@@ -53,6 +119,13 @@
             "args": [
               {
                 "arg": "checked",
+                "type": [
+                  "Boolean",
+                  "String",
+                  "Number",
+                  "Object",
+                  "Array"
+                ],
                 "description": "Value of checkbox(es). When bound to multiple checkboxes, value will be an array."
               }
             ]
@@ -63,6 +136,13 @@
             "args": [
               {
                 "arg": "checked",
+                "type": [
+                  "Boolean",
+                  "String",
+                  "Number",
+                  "Object",
+                  "Array"
+                ],
                 "description": "Value of checkbox(es). When bound to multiple checkboxes, value will be an array."
               }
             ]
diff --git a/src/components/form-file/form-file.js b/src/components/form-file/form-file.js
index c63aa678371..e69d5dcf190 100644
--- a/src/components/form-file/form-file.js
+++ b/src/components/form-file/form-file.js
@@ -2,6 +2,7 @@ import Vue from '../../utils/vue'
 import { from as arrayFrom, isArray, concat } from '../../utils/array'
 import { getComponentConfig } from '../../utils/config'
 import { isFunction } from '../../utils/inspect'
+import { File } from '../../utils/safe-types'
 import formCustomMixin from '../../mixins/form-custom'
 import formMixin from '../../mixins/form'
 import formStateMixin from '../../mixins/form-state'
@@ -25,7 +26,7 @@ export const BFormFile = /*#__PURE__*/ Vue.extend({
       default: () => getComponentConfig('BFormControl', 'size')
     },
     value: {
-      // type: Object,
+      type: [File, Array],
       default: null
     },
     accept: {
diff --git a/src/components/form-file/package.json b/src/components/form-file/package.json
index 760895bd0d3..b26d574abf1 100644
--- a/src/components/form-file/package.json
+++ b/src/components/form-file/package.json
@@ -10,10 +10,64 @@
         "aliases": [
           "BFile"
         ],
+        "props": [
+          {
+            "prop": "value",
+            "description": "The current value of the file input. Will be an array if multiple or directory is set. Can be set to null or empty array to reset the file input"
+          },
+          {
+            "prop": "accept",
+            "description": "Value to set on the file input's 'accept' attribute"
+          },
+          {
+            "prop": "capture",
+            "description": "When set, will instruction the browser to use the devices camera (if supported)"
+          },
+          {
+            "prop": "browseText",
+            "description": "Text content for the file browse button"
+          },
+          {
+            "prop": "dropPlaceholder",
+            "description": "Text to display as the placeholder when fies are being dragged"
+          },
+          {
+            "prop": "multiple",
+            "description": "When set, will allow multiple files to be selected. v-model will be an array"
+          },
+          {
+            "prop": "directory",
+            "description": "Enable directory drop mode (on browsers that support directory mode)"
+          },
+          {
+            "prop": "noTraverse",
+            "description": "For directory drop mode: returns files as a flat array"
+          },
+          {
+            "prop": "noDrop",
+            "description": "Disable drag and drop mode"
+          },
+          {
+            "prop": "fileNameFormatter",
+            "description": "Method to format the file names for display. Refer to the docs for details"
+          }
+        ],
         "slots": [
           {
             "name": "file-name",
-            "description": "Scoped slot for formatting the file names. Scoped props: files - array of File objects, names: array of file names"
+            "description": "Scoped slot for formatting the file names",
+            "scope": [
+              {
+                "prop": "files",
+                "type": "Array",
+                "description": "Array if File objects"
+              },
+              {
+                "prop": "names",
+                "type": "Array",
+                "description": "Array of file names (strings)"
+              }
+            ]
           }
         ],
         "events": [
@@ -22,13 +76,25 @@
             "description": "original native change event on input",
             "args": [
               {
-                "arg": "event"
+                "arg": "event",
+                "type": "Event",
+                "description": "Native change event object"
               }
             ]
           },
           {
             "event": "input",
-            "description": "[see above docs]"
+            "description": "Updates the v-model value (see docs for more details)",
+            "args": [
+              {
+                "arg": "file",
+                "type": [
+                  "File",
+                  "Array"
+                ],
+                "description": "Will be a single File object in single mode or an array of File objects in multiple mode"
+              }
+            ]
           }
         ]
       }
diff --git a/src/components/form-group/package.json b/src/components/form-group/package.json
index 49c62160272..746679b7b93 100644
--- a/src/components/form-group/package.json
+++ b/src/components/form-group/package.json
@@ -10,6 +10,104 @@
         "alias": [
           "BFormFieldset"
         ],
+        "props": [
+          {
+            "prop": "disabled",
+            "description": "Disabled the fieldset element, which in turn disables the form controls (on browsers that support disabled fieldsets). Has no effect if 'label-for' is set"
+          },
+          {
+            "prop": "label",
+            "description": "Text to place in the label/legend of the form group"
+          },
+          {
+            "prop": "labelFor",
+            "description": "Set to the ID of the singular form-control in the form-group. Do not set if there is more than one form control in the group."
+          },
+          {
+            "prop": "labelSrOnly",
+            "description": "Visually hides the label, but makes it available to screen reader users"
+          },
+          {
+            "prop": "description",
+            "description": "Text to place in the help text area of the form group"
+          },
+          {
+            "prop": "invalidFeedback",
+            "description": "Text to show when the form group has an invalid state"
+          },
+          {
+            "prop": "validFeedback",
+            "description": "Text to show when the form group has a valid state"
+          },
+          {
+            "prop": "feedbackAriaLive",
+            "description": "Value to use for the 'aria-live' attribute on the feedback text"
+          },
+          {
+            "prop": "labelCols",
+            "description": "Number of columns for the label width xs screens and up"
+          },
+          {
+            "prop": "labelColsSm",
+            "description": "Number of columns for the label width sm screens and up"
+          },
+          {
+            "prop": "labelColsMd",
+            "description": "Number of columns for the label width md screens and up"
+          },
+          {
+            "prop": "labelColsLg",
+            "description": "Number of columns for the label width lg screens and up"
+          },
+          {
+            "prop": "labelColsXl",
+            "description": "Number of columns for the label width xl screens and up"
+          },
+          {
+            "prop": "labelClass",
+            "description": "CSS class (or classes) to add to the label/legend element"
+          },
+          {
+            "prop": "labelAlign",
+            "description": "Text alignment 'left', 'center', 'right' for the label xs screens and up"
+          },
+          {
+            "prop": "labelAlignSm",
+            "description": "Text alignment 'left', 'center', 'right' for the label sm screens and up"
+          },
+          {
+            "prop": "labelAlignMd",
+            "description": "Text alignment 'left', 'center', 'right' for the label md screens and up"
+          },
+          {
+            "prop": "labelAlignLg",
+            "description": "Text alignment 'left', 'center', 'right' for the label lg screens and up"
+          },
+          {
+            "prop": "labelAlignXl",
+            "description": "Text alignment 'left', 'center', 'right' for the label xl screens and up"
+          },
+          {
+            "prop": "labelClass",
+            "description": "CSS class (or classes) to add to the label/legend element"
+          },
+          {
+            "prop": "labelSize",
+            "description": "Sets the text size of the label: 'sm', 'md' (default) or 'lg'. Use this prop to have the label size match the form control size"
+          },
+          {
+            "prop": "state",
+            "description": "Controls the validation state of hte feedback. 'true' force shows valid-feedback, 'false' force shows invalid feedback, 'null' does not force show the feedback"
+          },
+          {
+            "prop": "tooltip",
+            "description": "Renders the feedback text in a rudimentary tooltip style"
+          },
+          {
+            "prop": "validated",
+            "description": "When set, adds the Bootstrap validation trigger class 'was-validated' on the component"
+          }
+        ],
         "slots": [
           {
             "name": "label",
diff --git a/src/components/form-input/package.json b/src/components/form-input/package.json
index 7b428efe5de..105c35c0fd3 100644
--- a/src/components/form-input/package.json
+++ b/src/components/form-input/package.json
@@ -10,6 +10,56 @@
         "aliases": [
           "BInput"
         ],
+        "props": [
+          {
+            "prop": "value",
+            "description": "The current value of the input.  Result will always be a string, except when the 'number' prop is used"
+          },
+          {
+            "prop": "ariaInvalid",
+            "description": "Sets the 'aria-invalid' attribute with the specified value"
+          },
+          {
+            "prop": "trim",
+            "description": "When set, trims any leading and trailing white space from the input value"
+          },
+          {
+            "prop": "number",
+            "description": "When set attempts to convert the input value to a native number"
+          },
+          {
+            "prop": "type",
+            "description": "The type of input to render. See the docs for supported types"
+          },
+          {
+            "prop": "noWheel",
+            "description": "For number-like inputs, disables the mouse wheel from incrementing or decrementing the value"
+          },
+          {
+            "prop": "list",
+            "description": "The ID of the associated datalist element or component"
+          },
+          {
+            "prop": "formatter",
+            "description": "reference to a function for formatting the input"
+          },
+          {
+            "prop": "lazyFormatter",
+            "description": "When set, the input is formatted on blur instead of each keystroke (if there is a formatter specified)"
+          },
+          {
+            "prop": "min",
+            "description": "Value to set in the 'min' attribute on the input. Used by number-like inputs"
+          },
+          {
+            "prop": "max",
+            "description": "Value to set in the 'max' attribute on the input. Used by number-like inputs"
+          },
+          {
+            "prop": "step",
+            "description": "Value to set in the 'step' attribute on the input. Used by number-like inputs"
+          }
+        ],
         "events": [
           {
             "event": "input",
@@ -17,6 +67,10 @@
             "args": [
               {
                 "arg": "value",
+                "type": [
+                  "String",
+                  "Number"
+                ],
                 "description": "Current value of input"
               }
             ]
@@ -27,6 +81,10 @@
             "args": [
               {
                 "arg": "value",
+                "type": [
+                  "String",
+                  "Number"
+                ],
                 "description": "Current value of input"
               }
             ]
@@ -37,6 +95,10 @@
             "args": [
               {
                 "arg": "value",
+                "type": [
+                  "String",
+                  "Number"
+                ],
                 "description": "Value of input, after any formatting. Not emitted if the value does not change"
               }
             ]
@@ -47,6 +109,7 @@
             "args": [
               {
                 "arg": "event",
+                "type": "FocusEvent",
                 "description": "Native blur event (before any formatting)"
               }
             ]
diff --git a/src/components/form-radio/form-radio-group.js b/src/components/form-radio/form-radio-group.js
index d5f6b9e0a38..388f83c855f 100644
--- a/src/components/form-radio/form-radio-group.js
+++ b/src/components/form-radio/form-radio-group.js
@@ -8,7 +8,7 @@ import formStateMixin from '../../mixins/form-state'
 
 export const props = {
   checked: {
-    type: [String, Object, Number, Boolean],
+    // type: [String, Number, Boolean, Object],
     default: null
   }
 }
diff --git a/src/components/form-radio/form-radio.js b/src/components/form-radio/form-radio.js
index 5fea45e707c..e48a72d05d8 100644
--- a/src/components/form-radio/form-radio.js
+++ b/src/components/form-radio/form-radio.js
@@ -25,7 +25,7 @@ export const BFormRadio = /*#__PURE__*/ Vue.extend({
   props: {
     checked: {
       // v-model
-      type: [String, Object, Number, Boolean],
+      // type: [String, Number, Boolean, Object],
       default: null
     }
   },
diff --git a/src/components/form-radio/package.json b/src/components/form-radio/package.json
index d38e2bcb4bc..68fab35e0d9 100644
--- a/src/components/form-radio/package.json
+++ b/src/components/form-radio/package.json
@@ -10,6 +10,32 @@
         "aliases": [
           "BRadioGroup"
         ],
+        "props": [
+          {
+            "prop": "stacked",
+            "description": "When set, renders the radio group in stacked mode"
+          },
+          {
+            "prop": "buttons",
+            "description": "When set, renderes the radios in this group with button styling"
+          },
+          {
+            "prop": "buttonVariant",
+            "description": "Specifies the Bootstrap contextual color theme variant the apply to the button style radios"
+          },
+          {
+            "prop": "checked",
+            "description": "The current value of the checked radio in the group"
+          },
+          {
+            "prop": "validated",
+            "description": "When set, adds the Bootstrap class 'was-validated' to the group wrapper"
+          },
+          {
+            "prop": "ariaInvalid",
+            "description": "Sets the 'aria-invalid' attribute value on the wrapper element. When not provided, the 'state' prop will control the attribute"
+          }
+        ],
         "slots": [
           {
             "name": "first",
@@ -23,6 +49,12 @@
             "args": [
               {
                 "arg": "checked",
+                "type": [
+                  "Boolean",
+                  "String",
+                  "Number",
+                  "Object"
+                ],
                 "description": "current selected Value of radio group."
               }
             ]
@@ -33,6 +65,12 @@
             "args": [
               {
                 "arg": "checked",
+                "type": [
+                  "Boolean",
+                  "String",
+                  "Number",
+                  "Object"
+                ],
                 "description": "current selected Value of radio group."
               }
             ]
@@ -44,6 +82,28 @@
         "aliases": [
           "BRadio"
         ],
+        "props": [
+          {
+            "prop": "checked",
+            "description": "The current value of the radio(s)"
+          },
+          {
+            "prop": "value",
+            "description": "Value returned when this radio is checked"
+          },
+          {
+            "prop": "inline",
+            "description": "When set, renders the radio as an inline element rather than as a 100% width block"
+          },
+          {
+            "prop": "button",
+            "description": "When set, renders the radio with the appearance of a button"
+          },
+          {
+            "prop": "buttonVariant",
+            "description": "Applies on of Bootstrap's theme colors when in 'button' mode"
+          }
+        ],
         "events": [
           {
             "event": "input",
@@ -51,6 +111,12 @@
             "args": [
               {
                 "arg": "checked",
+                "type": [
+                  "Boolean",
+                  "String",
+                  "Number",
+                  "Object"
+                ],
                 "description": "current selected Value of radio group."
               }
             ]
@@ -61,6 +127,12 @@
             "args": [
               {
                 "arg": "checked",
+                "type": [
+                  "Boolean",
+                  "String",
+                  "Number",
+                  "Object"
+                ],
                 "description": "current selected Value of radio group."
               }
             ]
diff --git a/src/components/form-select/package.json b/src/components/form-select/package.json
index 4fbbe10cc3e..eaf04329926 100644
--- a/src/components/form-select/package.json
+++ b/src/components/form-select/package.json
@@ -10,6 +10,24 @@
         "aliases": [
           "BSelect"
         ],
+        "props": [
+          {
+            "prop": "value",
+            "description": "Current value of the select. Should be set to an array when the 'multiple' prop is set"
+          },
+          {
+            "prop": "multiple",
+            "description": "When set, allows multiple options to be selected (multi-select)"
+          },
+          {
+            "prop": "selectSize",
+            "description": "When set to a number larger than 0, will set the number of display option rows. Note not all browser will respect this setting"
+          },
+          {
+            "prop": "ariaInvalid",
+            "description": "Optional value to set for the 'aria-invalid' attribute. Supported values are 'true' and 'false'. If not set, the 'state' prop will dictate the value"
+          }
+        ],
         "slots": [
           {
             "name": "first",
@@ -23,7 +41,13 @@
             "args": [
               {
                 "arg": "value",
-                "description": "current selected value of the select."
+                "type": [
+                  "String",
+                  "Number",
+                  "Object",
+                  "Array"
+                ],
+                "description": "current selected value(s) of the select."
               }
             ]
           },
@@ -33,7 +57,13 @@
             "args": [
               {
                 "arg": "value",
-                "description": "current selected value of the select."
+                "type": [
+                  "String",
+                  "Number",
+                  "Object",
+                  "Array"
+                ],
+                "description": "current selected value(s) of the select."
               }
             ]
           }
diff --git a/src/components/form-textarea/package.json b/src/components/form-textarea/package.json
index 3d12305ec9f..b59835832b3 100644
--- a/src/components/form-textarea/package.json
+++ b/src/components/form-textarea/package.json
@@ -10,6 +10,52 @@
         "aliases": [
           "BTextarea"
         ],
+        "props": [
+          {
+            "prop": "value",
+            "description": "The current value of the textarea. Result will always be a string, except when the 'number' prop is used"
+          },
+          {
+            "prop": "ariaInvalid",
+            "description": "Sets the 'aria-invalid' attribute with the specified value"
+          },
+          {
+            "prop": "trim",
+            "description": "When set, trims any leading and trailing white space from the textarea value"
+          },
+          {
+            "prop": "number",
+            "description": "When set attempts to convert the input value to a native number"
+          },
+          {
+            "prop": "formatter",
+            "description": "reference to a function for formatting the textarea"
+          },
+          {
+            "prop": "lazyFormatter",
+            "description": "When set, the textarea is formatted on blur instead of each keystroke (if there is a formatter specified)"
+          },
+          {
+            "prop": "rows",
+            "description": "The minimum number of rows to display. Must be a value greater than 1"
+          },
+          {
+            "prop": "maxRows",
+            "description": "The maximum number of rows to show. When provided, the textarea will grow (or shrink) to fit the content up to maximum rows"
+          },
+          {
+            "prop": "wrap",
+            "description": "The value to place on the textarea's 'wrap' attribute. Controls how line break are returned"
+          },
+          {
+            "prop": "noResize",
+            "description": "When set, disabled the browser's resize handle which prevents the user from changing the height of the textarea. Automatically set when in auto height mode"
+          },
+          {
+            "prop": "noAutoShrink",
+            "description": "When set, prevents the auto height textarea from shrink to fit the content"
+          }
+        ],
         "events": [
           {
             "event": "input",
@@ -17,6 +63,7 @@
             "args": [
               {
                 "arg": "value",
+                "type": "String",
                 "description": "Current value of textarea"
               }
             ]
@@ -27,6 +74,7 @@
             "args": [
               {
                 "arg": "value",
+                "type": "String",
                 "description": "Current value of the textarea"
               }
             ]
@@ -37,6 +85,7 @@
             "args": [
               {
                 "arg": "value",
+                "type": "String",
                 "description": "Value of textarea, after any formatting. Not emitted if the value does nto change"
               }
             ]
@@ -47,7 +96,8 @@
             "args": [
               {
                 "arg": "event",
-                "description": "Native blur event (before any formatting)"
+                "type": "FocusEvent",
+                "description": "Native blur event (before any optional formatting occurs)"
               }
             ]
           }
diff --git a/src/components/form/package.json b/src/components/form/package.json
index 5d80eaa0479..a65b8702b2a 100644
--- a/src/components/form/package.json
+++ b/src/components/form/package.json
@@ -8,6 +8,20 @@
     "components": [
       {
         "component": "BForm",
+        "props": [
+          {
+            "prop": "inline",
+            "description": "When set, the form will be in inline mode which display labels, form controls, and buttons on a single horizontal row"
+          },
+          {
+            "prop": "novalidate",
+            "description": "When set, disables browser native HTML5 validation on controls in the form"
+          },
+          {
+            "prop": "validated",
+            "description": "When set, adds the Bootstrap class 'was-validated' on the form, triggering the native browser validation states"
+          }
+        ],
         "events": [
           {
             "event": "submit",
@@ -15,20 +29,62 @@
             "args": [
               {
                 "arg": "event",
+                "type": "Event",
                 "description": "Native submit event."
               }
             ]
           }
         ]
       },
-      "BFormText",
-      "BFormInvalidFeedback",
-      "BFormValidFeedback",
+      {
+        "component": "BFormText",
+        "props": [
+          {
+            "prop": "inline",
+            "description": "When set, renders the help text as an inline element, rather than a block element"
+          }
+        ]
+      },
+      {
+        "component": "BFormInvalidFeedback",
+        "props": [
+          {
+            "prop": "tooltip",
+            "description": "Renders the feedback text in a rudimentary tooltip style"
+          },
+          {
+            "prop": "forceShow",
+            "description": "Shows the feedback text, regardless of the value of the 'state' prop"
+          },
+          {
+            "prop": "state",
+            "description": "When explicitly 'false', forces the feedback to show"
+          }
+        ]
+      },
+      {
+        "component": "BFormValidFeedback",
+        "props": [
+          {
+            "prop": "tooltip",
+            "description": "Renders the feedback text in a rudimentary tooltip style"
+          },
+          {
+            "prop": "forceShow",
+            "description": "Shows the feedback text, regardless of the value of the 'state' prop"
+          },
+          {
+            "prop": "state",
+            "description": "When explicitly 'true', forces the feedback to show"
+          }
+        ]
+      },
       {
         "component": "BFormDatalist",
         "aliases": [
           "BDatalist"
-        ]
+        ],
+        "props": []
       }
     ]
   }
diff --git a/src/components/image/package.json b/src/components/image/package.json
index 9019f01019e..af4391c1ba3 100644
--- a/src/components/image/package.json
+++ b/src/components/image/package.json
@@ -5,8 +5,128 @@
     "title": "Image",
     "description": "Create responsive images, optionally adding lightweight styles to them — all via props. Support for rounded images, thumbnail styling, alignment, and even the ability to create blank images with an optional solid background color, and lazy loaded images.",
     "components": [
-      "BImg",
-      "BImgLazy"
+      {
+        "component": "BImg",
+        "props": [
+          {
+            "prop": "width",
+            "description": "The value to set on the image's 'width' attribute"
+          },
+          {
+            "prop": "height",
+            "description": "The value to set on the image's 'height' attribute"
+          },
+          {
+            "prop": "fluid",
+            "description": "Makes the image responsive. The image will shrink as needed or grow up the the image's native width"
+          },
+          {
+            "prop": "fluidGrow",
+            "description": "Similar to the 'fluid' prop, but allows the image to scale up past it's native width"
+          },
+          {
+            "prop": "thumbnail",
+            "description": "Adds a thumbnail border around the image"
+          },
+          {
+            "prop": "rounded",
+            "description": "When set to 'true', makes the image corners slightly rounded. Can also be used to disable rounded corners or make the image a circle/oval. See docs for details"
+          },
+          {
+            "prop": "blank",
+            "description": "Creates a blank/transparent image via an SVG data URI"
+          },
+          {
+            "prop": "blankColor",
+            "description": "Sets the color of the blank image to the CSS color value specified"
+          },
+          {
+            "prop": "block",
+            "description": "Forces the image to display as a block element rather than the browser default of inline-block element"
+          },
+          {
+            "prop": "left",
+            "description": "Floats the image to the left when set"
+          },
+          {
+            "prop": "center",
+            "description": "Centers the image horizontally"
+          },
+          {
+            "prop": "right",
+            "description": "Floats the image to the right when set"
+          }
+        ]
+      },
+      {
+        "component": "BImgLazy",
+        "props": [
+          {
+            "prop": "show",
+            "description": "If set to true, will force show the image specified via the 'src' prop"
+          },
+          {
+            "prop": "width",
+            "description": "The value to set on the image's 'width' attribute"
+          },
+          {
+            "prop": "height",
+            "description": "The value to set on the image's 'height' attribute"
+          },
+          {
+            "prop": "fluid",
+            "description": "Makes the image responsive. The image will shrink as needed or grow up the the image's native width"
+          },
+          {
+            "prop": "fluidGrow",
+            "description": "Similar to the 'fluid' prop, but allows the image to scale up past it's native width"
+          },
+          {
+            "prop": "thumbnail",
+            "description": "Adds a thumbnail border around the image"
+          },
+          {
+            "prop": "rounded",
+            "description": "When set to 'true', makes the image corners slightly rounded. Can also be used to disable rounded corners or make the image a circle/oval. See docs for details"
+          },
+          {
+            "prop": "blankColor",
+            "description": "Sets the color of the blank placeholder image to the CSS color value specified"
+          },
+          {
+            "prop": "blankSrc",
+            "description": "Placeholder image instead of a blank image"
+          },
+          {
+            "prop": "blankWidth",
+            "description": "The value to set on the placeholder image's 'width' attribute. Defaults to value of the 'width' prop"
+          },
+          {
+            "prop": "blankHeight",
+            "description": "The value to set on the placeholder image's 'height' attribute. Defaults to value of the 'height' prop"
+          },
+          {
+            "prop": "offset",
+            "description": "Number of pixels away from the viewport edge before the lazy image is loaded"
+          },
+          {
+            "prop": "block",
+            "description": "Forces the image to display as a block element rather than the browser default of inline-block element"
+          },
+          {
+            "prop": "left",
+            "description": "Floats the image to the left when set"
+          },
+          {
+            "prop": "center",
+            "description": "Centers the image horizontally"
+          },
+          {
+            "prop": "right",
+            "description": "Floats the image to the right when set"
+          }
+        ]
+      }
     ]
   }
 }
diff --git a/src/components/input-group/package.json b/src/components/input-group/package.json
index 429f193d6dd..d92a03f7391 100644
--- a/src/components/input-group/package.json
+++ b/src/components/input-group/package.json
@@ -7,6 +7,24 @@
     "components": [
       {
         "component": "BInputGroup",
+        "props": [
+          {
+            "prop": "append",
+            "description": "Text to append to the input group"
+          },
+          {
+            "prop": "appendHtml",
+            "description": "HTML string to append to the input group. Has precedence over 'append' prop. Use with caution"
+          },
+          {
+            "prop": "prepend",
+            "description": "Text to prepend to the input group"
+          },
+          {
+            "prop": "prependHtml",
+            "description": "HTML string to prepend to the input group. Has precedence over 'prepend' prop. Use with caution"
+          }
+        ],
         "slots": [
           {
             "name": "prepend",
@@ -18,10 +36,41 @@
           }
         ]
       },
-      "BInputGroupPrepend",
-      "BInputGroupAppend",
-      "BInputGroupText",
-      "BInputGroupAddon"
+      {
+        "component": "BInputGroupPrepend",
+        "props": [
+          {
+            "prop": "isText",
+            "description": "When 'true', wraps the content in a b-input-group-text component"
+          }
+        ]
+      },
+      {
+        "component": "BInputGroupAppend",
+        "props": [
+          {
+            "prop": "isText",
+            "description": "When 'true', wraps the content in a b-input-group-text component"
+          }
+        ]
+      },
+      {
+        "component": "BInputGroupText",
+        "props": []
+      },
+      {
+        "component": "BInputGroupAddon",
+        "props": [
+          {
+            "prop": "append",
+            "description": "When set to 'true' sets the addon as being appended. defaults to 'false' which is prepended"
+          },
+          {
+            "prop": "isText",
+            "description": "When 'true', wraps the content in a b-input-group-text component"
+          }
+        ]
+      }
     ]
   }
 }
diff --git a/src/components/jumbotron/package.json b/src/components/jumbotron/package.json
index d8fae661656..97876c29ec9 100644
--- a/src/components/jumbotron/package.json
+++ b/src/components/jumbotron/package.json
@@ -7,6 +7,32 @@
     "components": [
       {
         "component": "BJumbotron",
+        "props": [
+          {
+            "prop": "fluid",
+            "description": "Makes the jumbotron full width, and without rounded corners. When set, the inner content will automatically be wrapped into a 'b-container' (fixed width at the various breakpoints)"
+          },
+          {
+            "prop": "containerFluid",
+            "description": "When prop 'fluid' is set, this prop will make the inner container wrapper also fluid in width"
+          },
+          {
+            "prop": "headerLevel",
+            "description": "Scaling factor of hte header. Values range from 1 to 5"
+          },
+          {
+            "prop": "lead",
+            "description": "Text string to place in the lead paragraph"
+          },
+          {
+            "prop": "leadHtml",
+            "description": "HTML string to place in the lead paragraph. Use with caution"
+          },
+          {
+            "prop": "leadTag",
+            "description": "Specify the HTML tag to render instead of the default tag for the lead paragraph"
+          }
+        ],
         "slots": [
           {
             "name": "header",
diff --git a/src/components/layout/package.json b/src/components/layout/package.json
index 7a4f2263bff..e4bee424406 100644
--- a/src/components/layout/package.json
+++ b/src/components/layout/package.json
@@ -6,10 +6,112 @@
     "description": "Use the powerful mobile-first flexbox grid (via the <b-container>, <b-row>, <b-form-row> and <b-col> components) to build layouts of all shapes and sizes thanks to a twelve column system, five default responsive tiers, CSS Sass variables and mixins, and dozens of predefined classes.",
     "slug": "layout",
     "components": [
-      "BContainer",
-      "BRow",
-      "BCol",
-      "BFormRow"
+      {
+        "component": "BContainer",
+        "props": [
+          {
+            "prop": "fluid",
+            "description": "When set, makes the row 100% wide all the time"
+          }
+        ]
+      },
+      {
+        "component": "BRow",
+        "props": [
+          {
+            "prop": "noGutters",
+            "description": "When set, removes the margin from the row and removes the padding from the child columns"
+          },
+          {
+            "prop": "alignV",
+            "description": "Vertical alignment of all columns in a row: 'start', 'center', or 'end'"
+          },
+          {
+            "prop": "alignH",
+            "description": "Horizontal alignment/spacing of all columns: 'start', 'center', 'end', 'around', or 'between'"
+          },
+          {
+            "prop": "alignContent",
+            "description": "Align columns items together on the cross axis: 'start', 'center', 'end', 'around', 'between' or 'stretch'. Has no effect on single rows of items"
+          }
+        ]
+      },
+      {
+        "component": "BCol",
+        "props": [
+          {
+            "prop": "alignSelf",
+            "description": "Vertical alignment of the grid cell with respect to the row: 'start', 'center', or 'end'"
+          },
+          {
+            "prop": "col",
+            "description": "When true makes an equal width column grid cell spans for xs and up breakpoints"
+          },
+          {
+            "prop": "cols",
+            "description": "Number of columns the grid cell spans for xs and up breakpoints"
+          },
+          {
+            "prop": "sm",
+            "description": "Number of columns the grid cell spans for sm and up breakpoints"
+          },
+          {
+            "prop": "md",
+            "description": "Number of columns the grid cell spans for md and up breakpoints"
+          },
+          {
+            "prop": "lg",
+            "description": "Number of columns the grid cell spans for lg and up breakpoints"
+          },
+          {
+            "prop": "xl",
+            "description": "Number of columns the grid cell spans for xl and up breakpoints"
+          },
+          {
+            "prop": "offset",
+            "description": "Number of columns the grid cell is offset for xs and up breakpoints"
+          },
+          {
+            "prop": "offsetSm",
+            "description": "Number of columns the grid cell is offset for sm and up breakpoints"
+          },
+          {
+            "prop": "offsetMd",
+            "description": "Number of columns the grid cell is offset for md and up breakpoints"
+          },
+          {
+            "prop": "offsetLg",
+            "description": "Number of columns the grid cell is offset for lg and up breakpoints"
+          },
+          {
+            "prop": "offsetXl",
+            "description": "Number of columns the grid cell is offset for xl and up breakpoints"
+          },
+          {
+            "prop": "order",
+            "description": "Flex order of the grid cell for xs and up breakpoints"
+          },
+          {
+            "prop": "orderSm",
+            "description": "Flex order of the grid cell for sm and up breakpoints"
+          },
+          {
+            "prop": "orderMd",
+            "description": "Flex order of the grid cell for md and up breakpoints"
+          },
+          {
+            "prop": "orderLg",
+            "description": "Flex order of the grid cell for lg and up breakpoints"
+          },
+          {
+            "prop": "orderXl",
+            "description": "Flex order of the grid cell for xl and up breakpoints"
+          }
+        ]
+      },
+      {
+        "component": "BFormRow"
+      }
     ]
   }
 }
diff --git a/src/components/link/package.json b/src/components/link/package.json
index 0d45d0ff25c..4671251ef80 100644
--- a/src/components/link/package.json
+++ b/src/components/link/package.json
@@ -7,10 +7,18 @@
     "components": [
       {
         "component": "BLink",
+        "props": [],
         "events": [
           {
             "event": "click",
-            "description": "when link clicked"
+            "description": "when link clicked",
+            "args": [
+              {
+                "name": "event",
+                "type": "MouseEvent",
+                "description": "Native click event"
+              }
+            ]
           }
         ]
       }
diff --git a/src/components/list-group/package.json b/src/components/list-group/package.json
index e048f3e8643..b58e1dc7954 100644
--- a/src/components/list-group/package.json
+++ b/src/components/list-group/package.json
@@ -5,8 +5,32 @@
     "title": "List group",
     "description": "List groups are a flexible and powerful component for displaying a series of content. List group items can be modified to support just about any content within. They can also be used as navigation via various props.",
     "components": [
-      "BListGroup",
-      "BListGroupItem"
+      {
+        "component": "BListGroup",
+        "props": [
+          {
+            "prop": "flush",
+            "description": "When set, renders a flush list group with no left and right borders"
+          },
+          {
+            "prop": "horizontal",
+            "description": "When set, renders the list-group horizontally rather than the default of vertical"
+          }
+        ]
+      },
+      {
+        "component": "BListGroupItem",
+        "props": [
+          {
+            "prop": "button",
+            "description": "When true renders the list-group-item as a button element"
+          },
+          {
+            "prop": "action",
+            "description": "When set, give the item the appearance of having an action. Not needed when props 'to', 'href' or 'button' are used"
+          }
+        ]
+      }
     ]
   }
 }
diff --git a/src/components/media/package.json b/src/components/media/package.json
index b86a68f0020..8f5cacd2845 100644
--- a/src/components/media/package.json
+++ b/src/components/media/package.json
@@ -7,6 +7,20 @@
     "components": [
       {
         "component": "BMedia",
+        "props": [
+          {
+            "prop": "noBody",
+            "description": "When set, does not render a 'b-media-body' wrapper around the default slot content"
+          },
+          {
+            "prop": "rightAlign",
+            "description": "Render the 'aside' slot on the right. Default is on the left"
+          },
+          {
+            "prop": "verticalAlign",
+            "description": "Vertical alignment of the 'aside' slot: 'start' (or 'top'), 'center', or 'end' (or 'bottom')"
+          }
+        ],
         "slots": [
           {
             "name": "aside",
@@ -14,7 +28,15 @@
           }
         ]
       },
-      "BMediaAside",
+      {
+        "component": "BMediaAside",
+        "props": [
+          {
+            "prop": "verticalAlign",
+            "description": "Vertical alignment of the aside: 'start' (or 'top'), 'center', or 'end' (or 'bottom')"
+          }
+        ]
+      },
       "BMediaBody"
     ]
   }
diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js
index af8e94060a0..6dac3cb5508 100644
--- a/src/components/modal/modal.js
+++ b/src/components/modal/modal.js
@@ -16,6 +16,7 @@ import {
 import { isBrowser } from '../../utils/env'
 import { stripTags } from '../../utils/html'
 import { isString, isUndefinedOrNull } from '../../utils/inspect'
+import { HTMLElement } from '../../utils/safe-types'
 import { BTransporterSingle } from '../../utils/transporter'
 import idMixin from '../../mixins/id'
 import listenOnRootMixin from '../../mixins/listen-on-root'
@@ -224,7 +225,8 @@ export const props = {
     default: false
   },
   returnFocus: {
-    // type: Object,
+    // HTML Element, CSS selector string or Vue component instance
+    type: [HTMLElement, String, Object],
     default: null
   },
   headerCloseLabel: {
diff --git a/src/components/modal/package.json b/src/components/modal/package.json
index f19600d1898..c6efc76d74a 100644
--- a/src/components/modal/package.json
+++ b/src/components/modal/package.json
@@ -8,11 +8,168 @@
       "BVModalPlugin"
     ],
     "directives": [
-      "VBModal"
+      {
+        "directive": "VBModal",
+        "description": "Directive for opening a modal by ID",
+        "expression": "String",
+        "modifiers": [
+          {
+            "name": "{modalId}",
+            "pattern": "[a-zA-Z][a-zA-Z0-9_\\-]*",
+            "description": "Modal ID to open. Replace `{modalId}` with the modal's ID"
+          }
+        ]
+      }
     ],
     "components": [
       {
         "component": "BModal",
+        "props": [
+          {
+            "prop": "visible",
+            "description": "The current visibility state of the modal"
+          },
+          {
+            "prop": "modalClass",
+            "description": "CSS class (or classes) to apply to the '.modal' wrapper element"
+          },
+          {
+            "prop": "contentClass",
+            "description": "CSS class (or classes) to apply to the '.modal-content' wrapper element"
+          },
+          {
+            "prop": "dialogClass",
+            "description": "CSS class (or classes) to apply to the '.modal-dialog' wrapper element"
+          },
+          {
+            "prop": "bodyClass",
+            "description": "CSS class (or classes) to apply to the '.modal-body' wrapper element"
+          },
+          {
+            "prop": "headerClass",
+            "description": "CSS class (or classes) to apply to the '.modal-header' wrapper element"
+          },
+          {
+            "prop": "footerClass",
+            "description": "CSS class (or classes) to apply to the '.modal-footer' wrapper element"
+          },
+          {
+            "prop": "size",
+            "description": "Set the size of the modal's width. 'sm', 'md' (default), 'lg', or 'xl'"
+          },
+          {
+            "prop": "centered",
+            "description": "Vertically centers the modal in the viewport"
+          },
+          {
+            "prop": "scrollable",
+            "description": "Enables scrolling of the modal body"
+          },
+          {
+            "prop": "headerCloseVariant",
+            "description": "Text theme color variant to apply to the header close button"
+          },
+          {
+            "prop": "lazy",
+            "description": "When the modal has the `static` prop set, renders the modal content lazily"
+          },
+          {
+            "prop": "buttonSize",
+            "description": "Size of the built in footer buttons: 'sm', 'md' (default), or 'lg'"
+          },
+          {
+            "prop": "noStacking",
+            "description": "Prevents other modals from stacking over this one"
+          },
+          {
+            "prop": "noCloseOnBackdrop",
+            "description": "Disables the ability to close the modal by clicking the backdrop"
+          },
+          {
+            "prop": "noCloseOnEsc",
+            "description": "Disables the ability to close the modal by pressing ESC"
+          },
+          {
+            "prop": "noEnforceFocus",
+            "description": "Disables the enforce focus routine which maintains focus inside the modal"
+          },
+          {
+            "prop": "titleSrOnly",
+            "description": "Wraps the title in an '.sr-only' wrapper"
+          },
+          {
+            "prop": "ariaLabel",
+            "description": "Explicitly supply an 'aria-label' attribute for the modal. Should be set when the modal has no title. When not set 'aria-labelledby' will point to the modal's title"
+          },
+          {
+            "prop": "hideHeader",
+            "description": "Disables rendering of the modal header"
+          },
+          {
+            "prop": "hideHeaderClose",
+            "description": "Disables rendering of the modal header's close button"
+          },
+          {
+            "prop": "hideFooter",
+            "description": "Disables rendering of the modal footer"
+          },
+          {
+            "prop": "hideBackdrop",
+            "description": "Disables rendering of the modal backdrop"
+          },
+          {
+            "prop": "okOnly",
+            "description": "Disables rendering of the default footer Cancel button"
+          },
+          {
+            "prop": "okDisabled",
+            "description": "Places the default footer OK button in the disabled state"
+          },
+          {
+            "prop": "cancelDisabled",
+            "description": "Places the default footer Cancel button in the disabled state"
+          },
+          {
+            "prop": "headerCloseLabel",
+            "description": "Value of the 'aria-label' on the header close button"
+          },
+          {
+            "prop": "returnFocus",
+            "description": "HTML Element reference, CSS selector, or component reference to return focus to when the modal closes. When not set, will return focus to the element that last had focus before the modal opened"
+          },
+          {
+            "prop": "cancelTitle",
+            "description": "Text string to place in the default footer Cancel button"
+          },
+          {
+            "prop": "cancelTitleHtml",
+            "description": "HTML string to place in the default footer Cancel button. Use with caution"
+          },
+          {
+            "prop": "okTitle",
+            "description": "Text string to place in the default footer OK button"
+          },
+          {
+            "prop": "okTitleHtml",
+            "description": "HTML string to place in the default footer OK button. Use with caution"
+          },
+          {
+            "prop": "cancelVariant",
+            "description": "Button color theme variant to apply to the default footer Cancel button"
+          },
+          {
+            "prop": "okVariant",
+            "description": "Button color theme variant to apply to the default footer OK button"
+          },
+          {
+            "prop": "busy",
+            "description": "Places the built in default footer OK and Cancel buttons in the disabled state"
+          },
+          {
+            "prop": "autoFocusButton",
+            "description": "Specify which built-in button to focus once the modal opens: 'ok', 'cancel', or 'close'"
+          }
+        ],
         "events": [
           {
             "event": "change",
@@ -20,6 +177,7 @@
             "args": [
               {
                 "arg": "isVisible",
+                "type": "Boolean",
                 "description": "true if modal is visible, false otherwise"
               }
             ]
@@ -30,6 +188,7 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object. Call bvModalEvt.preventDefault() to cancel show"
               }
             ]
@@ -40,6 +199,7 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object"
               }
             ]
@@ -50,6 +210,7 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object. Call bvModalEvt.preventDefault() to cancel hide"
               }
             ]
@@ -60,6 +221,7 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object"
               }
             ]
@@ -70,6 +232,7 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object. Call bvModalEvt.preventDefault() to cancel hide"
               }
             ]
@@ -80,6 +243,7 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object. Call bvModalEvt.preventDefault() to cancel hide"
               }
             ]
@@ -90,6 +254,7 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object. Call bvModalEvt.preventDefault() to cancel hide"
               }
             ]
@@ -100,10 +265,12 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object. Call bvEvt.preventDefault() to cancel show"
               },
               {
                 "arg": "modalId",
+                "type": "String",
                 "description": "modal ID"
               }
             ]
@@ -114,10 +281,12 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object"
               },
               {
                 "arg": "modalId",
+                "type": "String",
                 "description": "modal ID"
               }
             ]
@@ -128,10 +297,12 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object. Call bvEvt.preventDefault() to cancel hide"
               },
               {
                 "arg": "modalId",
+                "type": "String",
                 "description": "modal ID"
               }
             ]
@@ -142,10 +313,12 @@
             "args": [
               {
                 "arg": "bvModalEvt",
+                "type": "BvModalEvent",
                 "description": "BvModalEvent object"
               },
               {
                 "arg": "modalId",
+                "type": "String",
                 "description": "modal ID"
               }
             ]
@@ -158,10 +331,15 @@
             "args": [
               {
                 "arg": "modalId",
+                "type": "String",
                 "description": "modal ID to show"
               },
               {
                 "arg": "elIDtoFocusOnClose",
+                "type": [
+                  "String",
+                  "HTMLElement"
+                ],
                 "description": "(optional), specify the element reference, or CSS selector, to return focus to once the modal is closed"
               }
             ]
@@ -172,6 +350,7 @@
             "args": [
               {
                 "arg": "modalId",
+                "type": "String",
                 "description": "ID of modal to hide"
               }
             ]
@@ -182,10 +361,15 @@
             "args": [
               {
                 "arg": "modalId",
+                "type": "String",
                 "description": "ID of modal to toggle visibility"
               },
               {
                 "arg": "elIDtoFocusOnClose",
+                "type": [
+                  "String",
+                  "HTMLElement"
+                ],
                 "description": "(optional), specify the element reference, or CSS selector, to return focus to once the modal is closed"
               }
             ]
@@ -194,15 +378,96 @@
         "slots": [
           {
             "name": "modal-header",
-            "description": "Entire modal header container contents. Also removes the top right X close button. Optionally scoped."
+            "description": "Entire modal header container contents. Also removes the top right X close button. Optionally scoped.",
+            "scope": [
+              {
+                "prop": "visible",
+                "type": "Boolean",
+                "description": "The visibility state of the modal. true if the modal is visible and false if not visible"
+              },
+              {
+                "prop": "ok",
+                "type": "Function",
+                "description": "Closes the modal and fires the 'ok' and 'hide' events, with bvModalEvent.trigger = 'ok'"
+              },
+              {
+                "prop": "cancel",
+                "type": "Function",
+                "description": "Closes the modal and fires the 'cancel' and 'hide' events, with bvModalEvent.trigger = 'cancel'"
+              },
+              {
+                "prop": "close",
+                "type": "Function",
+                "description": "Closes the modal and fires the close and hide events, with bvModalEvent.trigger = 'headerclose'"
+              },
+              {
+                "prop": "hide",
+                "type": "Function",
+                "description": "Accepts one argument 'trigger'. Closes the modal and fires the 'hide' event, with the bvModalEvent.trigger = trigger (trigger is optional)"
+              }
+            ]
           },
           {
             "name": "modal-title",
-            "description": "Modal title. If modal-header slot is used, this slot will not be shown. Optionally scoped."
+            "description": "Modal title. If modal-header slot is used, this slot will not be shown. Optionally scoped.",
+            "scope": [
+              {
+                "prop": "visible",
+                "type": "Boolean",
+                "description": "The visibility state of the modal. true if the modal is visible and false if not visible"
+              },
+              {
+                "prop": "ok",
+                "type": "Function",
+                "description": "Closes the modal and fires the 'ok' and 'hide' events, with bvModalEvent.trigger = 'ok'"
+              },
+              {
+                "prop": "cancel",
+                "type": "Function",
+                "description": "Closes the modal and fires the 'cancel' and 'hide' events, with bvModalEvent.trigger = 'cancel'"
+              },
+              {
+                "prop": "close",
+                "type": "Function",
+                "description": "Closes the modal and fires the close and hide events, with bvModalEvent.trigger = 'headerclose'"
+              },
+              {
+                "prop": "hide",
+                "type": "Function",
+                "description": "Accepts one argument 'trigger'. Closes the modal and fires the 'hide' event, with the bvModalEvent.trigger = trigger (trigger is optional)"
+              }
+            ]
           },
           {
             "name": "modal-footer",
-            "description": "Modal footer content. Also removes default OK and CANCEL buttons. Optionally scoped."
+            "description": "Modal footer content. Also removes default OK and CANCEL buttons. Optionally scoped.",
+            "scope": [
+              {
+                "prop": "visible",
+                "type": "Boolean",
+                "description": "The visibility state of the modal. true if the modal is visible and false if not visible"
+              },
+              {
+                "prop": "ok",
+                "type": "Function",
+                "description": "Closes the modal and fires the 'ok' and 'hide' events, with bvModalEvent.trigger = 'ok'"
+              },
+              {
+                "prop": "cancel",
+                "type": "Function",
+                "description": "Closes the modal and fires the 'cancel' and 'hide' events, with bvModalEvent.trigger = 'cancel'"
+              },
+              {
+                "prop": "close",
+                "type": "Function",
+                "description": "Closes the modal and fires the close and hide events, with bvModalEvent.trigger = 'headerclose'"
+              },
+              {
+                "prop": "hide",
+                "type": "Function",
+                "description": "Accepts one argument 'trigger'. Closes the modal and fires the 'hide' event, with the bvModalEvent.trigger = trigger (trigger is optional)"
+              }
+            ]
           },
           {
             "name": "modal-header-close",
@@ -222,7 +487,34 @@
           },
           {
             "name": "default",
-            "description": "Content of modal body. Optionally scoped."
+            "description": "Content of modal body. Optionally scoped.",
+            "scope": [
+              {
+                "prop": "visible",
+                "type": "Boolean",
+                "description": "The visibility state of the modal. true if the modal is visible and false if not visible"
+              },
+              {
+                "prop": "ok",
+                "type": "Function",
+                "description": "Closes the modal and fires the 'ok' and 'hide' events, with bvModalEvent.trigger = 'ok'"
+              },
+              {
+                "prop": "cancel",
+                "type": "Function",
+                "description": "Closes the modal and fires the 'cancel' and 'hide' events, with bvModalEvent.trigger = 'cancel'"
+              },
+              {
+                "prop": "close",
+                "type": "Function",
+                "description": "Closes the modal and fires the close and hide events, with bvModalEvent.trigger = 'headerclose'"
+              },
+              {
+                "prop": "hide",
+                "type": "Function",
+                "description": "Accepts one argument 'trigger'. Closes the modal and fires the 'hide' event, with the bvModalEvent.trigger = trigger (trigger is optional)"
+              }
+            ]
           }
         ]
       }
diff --git a/src/components/nav/package.json b/src/components/nav/package.json
index 8ae50a016aa..ee4fa561b81 100644
--- a/src/components/nav/package.json
+++ b/src/components/nav/package.json
@@ -8,10 +8,85 @@
       "DropdownPlugin"
     ],
     "components": [
-      "BNav",
-      "BNavItem",
-      "BNavText",
-      "BNavForm",
+      {
+        "component": "BNav",
+        "props": [
+          {
+            "prop": "tabs",
+            "description": "Renders the nav items with the appearance of tabs"
+          },
+          {
+            "prop": "pills",
+            "description": "Renders the nav items with the appearance of pill buttons"
+          },
+          {
+            "prop": "small",
+            "description": "Makes the nav smaller"
+          },
+          {
+            "prop": "align",
+            "description": "Align the nav items in the nav: 'start' (or 'left'), 'center', 'end' (or 'right')"
+          },
+          {
+            "prop": "fill",
+            "description": "Proportionately fills all horizontal space with nav items. All horizontal space is occupied, but not every nav item has the same width"
+          },
+          {
+            "prop": "justified",
+            "description": "Fills all horizontal space with nav items, but unlike 'fill', every nav item will be the same width"
+          },
+          {
+            "prop": "vertical",
+            "description": "Renders the nav vertically"
+          },
+          {
+            "prop": "cardHeader",
+            "description": "Set this prop when the nav is placed inside a card header"
+          }
+        ]
+      },
+      {
+        "component": "BNavItem",
+        "props": [
+          {
+            "prop": "linkAttrs",
+            "description": "Additional attributes to place on the nested link element"
+          },
+          {
+            "prop": "linkClasses",
+            "description": "CSS class (or classes) to place on the nested link element"
+          }
+        ]
+      },
+      {
+        "component": "BNavText"
+      },
+      {
+        "component": "BNavForm",
+        "props": [
+          {
+            "prop": "novalidate",
+            "description": "When set, disables browser native HTML5 validation on controls in the form"
+          },
+          {
+            "prop": "validated",
+            "description": "When set, adds the Bootstrap class 'was-validated' on the form, triggering the native browser validation states"
+          }
+        ],
+        "events": [
+          {
+            "event": "submit",
+            "description": "Emitted when the form is being submitted",
+            "args": [
+              {
+                "arg": "event",
+                "type": "Event",
+                "description": "Native submit event."
+              }
+            ]
+          }
+        ]
+      },
       {
         "component": "BNavItemDropdown",
         "aliases": [
@@ -19,10 +94,71 @@
           "BNavDropdown",
           "BNavDd"
         ],
+        "props": [
+          {
+            "prop": "text",
+            "description": "Text to place in the toggle button, or in the split button is split mode"
+          },
+          {
+            "prop": "html",
+            "description": "HTML string to place in the toggle button, or in the split button is split mode. Use with caution"
+          },
+          {
+            "prop": "dropup",
+            "description": "When set, positions the menu on the top of the button"
+          },
+          {
+            "prop": "dropright",
+            "description": "When set, positions the menu to the right of the button"
+          },
+          {
+            "prop": "dropleft",
+            "description": "When set, positions the menu to the left of the button"
+          },
+          {
+            "prop": "right",
+            "description": "Align the right edge of the menu with the right of the button"
+          },
+          {
+            "prop": "noFlip",
+            "description": "Prevent the menu from auto flipping positions"
+          },
+          {
+            "prop": "lazy",
+            "description": "When set, will only mount the menu content into the DOM when the menu is open"
+          },
+          {
+            "prop": "popperOpts",
+            "description": "Additional configuration to pass to Popper.js"
+          },
+          {
+            "prop": "menuClass",
+            "description": "CSS class (or classes) to add to the menu container"
+          },
+          {
+            "prop": "toggleClass",
+            "description": "CSS class (or classes) to add to the toggle button"
+          },
+          {
+            "prop": "noCaret",
+            "description": "Hide the caret indicator on the toggle button"
+          }
+        ],
         "slots": [
           {
             "name": "button-content",
             "description": "Can be used to implement custom text with icons and more styling."
+          },
+          {
+            "name": "default",
+            "description": "Optionally scoped default slot for dropdown menu content.",
+            "scope": [
+              {
+                "prop": "hide",
+                "type": "Function",
+                "description": "Can be used to close the dropdown menu. Accepts an optional boolean argument, which if true returns focus to the toggle button."
+              }
+            ]
           }
         ],
         "events": [
@@ -32,6 +168,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object. Call bvEvt.preventDefault() to cancel show."
               }
             ]
@@ -46,6 +183,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object. Call bvEvt.preventDefault() to cancel hide."
               }
             ]
diff --git a/src/components/navbar/package.json b/src/components/navbar/package.json
index 7020c5b2c8a..c256a97346f 100644
--- a/src/components/navbar/package.json
+++ b/src/components/navbar/package.json
@@ -10,14 +10,70 @@
       "CollapsePlugin"
     ],
     "components": [
-      "BNavbar",
-      "BNavbarNav",
-      "BNavbarBrand",
+      {
+        "component": "BNavbar",
+        "props": [
+          {
+            "prop": "type",
+            "description": "Control the text color by setting to 'light' for use with light background color variants, or 'dark' for dark background color variants"
+          },
+          {
+            "prop": "toggleable",
+            "description": "Ste to 'true' for an always collapsed navbar, or to a specific breakpoint at which point the navbar will be expanded: 'sn', 'ms', 'lg' or 'xl'"
+          },
+          {
+            "prop": "fixed",
+            "description": "Set to 'top' for fixed to the top of the viewport, or 'bottom' for fixed to the bottom of the viewport"
+          },
+          {
+            "prop": "sticky",
+            "description": "Set to true to make the navbar stick to the top of the viewport (or parent container that has 'position: relative' set) when scrolled"
+          },
+          {
+            "prop": "print",
+            "description": "Navbars are hidden by default when printing. When this prop is set it will be printed"
+          }
+        ]
+      },
+      {
+        "component": "BNavbarNav",
+        "props": [
+          {
+            "prop": "small",
+            "description": "Makes the nav smaller"
+          },
+          {
+            "prop": "align",
+            "description": "Align the nav items in the nav: 'start' (or 'left'), 'center', 'end' (or 'right')"
+          },
+          {
+            "prop": "fill",
+            "description": "Proportionately fills all horizontal space with nav items. All horizontal space is occupied, but not every nav item has the same width"
+          },
+          {
+            "prop": "justified",
+            "description": "Fills all horizontal space with nav items, but unlike 'fill', every nav item will be the same width"
+          }
+        ]
+      },
+      {
+        "component": "BNavbarBrand"
+      },
       {
         "component": "BNavbarToggle",
         "aliases": [
           "BNavToggle"
         ],
+        "props": [
+          {
+            "prop": "target",
+            "description": "ID of the collapse the toggle controls"
+          },
+          {
+            "prop": "label",
+            "description": "String to place in the toggle's 'aria-label' attribute"
+          }
+        ],
         "events": [
           {
             "event": "click",
@@ -25,6 +81,7 @@
             "args": [
               {
                 "name": "event",
+                "type": "MouseEvent",
                 "description": "Native click event object"
               }
             ]
diff --git a/src/components/pagination-nav/README.md b/src/components/pagination-nav/README.md
index 726e1c5ff42..809068b95dc 100644
--- a/src/components/pagination-nav/README.md
+++ b/src/components/pagination-nav/README.md
@@ -311,7 +311,7 @@ The slot `page` is always scoped, while the slots `first-text`, `prev-text`, `ne
 | `index`    | Number  | Page number (indexed from `0` to `numberOfPages -1`)      |
 | `active`   | Boolean | If the page is the active page                            |
 | `disabled` | Boolean | If the page button is disabled                            |
-| `content`  | String  | default content, or the result of the `link-gen` function |
+| `content`  | String  | default content, or the result of the `page-gen` function |
 
 **Scoped variables properties available to the `first-text`, `prev-text`, `next-text` and
 `last-text` slots:**
diff --git a/src/components/pagination-nav/package.json b/src/components/pagination-nav/package.json
index a7fbb868549..a9d28dd4cb0 100644
--- a/src/components/pagination-nav/package.json
+++ b/src/components/pagination-nav/package.json
@@ -7,6 +7,100 @@
     "components": [
       {
         "component": "BPaginationNav",
+        "props": [
+          {
+            "prop": "numberOfPages",
+            "description": "Total number of pages"
+          },
+          {
+            "prop": "baseUrl",
+            "description": "Base URL to use when auto generating page links"
+          },
+          {
+            "prop": "useRouter",
+            "description": "Render router-links instead of links when auto generating the page links"
+          },
+          {
+            "prop": "linkGen",
+            "description": "Link generator function. See docs for details"
+          },
+          {
+            "prop": "pageGen",
+            "description": "page number generator function. See docs for details"
+          },
+          {
+            "prop": "pages",
+            "description": "Array of page numbers and links"
+          },
+          {
+            "prop": "noPageDetect",
+            "description": "Disable of auto detection of current page"
+          },
+          {
+            "prop": "value",
+            "description": "Current page number, starting from 1"
+          },
+          {
+            "prop": "limit",
+            "description": "Maximum number of buttons to show (including ellipsis if shown, but excluding the bookend buttons)"
+          },
+          {
+            "prop": "align",
+            "description": "Alignment of the page buttons: 'start' (or 'left'), 'center', 'end' (or 'right'), or 'fill'"
+          },
+          {
+            "prop": "hideGotoEndButtons",
+            "description": "Hides the goto first and goto last page buttons"
+          },
+          {
+            "prop": "hideEllipsis",
+            "description": "Do not show ellipsis buttons"
+          },
+          {
+            "prop": "size",
+            "description": "Size of the rendered buttons: 'sm', 'md' (default), or 'lg'"
+          },
+          {
+            "prop": "ariaLabel",
+            "description": "Value to place in the 'aria-label' attribute of the pagination control"
+          },
+          {
+            "prop": "labelFirstPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto first page button"
+          },
+          {
+            "prop": "firstText",
+            "description": "Content to place in the goto first page button"
+          },
+          {
+            "prop": "labelPrevPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto previous page button"
+          },
+          {
+            "prop": "prevText",
+            "description": "Content to place in the goto previous page button"
+          },
+          {
+            "prop": "labelPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto page button. Page number will be prepended automatically"
+          },
+          {
+            "prop": "labelNextPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto next page button"
+          },
+          {
+            "prop": "nextText",
+            "description": "Content to place in the goto next page button"
+          },
+          {
+            "prop": "labelLastPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto last page button"
+          },
+          {
+            "prop": "lastText",
+            "description": "Content to place in the goto last page button"
+          }
+        ],
         "events": [
           {
             "event": "input",
@@ -32,27 +126,122 @@
         "slots": [
           {
             "name": "first-text",
-            "description": "The \"go to first page\" button text. Optionally scoped"
+            "description": "The \"go to first page\" button content. Optionally scoped",
+            "scope": [
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              }
+            ]
           },
           {
             "name": "prev-text",
-            "description": "The \"go to previous page\" button text. Optionally scoped"
+            "description": "The \"go to previous page\" button content. Optionally scoped",
+            "scope": [
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              }
+            ]
           },
           {
             "name": "next-text",
-            "description": "The \"go to next page\" button text. Optionally scoped"
+            "description": "The \"go to next page\" button content. Optionally scoped",
+            "scope": [
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              }
+            ]
           },
           {
             "name": "last-text",
-            "description": "The \"go to last page\" button text. Optionally scoped"
+            "description": "The \"go to last page\" button content. Optionally scoped",
+            "scope": [
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              }
+            ]
           },
           {
             "name": "ellipsis-text",
-            "description": "The '...' indicator text. Not scoped"
+            "description": "The '...' indicator content. Not scoped"
           },
           {
             "name": "page",
-            "description": "The page number button button content. Always scoped"
+            "description": "Page number button content. Always scoped",
+            "scope": [
+              {
+                "prop": "active",
+                "type": "Boolean",
+                "description": "If the page is the active page"
+              },
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              },
+              {
+                "prop": "content",
+                "type": "String",
+                "description": "Default button content, or the result of the page-gen function"
+              }
+            ]
           }
         ]
       }
diff --git a/src/components/pagination/package.json b/src/components/pagination/package.json
index a29216bc260..4b8c7099bd1 100644
--- a/src/components/pagination/package.json
+++ b/src/components/pagination/package.json
@@ -7,6 +7,84 @@
     "components": [
       {
         "component": "BPagination",
+        "props": [
+          {
+            "prop": "ariaControls",
+            "description": "ID of the element or component that this controls. Value is placed in the 'aria-controls' attribute"
+          },
+          {
+            "prop": "perPage",
+            "description": "Number of rows per page"
+          },
+          {
+            "prop": "totalRows",
+            "description": "Total number of rows in the dataset"
+          },
+          {
+            "prop": "value",
+            "description": "Current page number, starting from 1"
+          },
+          {
+            "prop": "limit",
+            "description": "Maximum number of buttons to show (including ellipsis if shown, but excluding the bookend buttons)"
+          },
+          {
+            "prop": "align",
+            "description": "Alignment of the page buttons: 'start' (or 'left'), 'center', 'end' (or 'right'), or 'fill'"
+          },
+          {
+            "prop": "hideGotoEndButtons",
+            "description": "Hides the goto first and goto last page buttons"
+          },
+          {
+            "prop": "hideEllipsis",
+            "description": "Do not show ellipsis buttons"
+          },
+          {
+            "prop": "size",
+            "description": "Size of the rendered buttons: 'sm', 'md' (default), or 'lg'"
+          },
+          {
+            "prop": "ariaLabel",
+            "description": "Value to place in the 'aria-label' attribute of the pagination control"
+          },
+          {
+            "prop": "labelFirstPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto first page button"
+          },
+          {
+            "prop": "firstText",
+            "description": "Content to place in the goto first page button"
+          },
+          {
+            "prop": "labelPrevPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto previous page button"
+          },
+          {
+            "prop": "labelPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto page button. Page number will be prepended automatically"
+          },
+          {
+            "prop": "prevText",
+            "description": "Content to place in the goto previous page button"
+          },
+          {
+            "prop": "labelNextPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto next page button"
+          },
+          {
+            "prop": "nextText",
+            "description": "Content to place in the goto next page button"
+          },
+          {
+            "prop": "labelLastPage",
+            "description": "Value to place in the 'aria-label' attribute of the goto last page button"
+          },
+          {
+            "prop": "lastText",
+            "description": "Content to place in the goto last page button"
+          }
+        ],
         "events": [
           {
             "event": "input",
@@ -14,6 +92,7 @@
             "args": [
               {
                 "arg": "page",
+                "type": "Number",
                 "description": "Selected page number (starting with 1)"
               }
             ]
@@ -24,6 +103,7 @@
             "args": [
               {
                 "arg": "page",
+                "type": "Number",
                 "description": "Selected page number (starting with 1)"
               }
             ]
@@ -32,19 +112,87 @@
         "slots": [
           {
             "name": "first-text",
-            "description": "The \"go to first page\" button content. Optionally scoped"
+            "description": "The \"go to first page\" button content. Optionally scoped",
+            "scope": [
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              }
+            ]
           },
           {
             "name": "prev-text",
-            "description": "The \"go to previous page\" button content. Optionally scoped"
+            "description": "The \"go to previous page\" button content. Optionally scoped",
+            "scope": [
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              }
+            ]
           },
           {
             "name": "next-text",
-            "description": "The \"go to next page\" button content. Optionally scoped"
+            "description": "The \"go to next page\" button content. Optionally scoped",
+            "scope": [
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              }
+            ]
           },
           {
             "name": "last-text",
-            "description": "The \"go to last page\" button content. Optionally scoped"
+            "description": "The \"go to last page\" button content. Optionally scoped",
+            "scope": [
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              }
+            ]
           },
           {
             "name": "ellipsis-text",
@@ -52,7 +200,34 @@
           },
           {
             "name": "page",
-            "description": "Page number button content. Always scoped"
+            "description": "Page number button content. Always scoped",
+            "scope": [
+              {
+                "prop": "active",
+                "type": "Boolean",
+                "description": "If the page is the active page"
+              },
+              {
+                "prop": "disabled",
+                "type": "Boolean",
+                "description": "Will be true if this button is disabled (non-clickable)"
+              },
+              {
+                "prop": "page",
+                "type": "Number",
+                "description": "Page number (from 1 to numberOfPages)"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "Page number (indexed from 0 to numberOfPages -1)"
+              },
+              {
+                "prop": "content",
+                "type": "String",
+                "description": "Default button content"
+              }
+            ]
           }
         ]
       }
diff --git a/src/components/popover/index.js b/src/components/popover/index.js
index 521fa6134bb..0b69d196a06 100644
--- a/src/components/popover/index.js
+++ b/src/components/popover/index.js
@@ -1,10 +1,10 @@
 import { BPopover } from './popover'
-import { VBPopover } from '../../directives/popover/popover'
+import { VBPopoverPlugin } from '../../directives/popover'
 import { pluginFactory } from '../../utils/plugins'
 
 const PopoverPlugin = /*#__PURE__*/ pluginFactory({
   components: { BPopover },
-  directives: { VBPopover }
+  plugins: { VBPopoverPlugin }
 })
 
 export { PopoverPlugin, BPopover }
diff --git a/src/components/popover/package.json b/src/components/popover/package.json
index 7d905950138..bbd15c007a4 100644
--- a/src/components/popover/package.json
+++ b/src/components/popover/package.json
@@ -4,12 +4,66 @@
   "meta": {
     "title": "Popover",
     "description": "The Popover feature provides a tooltip-like behavior, can be easily applied to any interactive element via the <b-popover> component or v-b-popover directive",
-    "directives": [
-      "VBPopover"
+    "plugins": [
+      "VBPopoverPlugin"
     ],
     "components": [
       {
         "component": "BPopover",
+        "props": [
+          {
+            "prop": "target",
+            "description": "Element string ID, or a reference to an element or component, that you want to trigger the popover."
+          },
+          {
+            "prop": "title",
+            "description": "Text to place in the popovers title"
+          },
+          {
+            "prop": "content",
+            "description": "Text to place in the body of the popover"
+          },
+          {
+            "prop": "triggers",
+            "description": "Specify which triggers will show the popover. Supported values are 'click', 'hover', 'focus'. Refer to the docs for special triggers 'blur' and 'manual'"
+          },
+          {
+            "prop": "placement",
+            "description": "Placement of the popover: One of 'top', 'bottom', 'right', 'left', 'top-left', 'top-right', 'bottom-left', 'bottom-right', 'left-top', 'left-bottom', 'right-top', 'right-bottom'"
+          },
+          {
+            "prop": "fallbackPlacement",
+            "description": "placement to use when the popover would be out of boundaries. Refer to the docs for more details"
+          },
+          {
+            "prop": "customClass",
+            "description": "CSS class (or classes) to apply to the popover's root element"
+          },
+          {
+            "prop": "delay",
+            "description": "Value for the show and hide delay. Applies to both show and hide when specified as a number or string. Use object form to set show and hide delays individually"
+          },
+          {
+            "prop": "boundary",
+            "description": "The boundary constraint of the popover: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement or component"
+          },
+          {
+            "prop": "boundaryPadding",
+            "description": "The popover will try and stay away from the edge of the boundary element by the number of pixels specified"
+          },
+          {
+            "prop": "offset",
+            "description": "Offset (in pixels) for the arrow center compared to the trigger target element"
+          },
+          {
+            "prop": "container",
+            "description": "The container element to append the rendered popover when visible. Default's to the body element"
+          },
+          {
+            "prop": "show",
+            "description": "When set will show the popover"
+          }
+        ],
         "events": [
           {
             "event": "show",
@@ -17,6 +71,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object"
               }
             ]
@@ -27,7 +82,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object."
+                "type": "BvEvent",
+                "description": "bvEvent object"
               }
             ]
           },
@@ -37,6 +93,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object"
               }
             ]
@@ -47,17 +104,32 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object."
+                "type": "BvEvent",
+                "description": "bvEvent object"
               }
             ]
           },
           {
             "event": "enabled",
-            "description": "Emitted when popover becomes enabled"
+            "description": "Emitted when popover becomes enabled",
+            "args": [
+              {
+                "arg": "bvEvent",
+                "type": "BvEvent",
+                "description": "bvEvent object"
+              }
+            ]
           },
           {
             "event": "disabled",
-            "description": "Emitted when popover becomes disabled"
+            "description": "Emitted when popover becomes disabled",
+            "args": [
+              {
+                "arg": "bvEvent",
+                "type": "BvEvent",
+                "description": "bvEvent object"
+              }
+            ]
           },
           {
             "event": "bv::popover::show",
@@ -65,6 +137,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object"
               }
             ]
@@ -75,7 +148,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object."
+                "type": "BvEvent",
+                "description": "bvEvent object"
               }
             ]
           },
@@ -85,6 +159,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object"
               }
             ]
@@ -95,7 +170,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object."
+                "type": "BvEvent",
+                "description": "bvEvent object"
               }
             ]
           },
@@ -105,7 +181,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object."
+                "type": "BvEvent",
+                "description": "bvEvent object"
               }
             ]
           },
@@ -115,7 +192,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object."
+                "type": "BvEvent",
+                "description": "bvEvent object"
               }
             ]
           }
@@ -127,6 +205,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "(optional), popover id to hide"
               }
             ]
@@ -137,6 +216,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "(optional), popover id to show"
               }
             ]
@@ -147,6 +227,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "(optional), popover id to disable"
               }
             ]
@@ -157,6 +238,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "(optional), popover id to enable"
               }
             ]
diff --git a/src/components/progress/package.json b/src/components/progress/package.json
index bdd6217ac3d..9474bc7ddc9 100644
--- a/src/components/progress/package.json
+++ b/src/components/progress/package.json
@@ -5,8 +5,84 @@
     "title": "Progress",
     "description": "A custom progress component for displaying simple or complex progress bars, featuring support for horizontally stacked bars, animated backgrounds, and text labels.",
     "components": [
-      "BProgress",
-      "BProgressBar"
+      {
+        "component": "BProgress",
+        "props": [
+          {
+            "prop": "striped",
+            "description": "Enable the striped background"
+          },
+          {
+            "prop": "animated",
+            "description": "Enable the animated background. Also automatically sets 'striped'"
+          },
+          {
+            "prop": "height",
+            "description": "Override the default height by specifying a CSS height value (including units)"
+          },
+          {
+            "prop": "showProgress",
+            "description": "Displays the current progress value as a percentage"
+          },
+          {
+            "prop": "showValue",
+            "description": "Displays the current progress value"
+          },
+          {
+            "prop": "precision",
+            "description": "The number of digits after the decimal to round the value to"
+          },
+          {
+            "prop": "max",
+            "description": "Set the maximum value"
+          },
+          {
+            "prop": "value",
+            "description": "The current value of the progress bar"
+          }
+        ]
+      },
+      {
+        "component": "BProgressBar",
+        "props": [
+          {
+            "prop": "striped",
+            "description": "Enable the striped background"
+          },
+          {
+            "prop": "animated",
+            "description": "Enable the animated background. Also automatically sets 'striped'"
+          },
+          {
+            "prop": "showProgress",
+            "description": "Displays the current progress value as a percentage"
+          },
+          {
+            "prop": "showValue",
+            "description": "Displays the current progress value"
+          },
+          {
+            "prop": "precision",
+            "description": "The number of digits after the decimal to round the value to"
+          },
+          {
+            "prop": "max",
+            "description": "Set the maximum value"
+          },
+          {
+            "prop": "value",
+            "description": "The current value of the progress bar"
+          },
+          {
+            "prop": "label",
+            "description": "Text string to explicitly set the label as"
+          },
+          {
+            "prop": "labelHtml",
+            "description": "HTML string to explicitly set the label as. Use with caution"
+          }
+        ]
+      }
     ]
   }
 }
diff --git a/src/components/spinner/package.json b/src/components/spinner/package.json
index 7786981e227..4cc03bb5cfe 100644
--- a/src/components/spinner/package.json
+++ b/src/components/spinner/package.json
@@ -8,6 +8,20 @@
     "components": [
       {
         "component": "BSpinner",
+        "props": [
+          {
+            "prop": "type",
+            "description": "Type of spinner to show. Current supported types are 'border' and 'grow'"
+          },
+          {
+            "prop": "label",
+            "description": "Text content to place in the sr-only label"
+          },
+          {
+            "prop": "small",
+            "description": "When set, rendered a smaller spinner suitable for placing in buttons"
+          }
+        ],
         "slots": [
           {
             "name": "label",
diff --git a/src/components/table/README.md b/src/components/table/README.md
index 1d64df07ca0..8fb946a7f48 100644
--- a/src/components/table/README.md
+++ b/src/components/table/README.md
@@ -820,7 +820,7 @@ explicit scoped slot provided.
 ```html
 <template>
   <div>
-    <b-table small :fields="fields" :items="items">
+    <b-table small :fields="fields" :items="items" responsive="sm">
       <!-- A virtual column -->
       <template v-slot:cell(index)="data">
         {{ data.index + 1 }}
diff --git a/src/components/table/package.json b/src/components/table/package.json
index a0bd54d9725..9abe4c53698 100644
--- a/src/components/table/package.json
+++ b/src/components/table/package.json
@@ -11,6 +11,272 @@
     "components": [
       {
         "component": "BTable",
+        "props": [
+          {
+            "prop": "striped",
+            "description": "Applies striping to the tbody rows"
+          },
+          {
+            "prop": "bordered",
+            "description": "Adds borders to all the cells and headers"
+          },
+          {
+            "prop": "borderless",
+            "description": "Removes all borders from cells"
+          },
+          {
+            "prop": "outlined",
+            "description": "Adds an outline border to the table element"
+          },
+          {
+            "prop": "dark",
+            "description": "Places the table in dark mode"
+          },
+          {
+            "prop": "hover",
+            "description": "Enables hover styling on rows"
+          },
+          {
+            "prop": "small",
+            "description": "Renders the table with smaller cell padding"
+          },
+          {
+            "prop": "fixed",
+            "description": "Makes all columns equal width (fixed layout table). Will speed up rendering for large tables. Column widths can be set via CSS or colgroup"
+          },
+          {
+            "prop": "responsive",
+            "description": "Makes the table responsive in width, adding a horizontal scrollbar. Set to true for always responsive or set to one of the breakpoints to switch from responsive to normal: 'sm', 'md', 'lg', 'xl'"
+          },
+          {
+            "prop": "stickyHeader",
+            "description": "Makes the table header sticky. Set to true for a maximum height 300px tall table, or set to any valid CSS hight (including units)"
+          },
+          {
+            "prop": "noBorderCollapse",
+            "description": "Disable's the collapsing of table borders. Useful when table has sticky headers or columns"
+          },
+          {
+            "prop": "captionTop",
+            "description": "Visually place the table caption above the table. Default is below."
+          },
+          {
+            "prop": "tableVariant",
+            "description": "Apply a Bootstrap theme color variant to the entire table"
+          },
+          {
+            "prop": "tableClass",
+            "description": "CSS class (or classes) to apply to the table element"
+          },
+          {
+            "prop": "stacked",
+            "description": "Place the table in stacked mode. Set to true for always stacked, or set to one of the breakpoints to switch from stacked to normal: 'sm', 'md', 'lg', 'xl'"
+          },
+          {
+            "prop": "headVariant",
+            "description": "Header variant: 'light' or 'dark', or unset"
+          },
+          {
+            "prop": "footVariant",
+            "description": "Footer variant: 'light' or 'dark', or unset"
+          },
+          {
+            "prop": "tbodyTransitionProps",
+            "description": "Vue 'transition-list' properties. When provided will make the tbody a Vue 'transition-list' component"
+          },
+          {
+            "prop": "tbodyTransitionHandlers",
+            "description": "Vue 'transition-list' event handlers. When provided will make the tbody a Vue 'transition-list' component"
+          },
+          {
+            "prop": "caption",
+            "description": "Text string to place in the caption element"
+          },
+          {
+            "prop": "captionHtml",
+            "description": "HTML string to place in the caption element. Use with caution"
+          },
+          {
+            "prop": "theadClass",
+            "description": "CSS class (or classes) to apply to the thead element"
+          },
+          {
+            "prop": "theadTrClass",
+            "description": "CSS class (or classes) to apply to the tr element in the thead"
+          },
+          {
+            "prop": "footClone",
+            "description": "Enable to the footer of the table, and clone the header content by default"
+          },
+          {
+            "prop": "tfootClass",
+            "description": "CSS class (or classes) to apply to the tfoot element"
+          },
+          {
+            "prop": "tfootTrClass",
+            "description": "CSS class (or classes) to apply to the tr element in the tfoot"
+          },
+          {
+            "prop": "tbodyClass",
+            "description": "CSS class (or classes) to apply to the tbody element"
+          },
+          {
+            "prop": "tbodyTrClass",
+            "description": "CSS class (or classes) to apply to the tr element in the tbody. Can be a function that returns a class (see docs for details)"
+          },
+          {
+            "prop": "value",
+            "description": "Currently displayed row data. Read-only. Do not set a value on this prop"
+          },
+          {
+            "prop": "fields",
+            "description": "Array of field names or array of field definition objects"
+          },
+          {
+            "prop": "items",
+            "description": "Array of items to display, or an items provider function reference. Refer to the docs for details"
+          },
+          {
+            "prop": "primaryKey",
+            "description": "Name of a table field that contains a guaranteed unique value per row. Needed for tbody transition support, and also speeds up table rendering"
+          },
+          {
+            "prop": "busy",
+            "description": "When set, forces the table into the busy state.Automatically set when an items provider function is being called"
+          },
+          {
+            "prop": "noProviderPaging",
+            "description": "When set, uses internal paging to pagination the data. Otherwise the items provider is expected to perform the paging"
+          },
+          {
+            "prop": "noProviderSorting",
+            "description": "When set, uses internal sorting to sort the data. Otherwise the items provider is expected to perform the sorting"
+          },
+          {
+            "prop": "noProviderFiltering",
+            "description": "When set, uses internal filtering to pagination the data. Otherwise the provider is expected to perform the filtering"
+          },
+          {
+            "prop": "apiUrl",
+            "description": "Pass through prop. Passed as part of the context object sent to the items provider function"
+          },
+          {
+            "prop": "perPage",
+            "description": "Number of rows to show per page. Set to 0 to disable pagination"
+          },
+          {
+            "prop": "currentPage",
+            "description": "The current page number to display when the table is paginated. Starting from 1 and up"
+          },
+          {
+            "prop": "noLocalSorting",
+            "description": "Disabled the internal sorting routine, and expects the user to provde the items sorted. Sorting controls will still be available"
+          },
+          {
+            "prop": "noFooterSorting",
+            "description": "When the build in formatter is used, setting this prop will disable the sorting ability in the footer"
+          },
+          {
+            "prop": "sortIconLeft",
+            "description": "Positions the sort control to the left of the header text. Default is on the right of the header text"
+          },
+          {
+            "prop": "noSortReset",
+            "description": "When a table is sortable, clicking on any non-sortable column heading will clear the current sort values. Set this prop to disable this feature"
+          },
+          {
+            "prop": "sortNullLast",
+            "description": "When sorting, null and undefined values will be sorted first (or last, depending on 'sort-desc'). Set this prop to sort null values last. Only applicable to internal sorting"
+          },
+          {
+            "prop": "sortBy",
+            "description": "Field name that is currently being sorted. Set to null to clear sorting. Syncable with the .sync prop modifier"
+          },
+          {
+            "prop": "sortDesc",
+            "description": "Set to true to sort the column in descending order. Syncable with the .sync prop modifier"
+          },
+          {
+            "prop": "sortDirection",
+            "description": "The initial sorting direction to sort an unsorted column by: 'asc', 'desc', or 'last' (to use the previous sort direction)"
+          },
+          {
+            "prop": "sortCompare",
+            "description": "A reference to a function for sort-comparing tow rows of data. Defaults to the internal sort compare routine. See docs for details"
+          },
+          {
+            "prop": "sortCompareOptions",
+            "description": "An object containing sort configuration for the 'String.prototype.sortLocale' method. See docs for details"
+          },
+          {
+            "prop": "sortCompareLocale",
+            "description": "The locale string (or array of locale string) that specified the language when sorting. See docs for details"
+          },
+          {
+            "prop": "labelSortAsc",
+            "description": "String to place in the header cell's 'aria-label' when clicking the cell will change the sort direction to ascending"
+          },
+          {
+            "prop": "labelSortDesc",
+            "description": "String to place in the header cell's 'aria-label' when clicking the cell will change the sort direction to descending"
+          },
+          {
+            "prop": "labelSortClear",
+            "description": "String to place in the header cell's 'aria-label' when clicking the cell will clear the current sorting direction"
+          },
+          {
+            "prop": "selectable",
+            "description": "When set, places the table body rows in selectable mode"
+          },
+          {
+            "prop": "selectMode",
+            "description": "The selectable mode for the table when 'selectable' is set. Possible values: 'single', 'multi' or 'range'"
+          },
+          {
+            "prop": "selectedVariant",
+            "description": "Bootstrap color theme variant to set selected rows to. use any of hte standard Bootstrap theme variants, or the special table row variant 'active'"
+          },
+          {
+            "prop": "showEmpty",
+            "description": "When enabled, and there are no item records to show, shows a message that there are no rows to show"
+          },
+          {
+            "prop": "emptyText",
+            "description": "Text string to show when the table has no items to show"
+          },
+          {
+            "prop": "emptyHtml",
+            "description": "HTML string to show when the table has no items to show. Usw with caution"
+          },
+          {
+            "prop": "emptyFilteredText",
+            "description": "Text string to show when the table has no items to show due to filtering"
+          },
+          {
+            "prop": "emptyFilteredHtml",
+            "description": "HTML string to show when the table has no items to show due to filtering. Use with caution"
+          },
+          {
+            "prop": "filter",
+            "description": "Criteria for filtering. Internal filtering supports only string or RegExpr criteria."
+          },
+          {
+            "prop": "filterFunction",
+            "description": "Reference to a function to use instead of the internal filtering function. Refer to the docs for details"
+          },
+          {
+            "prop": "filterIgnoredFields",
+            "description": "Array of top level fields to ignore when filtering the item data"
+          },
+          {
+            "prop": "filterIncludedFields",
+            "description": "Array of fields to include when filtering. Overrides filter-ignore-fields"
+          },
+          {
+            "prop": "filterDebounce",
+            "description": "Time in milliseconds to debounce changes to the filter criteria before filtering hte records"
+          }
+        ],
         "events": [
           {
             "event": "row-clicked",
@@ -18,14 +284,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being clicked."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being clicked."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -36,14 +305,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being double clicked."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being double clicked."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -54,14 +326,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being middle clicked."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being middle clicked."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -72,14 +347,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being right clicked."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being right clicked."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -90,14 +368,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being hovered."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being hovered."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -108,24 +389,28 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being unhovered."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being unhovered."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
           },
           {
             "event": "row-selected",
-            "description": "Emitted when a row or rows have been selected.",
+            "description": "Emitted when a row or rows have been selected or unselected.",
             "args": [
               {
                 "arg": "rows",
+                "type": "Array",
                 "description": "Array of the row items that are selected."
               }
             ]
@@ -136,18 +421,22 @@
             "args": [
               {
                 "arg": "key",
+                "type": "String",
                 "description": "Column key clicked (field name)."
               },
               {
                 "arg": "field",
+                "type": "Object",
                 "description": "Field definition object."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               },
               {
                 "arg": "isFooter",
+                "type": "Boolean",
                 "description": "'True' if this event originated from clicking on the footer cell"
               }
             ]
@@ -158,6 +447,7 @@
             "args": [
               {
                 "arg": "ctx",
+                "type": "Object",
                 "description": "Table state context object. See docs."
               }
             ]
@@ -168,6 +458,7 @@
             "args": [
               {
                 "arg": "ctx",
+                "type": "Object",
                 "description": "Table state context object. See docs."
               }
             ]
@@ -178,6 +469,7 @@
             "args": [
               {
                 "arg": "filteredItems",
+                "type": "Array",
                 "description": "Array of items after filtering (before local pagination occurs)."
               }
             ]
@@ -194,6 +486,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "table id to refresh data"
               }
             ]
@@ -201,28 +494,219 @@
         ],
         "slots": [
           {
-            "name": "cell(key)",
-            "description": "Scoped slot for custom data rendering of field data. 'key' is the fields key name. See docs for scoped data"
+            "name": "cell({key})",
+            "pattern": "cell\\([a-zA-Z0-9$_.\\-]+\\)",
+            "description": "Scoped slot for custom data rendering of field data. '{key}' is the field's key name. See docs for scoped data",
+            "scope": [
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "The row's index (zero-based) with respect to the displayed rows"
+              },
+              {
+                "prop": "item",
+                "type": "Object",
+                "description": "The row's item data object"
+              },
+              {
+                "prop": "value",
+                "description": "The value for this key in the record (null or undefined if a virtual column), or the output of the field's formatter function"
+              },
+              {
+                "prop": "unformatted",
+                "description": "The raw value for this key in the item record (null or undefined if a virtual column), before being passed to the field's formatter function"
+              },
+              {
+                "prop": "detailsShowing",
+                "type": "Boolean",
+                "description": "Will be true if the row's row-details scoped slot is visible"
+              },
+              {
+                "prop": "toggleDetails",
+                "type": "Function",
+                "description": "Can be called to toggle the visibility of the rows row-details scoped slot"
+              },
+              {
+                "prop": "rowSelected",
+                "type": "Boolean",
+                "description": "Will be true if the row has been selected."
+              }
+            ]
           },
           {
             "name": "cell()",
-            "description": "Default scoped slot for custom data rendering of field data. See docs for scoped data"
+            "description": "Default scoped slot for custom data rendering of field data. See docs for scoped data",
+            "scope": [
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "The row's index (zero-based) with respect to the displayed rows"
+              },
+              {
+                "prop": "item",
+                "type": "Object",
+                "description": "The row's item data object"
+              },
+              {
+                "prop": "value",
+                "description": "The value for this key in the record (null or undefined if a virtual column), or the output of the field's formatter function"
+              },
+              {
+                "prop": "unformatted",
+                "description": "The raw value for this key in the item record (null or undefined if a virtual column), before being passed to the field's formatter function"
+              },
+              {
+                "prop": "detailsShowing",
+                "type": "Boolean",
+                "description": "Will be true if the row's row-details scoped slot is visible"
+              },
+              {
+                "prop": "toggleDetails",
+                "type": "Function",
+                "description": "Can be called to toggle the visibility of the rows row-details scoped slot"
+              },
+              {
+                "prop": "rowSelected",
+                "type": "Boolean",
+                "description": "Will be true if the row has been selected."
+              }
+            ]
           },
           {
-            "name": "head(key)",
-            "description": "Scoped slot for custom rendering of field header. 'key' is the fields key name. See docs for scoped header"
+            "name": "head({key})",
+            "pattern": "head\\([a-zA-Z0-9$_.\\-]+\\)",
+            "description": "Scoped slot for custom rendering of field header. '{key}' is the field's key name. See docs for scoped header",
+            "scope": [
+              {
+                "prop": "column",
+                "type": "String",
+                "description": "The field's key value"
+              },
+              {
+                "prop": "field",
+                "type": "Object",
+                "description": "the field's definition object (from the fields prop)"
+              },
+              {
+                "prop": "label",
+                "type": "String",
+                "description": "The field's label value"
+              },
+              {
+                "prop": "selectAllRows",
+                "type": "Function",
+                "description": "Select all rows (applicable if the table is in selectable mode)"
+              },
+              {
+                "prop": "clearSelected",
+                "type": "Function",
+                "description": "Unselect all rows (applicable if the table is in selectable mode)"
+              },
+              {
+                "prop": "isFoot",
+                "type": "Boolean",
+                "description": "Will be true if the slot is being rendered in the table footer"
+              }
+            ]
           },
           {
             "name": "head()",
-            "description": "Default scoped slot for custom rendering of field header. See docs for scoped header"
+            "description": "Default scoped slot for custom rendering of field header. See docs for scoped header",
+            "scope": [
+              {
+                "prop": "column",
+                "type": "String",
+                "description": "The field's key value"
+              },
+              {
+                "prop": "field",
+                "type": "Object",
+                "description": "the field's definition object (from the fields prop)"
+              },
+              {
+                "prop": "label",
+                "type": "String",
+                "description": "The field's label value"
+              },
+              {
+                "prop": "selectAllRows",
+                "type": "Function",
+                "description": "Select all rows (applicable if the table is in selectable mode)"
+              },
+              {
+                "prop": "clearSelected",
+                "type": "Function",
+                "description": "Unselect all rows (applicable if the table is in selectable mode)"
+              },
+              {
+                "prop": "isFoot",
+                "type": "Boolean",
+                "description": "Will be true if the slot is being rendered in the table footer"
+              }
+            ]
           },
           {
-            "name": "foot(key)",
-            "description": "Scoped slot for custom rendering of field footer. 'key' is the fields key name. See docs for scoped footer"
+            "name": "foot({key})",
+            "pattern": "foot\\([a-zA-Z0-9$_.\\-]+\\)",
+            "description": "Scoped slot for custom rendering of field footer. '{key}' is the field's key name. See docs for scoped footer",
+            "scope": [
+              {
+                "prop": "column",
+                "type": "String",
+                "description": "The field's key value"
+              },
+              {
+                "prop": "field",
+                "type": "Object",
+                "description": "the field's definition object (from the fields prop)"
+              },
+              {
+                "prop": "label",
+                "type": "String",
+                "description": "The field's label value"
+              },
+              {
+                "prop": "selectAllRows",
+                "type": "Function",
+                "description": "Select all rows (applicable if the table is in selectable mode)"
+              },
+              {
+                "prop": "clearSelected",
+                "type": "Function",
+                "description": "Unselect all rows (applicable if the table is in selectable mode)"
+              }
+            ]
           },
           {
             "name": "foot()",
-            "description": "Default scoped slot for custom rendering of field footer. See docs for scoped footer"
+            "description": "Default scoped slot for custom rendering of field footer. See docs for scoped footer",
+            "scope": [
+              {
+                "prop": "column",
+                "type": "String",
+                "description": "The field's key value"
+              },
+              {
+                "prop": "field",
+                "type": "Object",
+                "description": "the field's definition object (from the fields prop)"
+              },
+              {
+                "prop": "label",
+                "type": "String",
+                "description": "The field's label value"
+              },
+              {
+                "prop": "selectAllRows",
+                "type": "Function",
+                "description": "Select all rows (applicable if the table is in selectable mode)"
+              },
+              {
+                "prop": "clearSelected",
+                "type": "Function",
+                "description": "Unselect all rows (applicable if the table is in selectable mode)"
+              }
+            ]
           },
           {
             "name": "table-caption",
@@ -230,7 +714,19 @@
           },
           {
             "name": "table-colgroup",
-            "description": "Slot to place custom colgroup and col elements (optionally scoped: columns - number of columns, fields - array of field definition objects)"
+            "description": "Slot to place custom colgroup and col elements. Optionally scoped",
+            "scope": [
+              {
+                "prop": "columns",
+                "type": "Number",
+                "description": "the number of columns in the table"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "Array of field definition objects"
+              }
+            ]
           },
           {
             "name": "table-busy",
@@ -238,36 +734,315 @@
           },
           {
             "name": "row-details",
-            "description": "Scoped slot for optional rendering additional record details. See docs for Row details support"
+            "description": "Scoped slot for optional rendering additional record details. See docs for Row details support",
+            "scope": [
+              {
+                "prop": "item",
+                "type": "Object",
+                "description": "The entire row's record data object"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "The item's row index number (with respect to the displayed item rows)"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              },
+              {
+                "prop": "toggleDetails",
+                "type": "Function",
+                "description": "Function to toggle visibility of the row's details slot"
+              }
+            ]
           },
           {
             "name": "empty",
-            "description": "Content to display when no items are present in the `items` array (optionally scoped: see docs for details)"
+            "description": "Content to display when no items are present in the `items` array. Optionally scoped",
+            "scope": [
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              },
+              {
+                "prop": "items",
+                "type": "Array",
+                "description": "The items array. Exposed here to check null vs []"
+              },
+              {
+                "prop": "emptyText",
+                "type": "String",
+                "description": "The value of the empty-text prop"
+              },
+              {
+                "prop": "emptyHtml",
+                "type": "String",
+                "description": "The value of the empty-html prop"
+              },
+              {
+                "prop": "emptyFilteredText",
+                "type": "String",
+                "description": "The value of the empty-filtered-text prop"
+              },
+              {
+                "prop": "emptyFilteredHtml",
+                "type": "String",
+                "description": "The value of the empty-filtered-html prop"
+              }
+            ]
           },
           {
             "name": "emptyfiltered",
-            "description": "Content to display when no items are present in the filtered `items` array (optionally scoped: see docs for details)"
+            "description": "Content to display when no items are present in the filtered `items` array. Optionally scoped",
+            "scope": [
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              },
+              {
+                "prop": "items",
+                "type": "Array",
+                "description": "The items array. Exposed here to check null vs []"
+              },
+              {
+                "prop": "emptyText",
+                "type": "String",
+                "description": "The value of the empty-text prop"
+              },
+              {
+                "prop": "emptyHtml",
+                "type": "String",
+                "description": "The value of the empty-html prop"
+              },
+              {
+                "prop": "emptyFilteredText",
+                "type": "String",
+                "description": "The value of the empty-filtered-text prop"
+              },
+              {
+                "prop": "emptyFilteredHtml",
+                "type": "String",
+                "description": "The value of the empty-filtered-html prop"
+              }
+            ]
           },
           {
             "name": "thead-top",
-            "description": "Slot above the column headers in the `thead` element for user-supplied B-TR's with B-TH/B-TD (optionally scoped: columns - number of TDs to provide, fields - array of field definition objects)"
+            "description": "Slot above the column headers in the `thead` element for user-supplied B-TR's with B-TH/B-TD. Optionally scoped.",
+            "scope": [
+              {
+                "prop": "columns",
+                "type": "Number",
+                "description": "the number of columns in the table"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              },
+              {
+                "prop": "selectAllRows",
+                "type": "Function",
+                "description": "Select all rows (applicable if the table is in selectable mode)"
+              },
+              {
+                "prop": "clearSelected",
+                "type": "Function",
+                "description": "Unselect all rows (applicable if the table is in selectable mode)"
+              }
+            ]
           },
           {
             "name": "top-row",
-            "description": "Fixed top row slot for user supplied B-TD cells (Optionally scoped: columns - number of B-TDs to provide, fields - array of field definition objects)"
+            "description": "Fixed top row slot for user supplied B-TD cells. Optionally scoped",
+            "scope": [
+              {
+                "prop": "columns",
+                "type": "Number",
+                "description": "the number of columns in the table"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              }
+            ]
           },
           {
             "name": "bottom-row",
-            "description": "Fixed bottom row slot for user supplied B-TD cells (Optionally Scoped: columns - number of B-TDs to provide, fields - array of field definition objects)"
+            "description": "Fixed bottom row slot for user supplied B-TD cells. Optionally Scoped",
+            "scope": [
+              {
+                "prop": "columns",
+                "type": "Number",
+                "description": "the number of columns in the table"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              }
+            ]
           },
           {
             "name": "custom-foot",
-            "description": "Custom footer content slot for user supplied B-TR, B-TH, B-TD (Optionally Scoped: columns - number columns, fields - array of field definition objects, items - array of currently displayed row items)"
+            "description": "Custom footer content slot for user supplied B-TR, B-TH, B-TD. Optionally Scoped",
+            "scope": [
+              {
+                "prop": "columns",
+                "type": "Number",
+                "description": "the number of columns in the table"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              },
+              {
+                "prop": "items",
+                "type": "Array",
+                "description": "Array of items that are currently being displayed"
+              }
+            ]
           }
         ]
       },
       {
         "component": "BTableLite",
+        "props": [
+          {
+            "prop": "striped",
+            "description": "Applies striping to the tbody rows"
+          },
+          {
+            "prop": "bordered",
+            "description": "Adds borders to all the cells and headers"
+          },
+          {
+            "prop": "borderless",
+            "description": "Removes all borders from cells"
+          },
+          {
+            "prop": "outlined",
+            "description": "Adds an outline border to the table element"
+          },
+          {
+            "prop": "dark",
+            "description": "Places the table in dark mode"
+          },
+          {
+            "prop": "hover",
+            "description": "Enables hover styling on rows"
+          },
+          {
+            "prop": "small",
+            "description": "Renders the table with smaller cell padding"
+          },
+          {
+            "prop": "fixed",
+            "description": "Makes all columns equal width (fixed layout table). Will speed up rendering for large tables. Column widths can be set via CSS or colgroup"
+          },
+          {
+            "prop": "responsive",
+            "description": "Makes the table responsive in width, adding a horizontal scrollbar. Set to true for always responsive or set to one of the breakpoints to switch from responsive to normal: 'sm', 'md', 'lg', 'xl'"
+          },
+          {
+            "prop": "stickyHeader",
+            "description": "Makes the table header sticky. Set to true for a maximum height 300px tall table, or set to any valid CSS hight (including units)"
+          },
+          {
+            "prop": "noBorderCollapse",
+            "description": "Disable's the collapsing of table borders. Useful when table has sticky headers or columns"
+          },
+          {
+            "prop": "captionTop",
+            "description": "Visually place the table caption above the table. Default is below."
+          },
+          {
+            "prop": "tableVariant",
+            "description": "Apply a Bootstrap theme color variant to the entire table"
+          },
+          {
+            "prop": "tableClass",
+            "description": "CSS class (or classes) to apply to the table element"
+          },
+          {
+            "prop": "stacked",
+            "description": "Place the table in stacked mode. Set to true for always stacked, or set to one of the breakpoints to switch from stacked to normal: 'sm', 'md', 'lg', 'xl'"
+          },
+          {
+            "prop": "headVariant",
+            "description": "Header variant: 'light' or 'dark', or unset"
+          },
+          {
+            "prop": "footVariant",
+            "description": "Footer variant: 'light' or 'dark', or unset"
+          },
+          {
+            "prop": "tbodyTransitionProps",
+            "description": "Vue 'transition-list' properties. When provided will make the tbody a Vue 'transition-list' component"
+          },
+          {
+            "prop": "tbodyTransitionHandlers",
+            "description": "Vue 'transition-list' event handlers. When provided will make the tbody a Vue 'transition-list' component"
+          },
+          {
+            "prop": "caption",
+            "description": "Text string to place in the caption element"
+          },
+          {
+            "prop": "captionHtml",
+            "description": "HTML string to place in the caption element. Use with caution"
+          },
+          {
+            "prop": "theadClass",
+            "description": "CSS class (or classes) to apply to the thead element"
+          },
+          {
+            "prop": "theadTrClass",
+            "description": "CSS class (or classes) to apply to the tr element in the thead"
+          },
+          {
+            "prop": "footClone",
+            "description": "Enable to the footer of the table, and clone the header content by default"
+          },
+          {
+            "prop": "tfootClass",
+            "description": "CSS class (or classes) to apply to the tfoot element"
+          },
+          {
+            "prop": "tfootTrClass",
+            "description": "CSS class (or classes) to apply to the tr element in the tfoot"
+          },
+          {
+            "prop": "tbodyClass",
+            "description": "CSS class (or classes) to apply to the tbody element"
+          },
+          {
+            "prop": "tbodyTrClass",
+            "description": "CSS class (or classes) to apply to the tr element in the tbody. Can be a function that returns a class (see docs for details)"
+          },
+          {
+            "prop": "value",
+            "description": "Currently displayed row data. Read-only. Do not set a value on this prop"
+          },
+          {
+            "prop": "fields",
+            "description": "Array of field names or array of field definition objects"
+          },
+          {
+            "prop": "items",
+            "description": "Array of items to display"
+          },
+          {
+            "prop": "primaryKey",
+            "description": "Name of a table field that contains a guaranteed unique value per row. Needed for tbody transition support, and also speeds up table rendering"
+          }
+        ],
         "events": [
           {
             "event": "row-clicked",
@@ -275,14 +1050,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being clicked."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being clicked."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -293,14 +1071,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being double clicked."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being double clicked."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -311,14 +1092,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being middle clicked."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being middle clicked."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -329,14 +1113,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being right clicked."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being right clicked."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -347,14 +1134,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being hovered."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being hovered."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -365,14 +1155,17 @@
             "args": [
               {
                 "arg": "item",
+                "type": "Object",
                 "description": "Item data of the row being unhovered."
               },
               {
                 "arg": "index",
+                "type": "Number",
                 "description": "Index of the row being unhovered."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               }
             ]
@@ -383,18 +1176,22 @@
             "args": [
               {
                 "arg": "key",
+                "type": "String",
                 "description": "Column key clicked (field name)."
               },
               {
                 "arg": "field",
+                "type": "Object",
                 "description": "Field definition object."
               },
               {
                 "arg": "event",
+                "type": "MouseEvent",
                 "description": "Native event object."
               },
               {
                 "arg": "isFooter",
+                "type": "Boolean",
                 "description": "'True' if this event originated from clicking on the footer cell"
               }
             ]
@@ -402,28 +1199,169 @@
         ],
         "slots": [
           {
-            "name": "cell(key)",
-            "description": "Scoped slot for custom data rendering of field data. 'key' is the fields key name. See docs for scoped data"
+            "name": "cell({key})",
+            "pattern": "cell\\([a-zA-Z0-9$_.\\-]+\\)",
+            "description": "Scoped slot for custom data rendering of field data. '{key}' is the field's key name.",
+            "scope": [
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "The row's index (zero-based) with respect to the displayed rows"
+              },
+              {
+                "prop": "item",
+                "type": "Object",
+                "description": "The row's item data object"
+              },
+              {
+                "prop": "value",
+                "description": "The value for this key in the record (null or undefined if a virtual column), or the output of the field's formatter function"
+              },
+              {
+                "prop": "unformatted",
+                "description": "The raw value for this key in the item record (null or undefined if a virtual column), before being passed to the field's formatter function"
+              },
+              {
+                "prop": "detailsShowing",
+                "type": "Boolean",
+                "description": "Will be true if the row's row-details scoped slot is visible"
+              },
+              {
+                "prop": "toggleDetails",
+                "type": "Function",
+                "description": "Can be called to toggle the visibility of the rows row-details scoped slot"
+              }
+            ]
           },
           {
             "name": "cell()",
-            "description": "Default scoped slot for custom data rendering of field data. See docs for scoped data"
+            "description": "Default scoped slot for custom data rendering of field data.",
+            "scope": [
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "The row's index (zero-based) with respect to the displayed rows"
+              },
+              {
+                "prop": "item",
+                "type": "Object",
+                "description": "The row's item data object"
+              },
+              {
+                "prop": "value",
+                "description": "The value for this key in the record (null or undefined if a virtual column), or the output of the field's formatter function"
+              },
+              {
+                "prop": "unformatted",
+                "description": "The raw value for this key in the item record (null or undefined if a virtual column), before being passed to the field's formatter function"
+              },
+              {
+                "prop": "detailsShowing",
+                "type": "Boolean",
+                "description": "Will be true if the row's row-details scoped slot is visible"
+              },
+              {
+                "prop": "toggleDetails",
+                "type": "Function",
+                "description": "Can be called to toggle the visibility of the rows row-details scoped slot"
+              }
+            ]
           },
           {
-            "name": "head(key)",
-            "description": "Scoped slot for custom rendering of field header. 'key' is the fields key name. See docs for scoped header"
+            "name": "head({key})",
+            "pattern": "head\\([a-zA-Z0-9$_.\\-]+\\)",
+            "description": "Scoped slot for custom rendering of field header. '{key}' is the field's key name",
+            "scope": [
+              {
+                "prop": "column",
+                "type": "String",
+                "description": "The field's key value"
+              },
+              {
+                "prop": "field",
+                "type": "Object",
+                "description": "the field's definition object (from the fields prop)"
+              },
+              {
+                "prop": "label",
+                "type": "String",
+                "description": "The field's label value"
+              },
+              {
+                "prop": "isFoot",
+                "type": "Boolean",
+                "description": "Will be true if the slot is being rendered in the table footer"
+              }
+            ]
           },
           {
             "name": "head()",
-            "description": "Default scoped slot for custom rendering of field header. See docs for scoped header"
+            "description": "Default scoped slot for custom rendering of field header.",
+            "scope": [
+              {
+                "prop": "column",
+                "type": "String",
+                "description": "The field's key value"
+              },
+              {
+                "prop": "field",
+                "type": "Object",
+                "description": "the field's definition object (from the fields prop)"
+              },
+              {
+                "prop": "label",
+                "type": "String",
+                "description": "The field's label value"
+              },
+              {
+                "prop": "isFoot",
+                "type": "Boolean",
+                "description": "Will be true if the slot is being rendered in the table footer"
+              }
+            ]
           },
           {
-            "name": "foot(key)",
-            "description": "Scoped slot for custom rendering of field footer. 'key' is the fields key name. See docs for scoped footer"
+            "name": "foot({key})",
+            "pattern": "foot\\([a-zA-Z0-9$_.\\-]+\\)",
+            "description": "Scoped slot for custom rendering of field footer. '{key}' is the field's key name.",
+            "scope": [
+              {
+                "prop": "column",
+                "type": "String",
+                "description": "The field's key value"
+              },
+              {
+                "prop": "field",
+                "type": "Object",
+                "description": "the field's definition object (from the fields prop)"
+              },
+              {
+                "prop": "label",
+                "type": "String",
+                "description": "The field's label value"
+              }
+            ]
           },
           {
             "name": "foot()",
-            "description": "Default scoped slot for custom rendering of field footer. See docs for scoped footer"
+            "description": "Default scoped slot for custom rendering of field footer",
+            "scope": [
+              {
+                "prop": "column",
+                "type": "String",
+                "description": "The field's key value"
+              },
+              {
+                "prop": "field",
+                "type": "Object",
+                "description": "the field's definition object (from the fields prop)"
+              },
+              {
+                "prop": "label",
+                "type": "String",
+                "description": "The field's label value"
+              }
+            ]
           },
           {
             "name": "table-caption",
@@ -431,42 +1369,235 @@
           },
           {
             "name": "table-colgroup",
-            "description": "Slot to place custom colgroup and col elements (optionally scoped: columns - number of columns, fields - array of field definition objects)"
+            "description": "Slot to place custom colgroup and col elements. Optionally scoped",
+            "scope": [
+              {
+                "prop": "columns",
+                "type": "Number",
+                "description": "the number of columns in the table"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "Array of field definition objects"
+              }
+            ]
           },
           {
             "name": "row-details",
-            "description": "Scoped slot for optional rendering additional record details. See docs for Row details support"
+            "description": "Scoped slot for optional rendering additional record details. See docs for Row details support",
+            "scope": [
+              {
+                "prop": "item",
+                "type": "Object",
+                "description": "The entire row's record data object"
+              },
+              {
+                "prop": "index",
+                "type": "Number",
+                "description": "The item's row index number (with respect to the displayed item rows)"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              },
+              {
+                "prop": "toggleDetails",
+                "type": "Function",
+                "description": "Function to toggle visibility of the row's details slot"
+              }
+            ]
           },
           {
             "name": "thead-top",
-            "description": "Slot above the column headers in the `thead` element for user-supplied B-TR with B-TH/B-TD (optionally scoped: columns - number of TDs to provide, fields - array of field definition objects)"
+            "description": "Slot above the column headers in the `thead` element for user-supplied B-TR with B-TH/B-TD. Optionally scoped.",
+            "scope": [
+              {
+                "prop": "columns",
+                "type": "Number",
+                "description": "the number of columns in the table"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              },
+              {
+                "prop": "selectAllRows",
+                "type": "Function",
+                "description": "Select all rows (applicable if the table is in selectable mode)"
+              },
+              {
+                "prop": "clearSelected",
+                "type": "Function",
+                "description": "Unselect all rows (applicable if the table is in selectable mode)"
+              }
+            ]
           },
           {
             "name": "custom-foot",
-            "description": "Custom footer content slot for user supplied B-TR's with B-TH/B-TD (Optionally Scoped: columns - number columns, fields - array of field definition objects, items - array of currently displayed row items)"
+            "description": "Custom footer content slot for user supplied B-TR's with B-TH/B-TD. Optionally Scoped",
+            "scope": [
+              {
+                "prop": "columns",
+                "type": "Number",
+                "description": "the number of columns in the table"
+              },
+              {
+                "prop": "fields",
+                "type": "Array",
+                "description": "The normalized fields definition array (in the array of objects format)"
+              },
+              {
+                "prop": "items",
+                "type": "Array",
+                "description": "Array of items that are currently being displayed"
+              }
+            ]
           }
         ]
       },
       {
-        "component": "BTableSimple"
+        "component": "BTableSimple",
+        "props": [
+          {
+            "prop": "striped",
+            "description": "Applies striping to the tbody rows"
+          },
+          {
+            "prop": "bordered",
+            "description": "Adds borders to all the cells and headers"
+          },
+          {
+            "prop": "borderless",
+            "description": "Removes all borders from cells"
+          },
+          {
+            "prop": "outlined",
+            "description": "Adds an outline border to the table element"
+          },
+          {
+            "prop": "dark",
+            "description": "Places the table in dark mode"
+          },
+          {
+            "prop": "hover",
+            "description": "Enables hover styling on rows"
+          },
+          {
+            "prop": "small",
+            "description": "Renders the table with smaller cell padding"
+          },
+          {
+            "prop": "fixed",
+            "description": "Makes all columns equal width (fixed layout table). Will speed up rendering for large tables. Column widths can be set via CSS or colgroup"
+          },
+          {
+            "prop": "responsive",
+            "description": "Makes the table responsive in width, adding a horizontal scrollbar. Set to true for always responsive or set to one of the breakpoints to switch from responsive to normal: 'sm', 'md', 'lg', 'xl'"
+          },
+          {
+            "prop": "stickyHeader",
+            "description": "Makes the table header sticky. Set to true for a maximum height 300px tall table, or set to any valid CSS hight (including units)"
+          },
+          {
+            "prop": "noBorderCollapse",
+            "description": "Disable's the collapsing of table borders. Useful when table has sticky headers or columns"
+          },
+          {
+            "prop": "captionTop",
+            "description": "Visually place the table caption above the table. Default is below."
+          },
+          {
+            "prop": "tableVariant",
+            "description": "Apply a Bootstrap theme color variant to the entire table"
+          },
+          {
+            "prop": "tableClass",
+            "description": "CSS class (or classes) to apply to the table element"
+          },
+          {
+            "prop": "stacked",
+            "description": "Place the table in stacked mode. Set to true for always stacked, or set to one of the breakpoints to switch from stacked to normal: 'sm', 'md', 'lg', 'xl'"
+          }
+        ]
       },
       {
-        "component": "BTbody"
+        "component": "BTbody",
+        "props": [
+          {
+            "prop": "tbodyTransitionProps",
+            "description": "Vue 'transition-list' properties. When provided will make the tbody a Vue 'transition-list' component"
+          },
+          {
+            "prop": "tbodyTransitionHandlers",
+            "description": "Vue 'transition-list' event handlers. When provided will make the tbody a Vue 'transition-list' component"
+          }
+        ]
       },
       {
-        "component": "BThead"
+        "component": "BThead",
+        "props": [
+          {
+            "prop": "headVariant",
+            "description": "Header variant: 'light' or 'dark', or unset"
+          }
+        ]
       },
       {
-        "component": "BTfoot"
+        "component": "BTfoot",
+        "props": [
+          {
+            "prop": "footVariant",
+            "description": "Footer variant: 'light' or 'dark', or unset"
+          }
+        ]
       },
       {
         "component": "BTr"
       },
       {
-        "component": "BTd"
+        "component": "BTd",
+        "props": [
+          {
+            "prop": "colspan",
+            "description": "Number of columns this cell spans"
+          },
+          {
+            "prop": "rowspan",
+            "description": "Number of rows this cell spans"
+          },
+          {
+            "prop": "stackedHeading",
+            "description": "Heading for the cell when in stacked mode. Only applicable to cells in the 'tbody' element"
+          },
+          {
+            "prop": "stickyColumn",
+            "description": "If this will be a sticky colum. Must be set on all cells in this column. table must be in sticky-header or responsive mode to work"
+          }
+        ]
       },
       {
-        "component": "BTh"
+        "component": "BTh",
+        "props": [
+          {
+            "prop": "colspan",
+            "description": "Number of columns this cell spans"
+          },
+          {
+            "prop": "rowspan",
+            "description": "Number of rows this cell spans"
+          },
+          {
+            "prop": "stackedHeading",
+            "description": "Heading for the cell when in stacked mode. Only applicable to cells in the 'tbody' element"
+          },
+          {
+            "prop": "stickyColumn",
+            "description": "If this will be a sticky colum. Must be set on all cells in this column. table must be in sticky-header or responsive mode to work"
+          }
+        ]
       }
     ]
   }
diff --git a/src/components/tabs/package.json b/src/components/tabs/package.json
index 2c34a1edde8..f990c20dc80 100644
--- a/src/components/tabs/package.json
+++ b/src/components/tabs/package.json
@@ -7,6 +7,80 @@
     "components": [
       {
         "component": "BTabs",
+        "props": [
+          {
+            "prop": "pills",
+            "description": "Renders the nav items with the appearance of pill buttons"
+          },
+          {
+            "prop": "small",
+            "description": "Makes the nav smaller"
+          },
+          {
+            "prop": "align",
+            "description": "Align the nav items in the nav: 'start' (or 'left'), 'center', 'end' (or 'right')"
+          },
+          {
+            "prop": "fill",
+            "description": "Proportionately fills all horizontal space with nav items. All horizontal space is occupied, but not every nav item has the same width"
+          },
+          {
+            "prop": "justified",
+            "description": "Fills all horizontal space with nav items, but unlike 'fill', every nav item will be the same width"
+          },
+          {
+            "prop": "vertical",
+            "description": "Renders the nav vertically"
+          },
+          {
+            "prop": "card",
+            "description": "When set to true, renders the tabs the the appropriate styles to be placed into a 'b-card'"
+          },
+          {
+            "prop": "vertical",
+            "description": "Renders the tab controls vertically"
+          },
+          {
+            "prop": "end",
+            "description": "Place the tab controls at the bottom (horizontal tabs), or right (vertical tabs)"
+          },
+          {
+            "prop": "lazy",
+            "description": "Lazily render the b-tab contents when shown"
+          },
+          {
+            "prop": "noNavStyle",
+            "description": "Do not render the tab controls with tab styling"
+          },
+          {
+            "prop": "noKeyNav",
+            "description": "Disable keyboard navigation of the tab controls"
+          },
+          {
+            "prop": "contentClass",
+            "description": "CSS class (or classes) to apply to the tab-content wrapper"
+          },
+          {
+            "prop": "navClass",
+            "description": "CSS class (or classes) to apply to the tablist (nav) wrapper"
+          },
+          {
+            "prop": "navWrapperClass",
+            "description": "CSS class (or classes) to apply to the tab controls wrapper element"
+          },
+          {
+            "prop": "activeTabClass",
+            "description": "CSS class (or classes) to apply to the currently active tab"
+          },
+          {
+            "prop": "activeNavItemClass",
+            "description": "CSS class (or classes) to apply to the active nav item tab control"
+          },
+          {
+            "prop": "value",
+            "description": "Currently visible tab index (zero-based)"
+          }
+        ],
         "events": [
           {
             "event": "input",
@@ -14,6 +88,7 @@
             "args": [
               {
                 "arg": "tabIndex",
+                "type": "Number",
                 "description": "Current selected tab index (0-based index)"
               }
             ]
@@ -24,10 +99,12 @@
             "args": [
               {
                 "arg": "currentTabs",
+                "type": "Array",
                 "description": "Array of the current b-tab instances, in document order."
               },
               {
                 "arg": "previousTabs",
+                "type": "Array",
                 "description": "Array of the previous b-tab instances, in document order."
               }
             ]
@@ -50,6 +127,28 @@
       },
       {
         "component": "BTab",
+        "props": [
+          {
+            "prop": "buttonId",
+            "description": "Use a specific ID for this tab's tab control button. If not provided, one will automatically be generated"
+          },
+          {
+            "prop": "titleItemClass",
+            "description": "CSS class (or classes) to apply to the tab's control button 'li' element"
+          },
+          {
+            "prop": "titleLinkClass",
+            "description": "CSS class (or classes) to apply to the tab's control button inner link element"
+          },
+          {
+            "prop": "noBody",
+            "description": "When the parent b-tabs has the 'card' prop set, do not render a card-body wrapper"
+          },
+          {
+            "prop": "lazy",
+            "description": "Lazily render this tab's content when shown"
+          }
+        ],
         "events": [
           {
             "event": "click",
@@ -57,6 +156,7 @@
             "args": [
               {
                 "arg": "evt",
+                "type": "MouseEvent",
                 "description": "Original event object"
               }
             ]
diff --git a/src/components/tabs/tab.js b/src/components/tabs/tab.js
index a0883cffbe1..540a1a672ee 100644
--- a/src/components/tabs/tab.js
+++ b/src/components/tabs/tab.js
@@ -44,11 +44,6 @@ export const BTab = /*#__PURE__*/ Vue.extend({
       type: [String, Array, Object],
       default: null
     },
-    headHtml: {
-      // Is this actually ever used?
-      type: String,
-      default: null
-    },
     disabled: {
       type: Boolean,
       default: false
diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js
index 0d5939eaad2..d6c91d029b7 100644
--- a/src/components/tabs/tabs.js
+++ b/src/components/tabs/tabs.js
@@ -14,7 +14,7 @@ import { BNav, props as BNavProps } from '../nav/nav'
 
 // -- Constants --
 
-const navProps = omit(BNavProps, ['tabs', 'isNavBar'])
+const navProps = omit(BNavProps, ['tabs', 'isNavBar', 'cardHeader'])
 
 // -- Utils --
 
diff --git a/src/components/toast/package.json b/src/components/toast/package.json
index 294f7e17825..e55f6bebba6 100644
--- a/src/components/toast/package.json
+++ b/src/components/toast/package.json
@@ -11,6 +11,60 @@
     "components": [
       {
         "component": "BToast",
+        "props": [
+          {
+            "prop": "title",
+            "description": "The toast's title text"
+          },
+          {
+            "prop": "toaster",
+            "description": "The name of the toaster target to render the toast in"
+          },
+          {
+            "prop": "visible",
+            "description": "When true, shows the toast"
+          },
+          {
+            "prop": "isStatus",
+            "description": "When set to 'true', makes the toast have attributes aria-live=polite and role=status. When 'false' aria-live will be 'assertive' and role will be 'alert'"
+          },
+          {
+            "prop": "appendToast",
+            "description": "When true, the toast will be appended to the bottom on the visible toasts, otherwise it will be prepended"
+          },
+          {
+            "prop": "noAutoHide",
+            "description": "When set, disabled the toast from automatically dismissing itself"
+          },
+          {
+            "prop": "autoHideDelay",
+            "description": "The number of milliseconds before the toast auto dismisses itself"
+          },
+          {
+            "prop": "noCloseButton",
+            "description": "When set, hides the close button in the toast header"
+          },
+          {
+            "prop": "noHoverPause",
+            "description": "When set, disables the pausing of hte auto hide delay when the mouse hovers the toast"
+          },
+          {
+            "prop": "solid",
+            "description": "When set, renderes the toast with a solid background rather than translucent"
+          },
+          {
+            "prop": "toastClass",
+            "description": "CSS class (or classes) to add to the toast wrapper element"
+          },
+          {
+            "prop": "headerClass",
+            "description": "CSS class (or classes) to add to the toast header element"
+          },
+          {
+            "prop": "bodyClass",
+            "description": "CSS class (or classes) to add to the toast body element"
+          }
+        ],
         "events": [
           {
             "event": "change",
@@ -18,6 +72,7 @@
             "args": [
               {
                 "arg": "visible",
+                "type": "Boolean",
                 "description": "true if toast is visible, false otherwise."
               }
             ]
@@ -28,6 +83,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object."
               }
             ]
@@ -38,6 +94,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object."
               }
             ]
@@ -48,6 +105,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object."
               }
             ]
@@ -58,6 +116,7 @@
             "args": [
               {
                 "arg": "bvEvt",
+                "type": "BvEvent",
                 "description": "BvEvent object."
               }
             ]
@@ -66,16 +125,40 @@
         "slots": [
           {
             "name": "toast-title",
-            "description": "Toast title. Optionally scoped."
+            "description": "Toast title. Optionally scoped.",
+            "scope": [
+              {
+                "prop": "hide",
+                "type": "Function",
+                "description": "Hides the toast when called. Useful if you are providing your own close button."
+              }
+            ]
           },
           {
             "name": "default",
-            "description": "Toast body content. Optionally scoped."
+            "description": "Toast body content. Optionally scoped.",
+            "scope": [
+              {
+                "prop": "hide",
+                "type": "Function",
+                "description": "Hides the toast when called. Useful if you are providing your own close button."
+              }
+            ]
           }
         ]
       },
       {
-        "component": "BToaster"
+        "component": "BToaster",
+        "props": [
+          {
+            "prop": "name",
+            "description": "The toaster's target name"
+          },
+          {
+            "prop": "ariaAtomic",
+            "description": "When screen reader's should read out the entire contents (set to string 'true') or just the changes (set to string 'false'). Leave blank for most cases"
+          }
+        ]
       }
     ]
   }
diff --git a/src/components/tooltip/index.js b/src/components/tooltip/index.js
index 9c7380e0d66..8cdd837370c 100644
--- a/src/components/tooltip/index.js
+++ b/src/components/tooltip/index.js
@@ -1,10 +1,10 @@
 import { BTooltip } from './tooltip'
-import { VBTooltip } from '../../directives/tooltip/tooltip'
+import { VBTooltipPlugin } from '../../directives/tooltip'
 import { pluginFactory } from '../../utils/plugins'
 
 const TooltipPlugin = /*#__PURE__*/ pluginFactory({
   components: { BTooltip },
-  directives: { VBTooltip }
+  plugins: { VBTooltipPlugin }
 })
 
 export { TooltipPlugin, BTooltip }
diff --git a/src/components/tooltip/package.json b/src/components/tooltip/package.json
index 964dee1eb0d..7f2d2d09e4f 100644
--- a/src/components/tooltip/package.json
+++ b/src/components/tooltip/package.json
@@ -4,12 +4,62 @@
   "meta": {
     "title": "Tooltip",
     "description": "Easily add tooltips to elements or components via the <b-tooltip> component or v-b-tooltip directive.",
-    "directives": [
-      "VBTooltip"
+    "plugins": [
+      "VBTooltipPlugin"
     ],
     "components": [
       {
         "component": "BTooltip",
+        "props": [
+          {
+            "prop": "target",
+            "description": "Element string ID, or a reference to an element or component, that you want to trigger the tooltip."
+          },
+          {
+            "prop": "title",
+            "description": "Text to place in the tooltip"
+          },
+          {
+            "prop": "triggers",
+            "description": "Specify which triggers will show the tooltip. Supported values are 'click', 'hover', 'focus'. Refer to the docs for special triggers 'blur' and 'manual'"
+          },
+          {
+            "prop": "placement",
+            "description": "Placement of the tooltip: One of 'top', 'bottom', 'right', 'left', 'top-left', 'top-right', 'bottom-left', 'bottom-right', 'left-top', 'left-bottom', 'right-top', 'right-bottom'"
+          },
+          {
+            "prop": "fallbackPlacement",
+            "description": "placement to use when the tooltip would be out of boundaries. Refer to the docs for more details"
+          },
+          {
+            "prop": "customClass",
+            "description": "CSS class (or classes) to apply to the tooltip's root element"
+          },
+          {
+            "prop": "delay",
+            "description": "Value for the show and hide delay. Applies to both show and hide when specified as a number or string. Use object form to set show and hide delays individually"
+          },
+          {
+            "prop": "boundary",
+            "description": "The boundary constraint of the tooltip: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement or component"
+          },
+          {
+            "prop": "boundaryPadding",
+            "description": "The tooltip will try and stay away from the edge of the boundary element by the number of pixels specificed"
+          },
+          {
+            "prop": "offset",
+            "description": "Offset (in pixels) for the arrow center compared to the trigger target element"
+          },
+          {
+            "prop": "container",
+            "description": "The container element to append the rendered tooltip when visible. Default's to the body element"
+          },
+          {
+            "prop": "show",
+            "description": "When set will show the tooltip"
+          }
+        ],
         "events": [
           {
             "event": "show",
@@ -17,7 +67,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object"
+                "type": "BvEvent",
+                "description": "bvEvent object. Cancelable."
               }
             ]
           },
@@ -27,6 +78,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object."
               }
             ]
@@ -37,7 +89,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object"
+                "type": "BvEvent",
+                "description": "bvEvent object. Cancelable."
               }
             ]
           },
@@ -47,17 +100,32 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object."
               }
             ]
           },
           {
             "event": "enabled",
-            "description": "Emitted when tooltip becomes enabled"
+            "description": "Emitted when tooltip becomes enabled",
+            "args": [
+              {
+                "arg": "bvEvent",
+                "type": "BvEvent",
+                "description": "bvEvent object"
+              }
+            ]
           },
           {
             "event": "disabled",
-            "description": "Emitted when tooltip becomes disabled"
+            "description": "Emitted when tooltip becomes disabled",
+            "args": [
+              {
+                "arg": "bvEvent",
+                "type": "BvEvent",
+                "description": "bvEvent object"
+              }
+            ]
           },
           {
             "event": "bv::tooltip::show",
@@ -65,7 +133,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object"
+                "type": "BvEvent",
+                "description": "bvEvent object. Cancelable."
               }
             ]
           },
@@ -75,6 +144,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object."
               }
             ]
@@ -85,7 +155,8 @@
             "args": [
               {
                 "arg": "bvEvent",
-                "description": "bvEvent object"
+                "type": "BvEvent",
+                "description": "bvEvent object. Cancelable."
               }
             ]
           },
@@ -95,6 +166,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object."
               }
             ]
@@ -105,6 +177,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object."
               }
             ]
@@ -115,6 +188,7 @@
             "args": [
               {
                 "arg": "bvEvent",
+                "type": "BvEvent",
                 "description": "bvEvent object."
               }
             ]
@@ -127,6 +201,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "(optional), tooltip id to hide"
               }
             ]
@@ -137,6 +212,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "(optional), tooltip id to show"
               }
             ]
@@ -147,6 +223,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "(optional), tooltip id to disable"
               }
             ]
@@ -157,6 +234,7 @@
             "args": [
               {
                 "arg": "id",
+                "type": "String",
                 "description": "(optional), tooltip id to enable"
               }
             ]
diff --git a/src/directives/popover/package.json b/src/directives/popover/package.json
index d5ed0cc004f..d4c8f307769 100644
--- a/src/directives/popover/package.json
+++ b/src/directives/popover/package.json
@@ -4,6 +4,106 @@
   "meta": {
     "title": "Popover",
     "description": "Add BootstrapVue popovers to any element on your site, using Bootstrap v4 CSS for styling and animations. Popovers are tooltips on steroids.",
-    "directive": "VBPopover"
+    "directive": "VBPopover",
+    "arg": {
+      "pattern": "[a-zA-Z][a-ZA-Z0-9_\\-]*",
+      "description": "ID of element to append the popover markup when visible. Optional, defaults to the body"
+    },
+    "expression": [
+      "String",
+      "Function",
+      "Object"
+    ],
+    "modifiers": [
+      {
+        "name": "top",
+        "description": "Positions the popover on the top of the trigger element (default)"
+      },
+      {
+        "name": "right",
+        "description": "Positions the popover on the right of the trigger element"
+      },
+      {
+        "name": "bottom",
+        "description": "Positions the popover on the bottom of the trigger element"
+      },
+      {
+        "name": "auto",
+        "description": "Positions the popover in the best fit place around the trigger element"
+      },
+      {
+        "name": "topright",
+        "description": "Positions the popover on the top-right of the trigger element"
+      },
+      {
+        "name": "topleft",
+        "description": "Positions the popover on the top-left of the trigger element"
+      },
+      {
+        "name": "bottomright",
+        "description": "Positions the popover on the bottom-right of the trigger element"
+      },
+      {
+        "name": "bottomleft",
+        "description": "Positions the popover on the bottom-left of the trigger element"
+      },
+      {
+        "name": "lefttop",
+        "description": "Positions the popover on the left-top of the trigger element"
+      },
+      {
+        "name": "leftbottom",
+        "description": "Positions the popover on the left-bottom of the trigger element"
+      },
+      {
+        "name": "righttop",
+        "description": "Positions the popover on the right-top of the trigger element"
+      },
+      {
+        "name": "rightbottom",
+        "description": "Positions the popover on the right-bottom of the trigger element"
+      },
+      {
+        "name": "nofade",
+        "description": "Disabled the fade animation of the popover"
+      },
+      {
+        "name": "html",
+        "description": "Enables basic HTML in the title/content (use with caution)"
+      },
+      {
+        "name": "viewport",
+        "description": "Sets the boundary constraint to the viewport"
+      },
+      {
+        "name": "window",
+        "description": "sets the boundary constrain to the window"
+      },
+      {
+        "name": "v-{variant}",
+        "pattern": "v-[a-z]+",
+        "description": "Sets the popover contextual color variant to `{variant}`"
+      },
+      {
+        "name": "d{###}",
+        "pattern": "d[0-9]+",
+        "description": "The show and hide delay in milliseconds (where `{###}` is the value in milliseconds)"
+      },
+      {
+        "name": "ds{###}",
+        "pattern": "ds[0-9]+",
+        "description": "The show delay in milliseconds (where `{###}` is the value in milliseconds)"
+      },
+      {
+        "name": "dh{###}",
+        "pattern": "dh[0-9]+",
+        "description": "The hide delay in milliseconds (where `{###}` is the value in milliseconds)"
+      },
+      {
+        "name": "o{###}",
+        "pattern": "o-?[0-9]+",
+        "description": "An offset value in pixels (where `{###}` is the number of pixels, defaults to 0. Negative values allowed)"
+      }
+    ]
   }
 }
diff --git a/src/directives/scrollspy/package.json b/src/directives/scrollspy/package.json
index 606488bdf4a..d3593963018 100644
--- a/src/directives/scrollspy/package.json
+++ b/src/directives/scrollspy/package.json
@@ -4,6 +4,34 @@
   "meta": {
     "title": "Scrollspy",
     "description": "Automatically activate BootstrapVue navigation or list group components based on scroll position to indicate which link is currently active in the viewport.",
-    "directive": "VBScrollspy"
+    "directive": "VBScrollspy",
+    "arg": {
+      "pattern": "[a-zA-Z][a-ZA-Z0-9_\\-]*",
+      "description": "ID of element to monitor scrolling on (if not provided defaults to the body element)"
+    },
+    "expression": [
+      "String",
+      "Number",
+      "Object"
+    ],
+    "modifiers": [
+      {
+        "name": "###",
+        "pattern": "[\\d]+",
+        "description": "Offset (in pixels) from top of scrolling viewport before triggering active state"
+      },
+      {
+        "name": "offset",
+        "description": "Position calculation method using `offset` procedure (default process for body)"
+      },
+      {
+        "name": "position",
+        "description": "Position calculation method using the `position` procedure"
+      },
+      {
+        "name": "auto",
+        "description": "Position calculation method: `auto` will choose `offset` if scroll element is body, else the method is `position`. This is the default."
+      }
+    ]
   }
 }
diff --git a/src/directives/tooltip/package.json b/src/directives/tooltip/package.json
index d40f9ac0bca..e18303e5c26 100644
--- a/src/directives/tooltip/package.json
+++ b/src/directives/tooltip/package.json
@@ -4,6 +4,106 @@
   "meta": {
     "title": "Tooltip",
     "description": "Add custom BootstrapVue tooltips to any element. Tooltips can be triggered by hovering, focusing, or clicking an element.",
-    "directive": "VBTooltip"
+    "directive": "VBTooltip",
+    "arg": {
+      "pattern": "[a-zA-Z][a-ZA-Z0-9_\\-]*",
+      "description": "ID of element to append the tooltip markup when visible. Optional, defaults to the body"
+    },
+    "expression": [
+      "String",
+      "Function",
+      "Object"
+    ],
+    "modifiers": [
+      {
+        "name": "top",
+        "description": "Positions the tooltip on the top of the trigger element (default)"
+      },
+      {
+        "name": "right",
+        "description": "Positions the tooltip on the right of the trigger element"
+      },
+      {
+        "name": "bottom",
+        "description": "Positions the tooltip on the bottom of the trigger element"
+      },
+      {
+        "name": "auto",
+        "description": "Positions the tooltip in the best fit place around the trigger element"
+      },
+      {
+        "name": "topright",
+        "description": "Positions the tooltip on the top-right of the trigger element"
+      },
+      {
+        "name": "topleft",
+        "description": "Positions the tooltip on the top-left of the trigger element"
+      },
+      {
+        "name": "bottomright",
+        "description": "Positions the tooltip on the bottom-right of the trigger element"
+      },
+      {
+        "name": "bottomleft",
+        "description": "Positions the tooltip on the bottom-left of the trigger element"
+      },
+      {
+        "name": "lefttop",
+        "description": "Positions the tooltip on the left-top of the trigger element"
+      },
+      {
+        "name": "leftbottom",
+        "description": "Positions the tooltip on the left-bottom of the trigger element"
+      },
+      {
+        "name": "righttop",
+        "description": "Positions the tooltip on the right-top of the trigger element"
+      },
+      {
+        "name": "rightbottom",
+        "description": "Positions the tooltip on the right-bottom of the trigger element"
+      },
+      {
+        "name": "nofade",
+        "description": "Disabled the fade animation of the tooltip"
+      },
+      {
+        "name": "html",
+        "description": "Enables basic HTML in the title (use with caution)"
+      },
+      {
+        "name": "viewport",
+        "description": "Sets the boundary constraint to the viewport"
+      },
+      {
+        "name": "window",
+        "description": "sets the boundary constrain to the window"
+      },
+      {
+        "name": "v-{variant}",
+        "pattern": "v-[a-z]+",
+        "description": "Sets the tooltip contextual color variant to `{variant}`"
+      },
+      {
+        "name": "d{###}",
+        "pattern": "d[0-9]+",
+        "description": "The show and hide delay in milliseconds (where `{###}` is the value in milliseconds)"
+      },
+      {
+        "name": "ds{###}",
+        "pattern": "ds[0-9]+",
+        "description": "The show delay in milliseconds (where `{###}` is the value in milliseconds)"
+      },
+      {
+        "name": "dh{###}",
+        "pattern": "dh[0-9]+",
+        "description": "The hide delay in milliseconds (where `{###}` is the value in milliseconds)"
+      },
+      {
+        "name": "o{###}",
+        "pattern": "o-?[0-9]+",
+        "description": "An offset value in pixels (where `{###}` is the number of pixels, defaults to 0. Negative values allowed)"
+      }
+    ]
   }
 }
diff --git a/src/utils/safe-types.js b/src/utils/safe-types.js
index 185b2feb1c6..a0264359644 100644
--- a/src/utils/safe-types.js
+++ b/src/utils/safe-types.js
@@ -6,4 +6,6 @@ import { hasWindowSupport } from './env'
 
 const w = hasWindowSupport ? window : {}
 
-export const HTMLElement = w.HTMLElement || Object
+export const HTMLElement = hasWindowSupport ? w.HTMLElement : class HTMLElement extends Object {}
+
+export const File = hasWindowSupport ? w.File : class File extends Object {}
diff --git a/yarn.lock b/yarn.lock
index cff93ccfd3d..79f9a1685e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8319,6 +8319,13 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
+node-dir@^0.1.17:
+  version "0.1.17"
+  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
+  integrity sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=
+  dependencies:
+    minimatch "^3.0.2"
+
 node-fetch@^2.2.0, node-fetch@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
@@ -10532,6 +10539,13 @@ request@^2.87.0, request@^2.88.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
+require-context@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/require-context/-/require-context-1.1.0.tgz#f77e60dddb0a296946e6915bf580c73dbe75ab4d"
+  integrity sha512-nfYSy3Q9W3W1fCo0nief19bDq216IGY9+wOUsmCWAJ5jssyak0r110rvqIj4KJYoUYDxLDaeA66ONOYy4PJEUw==
+  dependencies:
+    node-dir "^0.1.17"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"