diff --git a/src/views/button/ButtonDemo.vue b/src/views/button/ButtonDemo.vue
index 512fa4bdf..02fb66a5a 100644
--- a/src/views/button/ButtonDemo.vue
+++ b/src/views/button/ButtonDemo.vue
@@ -54,8 +54,8 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-    button {
-        margin-right: .5em;
-    }
+<style scoped>
+button {
+    margin-right: .5em;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/calendar/CalendarDemo.vue b/src/views/calendar/CalendarDemo.vue
index eab64daae..ddc85db6c 100644
--- a/src/views/calendar/CalendarDemo.vue
+++ b/src/views/calendar/CalendarDemo.vue
@@ -147,7 +147,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .special-day {
     background-color: #1dcbb3;
     color: #ffffff;
diff --git a/src/views/checkbox/CheckboxDemo.vue b/src/views/checkbox/CheckboxDemo.vue
index 894d61d0a..2b3bc5e47 100644
--- a/src/views/checkbox/CheckboxDemo.vue
+++ b/src/views/checkbox/CheckboxDemo.vue
@@ -66,8 +66,4 @@ export default {
         'CheckboxDoc': CheckboxDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/chips/ChipsDemo.vue b/src/views/chips/ChipsDemo.vue
index 686c2b64c..063b30164 100644
--- a/src/views/chips/ChipsDemo.vue
+++ b/src/views/chips/ChipsDemo.vue
@@ -7,7 +7,7 @@
             </div>
         </div>
 
-        <div class="content-section implementation">
+        <div class="content-section implementation p-fluid">
             <h3 class="first">Basic</h3>
             <Chips v-model="value1" />
 
@@ -41,9 +41,3 @@ export default {
     }
 }
 </script>
-
-<style>
-.p-chips .p-inputtext {
-    width: 100%;
-}
-</style>
diff --git a/src/views/chips/ChipsDoc.vue b/src/views/chips/ChipsDoc.vue
index 5fd05b158..4ee881635 100644
--- a/src/views/chips/ChipsDoc.vue
+++ b/src/views/chips/ChipsDoc.vue
@@ -146,7 +146,7 @@ import Chips from 'primevue/chips';
 <template v-pre>
 &lt;template&gt;
 	&lt;div&gt;
-		&lt;div class="content-section introduction"&gt;
+		&lt;div class="content-section introduction p-fluid"&gt;
 			&lt;div class="feature-intro"&gt;
 				&lt;h1&gt;Chips&lt;/h1&gt;
 				&lt;p&gt;Chips is used to enter multiple values on an input field.&lt;/p&gt;
@@ -181,12 +181,6 @@ export default {
 		}
 	}
 }
-</CodeHighlight>
-
-<CodeHighlight lang="css">
-.p-chips .p-inputtext {
-	width: 100%;
-}
 </CodeHighlight>
 			</TabPanel>
 		</TabView>
diff --git a/src/views/dropdown/DropdownDemo.vue b/src/views/dropdown/DropdownDemo.vue
index ff5c5443a..368e2ba4b 100644
--- a/src/views/dropdown/DropdownDemo.vue
+++ b/src/views/dropdown/DropdownDemo.vue
@@ -64,7 +64,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .p-dropdown {
     width: 12em;
 }
diff --git a/src/views/editor/EditorDemo.vue b/src/views/editor/EditorDemo.vue
index 96eb83ba1..c85e5adbe 100644
--- a/src/views/editor/EditorDemo.vue
+++ b/src/views/editor/EditorDemo.vue
@@ -42,7 +42,3 @@ export default {
     }
 }
 </script>
-
-<style>
-
-</style>
diff --git a/src/views/fieldset/FieldsetDemo.vue b/src/views/fieldset/FieldsetDemo.vue
index df0913ae5..e4f36f80c 100644
--- a/src/views/fieldset/FieldsetDemo.vue
+++ b/src/views/fieldset/FieldsetDemo.vue
@@ -45,7 +45,3 @@ export default {
     }
 }
 </script>
-
-<style>
-
-</style>
diff --git a/src/views/inputgroup/InputGroupDemo.vue b/src/views/inputgroup/InputGroupDemo.vue
index c544eb695..fbee9ab77 100644
--- a/src/views/inputgroup/InputGroupDemo.vue
+++ b/src/views/inputgroup/InputGroupDemo.vue
@@ -131,8 +131,4 @@ export default {
         'InputGroupDoc': InputGroupDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/password/PasswordDemo.vue b/src/views/password/PasswordDemo.vue
index 62bb0c6f8..7f537da40 100644
--- a/src/views/password/PasswordDemo.vue
+++ b/src/views/password/PasswordDemo.vue
@@ -29,7 +29,3 @@ export default {
     }
 }
 </script>
-
-<style>
-
-</style>
diff --git a/src/views/progressbar/ProgressBarDemo.vue b/src/views/progressbar/ProgressBarDemo.vue
index b09943923..fee3cc9d5 100644
--- a/src/views/progressbar/ProgressBarDemo.vue
+++ b/src/views/progressbar/ProgressBarDemo.vue
@@ -58,8 +58,4 @@ export default {
         'ProgressBarDoc': ProgressBarDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/radiobutton/RadioButtonDemo.vue b/src/views/radiobutton/RadioButtonDemo.vue
index 4b9ddb436..510b8e7da 100644
--- a/src/views/radiobutton/RadioButtonDemo.vue
+++ b/src/views/radiobutton/RadioButtonDemo.vue
@@ -61,8 +61,4 @@ export default {
         'RadioButtonDoc': RadioButtonDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/rating/RatingDemo.vue b/src/views/rating/RatingDemo.vue
index 2bf7b26bc..6f4154e8a 100644
--- a/src/views/rating/RatingDemo.vue
+++ b/src/views/rating/RatingDemo.vue
@@ -39,8 +39,4 @@ export default {
         'RatingDoc': RatingDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/selectbutton/SelectButtonDemo.vue b/src/views/selectbutton/SelectButtonDemo.vue
index fa37e9ceb..5ec06863c 100644
--- a/src/views/selectbutton/SelectButtonDemo.vue
+++ b/src/views/selectbutton/SelectButtonDemo.vue
@@ -60,8 +60,4 @@ export default {
         'SelectButtonDoc': SelectButtonDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/slider/SliderDemo.vue b/src/views/slider/SliderDemo.vue
index 20ab9df12..68a324efa 100644
--- a/src/views/slider/SliderDemo.vue
+++ b/src/views/slider/SliderDemo.vue
@@ -48,7 +48,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 .p-slider-horizontal, .p-inputtext {
     width: 14em;
 }
diff --git a/src/views/spinner/SpinnerDemo.vue b/src/views/spinner/SpinnerDemo.vue
index e6d9d37a2..d0547b8f6 100644
--- a/src/views/spinner/SpinnerDemo.vue
+++ b/src/views/spinner/SpinnerDemo.vue
@@ -41,8 +41,4 @@ export default {
         'SpinnerDoc': SpinnerDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/splitbutton/SplitButtonDemo.vue b/src/views/splitbutton/SplitButtonDemo.vue
index a2cb6f424..2d85910b5 100644
--- a/src/views/splitbutton/SplitButtonDemo.vue
+++ b/src/views/splitbutton/SplitButtonDemo.vue
@@ -74,7 +74,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    .p-splitbutton {
-        margin-right: .5em;
-    }
+.p-splitbutton {
+    margin-right: .5em;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/support/Support.vue b/src/views/support/Support.vue
index 4daa0ea63..be5d30d76 100644
--- a/src/views/support/Support.vue
+++ b/src/views/support/Support.vue
@@ -58,8 +58,4 @@
             guarantee response at forum although it is monitored and maintained by our staff. If you need to secure our response within 1 business day, you may consider PrimeVue PRO support.</p>
         </div>
     </div>
-</template>
-
-<style>
-
-</style>
+</template>
\ No newline at end of file
diff --git a/src/views/textarea/TextareaDemo.vue b/src/views/textarea/TextareaDemo.vue
index 33edd0b22..694f6374e 100644
--- a/src/views/textarea/TextareaDemo.vue
+++ b/src/views/textarea/TextareaDemo.vue
@@ -38,7 +38,3 @@ export default {
     }
 }
 </script>
-
-<style>
-
-</style>
diff --git a/src/views/toast/ToastDemo.vue b/src/views/toast/ToastDemo.vue
index 6d282d945..d04a628f1 100644
--- a/src/views/toast/ToastDemo.vue
+++ b/src/views/toast/ToastDemo.vue
@@ -102,10 +102,4 @@ export default {
         'ToastDoc': ToastDoc
     }
 }
-</script>
-
-<style lang="scss">
-button.p-button {
-    margin-right: .5em;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/togglebutton/ToggleButtonDemo.vue b/src/views/togglebutton/ToggleButtonDemo.vue
index 9d28e7b1b..90da8d660 100644
--- a/src/views/togglebutton/ToggleButtonDemo.vue
+++ b/src/views/togglebutton/ToggleButtonDemo.vue
@@ -35,8 +35,4 @@ export default {
         'ToggleButtonDoc': ToggleButtonDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/tristatecheckbox/TriStateCheckboxDemo.vue b/src/views/tristatecheckbox/TriStateCheckboxDemo.vue
index da04dd219..a1f85a70c 100644
--- a/src/views/tristatecheckbox/TriStateCheckboxDemo.vue
+++ b/src/views/tristatecheckbox/TriStateCheckboxDemo.vue
@@ -29,8 +29,4 @@ export default {
         'TriStateCheckboxDoc': TriStateCheckboxDoc
     }
 }
-</script>
-
-<style>
-
-</style>
+</script>
\ No newline at end of file