diff --git a/netbox_secretstore/forms/secrets.py b/netbox_secretstore/forms/secrets.py
index e473db5..66416c0 100644
--- a/netbox_secretstore/forms/secrets.py
+++ b/netbox_secretstore/forms/secrets.py
@@ -45,7 +45,7 @@ def validate_rsa_key(key, is_secret=True):
 # Secret roles
 #
 
-class SecretRoleForm(BootstrapMixin, CustomFieldModelForm):
+class SecretRoleForm(CustomFieldModelForm):
     slug = SlugField()
 
     class Meta:
@@ -61,7 +61,7 @@ class Meta:
         fields = SecretRole.csv_headers
 
 
-class SecretRoleBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditForm):
+class SecretRoleBulkEditForm(CustomFieldModelBulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=SecretRole.objects.all(),
         widget=forms.MultipleHiddenInput
@@ -79,7 +79,7 @@ class Meta:
 # Secrets
 #
 
-class SecretForm(BootstrapMixin, CustomFieldModelForm):
+class SecretForm(CustomFieldModelForm):
     device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         required=False
@@ -212,7 +212,7 @@ def save(self, *args, **kwargs):
         return s
 
 
-class SecretBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkEditForm):
+class SecretBulkEditForm(AddRemoveTagsForm, CustomFieldModelBulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=Secret.objects.all(),
         widget=forms.MultipleHiddenInput()
@@ -232,7 +232,7 @@ class Meta:
         ]
 
 
-class SecretFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
+class SecretFilterForm(CustomFieldModelFilterForm):
     model = Secret
     q = forms.CharField(
         required=False,
@@ -250,7 +250,7 @@ class SecretFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
 # UserKeys
 #
 
-class UserKeyForm(BootstrapMixin, forms.ModelForm):
+class UserKeyForm(forms.ModelForm):
 
     class Meta:
         model = UserKey
diff --git a/netbox_secretstore/templates/netbox_secretstore/generic/object.html b/netbox_secretstore/templates/netbox_secretstore/generic/object.html
deleted file mode 100644
index 8ea7b94..0000000
--- a/netbox_secretstore/templates/netbox_secretstore/generic/object.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends 'base/layout.html' %}
-{% load buttons %}
-{% load custom_links %}
-{% load helpers %}
-{% load perms %}
-{% load plugins %}
-{% load plugin_buttons %}
-{% load static %}
-
-{% block header %}
-  {# Breadcrumbs #}
-  <nav class="breadcrumb-container px-3" aria-label="breadcrumb">
-    <ol class="breadcrumb">
-      {% block breadcrumbs %}{% endblock %}
-    </ol>
-  </nav>
-  {{ block.super }}
-{% endblock %}
-
-{% block title %}{{ object }}{% endblock %}
-
-{% block controls %}
-  {# Clone/Edit/Delete Buttons #}
-  <div class="controls">
-    <div class="control-group">
-      {% custom_links object %}
-      {% plugin_buttons object %}
-
-      {# Extra buttons #}
-      {% block extra_controls %}{% endblock %}
-
-        {% if request.user|can_add:object %}
-          {% clone_button object %}
-        {% endif %}
-        {% if request.user|can_change:object %}
-          {% edit_button object %}
-        {% endif %}
-        {% if request.user|can_delete:object %}
-          {% delete_button object %}
-        {% endif %}
-    </div>
-  </div>
-{% endblock controls %}
-
-{% block tabs %}
-  <ul class="nav nav-tabs mb-3 px-3">
-    {% block tab_items %}
-      <li class="nav-item" role="presentation">
-        <a class="nav-link{% if not active_tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
-      </li>
-    {% endblock tab_items %}
-    {% if perms.extras.view_journalentry %}
-      {% with journal_viewname=object|viewname:'journal' %}
-      {% url journal_viewname pk=object.pk as journal_url %}
-      {% if journal_url %}
-        <li role="presentation" class="nav-item">
-          <a href="{{ journal_url }}" class="nav-link{% if active_tab == 'journal'%} active{% endif %}">Journal</a>
-        </li>
-      {% endif %}
-      {% endwith %}
-    {% endif %}
-    {% if perms.extras.view_objectchange %}
-      {% with changelog_viewname=object|viewname:'changelog' %}
-      {% url changelog_viewname pk=object.pk as changelog_url %}
-        <li role="presentation" class="nav-item">
-            <a href="{{ changelog_url }}" class="nav-link{% if active_tab == 'changelog'%} active{% endif %}">Change Log</a>
-        </li>
-      {% endwith %}
-    {% endif %}
-  </ul>
-{% endblock tabs %}
-
-{% block content %}
-  <p>
-    <small class="text-muted">
-      Created {{ object.created|annotated_date }} &middot;
-      Updated <span title="{{ object.last_updated|annotated_date }}">{{ object.last_updated|timesince }}</span> ago
-    </small>
-    <span class="badge bg-primary">{{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}</span>
-  </p>
-{% endblock content %}
-{% block components %}{% endblock %}
diff --git a/netbox_secretstore/templates/netbox_secretstore/generic/object_list.html b/netbox_secretstore/templates/netbox_secretstore/generic/object_list.html
deleted file mode 100644
index cec99f0..0000000
--- a/netbox_secretstore/templates/netbox_secretstore/generic/object_list.html
+++ /dev/null
@@ -1,98 +0,0 @@
-{% extends 'base/layout.html' %}
-{% load buttons %}
-{% load helpers %}
-{% load render_table from django_tables2 %}
-{% load plugin_helpers %}
-{% load static %}
-
-{% block controls %}
-<div class="controls">
-  <div class="control-group">
-    {% block extra_controls %}{% endblock %}
-    {% if permissions.add and 'add' in action_buttons %}
-        {% add_button content_type.model_class|validated_plugin_viewname:"add" %}
-    {% endif %}
-    {% if permissions.add and 'import' in action_buttons %}
-        {% import_button content_type.model_class|validated_plugin_viewname:"import" %}
-    {% endif %}
-    {% if 'export' in action_buttons %}
-        {% export_button content_type %}
-    {% endif %}
-  </div>
-</div>
-{% endblock controls %}
-
-{% block content %}
-{% if table.paginator.num_pages > 1 %}
-{% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
-  <div id="select-all-box" class="d-none card noprint">
-    <form method="post" class="form col-md-12">
-      {% csrf_token %}
-      <div class="card-body">
-        <div class="float-end">
-          {% if bulk_edit_url and permissions.change %}
-            <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled>
-              <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit All
-            </button>
-          {% endif %}
-          {% if bulk_delete_url and permissions.delete %}
-            <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled>
-              <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete All
-            </button>
-          {% endif %}
-        </div>
-        <div class="form-check">
-          <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
-          <label for="select-all" class="form-check-label">
-            Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
-          </label>
-        </div>
-      </div>
-    </form>
-  </div>
-{% endwith %}
-{% endif %}
-
-{# Object table #}
-<div class="row">
-  <div class="col {% if filter_form %}col-md-7 col-lg-8 col-xl-9 col-xxl-10{% else %}col-12{% endif %}">
-    {# Object list filter, table config #}
-    {% include 'inc/table_controls.html' with table_modal="ObjectTable_config" %}
-    {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
-      {% if permissions.change or permissions.delete %}
-        <form method="post" class="form form-horizontal">
-          {% csrf_token %}
-          <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
-          <div class="table-responsive">
-            {% render_table table 'inc/table.html' %}
-          </div>
-          <div class="noprint bulk-buttons">
-            <div class="bulk-button-group">
-              {% block bulk_buttons %}{% endblock %}
-              {% if bulk_edit_url and permissions.change %}
-                <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm">
-                  <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
-                </button>
-              {% endif %}
-              {% if bulk_delete_url and permissions.delete %}
-                <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm">
-                  <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete Selected
-                </button>
-              {% endif %}
-            </div>
-          </div>
-        </form>
-      {% else %}
-        <div class="table-responsive">
-          {% render_table table 'inc/table.html' %}
-        </div>
-      {% endif %}
-    {% endwith %}
-    {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
-  </div>
-  {% if filter_form %}
-    {% include 'inc/filter_list.html' %}
-  {% endif %}
-</div>
-{% table_config_form table table_name="ObjectTable" %}
-{% endblock content %}
diff --git a/netbox_secretstore/templates/netbox_secretstore/secret.html b/netbox_secretstore/templates/netbox_secretstore/secret.html
index 34cddfa..572e0e9 100644
--- a/netbox_secretstore/templates/netbox_secretstore/secret.html
+++ b/netbox_secretstore/templates/netbox_secretstore/secret.html
@@ -1,4 +1,4 @@
-{% extends 'netbox_secretstore/generic/object.html' %}
+{% extends 'netbox_plugin_extensions/generic/object.html' %}
 {% load buttons %}
 {% load helpers %}
 {% load static %}
@@ -39,7 +39,7 @@ <h5 class="card-header">
                 </table>
             </div>
         </div>
-        {% include 'inc/custom_fields_panel.html' %}
+        {% include 'inc/panels/custom_fields.html' %}
         {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
@@ -68,7 +68,7 @@ <h5 class="card-header">
                 </div>
             </div>
         </div>
-        {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='plugins:netbox_secretstore:secret_list' %}
+        {% include 'inc/panels/tags.html' with tags=object.tags.all url='plugins:netbox_secretstore:secret_list' %}
         {% plugin_right_page object %}
     </div>
 </div>
diff --git a/netbox_secretstore/templates/netbox_secretstore/secretrole.html b/netbox_secretstore/templates/netbox_secretstore/secretrole.html
index 570fe8e..fd0e23c 100644
--- a/netbox_secretstore/templates/netbox_secretstore/secretrole.html
+++ b/netbox_secretstore/templates/netbox_secretstore/secretrole.html
@@ -1,4 +1,4 @@
-{% extends 'netbox_secretstore/generic/object.html' %}
+{% extends 'netbox_plugin_extensions/generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
@@ -8,57 +8,57 @@
 {% endblock %}
 
 {% block content %}
-<div class="row mb-3">
-	<div class="col col-md-6">
-    <div class="card">
-      <h5 class="card-header">
-        Secret Role
-      </h5>
-      <div class="card-body">
-        <table class="table table-hover attr-table">
-          <tr>
-            <th scope="row">Name</th>
-            <td>{{ object.name }}</td>
-          </tr>
-          <tr>
-            <th scope="row">Description</th>
-            <td>{{ object.description|placeholder }}</td>
-          </tr>
-          <tr>
-            <th scope="row">Secrets</th>
-            <td>
-              <a href="{% url 'plugins:netbox_secretstore:secret_list' %}?role_id={{ object.pk }}">{{ secrets_table.rows|length }}</a>
-            </td>
-          </tr>
-        </table>
+  <div class="row mb-3">
+      <div class="col col-md-6">
+      <div class="card">
+        <h5 class="card-header">
+          Secret Role
+        </h5>
+        <div class="card-body">
+          <table class="table table-hover attr-table">
+            <tr>
+              <th scope="row">Name</th>
+              <td>{{ object.name }}</td>
+            </tr>
+            <tr>
+              <th scope="row">Description</th>
+              <td>{{ object.description|placeholder }}</td>
+            </tr>
+            <tr>
+              <th scope="row">Secrets</th>
+              <td>
+                <a href="{% url 'plugins:netbox_secretstore:secret_list' %}?role_id={{ object.pk }}">{{ secrets_table.rows|length }}</a>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
+      {% plugin_left_page object %}
       </div>
+      <div class="col col-md-6">
+      {% include 'inc/panels/custom_fields.html' %}
+      {% plugin_right_page object %}
     </div>
-    {% plugin_left_page object %}
-	</div>
-	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
-    {% plugin_right_page object %}
   </div>
-</div>
-<div class="row">
-	<div class="col col-md-12">
-    <div class="card">
-      <h5 class="card-header">
-        Secrets
-      </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=secrets_table %}
-      </div>
-      {% if perms.netbox_secretstore.add_secret %}
-        <div class="card-footer text-end noprint">
-          <a href="{% url 'plugins:netbox_secretstore:secret_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
-            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Secret
-          </a>
+  <div class="row">
+      <div class="col col-md-12">
+      <div class="card">
+        <h5 class="card-header">
+          Secrets
+        </h5>
+        <div class="card-body">
+          {% include 'inc/table.html' with table=secrets_table %}
         </div>
-      {% endif %}
+        {% if perms.netbox_secretstore.add_secret %}
+          <div class="card-footer text-end noprint">
+            <a href="{% url 'plugins:netbox_secretstore:secret_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+              <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Secret
+            </a>
+          </div>
+        {% endif %}
+      </div>
+      {% include 'inc/paginator.html' with paginator=secrets_table.paginator page=secrets_table.page %}
+      {% plugin_full_width_page object %}
     </div>
-    {% include 'inc/paginator.html' with paginator=secrets_table.paginator page=secrets_table.page %}
-    {% plugin_full_width_page object %}
   </div>
-</div>
 {% endblock %}
diff --git a/netbox_secretstore/templates/netbox_secretstore/userkey.html b/netbox_secretstore/templates/netbox_secretstore/userkey.html
index a343053..eaa4aaa 100644
--- a/netbox_secretstore/templates/netbox_secretstore/userkey.html
+++ b/netbox_secretstore/templates/netbox_secretstore/userkey.html
@@ -1,4 +1,4 @@
-{% extends 'users/base.html' %}
+{% extends 'base/layout.html' %}
 
 {% block title %}User Key{% endblock %}
 
diff --git a/netbox_secretstore/templates/netbox_secretstore/userkey_edit.html b/netbox_secretstore/templates/netbox_secretstore/userkey_edit.html
index 7d16507..22eacc9 100644
--- a/netbox_secretstore/templates/netbox_secretstore/userkey_edit.html
+++ b/netbox_secretstore/templates/netbox_secretstore/userkey_edit.html
@@ -1,10 +1,8 @@
-{% extends 'users/base.html' %}
+{% extends 'netbox_plugin_extensions/generic/object_edit.html' %}
 {% load form_helpers %}
 {% load plugins %}
 {% load static %}
 
-{% block title %}User Key{% endblock %}
-
 {% block content %}
     {% if object.is_active %}
         <div class="alert alert-danger" role="alert">
diff --git a/netbox_secretstore/templatetags/__init__.py b/netbox_secretstore/templatetags/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/netbox_secretstore/templatetags/plugin_buttons.py b/netbox_secretstore/templatetags/plugin_buttons.py
deleted file mode 100644
index 9026419..0000000
--- a/netbox_secretstore/templatetags/plugin_buttons.py
+++ /dev/null
@@ -1,102 +0,0 @@
-from django import template
-from django.urls import reverse
-
-from extras.models import ExportTemplate
-from utilities.utils import prepare_cloned_fields
-from .plugin_helpers import _get_plugin_viewname
-
-register = template.Library()
-
-
-#
-# Table buttons
-#
-
-@register.inclusion_tag('netbox_secretstore/buttons/tr_edit.html')
-def tr_edit_button(instance, extra=None):
-    viewname = _get_plugin_viewname(instance, 'edit')
-    base_url = reverse(_get_plugin_viewname(instance, 'list'))
-    url = reverse(viewname, kwargs={'pk': instance.pk})
-    url = f'{url}?return_url={base_url}'
-
-    if extra is not None:
-        url = f'{url}{extra}'
-
-    return {
-        'url': url,
-    }
-
-
-@register.inclusion_tag('netbox_secretstore/buttons/tr_delete.html')
-def tr_delete_button(instance, extra=None):
-    viewname = _get_plugin_viewname(instance, 'delete')
-    base_url = reverse(_get_plugin_viewname(instance, 'list'))
-    url = reverse(viewname, kwargs={'pk': instance.pk})
-    url = f'{url}?return_url={base_url}'
-
-    if extra is not None:
-        url = f'{url}{extra}'
-
-    return {
-        'url': url,
-    }
-
-
-@register.inclusion_tag('netbox_secretstore/buttons/tr_changelog.html')
-def tr_changelog_button(instance):
-    print(instance)
-    viewname = _get_plugin_viewname(instance, 'changelog')
-    print(viewname)
-    url = reverse(viewname, kwargs={'pk': instance.pk})
-
-    return {
-        'url': url,
-    }
-
-
-#
-# Instance buttons
-#
-
-@register.inclusion_tag('buttons/clone.html')
-def clone_button(instance):
-    url = reverse(_get_plugin_viewname(instance, 'add'))
-
-    # Populate cloned field values
-    param_string = prepare_cloned_fields(instance)
-    if param_string:
-        url = f'{url}?{param_string}'
-
-    return {
-        'url': url,
-    }
-
-
-@register.inclusion_tag('buttons/add.html')
-def add_button(instance):
-    viewname = _get_plugin_viewname(instance, 'edit')
-    url = reverse(viewname, kwargs={'pk': instance.pk})
-
-    return {
-        'url': url,
-    }
-
-
-@register.inclusion_tag('buttons/edit.html')
-def edit_button(instance):
-    viewname = _get_plugin_viewname(instance, 'edit')
-    url = reverse(viewname, kwargs={'pk': instance.pk})
-
-    return {
-        'url': url,
-    }
-
-
-@register.inclusion_tag('buttons/delete.html')
-def delete_button(instance):
-    viewname = _get_plugin_viewname(instance, 'delete')
-    url = reverse(viewname, kwargs={'pk': instance.pk})
-
-    return {
-        'url': url,
-    }
diff --git a/netbox_secretstore/templatetags/plugin_helpers.py b/netbox_secretstore/templatetags/plugin_helpers.py
deleted file mode 100644
index 1d7a0dc..0000000
--- a/netbox_secretstore/templatetags/plugin_helpers.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from django import template
-from django.apps import apps
-from django.urls import NoReverseMatch, reverse
-
-from extras.plugins import PluginConfig
-from utilities.forms import TableConfigForm
-
-register = template.Library()
-
-
-def _resolve_namespace(instance):
-    """
-    Get the appropriate namespace for the app based on whether it is a Plugin or base application
-    """
-
-    app = apps.get_app_config(instance._meta.app_label)
-    if isinstance(app, PluginConfig):
-        return f'plugins:{app.label}'
-    return f'{app.label}'
-
-
-def _get_plugin_viewname(instance, action=None):
-    """
-    Return the appropriate viewname for adding, editing, viewing changelog or deleting an instance.
-    """
-
-    # Validate action
-    assert action in ('add', 'edit', 'delete', 'list', 'changelog')
-    app_label = _resolve_namespace(instance)
-    print(f'{app_label}')
-    if action is not None:
-        viewname = f'{app_label}:{instance._meta.model_name}_{action}'
-    else:
-        viewname = f'{app_label}:{instance._meta.model_name}'
-    print(f'{app_label}:{viewname}')
-    return viewname
-
-
-@register.filter()
-def validated_plugin_viewname(model, action):
-    """
-    Return the view name for the given model and action if valid, or None if invalid.
-    """
-    namespace = _resolve_namespace(model)
-    viewname = f'{namespace}:{model._meta.model_name}_{action}'
-    try:
-        # Validate and return the view name. We don't return the actual URL yet because many of the templates
-        # are written to pass a name to {% url %}.
-        reverse(viewname)
-        return viewname
-    except NoReverseMatch:
-        return None
diff --git a/netbox_secretstore/utils/tables.py b/netbox_secretstore/utils/tables.py
index 85891b1..a56bb7e 100644
--- a/netbox_secretstore/utils/tables.py
+++ b/netbox_secretstore/utils/tables.py
@@ -13,12 +13,12 @@ class PluginButtonsColumn(ButtonsColumn):
     template_code = """
     {{% load plugin_buttons %}}
     {{% if "changelog" in buttons %}}
-        {{% tr_changelog_button record %}}
+        {{% plugin_tr_changelog_button record %}}
     {{% endif %}}
     {{% if "edit" in buttons and perms.{app_label}.change_{model_name} %}}
-        {{% tr_edit_button record return_url_extra %}}
+        {{% plugin_tr_edit_button record return_url_extra %}}
     {{% endif %}}
     {{% if "delete" in buttons and perms.{app_label}.delete_{model_name} %}}
-        {{% tr_delete_button record return_url_extra %}}
+        {{% plugin_tr_delete_button record return_url_extra %}}
     {{% endif %}}
     """
diff --git a/netbox_secretstore/views.py b/netbox_secretstore/views.py
index e623b66..9e3cc16 100644
--- a/netbox_secretstore/views.py
+++ b/netbox_secretstore/views.py
@@ -9,6 +9,8 @@
 from django.utils.safestring import mark_safe
 from django.views.generic.base import View
 
+from netbox_plugin_extensions.views.generic import PluginObjectListView, PluginObjectView, PluginObjectEditView, \
+    PluginObjectDeleteView
 from netbox_secretstore.forms import UserKeyForm
 
 from netbox.views import generic
@@ -35,15 +37,14 @@ def get_session_key(request):
 # Secret roles
 #
 
-class SecretRoleListView(generic.ObjectListView):
+class SecretRoleListView(PluginObjectListView):
     queryset = SecretRole.objects.annotate(
         secret_count=count_related(Secret, 'role')
     )
     table = SecretRoleTable
-    template_name = 'netbox_secretstore/generic/object_list.html'
 
 
-class SecretRoleView(generic.ObjectView):
+class SecretRoleView(PluginObjectView):
     queryset = SecretRole.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -60,12 +61,12 @@ def get_extra_context(self, request, instance):
         }
 
 
-class SecretRoleEditView(generic.ObjectEditView):
+class SecretRoleEditView(PluginObjectEditView):
     queryset = SecretRole.objects.all()
     model_form = SecretRoleForm
 
 
-class SecretRoleDeleteView(generic.ObjectDeleteView):
+class SecretRoleDeleteView(PluginObjectDeleteView):
     queryset = SecretRole.objects.all()
 
 
@@ -95,20 +96,19 @@ class SecretRoleBulkDeleteView(generic.BulkDeleteView):
 # Secrets
 #
 
-class SecretListView(generic.ObjectListView):
+class SecretListView(PluginObjectListView):
     queryset = Secret.objects.all()
     filterset = SecretFilterSet
     filterset_form = SecretFilterForm
     table = SecretTable
     action_buttons = ('add', 'import', 'export')
-    template_name = 'netbox_secretstore/generic/object_list.html'
 
 
-class SecretView(generic.ObjectView):
+class SecretView(PluginObjectView):
     queryset = Secret.objects.all()
 
 
-class SecretEditView(generic.ObjectEditView):
+class SecretEditView(PluginObjectEditView):
     queryset = Secret.objects.all()
     model_form = SecretForm
     template_name = 'netbox_secretstore/secret_edit.html'
@@ -177,7 +177,7 @@ def post(self, request, *args, **kwargs):
         })
 
 
-class SecretDeleteView(generic.ObjectDeleteView):
+class SecretDeleteView(PluginObjectDeleteView):
     queryset = Secret.objects.all()