diff --git a/src/@types/index.d.ts b/src/@types/index.d.ts
index 7c66d2b2..c6f41d1b 100644
--- a/src/@types/index.d.ts
+++ b/src/@types/index.d.ts
@@ -108,7 +108,6 @@ export type MultipleOptions = {
   index: number
   selected: CourseOption[]
   options: CourseOption[][]
-  names: string[]
 }
 
 export type ImportedCourses = { 
diff --git a/src/api/storage.ts b/src/api/storage.ts
index efd85b6a..040e2f81 100644
--- a/src/api/storage.ts
+++ b/src/api/storage.ts
@@ -3,7 +3,7 @@ import { getCourseTeachers } from '../utils/utils'
 import API from './backend'
 
 
-const INITIAL_VALUE = { index: 0, selected: [], options: [], names: Array.from({ length: 10 }, (_, i) => `Horário ${i + 1}`) }
+const INITIAL_VALUE = { index: 0, selected: [], options: [] }
 
 const isStorageValid = (key: string, daysElapsed: number) => {
   const stored = JSON.parse(localStorage.getItem(key))
@@ -32,8 +32,6 @@ const getOptionsStorage = (): MultipleOptions => {
   try {
     if (isStorageValid(key, 7)) {
       const courseOptions: MultipleOptions = JSON.parse(localStorage.getItem(key))
-      // For older files (which don't have the attribute 'names')
-      if (courseOptions.names === undefined) courseOptions.names = INITIAL_VALUE.names
 
       for (let i = 0; i < courseOptions.options.length; i++) {
         for (let j = 0; j < courseOptions.options[i].length; j++) {
diff --git a/src/components/planner/schedule/PrintSchedule.tsx b/src/components/planner/schedule/PrintSchedule.tsx
index 14ef58ea..5a260bda 100644
--- a/src/components/planner/schedule/PrintSchedule.tsx
+++ b/src/components/planner/schedule/PrintSchedule.tsx
@@ -1,32 +1,38 @@
-import { useCallback } from 'react'
+import { useCallback, useContext } from 'react'
+import { ThemeContext } from '../../../contexts/ThemeContext'
 import { Button } from '../../ui/button'
 import { CameraIcon } from '@heroicons/react/24/outline'
 import { toPng } from 'html-to-image'
 import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '../../ui/tooltip'
 
 const PrintSchedule = ({ component }) => {
-  const takeScreenshot = useCallback(() => {
-    if (component.current === null) {
-      return
-    }
+  const { enabled, setEnabled } = useContext(ThemeContext)
 
-    toPng(component.current, { cacheBust: true, backgroundColor: 'white' })
-      .then((dataUrl) => {
-        const link = document.createElement('a')
-        link.download = 'horario.png'
-        link.href = dataUrl
-        link.click()
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }, [component])
+  const takeScreenshot = useCallback(
+    (isThemeEnabled) => {
+      if (component.current === null) {
+        return
+      }
+
+      toPng(component.current, { cacheBust: true, backgroundColor: isThemeEnabled ? '#252733' : '#fbfbfb' })
+        .then((dataUrl) => {
+          const link = document.createElement('a')
+          link.download = 'horario.png'
+          link.href = dataUrl
+          link.click()
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
+    [component]
+  )
 
   return (
     <TooltipProvider delayDuration={300}>
       <Tooltip>
         <TooltipTrigger asChild>
-          <Button variant="icon" className="bg-lightish text-black" onClick={takeScreenshot}>
+          <Button variant="icon" className="bg-lightish text-black" onClick={() => takeScreenshot(enabled)}>
             <CameraIcon className="h-5 w-5" />
           </Button>
         </TooltipTrigger>
diff --git a/src/components/planner/sidebar/ClassSelector.tsx b/src/components/planner/sidebar/ClassSelector.tsx
index 74c3c030..93dcedd5 100644
--- a/src/components/planner/sidebar/ClassSelector.tsx
+++ b/src/components/planner/sidebar/ClassSelector.tsx
@@ -85,7 +85,6 @@ const ClassSelector = ({ courseOption, multipleOptionsHook, isImportedOptionHook
         index: prev.index,
         selected: [...newCourseOptions],
         options: prev.options,
-        names: prev.names,
       }
     })
   }
@@ -122,7 +121,6 @@ const ClassSelector = ({ courseOption, multipleOptionsHook, isImportedOptionHook
           index: prev.index,
           selected: [...newCourseOptions],
           options: prev.options,
-          names: prev.names,
         }
       })
     } else if (type === 'TP') {
@@ -141,7 +139,6 @@ const ClassSelector = ({ courseOption, multipleOptionsHook, isImportedOptionHook
           index: prev.index,
           selected: [...newCourseOptions],
           options: prev.options,
-          names: prev.names,
         }
       })
     }
@@ -183,7 +180,6 @@ const ClassSelector = ({ courseOption, multipleOptionsHook, isImportedOptionHook
         index: prevMultipleOptions.index,
         selected: resolvedCourseOptions,
         options: resolvedOptions,
-        names: prevMultipleOptions.names,
       }
 
       return value
diff --git a/src/components/planner/sidebar/CoursesController.tsx b/src/components/planner/sidebar/CoursesController.tsx
index bd93d8aa..8d2f15e1 100644
--- a/src/components/planner/sidebar/CoursesController.tsx
+++ b/src/components/planner/sidebar/CoursesController.tsx
@@ -1,5 +1,5 @@
 import { removeDuplicatesFromCourseOption } from '../../../utils/utils'
-import { default as ClassSelector } from './ClassSelector'
+import ClassSelector from './ClassSelector'
 
 const CoursesController = ({ multilpleOptionsHook, isImportedOptionHook }) => {
   const [multipleOptions, setMultipleOptions] = multilpleOptionsHook
@@ -8,16 +8,16 @@ const CoursesController = ({ multilpleOptionsHook, isImportedOptionHook }) => {
   return (
     <div className="flex w-full flex-col gap-4 px-0 py-2">
       {multipleOptions.selected.length > 0 &&
-        removeDuplicatesFromCourseOption(multipleOptions.options[multipleOptions.index]).map(
-          (courseOption, courseOptionIdx) => (
+        removeDuplicatesFromCourseOption(multipleOptions.options[multipleOptions.index])
+          .sort((a, b) => a.course.info.sigarra_id - b.course.info.sigarra_id)
+          .map((courseOption, courseOptionIdx) => (
             <ClassSelector
               courseOption={courseOption}
               multipleOptionsHook={[multipleOptions, setMultipleOptions]}
               isImportedOptionHook={[isImportedOption, setIsImportedOption]}
               key={`course-schedule-${multipleOptions.index}-${courseOption.course.info.id}`}
             />
-          )
-        )}
+          ))}
     </div>
   )
 }
diff --git a/src/components/planner/sidebar/OptionsController.tsx b/src/components/planner/sidebar/OptionsController.tsx
index 97e2fa84..1a4fc4ea 100644
--- a/src/components/planner/sidebar/OptionsController.tsx
+++ b/src/components/planner/sidebar/OptionsController.tsx
@@ -24,7 +24,6 @@ const Option = ({ item, selectedHook, multipleOptionsHook }) => {
       index: newIndex - 1,
       selected: prev.options[newIndex - 1],
       options: [...prev.options],
-      names: prev.names,
     }))
   }
 
diff --git a/src/components/planner/sidebar/index.ts b/src/components/planner/sidebar/index.ts
index 9a25bc70..437a5e95 100644
--- a/src/components/planner/sidebar/index.ts
+++ b/src/components/planner/sidebar/index.ts
@@ -2,10 +2,12 @@ import SessionController from './SessionController'
 import OptionsController from './OptionsController'
 import SelectedOptionController from './SelectedOptionController'
 import CoursesController from './CoursesController'
+import ClassSelector from './ClassSelector'
 
 export {
     SessionController,
     OptionsController,
     SelectedOptionController,
-    CoursesController
+    CoursesController,
+    ClassSelector
 }
diff --git a/src/components/planner/sidebar/selectedOptionController/CopyOption.tsx b/src/components/planner/sidebar/selectedOptionController/CopyOption.tsx
index fa375675..71bd46ab 100644
--- a/src/components/planner/sidebar/selectedOptionController/CopyOption.tsx
+++ b/src/components/planner/sidebar/selectedOptionController/CopyOption.tsx
@@ -4,11 +4,12 @@ import { CheckIcon, DocumentDuplicateIcon } from '@heroicons/react/24/outline'
 import { Major, CourseOption } from '../../../../@types'
 import { useToast } from '../../../ui/use-toast'
 import { Buffer } from 'buffer'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../../ui/tooltip'
 
 type Props = {
   majorHook: [Major, React.Dispatch<React.SetStateAction<Major>>]
   currentOption: CourseOption[]
-  className?: string,
+  className?: string
 }
 
 /**
@@ -68,13 +69,20 @@ const CopyOption = ({ majorHook, currentOption, className }: Props) => {
   }
 
   return (
-    <Button
-      variant="icon"
-      className={className.concat(' h-min w-min flex-grow bg-primary')}
-      onClick={() => copyOption()}
-    >
-      {icon ? <CheckIcon className="h-5 w-5" /> : <DocumentDuplicateIcon className="h-5 w-5" />}
-    </Button>
+    <TooltipProvider delayDuration={300}>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <Button
+            variant="icon"
+            className={className.concat(' h-min w-min flex-grow bg-primary')}
+            onClick={() => copyOption()}
+          >
+            {icon ? <CheckIcon className="h-5 w-5" /> : <DocumentDuplicateIcon className="h-5 w-5" />}
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent>Copiar horário</TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
   )
 }
 
diff --git a/src/components/planner/sidebar/selectedOptionController/PasteOption.tsx b/src/components/planner/sidebar/selectedOptionController/PasteOption.tsx
index 2e713bb0..83c3e376 100644
--- a/src/components/planner/sidebar/selectedOptionController/PasteOption.tsx
+++ b/src/components/planner/sidebar/selectedOptionController/PasteOption.tsx
@@ -16,6 +16,7 @@ import React, { useEffect, useState } from 'react'
 import ConfirmationModal from './ConfirmationModal'
 import { Buffer } from 'buffer'
 import fillOptions from './fillOptions'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../../ui/tooltip'
 
 type Props = {
   majors: Major[]
@@ -25,13 +26,7 @@ type Props = {
   isImportedOptionHook: [boolean, React.Dispatch<React.SetStateAction<boolean>>]
 }
 
-const PasteOption = ({
-  majors,
-  majorHook,
-  multipleOptionsHook,
-  checkCourses,
-  isImportedOptionHook,
-}: Props) => {
+const PasteOption = ({ majors, majorHook, multipleOptionsHook, checkCourses, isImportedOptionHook }: Props) => {
   const [multipleOptions, setMultipleOptions] = multipleOptionsHook
   const [major, setMajor] = majorHook
   const [modalOpen, setModalOpen] = useState(false)
@@ -54,12 +49,14 @@ const PasteOption = ({
     }
   }, [])
 
-  const importSchedule = async (value = null) => {
-    const url = value ?? await navigator.clipboard.readText()
+  const importSchedule = async (value) => {
+    const url = value
     const decoded_url = Buffer.from(url, 'base64').toString()
 
     if (!isValidURL(decoded_url)) {
-      const description = value ? 'O texto inserido não é uma opção válida' : 'O texto do clipboard não é uma opção válida';
+      const description = value
+        ? 'O texto inserido não é uma opção válida'
+        : 'O texto do clipboard não é uma opção válida'
       toast({
         title: 'Erro ao colar opção',
         description,
@@ -168,8 +165,8 @@ const PasteOption = ({
       const selected_option =
         class_name_option !== 'null'
           ? course_schedules.find(
-            (schedule) => schedule.class_name === class_name_option && schedule.lesson_type !== 'T'
-          )
+              (schedule) => schedule.class_name === class_name_option && schedule.lesson_type !== 'T'
+            )
           : null
 
       const course_option: CourseOption = {
@@ -205,7 +202,6 @@ const PasteOption = ({
         index: prevMultipleOptions.index,
         selected: importedOption.courses,
         options: newOptions,
-        names: prevMultipleOptions.names,
       }
 
       return value
@@ -217,34 +213,59 @@ const PasteOption = ({
 
   return (
     <>
-      {isClipboardSupported
-        ? <Button variant="icon" onClick={importSchedule} className="sm:py-0 xl:p-1 h-min w-min flex-grow bg-primary">
-          <ClipboardDocumentIcon className="h-5 w-5" />
-        </Button>
-        :
+      {isClipboardSupported ? (
+        <TooltipProvider delayDuration={300}>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button
+                variant="icon"
+                onClick={async () => {
+                  const value = await navigator.clipboard.readText()
+                  importSchedule(value)
+                }}
+                className="h-min w-min flex-grow bg-primary sm:py-0 xl:p-1"
+              >
+                <ClipboardDocumentIcon className="h-5 w-5" />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>Colar horário</TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      ) : (
         <DropdownMenu open={isDropdownOpen}>
-          <DropdownMenuTrigger asChild>
-            <Button onClick={() => setIsDropdownOpen(true)} variant="icon" className="sm:py-0 xl:p-1 h-min w-min flex-grow bg-primary">
-              <ClipboardDocumentIcon className="h-5 w-5" />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent>
-            <input
-              autoFocus
-              type="text"
-              placeholder="Colar aqui opção"
-              className="w-full p-2 rounded border border-slate-200 dark:border-slate-800 text-slate-950 dark:text-slate-50 focus:outline-none focus:ring-2 focus:ring-primary"
-              onPaste={(e) => importSchedule(e.clipboardData.getData('text/plain'))}
-              onKeyDown={(e) => {
-                if (e.key === 'Enter') {
-                  importSchedule(e.currentTarget.value)
-                }
-              }}
-              onBlur={() => setIsDropdownOpen(false)}
-            />
-          </DropdownMenuContent>
+          <TooltipProvider delayDuration={300}>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <DropdownMenuTrigger asChild>
+                  <Button
+                    onClick={() => setIsDropdownOpen(true)}
+                    variant="icon"
+                    className="h-min w-min flex-grow bg-primary sm:py-0 xl:p-1"
+                  >
+                    <ClipboardDocumentIcon className="h-5 w-5" />
+                  </Button>
+                </DropdownMenuTrigger>
+              </TooltipTrigger>
+              <TooltipContent>Colar horário</TooltipContent>
+              <DropdownMenuContent>
+                <input
+                  autoFocus
+                  type="text"
+                  placeholder="Colar aqui opção"
+                  className="text-slate-950 w-full rounded border border-slate-200 p-2 focus:outline-none focus:ring-2 focus:ring-primary dark:border-slate-800 dark:text-slate-50"
+                  onPaste={(e) => importSchedule(e.clipboardData.getData('text/plain'))}
+                  onKeyDown={(e) => {
+                    if (e.key === 'Enter') {
+                      importSchedule(e.currentTarget.value)
+                    }
+                  }}
+                  onBlur={() => setIsDropdownOpen(false)}
+                />
+              </DropdownMenuContent>
+            </Tooltip>
+          </TooltipProvider>
         </DropdownMenu>
-      }
+      )}
       <ConfirmationModal
         major={importingMajor}
         isOpen={modalOpen}
diff --git a/src/components/planner/sidebar/selectedOptionController/RandomFill.tsx b/src/components/planner/sidebar/selectedOptionController/RandomFill.tsx
index 42b77c9c..55765bd4 100644
--- a/src/components/planner/sidebar/selectedOptionController/RandomFill.tsx
+++ b/src/components/planner/sidebar/selectedOptionController/RandomFill.tsx
@@ -6,6 +6,7 @@ import { Button } from '../../../ui/button'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../../ui/tooltip'
 import { ScrollArea } from '../../../ui/scroll-area'
 import { Checkbox } from '../../../ui/checkbox'
+import { Separator } from '../../../ui/separator'
 
 type Props = {
   multipleOptionsHook: [MultipleOptions, React.Dispatch<React.SetStateAction<MultipleOptions>>]
@@ -15,12 +16,10 @@ type Props = {
 const RandomFill = ({ multipleOptionsHook, className }: Props) => {
   const [multipleOptions, setMultipleOptions] = multipleOptionsHook
   const courseOptions = removeDuplicatesFromCourseOption(multipleOptions.selected)
-
   const [permutations, setPermutations] = useState([])
   const [lockedCourses, setLockedCourses] = useState(
     courseOptions.filter((course) => course.locked).map((course) => course.course.info.acronym)
   )
-
   const [randomClasses, setRandomClasses] = useState({})
 
   /* 
@@ -56,8 +55,7 @@ const RandomFill = ({ multipleOptionsHook, className }: Props) => {
       if (course.locked) {
         return [course.option]
       }
-      let aux = course.schedules.filter((schedule) => schedule.lesson_type != 'T' && randomClasses[schedule.class_name])
-      return aux
+      return course.schedules.filter((schedule) => schedule.lesson_type != 'T' && randomClasses[schedule.class_name])
     })
 
     return cartesianGenerator(...allSchedules)
@@ -134,7 +132,6 @@ const RandomFill = ({ multipleOptionsHook, className }: Props) => {
         index: prevMultipleOptions.index,
         selected: [...newSelected],
         options: prevMultipleOptions.options,
-        names: prevMultipleOptions.names,
       }
 
       return value
@@ -175,7 +172,13 @@ const RandomFill = ({ multipleOptionsHook, className }: Props) => {
     })
 
     setRandomClasses(keyValue)
+  }, [multipleOptions])
 
+  /**
+   * Reseting generator and permutations when:
+   * -
+   */
+  useEffect(() => {
     // ------------------------------------------------------
     // Updating locked courses
     const newLockedCourses = multipleOptions.selected
@@ -184,18 +187,20 @@ const RandomFill = ({ multipleOptionsHook, className }: Props) => {
     // Only update if locked courses changed
     if (newLockedCourses.join() !== lockedCourses.join()) {
       setLockedCourses(newLockedCourses)
+      setPermutations([])
+      setGenerator(getSchedulesGenerator())
     }
   }, [multipleOptions])
 
   /**
    * Reseting generator and permutations when:
-   * - Multiple options change
+   * - Selected option changes
    * - Selected classes for random generations change
    */
   useEffect(() => {
     setPermutations([])
     setGenerator(getSchedulesGenerator())
-  }, [multipleOptions, randomClasses])
+  }, [multipleOptions.index, randomClasses])
 
   const [generator, setGenerator] = useState(getSchedulesGenerator())
 
@@ -213,6 +218,8 @@ const RandomFill = ({ multipleOptionsHook, className }: Props) => {
         </TooltipTrigger>
         <TooltipContent side="bottom" asChild>
           <ScrollArea className="mx-5 h-72 rounded px-3">
+            <div className="p-1">Preenchimento aleatório</div>
+            <Separator />
             {Object.keys(randomClasses).map((key) => (
               <div
                 key={key}
diff --git a/src/components/planner/sidebar/selectedOptionController/fillOptions.ts b/src/components/planner/sidebar/selectedOptionController/fillOptions.ts
index 193f0705..932b2bb8 100644
--- a/src/components/planner/sidebar/selectedOptionController/fillOptions.ts
+++ b/src/components/planner/sidebar/selectedOptionController/fillOptions.ts
@@ -34,7 +34,6 @@ const fillOptions = (importedCourses: ImportedCourses, setMultipleOptions: React
             index: prevMultipleOptions.index,
             selected: newOptions[prevMultipleOptions.index],
             options: newOptions,
-            names: prevMultipleOptions.names,
         };
 
         return value;
diff --git a/src/components/planner/sidebar/sessionController/CoursePicker.tsx b/src/components/planner/sidebar/sessionController/CoursePicker.tsx
index 0dc23cdf..1847826f 100644
--- a/src/components/planner/sidebar/sessionController/CoursePicker.tsx
+++ b/src/components/planner/sidebar/sessionController/CoursePicker.tsx
@@ -396,27 +396,29 @@ const SelectionModal = ({
 
                               {/* Children checkboxes */}
                               <div className="mt-2 ml-4 grid grid-flow-col grid-rows-8 gap-x-1 gap-y-1.5 p-1">
-                                {year.map((course: CheckedCourse, courseIdx: number) => (
-                                  <div
-                                    title={course?.info.name}
-                                    key={`checkbox-${yearIdx}-${courseIdx}`}
-                                    className="flex items-center transition"
-                                  >
-                                    <input
-                                      type="checkbox"
-                                      className="checkbox"
-                                      checked={courses[yearIdx + 1][courseIdx].checked}
-                                      id={`course-checkbox-${yearIdx}-${courseIdx}`}
-                                      onChange={(event) => handleCheck(event, yearIdx, courseIdx)}
-                                    />
-                                    <label
-                                      className="ml-1.5 block cursor-pointer text-sm dark:text-white"
-                                      htmlFor={`course-checkbox-${yearIdx}-${courseIdx}`}
+                                {year
+                                  .sort((a, b) => a.info.sigarra_id - b.info.sigarra_id)
+                                  .map((course: CheckedCourse, courseIdx: number) => (
+                                    <div
+                                      title={course?.info.name}
+                                      key={`checkbox-${yearIdx}-${courseIdx}`}
+                                      className="flex items-center transition"
                                     >
-                                      {course.info.acronym}
-                                    </label>
-                                  </div>
-                                ))}
+                                      <input
+                                        type="checkbox"
+                                        className="checkbox"
+                                        checked={courses[yearIdx + 1][courseIdx].checked}
+                                        id={`course-checkbox-${yearIdx}-${courseIdx}`}
+                                        onChange={(event) => handleCheck(event, yearIdx, courseIdx)}
+                                      />
+                                      <label
+                                        className="ml-1.5 block cursor-pointer text-sm dark:text-white"
+                                        htmlFor={`course-checkbox-${yearIdx}-${courseIdx}`}
+                                      >
+                                        {course.info.acronym}
+                                      </label>
+                                    </div>
+                                  ))}
                               </div>
                             </div>
                           ))
diff --git a/src/pages/TimeTableScheduler.tsx b/src/pages/TimeTableScheduler.tsx
index aea67750..316cc8a6 100644
--- a/src/pages/TimeTableScheduler.tsx
+++ b/src/pages/TimeTableScheduler.tsx
@@ -136,7 +136,6 @@ const TimeTableSchedulerPage = () => {
     index: 0,
     selected: [],
     options: [],
-    names: Array.from({ length: 10 }, (_, i) => `Horário ${i + 1}`),
   }) // schedule options and selected schedule
   const totalSelected = useMemo(
     () => multipleOptions.options.map((co: CourseOption[]) => co.filter((item) => item.option !== null)).flat(),
@@ -352,7 +351,6 @@ const TimeTableSchedulerPage = () => {
             index: prev.index,
             selected: newCourseOptions,
             options: newOptions,
-            names: prev.names,
           }
         })