diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/AddExtraCommandsDialog.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/AddExtraCommandsDialog.kt
index 0f07f90d..13760fb3 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/AddExtraCommandsDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/AddExtraCommandsDialog.kt
@@ -93,8 +93,12 @@ class AddExtraCommandsDialog(private val item: DownloadItem? = null, private val
             view.findViewById<View>(R.id.current).visibility = View.GONE
         }
 
-        text.enableTextHighlight()
-        currentText.enableTextHighlight()
+        if (sharedPreferences.getBoolean("use_code_color_highlighter", true)) {
+            text.enableTextHighlight()
+            currentText.enableTextHighlight()
+        }
+
+
 
         text?.setText(item?.extraCommands)
         val imm = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadCommandFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadCommandFragment.kt
index 2816e10d..627d4e75 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadCommandFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadCommandFragment.kt
@@ -104,7 +104,9 @@ class DownloadCommandFragment(private val resultItem: ResultItem? = null, privat
 
                 val chosenCommandView = view.findViewById<TextInputLayout>(R.id.content)
                 chosenCommandView.editText?.setText(downloadItem.format.format_note)
-                chosenCommandView.editText?.enableTextHighlight()
+                if (preferences.getBoolean("use_code_color_highlighter", true)) {
+                    chosenCommandView.editText?.enableTextHighlight()
+                }
                 chosenCommandView.endIconDrawable = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_delete_all)
                 chosenCommandView.editText!!.addTextChangedListener(object : TextWatcher {
                     override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {}
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadsAlreadyExistDialog.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadsAlreadyExistDialog.kt
index cd9fdded..4e50ffe7 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadsAlreadyExistDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadsAlreadyExistDialog.kt
@@ -168,7 +168,7 @@ class DownloadsAlreadyExistDialog : BottomSheetDialogFragment(), AlreadyExistsAd
             val historyItem = withContext(Dispatchers.IO){
                 downloadViewModel.getHistoryItemById(historyItemID)
             }
-            UiUtil.showHistoryItemDetailsCard(historyItem, requireActivity(), isPresent = true,
+            UiUtil.showHistoryItemDetailsCard(historyItem, requireActivity(), isPresent = true, preferences,
                 removeItem = { item, deleteFile ->
                     historyViewModel.delete(item, deleteFile)
                 },
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/ResultCardDetailsDialog.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/ResultCardDetailsDialog.kt
index e6f2213c..333d0334 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/ResultCardDetailsDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/ResultCardDetailsDialog.kt
@@ -450,6 +450,7 @@ class ResultCardDetailsDialog : BottomSheetDialogFragment(), GenericDownloadAdap
                 requireActivity(),
                 DownloadRepository.Status.valueOf(item.status),
                 ytdlpViewModel,
+                sharedPreferences,
                 removeItem = { it: DownloadItem, sheet: BottomSheetDialog ->
                     sheet.hide()
                     removeQueuedItem(itemID)
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt
index 6563172f..214e06e9 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt
@@ -178,6 +178,7 @@ class CancelledDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClic
                 requireActivity(),
                 DownloadRepository.Status.valueOf(item.status),
                 ytdlpViewModel,
+                preferences,
                 removeItem = { it: DownloadItem, sheet: BottomSheetDialog ->
                     removeItem(it, sheet)
                 },
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt
index 7a9b1e28..5d9d6db4 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt
@@ -178,6 +178,7 @@ class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickL
                requireActivity(),
                DownloadRepository.Status.valueOf(item.status),
                ytdlpViewModel,
+               preferences,
                removeItem = { it: DownloadItem, sheet: BottomSheetDialog ->
                    removeItem(it, sheet)
 
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/HistoryFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/HistoryFragment.kt
index e1470732..061c5a97 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/HistoryFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/HistoryFragment.kt
@@ -506,7 +506,7 @@ class HistoryFragment : Fragment(), HistoryPaginatedAdapter.OnItemClickListener{
                 historyViewModel.getByID(itemID)
             }
 
-            UiUtil.showHistoryItemDetailsCard(item, requireActivity(), filePresent,
+            UiUtil.showHistoryItemDetailsCard(item, requireActivity(), filePresent, sharedPreferences,
                 removeItem = { it, deleteFile ->
                     historyViewModel.delete(it, deleteFile)
                 },
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/QueuedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/QueuedDownloadsFragment.kt
index dc508f6a..604322fb 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/QueuedDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/QueuedDownloadsFragment.kt
@@ -454,6 +454,7 @@ class QueuedDownloadsFragment : Fragment(), QueuedDownloadAdapter.OnItemClickLis
                 requireActivity(),
                 DownloadRepository.Status.valueOf(item.status),
                 ytdlpViewModel,
+                sharedPreferences,
                 removeItem = { it: DownloadItem, sheet: BottomSheetDialog ->
                     sheet.hide()
                     removeItem(it.id)
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt
index 32914d2e..7d6d2912 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt
@@ -187,6 +187,7 @@ class SavedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLis
                 requireActivity(),
                 DownloadRepository.Status.valueOf(item.status),
                 ytdlpViewModel,
+                preferences,
                 removeItem = { it: DownloadItem, sheet: BottomSheetDialog ->
                     removeItem(it, sheet)
                 },
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt
index f449e090..e13d122c 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt
@@ -183,6 +183,7 @@ class ScheduledDownloadsFragment : Fragment(), ScheduledDownloadAdapter.OnItemCl
                 requireActivity(),
                 DownloadRepository.Status.valueOf(item.status),
                 ytdlpViewModel,
+                preferences,
                 removeItem = { it: DownloadItem, sheet: BottomSheetDialog ->
                     sheet.hide()
                     removeItem(it, sheet)
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/more/CookiesFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/more/CookiesFragment.kt
index a7d715b2..21baf624 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/CookiesFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/CookiesFragment.kt
@@ -190,7 +190,9 @@ class CookiesFragment : Fragment(), CookieAdapter.OnItemClickListener {
             item?.apply {
                 current.findViewById<TextView>(R.id.currentText).apply {
                     setText(item.content)
-                    enableTextHighlight()
+                    if (preferences.getBoolean("use_code_color_highlighter", true)) {
+                        enableTextHighlight()
+                    }
                 }
             }
 
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/more/downloadLogs/DownloadLogFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/more/downloadLogs/DownloadLogFragment.kt
index 6b6de2c1..3c4432da 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/downloadLogs/DownloadLogFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/downloadLogs/DownloadLogFragment.kt
@@ -126,7 +126,9 @@ class DownloadLogFragment : Fragment() {
 
         lifecycleScope.launch(Dispatchers.IO){
             content.isFocusable = true
-            content.enableTextHighlight()
+            if (sharedPreferences.getBoolean("use_code_color_highlighter", true)) {
+                content.enableTextHighlight()
+            }
         }
 
         contentScrollView.enableFastScroll()
diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt
index 47156635..7f643383 100644
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt
@@ -227,7 +227,11 @@ class TerminalFragment : Fragment() {
         notificationUtil = NotificationUtil(requireContext())
         initMenu()
 
-        input?.enableTextHighlight()
+        lifecycleScope.launch(Dispatchers.IO) {
+            if (sharedPreferences.getBoolean("use_code_color_highlighter", true)) {
+                input?.enableTextHighlight()
+            }
+        }
 
         input?.append(bundle?.getString("input") ?: "")
         input!!.requestFocus()
diff --git a/app/src/main/java/com/deniscerri/ytdl/util/FormatUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/FormatUtil.kt
index 6a2db701..9a9a3d1a 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/FormatUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/util/FormatUtil.kt
@@ -66,14 +66,14 @@ class FormatUtil(private var context: Context) {
             val orderPreferences = sharedPreferences.getString("format_importance_video", itemValues.joinToString(","))!!.split(",").toMutableList()
             if (preferSmallerFormats) {
                 orderPreferences.remove("file_size")
-                orderPreferences.add(0, "smallsize")
+                orderPreferences.add("smallsize")
             }
 
             return orderPreferences
         }else {
             val formatImportance = mutableListOf("resolution", "codec", "container")
             if (sharedPreferences.getBoolean("prefer_smaller_formats", false)) {
-                formatImportance.add(0, "smallsize")
+                formatImportance.add("smallsize")
             }
 
             return formatImportance
diff --git a/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt
index 8c769f2b..48cb733f 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt
@@ -533,6 +533,7 @@ object UiUtil {
         context: Activity,
         status: DownloadRepository.Status,
         ytdlpViewModel: YTDLPViewModel,
+        preferences: SharedPreferences,
         removeItem : (DownloadItem, BottomSheetDialog) -> Unit,
         downloadItem: (DownloadItem) -> Unit,
         longClickDownloadButton: (DownloadItem) -> Unit,
@@ -642,7 +643,7 @@ object UiUtil {
         else fileSize!!.text = fileSizeReadable
 
         command?.setOnClickListener {
-            showGeneratedCommand(context, ytdlpViewModel.parseYTDLRequestString(item))
+            showGeneratedCommand(context, preferences, ytdlpViewModel.parseYTDLRequestString(item))
         }
 
         val link = bottomSheet.findViewById<Button>(R.id.bottom_sheet_link)
@@ -736,6 +737,7 @@ object UiUtil {
         item: HistoryItem?,
         context: Activity,
         isPresent: Boolean,
+        preferences: SharedPreferences,
         removeItem: (item:HistoryItem, removeFiles: Boolean) -> Unit,
         redownloadItem: (HistoryItem) -> Unit,
         redownloadShowDownloadCard: (HistoryItem) -> Unit,
@@ -861,7 +863,7 @@ object UiUtil {
         else fileSize!!.text = fileSizeReadable
 
         command?.setOnClickListener {
-            showGeneratedCommand(context, item.command)
+            showGeneratedCommand(context, preferences, item.command)
         }
 
         val availableFiles = item.downloadPath.filter { FileUtil.exists(it) }
@@ -2094,7 +2096,7 @@ object UiUtil {
         dialog.getButton(AlertDialog.BUTTON_NEUTRAL).gravity = Gravity.START
     }
 
-    private fun showGeneratedCommand(context: Activity, command: String){
+    private fun showGeneratedCommand(context: Activity, preferences: SharedPreferences, command: String) {
         val builder = MaterialAlertDialogBuilder(context)
         builder.setTitle(context.getString(R.string.command))
         val view = context.layoutInflater.inflate(R.layout.command_dialog, null)
@@ -2102,7 +2104,9 @@ object UiUtil {
             text = command
             isLongClickable = true
             setTextIsSelectable(true)
-            enableTextHighlight()
+            if (preferences.getBoolean("use_code_color_highlighter", true)) {
+                enableTextHighlight()
+            }
             setPadding(20, 0, 20, 0)
         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26a3a7df..f9c497c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -465,4 +465,5 @@
     <string name="cache_directory_warning">Changing the Cache Folder might cause unexpected issues. If the app cannot write to the configured path, it will resort to the default internal cache directory</string>
     <string name="app_icon_change">Icon could change and Application will close</string>
     <string name="use_format_sorting">Use Format Importance Ordering</string>
+    <string name="use_code_highlighter">Use Code Color Highlighter</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/general_preferences.xml b/app/src/main/res/xml/general_preferences.xml
index 5f18cd2b..6ccfc144 100644
--- a/app/src/main/res/xml/general_preferences.xml
+++ b/app/src/main/res/xml/general_preferences.xml
@@ -190,6 +190,13 @@
             android:key="swipe_gestures_download_card"
             app:title="@string/swipe_gestures_download_card" />
 
+        <SwitchPreferenceCompat
+            android:widgetLayout="@layout/preferece_material_switch"
+            app:defaultValue="true"
+            android:icon="@drawable/baseline_color_lens_24"
+            android:key="use_code_color_highlighter"
+            app:title="@string/use_code_highlighter" />
+
         <SwitchPreferenceCompat
             android:widgetLayout="@layout/preferece_material_switch"
             app:defaultValue="false"