diff --git a/packages/check-in-place-select/src/check-in-place-select.js b/packages/check-in-place-select/src/check-in-place-select.js
index 9e6e43213bcc43be15e561840a1a02ac6ca4fe7a..613fdfed0764584f45bdc35282be2a2cd1dfd7f1 100644
--- a/packages/check-in-place-select/src/check-in-place-select.js
+++ b/packages/check-in-place-select/src/check-in-place-select.js
@@ -419,6 +419,17 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(AdapterLitElement) {
                 .select2-bug .loading-results {
                     display: none !important;
                 }
+                
+                .select2-container--default .select2-selection--single, .select2-dropdown, .select2-container--default .select2-search--dropdown .select2-search__field{
+                    background: var(--dbp-background);
+                    border: var(--dbp-border);
+                    border-color: var(--dbp-muted);
+                }
+                
+                .select2-dropdown{
+                    background-color: var(--dbp-background);
+                }
+                
             `,
         ];
     }
diff --git a/packages/common/styles.js b/packages/common/styles.js
index 492e25edc5fdd29cb9a6080f2af2451e0524aeca..3bc2b19e60c50272a0e66724d028ba46f286f93f 100644
--- a/packages/common/styles.js
+++ b/packages/common/styles.js
@@ -945,8 +945,6 @@ export function getTagCSS() {
             align-items: center;
             background-color: var(--dbp-muted);
             border-radius: var(--dbp-border-radius);
-            border: var(--dbp-border);
-            border-color: var(--dbp-muted-surface-border-color);
             color: var(--dbp-muted);
             display: inline-flex;
             font-size: 0.75rem;
@@ -964,15 +962,13 @@ export function getTagCSS() {
         }
 
         .tag:not(body).is-dark {
-            background-color: var(--dbp-secondary-surface);
-            color: var(--dbp-on-secondary-surface);
-            border-color: var(--dbp-secondary-surface-border-color);
+            background-color: var(--dbp-content-surface);
+            color: var(--dbp-on-content-surface);
         }
 
         .tag:not(body).is-light {
             background-color: var(--dbp-background);
             color: var(--dbp-content);
-            border: var(--dbp-border);
         }
 
         .tag:not(body).is-normal {
@@ -1323,7 +1319,8 @@ export function getLinkCss() {
         .int-link-internal,
         .link,
         .link-without-hover {
-            border-bottom: 1px solid var(--dbp-content);
+            border-bottom: var(--dbp-border);
+            border-color: var(--dbp-content);
         }
 
         .int-link-external:hover,