diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.xml
index 7515161831..b1bec1194e 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.xml
@@ -31,7 +31,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.xml
index 0b480df1dc..1d78e66b92 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.xml
@@ -31,7 +31,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget.xml
index 688a06fb6a..352af8b275 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget.xml
@@ -31,7 +31,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.xml
index 236ab3a422..3c0b85373a 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.xml
@@ -33,7 +33,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.xml
index 7f87225af1..9eadeb816e 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.xml
@@ -33,7 +33,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.xml
index 20cba23be3..8f70e9739f 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.xml
@@ -31,7 +31,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.xml
index 93cc23bfeb..eaf67f2563 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.xml
@@ -31,7 +31,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget.xml
index 9a0e01a435..0b0bc0e095 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget.xml
@@ -32,7 +32,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/index.xml
index 8b83c0d740..b921c37a7a 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/index.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/index.xml
@@ -50,7 +50,7 @@
                 <script src="../commons/js/d3.min.js"></script>
                 <script src="../commons/js/vega.js"></script>
 <!--
-                <script src="../commons/js/VizGrammar.min.js"></script>
+                <script src="../commons/js/VizGrammar_2.js"></script>
                 <script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script>
                 <script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script>
 -->
@@ -58,7 +58,7 @@
                 <!-- JS -->
                 <script src="js/topojson.js"></script>
                 <script src="js/vega.js"></script>
-                <script src="js/VizGrammar.min.js"></script>
+                <script src="js/VizGrammar_2.js"></script>
                 <script src="js/VizGrammarSettings.js"></script>
                 <script src="js/gadgetconf.js"></script>
                 <script src="js/analyticsUtils.js"></script>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/index.xml
index eaf96d302b..44a225a478 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/index.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/index.xml
@@ -46,7 +46,7 @@
                 <!-- Include VizGrammar -->
                 <script src="../commons/js/d3.min.js"></script>
                 <script src="../commons/js/vega.js"></script>
-                <script src="../commons/js/VizGrammar.min.js"></script>
+                <script src="../commons/js/VizGrammar_2.js"></script>
                 <script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script>
                 <script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.xml
index 60ccb63961..09da41da9f 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.xml
@@ -35,7 +35,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.xml
index 557b821763..5bebedd5af 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.xml
@@ -31,7 +31,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget.xml
index fd37a4b39f..18df1d7266 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget.xml
@@ -35,7 +35,7 @@
             <script src="js/provider-libs/ws-client.js"></script>
             <script src="/portal/libs/analytics-wso2-2.0.0/d3.min.js"></script>
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/index.xml
index 5a94be07f0..6a32bf37fa 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/index.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/index.xml
@@ -50,7 +50,7 @@
                 <!-- Include VizGrammar -->
                 <script src="../commons/js/d3.min.js"></script>
                 <script src="../commons/js/vega.js"></script>
-                <script src="../commons/js/VizGrammar.min.js"></script>
+                <script src="../commons/js/VizGrammar_2.js"></script>
                 <script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script>
                 <script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.xml
index 01a31c7e13..cde2656709 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.xml
@@ -4,11 +4,11 @@
         <Require feature="dynamic-height"/>
         <Require feature="wso2-gadgets-identity"/>
     </ModulePrefs>
-    
+
     <UserPref name="windowSize"
               display_name="Window Size"
               default_value="10"/>
-    
+
     <Content type="html">
         <![CDATA[
         <head>
@@ -37,13 +37,13 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
 
-            <script src="/portal/libs/analytics-wso2-2.0.0/gadget-utils.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
             
             <!-- chart specific vendor libs -->
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.xml
index 322b5e657e..334d78791e 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.xml
@@ -4,11 +4,11 @@
         <Require feature="dynamic-height"/>
         <Require feature="wso2-gadgets-identity"/>
     </ModulePrefs>
-    
+
     <UserPref name="windowSize"
               display_name="Window Size"
               default_value="10"/>
-    
+
     <Content type="html">
         <![CDATA[
         <head>
@@ -37,12 +37,14 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
-            
+
+             <script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
+
             <!-- chart specific vendor libs -->
             
             <!-- chart specific js -->
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget.xml
index 6d4eda421d..d058398596 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget.xml
@@ -4,11 +4,11 @@
         <Require feature="dynamic-height"/>
         <Require feature="wso2-gadgets-identity"/>
     </ModulePrefs>
-    
+
     <UserPref name="windowSize"
               display_name="Window Size"
               default_value="10"/>
-    
+
     <Content type="html">
         <![CDATA[
         <head>
@@ -37,13 +37,14 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
+            <script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
+
             <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
 
-            <script src="/portal/libs/analytics-wso2-2.0.0/gadget-utils.js"></script>
             
             <!-- chart specific vendor libs -->
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget.xml
index 74c95aa746..f0029bc7b8 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget.xml
@@ -4,11 +4,11 @@
         <Require feature="dynamic-height"/>
         <Require feature="wso2-gadgets-identity"/>
     </ModulePrefs>
-    
+
     <UserPref name="windowSize"
               display_name="Window Size"
               default_value="10"/>
-    
+
     <Content type="html">
         <![CDATA[
         <head>
@@ -37,7 +37,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.xml
index f7daab5217..e7243f551a 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.xml
@@ -4,11 +4,11 @@
         <Require feature="dynamic-height"/>
         <Require feature="wso2-gadgets-identity"/>
     </ModulePrefs>
-    
+
     <UserPref name="windowSize"
               display_name="Window Size"
               default_value="10"/>
-    
+
     <Content type="html">
         <![CDATA[
         <head>
@@ -37,12 +37,14 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
-            
+
+             <script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
+
             <!-- chart specific vendor libs -->
             
             <!-- chart specific js -->
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.xml
index a61e514244..ed4e500084 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.xml
@@ -4,11 +4,11 @@
         <Require feature="dynamic-height"/>
         <Require feature="wso2-gadgets-identity"/>
     </ModulePrefs>
-    
+
     <UserPref name="windowSize"
               display_name="Window Size"
               default_value="10"/>
-    
+
     <Content type="html">
         <![CDATA[
         <head>
@@ -37,11 +37,11 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
 
-            <script src="/portal/libs/analytics-wso2-2.0.0/gadget-utils.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/iot-gadget-utils.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/chart-utils.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.xml
index 7706136be3..e58b3410ef 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.xml
@@ -31,7 +31,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget.xml
index da096fcf83..c55103985e 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget.xml
@@ -31,7 +31,7 @@
             
             <script src="/portal/libs/analytics-wso2-2.0.0/vega.js"></script>
             
-            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar.min.js"></script>
+            <script src="/portal/libs/analytics-wso2-2.0.0/VizGrammar_2.js"></script>
             
             <script src="/portal/libs/analytics-wso2-2.0.0/wso2gadgets.js"></script>
             
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/index.xml
index 5d0e5b6c74..7a48acdb04 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/index.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/index.xml
@@ -46,7 +46,7 @@
                 <!-- Include VizGrammar -->
                 <script src="../commons/js/d3.min.js"></script>
                 <script src="../commons/js/vega.js"></script>
-                <script src="../commons/js/VizGrammar.min.js"></script>
+                <script src="../commons/js/VizGrammar_2.js"></script>
                 <script src="/portal/extensions/themes/analytics/js/colorbrewer.js"></script>
                 <script src="/portal/extensions/themes/analytics/js/VizGrammarSettings.js"></script>