diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/_access-policies.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/_access-policies.component-theme.scss
deleted file mode 100644
index ac09e08904..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/_access-policies.component-theme.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-
-    .access-policies-header {
-        color: $primary-palette-default;
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/_add-tenant-to-policy-dialog.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/_add-tenant-to-policy-dialog.component-theme.scss
deleted file mode 100644
index da4e4f2419..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/_add-tenant-to-policy-dialog.component-theme.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { ClusterSummaryState } from '../state/cluster-summary';
-import { selectDisconnectionAcknowledged } from '../state/cluster-summary/cluster-summary.selectors';
-
-@Injectable({
-    providedIn: 'root'
-})
-export class ClusterConnectionService {
-    private disconnectionAcknowledged = this.store.selectSignal(selectDisconnectionAcknowledged);
-
-    constructor(private store: Store<ClusterSummaryState>) {}
-
-    isDisconnectionAcknowledged(): boolean {
-        return this.disconnectionAcknowledged();
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/_component-access-policies.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/_component-access-policies.component-theme.scss
deleted file mode 100644
index 2055d2131e..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/_component-access-policies.component-theme.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-/*!
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-@use '../../../../../assets/utils.scss' as utils;
-
-@mixin nifi-theme($material-theme, $canvas-theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($material-theme);
-    $canvas-color-config: mat.get-color-config($canvas-theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-    $accent-palette: map.get($color-config, 'accent');
-
-    // Get hues from palette
-    $primary-palette-darker: mat.get-color-from-palette($primary-palette, darker);
-    $accent-palette-default: mat.get-color-from-palette($accent-palette, 'default');
-    $on-surface: utils.get-on-surface($canvas-color-config);
-
-    .component-access-policies {
-        .operation-context-logo {
-            .icon {
-                color: $accent-palette-default;
-            }
-        }
-
-        .operation-context-name {
-            color: $on-surface;
-        }
-
-        .operation-context-type {
-            color: $primary-palette-darker;
-        }
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/feature/_bulletins.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/feature/_bulletins.component-theme.scss
deleted file mode 100644
index 6aec26c0d0..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/feature/_bulletins.component-theme.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-
-    .bulletin-board-header {
-        color: $primary-palette-default;
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/_counters.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/_counters.component-theme.scss
deleted file mode 100644
index 4f997617a8..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/_counters.component-theme.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-
-    .counter-header {
-        color: $primary-palette-default;
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/_create-process-group.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/_create-process-group.component-theme.scss
deleted file mode 100644
index a6ddec0e61..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/_create-process-group.component-theme.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-syntax = "proto3";
-
-message Proto3Message {
-  bool booleanField = 1;
-  string stringField = 2;
-  int32 int32Field = 3;
-  uint32 uint32Field = 4;
-  sint32 sint32Field = 5;
-  fixed32 fixed32Field = 6;
-  sfixed32 sfixed32Field = 7;
-  double doubleField = 8;
-  float floatField = 9;
-  bytes bytesField = 10;
-  int64 int64Field = 11;
-  uint64 uint64Field = 12;
-  sint64 sint64Field = 13;
-  fixed64 fixed64Field = 14;
-  sfixed64 sfixed64Field = 15;
-  NestedMessage nestedMessage = 16;
-}
-
-message NestedMessage {
-  TestEnum testEnum = 20;
-  repeated string repeatedField = 21;
-  oneof oneOfField {
-    string stringOption = 22;
-    bool booleanOption = 23;
-    int32 int32Option = 24;
-  }
-  map<string, int32> testMap = 25;
-}
-
-enum TestEnum {
-  ENUM_VALUE_1 = 0;
-  ENUM_VALUE_2 = 1;
-  ENUM_VALUE_3 = 2;
-}
\ No newline at end of file
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/create-remote-process-group/_create-remote-process-group.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/create-remote-process-group/_create-remote-process-group.component-theme.scss
deleted file mode 100644
index 11d71e6c44..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/create-remote-process-group/_create-remote-process-group.component-theme.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-syntax = "proto2";
-
-import "google/protobuf/any.proto";
-
-message Proto2Message {
-  extensions 100 to max;
-  required bool booleanField = 1;
-  optional string stringField = 2 [default = "Missing field"];
-  optional google.protobuf.Any anyField = 3;
-}
-
-message AnyValueMessage {
-  optional string anyStringField1 = 1;
-  optional string anyStringField2 = 2;
-}
-
-extend Proto2Message {
-  optional int32 extensionField = 100;
-}
\ No newline at end of file
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/controller-service/_controller-services.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/controller-service/_controller-services.component-theme.scss
deleted file mode 100644
index 99367449f0..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/controller-service/_controller-services.component-theme.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-
-    .controller-services-header {
-        color: $primary-palette-default;
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/_manage-remote-ports.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/_manage-remote-ports.component-theme.scss
deleted file mode 100644
index c46e117917..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/_manage-remote-ports.component-theme.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme, $canvas-theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-    $canvas-color-config: mat.get-color-config($canvas-theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-    $canvas-warn-palette: map.get($canvas-color-config, 'warn');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-    $canvas-warn-palette-A200: mat.get-color-from-palette($canvas-warn-palette, 'A200');
-
-    .manage-remote-ports-header {
-        color: $primary-palette-default;
-    }
-
-    .manage-remote-ports-table {
-        .listing-table {
-            .fa.fa-warning {
-                color: $canvas-warn-palette-A200;
-            }
-        }
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/login/ui/login-form/_login-form.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/login/ui/login-form/_login-form.component-theme.scss
deleted file mode 100644
index 35cce3bf51..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/login/ui/login-form/_login-form.component-theme.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.services.protobuf.validation;
-
-import com.squareup.wire.schema.Schema;
-
-public class ProtoValidationResource {
-
-    private final String protoDirectory;
-    private final Schema protoSchema;
-
-    public ProtoValidationResource(String protoDirectory, Schema protoSchema) {
-        this.protoDirectory = protoDirectory;
-        this.protoSchema = protoSchema;
-    }
-
-    public String getProtoDirectory() {
-        return protoDirectory;
-    }
-
-    public Schema getProtoSchema() {
-        return protoSchema;
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/feature/_parameter-contexts.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/feature/_parameter-contexts.component-theme.scss
deleted file mode 100644
index 8183c1f4cd..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/feature/_parameter-contexts.component-theme.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.processors.hadoop.util;
-
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-
-import java.util.function.BiConsumer;
-
-public class GSSExceptionRollbackYieldSessionHandler implements BiConsumer<ProcessSession, ProcessContext> {
-    @Override
-    public void accept(ProcessSession processSession, ProcessContext processContext) {
-        processSession.rollback();
-        processContext.yield();
-    }
-}
\ No newline at end of file
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/_flowfile-dialog.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/_flowfile-dialog.component-theme.scss
deleted file mode 100644
index ba6d348b6c..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/_flowfile-dialog.component-theme.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-
-    .flowfile {
-        .mdc-dialog__content {
-            .tab-content {
-                .flowfile-header {
-                    color: $primary-palette-default;
-                }
-            }
-        }
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/_flowfile-table.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/_flowfile-table.component-theme.scss
deleted file mode 100644
index d008dac19a..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/_flowfile-table.component-theme.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-    $warn-palette: map.get($color-config, 'warn');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-    $warn-palette-default: mat.get-color-from-palette($warn-palette, default);
-
-    .flowfile-table {
-        .queue-listing-header {
-            color: $primary-palette-default;
-        }
-
-        .listing-message {
-            color: $warn-palette-default;
-        }
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/feature/_settings.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/feature/_settings.component-theme.scss
deleted file mode 100644
index 7de25dba48..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/feature/_settings.component-theme.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-@use '../../../../../node_modules/@angular/material/core/theming/inspection' as inspection;
-@use '../../../../assets/utils.scss' as utils;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the surface color from material so we can ensure best contrast
-    $surface: inspection.get-theme-color($theme, background, background);
-
-    .settings-header {
-        color: utils.get-color-on-surface($color-config, $surface);
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/feature/_summary.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/feature/_summary.component-theme.scss
deleted file mode 100644
index 6ef8cedadb..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/feature/_summary.component-theme.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-@use '../../../../../node_modules/@angular/material/core/theming/inspection' as inspection;
-@use '../../../../assets/utils.scss' as utils;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the surface color from material so we can ensure best contrast
-    $surface: inspection.get-theme-color($theme, background, background);
-
-    .summary-header {
-        color: utils.get-color-on-surface($color-config, $surface);
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/feature/_users.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/feature/_users.component-theme.scss
deleted file mode 100644
index ad525d82e0..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/feature/_users.component-theme.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-
-    .user-header {
-        color: $primary-palette-default;
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/extension-creation/_extension-creation.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/extension-creation/_extension-creation.component-theme.scss
deleted file mode 100644
index be2dc47451..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/extension-creation/_extension-creation.component-theme.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-@use '../../../../assets/utils.scss' as utils;
-
-@mixin nifi-theme($material-theme, $canvas-theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($material-theme);
-    $canvas-color-config: mat.get-color-config($canvas-theme);
-
-    // Get the color palette from the color-config.
-    $accent-palette: map.get($color-config, 'accent');
-    $warn-palette: map.get($color-config, 'warn');
-
-    // Get hues from palette
-    $accent-palette-default: mat.get-color-from-palette($accent-palette, 'default');
-    $warn-palette-default: mat.get-color-from-palette($warn-palette, default);
-    $on-surface-medium: utils.get-on-surface($canvas-color-config, medium);
-
-    .extension-creation-dialog {
-        @include mat.button-density(-1);
-
-        .listing-table {
-            @include mat.table-density(-4);
-
-            table {
-                .fa.fa-shield {
-                    color: $warn-palette-default;
-                }
-            }
-        }
-
-        .selected-type-name {
-            color: $accent-palette-default;
-        }
-
-        .selected-type-bundle {
-            color: $on-surface-medium;
-        }
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/provenance-event-dialog/_provenance-event-dialog.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/provenance-event-dialog/_provenance-event-dialog.component-theme.scss
deleted file mode 100644
index 40483370a7..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/provenance-event-dialog/_provenance-event-dialog.component-theme.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, 'default');
-
-    .provenance-event {
-        @include mat.button-density(-1);
-
-        .mdc-dialog__content {
-            .tab-content {
-                .event-header {
-                    color: $primary-palette-default;
-                }
-            }
-        }
-    }
-}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/_system-diagnostics-dialog.component-theme.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/_system-diagnostics-dialog.component-theme.scss
deleted file mode 100644
index 92f0404835..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/_system-diagnostics-dialog.component-theme.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin nifi-theme($theme) {
-    // Get the color config from the theme.
-    $color-config: mat.get-color-config($theme);
-
-    // Get the color palette from the color-config.
-    $primary-palette: map.get($color-config, 'primary');
-
-    // Get hues from palette
-    $primary-palette-default: mat.get-color-from-palette($primary-palette, default);
-
-    .system-diagnostics {
-        .tab-content {
-            .section-header {
-                color: $primary-palette-default;
-            }
-        }
-    }
-}