diff --git a/packages/main/src/components/DataViews/index.tsx b/packages/main/src/components/DataViews/index.tsx
index 72d3ccd2..6c652eb6 100644
--- a/packages/main/src/components/DataViews/index.tsx
+++ b/packages/main/src/components/DataViews/index.tsx
@@ -25,7 +25,7 @@ export default function DataViews(props: any) {
     if (viewsMemo.length > 0) {
         return (
             <ThemeProvider theme={theme}>
-                <DataviewsContainer>
+                <DataviewsContainer theme={theme}>
                     <PluginRenderer section={"Data Views"} localProps={props} />
                     {!isCardinality && viewsMemo?.map((dv: any, index: any) => (
                         <DataViewItem
diff --git a/packages/main/src/components/DataViews/styled.ts b/packages/main/src/components/DataViews/styled.ts
index 0b0a4a90..75b89973 100644
--- a/packages/main/src/components/DataViews/styled.ts
+++ b/packages/main/src/components/DataViews/styled.ts
@@ -1,192 +1,192 @@
 import styled from "@emotion/styled";
 import { CircularProgress } from "@mui/material";
-
+import { QrynTheme } from "@ui/theme/types";
 export const DataViewStyled = styled.div`
-  background: ${({ theme }: any) => theme.background};
-  border: 1px solid ${({ theme }: any) => theme.accentNeutral};
-  margin: 5px;
-  padding: 6px;
-  overflow-y: auto;
-  overflow-x: hidden;
-  position: relative;
-  flex: 1;
-  border-radius: 3px;
+    background: ${({ theme }: any) => theme.background};
+    border: 1px solid ${({ theme }: any) => theme.accentNeutral};
+    margin: 5px;
+    padding: 6px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    position: relative;
+    flex: 1;
+    border-radius: 3px;
 
-  &::-webkit-scrollbar {
-    width: 5px;
-  }
-  &::-webkit-scrollbar-corner {
-    background: transparent;
-  }
+    &::-webkit-scrollbar {
+        width: 5px;
+    }
+    &::-webkit-scrollbar-corner {
+        background: transparent;
+    }
 
-  &::-webkit-scrollbar-thumb {
-    border-radius: 5px;
-    background: ${({ theme }: any) => theme.alphaPlusNeutral};
-  }
+    &::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        background: ${({ theme }: any) => theme.alphaPlusNeutral};
+    }
 `;
 
 export const EmptyViewContainer = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex: 1;
-  height: 100%;
-  font-size: 0.75em;
-  letter-spacing: 1px;
-  padding: 30px;
-  color: ${({ theme }: any) => theme.lightContrast};
-  background: ${({ theme }: any) => theme.background};
-  text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 1;
+    height: 100%;
+    font-size: 0.75em;
+    letter-spacing: 1px;
+    padding: 30px;
+    color: ${({ theme }: any) => theme.lightContrast};
+    background: ${({ theme }: any) => theme.background};
+    text-align: center;
 `;
 
 export const DataViewHeader = styled.div`
-  display: flex;
-  align-items: center;
-  font-size: 10px;
-  font-family: monospace;
-  margin: 0px 10px;
-  color: ${({ theme }: any) => theme.contrast};
-  span {
-    background: ${({ theme }: any) => theme.deep};
-    padding: 4px;
-    border-radius: 4px;
-    border: 1px solid ${({ theme }: any) => theme.accentNeutral};
-    margin: 0px 5px;
     display: flex;
     align-items: center;
-    justify-content: center;
-  }
+    font-size: 10px;
+    font-family: monospace;
+    margin: 0px 10px;
+    color: ${({ theme }: any) => theme.contrast};
+    span {
+        background: ${({ theme }: any) => theme.deep};
+        padding: 4px;
+        border-radius: 4px;
+        border: 1px solid ${({ theme }: any) => theme.accentNeutral};
+        margin: 0px 5px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
 `;
 
 export const DataViewCont = styled.div`
-  display: flex;
-  min-height: min-content;
-  flex-direction: column;
-  height: 100%;
+    display: flex;
+    min-height: min-content;
+    flex-direction: column;
+    height: 100%;
 `;
 
 export const Loader = styled(CircularProgress)`
-  position: absolute;
-  top: 50px;
-  left: 0;
-  right: 0;
-  margin: auto;
+    position: absolute;
+    top: 50px;
+    left: 0;
+    right: 0;
+    margin: auto;
 `;
 
-export const DataviewsContainer = styled.div`
-  overflow-y: auto;
-  margin: 2px;
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  max-height: 100vh;
-  &::-webkit-scrollbar {
-    background: transparent;
-  }
-  ::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-  &::-webkit-scrollbar-thumb {
-    background: transparent;
-  }
+export const DataviewsContainer = styled.div<{ theme: QrynTheme }>`
+    overflow-y: auto;
+    margin: 2px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    max-height: 100vh;
+    &::-webkit-scrollbar {
+        background: ${({ theme }) => theme.background};
+    }
+    ::-webkit-scrollbar-corner {
+        background: transparent;
+    }
+    &::-webkit-scrollbar-thumb {
+        background: ${({ theme }) => theme.accentNeutral};
+    }
 `;
 
 export const ViewHeaderStyled = styled.div`
-  display: flex;
-  align-items: center;
-  color: ${({ theme }: any) => theme.contrast};
-  font-size: 12px;
-  .header-actions {
-    justify-self: flex-end;
-    .header-icon {
-      padding: 1px 2px;
-      margin: 0px 2px;
-      border-radius: 3px;
-      cursor: pointer;
-      color: ${({ theme }: any) => theme.contrast};
-      &:hover {
-        background: ${({ theme }: any) => theme.neutral};
-      }
-    }
-  }
-  .view-header-info {
     display: flex;
-    flex: 1;
     align-items: center;
-    padding:4px;
-    padding-bottom:8px;
-    span {
-      margin: 0px 3px;
-      .exp {
-        font-family: monospace;
-      }
+    color: ${({ theme }: any) => theme.contrast};
+    font-size: 12px;
+    .header-actions {
+        justify-self: flex-end;
+        .header-icon {
+            padding: 1px 2px;
+            margin: 0px 2px;
+            border-radius: 3px;
+            cursor: pointer;
+            color: ${({ theme }: any) => theme.contrast};
+            &:hover {
+                background: ${({ theme }: any) => theme.neutral};
+            }
+        }
+    }
+    .view-header-info {
+        display: flex;
+        flex: 1;
+        align-items: center;
+        padding: 4px;
+        padding-bottom: 8px;
+        span {
+            margin: 0px 3px;
+            .exp {
+                font-family: monospace;
+            }
+        }
     }
-  }
 `;
 
 export const LabelChip = styled.div`
-  margin: 0px 2px;
-  padding: 2px;
-  font-size: 10px;
-  border: 1px solid ${({ theme }: any) => theme.accentNeutral};
-  border-radius: 3px;
+    margin: 0px 2px;
+    padding: 2px;
+    font-size: 10px;
+    border: 1px solid ${({ theme }: any) => theme.accentNeutral};
+    border-radius: 3px;
 `;
 
 export const HeadLabelsCont = styled.div`
-  display: flex;
-  align-items: center;
-  margin: 0px 12px;
-  flex: 1;
-  max-width: 450px;
-  overflow-x: auto;
-  &::-webkit-scrollbar {
-    width: 5px;
-    height: 5px;
-  }
-  &::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-  &::-webkit-scrollbar-thumb {
-    border-radius: 5px;
-    background: ${({ theme }: any) => theme.alphaPlusNeutral};
-  }
+    display: flex;
+    align-items: center;
+    margin: 0px 12px;
+    flex: 1;
+    max-width: 450px;
+    overflow-x: auto;
+    &::-webkit-scrollbar {
+        width: 5px;
+        height: 5px;
+    }
+    &::-webkit-scrollbar-corner {
+        background: transparent;
+    }
+    &::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        background: ${({ theme }: any) => theme.alphaPlusNeutral};
+    }
 `;
 
 export const StyledInfoContent = styled.div`
-  background: ${({ theme }: any) => theme.shadow};
-  color: ${({ theme }: any) => theme.contrast};
-  display: flex;
-  flex-direction: column;
-  padding: 20px;
-  div {
-    width: 100%;
-    overflow-wrap: break-word;
-    font-family: monospace;
-  }
-  p {
-    padding: 10px;
-    font-size: 12px;
+    background: ${({ theme }: any) => theme.shadow};
+    color: ${({ theme }: any) => theme.contrast};
     display: flex;
-    flex: 1;
-    align-items: center;
-    flex-wrap: wrap;
-    span.label {
-      background: ${({ theme }: any) => theme.accentNeutral};
-      color: ${({ theme }: any) => theme.shadow};
-      margin: 2px;
-      padding: 2px;
-      border-radius: 2px;
-    }
-  }
-  h4 {
-    margin-bottom: 20px;
-    padding-bottom: 4px;
-    border-bottom: 1px solid ${({ theme }: any) => theme.accentNeutral};
-  }
-  pre {
-    font-family: monospace;
-  }
-  small {
-    font-size: 10px;
-  }
+    flex-direction: column;
+    padding: 20px;
+    div {
+        width: 100%;
+        overflow-wrap: break-word;
+        font-family: monospace;
+    }
+    p {
+        padding: 10px;
+        font-size: 12px;
+        display: flex;
+        flex: 1;
+        align-items: center;
+        flex-wrap: wrap;
+        span.label {
+            background: ${({ theme }: any) => theme.accentNeutral};
+            color: ${({ theme }: any) => theme.shadow};
+            margin: 2px;
+            padding: 2px;
+            border-radius: 2px;
+        }
+    }
+    h4 {
+        margin-bottom: 20px;
+        padding-bottom: 4px;
+        border-bottom: 1px solid ${({ theme }: any) => theme.accentNeutral};
+    }
+    pre {
+        font-family: monospace;
+    }
+    small {
+        font-size: 10px;
+    }
 `;