From a5089094711fac0ed40501e27fb7a00e510538bb Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Wed, 1 Dec 2021 22:59:01 +0530
Subject: [PATCH] refactor: sort windi class names

---
 .../hoppscotch-app/assets/scss/styles.scss    |  9 ++-
 .../components/app/Announcement.vue           |  6 +-
 .../hoppscotch-app/components/app/Footer.vue  |  4 +-
 .../hoppscotch-app/components/app/Fuse.vue    |  4 +-
 .../hoppscotch-app/components/app/Header.vue  | 12 ++--
 .../components/app/Interceptor.vue            |  2 +-
 .../components/app/PowerSearch.vue            |  6 +-
 .../components/app/PowerSearchEntry.vue       |  6 +-
 .../hoppscotch-app/components/app/Section.vue |  2 +-
 .../hoppscotch-app/components/app/Share.vue   | 10 ++--
 .../components/app/Shortcuts.vue              | 26 ++++----
 .../hoppscotch-app/components/app/Sidenav.vue |  4 +-
 .../components/app/SlideOver.vue              |  6 +-
 .../components/button/Primary.vue             |  6 +-
 .../components/button/Secondary.vue           |  9 ++-
 .../components/collections/ChooseType.vue     |  2 +-
 .../components/collections/SaveRequest.vue    |  2 +-
 .../collections/graphql/Collection.vue        | 14 ++---
 .../components/collections/graphql/Folder.vue | 14 ++---
 .../collections/graphql/Request.vue           |  8 +--
 .../components/collections/graphql/index.vue  | 16 ++---
 .../components/collections/index.vue          | 16 ++---
 .../components/collections/my/Collection.vue  | 14 ++---
 .../components/collections/my/Folder.vue      | 14 ++---
 .../components/collections/my/Request.vue     |  8 +--
 .../collections/teams/Collection.vue          | 14 ++---
 .../components/collections/teams/Folder.vue   | 14 ++---
 .../components/collections/teams/Request.vue  |  8 +--
 .../components/environments/Edit.vue          | 18 +++---
 .../components/environments/Environment.vue   |  6 +-
 .../components/environments/index.vue         | 18 +++---
 .../components/firebase/Login.vue             |  8 +--
 .../components/graphql/Field.vue              | 10 ++--
 .../components/graphql/Request.vue            |  6 +-
 .../components/graphql/RequestOptions.vue     | 24 ++++----
 .../components/graphql/Response.vue           | 16 ++---
 .../components/graphql/Sidebar.vue            | 20 +++----
 .../components/graphql/Type.vue               | 10 ++--
 .../components/history/graphql/Card.vue       | 10 ++--
 .../components/history/index.vue              | 14 ++---
 .../components/history/rest/Card.vue          |  8 +--
 .../components/http/Authorization.vue         | 38 ++++++------
 .../hoppscotch-app/components/http/Body.vue   | 12 ++--
 .../components/http/BodyParameters.vue        | 14 ++---
 .../components/http/CodegenModal.vue          |  4 +-
 .../components/http/Headers.vue               | 14 ++---
 .../components/http/ImportCurl.vue            |  2 +-
 .../components/http/OAuth2Authorization.vue   | 20 +++----
 .../components/http/Parameters.vue            | 12 ++--
 .../components/http/PreRequestScript.vue      | 12 ++--
 .../components/http/RawBody.vue               |  4 +-
 .../components/http/Request.vue               | 12 ++--
 .../components/http/ResponseMeta.vue          | 26 ++++----
 .../components/http/TestResult.vue            | 18 +++---
 .../components/http/TestResultEntry.vue       |  4 +-
 .../components/http/TestResultReport.vue      |  2 +-
 .../hoppscotch-app/components/http/Tests.vue  | 12 ++--
 .../components/lenses/HeadersRenderer.vue     | 14 ++---
 .../lenses/renderers/HTMLLensRenderer.vue     |  4 +-
 .../lenses/renderers/ImageLensRenderer.vue    |  6 +-
 .../lenses/renderers/JSONLensRenderer.vue     |  8 +--
 .../lenses/renderers/RawLensRenderer.vue      |  4 +-
 .../lenses/renderers/XMLLensRenderer.vue      |  4 +-
 .../components/profile/Picture.vue            |  6 +-
 .../components/realtime/Log.vue               |  4 +-
 .../components/realtime/Mqtt.vue              | 22 +++----
 .../components/realtime/Socketio.vue          | 20 +++----
 .../components/realtime/Sse.vue               | 10 ++--
 .../components/realtime/Websocket.vue         | 26 ++++----
 .../components/smart/Checkbox.vue             |  4 +-
 .../components/smart/DeletableChip.vue        |  2 +-
 .../hoppscotch-app/components/smart/Item.vue  | 10 ++--
 .../components/smart/LoadingIndicator.vue     |  2 +-
 .../hoppscotch-app/components/smart/Modal.vue | 16 ++---
 .../hoppscotch-app/components/smart/Tabs.vue  | 10 ++--
 .../components/smart/Toggle.vue               |  4 +-
 .../hoppscotch-app/components/tab/Primary.vue |  2 +-
 .../components/tab/Secondary.vue              |  2 +-
 .../hoppscotch-app/components/teams/Edit.vue  | 20 +++----
 .../components/teams/Invite.vue               | 60 +++++++++----------
 .../hoppscotch-app/components/teams/Team.vue  | 10 ++--
 .../hoppscotch-app/components/teams/index.vue | 10 ++--
 packages/hoppscotch-app/layouts/default.vue   |  2 +-
 packages/hoppscotch-app/layouts/error.vue     |  2 +-
 .../hoppscotch-app/pages/documentation.vue    | 16 ++---
 packages/hoppscotch-app/pages/enter.vue       |  2 +-
 packages/hoppscotch-app/pages/index.vue       |  2 +-
 packages/hoppscotch-app/pages/join-team.vue   | 30 +++++-----
 packages/hoppscotch-app/pages/profile.vue     | 30 +++++-----
 packages/hoppscotch-app/pages/r/_id.vue       | 18 +++---
 packages/hoppscotch-app/pages/settings.vue    | 18 +++---
 91 files changed, 518 insertions(+), 512 deletions(-)

diff --git a/packages/hoppscotch-app/assets/scss/styles.scss b/packages/hoppscotch-app/assets/scss/styles.scss
index b6c52a3bc..7d06cefdd 100644
--- a/packages/hoppscotch-app/assets/scss/styles.scss
+++ b/packages/hoppscotch-app/assets/scss/styles.scss
@@ -19,7 +19,8 @@
   @apply bg-divider bg-clip-content;
   @apply rounded-full;
   @apply border-solid border-transparent border-4;
-  @apply hover:(bg-dividerDark bg-clip-content);
+  @apply hover:bg-dividerDark;
+  @apply hover:bg-clip-content;
 }
 
 ::-webkit-scrollbar {
@@ -130,7 +131,8 @@ a {
     @apply text-accent;
     @apply rounded;
     @apply hover:text-accentDark;
-    @apply focus-visible:(ring ring-accent);
+    @apply focus-visible:ring;
+    @apply focus-visible:ring-accent;
   }
 }
 
@@ -336,7 +338,8 @@ pre.ace_editor {
         @apply rounded;
         @apply text-current;
         @apply normal-case;
-        @apply hover:(bg-opacity-20 no-underline);
+        @apply hover:bg-opacity-20;
+        @apply hover:no-underline;
         @apply font-medium;
 
         font-size: var(--body-font-size);
diff --git a/packages/hoppscotch-app/components/app/Announcement.vue b/packages/hoppscotch-app/components/app/Announcement.vue
index 817015812..cdbdbd45c 100644
--- a/packages/hoppscotch-app/components/app/Announcement.vue
+++ b/packages/hoppscotch-app/components/app/Announcement.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="bg-error flex justify-between">
     <span
-      class="group relative flex items-center justify-center px-4 py-2 transition"
+      class="flex py-2 px-4 transition justify-center group relative items-center"
     >
-      <i class="material-icons mr-2">info_outline</i>
+      <i class="mr-2 material-icons">info_outline</i>
       <span class="text-secondaryDark">
         <span class="md:hidden">
           {{ t("helpers.offline_short") }}
         </span>
-        <span class="md:inline hidden">
+        <span class="hidden md:inline">
           {{ t("helpers.offline") }}
         </span>
       </span>
diff --git a/packages/hoppscotch-app/components/app/Footer.vue b/packages/hoppscotch-app/components/app/Footer.vue
index 4579e1308..9fdc06d7e 100644
--- a/packages/hoppscotch-app/components/app/Footer.vue
+++ b/packages/hoppscotch-app/components/app/Footer.vue
@@ -107,7 +107,7 @@
                 @click.native="$refs.options.tippy().hide()"
               />
               <!-- <SmartItem :label="t('app.status')" /> -->
-              <div class="flex px-4 py-2 opacity-50">
+              <div class="flex opacity-50 py-2 px-4">
                 {{ `${t("app.name")} ${t("app.version")}` }}
               </div>
             </div>
@@ -135,7 +135,7 @@
           @click.native="COLUMN_LAYOUT = !COLUMN_LAYOUT"
         />
         <span
-          class="transition transform"
+          class="transform transition"
           :class="{
             'rotate-180': SIDEBAR_ON_LEFT,
           }"
diff --git a/packages/hoppscotch-app/components/app/Fuse.vue b/packages/hoppscotch-app/components/app/Fuse.vue
index 79c423638..c46e66b6a 100644
--- a/packages/hoppscotch-app/components/app/Fuse.vue
+++ b/packages/hoppscotch-app/components/app/Fuse.vue
@@ -11,9 +11,9 @@
     />
     <div
       v-if="searchResults.length === 0"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
-      <i class="material-icons pb-2 opacity-75">manage_search</i>
+      <i class="opacity-75 pb-2 material-icons">manage_search</i>
       <span class="text-center">
         {{ t("state.nothing_found") }} "{{ search }}"
       </span>
diff --git a/packages/hoppscotch-app/components/app/Header.vue b/packages/hoppscotch-app/components/app/Header.vue
index 0aad0870f..264d97e3f 100644
--- a/packages/hoppscotch-app/components/app/Header.vue
+++ b/packages/hoppscotch-app/components/app/Header.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <header
-      class="flex items-center justify-between flex-1 px-2 py-2 space-x-2"
+      class="flex space-x-2 flex-1 py-2 px-2 items-center justify-between"
     >
-      <div class="inline-flex items-center space-x-2">
+      <div class="space-x-2 inline-flex items-center">
         <ButtonSecondary
           class="tracking-wide !font-bold !text-secondaryDark"
           label="HOPPSCOTCH"
@@ -11,7 +11,7 @@
         />
         <AppGitHubStarButton class="mt-1.5 transition hidden sm:flex" />
       </div>
-      <div class="inline-flex items-center space-x-2">
+      <div class="space-x-2 inline-flex items-center">
         <ButtonSecondary
           id="installPWA"
           v-tippy="{ theme: 'tooltip' }"
@@ -39,7 +39,7 @@
           svg="upload-cloud"
           :label="t('header.save_workspace')"
           filled
-          class="md:flex hidden"
+          class="hidden md:flex"
           @click.native="showLogin = true"
         />
         <ButtonPrimary
@@ -47,13 +47,13 @@
           :label="t('header.login')"
           @click.native="showLogin = true"
         />
-        <div v-else class="inline-flex items-center space-x-2">
+        <div v-else class="space-x-2 inline-flex items-center">
           <ButtonPrimary
             v-tippy="{ theme: 'tooltip' }"
             :title="t('team.invite_tooltip')"
             :label="t('team.invite')"
             svg="user-plus"
-            class="!bg-green-500 !text-green-500 !bg-opacity-15 !hover:bg-opacity-10 !hover:text-green-600 !hover:bg-green-400"
+            class="!bg-green-500 !bg-opacity-15 !text-green-500 !hover:bg-opacity-10 !hover:bg-green-400 !hover:text-green-600"
             @click.native="showTeamsModal = true"
           />
           <span class="px-2">
diff --git a/packages/hoppscotch-app/components/app/Interceptor.vue b/packages/hoppscotch-app/components/app/Interceptor.vue
index 821fc2e22..6d0af4482 100644
--- a/packages/hoppscotch-app/components/app/Interceptor.vue
+++ b/packages/hoppscotch-app/components/app/Interceptor.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col items-start p-4 space-y-4">
+  <div class="flex flex-col space-y-4 p-4 items-start">
     <SmartToggle
       :on="PROXY_ENABLED"
       @change="toggleSettingKey('PROXY_ENABLED')"
diff --git a/packages/hoppscotch-app/components/app/PowerSearch.vue b/packages/hoppscotch-app/components/app/PowerSearch.vue
index 905e9dd08..c60325f58 100644
--- a/packages/hoppscotch-app/components/app/PowerSearch.vue
+++ b/packages/hoppscotch-app/components/app/PowerSearch.vue
@@ -14,7 +14,7 @@
         autocomplete="off"
         name="command"
         :placeholder="`${t('app.type_a_command_search')}`"
-        class="border-dividerLight text-secondaryDark flex flex-shrink-0 p-6 text-base bg-transparent border-b"
+        class="bg-transparent border-b border-dividerLight flex flex-shrink-0 text-base text-secondaryDark p-6"
       />
       <AppFuse
         v-if="search && show"
@@ -24,14 +24,14 @@
       />
       <div
         v-else
-        class="divide-dividerLight hide-scrollbar flex flex-col flex-1 space-y-4 overflow-auto divide-y"
+        class="divide-dividerLight divide-y flex flex-col space-y-4 flex-1 overflow-auto hide-scrollbar"
       >
         <div
           v-for="(map, mapIndex) in mappings"
           :key="`map-${mapIndex}`"
           class="flex flex-col"
         >
-          <h5 class="text-secondaryLight px-6 py-2 my-2">
+          <h5 class="my-2 text-secondaryLight py-2 px-6">
             {{ t(map.section) }}
           </h5>
           <AppPowerSearchEntry
diff --git a/packages/hoppscotch-app/components/app/PowerSearchEntry.vue b/packages/hoppscotch-app/components/app/PowerSearchEntry.vue
index 657268348..8c3eec2fa 100644
--- a/packages/hoppscotch-app/components/app/PowerSearchEntry.vue
+++ b/packages/hoppscotch-app/components/app/PowerSearchEntry.vue
@@ -1,18 +1,18 @@
 <template>
   <button
-    class="search-entry focus:outline-none flex items-center flex-1 px-6 py-2 transition cursor-pointer"
+    class="cursor-pointer flex flex-1 py-2 px-6 transition items-center search-entry focus:outline-none"
     :class="{ active: active }"
     tabindex="-1"
     @click="$emit('action', shortcut.action)"
     @keydown.enter="$emit('action', shortcut.action)"
   >
     <SmartIcon
-      class="svg-icons mr-4 transition opacity-50"
+      class="mr-4 opacity-50 transition svg-icons"
       :class="{ 'opacity-100 text-secondaryDark': active }"
       :name="shortcut.icon"
     />
     <span
-      class="flex flex-1 mr-4 font-medium transition"
+      class="flex font-medium flex-1 mr-4 transition"
       :class="{ 'text-secondaryDark': active }"
     >
       {{ t(shortcut.label) }}
diff --git a/packages/hoppscotch-app/components/app/Section.vue b/packages/hoppscotch-app/components/app/Section.vue
index 5d08305ae..19cbb462a 100644
--- a/packages/hoppscotch-app/components/app/Section.vue
+++ b/packages/hoppscotch-app/components/app/Section.vue
@@ -1,5 +1,5 @@
 <template>
-  <section :id="label.toLowerCase()" class="relative flex flex-col flex-1">
+  <section :id="label.toLowerCase()" class="flex flex-col flex-1 relative">
     <slot></slot>
   </section>
 </template>
diff --git a/packages/hoppscotch-app/components/app/Share.vue b/packages/hoppscotch-app/components/app/Share.vue
index f3c0977b2..72ba621c1 100644
--- a/packages/hoppscotch-app/components/app/Share.vue
+++ b/packages/hoppscotch-app/components/app/Share.vue
@@ -5,11 +5,11 @@
     @close="hideModal"
   >
     <template #body>
-      <p class="text-secondaryLight px-2 mb-8">
+      <p class="text-secondaryLight mb-8 px-2">
         {{ t("app.invite_description") }}
       </p>
-      <div class="flex flex-col px-2 space-y-2">
-        <div class="grid grid-cols-3 gap-4">
+      <div class="flex flex-col space-y-2 px-2">
+        <div class="grid gap-4 grid-cols-3">
           <a
             v-for="(platform, index) in platforms"
             :key="`platform-${index}`"
@@ -17,13 +17,13 @@
             target="_blank"
             class="share-link"
           >
-            <SmartIcon :name="platform.icon" class="w-6 h-6" />
+            <SmartIcon :name="platform.icon" class="h-6 w-6" />
             <span class="mt-3">
               {{ platform.name }}
             </span>
           </a>
           <button class="share-link" @click="copyAppLink">
-            <SmartIcon class="w-6 h-6 text-xl" :name="copyIcon" />
+            <SmartIcon class="h-6 text-xl w-6" :name="copyIcon" />
             <span class="mt-3">
               {{ t("app.copy") }}
             </span>
diff --git a/packages/hoppscotch-app/components/app/Shortcuts.vue b/packages/hoppscotch-app/components/app/Shortcuts.vue
index c78ce5009..da55b0c53 100644
--- a/packages/hoppscotch-app/components/app/Shortcuts.vue
+++ b/packages/hoppscotch-app/components/app/Shortcuts.vue
@@ -2,34 +2,34 @@
   <AppSlideOver :show="show" @close="close()">
     <template #content>
       <div
-        class="bg-primary border-dividerLight sticky top-0 z-10 flex items-center justify-between p-2 border-b"
+        class="bg-primary border-b border-dividerLight flex p-2 top-0 z-10 sticky items-center justify-between"
       >
-        <h3 class="heading ml-4">{{ t("app.shortcuts") }}</h3>
+        <h3 class="ml-4 heading">{{ t("app.shortcuts") }}</h3>
         <div class="flex">
           <ButtonSecondary svg="x" class="rounded" @click.native="close()" />
         </div>
       </div>
-      <div class="bg-primary border-dividerLight border-b">
-        <div class="flex flex-col mx-6 my-4">
+      <div class="bg-primary border-b border-dividerLight">
+        <div class="flex flex-col my-4 mx-6">
           <input
             v-model="filterText"
             type="search"
             autocomplete="off"
-            class="bg-primaryLight border-dividerLight focus-visible:border-divider flex w-full px-4 py-2 border rounded"
+            class="bg-primaryLight border border-dividerLight rounded flex w-full py-2 px-4 focus-visible:border-divider"
             :placeholder="`${t('action.search')}`"
           />
         </div>
       </div>
       <div
         v-if="filterText"
-        class="divide-dividerLight hide-scrollbar flex flex-col flex-1 overflow-auto divide-y"
+        class="divide-dividerLight divide-y flex flex-col flex-1 overflow-auto hide-scrollbar"
       >
         <div
           v-for="(map, mapIndex) in searchResults"
           :key="`map-${mapIndex}`"
-          class="px-6 py-4 space-y-4"
+          class="space-y-4 py-4 px-6"
         >
-          <h1 class="text-secondaryDark font-semibold">
+          <h1 class="font-semibold text-secondaryDark">
             {{ t(map.item.section) }}
           </h1>
           <AppShortcutsEntry
@@ -40,9 +40,9 @@
         </div>
         <div
           v-if="searchResults.length === 0"
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
-          <i class="material-icons pb-2 opacity-75">manage_search</i>
+          <i class="opacity-75 pb-2 material-icons">manage_search</i>
           <span class="text-center">
             {{ t("state.nothing_found") }} "{{ filterText }}"
           </span>
@@ -50,14 +50,14 @@
       </div>
       <div
         v-else
-        class="divide-dividerLight hide-scrollbar flex flex-col flex-1 overflow-auto divide-y"
+        class="divide-dividerLight divide-y flex flex-col flex-1 overflow-auto hide-scrollbar"
       >
         <div
           v-for="(map, mapIndex) in mappings"
           :key="`map-${mapIndex}`"
-          class="px-6 py-4 space-y-4"
+          class="space-y-4 py-4 px-6"
         >
-          <h1 class="text-secondaryDark font-semibold">
+          <h1 class="font-semibold text-secondaryDark">
             {{ t(map.section) }}
           </h1>
           <AppShortcutsEntry
diff --git a/packages/hoppscotch-app/components/app/Sidenav.vue b/packages/hoppscotch-app/components/app/Sidenav.vue
index 61916942f..77fee36e3 100644
--- a/packages/hoppscotch-app/components/app/Sidenav.vue
+++ b/packages/hoppscotch-app/components/app/Sidenav.vue
@@ -1,6 +1,6 @@
 <template>
-  <aside class="md:flex-col flex justify-between h-full">
-    <nav class="flex-nowrap md:flex-col md:flex-none flex flex-1">
+  <aside class="flex h-full justify-between md:flex-col">
+    <nav class="flex flex-nowrap flex-1 md:flex-col md:flex-none">
       <NuxtLink
         v-for="(navigation, index) in primaryNavigation"
         :key="`navigation-${index}`"
diff --git a/packages/hoppscotch-app/components/app/SlideOver.vue b/packages/hoppscotch-app/components/app/SlideOver.vue
index 45c79d32b..6b13d2217 100644
--- a/packages/hoppscotch-app/components/app/SlideOver.vue
+++ b/packages/hoppscotch-app/components/app/SlideOver.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <transition v-if="show" name="fade" appear>
-      <div class="fixed inset-0 z-20 transition-opacity" @keydown.esc="close()">
+      <div class="inset-0 transition-opacity z-20 fixed" @keydown.esc="close()">
         <div
-          class="bg-primaryLight opacity-90 absolute inset-0"
+          class="bg-primaryLight opacity-90 inset-0 absolute"
           tabindex="0"
           @click="close()"
         ></div>
       </div>
     </transition>
     <aside
-      class="bg-primary w-96 fixed top-0 right-0 z-30 flex flex-col h-full max-w-full overflow-auto transition duration-300 ease-in-out transform"
+      class="bg-primary flex flex-col h-full max-w-full transform transition top-0 ease-in-out right-0 w-96 z-30 duration-300 fixed overflow-auto"
       :class="show ? 'shadow-xl translate-x-0' : 'translate-x-full'"
     >
       <slot name="content"></slot>
diff --git a/packages/hoppscotch-app/components/button/Primary.vue b/packages/hoppscotch-app/components/button/Primary.vue
index aa7b4c190..b87285cc5 100644
--- a/packages/hoppscotch-app/components/button/Primary.vue
+++ b/packages/hoppscotch-app/components/button/Primary.vue
@@ -3,7 +3,7 @@
     :to="`${/^\/(?!\/).*$/.test(to) ? localePath(to) : to}`"
     :exact="exact"
     :blank="blank"
-    class="focus:outline-none focus-visible:bg-accentDark inline-flex items-center justify-center py-2 font-bold transition"
+    class="font-bold py-2 transition inline-flex items-center justify-center focus:outline-none focus-visible:bg-accentDark"
     :class="[
       color
         ? `text-${color}-800 bg-${color}-200 hover:(text-${color}-900 bg-${color}-300) focus-visible:(text-${color}-900 bg-${color}-300)`
@@ -29,7 +29,7 @@
   >
     <span
       v-if="!loading"
-      class="whitespace-nowrap inline-flex items-center justify-center"
+      class="inline-flex items-center justify-center whitespace-nowrap"
       :class="{ 'flex-row-reverse': reverse }"
     >
       <i
@@ -56,7 +56,7 @@
         <kbd
           v-for="(key, index) in shortcut"
           :key="`key-${index}`"
-          class="bg-accentLight inline-flex px-1 ml-1 rounded"
+          class="bg-accentLight rounded ml-1 px-1 inline-flex"
         >
           {{ key }}
         </kbd>
diff --git a/packages/hoppscotch-app/components/button/Secondary.vue b/packages/hoppscotch-app/components/button/Secondary.vue
index ccc3df711..fac87b94e 100644
--- a/packages/hoppscotch-app/components/button/Secondary.vue
+++ b/packages/hoppscotch-app/components/button/Secondary.vue
@@ -3,7 +3,7 @@
     :to="`${/^\/(?!\/).*$/.test(to) ? localePath(to) : to}`"
     :exact="exact"
     :blank="blank"
-    class="whitespace-nowrap hover:bg-primaryDark focus:outline-none focus-visible:bg-primaryDark inline-flex items-center justify-center py-2 font-semibold transition"
+    class="font-semibold py-2 transition inline-flex items-center justify-center whitespace-nowrap hover:bg-primaryDark focus:outline-none focus-visible:bg-primaryDark"
     :class="[
       color
         ? `text-${color}-500 hover:(text-${color}-600 text-${color}-600)`
@@ -17,7 +17,10 @@
         'border border-divider hover:border-dividerDark focus-visible:border-dividerDark':
           outline,
       },
-      { '!bg-primaryLight !hover:bg-primaryDark': filled },
+      {
+        '!bg-primaryLight !hover:bg-primaryDark !focus-visible:bg-primaryDark':
+          filled,
+      },
     ]"
     :disabled="disabled"
   >
@@ -45,7 +48,7 @@
       <kbd
         v-for="(key, index) in shortcut"
         :key="`key-${index}`"
-        class="bg-dividerLight text-secondaryLight inline-flex px-1 ml-1 rounded"
+        class="bg-dividerLight rounded text-secondaryLight ml-1 px-1 inline-flex"
       >
         {{ key }}
       </kbd>
diff --git a/packages/hoppscotch-app/components/collections/ChooseType.vue b/packages/hoppscotch-app/components/collections/ChooseType.vue
index c4dd5c89b..52835e776 100644
--- a/packages/hoppscotch-app/components/collections/ChooseType.vue
+++ b/packages/hoppscotch-app/components/collections/ChooseType.vue
@@ -18,7 +18,7 @@
               type="text"
               autocomplete="off"
               autofocus
-              class="border-dividerLight hover:bg-primaryDark flex w-full px-4 py-2 font-semibold bg-transparent border-t appearance-none cursor-pointer"
+              class="bg-transparent border-t border-dividerLight cursor-pointer flex font-semibold w-full py-2 px-4 appearance-none hover:bg-primaryDark"
               @change="updateSelectedTeam(myTeams[$event.target.value])"
             >
               <option
diff --git a/packages/hoppscotch-app/components/collections/SaveRequest.vue b/packages/hoppscotch-app/components/collections/SaveRequest.vue
index a8c2484e6..5094f71ae 100644
--- a/packages/hoppscotch-app/components/collections/SaveRequest.vue
+++ b/packages/hoppscotch-app/components/collections/SaveRequest.vue
@@ -6,7 +6,7 @@
   >
     <template #body>
       <div class="flex flex-col px-2">
-        <div class="relative flex">
+        <div class="flex relative">
           <input
             id="selectLabelSaveReq"
             v-model="requestName"
diff --git a/packages/hoppscotch-app/components/collections/graphql/Collection.vue b/packages/hoppscotch-app/components/collections/graphql/Collection.vue
index 1a7915ee9..1f5de7a8c 100644
--- a/packages/hoppscotch-app/components/collections/graphql/Collection.vue
+++ b/packages/hoppscotch-app/components/collections/graphql/Collection.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col" :class="[{ 'bg-primaryLight': dragging }]">
     <div
-      class="group flex items-center"
+      class="flex items-center group"
       @dragover.prevent
       @drop.prevent="dropEvent"
       @dragover="dragging = true"
@@ -10,7 +10,7 @@
       @dragend="dragging = false"
     >
       <span
-        class="flex items-center justify-center px-4 cursor-pointer"
+        class="cursor-pointer flex px-4 items-center justify-center"
         @click="toggleShowChildren()"
       >
         <SmartIcon
@@ -20,7 +20,7 @@
         />
       </span>
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
         @click="toggleShowChildren()"
       >
         <span class="truncate"> {{ collection.name }} </span>
@@ -30,7 +30,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
           :title="$t('folder.new')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="
             $emit('add-folder', {
               path: `${collectionIndex}`,
@@ -91,7 +91,7 @@
     </div>
     <div v-if="showChildren || isFiltered" class="flex">
       <div
-        class="flex w-1 transform transition cursor-nsResize ml-5.5 bg-dividerLight hover:scale-x-125 hover:bg-dividerDark"
+        class="bg-dividerLight cursor-nsResize flex ml-5.5 transform transition w-1 hover:bg-dividerDark hover:scale-x-125"
         @click="toggleShowChildren()"
       ></div>
       <div class="flex flex-col flex-1 truncate">
@@ -132,12 +132,12 @@
           v-if="
             collection.folders.length === 0 && collection.requests.length === 0
           "
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
           <img
             :src="`/images/states/${$colorMode.value}/pack.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+            class="flex-col object-contain object-center h-16 mb-4 w-16 inline-flex"
             :alt="$t('empty.collection')"
           />
           <span class="text-center">
diff --git a/packages/hoppscotch-app/components/collections/graphql/Folder.vue b/packages/hoppscotch-app/components/collections/graphql/Folder.vue
index 10e8333ea..6d6f4c19e 100644
--- a/packages/hoppscotch-app/components/collections/graphql/Folder.vue
+++ b/packages/hoppscotch-app/components/collections/graphql/Folder.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col" :class="[{ 'bg-primaryLight': dragging }]">
     <div
-      class="group flex items-center"
+      class="flex items-center group"
       @dragover.prevent
       @drop.prevent="dropEvent"
       @dragover="dragging = true"
@@ -10,7 +10,7 @@
       @dragend="dragging = false"
     >
       <span
-        class="flex items-center justify-center px-4 cursor-pointer"
+        class="cursor-pointer flex px-4 items-center justify-center"
         @click="toggleShowChildren()"
       >
         <SmartIcon
@@ -20,7 +20,7 @@
         />
       </span>
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
         @click="toggleShowChildren()"
       >
         <span class="truncate">
@@ -32,7 +32,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
           :title="$t('folder.new')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="$emit('add-folder', { folder, path: folderPath })"
         />
         <span>
@@ -87,7 +87,7 @@
     </div>
     <div v-if="showChildren || isFiltered" class="flex">
       <div
-        class="flex w-1 transform transition cursor-nsResize ml-5.5 bg-dividerLight hover:scale-x-125 hover:bg-dividerDark"
+        class="bg-dividerLight cursor-nsResize flex ml-5.5 transform transition w-1 hover:bg-dividerDark hover:scale-x-125"
         @click="toggleShowChildren()"
       ></div>
       <div class="flex flex-col flex-1 truncate">
@@ -131,12 +131,12 @@
             folder.requests &&
             folder.requests.length === 0
           "
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
           <img
             :src="`/images/states/${$colorMode.value}/pack.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+            class="flex-col object-contain object-center h-16 mb-4 w-16 inline-flex"
             :alt="$t('empty.folder')"
           />
           <span class="text-center">
diff --git a/packages/hoppscotch-app/components/collections/graphql/Request.vue b/packages/hoppscotch-app/components/collections/graphql/Request.vue
index 040de2ef6..595773866 100644
--- a/packages/hoppscotch-app/components/collections/graphql/Request.vue
+++ b/packages/hoppscotch-app/components/collections/graphql/Request.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col" :class="[{ 'bg-primaryLight': dragging }]">
     <div
-      class="group flex items-center"
+      class="flex items-center group"
       draggable="true"
       @dragstart="dragStart"
       @dragover.stop
@@ -9,7 +9,7 @@
       @dragend="dragging = false"
     >
       <span
-        class="flex items-center justify-center w-16 px-2 truncate cursor-pointer"
+        class="cursor-pointer flex px-2 w-16 items-center justify-center truncate"
         @click="!doc ? selectRequest() : {}"
       >
         <SmartIcon
@@ -19,7 +19,7 @@
         />
       </span>
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
         @click="!doc ? selectRequest() : {}"
       >
         <span class="truncate"> {{ request.name }} </span>
@@ -30,7 +30,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="rotate-ccw"
           :title="$t('action.restore')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="!doc ? selectRequest() : {}"
         />
         <span>
diff --git a/packages/hoppscotch-app/components/collections/graphql/index.vue b/packages/hoppscotch-app/components/collections/graphql/index.vue
index f475cfc03..ad8ecb6d6 100644
--- a/packages/hoppscotch-app/components/collections/graphql/index.vue
+++ b/packages/hoppscotch-app/components/collections/graphql/index.vue
@@ -4,7 +4,7 @@
     :class="{ 'rounded border border-divider': savingMode }"
   >
     <div
-      class="divide-dividerLight border-dividerLight sticky top-0 z-10 flex flex-col border-b divide-y"
+      class="divide-dividerLight divide-y border-b border-dividerLight flex flex-col top-0 z-10 sticky"
       :class="{ 'bg-primary': !savingMode }"
     >
       <input
@@ -13,9 +13,9 @@
         type="search"
         autocomplete="off"
         :placeholder="$t('action.search')"
-        class="flex w-full px-4 py-2 bg-transparent"
+        class="bg-transparent flex w-full py-2 px-4"
       />
-      <div class="flex justify-between flex-1">
+      <div class="flex flex-1 justify-between">
         <ButtonSecondary
           svg="plus"
           :label="$t('action.new')"
@@ -62,15 +62,15 @@
     </div>
     <div
       v-if="collections.length === 0"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <img
         :src="`/images/states/${$colorMode.value}/pack.svg`"
         loading="lazy"
-        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
         :alt="$t('empty.collections')"
       />
-      <span class="pb-4 text-center">
+      <span class="text-center pb-4">
         {{ $t("empty.collections") }}
       </span>
       <ButtonSecondary
@@ -81,9 +81,9 @@
     </div>
     <div
       v-if="!(filteredCollections.length !== 0 || collections.length === 0)"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
-      <i class="material-icons pb-2 opacity-75">manage_search</i>
+      <i class="opacity-75 pb-2 material-icons">manage_search</i>
       <span class="text-center">
         {{ $t("state.nothing_found") }} "{{ filterText }}"
       </span>
diff --git a/packages/hoppscotch-app/components/collections/index.vue b/packages/hoppscotch-app/components/collections/index.vue
index 0a19002f4..93d087f5b 100644
--- a/packages/hoppscotch-app/components/collections/index.vue
+++ b/packages/hoppscotch-app/components/collections/index.vue
@@ -4,7 +4,7 @@
     :class="{ 'rounded border border-divider': saveRequest }"
   >
     <div
-      class="divide-dividerLight bg-primary border-dividerLight sticky top-0 z-10 flex flex-col border-b divide-y rounded-t"
+      class="divide-dividerLight divide-y bg-primary border-b border-dividerLight rounded-t flex flex-col top-0 z-10 sticky"
     >
       <div v-if="!saveRequest" class="search-wrappe">
         <input
@@ -12,7 +12,7 @@
           type="search"
           autocomplete="off"
           :placeholder="$t('action.search')"
-          class="flex w-full py-2 pl-4 pr-2 bg-transparent"
+          class="bg-transparent flex w-full py-2 pr-2 pl-4"
         />
       </div>
       <CollectionsChooseType
@@ -22,7 +22,7 @@
         @update-collection-type="updateCollectionType"
         @update-selected-team="updateSelectedTeam"
       />
-      <div class="flex justify-between flex-1">
+      <div class="flex flex-1 justify-between">
         <ButtonSecondary
           v-if="
             collectionsType.type == 'team-collections' &&
@@ -98,15 +98,15 @@
     </div>
     <div
       v-if="filteredCollections.length === 0 && filterText.length === 0"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <img
         :src="`/images/states/${$colorMode.value}/pack.svg`"
         loading="lazy"
-        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
         :alt="$t('empty.collections')"
       />
-      <span class="pb-4 text-center">
+      <span class="text-center pb-4">
         {{ $t("empty.collections") }}
       </span>
       <ButtonSecondary
@@ -131,9 +131,9 @@
     </div>
     <div
       v-if="filterText.length !== 0 && filteredCollections.length === 0"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
-      <i class="material-icons pb-2 opacity-75">manage_search</i>
+      <i class="opacity-75 pb-2 material-icons">manage_search</i>
       <span class="text-center">
         {{ $t("state.nothing_found") }} "{{ filterText }}"
       </span>
diff --git a/packages/hoppscotch-app/components/collections/my/Collection.vue b/packages/hoppscotch-app/components/collections/my/Collection.vue
index 49261050d..74fe8078b 100644
--- a/packages/hoppscotch-app/components/collections/my/Collection.vue
+++ b/packages/hoppscotch-app/components/collections/my/Collection.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col" :class="[{ 'bg-primaryLight': dragging }]">
     <div
-      class="group flex items-center"
+      class="flex items-center group"
       @dragover.prevent
       @drop.prevent="dropEvent"
       @dragover="dragging = true"
@@ -10,7 +10,7 @@
       @dragend="dragging = false"
     >
       <span
-        class="flex items-center justify-center px-4 cursor-pointer"
+        class="cursor-pointer flex px-4 items-center justify-center"
         @click="toggleShowChildren()"
       >
         <SmartIcon
@@ -20,7 +20,7 @@
         />
       </span>
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
         @click="toggleShowChildren()"
       >
         <span class="truncate"> {{ collection.name }} </span>
@@ -47,7 +47,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
           :title="$t('folder.new')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="
             $emit('add-folder', {
               folder: collection,
@@ -110,7 +110,7 @@
     </div>
     <div v-if="showChildren || isFiltered" class="flex">
       <div
-        class="flex w-1 transform transition cursor-nsResize ml-5.5 bg-dividerLight hover:scale-x-125 hover:bg-dividerDark"
+        class="bg-dividerLight cursor-nsResize flex ml-5.5 transform transition w-1 hover:bg-dividerDark hover:scale-x-125"
         @click="toggleShowChildren()"
       ></div>
       <div class="flex flex-col flex-1 truncate">
@@ -158,12 +158,12 @@
             (collection.requests == undefined ||
               collection.requests.length === 0)
           "
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
           <img
             :src="`/images/states/${$colorMode.value}/pack.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+            class="flex-col object-contain object-center h-16 mb-4 w-16 inline-flex"
             :alt="$t('empty.collection')"
           />
           <span class="text-center">
diff --git a/packages/hoppscotch-app/components/collections/my/Folder.vue b/packages/hoppscotch-app/components/collections/my/Folder.vue
index 3d0ce7e6d..9cd319845 100644
--- a/packages/hoppscotch-app/components/collections/my/Folder.vue
+++ b/packages/hoppscotch-app/components/collections/my/Folder.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col" :class="[{ 'bg-primaryLight': dragging }]">
     <div
-      class="group flex items-center"
+      class="flex items-center group"
       @dragover.prevent
       @drop.prevent="dropEvent"
       @dragover="dragging = true"
@@ -10,7 +10,7 @@
       @dragend="dragging = false"
     >
       <span
-        class="flex items-center justify-center px-4 cursor-pointer"
+        class="cursor-pointer flex px-4 items-center justify-center"
         @click="toggleShowChildren()"
       >
         <SmartIcon
@@ -20,7 +20,7 @@
         />
       </span>
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
         @click="toggleShowChildren()"
       >
         <span class="truncate">
@@ -32,7 +32,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
           :title="$t('folder.new')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="$emit('add-folder', { folder, path: folderPath })"
         />
         <span>
@@ -92,7 +92,7 @@
     </div>
     <div v-if="showChildren || isFiltered" class="flex">
       <div
-        class="flex w-1 transform transition cursor-nsResize ml-5.5 bg-dividerLight hover:scale-x-125 hover:bg-dividerDark"
+        class="bg-dividerLight cursor-nsResize flex ml-5.5 transform transition w-1 hover:bg-dividerDark hover:scale-x-125"
         @click="toggleShowChildren()"
       ></div>
       <div class="flex flex-col flex-1 truncate">
@@ -140,12 +140,12 @@
             folder.requests &&
             folder.requests.length === 0
           "
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
           <img
             :src="`/images/states/${$colorMode.value}/pack.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+            class="flex-col object-contain object-center h-16 mb-4 w-16 inline-flex"
             :alt="$t('empty.folder')"
           />
           <span class="text-center">
diff --git a/packages/hoppscotch-app/components/collections/my/Request.vue b/packages/hoppscotch-app/components/collections/my/Request.vue
index dd1e5b372..b4ba0a453 100644
--- a/packages/hoppscotch-app/components/collections/my/Request.vue
+++ b/packages/hoppscotch-app/components/collections/my/Request.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col" :class="[{ 'bg-primaryLight': dragging }]">
     <div
-      class="group flex items-center"
+      class="flex items-center group"
       draggable="true"
       @dragstart="dragStart"
       @dragover.stop
@@ -9,7 +9,7 @@
       @dragend="dragging = false"
     >
       <span
-        class="flex items-center justify-center w-16 px-2 truncate cursor-pointer"
+        class="cursor-pointer flex px-2 w-16 items-center justify-center truncate"
         :class="getRequestLabelColor(request.method)"
         @click="!doc ? selectRequest() : {}"
       >
@@ -24,7 +24,7 @@
         </span>
       </span>
       <span
-        class="group-hover:text-secondaryDark flex items-center flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition items-center group-hover:text-secondaryDark"
         @click="!doc ? selectRequest() : {}"
       >
         <span class="truncate"> {{ request.name }} </span>
@@ -44,7 +44,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="rotate-ccw"
           :title="$t('action.restore')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="!doc ? selectRequest() : {}"
         />
         <span>
diff --git a/packages/hoppscotch-app/components/collections/teams/Collection.vue b/packages/hoppscotch-app/components/collections/teams/Collection.vue
index a39de2411..6dd853753 100644
--- a/packages/hoppscotch-app/components/collections/teams/Collection.vue
+++ b/packages/hoppscotch-app/components/collections/teams/Collection.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="flex flex-col">
-    <div class="group flex items-center">
+    <div class="flex items-center group">
       <span
-        class="flex items-center justify-center px-4 cursor-pointer"
+        class="cursor-pointer flex px-4 items-center justify-center"
         @click="toggleShowChildren()"
       >
         <SmartIcon
@@ -12,7 +12,7 @@
         />
       </span>
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
         @click="toggleShowChildren()"
       >
         <span class="truncate"> {{ collection.title }} </span>
@@ -39,7 +39,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
           :title="$t('folder.new')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="
             $emit('add-folder', {
               folder: collection,
@@ -106,7 +106,7 @@
     </div>
     <div v-if="showChildren || isFiltered" class="flex">
       <div
-        class="flex w-1 transform transition cursor-nsResize ml-5.5 bg-dividerLight hover:scale-x-125 hover:bg-dividerDark"
+        class="bg-dividerLight cursor-nsResize flex ml-5.5 transform transition w-1 hover:bg-dividerDark hover:scale-x-125"
         @click="toggleShowChildren()"
       ></div>
       <div class="flex flex-col flex-1 truncate">
@@ -152,12 +152,12 @@
             (collection.requests == undefined ||
               collection.requests.length === 0)
           "
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
           <img
             :src="`/images/states/${$colorMode.value}/pack.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+            class="flex-col object-contain object-center h-16 mb-4 w-16 inline-flex"
             :alt="$t('empty.collection')"
           />
           <span class="text-center">
diff --git a/packages/hoppscotch-app/components/collections/teams/Folder.vue b/packages/hoppscotch-app/components/collections/teams/Folder.vue
index 1a9185620..2dd67644c 100644
--- a/packages/hoppscotch-app/components/collections/teams/Folder.vue
+++ b/packages/hoppscotch-app/components/collections/teams/Folder.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="flex flex-col">
-    <div class="group flex items-center">
+    <div class="flex items-center group">
       <span
-        class="flex items-center justify-center px-4 cursor-pointer"
+        class="cursor-pointer flex px-4 items-center justify-center"
         @click="toggleShowChildren()"
       >
         <SmartIcon
@@ -12,7 +12,7 @@
         />
       </span>
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
         @click="toggleShowChildren()"
       >
         <span class="truncate">
@@ -25,7 +25,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
           :title="$t('folder.new')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="$emit('add-folder', { folder, path: folderPath })"
         />
         <span>
@@ -89,7 +89,7 @@
     </div>
     <div v-if="showChildren || isFiltered" class="flex">
       <div
-        class="flex w-1 transform transition cursor-nsResize ml-5.5 bg-dividerLight hover:scale-x-125 hover:bg-dividerDark"
+        class="bg-dividerLight cursor-nsResize flex ml-5.5 transform transition w-1 hover:bg-dividerDark hover:scale-x-125"
         @click="toggleShowChildren()"
       ></div>
       <div class="flex flex-col flex-1 truncate">
@@ -133,12 +133,12 @@
             (folder.children == undefined || folder.children.length === 0) &&
             (folder.requests == undefined || folder.requests.length === 0)
           "
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
           <img
             :src="`/images/states/${$colorMode.value}/pack.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+            class="flex-col object-contain object-center h-16 mb-4 w-16 inline-flex"
             :alt="$t('empty.folder')"
           />
           <span class="text-center">
diff --git a/packages/hoppscotch-app/components/collections/teams/Request.vue b/packages/hoppscotch-app/components/collections/teams/Request.vue
index e27c28a8d..4505e89c7 100644
--- a/packages/hoppscotch-app/components/collections/teams/Request.vue
+++ b/packages/hoppscotch-app/components/collections/teams/Request.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="flex flex-col">
-    <div class="group flex items-center">
+    <div class="flex items-center group">
       <span
-        class="flex items-center justify-center w-16 px-2 truncate cursor-pointer"
+        class="cursor-pointer flex px-2 w-16 items-center justify-center truncate"
         :class="getRequestLabelColor(request.method)"
         @click="!doc ? selectRequest() : {}"
       >
@@ -17,7 +17,7 @@
         </span>
       </span>
       <span
-        class="group-hover:text-secondaryDark flex items-center flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition items-center group-hover:text-secondaryDark"
         @click="!doc ? selectRequest() : {}"
       >
         <span class="truncate"> {{ request.name }} </span>
@@ -36,7 +36,7 @@
           v-tippy="{ theme: 'tooltip' }"
           svg="rotate-ccw"
           :title="$t('action.restore')"
-          class="group-hover:inline-flex hidden"
+          class="hidden group-hover:inline-flex"
           @click.native="!doc ? selectRequest() : {}"
         />
         <span>
diff --git a/packages/hoppscotch-app/components/environments/Edit.vue b/packages/hoppscotch-app/components/environments/Edit.vue
index 2b282b398..09805198f 100644
--- a/packages/hoppscotch-app/components/environments/Edit.vue
+++ b/packages/hoppscotch-app/components/environments/Edit.vue
@@ -6,7 +6,7 @@
   >
     <template #body>
       <div class="flex flex-col px-2">
-        <div class="relative flex">
+        <div class="flex relative">
           <input
             id="selectLabelEnvEdit"
             v-model="name"
@@ -22,7 +22,7 @@
             {{ $t("action.label") }}
           </label>
         </div>
-        <div class="flex items-center justify-between flex-1">
+        <div class="flex flex-1 items-center justify-between">
           <label for="variableList" class="p-4">
             {{ $t("environment.variable_list") }}
           </label>
@@ -43,21 +43,21 @@
             />
           </div>
         </div>
-        <div class="divide-dividerLight border-divider border divide-y rounded">
+        <div class="divide-dividerLight divide-y border border-divider rounded">
           <div
             v-for="(variable, index) in vars"
             :key="`variable-${index}`"
-            class="divide-dividerLight flex divide-x"
+            class="divide-dividerLight divide-x flex"
           >
             <input
               v-model="variable.key"
-              class="flex flex-1 px-4 py-2 bg-transparent"
+              class="bg-transparent flex flex-1 py-2 px-4"
               :placeholder="`${$t('count.variable', { count: index + 1 })}`"
               :name="'param' + index"
             />
             <input
               v-model="variable.value"
-              class="flex flex-1 px-4 py-2 bg-transparent"
+              class="bg-transparent flex flex-1 py-2 px-4"
               :placeholder="`${$t('count.value', { count: index + 1 })}`"
               :name="'value' + index"
             />
@@ -74,15 +74,15 @@
           </div>
           <div
             v-if="vars.length === 0"
-            class="text-secondaryLight flex flex-col items-center justify-center p-4"
+            class="flex flex-col text-secondaryLight p-4 items-center justify-center"
           >
             <img
               :src="`/images/states/${$colorMode.value}/blockchain.svg`"
               loading="lazy"
-              class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+              class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
               :alt="$t('empty.environments')"
             />
-            <span class="pb-4 text-center">
+            <span class="text-center pb-4">
               {{ $t("empty.environments") }}
             </span>
             <ButtonSecondary
diff --git a/packages/hoppscotch-app/components/environments/Environment.vue b/packages/hoppscotch-app/components/environments/Environment.vue
index e88b36a8c..2642bf514 100644
--- a/packages/hoppscotch-app/components/environments/Environment.vue
+++ b/packages/hoppscotch-app/components/environments/Environment.vue
@@ -1,13 +1,13 @@
 <template>
-  <div class="group flex items-center">
+  <div class="flex items-center group">
     <span
-      class="flex items-center justify-center px-4 cursor-pointer"
+      class="cursor-pointer flex px-4 items-center justify-center"
       @click="$emit('edit-environment')"
     >
       <SmartIcon class="svg-icons" name="layers" />
     </span>
     <span
-      class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+      class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
       @click="$emit('edit-environment')"
     >
       <span class="truncate">
diff --git a/packages/hoppscotch-app/components/environments/index.vue b/packages/hoppscotch-app/components/environments/index.vue
index 59d9c8218..2b1ef3cfc 100644
--- a/packages/hoppscotch-app/components/environments/index.vue
+++ b/packages/hoppscotch-app/components/environments/index.vue
@@ -1,22 +1,22 @@
 <template>
   <AppSection :label="`${$t('environment.title')}`">
-    <div class="bg-primary sticky top-0 z-10 flex flex-col rounded-t">
+    <div class="bg-primary rounded-t flex flex-col top-0 z-10 sticky">
       <tippy ref="options" interactive trigger="click" theme="popover" arrow>
         <template #trigger>
           <span
             v-tippy="{ theme: 'tooltip' }"
             :title="`${$t('environment.select')}`"
-            class="border-dividerLight select-wrapper flex-1 bg-transparent border-b"
+            class="bg-transparent border-b border-dividerLight flex-1 select-wrapper"
           >
             <ButtonSecondary
               v-if="selectedEnvironmentIndex !== -1"
               :label="environments[selectedEnvironmentIndex].name"
-              class="flex-1 pr-8 rounded-none"
+              class="rounded-none flex-1 pr-8"
             />
             <ButtonSecondary
               v-else
               :label="`${$t('environment.no_environment')}`"
-              class="flex-1 pr-8 rounded-none"
+              class="rounded-none flex-1 pr-8"
             />
           </span>
         </template>
@@ -45,7 +45,7 @@
           "
         />
       </tippy>
-      <div class="border-dividerLight flex justify-between flex-1 border-b">
+      <div class="border-b border-dividerLight flex flex-1 justify-between">
         <ButtonSecondary
           svg="plus"
           :label="`${$t('action.new')}`"
@@ -86,7 +86,7 @@
       <EnvironmentsEnvironment
         environment-index="Global"
         :environment="globalEnvironment"
-        class="border-dividerLight border-b border-dashed"
+        class="border-b border-dashed border-dividerLight"
         @edit-environment="editEnvironment('Global')"
       />
       <EnvironmentsEnvironment
@@ -99,15 +99,15 @@
     </div>
     <div
       v-if="environments.length === 0"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <img
         :src="`/images/states/${$colorMode.value}/blockchain.svg`"
         loading="lazy"
-        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
         :alt="$t('empty.environments')"
       />
-      <span class="pb-4 text-center">
+      <span class="text-center pb-4">
         {{ $t("empty.environments") }}
       </span>
       <ButtonSecondary
diff --git a/packages/hoppscotch-app/components/firebase/Login.vue b/packages/hoppscotch-app/components/firebase/Login.vue
index 8f931bad7..3d26cf4dd 100644
--- a/packages/hoppscotch-app/components/firebase/Login.vue
+++ b/packages/hoppscotch-app/components/firebase/Login.vue
@@ -7,7 +7,7 @@
     @close="hideModal"
   >
     <template #body>
-      <div v-if="mode === 'sign-in'" class="flex flex-col px-2 space-y-2">
+      <div v-if="mode === 'sign-in'" class="flex flex-col space-y-2 px-2">
         <SmartItem
           :loading="signingInWithGitHub"
           svg="auth/github"
@@ -56,8 +56,8 @@
         />
       </form>
       <div v-if="mode === 'email-sent'" class="flex flex-col px-4">
-        <div class="flex flex-col items-center justify-center max-w-md">
-          <SmartIcon class="text-accent w-6 h-6" name="inbox" />
+        <div class="flex flex-col max-w-md items-center justify-center">
+          <SmartIcon class="h-6 text-accent w-6" name="inbox" />
           <h3 class="my-2 text-lg text-center">
             {{ $t("auth.we_sent_magic_link") }}
           </h3>
@@ -95,7 +95,7 @@
       </p>
       <p
         v-if="mode === 'email-sent'"
-        class="text-secondaryLight flex justify-between flex-1"
+        class="flex flex-1 text-secondaryLight justify-between"
       >
         <SmartAnchor
           class="link"
diff --git a/packages/hoppscotch-app/components/graphql/Field.vue b/packages/hoppscotch-app/components/graphql/Field.vue
index 29da35924..39dc7105f 100644
--- a/packages/hoppscotch-app/components/graphql/Field.vue
+++ b/packages/hoppscotch-app/components/graphql/Field.vue
@@ -21,19 +21,19 @@
     </div>
     <div
       v-if="gqlField.description"
-      class="text-secondaryLight field-desc py-2"
+      class="text-secondaryLight py-2 field-desc"
     >
       {{ gqlField.description }}
     </div>
     <div
       v-if="gqlField.isDeprecated"
-      class="field-deprecated inline-block px-2 py-1 my-1 text-black bg-yellow-200 rounded"
+      class="rounded bg-yellow-200 my-1 text-black py-1 px-2 inline-block field-deprecated"
     >
       {{ $t("state.deprecated") }}
     </div>
     <div v-if="fieldArgs.length > 0">
       <h5 class="my-2">Arguments:</h5>
-      <div class="border-divider pl-4 border-l-2">
+      <div class="border-divider border-l-2 pl-4">
         <div v-for="(field, index) in fieldArgs" :key="`field-${index}`">
           <span>
             {{ field.name }}:
@@ -44,7 +44,7 @@
           </span>
           <div
             v-if="field.description"
-            class="text-secondaryLight field-desc py-2"
+            class="text-secondaryLight py-2 field-desc"
           >
             {{ field.description }}
           </div>
@@ -77,7 +77,7 @@ export default defineComponent({
 
 <style scoped lang="scss">
 .field-highlighted {
-  @apply border-b-2 border-accent;
+  @apply border-accent border-b-2;
 }
 
 .field-title {
diff --git a/packages/hoppscotch-app/components/graphql/Request.vue b/packages/hoppscotch-app/components/graphql/Request.vue
index 5b5b6d0b5..816d01d61 100644
--- a/packages/hoppscotch-app/components/graphql/Request.vue
+++ b/packages/hoppscotch-app/components/graphql/Request.vue
@@ -1,13 +1,13 @@
 <template>
-  <div class="bg-primary sticky top-0 z-10 flex p-4">
-    <div class="inline-flex flex-1 space-x-2">
+  <div class="bg-primary flex p-4 top-0 z-10 sticky">
+    <div class="space-x-2 flex-1 inline-flex">
       <input
         id="url"
         v-model="url"
         type="url"
         autocomplete="off"
         spellcheck="false"
-        class="bg-primaryLight border-divider text-secondaryDark hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark w-full px-4 py-2 border rounded"
+        class="bg-primaryLight border border-divider rounded text-secondaryDark w-full py-2 px-4 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
         :placeholder="`${t('request.url')}`"
         :disabled="connected"
         @keyup.enter="onConnectClick"
diff --git a/packages/hoppscotch-app/components/graphql/RequestOptions.vue b/packages/hoppscotch-app/components/graphql/RequestOptions.vue
index 15e5324ad..e28251ef1 100644
--- a/packages/hoppscotch-app/components/graphql/RequestOptions.vue
+++ b/packages/hoppscotch-app/components/graphql/RequestOptions.vue
@@ -19,9 +19,9 @@
       <SmartTab :id="'query'" :label="`${t('tab.query')}`" :selected="true">
         <AppSection label="query">
           <div
-            class="bg-primary border-dividerLight top-upperSecondaryStickyFold gqlRunQuery sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+            class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between gqlRunQuery"
           >
-            <label class="text-secondaryLight font-semibold">
+            <label class="font-semibold text-secondaryLight">
               {{ t("request.query") }}
             </label>
             <div class="flex">
@@ -53,9 +53,9 @@
       <SmartTab :id="'variables'" :label="`${t('tab.variables')}`">
         <AppSection label="variables">
           <div
-            class="bg-primary border-dividerLight top-upperSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+            class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
           >
-            <label class="text-secondaryLight font-semibold">
+            <label class="font-semibold text-secondaryLight">
               {{ t("request.variables") }}
             </label>
             <div class="flex">
@@ -81,9 +81,9 @@
       <SmartTab :id="'headers'" :label="`${t('tab.headers')}`">
         <AppSection label="headers">
           <div
-            class="bg-primary border-dividerLight top-upperSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+            class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
           >
-            <label class="text-secondaryLight font-semibold">
+            <label class="font-semibold text-secondaryLight">
               {{ t("tab.headers") }}
             </label>
             <div class="flex">
@@ -121,7 +121,7 @@
             <div
               v-for="(header, index) in headers"
               :key="`header-${String(index)}`"
-              class="divide-dividerLight border-dividerLight flex border-b divide-x"
+              class="divide-dividerLight divide-x border-b border-dividerLight flex"
             >
               <SmartAutoComplete
                 :placeholder="`${t('count.header', { count: index + 1 })}`"
@@ -137,7 +137,7 @@
                   px-4
                   truncate
                 "
-                class="!flex flex-1"
+                class="flex-1 !flex"
                 @input="
                   updateRequestHeader(index, {
                     key: $event,
@@ -147,7 +147,7 @@
                 "
               />
               <input
-                class="flex flex-1 px-4 py-2 bg-transparent"
+                class="bg-transparent flex flex-1 py-2 px-4"
                 :placeholder="`${t('count.value', { count: index + 1 })}`"
                 :name="`value ${String(index)}`"
                 :value="header.value"
@@ -199,15 +199,15 @@
             </div>
             <div
               v-if="headers.length === 0"
-              class="text-secondaryLight flex flex-col items-center justify-center p-4"
+              class="flex flex-col text-secondaryLight p-4 items-center justify-center"
             >
               <img
                 :src="`/images/states/${$colorMode.value}/add_category.svg`"
                 loading="lazy"
-                class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+                class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
                 :alt="`${t('empty.headers')}`"
               />
-              <span class="pb-4 text-center">
+              <span class="text-center pb-4">
                 {{ t("empty.headers") }}
               </span>
               <ButtonSecondary
diff --git a/packages/hoppscotch-app/components/graphql/Response.vue b/packages/hoppscotch-app/components/graphql/Response.vue
index 7e942b81b..014b99e0f 100644
--- a/packages/hoppscotch-app/components/graphql/Response.vue
+++ b/packages/hoppscotch-app/components/graphql/Response.vue
@@ -2,16 +2,16 @@
   <AppSection ref="response" label="response">
     <div
       v-if="responseString === 'loading'"
-      class="flex flex-col items-center justify-center p-4"
+      class="flex flex-col p-4 items-center justify-center"
     >
       <SmartSpinner class="my-4" />
       <span class="text-secondaryLight">{{ t("state.loading") }}</span>
     </div>
     <div v-else-if="responseString">
       <div
-        class="bg-primary border-dividerLight sticky top-0 z-10 flex items-center justify-between flex-1 pl-4 border-b"
+        class="bg-primary border-b border-dividerLight flex flex-1 pl-4 top-0 z-10 sticky items-center justify-between"
       >
-        <label class="text-secondaryLight font-semibold">
+        <label class="font-semibold text-secondaryLight">
           {{ t("response.title") }}
         </label>
         <div class="flex">
@@ -42,14 +42,14 @@
     </div>
     <div
       v-else
-      class="text-secondaryLight flex flex-col items-center justify-center flex-1 p-4"
+      class="flex flex-col flex-1 text-secondaryLight p-4 items-center justify-center"
     >
-      <div class="flex pb-4 my-4 space-x-2">
-        <div class="flex flex-col items-end space-y-4 text-right">
-          <span class="flex items-center flex-1">
+      <div class="flex space-x-2 my-4 pb-4">
+        <div class="flex flex-col space-y-4 text-right items-end">
+          <span class="flex flex-1 items-center">
             {{ t("shortcut.general.command_menu") }}
           </span>
-          <span class="flex items-center flex-1">
+          <span class="flex flex-1 items-center">
             {{ t("shortcut.general.help_menu") }}
           </span>
         </div>
diff --git a/packages/hoppscotch-app/components/graphql/Sidebar.vue b/packages/hoppscotch-app/components/graphql/Sidebar.vue
index 1f663e8d3..2f3bcc61b 100644
--- a/packages/hoppscotch-app/components/graphql/Sidebar.vue
+++ b/packages/hoppscotch-app/components/graphql/Sidebar.vue
@@ -34,26 +34,26 @@
             subscriptionFields.length === 0 &&
             graphqlTypes.length === 0
           "
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
           <img
             :src="`/images/states/${$colorMode.value}/add_comment.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+            class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
             :alt="`${t('empty.documentation')}`"
           />
-          <span class="mb-4 text-center">
+          <span class="text-center mb-4">
             {{ t("empty.documentation") }}
           </span>
         </div>
         <div v-else>
-          <div class="bg-primary sticky top-0 z-10 flex">
+          <div class="bg-primary flex top-0 z-10 sticky">
             <input
               v-model="graphqlFieldsFilterText"
               type="search"
               autocomplete="off"
               :placeholder="`${t('action.search')}`"
-              class="flex w-full p-4 py-2 bg-transparent"
+              class="bg-transparent flex w-full p-4 py-2"
             />
             <div class="flex">
               <ButtonSecondary
@@ -140,9 +140,9 @@
       <AppSection ref="schema" label="schema">
         <div
           v-if="schemaString"
-          class="bg-primary border-dividerLight sticky top-0 z-10 flex items-center justify-between flex-1 pl-4 border-b"
+          class="bg-primary border-b border-dividerLight flex flex-1 pl-4 top-0 z-10 sticky items-center justify-between"
         >
-          <label class="text-secondaryLight font-semibold">
+          <label class="font-semibold text-secondaryLight">
             {{ t("graphql.schema") }}
           </label>
           <div class="flex">
@@ -179,15 +179,15 @@
         <div v-if="schemaString" ref="schemaEditor"></div>
         <div
           v-else
-          class="text-secondaryLight flex flex-col items-center justify-center p-4"
+          class="flex flex-col text-secondaryLight p-4 items-center justify-center"
         >
           <img
             :src="`/images/states/${$colorMode.value}/blockchain.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+            class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
             :alt="`${t('empty.schema')}`"
           />
-          <span class="mb-4 text-center">
+          <span class="text-center mb-4">
             {{ t("empty.schema") }}
           </span>
         </div>
diff --git a/packages/hoppscotch-app/components/graphql/Type.vue b/packages/hoppscotch-app/components/graphql/Type.vue
index cd74fc83d..910d39752 100644
--- a/packages/hoppscotch-app/components/graphql/Type.vue
+++ b/packages/hoppscotch-app/components/graphql/Type.vue
@@ -6,7 +6,7 @@
       <span v-else-if="isEnum" class="text-accent">enum </span>
       {{ gqlType.name }}
     </div>
-    <div v-if="gqlType.description" class="py-2 text-secondaryLight type-desc">
+    <div v-if="gqlType.description" class="text-secondaryLight py-2 type-desc">
       {{ gqlType.description }}
     </div>
     <div v-if="interfaces.length > 0">
@@ -18,7 +18,7 @@
         <GraphqlTypeLink
           :gql-type="gqlInterface"
           :jump-type-callback="jumpTypeCallback"
-          class="pl-4 border-l-2 border-divider"
+          class="border-divider border-l-2 pl-4"
         />
       </div>
     </div>
@@ -29,7 +29,7 @@
         :key="`child-${index}`"
         :gql-type="child"
         :jump-type-callback="jumpTypeCallback"
-        class="pl-4 border-l-2 border-divider"
+        class="border-divider border-l-2 pl-4"
       />
     </div>
     <div v-if="gqlType.getFields">
@@ -37,7 +37,7 @@
       <GraphqlField
         v-for="(field, index) in gqlType.getFields()"
         :key="`field-${index}`"
-        class="pl-4 border-l-2 border-divider"
+        class="border-divider border-l-2 pl-4"
         :gql-field="field"
         :is-highlighted="isFieldHighlighted({ field })"
         :jump-type-callback="jumpTypeCallback"
@@ -48,7 +48,7 @@
       <div
         v-for="(value, index) in gqlType.getValues()"
         :key="`value-${index}`"
-        class="pl-4 border-l-2 border-divider"
+        class="border-divider border-l-2 pl-4"
         v-text="value.name"
       ></div>
     </div>
diff --git a/packages/hoppscotch-app/components/history/graphql/Card.vue b/packages/hoppscotch-app/components/history/graphql/Card.vue
index 79284223e..234ec41dd 100644
--- a/packages/hoppscotch-app/components/history/graphql/Card.vue
+++ b/packages/hoppscotch-app/components/history/graphql/Card.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="group flex flex-col">
+  <div class="flex flex-col group">
     <div class="flex items-center">
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pl-4 pr-2 transition cursor-pointer"
+        class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 pl-4 transition group-hover:text-secondaryDark"
         data-testid="restore_history_entry"
         @click="useEntry"
       >
@@ -15,7 +15,7 @@
         svg="trash"
         color="red"
         :title="$t('action.remove')"
-        class="group-hover:inline-flex hidden"
+        class="hidden group-hover:inline-flex"
         data-testid="delete_history_entry"
         @click.native="$emit('delete-entry')"
       />
@@ -23,7 +23,7 @@
         v-tippy="{ theme: 'tooltip' }"
         :title="expand ? $t('hide.more') : $t('show.more')"
         :svg="expand ? 'minimize-2' : 'maximize-2'"
-        class="group-hover:inline-flex hidden"
+        class="hidden group-hover:inline-flex"
         @click.native="expand = !expand"
       />
       <ButtonSecondary
@@ -40,7 +40,7 @@
       <span
         v-for="(line, index) in query"
         :key="`line-${index}`"
-        class="text-secondaryLight px-4 truncate whitespace-pre cursor-pointer"
+        class="cursor-pointer text-secondaryLight px-4 truncate whitespace-pre"
         data-testid="restore_history_entry"
         @click="useEntry"
         >{{ line }}</span
diff --git a/packages/hoppscotch-app/components/history/index.vue b/packages/hoppscotch-app/components/history/index.vue
index 2fe95e4cd..da64752e0 100644
--- a/packages/hoppscotch-app/components/history/index.vue
+++ b/packages/hoppscotch-app/components/history/index.vue
@@ -1,11 +1,11 @@
 <template>
   <AppSection label="history">
-    <div class="sticky top-0 z-10 flex border-b bg-primary border-dividerLight">
+    <div class="bg-primary border-b border-dividerLight flex top-0 z-10 sticky">
       <input
         v-model="filterText"
         type="search"
         autocomplete="off"
-        class="flex w-full p-4 py-2 bg-transparent"
+        class="bg-transparent flex w-full p-4 py-2"
         :placeholder="`${$t('action.search')}`"
       />
       <div class="flex">
@@ -49,24 +49,24 @@
     </div>
     <div
       v-if="!(filteredHistory.length !== 0 || history.length === 0)"
-      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
-      <i class="pb-2 opacity-75 material-icons">manage_search</i>
+      <i class="opacity-75 pb-2 material-icons">manage_search</i>
       <span class="text-center">
         {{ $t("state.nothing_found") }} "{{ filterText }}"
       </span>
     </div>
     <div
       v-if="history.length === 0"
-      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <img
         :src="`/images/states/${$colorMode.value}/history.svg`"
         loading="lazy"
-        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
         :alt="$t('empty.history')"
       />
-      <span class="mb-4 text-center">
+      <span class="text-center mb-4">
         {{ $t("empty.history") }}
       </span>
     </div>
diff --git a/packages/hoppscotch-app/components/history/rest/Card.vue b/packages/hoppscotch-app/components/history/rest/Card.vue
index b2dc1a5c3..901b32ba9 100644
--- a/packages/hoppscotch-app/components/history/rest/Card.vue
+++ b/packages/hoppscotch-app/components/history/rest/Card.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="group flex items-center">
+  <div class="flex items-center group">
     <span
-      class="flex items-center justify-center w-16 px-2 truncate cursor-pointer"
+      class="cursor-pointer flex px-2 w-16 items-center justify-center truncate"
       :class="entryStatus.className"
       data-testid="restore_history_entry"
       :title="`${duration}`"
@@ -10,7 +10,7 @@
       {{ entry.request.method }}
     </span>
     <span
-      class="group-hover:text-secondaryDark flex flex-1 min-w-0 py-2 pr-2 transition cursor-pointer"
+      class="cursor-pointer flex flex-1 min-w-0 py-2 pr-2 transition group-hover:text-secondaryDark"
       data-testid="restore_history_entry"
       :title="`${duration}`"
       @click="$emit('use-entry')"
@@ -24,7 +24,7 @@
       svg="trash"
       color="red"
       :title="$t('action.remove')"
-      class="group-hover:inline-flex hidden"
+      class="hidden group-hover:inline-flex"
       data-testid="delete_history_entry"
       @click.native="$emit('delete-entry')"
     />
diff --git a/packages/hoppscotch-app/components/http/Authorization.vue b/packages/hoppscotch-app/components/http/Authorization.vue
index 0009e3e5f..e5772c851 100644
--- a/packages/hoppscotch-app/components/http/Authorization.vue
+++ b/packages/hoppscotch-app/components/http/Authorization.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div
-      class="bg-primary border-dividerLight top-upperSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
       <span class="flex items-center">
-        <label class="text-secondaryLight font-semibold">
+        <label class="font-semibold text-secondaryLight">
           {{ $t("authorization.type") }}
         </label>
         <tippy
@@ -17,7 +17,7 @@
           <template #trigger>
             <span class="select-wrapper">
               <ButtonSecondary
-                class="pr-8 ml-2 rounded-none"
+                class="rounded-none ml-2 pr-8"
                 :label="authName"
               />
             </span>
@@ -83,15 +83,15 @@
     </div>
     <div
       v-if="authType === 'none'"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <img
         :src="`/images/states/${$colorMode.value}/login.svg`"
         loading="lazy"
-        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
         :alt="$t('empty.authorization')"
       />
-      <span class="pb-4 text-center">
+      <span class="text-center pb-4">
         {{ $t("empty.authorization") }}
       </span>
       <ButtonSecondary
@@ -104,16 +104,16 @@
         class="mb-4"
       />
     </div>
-    <div v-if="authType === 'basic'" class="border-dividerLight flex border-b">
-      <div class="border-dividerLight w-2/3 border-r">
-        <div class="border-dividerLight flex border-b">
+    <div v-if="authType === 'basic'" class="border-b border-dividerLight flex">
+      <div class="border-r border-dividerLight w-2/3">
+        <div class="border-b border-dividerLight flex">
           <SmartEnvInput
             v-model="basicUsername"
             :placeholder="$t('authorization.username')"
             styles="bg-transparent flex flex-1 py-1 px-4"
           />
         </div>
-        <div class="border-dividerLight flex border-b">
+        <div class="border-b border-dividerLight flex">
           <SmartEnvInput
             v-model="basicPassword"
             :placeholder="$t('authorization.password')"
@@ -122,7 +122,7 @@
         </div>
       </div>
       <div
-        class="bg-primary top-upperTertiaryStickyFold min-w-46 max-w-1/3 z-9 sticky h-full p-4 overflow-auto"
+        class="bg-primary h-full top-upperTertiaryStickyFold min-w-46 max-w-1/3 p-4 z-9 sticky overflow-auto"
       >
         <div class="p-2">
           <div class="text-secondaryLight pb-2">
@@ -137,9 +137,9 @@
         </div>
       </div>
     </div>
-    <div v-if="authType === 'bearer'" class="border-dividerLight flex border-b">
-      <div class="border-dividerLight w-2/3 border-r">
-        <div class="border-dividerLight flex border-b">
+    <div v-if="authType === 'bearer'" class="border-b border-dividerLight flex">
+      <div class="border-r border-dividerLight w-2/3">
+        <div class="border-b border-dividerLight flex">
           <SmartEnvInput
             v-model="bearerToken"
             placeholder="Token"
@@ -148,7 +148,7 @@
         </div>
       </div>
       <div
-        class="bg-primary top-upperTertiaryStickyFold min-w-46 max-w-1/3 z-9 sticky h-full p-4 overflow-auto"
+        class="bg-primary h-full top-upperTertiaryStickyFold min-w-46 max-w-1/3 p-4 z-9 sticky overflow-auto"
       >
         <div class="p-2">
           <div class="text-secondaryLight pb-2">
@@ -165,10 +165,10 @@
     </div>
     <div
       v-if="authType === 'oauth-2'"
-      class="border-dividerLight flex border-b"
+      class="border-b border-dividerLight flex"
     >
-      <div class="border-dividerLight w-2/3 border-r">
-        <div class="border-dividerLight flex border-b">
+      <div class="border-r border-dividerLight w-2/3">
+        <div class="border-b border-dividerLight flex">
           <SmartEnvInput
             v-model="oauth2Token"
             placeholder="Token"
@@ -178,7 +178,7 @@
         <HttpOAuth2Authorization />
       </div>
       <div
-        class="bg-primary top-upperTertiaryStickyFold min-w-46 max-w-1/3 z-9 sticky h-full p-4 overflow-auto"
+        class="bg-primary h-full top-upperTertiaryStickyFold min-w-46 max-w-1/3 p-4 z-9 sticky overflow-auto"
       >
         <div class="p-2">
           <div class="text-secondaryLight pb-2">
diff --git a/packages/hoppscotch-app/components/http/Body.vue b/packages/hoppscotch-app/components/http/Body.vue
index 19791e84a..cfa80ab4a 100644
--- a/packages/hoppscotch-app/components/http/Body.vue
+++ b/packages/hoppscotch-app/components/http/Body.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div
-      class="bg-primary border-dividerLight top-upperSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
       <span class="flex items-center">
-        <label class="text-secondaryLight font-semibold">
+        <label class="font-semibold text-secondaryLight">
           {{ $t("request.content_type") }}
         </label>
         <tippy
@@ -18,7 +18,7 @@
             <span class="select-wrapper">
               <ButtonSecondary
                 :label="contentType || $t('state.none').toLowerCase()"
-                class="pr-8 ml-2 rounded-none"
+                class="rounded-none ml-2 pr-8"
               />
             </span>
           </template>
@@ -53,15 +53,15 @@
     <HttpRawBody v-else-if="contentType !== null" :content-type="contentType" />
     <div
       v-if="contentType == null"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <img
         :src="`/images/states/${$colorMode.value}/upload_single_file.svg`"
         loading="lazy"
-        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
         :alt="$t('empty.body')"
       />
-      <span class="pb-4 text-center">
+      <span class="text-center pb-4">
         {{ $t("empty.body") }}
       </span>
       <ButtonSecondary
diff --git a/packages/hoppscotch-app/components/http/BodyParameters.vue b/packages/hoppscotch-app/components/http/BodyParameters.vue
index da99b601e..1297e2211 100644
--- a/packages/hoppscotch-app/components/http/BodyParameters.vue
+++ b/packages/hoppscotch-app/components/http/BodyParameters.vue
@@ -1,9 +1,9 @@
 <template>
   <AppSection label="bodyParameters">
     <div
-      class="bg-primary border-dividerLight top-upperTertiaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-upperTertiaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ $t("request.body") }}
       </label>
       <div class="flex">
@@ -31,7 +31,7 @@
     <div
       v-for="(param, index) in bodyParams"
       :key="`param-${index}`"
-      class="divide-dividerLight border-dividerLight flex border-b divide-x"
+      class="divide-dividerLight divide-x border-b border-dividerLight flex"
     >
       <SmartEnvInput
         v-model="param.key"
@@ -53,7 +53,7 @@
         "
       />
       <div v-if="param.isFile" class="file-chips-container hide-scrollbar">
-        <div class="file-chips-wrapper space-x-2">
+        <div class="space-x-2 file-chips-wrapper">
           <SmartDeletableChip
             v-for="(file, fileIndex) in param.value"
             :key="`param-${index}-file-${fileIndex}`"
@@ -141,15 +141,15 @@
     </div>
     <div
       v-if="bodyParams.length === 0"
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <img
         :src="`/images/states/${$colorMode.value}/upload_single_file.svg`"
         loading="lazy"
-        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
         :alt="$t('empty.body')"
       />
-      <span class="pb-4 text-center">
+      <span class="text-center pb-4">
         {{ $t("empty.body") }}
       </span>
       <ButtonSecondary
diff --git a/packages/hoppscotch-app/components/http/CodegenModal.vue b/packages/hoppscotch-app/components/http/CodegenModal.vue
index d9f3044c3..6b5171a6b 100644
--- a/packages/hoppscotch-app/components/http/CodegenModal.vue
+++ b/packages/hoppscotch-app/components/http/CodegenModal.vue
@@ -33,7 +33,7 @@
             "
           />
         </tippy>
-        <div class="flex justify-between flex-1">
+        <div class="flex flex-1 justify-between">
           <label for="generatedCode" class="p-4">
             {{ t("request.generated_code") }}
           </label>
@@ -41,7 +41,7 @@
         <div
           v-if="codegenType"
           ref="generatedCode"
-          class="border rounded border-dividerLight"
+          class="border border-dividerLight rounded"
         ></div>
       </div>
     </template>
diff --git a/packages/hoppscotch-app/components/http/Headers.vue b/packages/hoppscotch-app/components/http/Headers.vue
index a0aec0c7a..d29b6f742 100644
--- a/packages/hoppscotch-app/components/http/Headers.vue
+++ b/packages/hoppscotch-app/components/http/Headers.vue
@@ -1,9 +1,9 @@
 <template>
   <AppSection label="headers">
     <div
-      class="bg-primary border-dividerLight top-upperSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("request.header_list") }}
       </label>
       <div class="flex">
@@ -41,7 +41,7 @@
       <div
         v-for="(header, index) in headers$"
         :key="`header-${index}`"
-        class="divide-dividerLight border-dividerLight flex border-b divide-x"
+        class="divide-dividerLight divide-x border-b border-dividerLight flex"
       >
         <SmartAutoComplete
           :placeholder="`${t('count.header', { count: index + 1 })}`"
@@ -57,7 +57,7 @@
             px-4
             truncate
           "
-          class="!flex flex-1"
+          class="flex-1 !flex"
           @input="
             updateHeader(index, {
               key: $event,
@@ -125,15 +125,15 @@
       </div>
       <div
         v-if="headers$.length === 0"
-        class="text-secondaryLight flex flex-col items-center justify-center p-4"
+        class="flex flex-col text-secondaryLight p-4 items-center justify-center"
       >
         <img
           :src="`/images/states/${$colorMode.value}/add_category.svg`"
           loading="lazy"
-          class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+          class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
           :alt="`${t('empty.headers')}`"
         />
-        <span class="pb-4 text-center">
+        <span class="text-center pb-4">
           {{ t("empty.headers") }}
         </span>
         <ButtonSecondary
diff --git a/packages/hoppscotch-app/components/http/ImportCurl.vue b/packages/hoppscotch-app/components/http/ImportCurl.vue
index 04daf8cd8..146ccd792 100644
--- a/packages/hoppscotch-app/components/http/ImportCurl.vue
+++ b/packages/hoppscotch-app/components/http/ImportCurl.vue
@@ -2,7 +2,7 @@
   <SmartModal v-if="show" :title="`${t('import.curl')}`" @close="hideModal">
     <template #body>
       <div class="flex flex-col px-2">
-        <div ref="curlEditor" class="border rounded border-dividerLight"></div>
+        <div ref="curlEditor" class="border border-dividerLight rounded"></div>
       </div>
     </template>
     <template #footer>
diff --git a/packages/hoppscotch-app/components/http/OAuth2Authorization.vue b/packages/hoppscotch-app/components/http/OAuth2Authorization.vue
index 2865c7070..7fae5deb9 100644
--- a/packages/hoppscotch-app/components/http/OAuth2Authorization.vue
+++ b/packages/hoppscotch-app/components/http/OAuth2Authorization.vue
@@ -1,46 +1,46 @@
 <template>
   <div class="flex flex-col">
-    <div class="flex border-b border-dividerLight">
+    <div class="border-b border-dividerLight flex">
       <input
         id="oidcDiscoveryURL"
         v-model="oidcDiscoveryURL"
-        class="flex flex-1 px-4 py-2 bg-transparent"
+        class="bg-transparent flex flex-1 py-2 px-4"
         placeholder="OpenID Connect Discovery URL"
         name="oidcDiscoveryURL"
       />
     </div>
-    <div class="flex border-b border-dividerLight">
+    <div class="border-b border-dividerLight flex">
       <input
         id="authURL"
         v-model="authURL"
-        class="flex flex-1 px-4 py-2 bg-transparent"
+        class="bg-transparent flex flex-1 py-2 px-4"
         placeholder="Authentication URL"
         name="authURL"
       />
     </div>
-    <div class="flex border-b border-dividerLight">
+    <div class="border-b border-dividerLight flex">
       <input
         id="accessTokenURL"
         v-model="accessTokenURL"
-        class="flex flex-1 px-4 py-2 bg-transparent"
+        class="bg-transparent flex flex-1 py-2 px-4"
         placeholder="Access Token URL"
         name="accessTokenURL"
       />
     </div>
-    <div class="flex border-b border-dividerLight">
+    <div class="border-b border-dividerLight flex">
       <input
         id="clientID"
         v-model="clientID"
-        class="flex flex-1 px-4 py-2 bg-transparent"
+        class="bg-transparent flex flex-1 py-2 px-4"
         placeholder="Client ID"
         name="clientID"
       />
     </div>
-    <div class="flex border-b border-dividerLight">
+    <div class="border-b border-dividerLight flex">
       <input
         id="scope"
         v-model="scope"
-        class="flex flex-1 px-4 py-2 bg-transparent"
+        class="bg-transparent flex flex-1 py-2 px-4"
         placeholder="Scope"
         name="scope"
       />
diff --git a/packages/hoppscotch-app/components/http/Parameters.vue b/packages/hoppscotch-app/components/http/Parameters.vue
index 2ca3617fb..f054efcf4 100644
--- a/packages/hoppscotch-app/components/http/Parameters.vue
+++ b/packages/hoppscotch-app/components/http/Parameters.vue
@@ -1,9 +1,9 @@
 <template>
   <AppSection label="parameters">
     <div
-      class="bg-primary border-dividerLight top-upperSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("request.parameter_list") }}
       </label>
       <div class="flex">
@@ -41,7 +41,7 @@
       <div
         v-for="(param, index) in params$"
         :key="`param-${index}`"
-        class="divide-dividerLight border-dividerLight flex border-b divide-x"
+        class="divide-dividerLight divide-x border-b border-dividerLight flex"
       >
         <SmartEnvInput
           v-model="param.key"
@@ -118,15 +118,15 @@
       </div>
       <div
         v-if="params$.length === 0"
-        class="text-secondaryLight flex flex-col items-center justify-center p-4"
+        class="flex flex-col text-secondaryLight p-4 items-center justify-center"
       >
         <img
           :src="`/images/states/${$colorMode.value}/add_files.svg`"
           loading="lazy"
-          class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+          class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
           :alt="`${t('empty.parameters')}`"
         />
-        <span class="pb-4 text-center">
+        <span class="text-center pb-4">
           {{ t("empty.parameters") }}
         </span>
         <ButtonSecondary
diff --git a/packages/hoppscotch-app/components/http/PreRequestScript.vue b/packages/hoppscotch-app/components/http/PreRequestScript.vue
index 00781fa12..4f79f6a28 100644
--- a/packages/hoppscotch-app/components/http/PreRequestScript.vue
+++ b/packages/hoppscotch-app/components/http/PreRequestScript.vue
@@ -1,9 +1,9 @@
 <template>
   <AppSection id="script" :label="`${t('preRequest.script')}`">
     <div
-      class="bg-primary border-dividerLight top-upperSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("preRequest.javascript_code") }}
       </label>
       <div class="flex">
@@ -29,12 +29,12 @@
         />
       </div>
     </div>
-    <div class="border-dividerLight flex border-b">
-      <div class="border-dividerLight w-2/3 border-r">
+    <div class="border-b border-dividerLight flex">
+      <div class="border-r border-dividerLight w-2/3">
         <div ref="preRrequestEditor"></div>
       </div>
       <div
-        class="bg-primary top-upperTertiaryStickyFold min-w-46 max-w-1/3 z-9 sticky h-full p-4 overflow-auto"
+        class="bg-primary h-full top-upperTertiaryStickyFold min-w-46 max-w-1/3 p-4 z-9 sticky overflow-auto"
       >
         <div class="text-secondaryLight pb-2">
           {{ t("helpers.pre_request_script") }}
@@ -44,7 +44,7 @@
           to="https://docs.hoppscotch.io/features/pre-request-script"
           blank
         />
-        <h4 class="text-secondaryLight pt-6 font-bold">
+        <h4 class="font-bold text-secondaryLight pt-6">
           {{ t("preRequest.snippets") }}
         </h4>
         <div class="flex flex-col pt-4">
diff --git a/packages/hoppscotch-app/components/http/RawBody.vue b/packages/hoppscotch-app/components/http/RawBody.vue
index 6fd5874e2..8bc6dd78d 100644
--- a/packages/hoppscotch-app/components/http/RawBody.vue
+++ b/packages/hoppscotch-app/components/http/RawBody.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div
-      class="bg-primary border-dividerLight top-upperTertiaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-upperTertiaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("request.raw_body") }}
       </label>
       <div class="flex">
diff --git a/packages/hoppscotch-app/components/http/Request.vue b/packages/hoppscotch-app/components/http/Request.vue
index 4d43936f3..a011b1802 100644
--- a/packages/hoppscotch-app/components/http/Request.vue
+++ b/packages/hoppscotch-app/components/http/Request.vue
@@ -1,9 +1,9 @@
 <template>
   <div
-    class="bg-primary hide-scrollbar sticky top-0 z-10 flex p-4 space-x-2 overflow-x-auto"
+    class="bg-primary flex space-x-2 p-4 top-0 z-10 sticky overflow-x-auto hide-scrollbar"
   >
     <div class="flex flex-1">
-      <div class="relative flex">
+      <div class="flex relative">
         <label for="method">
           <tippy
             ref="methodOptions"
@@ -16,7 +16,7 @@
               <span class="select-wrapper">
                 <input
                   id="method"
-                  class="bg-primaryLight border-divider text-secondaryDark w-26 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark flex px-4 py-2 font-semibold border rounded-l cursor-pointer"
+                  class="bg-primaryLight border border-divider rounded-l cursor-pointer flex font-semibold text-secondaryDark py-2 px-4 w-26 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
                   :value="newMethod"
                   :readonly="!isCustomMethod"
                   :placeholder="`${t('request.method')}`"
@@ -58,7 +58,7 @@
     <div class="flex">
       <ButtonPrimary
         id="send"
-        class="min-w-20 flex-1 rounded-r-none"
+        class="rounded-r-none flex-1 min-w-20"
         :label="`${!loading ? t('action.send') : t('action.cancel')}`"
         @click.native="!loading ? newSendRequest() : cancelRequest()"
       />
@@ -107,7 +107,7 @@
         </tippy>
       </span>
       <ButtonSecondary
-        class="ml-2 rounded rounded-r-none"
+        class="rounded rounded-r-none ml-2"
         :label="
           windowInnerWidth.x.value >= 768 && COLUMN_LAYOUT
             ? `${t('request.save')}`
@@ -139,7 +139,7 @@
             name="request-name"
             type="text"
             autocomplete="off"
-            class="input mb-2"
+            class="mb-2 input"
             @keyup.enter="saveOptions.tippy().hide()"
           />
           <SmartItem
diff --git a/packages/hoppscotch-app/components/http/ResponseMeta.vue b/packages/hoppscotch-app/components/http/ResponseMeta.vue
index c61ac1106..428ac9430 100644
--- a/packages/hoppscotch-app/components/http/ResponseMeta.vue
+++ b/packages/hoppscotch-app/components/http/ResponseMeta.vue
@@ -1,23 +1,23 @@
 <template>
   <div
-    class="bg-primary hide-scrollbar whitespace-nowrap sticky top-0 z-10 flex items-center p-4 overflow-auto"
+    class="bg-primary flex p-4 top-0 z-10 sticky items-center overflow-auto hide-scrollbar whitespace-nowrap"
   >
     <div
       v-if="response == null"
-      class="text-secondaryLight flex flex-col items-center justify-center flex-1"
+      class="flex flex-col flex-1 text-secondaryLight items-center justify-center"
     >
-      <div class="flex pb-4 my-4 space-x-2">
-        <div class="flex flex-col items-end space-y-4 text-right">
-          <span class="flex items-center flex-1">
+      <div class="flex space-x-2 my-4 pb-4">
+        <div class="flex flex-col space-y-4 text-right items-end">
+          <span class="flex flex-1 items-center">
             {{ t("shortcut.request.send_request") }}
           </span>
-          <span class="flex items-center flex-1">
+          <span class="flex flex-1 items-center">
             {{ t("shortcut.general.show_all") }}
           </span>
-          <span class="flex items-center flex-1">
+          <span class="flex flex-1 items-center">
             {{ t("shortcut.general.command_menu") }}
           </span>
-          <span class="flex items-center flex-1">
+          <span class="flex flex-1 items-center">
             {{ t("shortcut.general.help_menu") }}
           </span>
         </div>
@@ -57,18 +57,18 @@
       </div>
       <div
         v-if="response.type === 'network_fail'"
-        class="flex flex-col items-center justify-center flex-1 p-4"
+        class="flex flex-col flex-1 p-4 items-center justify-center"
       >
         <img
           :src="`/images/states/${$colorMode.value}/youre_lost.svg`"
           loading="lazy"
-          class="inline-flex flex-col object-contain object-center w-32 h-32 my-4"
+          class="flex-col object-contain object-center h-32 my-4 w-32 inline-flex"
           :alt="`${t('error.network_fail')}`"
         />
-        <span class="mb-2 font-semibold text-center">
+        <span class="font-semibold text-center mb-2">
           {{ t("error.network_fail") }}
         </span>
-        <span class="text-secondaryLight max-w-sm mb-4 text-center">
+        <span class="max-w-sm text-center text-secondaryLight mb-4">
           {{ t("helpers.network_fail") }}
         </span>
         <AppInterceptor />
@@ -76,7 +76,7 @@
       <div
         v-if="response.type === 'success' || 'fail'"
         :class="statusCategory.className"
-        class="space-x-4 font-semibold"
+        class="font-semibold space-x-4"
       >
         <span v-if="response.statusCode">
           <span class="text-secondary"> {{ t("response.status") }}: </span>
diff --git a/packages/hoppscotch-app/components/http/TestResult.vue b/packages/hoppscotch-app/components/http/TestResult.vue
index 260b8aa5e..ce24e7972 100644
--- a/packages/hoppscotch-app/components/http/TestResult.vue
+++ b/packages/hoppscotch-app/components/http/TestResult.vue
@@ -7,9 +7,9 @@
       "
     >
       <div
-        class="bg-primary border-dividerLight top-lowerSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+        class="bg-primary border-b border-dividerLight flex flex-1 top-lowerSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
       >
-        <label class="text-secondaryLight font-semibold">
+        <label class="font-semibold text-secondaryLight">
           {{ t("test.report") }}
         </label>
         <ButtonSecondary
@@ -19,7 +19,7 @@
           @click.native="clearContent()"
         />
       </div>
-      <div class="divide-dividerLight border-dividerLight border-b divide-y-4">
+      <div class="divide-dividerLight border-b border-dividerLight divide-y-4">
         <div v-if="testResults.tests" class="divide-dividerLight divide-y-4">
           <HttpTestResultEntry
             v-for="(result, index) in testResults.tests"
@@ -38,10 +38,10 @@
           <div
             v-for="(result, index) in testResults.expectResults"
             :key="`result-${index}`"
-            class="flex items-center px-4 py-2"
+            class="flex py-2 px-4 items-center"
           >
             <i
-              class="material-icons mr-4"
+              class="mr-4 material-icons"
               :class="
                 result.status === 'pass' ? 'text-green-500' : 'text-red-500'
               "
@@ -64,18 +64,18 @@
     </div>
     <div
       v-else
-      class="text-secondaryLight flex flex-col items-center justify-center p-4"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <img
         :src="`/images/states/${$colorMode.value}/validation.svg`"
         loading="lazy"
-        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
         :alt="`${t('empty.tests')}`"
       />
-      <span class="pb-2 text-center">
+      <span class="text-center pb-2">
         {{ t("empty.tests") }}
       </span>
-      <span class="pb-4 text-center">
+      <span class="text-center pb-4">
         {{ t("helpers.tests") }}
       </span>
       <ButtonSecondary
diff --git a/packages/hoppscotch-app/components/http/TestResultEntry.vue b/packages/hoppscotch-app/components/http/TestResultEntry.vue
index 4ec238742..339709091 100644
--- a/packages/hoppscotch-app/components/http/TestResultEntry.vue
+++ b/packages/hoppscotch-app/components/http/TestResultEntry.vue
@@ -2,7 +2,7 @@
   <div>
     <span
       v-if="testResults.description"
-      class="flex items-center px-4 py-2 font-bold text-secondaryDark"
+      class="flex font-bold text-secondaryDark py-2 px-4 items-center"
     >
       {{ testResults.description }}
     </span>
@@ -14,7 +14,7 @@
       <div
         v-for="(result, index) in testResults.expectResults"
         :key="`result-${index}`"
-        class="flex items-center px-4 py-2"
+        class="flex py-2 px-4 items-center"
       >
         <i
           class="mr-4 material-icons"
diff --git a/packages/hoppscotch-app/components/http/TestResultReport.vue b/packages/hoppscotch-app/components/http/TestResultReport.vue
index 66fc9f83a..bce7a045e 100644
--- a/packages/hoppscotch-app/components/http/TestResultReport.vue
+++ b/packages/hoppscotch-app/components/http/TestResultReport.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex items-center p-2">
+  <div class="flex p-2 items-center">
     <SmartProgressRing
       class="text-red-500"
       :radius="16"
diff --git a/packages/hoppscotch-app/components/http/Tests.vue b/packages/hoppscotch-app/components/http/Tests.vue
index efc815d01..d7d6f7083 100644
--- a/packages/hoppscotch-app/components/http/Tests.vue
+++ b/packages/hoppscotch-app/components/http/Tests.vue
@@ -1,9 +1,9 @@
 <template>
   <AppSection id="script" :label="`${t('test.script')}`">
     <div
-      class="bg-primary border-dividerLight top-upperSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-upperSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("test.javascript_code") }}
       </label>
       <div class="flex">
@@ -29,12 +29,12 @@
         />
       </div>
     </div>
-    <div class="border-dividerLight flex border-b">
-      <div class="border-dividerLight w-2/3 border-r">
+    <div class="border-b border-dividerLight flex">
+      <div class="border-r border-dividerLight w-2/3">
         <div ref="testScriptEditor"></div>
       </div>
       <div
-        class="bg-primary top-upperTertiaryStickyFold min-w-46 max-w-1/3 z-9 sticky h-full p-4 overflow-auto"
+        class="bg-primary h-full top-upperTertiaryStickyFold min-w-46 max-w-1/3 p-4 z-9 sticky overflow-auto"
       >
         <div class="text-secondaryLight pb-2">
           {{ t("helpers.post_request_tests") }}
@@ -44,7 +44,7 @@
           to="https://docs.hoppscotch.io/features/tests"
           blank
         />
-        <h4 class="text-secondaryLight pt-6 font-bold">
+        <h4 class="font-bold text-secondaryLight pt-6">
           {{ t("test.snippets") }}
         </h4>
         <div class="flex flex-col pt-4">
diff --git a/packages/hoppscotch-app/components/lenses/HeadersRenderer.vue b/packages/hoppscotch-app/components/lenses/HeadersRenderer.vue
index 5ebc059c4..9d795e2ae 100644
--- a/packages/hoppscotch-app/components/lenses/HeadersRenderer.vue
+++ b/packages/hoppscotch-app/components/lenses/HeadersRenderer.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div
-      class="bg-primary border-dividerLight top-lowerSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-lowerSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("request.header_list") }}
       </label>
       <div class="flex">
@@ -20,19 +20,19 @@
     <div
       v-for="(header, index) in headers"
       :key="`header-${index}`"
-      class="divide-dividerLight border-dividerLight group flex border-b divide-x"
+      class="divide-dividerLight divide-x border-b border-dividerLight flex group"
     >
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 px-4 py-2 transition"
+        class="flex flex-1 min-w-0 py-2 px-4 transition group-hover:text-secondaryDark"
       >
-        <span class="truncate rounded-sm select-all">
+        <span class="rounded-sm truncate select-all">
           {{ header.key }}
         </span>
       </span>
       <span
-        class="group-hover:text-secondaryDark flex flex-1 min-w-0 px-4 py-2 transition"
+        class="flex flex-1 min-w-0 py-2 px-4 transition group-hover:text-secondaryDark"
       >
-        <span class="truncate rounded-sm select-all">
+        <span class="rounded-sm truncate select-all">
           {{ header.value }}
         </span>
       </span>
diff --git a/packages/hoppscotch-app/components/lenses/renderers/HTMLLensRenderer.vue b/packages/hoppscotch-app/components/lenses/renderers/HTMLLensRenderer.vue
index 6a54cab4d..509a469bd 100644
--- a/packages/hoppscotch-app/components/lenses/renderers/HTMLLensRenderer.vue
+++ b/packages/hoppscotch-app/components/lenses/renderers/HTMLLensRenderer.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="flex flex-col flex-1">
     <div
-      class="bg-primary border-dividerLight top-lowerSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-lowerSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("response.body") }}
       </label>
       <div class="flex">
diff --git a/packages/hoppscotch-app/components/lenses/renderers/ImageLensRenderer.vue b/packages/hoppscotch-app/components/lenses/renderers/ImageLensRenderer.vue
index 0d508f93a..402398e41 100644
--- a/packages/hoppscotch-app/components/lenses/renderers/ImageLensRenderer.vue
+++ b/packages/hoppscotch-app/components/lenses/renderers/ImageLensRenderer.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div
-      class="bg-primary border-dividerLight top-lowerSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-lowerSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ $t("response.body") }}
       </label>
       <div class="flex">
@@ -18,7 +18,7 @@
       </div>
     </div>
     <img
-      class="border-dividerLight flex flex-1 max-w-full border-b"
+      class="border-b border-dividerLight flex max-w-full flex-1"
       :src="imageSource"
       loading="lazy"
       :alt="imageSource"
diff --git a/packages/hoppscotch-app/components/lenses/renderers/JSONLensRenderer.vue b/packages/hoppscotch-app/components/lenses/renderers/JSONLensRenderer.vue
index eb7697367..55e0d133c 100644
--- a/packages/hoppscotch-app/components/lenses/renderers/JSONLensRenderer.vue
+++ b/packages/hoppscotch-app/components/lenses/renderers/JSONLensRenderer.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div
-      class="bg-primary border-dividerLight top-lowerSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-lowerSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">{{
+      <label class="font-semibold text-secondaryLight">{{
         t("response.body")
       }}</label>
       <div class="flex">
@@ -36,7 +36,7 @@
     <div ref="jsonResponse"></div>
     <div
       v-if="outlinePath"
-      class="bg-primaryLight border-dividerLight flex-nowrap hide-scrollbar sticky bottom-0 z-10 flex flex-1 px-2 overflow-auto border-t"
+      class="bg-primaryLight border-t border-dividerLight flex flex-nowrap flex-1 px-2 bottom-0 z-10 sticky overflow-auto hide-scrollbar"
     >
       <div
         v-for="(item, index) in outlinePath"
@@ -115,7 +115,7 @@
         </tippy>
         <i
           v-if="index + 1 !== outlinePath.length"
-          class="text-secondaryLight material-icons opacity-50"
+          class="text-secondaryLight opacity-50 material-icons"
           >chevron_right</i
         >
       </div>
diff --git a/packages/hoppscotch-app/components/lenses/renderers/RawLensRenderer.vue b/packages/hoppscotch-app/components/lenses/renderers/RawLensRenderer.vue
index e6f31eb70..f71a60f12 100644
--- a/packages/hoppscotch-app/components/lenses/renderers/RawLensRenderer.vue
+++ b/packages/hoppscotch-app/components/lenses/renderers/RawLensRenderer.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div
-      class="bg-primary border-dividerLight top-lowerSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-lowerSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("response.body") }}
       </label>
       <div class="flex">
diff --git a/packages/hoppscotch-app/components/lenses/renderers/XMLLensRenderer.vue b/packages/hoppscotch-app/components/lenses/renderers/XMLLensRenderer.vue
index f363ccccd..34acae34a 100644
--- a/packages/hoppscotch-app/components/lenses/renderers/XMLLensRenderer.vue
+++ b/packages/hoppscotch-app/components/lenses/renderers/XMLLensRenderer.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div
-      class="bg-primary border-dividerLight top-lowerSecondaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 top-lowerSecondaryStickyFold pl-4 z-10 sticky items-center justify-between"
     >
-      <label class="text-secondaryLight font-semibold">
+      <label class="font-semibold text-secondaryLight">
         {{ t("response.body") }}
       </label>
       <div class="flex">
diff --git a/packages/hoppscotch-app/components/profile/Picture.vue b/packages/hoppscotch-app/components/profile/Picture.vue
index 43e7474f1..266bce2d7 100644
--- a/packages/hoppscotch-app/components/profile/Picture.vue
+++ b/packages/hoppscotch-app/components/profile/Picture.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="relative flex items-center justify-center w-5 h-5 cursor-pointer">
+  <div class="cursor-pointer flex h-5 w-5 relative items-center justify-center">
     <img
-      class="bg-primaryDark absolute object-cover object-center w-5 h-5 transition rounded-full"
+      class="bg-primaryDark rounded-full object-cover object-center h-5 transition w-5 absolute"
       :src="url"
       :alt="alt"
       loading="lazy"
     />
-    <div class="absolute inset-0 rounded-full shadow-inner"></div>
+    <div class="rounded-full shadow-inner inset-0 absolute"></div>
     <span
       v-if="indicator"
       class="border-primary rounded-full border-2 h-2.5 -top-0.5 -right-0.5 w-2.5 absolute"
diff --git a/packages/hoppscotch-app/components/realtime/Log.vue b/packages/hoppscotch-app/components/realtime/Log.vue
index 38092b4fd..5584051df 100644
--- a/packages/hoppscotch-app/components/realtime/Log.vue
+++ b/packages/hoppscotch-app/components/realtime/Log.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="flex flex-col">
     <div
-      class="bg-primary border-dividerLight sticky top-0 z-10 flex items-center justify-between flex-1 pl-4 border-b"
+      class="bg-primary border-b border-dividerLight flex flex-1 pl-4 top-0 z-10 sticky items-center justify-between"
     >
-      <label for="log" class="text-secondaryLight py-2 font-semibold">
+      <label for="log" class="font-semibold text-secondaryLight py-2">
         {{ title }}
       </label>
     </div>
diff --git a/packages/hoppscotch-app/components/realtime/Mqtt.vue b/packages/hoppscotch-app/components/realtime/Mqtt.vue
index 8e8b2b525..968c6f987 100644
--- a/packages/hoppscotch-app/components/realtime/Mqtt.vue
+++ b/packages/hoppscotch-app/components/realtime/Mqtt.vue
@@ -15,16 +15,16 @@
         >
           <AppSection label="request">
             <div
-              class="bg-primary sticky top-0 z-10 flex flex-col p-4 space-y-4"
+              class="bg-primary flex flex-col space-y-4 p-4 top-0 z-10 sticky"
             >
-              <div class="inline-flex flex-1 space-x-2">
+              <div class="space-x-2 flex-1 inline-flex">
                 <input
                   id="mqtt-url"
                   v-model="url"
                   type="url"
                   autocomplete="off"
                   spellcheck="false"
-                  class="bg-primaryLight border-divider text-secondaryDark hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark w-full px-4 py-2 border rounded"
+                  class="bg-primaryLight border border-divider rounded text-secondaryDark w-full py-2 px-4 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
                   :placeholder="$t('mqtt.url')"
                   :disabled="connectionState"
                   @keyup.enter="validUrl ? toggleConnection() : null"
@@ -80,8 +80,8 @@
       class="hide-scrollbar !overflow-auto"
     >
       <AppSection label="messages">
-        <div class="flex inline-flex flex-col flex-1 p-4">
-          <label for="pub_topic" class="text-secondaryLight font-semibold">
+        <div class="flex flex-col flex-1 p-4 inline-flex">
+          <label for="pub_topic" class="font-semibold text-secondaryLight">
             {{ $t("mqtt.topic") }}
           </label>
         </div>
@@ -96,12 +96,12 @@
             spellcheck="false"
           />
         </div>
-        <div class="flex items-center justify-between flex-1 p-4">
-          <label for="mqtt-message" class="text-secondaryLight font-semibold">
+        <div class="flex flex-1 p-4 items-center justify-between">
+          <label for="mqtt-message" class="font-semibold text-secondaryLight">
             {{ $t("mqtt.communication") }}
           </label>
         </div>
-        <div class="flex px-4 space-x-2">
+        <div class="flex space-x-2 px-4">
           <input
             id="mqtt-message"
             v-model="msg"
@@ -120,13 +120,13 @@
           />
         </div>
         <div
-          class="border-dividerLight flex inline-flex flex-col flex-1 p-4 mt-4 border-t"
+          class="border-t border-dividerLight flex flex-col flex-1 mt-4 p-4 inline-flex"
         >
-          <label for="sub_topic" class="text-secondaryLight font-semibold">
+          <label for="sub_topic" class="font-semibold text-secondaryLight">
             {{ $t("mqtt.topic") }}
           </label>
         </div>
-        <div class="flex px-4 space-x-2">
+        <div class="flex space-x-2 px-4">
           <input
             id="sub_topic"
             v-model="sub_topic"
diff --git a/packages/hoppscotch-app/components/realtime/Socketio.vue b/packages/hoppscotch-app/components/realtime/Socketio.vue
index d270aca2a..b6405bb53 100644
--- a/packages/hoppscotch-app/components/realtime/Socketio.vue
+++ b/packages/hoppscotch-app/components/realtime/Socketio.vue
@@ -14,8 +14,8 @@
           class="hide-scrollbar !overflow-auto"
         >
           <AppSection label="request">
-            <div class="bg-primary sticky top-0 z-10 flex p-4">
-              <div class="inline-flex flex-1 space-x-2">
+            <div class="bg-primary flex p-4 top-0 z-10 sticky">
+              <div class="space-x-2 flex-1 inline-flex">
                 <div class="flex flex-1">
                   <label for="client-version">
                     <tippy
@@ -31,7 +31,7 @@
                             id="client-version"
                             v-tippy="{ theme: 'tooltip' }"
                             title="socket.io-client version"
-                            class="bg-primaryLight border-divider text-secondaryDark w-26 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark flex px-4 py-2 font-semibold border rounded-l cursor-pointer"
+                            class="bg-primaryLight border border-divider rounded-l cursor-pointer flex font-semibold text-secondaryDark py-2 px-4 w-26 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
                             :value="`Client ${clientVersion}`"
                             readonly
                             :disabled="connectionState"
@@ -53,7 +53,7 @@
                     autocomplete="off"
                     spellcheck="false"
                     :class="{ error: !urlValid }"
-                    class="bg-primaryLight border-divider text-secondaryDark hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark flex flex-1 w-full px-4 py-2 border"
+                    class="bg-primaryLight border border-divider flex flex-1 text-secondaryDark w-full py-2 px-4 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
                     :placeholder="$t('socketio.url')"
                     :disabled="connectionState"
                     @keyup.enter="urlValid ? toggleConnection() : null"
@@ -61,7 +61,7 @@
                   <input
                     id="socketio-path"
                     v-model="path"
-                    class="bg-primaryLight border-divider text-secondaryDark hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark flex flex-1 w-full px-4 py-2 border rounded-r"
+                    class="bg-primaryLight border border-divider rounded-r flex flex-1 text-secondaryDark w-full py-2 px-4 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
                     spellcheck="false"
                     :disabled="connectionState"
                     @keyup.enter="urlValid ? toggleConnection() : null"
@@ -101,8 +101,8 @@
       class="hide-scrollbar !overflow-auto"
     >
       <AppSection label="messages">
-        <div class="flex inline-flex flex-col flex-1 p-4">
-          <label for="events" class="text-secondaryLight font-semibold">
+        <div class="flex flex-col flex-1 p-4 inline-flex">
+          <label for="events" class="font-semibold text-secondaryLight">
             {{ $t("socketio.events") }}
           </label>
         </div>
@@ -118,8 +118,8 @@
             :disabled="!connectionState"
           />
         </div>
-        <div class="flex items-center justify-between flex-1 p-4">
-          <label class="text-secondaryLight font-semibold">
+        <div class="flex flex-1 p-4 items-center justify-between">
+          <label class="font-semibold text-secondaryLight">
             {{ $t("socketio.communication") }}
           </label>
           <div class="flex">
@@ -132,7 +132,7 @@
             />
           </div>
         </div>
-        <div class="flex flex-col px-4 pb-4 space-y-2">
+        <div class="flex flex-col space-y-2 px-4 pb-4">
           <div
             v-for="(input, index) of communication.inputs"
             :key="`input-${index}`"
diff --git a/packages/hoppscotch-app/components/realtime/Sse.vue b/packages/hoppscotch-app/components/realtime/Sse.vue
index aee25d0f0..80ff715b6 100644
--- a/packages/hoppscotch-app/components/realtime/Sse.vue
+++ b/packages/hoppscotch-app/components/realtime/Sse.vue
@@ -1,8 +1,8 @@
 <template>
   <Splitpanes class="smart-splitter" :horizontal="COLUMN_LAYOUT">
     <Pane :size="COLUMN_LAYOUT ? 45 : 50" class="hide-scrollbar !overflow-auto">
-      <div class="bg-primary sticky top-0 z-10 flex p-4">
-        <div class="inline-flex flex-1 space-x-2">
+      <div class="bg-primary flex p-4 top-0 z-10 sticky">
+        <div class="space-x-2 flex-1 inline-flex">
           <div class="flex flex-1">
             <input
               id="server"
@@ -10,21 +10,21 @@
               type="url"
               autocomplete="off"
               :class="{ error: !serverValid }"
-              class="bg-primaryLight border-divider text-secondaryDark hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark flex flex-1 w-full px-4 py-2 border rounded-l"
+              class="bg-primaryLight border border-divider rounded-l flex flex-1 text-secondaryDark w-full py-2 px-4 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
               :placeholder="$t('sse.url')"
               :disabled="connectionSSEState"
               @keyup.enter="serverValid ? toggleSSEConnection() : null"
             />
             <label
               for="event-type"
-              class="bg-primaryLight border-divider text-secondaryLight px-4 py-2 font-semibold truncate border-t border-b"
+              class="bg-primaryLight border-t border-b border-divider font-semibold text-secondaryLight py-2 px-4 truncate"
             >
               {{ $t("sse.event_type") }}
             </label>
             <input
               id="event-type"
               v-model="eventType"
-              class="bg-primaryLight border-divider text-secondaryDark hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark flex flex-1 w-full px-4 py-2 border rounded-r"
+              class="bg-primaryLight border border-divider rounded-r flex flex-1 text-secondaryDark w-full py-2 px-4 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
               spellcheck="false"
               :disabled="connectionSSEState"
               @keyup.enter="serverValid ? toggleSSEConnection() : null"
diff --git a/packages/hoppscotch-app/components/realtime/Websocket.vue b/packages/hoppscotch-app/components/realtime/Websocket.vue
index c173aef44..1be933a5f 100644
--- a/packages/hoppscotch-app/components/realtime/Websocket.vue
+++ b/packages/hoppscotch-app/components/realtime/Websocket.vue
@@ -14,12 +14,12 @@
           class="hide-scrollbar !overflow-auto"
         >
           <AppSection label="request">
-            <div class="bg-primary sticky top-0 z-10 flex p-4">
-              <div class="inline-flex flex-1 space-x-2">
+            <div class="bg-primary flex p-4 top-0 z-10 sticky">
+              <div class="space-x-2 flex-1 inline-flex">
                 <input
                   id="websocket-url"
                   v-model="url"
-                  class="bg-primaryLight border-divider text-secondaryDark hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark w-full px-4 py-2 border rounded"
+                  class="bg-primaryLight border border-divider rounded text-secondaryDark w-full py-2 px-4 hover:border-dividerDark focus-visible:bg-transparent focus-visible:border-dividerDark"
                   type="url"
                   autocomplete="off"
                   spellcheck="false"
@@ -44,9 +44,9 @@
               </div>
             </div>
             <div
-              class="bg-primary border-dividerLight top-upperPrimaryStickyFold sticky z-10 flex items-center justify-between flex-1 pl-4 border-b"
+              class="bg-primary border-b border-dividerLight flex flex-1 top-upperPrimaryStickyFold pl-4 z-10 sticky items-center justify-between"
             >
-              <label class="text-secondaryLight font-semibold">
+              <label class="font-semibold text-secondaryLight">
                 {{ $t("websocket.protocols") }}
               </label>
               <div class="flex">
@@ -67,11 +67,11 @@
             <div
               v-for="(protocol, index) of protocols"
               :key="`protocol-${index}`"
-              class="divide-dividerLight border-dividerLight flex border-b divide-x"
+              class="divide-dividerLight divide-x border-b border-dividerLight flex"
             >
               <input
                 v-model="protocol.value"
-                class="flex flex-1 px-4 py-2 bg-transparent"
+                class="bg-transparent flex flex-1 py-2 px-4"
                 :placeholder="$t('count.protocol', { count: index + 1 })"
                 name="message"
                 type="text"
@@ -114,15 +114,15 @@
             </div>
             <div
               v-if="protocols.length === 0"
-              class="text-secondaryLight flex flex-col items-center justify-center p-4"
+              class="flex flex-col text-secondaryLight p-4 items-center justify-center"
             >
               <img
                 :src="`/images/states/${$colorMode.value}/add_category.svg`"
                 loading="lazy"
-                class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+                class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
                 :alt="$t('empty.protocols')"
               />
-              <span class="mb-4 text-center">
+              <span class="text-center mb-4">
                 {{ $t("empty.protocols") }}
               </span>
             </div>
@@ -148,15 +148,15 @@
       class="hide-scrollbar !overflow-auto"
     >
       <AppSection label="messages">
-        <div class="flex inline-flex flex-col flex-1 p-4">
+        <div class="flex flex-col flex-1 p-4 inline-flex">
           <label
             for="websocket-message"
-            class="text-secondaryLight font-semibold"
+            class="font-semibold text-secondaryLight"
           >
             {{ $t("websocket.communication") }}
           </label>
         </div>
-        <div class="flex px-4 space-x-2">
+        <div class="flex space-x-2 px-4">
           <input
             id="websocket-message"
             v-model="communication.input"
diff --git a/packages/hoppscotch-app/components/smart/Checkbox.vue b/packages/hoppscotch-app/components/smart/Checkbox.vue
index 3ae0fa806..06d797b43 100644
--- a/packages/hoppscotch-app/components/smart/Checkbox.vue
+++ b/packages/hoppscotch-app/components/smart/Checkbox.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex-nowrap group hover:text-secondaryDark inline-flex items-center justify-center transition cursor-pointer"
+    class="cursor-pointer flex-nowrap transition inline-flex items-center justify-center group hover:text-secondaryDark"
     @click="$emit('change')"
   >
     <input
@@ -12,7 +12,7 @@
     />
     <label
       for="checkbox"
-      class="pl-0 font-semibold align-middle cursor-pointer"
+      class="cursor-pointer font-semibold pl-0 align-middle"
     >
       <slot></slot>
     </label>
diff --git a/packages/hoppscotch-app/components/smart/DeletableChip.vue b/packages/hoppscotch-app/components/smart/DeletableChip.vue
index a244a17a5..ae4549ff2 100644
--- a/packages/hoppscotch-app/components/smart/DeletableChip.vue
+++ b/packages/hoppscotch-app/components/smart/DeletableChip.vue
@@ -1,7 +1,7 @@
 <template>
   <span class="chip">
     <i class="opacity-75 material-icons">attachment</i>
-    <span class="px-2 truncate max-w-64"><slot></slot></span>
+    <span class="max-w-64 px-2 truncate"><slot></slot></span>
     <ButtonSecondary
       class="rounded close-button"
       svg="x"
diff --git a/packages/hoppscotch-app/components/smart/Item.vue b/packages/hoppscotch-app/components/smart/Item.vue
index 91d95dd77..39cd0841c 100644
--- a/packages/hoppscotch-app/components/smart/Item.vue
+++ b/packages/hoppscotch-app/components/smart/Item.vue
@@ -3,7 +3,7 @@
     :to="`${/^\/(?!\/).*$/.test(to) ? localePath(to) : to}`"
     :exact="exact"
     :blank="blank"
-    class="hover:bg-primaryDark hover:text-secondaryDark focus:outline-none focus-visible:bg-primaryDark focus-visible:text-secondaryDark inline-flex items-center flex-shrink-0 px-4 py-2 transition rounded"
+    class="rounded flex-shrink-0 py-2 px-4 transition inline-flex items-center hover:bg-primaryDark hover:text-secondaryDark focus:outline-none focus-visible:bg-primaryDark focus-visible:text-secondaryDark"
     :class="[
       { 'opacity-75 cursor-not-allowed': disabled },
       { 'pointer-events-none': loading },
@@ -42,9 +42,9 @@
         class="svg-icons"
       />
     </span>
-    <SmartSpinner v-else class="text-secondaryDark mr-4" />
+    <SmartSpinner v-else class="mr-4 text-secondaryDark" />
     <div
-      class="inline-flex items-start flex-1 truncate"
+      class="flex-1 inline-flex items-start truncate"
       :class="{ 'flex-col': description }"
     >
       <div class="font-semibold truncate">
@@ -52,14 +52,14 @@
       </div>
       <p
         v-if="description"
-        class="text-secondaryLight my-2 font-medium text-left"
+        class="font-medium my-2 text-left text-secondaryLight"
       >
         {{ description }}
       </p>
     </div>
     <i
       v-if="infoIcon"
-      class="material-icons items-center self-center ml-6"
+      class="ml-6 items-center self-center material-icons"
       :class="{ 'text-accent': activeInfoIcon }"
     >
       {{ infoIcon }}
diff --git a/packages/hoppscotch-app/components/smart/LoadingIndicator.vue b/packages/hoppscotch-app/components/smart/LoadingIndicator.vue
index 922a3a9a7..59b1015e4 100644
--- a/packages/hoppscotch-app/components/smart/LoadingIndicator.vue
+++ b/packages/hoppscotch-app/components/smart/LoadingIndicator.vue
@@ -1,5 +1,5 @@
 <template>
   <div class="text-sm text-secondaryLight animate-pulse">
-    <AppLogo class="w-8 h-8" />
+    <AppLogo class="h-8 w-8" />
   </div>
 </template>
diff --git a/packages/hoppscotch-app/components/smart/Modal.vue b/packages/hoppscotch-app/components/smart/Modal.vue
index c4e20010a..c587c2722 100644
--- a/packages/hoppscotch-app/components/smart/Modal.vue
+++ b/packages/hoppscotch-app/components/smart/Modal.vue
@@ -2,14 +2,14 @@
   <transition name="fade" appear @leave="onTransitionLeaveStart">
     <div
       ref="modal"
-      class="hide-scrollbar fixed inset-0 z-10 z-50 overflow-y-auto transition"
+      class="inset-0 transition z-10 z-50 fixed overflow-y-auto hide-scrollbar"
     >
       <div
-        class="sm:block flex items-end justify-center min-h-screen text-center"
+        class="flex min-h-screen text-center items-end justify-center sm:block"
       >
         <transition name="fade" appear>
           <div
-            class="bg-primaryLight opacity-90 fixed inset-0 transition"
+            class="bg-primaryLight opacity-90 inset-0 transition fixed"
             @touchstart="!dialog ? close() : null"
             @touchend="!dialog ? close() : null"
             @mouseup="!dialog ? close() : null"
@@ -18,7 +18,7 @@
         </transition>
         <span
           v-if="placement === 'center'"
-          class="sm:h-screen sm:inline-block sm:align-middle hidden"
+          class="hidden sm:h-screen sm:inline-block sm:align-middle"
           aria-hidden="true"
           >&#8203;</span
         >
@@ -32,7 +32,7 @@
           leave-to-class="scale-95 translate-y-4"
         >
           <div
-            class="bg-primary sm:align-middle sm:rounded-xl inline-block w-full overflow-hidden text-left align-bottom transition-all transform shadow-lg"
+            class="bg-primary shadow-lg text-left w-full transform transition-all inline-block overflow-hidden align-bottom sm:rounded-xl sm:align-middle"
             :class="[
               { 'mt-24 md:mb-8': placement === 'top' },
               { 'p-4': !fullWidth },
@@ -41,7 +41,7 @@
           >
             <div
               v-if="title"
-              class="flex items-center justify-between pl-2 mb-4"
+              class="flex mb-4 pl-2 items-center justify-between"
             >
               <h3 class="heading">{{ title }}</h3>
               <span class="flex">
@@ -55,14 +55,14 @@
               </span>
             </div>
             <div
-              class="max-h-md hide-scrollbar flex flex-col overflow-y-auto"
+              class="flex flex-col max-h-md overflow-y-auto hide-scrollbar"
               :class="{ 'py-2': !fullWidth }"
             >
               <slot name="body"></slot>
             </div>
             <div
               v-if="hasFooterSlot"
-              class="flex items-center justify-between flex-1 p-2 mt-4"
+              class="flex flex-1 mt-4 p-2 items-center justify-between"
             >
               <slot name="footer"></slot>
             </div>
diff --git a/packages/hoppscotch-app/components/smart/Tabs.vue b/packages/hoppscotch-app/components/smart/Tabs.vue
index 268276a00..b498ecb63 100644
--- a/packages/hoppscotch-app/components/smart/Tabs.vue
+++ b/packages/hoppscotch-app/components/smart/Tabs.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex flex-1 h-full flex-nowrap"
+    class="flex flex-nowrap h-full flex-1"
     :class="{ 'flex-col h-auto': !vertical }"
   >
     <div
@@ -9,7 +9,7 @@
     >
       <div class="flex flex-1">
         <div
-          class="flex justify-between flex-1"
+          class="flex flex-1 justify-between"
           :class="{ 'flex-col': vertical }"
         >
           <div class="flex" :class="{ 'flex-col space-y-2 p-2': vertical }">
@@ -35,7 +35,7 @@
               </span>
               <span
                 v-if="tab.indicator"
-                class="w-1 h-1 ml-2 rounded-full bg-accentLight"
+                class="bg-accentLight rounded-full h-1 ml-2 w-1"
               ></span>
             </button>
           </div>
@@ -46,7 +46,7 @@
       </div>
     </div>
     <div
-      class="w-full h-full contents"
+      class="h-full w-full contents"
       :class="{
         '!flex flex-col flex-1 overflow-y-auto hide-scrollbar': vertical,
       }"
@@ -128,7 +128,7 @@ export default defineComponent({
     @apply flex-shrink-0;
     @apply items-center;
     @apply justify-center;
-    @apply px-4 py-2;
+    @apply py-2 px-4;
     @apply text-secondary;
     @apply font-semibold;
     @apply cursor-pointer;
diff --git a/packages/hoppscotch-app/components/smart/Toggle.vue b/packages/hoppscotch-app/components/smart/Toggle.vue
index b5605d0c1..558931529 100644
--- a/packages/hoppscotch-app/components/smart/Toggle.vue
+++ b/packages/hoppscotch-app/components/smart/Toggle.vue
@@ -1,12 +1,12 @@
 <template>
   <div
-    class="inline-flex items-center justify-center cursor-pointer flex-nowrap"
+    class="cursor-pointer flex-nowrap inline-flex items-center justify-center"
     @click="$emit('change')"
   >
     <label ref="toggle" class="toggle" :class="{ on: on }">
       <span class="handle"></span>
     </label>
-    <label class="pl-0 font-semibold align-middle cursor-pointer">
+    <label class="cursor-pointer font-semibold pl-0 align-middle">
       <slot></slot>
     </label>
   </div>
diff --git a/packages/hoppscotch-app/components/tab/Primary.vue b/packages/hoppscotch-app/components/tab/Primary.vue
index 6dbf2e4ae..1538affac 100644
--- a/packages/hoppscotch-app/components/tab/Primary.vue
+++ b/packages/hoppscotch-app/components/tab/Primary.vue
@@ -3,7 +3,7 @@
     :to="`${/^\/(?!\/).*$/.test(to) ? localePath(to) : to}`"
     :exact="exact"
     :blank="blank"
-    class="focus:outline-none inline-flex items-center px-4 py-2 truncate transition rounded"
+    class="rounded py-2 px-4 transition inline-flex items-center truncate focus:outline-none"
     :class="[
       color
         ? `text-${color}-500 hover:text-${color}-600 focus-visible:text-${color}-600`
diff --git a/packages/hoppscotch-app/components/tab/Secondary.vue b/packages/hoppscotch-app/components/tab/Secondary.vue
index e4aad1074..7e43a8726 100644
--- a/packages/hoppscotch-app/components/tab/Secondary.vue
+++ b/packages/hoppscotch-app/components/tab/Secondary.vue
@@ -3,7 +3,7 @@
     :to="`${/^\/(?!\/).*$/.test(to) ? localePath(to) : to}`"
     :exact="exact"
     :blank="blank"
-    class="hover:translate-x-2 focus:outline-none focus-visible:translate-x-2 inline-flex items-center flex-1 py-2 font-semibold truncate transition transform"
+    class="font-semibold flex-1 py-2 transform transition inline-flex items-center truncate hover:translate-x-2 focus:outline-none focus-visible:translate-x-2"
     :class="[
       label ? 'px-3' : 'px-2',
       active
diff --git a/packages/hoppscotch-app/components/teams/Edit.vue b/packages/hoppscotch-app/components/teams/Edit.vue
index aa1c36fb4..f53de3bcb 100644
--- a/packages/hoppscotch-app/components/teams/Edit.vue
+++ b/packages/hoppscotch-app/components/teams/Edit.vue
@@ -2,7 +2,7 @@
   <SmartModal v-if="show" :title="t('team.edit')" @close="hideModal">
     <template #body>
       <div class="flex flex-col px-2">
-        <div class="relative flex">
+        <div class="flex relative">
           <input
             id="selectLabelTeamEdit"
             v-model="name"
@@ -17,7 +17,7 @@
             {{ t("action.label") }}
           </label>
         </div>
-        <div class="flex items-center justify-between flex-1 pt-4">
+        <div class="flex flex-1 pt-4 items-center justify-between">
           <label for="memberList" class="p-4">
             {{ t("team.members") }}
           </label>
@@ -47,19 +47,19 @@
             E.isRight(teamDetails.data) &&
             teamDetails.data.right.team.teamMembers
           "
-          class="divide-dividerLight border-divider border divide-y rounded"
+          class="divide-dividerLight divide-y border border-divider rounded"
         >
           <div
             v-if="teamDetails.data.right.team.teamMembers === 0"
-            class="text-secondaryLight flex flex-col items-center justify-center p-4"
+            class="flex flex-col text-secondaryLight p-4 items-center justify-center"
           >
             <img
               :src="`/images/states/${$colorMode.value}/add_group.svg`"
               loading="lazy"
-              class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+              class="flex-col object-contain object-center h-16 my-4 w-16 inline-flex"
               :alt="`${t('empty.members')}`"
             />
-            <span class="pb-4 text-center">
+            <span class="text-center pb-4">
               {{ t("empty.members") }}
             </span>
             <ButtonSecondary
@@ -76,10 +76,10 @@
             <div
               v-for="(member, index) in membersList"
               :key="`member-${index}`"
-              class="divide-dividerLight flex divide-x"
+              class="divide-dividerLight divide-x flex"
             >
               <input
-                class="flex flex-1 px-4 py-2 bg-transparent"
+                class="bg-transparent flex flex-1 py-2 px-4"
                 :placeholder="`${t('team.email')}`"
                 :name="'param' + index"
                 :value="member.email"
@@ -96,7 +96,7 @@
                   <template #trigger>
                     <span class="select-wrapper">
                       <input
-                        class="flex flex-1 px-4 py-2 bg-transparent cursor-pointer"
+                        class="bg-transparent cursor-pointer flex flex-1 py-2 px-4"
                         :placeholder="`${t('team.permissions')}`"
                         :name="'value' + index"
                         :value="
@@ -154,7 +154,7 @@
           v-if="!teamDetails.loading && E.isLeft(teamDetails.data)"
           class="flex flex-col items-center"
         >
-          <i class="material-icons mb-4">help_outline</i>
+          <i class="mb-4 material-icons">help_outline</i>
           {{ t("error.something_went_wrong") }}
         </div>
       </div>
diff --git a/packages/hoppscotch-app/components/teams/Invite.vue b/packages/hoppscotch-app/components/teams/Invite.vue
index ad161142e..beaffea16 100644
--- a/packages/hoppscotch-app/components/teams/Invite.vue
+++ b/packages/hoppscotch-app/components/teams/Invite.vue
@@ -2,8 +2,8 @@
   <SmartModal v-if="show" :title="t('team.invite')" @close="hideModal">
     <template #body>
       <div v-if="sendInvitesResult.length" class="flex flex-col px-4">
-        <div class="flex flex-col items-center justify-center max-w-md">
-          <SmartIcon class="text-accent w-6 h-6" name="users" />
+        <div class="flex flex-col max-w-md items-center justify-center">
+          <SmartIcon class="h-6 text-accent w-6" name="users" />
           <h3 class="my-2 text-lg text-center">
             {{ t("team.we_sent_invite_link") }}
           </h3>
@@ -12,7 +12,7 @@
           </p>
         </div>
         <div
-          class="border-dividerLight flex flex-col p-4 mt-8 space-y-6 border rounded"
+          class="border border-dividerLight rounded flex flex-col space-y-6 mt-8 p-4"
         >
           <div
             v-for="(invitee, index) in sendInvitesResult"
@@ -20,7 +20,7 @@
           >
             <p class="flex items-center">
               <i
-                class="material-icons mr-4"
+                class="mr-4 material-icons"
                 :class="
                   invitee.status === 'error' ? 'text-red-500' : 'text-green-500'
                 "
@@ -41,20 +41,20 @@
       </div>
       <div
         v-else-if="sendingInvites"
-        class="flex items-center justify-center p-4"
+        class="flex p-4 items-center justify-center"
       >
         <SmartSpinner />
       </div>
       <div v-else class="flex flex-col px-2">
-        <div class="flex items-center justify-between flex-1">
+        <div class="flex flex-1 items-center justify-between">
           <label for="memberList" class="px-4 pb-4">
             {{ t("team.pending_invites") }}
           </label>
         </div>
-        <div class="divide-dividerLight border-divider border divide-y rounded">
+        <div class="divide-dividerLight divide-y border border-divider rounded">
           <div
             v-if="pendingInvites.loading"
-            class="flex items-center justify-center p-4"
+            class="flex p-4 items-center justify-center"
           >
             <SmartSpinner />
           </div>
@@ -66,18 +66,18 @@
                 v-for="(invitee, index) in pendingInvites.data.right.team
                   .teamInvitations"
                 :key="`invitee-${index}`"
-                class="divide-dividerLight flex divide-x"
+                class="divide-dividerLight divide-x flex"
               >
                 <input
                   v-if="invitee"
-                  class="text-secondaryLight flex flex-1 px-4 py-2 bg-transparent"
+                  class="bg-transparent flex flex-1 text-secondaryLight py-2 px-4"
                   :placeholder="`${t('team.email')}`"
                   :name="'param' + index"
                   :value="invitee.inviteeEmail"
                   readonly
                 />
                 <input
-                  class="text-secondaryLight flex flex-1 px-4 py-2 bg-transparent"
+                  class="bg-transparent flex flex-1 text-secondaryLight py-2 px-4"
                   :placeholder="`${t('team.permissions')}`"
                   :name="'value' + index"
                   :value="
@@ -103,7 +103,7 @@
                 E.isRight(pendingInvites.data) &&
                 pendingInvites.data.right.team.teamInvitations.length === 0
               "
-              class="text-secondaryLight flex flex-col items-center justify-center p-4"
+              class="flex flex-col text-secondaryLight p-4 items-center justify-center"
             >
               <span class="text-center">
                 {{ t("empty.pending_invites") }}
@@ -111,14 +111,14 @@
             </div>
             <div
               v-if="!pendingInvites.loading && E.isLeft(pendingInvites.data)"
-              class="flex flex-col items-center p-4"
+              class="flex flex-col p-4 items-center"
             >
-              <i class="material-icons mb-4">help_outline</i>
+              <i class="mb-4 material-icons">help_outline</i>
               {{ t("error.something_went_wrong") }}
             </div>
           </div>
         </div>
-        <div class="flex items-center justify-between flex-1 pt-4">
+        <div class="flex flex-1 pt-4 items-center justify-between">
           <label for="memberList" class="p-4">
             {{ t("team.invite_tooltip") }}
           </label>
@@ -131,15 +131,15 @@
             />
           </div>
         </div>
-        <div class="divide-dividerLight border-divider border divide-y rounded">
+        <div class="divide-dividerLight divide-y border border-divider rounded">
           <div
             v-for="(invitee, index) in newInvites"
             :key="`new-invitee-${index}`"
-            class="divide-dividerLight flex divide-x"
+            class="divide-dividerLight divide-x flex"
           >
             <input
               v-model="invitee.key"
-              class="flex flex-1 px-4 py-2 bg-transparent"
+              class="bg-transparent flex flex-1 py-2 px-4"
               :placeholder="`${t('team.email')}`"
               :name="'invitee' + index"
               autofocus
@@ -155,7 +155,7 @@
                 <template #trigger>
                   <span class="select-wrapper">
                     <input
-                      class="flex flex-1 px-4 py-2 bg-transparent cursor-pointer"
+                      class="bg-transparent cursor-pointer flex flex-1 py-2 px-4"
                       :placeholder="`${t('team.permissions')}`"
                       :name="'value' + index"
                       :value="
@@ -209,15 +209,15 @@
           </div>
           <div
             v-if="newInvites.length === 0"
-            class="text-secondaryLight flex flex-col items-center justify-center p-4"
+            class="flex flex-col text-secondaryLight p-4 items-center justify-center"
           >
             <img
               :src="`/images/states/${$colorMode.value}/add_group.svg`"
               loading="lazy"
-              class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+              class="flex-col object-contain object-center h-16 mb-4 w-16 inline-flex"
               :alt="`${t('empty.invites')}`"
             />
-            <span class="pb-4 text-center">
+            <span class="text-center pb-4">
               {{ t("empty.invites") }}
             </span>
             <ButtonSecondary
@@ -229,12 +229,12 @@
         </div>
         <div
           v-if="newInvites.length"
-          class="border-dividerLight flex flex-col items-start px-4 py-4 mt-4 border rounded"
+          class="border border-dividerLight rounded flex flex-col mt-4 py-4 px-4 items-start"
         >
           <span
-            class="bg-primaryDark border-divider flex items-center justify-center px-2 py-1 mb-4 font-semibold border rounded-full"
+            class="bg-primaryDark border border-divider rounded-full flex font-semibold mb-4 py-1 px-2 items-center justify-center"
           >
-            <i class="text-secondaryLight material-icons mr-2">help_outline</i>
+            <i class="mr-2 text-secondaryLight material-icons">help_outline</i>
             {{ t("profile.roles") }}
           </span>
           <p>
@@ -242,10 +242,10 @@
               {{ t("profile.roles_description") }}
             </span>
           </p>
-          <ul class="mt-4 space-y-4">
+          <ul class="space-y-4 mt-4">
             <li class="flex">
               <span
-                class="text-secondaryDark max-w-16 w-1/4 font-semibold uppercase truncate"
+                class="font-semibold text-secondaryDark max-w-16 w-1/4 uppercase truncate"
               >
                 {{ t("profile.owner") }}
               </span>
@@ -255,7 +255,7 @@
             </li>
             <li class="flex">
               <span
-                class="text-secondaryDark max-w-16 w-1/4 font-semibold uppercase truncate"
+                class="font-semibold text-secondaryDark max-w-16 w-1/4 uppercase truncate"
               >
                 {{ t("profile.editor") }}
               </span>
@@ -265,7 +265,7 @@
             </li>
             <li class="flex">
               <span
-                class="text-secondaryDark max-w-16 w-1/4 font-semibold uppercase truncate"
+                class="font-semibold text-secondaryDark max-w-16 w-1/4 uppercase truncate"
               >
                 {{ t("profile.viewer") }}
               </span>
@@ -280,7 +280,7 @@
     <template #footer>
       <p
         v-if="sendInvitesResult.length"
-        class="text-secondaryLight flex justify-between flex-1"
+        class="flex flex-1 text-secondaryLight justify-between"
       >
         <SmartAnchor
           class="link"
diff --git a/packages/hoppscotch-app/components/teams/Team.vue b/packages/hoppscotch-app/components/teams/Team.vue
index fe472548a..5317d46d8 100644
--- a/packages/hoppscotch-app/components/teams/Team.vue
+++ b/packages/hoppscotch-app/components/teams/Team.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="flex flex-col flex-1 border rounded border-divider">
+  <div class="border border-divider rounded flex flex-col flex-1">
     <div
-      class="flex items-start flex-1"
+      class="flex flex-1 items-start"
       :class="
         compact
           ? team.myRole === 'OWNER'
@@ -24,7 +24,7 @@
         >
           {{ team.name || t("state.nothing_found") }}
         </label>
-        <div class="flex mt-2 overflow-hidden -space-x-1">
+        <div class="flex -space-x-1 mt-2 overflow-hidden">
           <img
             v-for="(member, index) in team.teamMembers"
             :key="`member-${index}`"
@@ -32,13 +32,13 @@
             :title="member.user.displayName"
             :src="member.user.photoURL || undefined"
             :alt="member.user.displayName"
-            class="inline-block w-5 h-5 rounded-full ring-primary ring-2"
+            class="rounded-full h-5 ring-primary ring-2 w-5 inline-block"
             loading="lazy"
           />
         </div>
       </div>
     </div>
-    <div v-if="!compact" class="flex items-end justify-between flex-shrink-0">
+    <div v-if="!compact" class="flex flex-shrink-0 items-end justify-between">
       <span>
         <ButtonSecondary
           v-if="team.myRole === 'OWNER'"
diff --git a/packages/hoppscotch-app/components/teams/index.vue b/packages/hoppscotch-app/components/teams/index.vue
index 4c57e602a..579442139 100644
--- a/packages/hoppscotch-app/components/teams/index.vue
+++ b/packages/hoppscotch-app/components/teams/index.vue
@@ -1,6 +1,6 @@
 <template>
   <AppSection label="teams">
-    <div class="p-4 space-y-4">
+    <div class="space-y-4 p-4">
       <ButtonSecondary
         :label="`${t('team.create_new')}`"
         outline
@@ -19,15 +19,15 @@
           E.isRight(myTeams.data) &&
           myTeams.data.right.myTeams.length === 0
         "
-        class="text-secondaryLight flex flex-col items-center justify-center p-4"
+        class="flex flex-col text-secondaryLight p-4 items-center justify-center"
       >
         <img
           :src="`/images/states/${$colorMode.value}/add_group.svg`"
           loading="lazy"
-          class="inline-flex flex-col object-contain object-center w-16 h-16 mb-8"
+          class="flex-col object-contain object-center h-16 mb-8 w-16 inline-flex"
           :alt="`${t('empty.teams')}`"
         />
-        <span class="mb-4 text-center">
+        <span class="text-center mb-4">
           {{ t("empty.teams") }}
         </span>
         <ButtonSecondary
@@ -57,7 +57,7 @@
         v-if="!myTeams.loading && E.isLeft(myTeams.data)"
         class="flex flex-col items-center"
       >
-        <i class="material-icons mb-4">help_outline</i>
+        <i class="mb-4 material-icons">help_outline</i>
         {{ t("error.something_went_wrong") }}
       </div>
     </div>
diff --git a/packages/hoppscotch-app/layouts/default.vue b/packages/hoppscotch-app/layouts/default.vue
index 6e201ecee..078f17663 100644
--- a/packages/hoppscotch-app/layouts/default.vue
+++ b/packages/hoppscotch-app/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex w-screen h-screen">
+  <div class="flex h-screen w-screen">
     <Splitpanes class="no-splitter" :dbl-click-splitter="false" horizontal>
       <Pane v-if="!ZEN_MODE" style="height: auto">
         <AppHeader />
diff --git a/packages/hoppscotch-app/layouts/error.vue b/packages/hoppscotch-app/layouts/error.vue
index d2ddcec09..d9dbbc03f 100644
--- a/packages/hoppscotch-app/layouts/error.vue
+++ b/packages/hoppscotch-app/layouts/error.vue
@@ -3,7 +3,7 @@
     <img
       :src="`/images/states/${$colorMode.value}/youre_lost.svg`"
       loading="lazy"
-      class="inline-flex flex-col object-contain object-center my-4 h-46 w-46"
+      class="flex-col object-contain object-center h-46 my-4 w-46 inline-flex"
       :alt="message"
     />
     <h1 class="mb-4 text-4xl heading">{{ statusCode }}</h1>
diff --git a/packages/hoppscotch-app/pages/documentation.vue b/packages/hoppscotch-app/pages/documentation.vue
index e2b4df35e..8ede25bb8 100644
--- a/packages/hoppscotch-app/pages/documentation.vue
+++ b/packages/hoppscotch-app/pages/documentation.vue
@@ -14,18 +14,18 @@
           class="hide-scrollbar !overflow-auto"
         >
           <AppSection label="import">
-            <div class="flex items-start justify-between p-4">
+            <div class="flex p-4 items-start justify-between">
               <label>
                 {{ $t("documentation.generate_message") }}
               </label>
               <span
-                class="bg-accentDark text-accentContrast inline-flex px-2 py-1 rounded"
+                class="bg-accentDark rounded text-accentContrast py-1 px-2 inline-flex"
               >
                 BETA
               </span>
             </div>
             <div
-              class="bg-primary border-dividerLight sticky top-0 z-10 flex items-start justify-between border-b"
+              class="bg-primary border-b border-dividerLight flex top-0 z-10 sticky items-start justify-between"
             >
               <label for="collectionUpload">
                 <ButtonSecondary
@@ -54,12 +54,12 @@
             <textarea-autosize
               id="import-curl"
               v-model="collectionJSON"
-              class="bg-primary p-4 font-mono"
+              class="bg-primary font-mono p-4"
               autofocus
               rows="8"
             />
             <div
-              class="bg-primary border-dividerLight sticky bottom-0 z-10 flex items-start justify-between p-4 border-t border-b"
+              class="bg-primary border-t border-b border-dividerLight flex p-4 bottom-0 z-10 sticky items-start justify-between"
             >
               <ButtonPrimary
                 :label="$t('documentation.generate')"
@@ -76,16 +76,16 @@
             <div class="flex flex-col">
               <div
                 v-if="items.length === 0"
-                class="text-secondaryLight flex flex-col items-center justify-center p-4"
+                class="flex flex-col text-secondaryLight p-4 items-center justify-center"
               >
-                <i class="material-icons pb-2 opacity-75">topic</i>
+                <i class="opacity-75 pb-2 material-icons">topic</i>
                 <span class="text-center">
                   {{ $t("helpers.generate_documentation_first") }}
                 </span>
               </div>
               <div
                 v-else
-                class="bg-primary border-dividerLight sticky top-0 z-10 flex flex-1 p-4 border-b"
+                class="bg-primary border-b border-dividerLight flex flex-1 p-4 top-0 z-10 sticky"
               >
                 <span
                   v-tippy="{ theme: 'tooltip' }"
diff --git a/packages/hoppscotch-app/pages/enter.vue b/packages/hoppscotch-app/pages/enter.vue
index 78f91fd76..c97814783 100644
--- a/packages/hoppscotch-app/pages/enter.vue
+++ b/packages/hoppscotch-app/pages/enter.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col items-center justify-center min-h-screen">
+  <div class="flex flex-col min-h-screen items-center justify-center">
     <SmartSpinner v-if="signingInWithEmail" />
     <SmartLoadingIndicator v-else />
     <pre v-if="error">{{ error }}</pre>
diff --git a/packages/hoppscotch-app/pages/index.vue b/packages/hoppscotch-app/pages/index.vue
index 1339bbf6e..bdd975b9c 100644
--- a/packages/hoppscotch-app/pages/index.vue
+++ b/packages/hoppscotch-app/pages/index.vue
@@ -57,7 +57,7 @@
         </Pane>
         <Pane
           :size="COLUMN_LAYOUT ? 65 : 50"
-          class="hide-scrollbar !overflow-auto flex flex-col"
+          class="flex flex-col hide-scrollbar !overflow-auto"
         >
           <HttpResponse ref="response" />
         </Pane>
diff --git a/packages/hoppscotch-app/pages/join-team.vue b/packages/hoppscotch-app/pages/join-team.vue
index 9fdac7799..cde2c3d99 100644
--- a/packages/hoppscotch-app/pages/join-team.vue
+++ b/packages/hoppscotch-app/pages/join-team.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="flex flex-col items-center justify-between min-h-screen">
+  <div class="flex flex-col min-h-screen items-center justify-between">
     <div
       v-if="invalidLink"
-      class="flex flex-col items-center justify-center flex-1"
+      class="flex flex-col flex-1 items-center justify-center"
     >
-      <i class="material-icons pb-2 opacity-75">error_outline</i>
-      <h1 class="heading text-center">
+      <i class="opacity-75 pb-2 material-icons">error_outline</i>
+      <h1 class="text-center heading">
         {{ $t("team.invalid_invite_link") }}
       </h1>
       <p class="mt-2 text-center">
@@ -14,13 +14,13 @@
     </div>
     <div
       v-else-if="loadingCurrentUser"
-      class="flex flex-col items-center justify-center flex-1 p-4"
+      class="flex flex-col flex-1 p-4 items-center justify-center"
     >
       <SmartSpinner />
     </div>
     <div
       v-else-if="currentUser === null"
-      class="flex flex-col items-center justify-center flex-1 p-4"
+      class="flex flex-col flex-1 p-4 items-center justify-center"
     >
       <h1 class="heading">{{ $t("team.login_to_continue") }}</h1>
       <p class="mt-2">{{ $t("team.login_to_continue_description") }}</p>
@@ -30,24 +30,24 @@
         @click.native="showLogin = true"
       />
     </div>
-    <div v-else class="flex flex-col items-center justify-center flex-1 p-4">
+    <div v-else class="flex flex-col flex-1 p-4 items-center justify-center">
       <div
         v-if="inviteDetails.loading"
-        class="flex flex-col items-center justify-center flex-1 p-4"
+        class="flex flex-col flex-1 p-4 items-center justify-center"
       >
         <SmartSpinner />
       </div>
       <div v-else>
         <div
           v-if="!inviteDetails.loading && E.isLeft(inviteDetails.data)"
-          class="flex flex-col items-center p-4"
+          class="flex flex-col p-4 items-center"
         >
-          <i class="material-icons mb-4">error_outline</i>
+          <i class="mb-4 material-icons">error_outline</i>
           <p>
             {{ getErrorMessage(inviteDetails.data.left) }}
           </p>
           <p
-            class="border-dividerLight flex flex-col items-center p-4 mt-8 border rounded"
+            class="border border-dividerLight rounded flex flex-col mt-8 p-4 items-center"
           >
             <span class="mb-4">
               {{ $t("team.logout_and_try_again") }}
@@ -66,7 +66,7 @@
             E.isRight(inviteDetails.data) &&
             !joinTeamSuccess
           "
-          class="flex flex-col items-center justify-center flex-1 p-4"
+          class="flex flex-col flex-1 p-4 items-center justify-center"
         >
           <h1 class="heading">
             {{
@@ -75,7 +75,7 @@
               })
             }}
           </h1>
-          <p class="text-secondaryLight mt-2">
+          <p class="mt-2 text-secondaryLight">
             {{
               $t("team.invited_to_team", {
                 owner:
@@ -103,7 +103,7 @@
             E.isRight(inviteDetails.data) &&
             joinTeamSuccess
           "
-          class="flex flex-col items-center justify-center flex-1 p-4"
+          class="flex flex-col flex-1 p-4 items-center justify-center"
         >
           <h1 class="heading">
             {{
@@ -112,7 +112,7 @@
               })
             }}
           </h1>
-          <p class="text-secondaryLight mt-2">
+          <p class="mt-2 text-secondaryLight">
             {{
               $t("team.joined_team_description", {
                 team: inviteDetails.data.right.teamInvitation.team.name,
diff --git a/packages/hoppscotch-app/pages/profile.vue b/packages/hoppscotch-app/pages/profile.vue
index 3a6b0604f..e71d63ef4 100644
--- a/packages/hoppscotch-app/pages/profile.vue
+++ b/packages/hoppscotch-app/pages/profile.vue
@@ -9,10 +9,10 @@
           <img
             :src="`/images/states/${$colorMode.value}/login.svg`"
             loading="lazy"
-            class="inline-flex flex-col object-contain object-center w-24 h-24 my-4"
+            class="flex-col object-contain object-center h-24 my-4 w-24 inline-flex"
             :alt="`${t('empty.parameters')}`"
           />
-          <p class="text-secondaryLight pb-4 text-center">
+          <p class="text-center text-secondaryLight pb-4">
             {{ t("empty.profile") }}
           </p>
           <ButtonPrimary
@@ -23,15 +23,15 @@
         </div>
         <div v-else class="space-y-8">
           <div
-            class="bg-primaryLight md:h-32 -mb-11 h-24 rounded"
+            class="bg-primaryLight rounded h-24 -mb-11 md:h-32"
             style="background-image: url('/images/cover.svg')"
           ></div>
-          <div class="md:flex-row flex flex-col justify-between px-4 space-y-8">
+          <div class="flex flex-col space-y-8 px-4 justify-between md:flex-row">
             <div class="flex items-end">
               <img
                 v-if="currentUser.photoURL"
                 :src="currentUser.photoURL"
-                class="ring-4 ring-primary w-16 h-16 rounded-lg"
+                class="rounded-lg h-16 ring-primary ring-4 w-16"
                 :alt="currentUser.displayName"
               />
               <SmartIcon v-else name="user" class="svg-icons" />
@@ -39,17 +39,17 @@
                 <label class="heading">
                   {{ currentUser.displayName || t("state.nothing_found") }}
                 </label>
-                <p class="text-secondaryLight flex items-center">
+                <p class="flex text-secondaryLight items-center">
                   {{ currentUser.email }}
                   <SmartIcon
                     v-if="currentUser.emailVerified"
                     name="verified"
-                    class="svg-icons ml-2 text-green-500"
+                    class="ml-2 text-green-500 svg-icons"
                   />
                 </p>
               </div>
             </div>
-            <div class="flex items-end space-x-2">
+            <div class="flex space-x-2 items-end">
               <div>
                 <SmartItem
                   to="/settings"
@@ -68,10 +68,10 @@
               :selected="true"
             >
               <section class="p-4">
-                <h4 class="text-secondaryDark font-semibold">
+                <h4 class="font-semibold text-secondaryDark">
                   {{ t("settings.profile") }}
                 </h4>
-                <div class="text-secondaryLight mt-1">
+                <div class="mt-1 text-secondaryLight">
                   {{ t("settings.profile_description") }}
                 </div>
                 <div class="py-4">
@@ -79,7 +79,7 @@
                     {{ t("settings.profile_name") }}
                   </label>
                   <form
-                    class="md:max-w-sm flex mt-2"
+                    class="flex mt-2 md:max-w-sm"
                     @submit.prevent="updateDisplayName"
                   >
                     <input
@@ -93,7 +93,7 @@
                     />
                     <ButtonPrimary
                       :label="t('action.save')"
-                      class="min-w-16 ml-2"
+                      class="ml-2 min-w-16"
                       type="submit"
                       :loading="updatingDisplayName"
                     />
@@ -101,13 +101,13 @@
                 </div>
               </section>
               <section class="p-4">
-                <h4 class="text-secondaryDark font-semibold">
+                <h4 class="font-semibold text-secondaryDark">
                   {{ t("settings.sync") }}
                 </h4>
-                <div class="text-secondaryLight mt-1">
+                <div class="mt-1 text-secondaryLight">
                   {{ t("settings.sync_description") }}
                 </div>
-                <div class="py-4 space-y-4">
+                <div class="space-y-4 py-4">
                   <div class="flex items-center">
                     <SmartToggle
                       :on="SYNC_COLLECTIONS"
diff --git a/packages/hoppscotch-app/pages/r/_id.vue b/packages/hoppscotch-app/pages/r/_id.vue
index 2321d547c..7713fc252 100644
--- a/packages/hoppscotch-app/pages/r/_id.vue
+++ b/packages/hoppscotch-app/pages/r/_id.vue
@@ -2,30 +2,30 @@
   <div class="flex flex-col items-center justify-between">
     <div
       v-if="invalidLink"
-      class="flex flex-col items-center justify-center flex-1"
+      class="flex flex-col flex-1 items-center justify-center"
     >
-      <i class="material-icons pb-2 opacity-75">error_outline</i>
-      <h1 class="heading text-center">
+      <i class="opacity-75 pb-2 material-icons">error_outline</i>
+      <h1 class="text-center heading">
         {{ $t("error.invalid_link") }}
       </h1>
       <p class="mt-2 text-center">
         {{ $t("error.invalid_link_description") }}
       </p>
     </div>
-    <div v-else class="flex flex-col items-center justify-center flex-1 p-4">
+    <div v-else class="flex flex-col flex-1 p-4 items-center justify-center">
       <div
         v-if="shortcodeDetails.loading"
-        class="flex flex-col items-center justify-center flex-1 p-4"
+        class="flex flex-col flex-1 p-4 items-center justify-center"
       >
         <SmartSpinner />
       </div>
       <div v-else>
         <div
           v-if="!shortcodeDetails.loading && E.isLeft(shortcodeDetails.data)"
-          class="flex flex-col items-center p-4"
+          class="flex flex-col p-4 items-center"
         >
-          <i class="material-icons pb-2 opacity-75">error_outline</i>
-          <h1 class="heading text-center">
+          <i class="opacity-75 pb-2 material-icons">error_outline</i>
+          <h1 class="text-center heading">
             {{ $t("error.invalid_link") }}
           </h1>
           <p class="mt-2 text-center">
@@ -43,7 +43,7 @@
         </div>
         <div
           v-if="!shortcodeDetails.loading && E.isRight(shortcodeDetails.data)"
-          class="flex flex-col items-center justify-center flex-1 p-4"
+          class="flex flex-col flex-1 p-4 items-center justify-center"
         >
           <h1 class="heading">
             {{ $t("state.loading") }}
diff --git a/packages/hoppscotch-app/pages/settings.vue b/packages/hoppscotch-app/pages/settings.vue
index 7da34e490..e4981948a 100644
--- a/packages/hoppscotch-app/pages/settings.vue
+++ b/packages/hoppscotch-app/pages/settings.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="container divide-dividerLight space-y-8 divide-y">
+    <div class="container divide-dividerLight divide-y space-y-8">
       <div class="md:grid md:gap-4 md:grid-cols-3">
         <div class="p-8 md:col-span-1">
           <h3 class="heading">
@@ -10,7 +10,7 @@
             {{ $t("settings.theme_description") }}
           </p>
         </div>
-        <div class="p-8 md:col-span-2 space-y-8">
+        <div class="space-y-8 p-8 md:col-span-2">
           <section>
             <h4 class="font-semibold text-secondaryDark">
               {{ $t("settings.background") }}
@@ -68,7 +68,7 @@
                 {{ $t("app.contact_us") }} </SmartLink
               >.
             </div>
-            <div class="py-4 space-y-4">
+            <div class="space-y-4 py-4">
               <div class="flex items-center">
                 <SmartToggle :on="TELEMETRY_ENABLED" @change="showConfirmModal">
                   {{ $t("settings.telemetry") }}
@@ -109,7 +109,7 @@
             {{ $t("settings.interceptor_description") }}
           </p>
         </div>
-        <div class="p-8 md:col-span-2 space-y-8">
+        <div class="space-y-8 p-8 md:col-span-2">
           <section>
             <h4 class="font-semibold text-secondaryDark">
               {{ $t("settings.extensions") }}
@@ -127,7 +127,7 @@
                 {{ $t("settings.extension_ver_not_reported") }}
               </span>
             </div>
-            <div class="flex flex-col py-4 space-y-2">
+            <div class="flex flex-col space-y-2 py-4">
               <span>
                 <SmartItem
                   to="https://addons.mozilla.org/en-US/firefox/addon/hoppscotch"
@@ -151,7 +151,7 @@
                 />
               </span>
             </div>
-            <div class="py-4 space-y-4">
+            <div class="space-y-4 py-4">
               <div class="flex items-center">
                 <SmartToggle
                   :on="EXTENSIONS_ENABLED"
@@ -180,7 +180,7 @@
                 {{ $t("app.proxy_privacy_policy") }} </SmartLink
               >.
             </div>
-            <div class="py-4 space-y-4">
+            <div class="space-y-4 py-4">
               <div class="flex items-center">
                 <SmartToggle
                   :on="PROXY_ENABLED"
@@ -190,8 +190,8 @@
                 </SmartToggle>
               </div>
             </div>
-            <div class="flex items-center py-4 space-x-2">
-              <div class="relative flex flex-col flex-1">
+            <div class="flex space-x-2 py-4 items-center">
+              <div class="flex flex-col flex-1 relative">
                 <input
                   id="url"
                   v-model="PROXY_URL"