diff --git a/dt-assets/js/details.js b/dt-assets/js/details.js
index 748721cc7..6ca1e3cef 100644
--- a/dt-assets/js/details.js
+++ b/dt-assets/js/details.js
@@ -79,53 +79,6 @@ jQuery(document).ready(function ($) {
     };
   }
 
-  /* field type: link */
-  $('input.link-input').change(function () {
-    const link_input = $(this);
-    const fieldKey = $(link_input).data('field-key');
-    const type = $(link_input).data('type');
-    const meta_id = $(link_input).data('meta-id');
-    const value = $(link_input).val();
-
-    if ($(link_input).prop('required') && value === '') {
-      return;
-    }
-
-    const fieldValues = {
-      values: [
-        {
-          value,
-          type,
-          meta_id,
-        },
-      ],
-    };
-    $(`#${fieldKey}-spinner`).addClass('active');
-    rest_api
-      .update_post(post_type, post_id, { [fieldKey]: fieldValues })
-      .then((newPost) => {
-        $(`#${fieldKey}-spinner`).removeClass('active');
-        post = newPost;
-
-        // Make sure a key exists for the new link field.
-        if (post && post[fieldKey] && post[fieldKey].length > 0) {
-          let updated_values = post[fieldKey].filter((option) => {
-            return option['type'] === type && option['value'] === value;
-          });
-
-          // This ensures any immediate updates, are assigned to correct link input and not to a new/duplicated input field.
-          if (
-            updated_values &&
-            updated_values[0] &&
-            updated_values[0]['meta_id']
-          ) {
-            $(link_input).data('meta-id', updated_values[0]['meta_id']);
-          }
-        }
-      })
-      .catch(window.handleAjaxError);
-  });
-
   /* field type: datetime */
   $('.dt_date_time_group').each(function setTimePickers() {
     const timestamp = this.dataset.timestamp;
diff --git a/dt-assets/js/merge-post-details.js b/dt-assets/js/merge-post-details.js
index c53113519..813c286c3 100644
--- a/dt-assets/js/merge-post-details.js
+++ b/dt-assets/js/merge-post-details.js
@@ -225,11 +225,6 @@ jQuery(function ($) {
         return typeahead && !window.lodash.isEmpty(typeahead.items);
       }
 
-      case 'link':
-        return !window.lodash.isEmpty(
-          $(td_field_input).find('input.link-input').not('[value=""]'),
-        );
-
       case 'communication_channel':
       case 'location_meta':
         return !window.lodash.isEmpty(
@@ -296,48 +291,6 @@ jQuery(function ($) {
               .prop('disabled', read_only);
             break;
 
-          case 'link': {
-            // Disable/Display field accordingly, based on read-only flag
-            $(td).find('input.link-input').prop('disabled', read_only);
-            $(td).find('button.link-delete-button').prop('disabled', read_only);
-
-            // Ensure add link functionality is suppressed.
-            $(td).find('div.add-link-dropdown').remove();
-
-            if (!read_only) {
-              $(td)
-                .find('input.link-input')
-                .each(function (idx, input) {
-                  if (window.lodash.isEmpty($(input).val())) {
-                    $(input).parent().hide();
-                  }
-                });
-
-              /**
-               * Remove
-               */
-
-              $(document).on('click', '.link-delete-button', (evt) => {
-                const delete_but = $(evt.currentTarget);
-
-                // Keep a record of deleted meta_ids.
-                let meta_id = $(delete_but).data('meta-id');
-                let deleted_items = $(field_meta).val()
-                  ? JSON.parse($(field_meta).val())
-                  : [];
-                if (!window.lodash.includes(deleted_items, meta_id)) {
-                  deleted_items.push(meta_id);
-                  $(field_meta).val(JSON.stringify(deleted_items));
-                }
-
-                // Finally, remove from parent.
-                $(delete_but).parent().parent().remove();
-              });
-            }
-
-            break;
-          }
-
           case 'user_select': {
             let user_select_typeahead_field_input = '.js-typeahead-' + field_id;
 
@@ -501,78 +454,6 @@ jQuery(function ($) {
         break;
       }
 
-      case 'link': {
-        // Determine selector source field link inputs to be processed.
-        let source_field_link_inputs = [];
-        let tr = $(selector).parent().parent();
-        $(tr)
-          .find('.td-field-input input.link-input')
-          .each(function (idx, input) {
-            if ($(input).val()) {
-              source_field_link_inputs.push(input);
-            }
-          });
-
-        // Delete/Add updated post record, based on identified source field inputs.
-        let main_updated_fields_div = $('#main_updated_fields_div');
-        let link_field_meta_input = $(main_updated_fields_div)
-          .find(`.link-list-${update_field_id}`)
-          .parent()
-          .parent()
-          .find('#field_meta');
-        let deleted_items = $(link_field_meta_input).val()
-          ? JSON.parse($(link_field_meta_input).val())
-          : [];
-
-        // Locate by link field values.
-        $.each(source_field_link_inputs, function (idx, input) {
-          let link_list_section_div = $(main_updated_fields_div).find(
-            `.link-list-${update_field_id} .link-section--${$(input).data('type')}`,
-          );
-          let matched_input = $(link_list_section_div).find(
-            `.input-group input[value="${$(input).val()}"].link-input`,
-          );
-
-          // Handle accordingly, based on incoming selected state.
-          if (is_selected) {
-            // Add new updated link fields.
-            if (matched_input.length === 0) {
-              $(link_list_section_div).append(`
-                <div class="input-group">
-                    <input type="text" class="link-input input-group-field" value="${window.SHAREDFUNCTIONS.escapeHTML($(input).val())}" data-meta-id="${window.SHAREDFUNCTIONS.escapeHTML($(input).data('meta-id'))}" data-field-key="${window.SHAREDFUNCTIONS.escapeHTML(update_field_id)}" data-type="${window.SHAREDFUNCTIONS.escapeHTML($(input).data('type'))}">
-                    <div class="input-group-button">
-                        <button class="button alert delete-button-style input-height link-delete-button delete-button" data-meta-id="${window.SHAREDFUNCTIONS.escapeHTML($(input).data('meta-id'))}" data-field-key="${window.SHAREDFUNCTIONS.escapeHTML(update_field_id)}">&times;</button>
-                    </div>
-                </div>`);
-
-              // Remove any previously deleted entries.
-              window.lodash.remove(deleted_items, function (meta_id) {
-                return meta_id === $(input).data('meta-id');
-              });
-              $(link_field_meta_input).val(JSON.stringify(deleted_items));
-            }
-          } else {
-            // Remove new updated link fields.
-            if (matched_input.length > 0) {
-              $(matched_input).parent().remove();
-
-              // Keep a record of deleted meta_ids.
-              if (
-                !window.lodash.includes(
-                  deleted_items,
-                  $(matched_input).data('meta-id'),
-                )
-              ) {
-                deleted_items.push($(matched_input).data('meta-id'));
-                $(link_field_meta_input).val(JSON.stringify(deleted_items));
-              }
-            }
-          }
-        });
-
-        break;
-      }
-
       case 'communication_channel': {
         // Determine values to be updated
         const sourceValue = sourceField.val() || [];
@@ -1207,61 +1088,6 @@ jQuery(function ($) {
             break;
           }
 
-          case 'link': {
-            // Determine values to be processed
-            let link_entries = [];
-            let link_deletions = field_meta.val()
-              ? JSON.parse(field_meta.val())
-              : [];
-
-            // Package values and any deletions
-            $(td)
-              .find('.input-group input.link-input')
-              .each(function (idx, input) {
-                let link_type = $(input).data('type');
-                let link_meta_id = $(input).data('meta-id');
-                let link_val = $(input).val();
-
-                let has_value = is_link_field_value_already_in_primary(
-                  post_field_id,
-                  link_type,
-                  link_meta_id,
-                  link_val,
-                  true,
-                );
-                let matched_meta_id = is_link_field_value_already_in_primary(
-                  post_field_id,
-                  link_type,
-                  link_meta_id,
-                  link_val,
-                  false,
-                );
-
-                if (link_val && !has_value) {
-                  link_entries.push({
-                    value: link_val,
-                    type: link_type,
-                    meta_id: matched_meta_id ? link_meta_id : '',
-                  });
-                }
-              });
-
-            $.each(link_deletions, function (idx, deleted_meta_id) {
-              link_entries.push({
-                meta_id: deleted_meta_id,
-                delete: true,
-              });
-            });
-
-            // If present, capture entries
-            if (link_entries) {
-              values[post_field_id] = {
-                values: link_entries,
-              };
-            }
-            break;
-          }
-
           case 'user_select': {
             let user_select_typeahead =
               window.Typeahead['.js-typeahead-' + field_id];
diff --git a/dt-assets/js/new-bulk-record.js b/dt-assets/js/new-bulk-record.js
index 473e3b5ac..179c4c5fc 100644
--- a/dt-assets/js/new-bulk-record.js
+++ b/dt-assets/js/new-bulk-record.js
@@ -117,19 +117,6 @@ jQuery(function ($) {
         new_post[$(entry).attr('id')] = $(entry).val();
       }
     });
-    $('.link-input').each((index, entry) => {
-      let fieldKey = $(entry).data('field-key');
-      let type = $(entry).data('type');
-      if ($(entry).val()) {
-        if (!Object.prototype.hasOwnProperty.call(new_post, fieldKey)) {
-          new_post[fieldKey] = { values: [] };
-        }
-        new_post[fieldKey].values.push({
-          value: $(entry).val(),
-          type: type,
-        });
-      }
-    });
     $('.dt_textarea').each((index, entry) => {
       if ($(entry).val()) {
         new_post[$(entry).attr('id')] = $(entry).val();
diff --git a/dt-assets/js/new-record.js b/dt-assets/js/new-record.js
index 15adf76d2..6210e4346 100644
--- a/dt-assets/js/new-record.js
+++ b/dt-assets/js/new-record.js
@@ -232,19 +232,6 @@ jQuery(function ($) {
           new_post[$(entry).attr('id')] = $(entry).val();
         }
       });
-      $('.link-input').each((index, entry) => {
-        let fieldKey = $(entry).data('field-key');
-        let type = $(entry).data('type');
-        if ($(entry).val()) {
-          if (!Object.prototype.hasOwnProperty.call(new_post, fieldKey)) {
-            new_post[fieldKey] = { values: [] };
-          }
-          new_post[fieldKey].values.push({
-            value: $(entry).val(),
-            type: type,
-          });
-        }
-      });
 
       // location_meta
       if (typeof window.selected_location_grid_meta !== 'undefined') {
diff --git a/dt-core/global-functions.php b/dt-core/global-functions.php
index 18b05e79c..ad74c374f 100755
--- a/dt-core/global-functions.php
+++ b/dt-core/global-functions.php
@@ -654,6 +654,9 @@ function render_field_for_display( $field_key, $fields, $post, $show_extra_contr
                 case 'user_select':
                     DT_Components::render_user_select( $field_key, $fields, $post, $params );
                     break;
+                case 'link':
+                    DT_Components::render_link( $field_key, $fields, $post, $params );
+                    break;
                 default:
                     $is_legacy = true;
                     break;
@@ -663,60 +666,6 @@ function render_field_for_display( $field_key, $fields, $post, $show_extra_contr
                 $is_empty_post = !is_array( $post ) || count( array_keys( $post ) ) <= 1; // if this is a new post, it only has a post_type key
                 $hide_label = isset( $params['hide_label'] ) && $params['hide_label'] === true;
                 ?>
-                <?php if ( !$hide_label || $field_type === 'link' ) : ?>
-                <div class="section-subheader" <?php echo ( $hide_label && $field_type === 'link' ) ? 'style="display: flex; align-items: center; justify-content: flex-start;"' : ''; ?>>
-                    <?php if ( !$hide_label ) : ?>
-                        <?php dt_render_field_icon( $fields[$field_key] );
-
-                        echo esc_html( $fields[$field_key]['name'] );
-                        ?> <span id="<?php echo esc_html( $display_field_id ); ?>-spinner" class="loading-spinner"></span>
-                        <?php if ( $is_private ) : ?>
-                            <i class="fi-lock small" title="<?php _x( "Private Field: Only I can see it's content", 'disciple_tools' )?>"></i>
-                        <?php endif; ?>
-                    <?php endif; ?>
-
-                    <?php if ( $field_type === 'link' ) : ?>
-                        <?php $only_one_option = count( $fields[$field_key]['default'] ) === 1 ? esc_attr( array_keys( $fields[$field_key]['default'] )[0] ) : '' ?>
-
-                        <div class="add-link-dropdown"
-                            <?php echo !empty( $only_one_option ) ? 'data-only-one-option' : '' ?>
-                             data-link-type="<?php echo esc_attr( $only_one_option ) ?>"
-                             data-field-key="<?php echo esc_attr( $field_key ) ?>">
-                            <button
-                                class="add-button add-link-dropdown__button"
-                                type="button"
-                                data-field-type="<?php echo esc_html( $field_type ) ?>"
-                                data-list-class="<?php echo esc_html( $display_field_id ); ?>"
-                                <?php echo esc_html( $disabled ); ?>
-                            >
-                                <img src="<?php echo esc_html( get_template_directory_uri() . '/dt-assets/images/small-add.svg' ) ?>"/>
-                            </button>
-
-                            <div class="add-link-dropdown__content add-link-<?php echo esc_attr( $display_field_id ) ?>"
-                                 style="<?php echo count( $fields[$field_key]['default'] ) < 2 ? 'display: none' : '' ?>">
-                                <?php foreach ( $fields[$field_key]['default'] as $option_key => $option_value ): ?>
-
-                                    <?php if ( isset( $option_value['deleted'] ) && $option_value['deleted'] === true ) {
-                                        continue;
-                                    } ?>
-
-                                    <div
-                                        class="add-link__option"
-                                        <?php echo !empty( $only_one_option ) ? 'data-only-one-option' : '' ?>
-                                        data-link-type="<?php echo esc_attr( $option_key ) ?>"
-                                        data-field-key="<?php echo esc_attr( $field_key ) ?>"
-                                    >
-                                        <span style="margin: 0 5px 1rem 0;"><?php dt_render_field_icon( $option_value ) ?></span>
-                                        <?php echo esc_html( $option_value['label'] ) ?>
-                                    </div>
-
-                                <?php endforeach; ?>
-                            </div>
-                        </div>
-
-                    <?php endif; ?>
-                </div>
-                <?php endif; ?>
                 <?php
                 // render fields
                 if ( $field_type === 'boolean' ):
@@ -736,62 +685,6 @@ class="add-link__option"
                             class="text-input" value="<?php echo esc_html( $post[$field_key] ?? '' ) ?>" <?php echo esc_html( $disabled ); ?>
                             min="<?php echo esc_html( $fields[$field_key]['min_option'] ?? '' ) ?>"
                             max="<?php echo esc_html( $fields[$field_key]['max_option'] ?? '' ) ?>" onwheel="return false;" />
-                <?php elseif ( $field_type === 'link' ): ?>
-
-                    <div class="link-group">
-
-                        <div class="link-list-<?php echo esc_attr( $field_key ) ?>">
-
-                            <?php
-                            $links_sorted_by_type = [];
-                            foreach ( $post[$field_key] ?? [] as $link_item ) {
-                                if ( !isset( $link_item['type'] ) ) {
-                                    continue;
-                                }
-                                $link_type = $link_item['type'];
-                                if ( !isset( $links_sorted_by_type[$link_type] ) ) {
-                                    $links_sorted_by_type[$link_type] = [];
-                                }
-                                $links_sorted_by_type[$link_type][] = $link_item;
-                            }
-
-                            $only_one_option = count( $fields[$field_key]['default'] ) === 1;
-                            foreach ( $fields[$field_key]['default'] as $link_type => $link_value ) : ?>
-
-                                <div class="link-section link-section--<?php echo esc_attr( $link_type ) ?>">
-                                    <div class="section-subheader" <?php echo $only_one_option ? 'style="display: none"' : '' ?> >
-                                        <?php dt_render_field_icon( $link_value ) ?>
-                                        <?php echo esc_html( $link_value['label'] ); ?>
-                                    </div>
-
-                                        <?php if ( isset( $links_sorted_by_type[$link_type] ) ) : ?>
-                                            <?php foreach ( $links_sorted_by_type[$link_type] as $link_item ) : ?>
-
-                                                <?php render_link_field( $field_key, $link_type, $link_item['value'], $display_field_id, $link_item['meta_id'], $required_tag, $disabled ); ?>
-
-                                            <?php endforeach; ?>
-                                        <?php endif; ?>
-
-                                </div>
-
-                            <?php endforeach; ?>
-
-                        </div>
-
-                        <?php foreach ( $fields[$field_key]['default'] as $option_key => $option_value ): ?>
-
-                            <?php if ( isset( $option_value['deleted'] ) && $option_value['deleted'] === true ) {
-                                continue;
-                            } ?>
-
-                            <div style="display: none" id="link-template-<?php echo esc_html( $field_key ) ?>-<?php echo esc_html( $option_key ) ?>">
-                                <?php render_link_field( $field_key, $option_key, '', $display_field_id, '', $required_tag, $disabled ) ?>
-                            </div>
-
-                        <?php endforeach; ?>
-
-                    </div>
-
                 <?php elseif ( $field_type === 'datetime' ): ?>
                     <?php $timestamp = $post[$field_key]['timestamp'] ?? '' ?>
                     <div class="<?php echo esc_html( $display_field_id ); ?> input-group dt_date_time_group" data-timestamp="<?php echo esc_html( $timestamp ) ?>">
@@ -834,34 +727,6 @@ class="text-input" value="<?php echo esc_html( $post[$field_key] ?? '' ) ?>" <?p
         do_action( 'dt_render_field_for_display_template', $post, $field_type, $field_key, $required_tag, $display_field_id, $custom_display, $fields );
     }
 
-    function render_link_field( $field_key, $option_key, $value, $display_field_id, $meta_id, $required_tag, $disabled ) {
-        ?>
-
-        <div class="input-group">
-            <input
-                type="text"
-                class="link-input input-group-field"
-                value="<?php echo esc_html( $value ) ?>"
-                data-meta-id="<?php echo esc_html( $meta_id ) ?>"
-                data-field-key="<?php echo esc_html( $display_field_id ) ?>"
-                data-type="<?php echo esc_html( $option_key ) ?>"
-                <?php echo esc_html( $required_tag ) ?>
-                <?php echo esc_html( $disabled ) ?>
-            >
-            <div class="input-group-button">
-                <button
-                    class="button alert delete-button-style input-height link-delete-button delete-button"
-                    data-meta-id="<?php echo esc_html( $meta_id ) ?>"
-                    data-field-key="<?php echo esc_html( $field_key ) ?>"
-                >
-                    &times;
-                </button>
-            </div>
-        </div>
-
-        <?php
-    }
-
     function dt_increment( &$var, $val ){
         if ( !isset( $var ) ){
             $var = 0;
diff --git a/dt-core/utilities/dt-components.php b/dt-core/utilities/dt-components.php
index 30507fdb7..79ff954c0 100644
--- a/dt-core/utilities/dt-components.php
+++ b/dt-core/utilities/dt-components.php
@@ -321,4 +321,22 @@ public static function render_user_select( $field_key, $fields, $post, $params =
         </dt-users-connection>
         <?php
     }
+
+    public static function render_link( $field_key, $fields, $post, $params = [] ) {
+        $shared_attributes = self::shared_attributes( $field_key, $fields, $post, $params );
+        $default_options = $fields[$field_key]['default'];
+        $options_array = array_map(function ( $key, $value ) {
+            return [
+                'id' => (string) $key,
+                'label' => $value['label'] ?? $key
+            ];
+        }, array_keys( $default_options ), $default_options);
+        ?>
+        <dt-multi-text-groups <?php echo wp_kses_post( $shared_attributes ) ?>
+            groups='<?php echo esc_attr( json_encode( $options_array ) ) ?>'
+            value="<?php echo esc_attr( isset( $post[$field_key] ) ? json_encode( $post[$field_key] ) : '' ) ?>">
+            <?php dt_render_icon_slot( $fields[$field_key] ) ?>
+        </dt-multi-text-groups>
+        <?php
+    }
 }