diff --git a/src/helpers/get-colors.ts b/src/helpers/get-colors.ts
index 037df55..9407b24 100644
--- a/src/helpers/get-colors.ts
+++ b/src/helpers/get-colors.ts
@@ -1,12 +1,12 @@
 import {
-  Layer, Page, Group, Selection,
+  Layer, Page, Group, Selection, Fill, Border
 } from 'sketch'; // eslint-disable-line import/no-unresolved
 
 export const getParents = (parents: any[], id: { id: string, type: string, name: string }) => [...parents, id];
 
-export const hasBorder = (layer: any) => !!layer.style.borders.length;
+export const hasBorder = (layer: any): boolean => !!layer.style.borders.filter((border: Border) => border.enabled).length;
 
-export const hasFill = (layer: any) => !!layer.style.fills.length;
+export const hasFill = (layer: any): boolean => !!layer.style.fills.filter((fill: Fill) => fill.enabled).length;
 
 export const hasTextColor = (layer: any) => !!layer.style.textColor;
 
diff --git a/typings/sketch.d.ts b/typings/sketch.d.ts
index 6194792..a2e8405 100644
--- a/typings/sketch.d.ts
+++ b/typings/sketch.d.ts
@@ -46,10 +46,12 @@ declare module 'sketch' {
 
     export interface Fill {
         color: string;
+        enabled: boolean;
     }
 
     export interface Border {
         color: string;
+        enabled: boolean;
     }
 
     export interface Selection {