diff --git a/app/assets/javascripts/run-tests.js b/app/assets/javascripts/run-tests.js
index 1463c3f60..5ca5cd355 100644
--- a/app/assets/javascripts/run-tests.js
+++ b/app/assets/javascripts/run-tests.js
@@ -7,6 +7,7 @@ window.serverConfig  = {picoCTF: false, production: false};
 window.StripeCheckout = {configure: function (){}};
 initialize = require('core/initialize');
 initialize.init();
+application.testing = true;
 console.debug = function() {}; // Karma conf doesn't seem to work? Debug messages are still emitted when they shouldn't be.
 TestView = require('views/TestView');
 TestView.runTests();
diff --git a/app/assets/javascripts/workers/worker_world.js b/app/assets/javascripts/workers/worker_world.js
index 4d6b8c56b..26217cb16 100644
--- a/app/assets/javascripts/workers/worker_world.js
+++ b/app/assets/javascripts/workers/worker_world.js
@@ -84,12 +84,6 @@ var ensureLanguagesImportedFromUserCodeMap = function (userCodeMap) {
 
 
 var restricted = ["XMLHttpRequest", "Worker"];
-if (!self.navigator || !(self.navigator.userAgent.indexOf('MSIE') > 0) && 
-    !self.navigator.userAgent.match(/Trident.*rv\:11\./) &&
-    !self.navigator.userAgent.match(/Edge/)) {
-  // Can't restrict 'importScripts' in IE11, skip for all IE versions
-  restricted.push("importScripts");
-}
 for(var i = 0; i < restricted.length; ++i) {
   // We could do way more from this: http://stackoverflow.com/questions/10653809/making-webworkers-a-safe-environment
   Object.defineProperty(self, restricted[i], {
diff --git a/app/assets/main.html b/app/assets/main.html
index 717b8985b..bda9da542 100644
--- a/app/assets/main.html
+++ b/app/assets/main.html
@@ -38,15 +38,6 @@
     ga('create', 'UA-39724129-1', 'auto');
   </script>
 
-  <!-- Errorception -->
-  <script>
-    (function(_,e,rr,s){_errs=[s];var c=_.onerror;_.onerror=function(){var a=arguments;_errs.push(a);
-    c&&c.apply(this,a)};var b=function(){var c=e.createElement(rr),b=e.getElementsByTagName(rr)[0];
-    c.src="//beacon.errorception.com/"+s+".js";c.async=!0;b.parentNode.insertBefore(c,b)};
-    _.addEventListener?_.addEventListener("load",b,!1):_.attachEvent("onload",b)})
-    (window,document,"script","51a79585ee207206390002a2");
-  </script>
-
   <!-- Mixpanel -->
   <script type="text/javascript">
     (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
diff --git a/app/core/services/algolia.coffee b/app/core/services/algolia.coffee
new file mode 100644
index 000000000..10cbd50c5
--- /dev/null
+++ b/app/core/services/algolia.coffee
@@ -0,0 +1,5 @@
+client = algoliasearch("JJM5H2CHJR", "50382fc2f7fa69c67e8233ace7cd7c4c")
+
+module.exports = 
+  client: client
+  schoolsIndex: client.initIndex('schools')
diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee
index 3398d1b5c..cfe1db58a 100644
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "إلعب" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     submit_patch: "تقديم التصحيح"
     submit_changes: "تقديم التغييرات"
     save_changes: "حفظ التغيرات"
+#    required_field: "Required field"
 
   general:
     and: "و"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     subject: "موضوع"
     email: "البريد الالكتروني"
     password: "الرمز السري"
+#    confirm_password: "Confirm Password"
     message: "رسالة"
     code: "رمز"
     ladder: "سلم"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     warrior: "محارب"
     ranger: "مقاتل"
     wizard: "ساحر"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "ثانيّة"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     years: "سنوات"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "انتهاء"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     victory_new_item: "عنصر جديد"
     victory_viking_code_school: "يدخن المقدسة، وكان ذلك على مستوى الثابت الذي فاز فقط! إذا لم تكن بالفعل مطور برامج، يجب أن تكون. كنت فقط حصلت على المسار السريع لقبوله مع مدرسة فايكنغ المدونة، حيث يمكنك أن تأخذ المهارات الخاصة بك إلى المستوى التالي وتصبح مطور ويب محترف في 14 أسبوعا."
     victory_become_a_viking: "تصبح فايكنغ"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "دليل"
     tome_cast_button_run: "Run"
     tome_cast_button_running: "تشغيل"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee
index 9cf7f7825..57d2a17e0 100644
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "български език", englishDescri
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Нива" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "български език", englishDescri
     submit_patch: "Изпрати кръпка"
     submit_changes: "Изпрати промените"
     save_changes: "Запази промените"
+#    required_field: "Required field"
 
   general:
     and: "и"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "български език", englishDescri
     subject: "Тема"
     email: "Email"
     password: "Парола"
+#    confirm_password: "Confirm Password"
     message: "Съобщение"
     code: "Код"
     ladder: "Стълба"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "български език", englishDescri
     warrior: "Боец"
     ranger: "Рейнджър"
     wizard: "Магьосник"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "секунда"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "български език", englishDescri
     years: "години"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Готово"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "български език", englishDescri
     victory_new_item: "Нов Предмет"
     victory_viking_code_school: "О да - това ниво беше наистина тежко! Ти или си програмист, или обезателно трябва да станеш такъв! Току що се доближи до приемането си във Викингското Училище по Програмиране, където ще научиш много нови неща и ще станеш професионален уеб програмист за 14 седмици."
     victory_become_a_viking: "Стани Викинг"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Упътване"
     tome_cast_button_run: "Стартиране"
     tome_cast_button_running: "В Процес..."
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "български език", englishDescri
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "български език", englishDescri
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "български език", englishDescri
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "български език", englishDescri
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee
index 89046f71d..47fe55f6f 100644
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Nivells" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     submit_patch: "Enviar pegat"
     submit_changes: "Puja canvis"
     save_changes: "Guarda canvis"
+#    required_field: "Required field"
 
   general:
     and: "i"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     subject: "Tema"
     email: "Correu electrònic"
     password: "Contrasenya"
+#    confirm_password: "Confirm Password"
     message: "Missatge"
     code: "Codi"
     ladder: "Escala"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     warrior: "Guerrer"
     ranger: "Guardabosc"
     wizard: "Mag"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "segon"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     years: "anys"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Nivell completat:"
     course: "Curs:"
     done: "Fet"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     victory_new_item: "Objecte nou"
     victory_viking_code_school: "Ostres! Aquest nivell era un nivell difícil de superar! Si no ets un programador, ho hauries de ser. Acabes d'aconseguir una acceptació per la via ràpida a l'Escola de Programació Vikinga, on pot millorar les teves habilitats fins al següent nivell i esdevenir un programador de webs professional en 14 setmanes."
     victory_become_a_viking: "Converteix-te en un víking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guia"
     tome_cast_button_run: "Executar"
     tome_cast_button_running: "Executant"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arximag"
diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee
index d309c3559..e43b11b07 100644
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Úrovně" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     submit_patch: "Odeslat opravu"
     submit_changes: "Odeslat změny"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
     and: "a"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     subject: "Předmět"
     email: "Email"
     password: "Heslo"
+#    confirm_password: "Confirm Password"
     message: "Zpráva"
     code: "Kód"
     ladder: "Žebříček"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     warrior: "Válečník"
     ranger: "Odstřelovač"
     wizard: "Kouzelník"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "sekunda"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     years: "roků"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Hotovo"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Průvodce"
     tome_cast_button_run: "Spustit"
     tome_cast_button_running: "Spuštěné"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arcikouzelník"
diff --git a/app/locale/da.coffee b/app/locale/da.coffee
index c2c182f7d..26506569e 100644
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@@ -4,7 +4,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     no_ie: "CodeCombat kan desværre ikke køre i Internet Explorer 8 eller ældre. Beklager!" # Warning that only shows up in IE8 and older
     no_mobile: "CodeCombat er ikke designet til mobile enheder og vil måske ikke virke!" # Warning that shows up on mobile devices
     play: "Spil" # The big play button that opens up the campaign view.
-#    play_campaign_version: "Play Campaign Version" # Shows up under big play button if you only play /courses
+    play_campaign_version: "Spil Kampagne Version" # Shows up under big play button if you only play /courses
     old_browser: "Åh åh, din browser er for gammel til at køre CodeCombat. Beklager!" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "Du kan godt prøve alligevel, men det vil nok ikke virke."
     ipad_browser: "Dårlige nyheder: CodeCombat virker ikke i browseren på iPad. Gode nyheder: vores iPad app afventer kun Apple's godkendelse."
@@ -14,78 +14,97 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     for_developers: "For Udviklere" # Not currently shown on home page.
     or_ipad: "Eller download til iPad"
 
-#  new_home:
-#    slogan: "The most engaging game for learning programming."
-#    classroom_edition: "Classroom Edition:"
-#    learn_to_code: "Learn to code:"
-#    teacher: "Teacher"
-#    student: "Student"
-#    play_now: "Play Now"
-#    im_a_teacher: "I'm a Teacher"
-#    im_a_student: "I'm a Student"
-#    learn_more: "Learn more"
-#    classroom_in_a_box: "A classroom in-a-box for teaching computer science."
-#    codecombat_is: "CodeCombat is a platform <strong>for students</strong> to learn computer science while playing through a real game."
-#    our_courses: "Our courses have been specifically playtested to <strong>excel in the classroom</strong>, even by teachers with little to no prior programming experience."
-#    top_screenshots_hint: "Students write code and see their changes update in real-time"
-#    designed_with: "Designed with teachers in mind"
-#    real_code: "Real, typed code"
-#    from_the_first_level: "from the first level"
-#    getting_students: "Getting students to typed code as quickly as possible is critical to learning programming syntax and proper structure."
-#    educator_resources: "Educator resources"
-#    course_guides: "and course guides"
-#    teaching_computer_science: "Teaching computer science does not require a costly degree, because we provide tools to support educators of all backgrounds."
-#    accessible_to: "Accessible to"
-#    everyone: "everyone"
-#    democratizing: "Democratizing the process of learning coding is at the core of our philosophy. Everyone should be able to learn to code."
-#    forgot_learning: "I think they actually forgot that they were actually learning something."
-#    wanted_to_do: " Coding is something I've always wanted to do, and I never thought I would be able to learn it in school."
-#    why_games: "Why is learning through games important?"
-#    games_reward: "Games reward the productive struggle."
-#    encourage: "Gaming is a medium that encourages interaction, discovery, and trial-and-error. A good game challenges the player to master skills over time, which is the same critical process students go through as they learn."
-#    excel: "Games excel at rewarding"
-#    struggle: "productive struggle"
-#    kind_of_struggle: "the kind of struggle that results in learning that’s engaging and"
-#    motivating: "motivating"
-#    not_tedious: "not tedious."
-#    gaming_is_good: "Studies suggest gaming is good for children’s brains. (it’s true!)"
-#    game_based: "When game-based learning systems are"
-#    compared: "compared"
-#    conventional: "against conventional assessment methods, the difference is clear: games are better at helping students retain knowledge, concentrate and"
-#    perform_at_higher_level: "perform at a higher level of achievement"
-#    feedback: "Games also provide real-time feedback that allows students to adjust their solution path and understand concepts more holistically, instead of being limited to just “correct” or “incorrect” answers."
-#    real_game: "A real game, played with real coding."
-#    great_game: "A great game is more than just badges and achievements - it’s about a player’s journey, well-designed puzzles, and the ability to tackle challenges with agency and confidence."
-#    agency: "CodeCombat is a game that gives players that agency and confidence with our robust typed code engine, which helps beginner and advanced students alike write proper, valid code."
-#    curious: "Curious? Request a demo and we'll show you the ropes"
-#    request_demo_title: "Get your students started today!"
-#    request_demo_subtitle: "Request a demo and get your students started in less than an hour."
-#    get_started_title: "Set up your class today"
-#    get_started_subtitle: "Set up a class, add your students, and monitor their progress as they learn computer science."
-#    create_class: "Or create a class and see it for yourself!"
-#    teacher_screenshots_hint: "Students write code and see their changes update in real-time"
-#    request_demo: "Request a Demo"
-#    create_a_class: "Create a Class"
-#    setup_a_class: "Set Up a Class"
-#    have_an_account: "Have an account?"
-#    log_in: "Log In"
-#    logged_in_as: "You are currently logged in as"
-#    view_my_classes: "View my classes"
-#    computer_science: "Computer science courses for all ages"
-#    show_me_lesson_time: "Show me lesson time estimates for:"
-#    curriculum: "Total curriculum hours:"
-#    ffa: "Free for all students"
-#    lesson_time: "Lesson time:"
-#    coming_soon: "Coming soon!"
-#    courses_available_in: "Courses are available in JavaScript, Python, and Java (coming soon!)"
-#    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
-#    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
-#    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+  new_home:
+    slogan: "Det mest engagerende spil for at lære programmering."
+    classroom_edition: "Klasseværelse Udgave:"
+    learn_to_code: "Lær at kode:"
+    teacher: "Lærer"
+    student: "Elev"
+    play_now: "Spil Nu"
+    im_a_teacher: "Jeg er lærer"
+    im_a_student: "Jeg er elev"
+    learn_more: "Lær mere"
+    classroom_in_a_box: "En klasseværelsespakkeløsning til at undervise datalogi."
+    codecombat_is: "CodeCombat er en platform <strong> for studerende </strong> for at lære datalogi mens du nyder et rigtigt spil."
+    our_courses: "Vores kurser er spiltestet til at udmærke sig i et klasseværelsesmiljø, selv af lærere med lille eller ingen forudgående programmeringserfaring."
+    top_screenshots_hint: "Elever skriver kode og ser deres ændringer i realtid"
+    designed_with: "Designet med lærere i tankerne"
+    real_code: "Rigtigt, indtastet kode"
+    from_the_first_level: "fra den første bane"
+    getting_students: "At få eleven til indtastet kode så hurtigt som muligt er afgørende for at lære programmeringssyntaks og ordentlig struktur."
+    educator_resources: "Lærerressourcer"
+    course_guides: "og kursusguider"
+    teaching_computer_science: "At undervise datalogi kræver ikke en kostelig uddannelse, fordi vi leverer værktøjer til at understøtte lærere med alle mulige baggrunde."
+    accessible_to: "Tilgængelig til"
+    everyone: "alle"
+    democratizing: "At demokratisere processen med at lære programmering er kernen i vores filosofi. Alle bør være i stand til at lære at kode."
+    forgot_learning: "Jeg tror faktisk, at de glemte, at de faktisk var ved at lære noget."
+    wanted_to_do: " Programmering er noget, jeg har altid ønsket mig at kunne, og jeg troede aldrig, jeg ville være i stand til at lære det i skolen."
+    why_games: "Hvorfor er læring gennem spil vigtig?"
+    games_reward: "Spil belønner den produktive kamp."
+    encourage: "Gaming er et medium, der tilskynder interaktion, opdagelse, og trial-and-error. Et godt spil udfordrer spilleren til at mestre færdigheder over tid, hvilket er den samme kritiske proces elever går igennem når de lærer."
+    excel: "Spil udmærker sig ved at være givende"
+    struggle: "produktive kamp"
+    kind_of_struggle: "den form for kamp, ​​der resulterer i at lære, det er engagerende og"
+    motivating: "motiverende"
+    not_tedious: "ikke kedelig."
+    gaming_is_good: "Undersøgelser tyder på at spil er godt for børns hjerner. (det er sandt!)"
+    game_based: "Når spilbaserede læringssystemer er"
+    compared: "sammenlignet"
+    conventional: "med konventionelle vurderingsmetoder, så er forskellen er klar: Spil er bedre til at hjælpe elever med at erhverve sig viden, koncentrere sig og"
+    perform_at_higher_level: "nå et højere præstationsniveau"
+    feedback: "Spil giver også realtids-feedback, der giver eleverne mulighed for at tilpasse deres løsningsstrategi og forstå begreber mere helhedsorienteret, i stedet for at være begrænset til blot “rigtige” eller “forkerte” svar."
+    real_game: "Et rigtigt spil, spillet med rigtig programmering."
+    great_game: "Et godt spil er mere end blot badges og achievements - det handler om en spillers rejse, veldesignede gåder, og evnen til at tackle udfordringer med rammer og tillid."
+    agency: "CodeCombat er et spil, der giver spillerne rammerne og en tillid til vores robuste kodefortolkermotor, som hjælper begyndere og avancerede elever med både skrive ordentligt og korrekt kode."
+    curious: "Nysgerrig? Anmod om en demo, og vi vil vise jer hvordan"
+    request_demo_title: "Få dine elever i gang i dag!"
+    request_demo_subtitle: "Anmod om en demo og få dine elever i gang på mindre end en time."
+    get_started_title: "Opsæt din klasse i dag"
+    get_started_subtitle: "Opsæt en klasse, tilføj dine elever, og overvåg deres fremgang når de lærer datalogi."
+    create_class: "Eller opret en klasse og se det selv!"
+    teacher_screenshots_hint: "Elever skriver kode og se deres ændringer i realtid"
+    request_demo: "Anmod demo"
+    create_a_class: "Opret klasse"
+    setup_a_class: "Opsæt klasse"
+    have_an_account: "Har du allerede en konto?"
+    log_in: "Log ind"
+    logged_in_as: "Du er i øjeblikket logget ind som"
+    view_my_classes: "Se mine klasser"
+    computer_science: "Datalogikurser for alle aldre"
+    show_me_lesson_time: "Vis mig estimeret lektionstid for:"
+    curriculum: "Samlet pensumtimer:"
+    ffa: "Gratis for alle elever"
+    lesson_time: "Lektionstid:"
+    coming_soon: "Kommer snart!"
+    courses_available_in: "Kurser er tilgængelige i JavaScript, Python og Java (kommer snart!)"
+    boast: "Praler med gåder, der er komplekse nok til at fascinere både gamere og kodere."
+    winning: "En overbevisende kombination af rolespil og programmeringsopgaver, der formår at gøre børnevenlig uddannelse lovligt fornøjelig."
+    run_class: "Alt hvad du behøver for at køre en datalogiklasse på din skole i dag - uden at kræve en datalogibaggrund."
+    teachers: "Lærere!"
+    teachers_and_educators: "Lærere & Undervisere"
+    class_in_box: "Lær hvordan vores klasseværelsespakkeløsning passer med dit pensum."
+    get_started: "Get Started"
+    students: "Elever:"
+    join_class: "Følg Klasse"
+    role: "Din rolle:"
+    student_count: "Antal elever:"
+    start_playing_for_free: "Start med at spille gratis!"
+    students_and_players: "Elever & Spillere"
+    goto_classes: "Gå til mine Klasser" # {change}
+    educator_wiki: "Underviser wiki"
+    view_profile: "Vis Min Profil"
+#    view_progress: "View Progress"
+    login_switch: "Har du en konto?"
+    check_out_wiki: "Tjek vores nye pædagog Wiki"
+    want_coco: "Ønsker du CodeCombat på din skole?"
+    form_select_role: "Vælg primær rolle"
+    form_select_range: "Vælg klassestørrelse"
 
   nav:
     play: "Spil" # The top nav bar entry where players choose which levels to play
     community: "Fællesskab"
-#    courses: "Courses"
+    courses: "Kurser"
     editor: "Editor"
     blog: "Blog"
     forum: "Forum"
@@ -101,22 +120,21 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     twitter_follow: "Følg"
     teachers: "Lærere"
     careers: "Karrierer"
-#    facebook: "Facebook"
-#    twitter: "Twitter"
-#    create_a_class: "Create a Class"
-#    other: "Other"
-#    learn_to_code: "Learn to Code!"
-#    toggle_nav: "Toggle navigation"
-#    jobs: "Jobs"
-#    schools: "Schools"
-#    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
-#    get_involved: "Get Involved"
-#    open_source: "Open source (GitHub)"
-#    support: "Support"
-#    faqs: "FAQs"
-#    help_pref: "Need help? Email"
-#    help_suff: "and we'll get in touch!"
+    facebook: "Facebook"
+    twitter: "Twitter"
+    create_a_class: "Opret klasse"
+    other: "Andet"
+    learn_to_code: "Lær at kode!"
+    toggle_nav: "Toggle navigation"
+    jobs: "Ledige stillinger"
+    schools: "Skoler"
+    educator_wiki: "Lærer Wiki"
+    get_involved: "Bliv involveret"
+    open_source: "Open source (GitHub)"
+    support: "Support"
+    faqs: "FAQs"
+    help_pref: "Brug for hjælp? E-mail"
+    help_suff: "så vi kommer i kontakt!"
 
   modal:
     close: "Luk"
@@ -135,7 +153,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 
   play:
     play_as: "Spil Som " # Ladder page
-#    compete: "Compete!" # Course details page
+    compete: "Konkurrér!" # Course details page
     spectate: "Observér" # Ladder page
     players: "spillere" # Hover over a level on /play
     hours_played: "timer spillet" # Hover over a level on /play
@@ -158,7 +176,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     subscription_required: "Kræver abonnement"
     anonymous: "Anonym spiller"
     level_difficulty: "Sværhedsgrad: "
-#    play_classroom_version: "Play Classroom Version" # Choose a level in campaign version that you also can play in one of your courses
+    play_classroom_version: "Spil Klasseværelse Version" # Choose a level in campaign version that you also can play in one of your courses
     campaign_beginner: "Begynderkampagne"
     awaiting_levels_adventurer_prefix: "Vi frigiver nye baner hver uge."
     awaiting_levels_adventurer: "Skriv dig op som eventyrer"
@@ -167,7 +185,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     campaign_multiplayer: "Multiplayer Arenaer"
     campaign_multiplayer_description: "... hvor du koder ansigt-til-ansigt imod andre spillere."
     campaign_old_multiplayer: "(Forældet) Gammel version af Multiplayer Arenaer"
-#    campaign_old_multiplayer_description: "Relics of a more civilized age. No simulations are run for these older, hero-less multiplayer arenas."
+    campaign_old_multiplayer_description: "Levn fra en mere civiliseret tid. Ingen simuleringer er kørt for disse ældre, helte-fattige multiplayer arenaer."
 
   share_progress_modal:
     blurb: "Du gør godt fremskridt! Fortæl din forælder hvor meget du har lært med CodeCombat."
@@ -178,7 +196,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     title: "Fremragende arbejde, Lærling"
 
   login:
-    sign_up: "opret ny konto"
+    sign_up: "Opret ny konto"
     log_in: "Log Ind"
     logging_in: "Logger ind"
     log_out: "Log Ud"
@@ -187,27 +205,27 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     load_profile: "Indlæs G+ Profil"
     finishing: "Færdiggører"
     sign_in_with_facebook: "Log ind med Facebook"
-    sign_in_with_gplus: "Sign in with G+"
+    sign_in_with_gplus: "Log ind med G+"
     signup_switch: "Vil du oprette en konto?"
 
   signup:
     email_announcements: "Modtag nyheder på email"
     creating: "Opretter Konto..."
-    sign_up: "Registrer"
+    sign_up: "Registrér"
     log_in: "Log ind med password"
     required: "Du skal logge ind før du kan gå den vej."
     login_switch: "Har du allerede en konto?"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
-#    or_sign_up_with: "or sign up with"
-#    connected_gplus_header: "You've successfully connected with Google+!"
-#    connected_gplus_p: "Finish signing up so you can log in with your Google+ account."
-#    gplus_exists: "You already have an account associated with Google+!"
-#    connected_facebook_header: "You've successfully connected with Facebook!"
-#    connected_facebook_p: "Finish signing up so you can log in with your Facebook account."
-#    facebook_exists: "You already have an account associated with Facebook!"
-#    hey_students: "Students, enter the class code from your teacher."
+    school_name: "Skolens navn og by"
+    optional: "valgfrit"
+    school_name_placeholder: "Eksempelarium Skolen, Eksempelby"
+    or_sign_up_with: "eller registrér dig med"
+    connected_gplus_header: "Du har registreret dig med Google+!"
+    connected_gplus_p: "Afslut registreringen, så du kan logge ind med din Google+ konto."
+    gplus_exists: "Du har allerede en konto registreret med Google+!"
+    connected_facebook_header: "Du har registreret dig med  Facebook!"
+    connected_facebook_p: "Afslut registreringen, så du kan logge ind med din Facebook account."
+    facebook_exists: "Du har allerede en konto registreret med Facebook!"
+    hey_students: "Elever, indtast klassekoden udleveret af din lærer."
 
   recover:
     recover_account_title: "genskab konto"
@@ -241,9 +259,10 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     help: "Hjælp"
     watch: "Hold øje"
     unwatch: "Stop med at holde øje"
-    submit_patch: "Indsend patch"
+    submit_patch: "Indsend opdatering"
     submit_changes: "Indsend ændringer"
     save_changes: "Gem ændringer"
+#    required_field: "Required field"
 
   general:
     and: "og"
@@ -256,8 +275,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     rejected: "Afvist"
     withdrawn: "Trukket tilbage"
     accept: "Accepter"
-#    reject: "Reject"
-#    withdraw: "Withdraw"
+    reject: "Afvis"
+    withdraw: "Tilbagetræk"
     submitter: "Indsender"
     submitted: "Indsendt"
     commit_msg: "ændringsnotat"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     subject: "Emne"
     email: "email"
     password: "Kodeord"
+#    confirm_password: "Confirm Password"
     message: "Besked"
     code: "Kode"
     ladder: "Rangstige"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     warrior: "Krigsherre"
     ranger: "Bueskytte"
     wizard: "Troldmand"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "sekund"
@@ -312,10 +335,11 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     years: "år"
 
   play_level:
-#    completed_level: "Completed Level:"
-#    course: "Course:"
+#    level_complete: "Level Complete"
+    completed_level: "Gennemførte Baner:"
+    course: "Kursus:"
     done: "Færdig"
-#    next_level: "Next Level"
+    next_level: "Næste Bane:"
     next_game: "Næste spil"
     show_menu: "Vis spil menu"
     home: "Hjem" # Not used any more, will be removed soon.
@@ -338,13 +362,13 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     reload_really: "Er du sikker på at du ønsker at genindlæse denne bane helt fra begyndelsen?"
     reload_confirm: "Genindlæs alt"
     victory: "Sejr"
-#    victory_title_prefix: ""
+    victory_title_prefix: ""
     victory_title_suffix: " Færdig"
-    victory_sign_up: "Opret dig for at gemme dit fremskridt"
+    victory_sign_up: "Opret dig for at gemme din fremgang"
     victory_sign_up_poke: "Ønsker du at gemme din kode? Opret en gratis konto!"
-    victory_rate_the_level: "Bedøm denne bane: " # {change}
+    victory_rate_the_level: "Bedøm denne bane: "
     victory_return_to_ladder: "Returner til rangstige"
-    victory_saving_progress: "Gemmer fremskridt"
+    victory_saving_progress: "Gemmer fremgang"
     victory_go_home: "Gå hjem"
     victory_review: "Fortæl os mere!"
     victory_review_placeholder: "Hvordan var levelet?"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     victory_new_item: "Nyt udstyr"
     victory_viking_code_school: "For dælen det var en svær bane du lige slog! Hvis ikke du allerede er softwareudvikler, så burde du blive det. Du er lige kommet foran i køen til at blive accepteret hos Viking Code School, du kan tage dine evner til det næste niveau og blive en professionel webudvikler på 14 uger."
     victory_become_a_viking: "Bliv en Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Instruktioner"
     tome_cast_button_run: "Kør"
     tome_cast_button_running: "Kører"
@@ -398,172 +423,172 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     tip_baby_coders: "I fremtiden vil selv babier være Ærketroldmænd."
     tip_morale_improves: "Indlæsning vil fortsætte indtil moralen forbedres."
     tip_all_species: "Vi tror på lige muligheder for at lære programmering for alle arter."
-#    tip_reticulating: "Reticulating spines."
+    tip_reticulating: "Krydset knogler."
     tip_harry: "Du' en troldmand, "
     tip_great_responsibility: "Med store kodeevner kommer stort fejlfindingsansvnar."
     tip_munchkin: "Hvis du ikke spiser dine grøntsager, kommer der en Munchkin efter dig mens du sover."
     tip_binary: "Der findes kun 10 slags mennesker i verdenen: Dem som forstår binært, og dem som ikke gør."
-#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
-#    tip_talk_is_cheap: "Talk is cheap. Show me the code. - Linus Torvalds"
-#    tip_first_language: "The most disastrous thing that you can ever learn is your first programming language. - Alan Kay"
-#    tip_hardware_problem: "Q: How many programmers does it take to change a light bulb?  A: None, it's a hardware problem."
-#    tip_hofstadters_law: "Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law."
-#    tip_premature_optimization: "Premature optimization is the root of all evil. - Donald Knuth"
-#    tip_brute_force: "When in doubt, use brute force. - Ken Thompson"
-#    tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..."
-#    tip_superpower: "Coding is the closest thing we have to a superpower."
-#    tip_control_destiny: "In real open source, you have the right to control your own destiny. - Linus Torvalds"
+    tip_commitment_yoda: "En programmør skal have det dybeste engagement, det alvorligste sind. ~ Yoda"
+    tip_no_try: "Gør. Eller ej. Forsøg intet. - Yoda"
+    tip_patience: "Tålmodighed du skal have, unge Padawan. - Yoda"
+    tip_documented_bug: "En dokumenteret bug er ikke en fejl; det er en feature."
+    tip_impossible: "Det virker altid umuligt indtil det er gjort. - Nelson Mandela"
+    tip_talk_is_cheap: "Tale er billigt. Vis mig koden. - Linus Torvalds"
+    tip_first_language: "Det mest katastrofale, du nogensinde kan lære, er dit første programmeringssprog. - Alan Kay"
+    tip_hardware_problem: "Q: Hvor mange programmører tager det at skifte en pære?  A: Ingen, det er et hardware problem."
+    tip_hofstadters_law: "Hofstadter's Lov: Det tager altid længere tid end du forventer, selv når du tager hensyn til Hofstadter's Lov."
+    tip_premature_optimization: "For tidlig optimering er roden til alt ondt. - Donald Knuth"
+    tip_brute_force: "I tvivlstilfælde, brug rå kraft. - Ken Thompson"
+    tip_extrapolation: "Der er kun to slags mennesker: Dem der kan ekstrapolere fra ufuldstændig data..."
+    tip_superpower: "Programmering er det tætteste vi kommer op at have superheltekræfter."
+    tip_control_destiny: "I rigtig open source, har du ret til at styre din egen skæbne. - Linus Torvalds"
     tip_no_code: "Ingen kode er hurtigerer end ingen kode."
     tip_code_never_lies: "Kode lyver aldrig, kommentarer gør nogle gange. - Ron Jeffries"
     tip_reusable_software: "Før software kan være genbrugeligt skal det først være brugbart."
-#    tip_optimization_operator: "Every language has an optimization operator. In most languages that operator is ‘//’"
-#    tip_lines_of_code: "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. — Bill Gates"
-#    tip_source_code: "I want to change the world but they would not give me the source code."
-#    tip_javascript_java: "Java is to JavaScript what Car is to Carpet. - Chris Heilmann"
+    tip_optimization_operator: "Et hvert sprog har en optimeringsoperator. I de fleste sprog er operatoren ‘//’"
+    tip_lines_of_code: "At måle programmeringsfremgang via antal kodelinjer er som at måle flyfremgang efter vægt. — Bill Gates"
+    tip_source_code: "Jeg ønsker at ændre verden, men de ville ikke give mig kildekoden."
+    tip_javascript_java: "Java er til JavaScript hvad Bil er at Billet. - Chris Heilmann"
     tip_move_forward: "Hvad end du gør, så bliv ved med at rykke fremad. - Martin Luther King Jr."
     tip_google: "Har du et problem du ikke kan løse? Google det!"
     tip_adding_evil: "Tilføjer et strejf af ondskab.."
-#    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-#    tip_open_source_contribute: "You can help CodeCombat improve!"
-#    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
-#    tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus"
+    tip_hate_computers: "Der er en ting omkring folk, der tror, ​​de hader computere. Hvad de i virkeligheden hader er elendige programmører. - Larry Niven"
+    tip_open_source_contribute: "Du kan hjælpe med at forbedre CodeCombat!"
+    tip_recurse: "At iterere er menneskeligt, rekursion er guddommeligt. - L. Peter Deutsch"
+    tip_free_your_mind: "Du er nødt til at slippe det hele, Neo. Frygt, tvivl og mistillid. Befri dit sind. - Morpheus"
     tip_strong_opponents: "Selv de stærkeste modstandere har en svaghed. - Itachi Uchiha"
     tip_paper_and_pen: "Før du starter med at programmere, kan du altid sætte dig ned med et stykke papir og blyant."
     tip_solve_then_write: "Først, løs problemet, derefter skriv koden. - John Johnson"
-#    tip_compiler_ignores_comments: "Sometimes I think that the compiler ignores my comments."
-#    tip_understand_recursion: "The only way to understand recursion is to understand recursion."
-#    tip_life_and_polymorphism: "Open Source is like a totally polymorphic heterogeneous structure: All types are welcome."
-#    tip_mistakes_proof_of_trying: "Mistakes in your code are just proof that you are trying."
-#    tip_adding_orgres: "Rounding up ogres."
-#    tip_sharpening_swords: "Sharpening the swords."
-#    tip_ratatouille: "You must not let anyone define your limits because of where you come from. Your only limit is your soul. - Gusteau, Ratatouille"
-#    tip_nemo: "When life gets you down, want to know what you've gotta do? Just keep swimming, just keep swimming. - Dory, Finding Nemo"
-#    tip_internet_weather: "Just move to the internet, it's great here. We get to live inside where the weather is always awesome. - John Green"
-#    tip_nerds: "Nerds are allowed to love stuff, like jump-up-and-down-in-the-chair-can't-control-yourself love it. - John Green"
-#    tip_self_taught: "I taught myself 90% of what I've learned. And that's normal! - Hank Green"
-#    tip_luna_lovegood: "Don't worry, you're just as sane as I am. - Luna Lovegood"
-#    tip_good_idea: "The best way to have a good idea is to have a lot of ideas. - Linus Pauling"
-#    tip_programming_not_about_computers: "Computer Science is no more about computers than astronomy is about telescopes. - Edsger Dijkstra"
-#    tip_mulan: "Believe you can, then you will. - Mulan"
+    tip_compiler_ignores_comments: "Nogle gange tror jeg, at kompileren ignorerer mine kommentarer."
+    tip_understand_recursion: "Den eneste måde at forstå rekursion er at forstå rekursion."
+    tip_life_and_polymorphism: "Open Source er som en helt polymorf heterogen struktur: Alle typer er velkomne."
+    tip_mistakes_proof_of_trying: "Fejl i din kode er bare bevis på, at du forsøger."
+    tip_adding_orgres: "Runder kæmper op."
+    tip_sharpening_swords: "Slibning af sværd."
+    tip_ratatouille: "Du skal ikke lade nogen definere dine grænser på grund af hvor du kommer fra. Din eneste begrænsning er din sjæl. - Gusteau, Ratatouille"
+    tip_nemo: "Når livet tynger dig ned, ved du så hvad du skal gøre? Bare svøm videre, bare svøm videre. - Dory, Finding Nemo"
+    tip_internet_weather: "Bare flyt til Internet, det er allertiders her. Vi får lov til at leve hvor vejret altid er fantastisk. - John Green"
+    tip_nerds: "Nørder hare lov til at elske ting, som i at-hoppe-op-og-ned-i-stolen-kan-ikke-kontrollere-mig-selv elske det. - John Green"
+    tip_self_taught: "Jeg lærte mig selv 90% af hvad jeg har lært. Og det er normalt! - Hank Green"
+    tip_luna_lovegood: "Bare rolig, du er lige så rask som jeg er. - Luna Lovegood"
+    tip_good_idea: "Den bedste måde at få en god idé på er at få en masse ideer. - Linus Pauling"
+    tip_programming_not_about_computers: "Datalogi handler ikke mere om computere end astronomi handler om teleskoper. - Edsger Dijkstra"
+    tip_mulan: "Tro du kan, så kan du. - Mulan"
 
   game_menu:
     inventory_tab: "Dine ting"
     save_load_tab: "Gem/Indlæs"
     options_tab: "Indstillinger"
     guide_tab: "Guide"
-#    guide_video_tutorial: "Video Tutorial"
+    guide_video_tutorial: "Video Tutorial"
     guide_tips: "Råd"
     multiplayer_tab: "Flere spillere"
     auth_tab: "Tilmeld dig"
     inventory_caption: "Udrust din helt"
     choose_hero_caption: "Vælg helt, sprog"
     save_load_caption: "... og se historie"
-    options_caption: "Ændre indstillinger"
-#    guide_caption: "Docs and tips"
+    options_caption: "Rediger indstillinger"
+    guide_caption: "Dokumentation og tips"
     multiplayer_caption: "Spil med venner!"
     auth_caption: "Gem dit spil."
 
   leaderboard:
-#    view_other_solutions: "View Leaderboards"
-#    scores: "Scores"
-#    top_players: "Top Players by"
+    view_other_solutions: "Vis Ranglister"
+    scores: "Point"
+    top_players: "Topspillere efter"
     day: "Idag"
     week: "Denne uge"
-#    all: "All-Time"
+    all: "Historisk"
     time: "Tid"
-#    damage_taken: "Damage Taken"
-#    damage_dealt: "Damage Dealt"
+    damage_taken: "Skade taget"
+    damage_dealt: "Skade gjort"
     difficulty: "Sværhedsgrad"
     gold_collected: "Guld samlet"
 
-#  inventory:
-#    equipped_item: "Equipped"
-#    required_purchase_title: "Required"
-#    available_item: "Available"
-#    restricted_title: "Restricted"
-#    should_equip: "(double-click to equip)"
-#    equipped: "(equipped)"
-#    locked: "(locked)"
-#    restricted: "(restricted in this level)"
-#    equip: "Equip"
-#    unequip: "Unequip"
+  inventory:
+    equipped_item: "Taget på"
+    required_purchase_title: "Påkrævet"
+    available_item: "Tilgængelig"
+    restricted_title: "Begrænset"
+    should_equip: "(dobbeltklik for at tage det på)"
+    equipped: "(taget på)"
+    locked: "(låst)"
+    restricted: "(begrænset til denne bane)"
+    equip: "Tag på"
+    unequip: "Tag af"
 
-#  buy_gems:
-#    few_gems: "A few gems"
-#    pile_gems: "Pile of gems"
-#    chest_gems: "Chest of gems"
-#    purchasing: "Purchasing..."
-#    declined: "Your card was declined"
-#    retrying: "Server error, retrying."
-#    prompt_title: "Not Enough Gems"
-#    prompt_body: "Do you want to get more?"
-#    prompt_button: "Enter Shop"
-#    recovered: "Previous gems purchase recovered. Please refresh the page."
-#    price: "x{{gems}} / mo"
+  buy_gems:
+    few_gems: "Et par ædelstene"
+    pile_gems: "En bunke ædelstene"
+    chest_gems: "En kiste med ædelstene"
+    purchasing: "Køber..."
+    declined: "Dit kort blev afvist"
+    retrying: "Server fejl, prøver igen."
+    prompt_title: "Ikke nok ædelstene"
+    prompt_body: "Ønsker du flere?"
+    prompt_button: "Besøg Butik"
+    recovered: "Tidliger ædelstenskøb er genskabt. Opdatér venligst siden."
+    price: "x{{gems}} / måned"
 
-#  subscribe:
-#    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
-#    feature1: "125+ basic levels across 4 worlds"
-#    feature2: "10 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "85+ bonus levels"
-#    feature4: "<strong>{{gems}} bonus gems</strong> every month!"
-#    feature5: "Video tutorials"
-#    feature6: "Premium email support"
-#    feature7: "Private <strong>Clans</strong>"
-#    feature8: "<strong>No ads!</strong>"
-#    free: "Free"
-#    month: "month"
-#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
-#    subscribe_title: "Subscribe"
-#    unsubscribe: "Unsubscribe"
-#    confirm_unsubscribe: "Confirm Unsubscribe"
-#    never_mind: "Never Mind, I Still Love You"
-#    thank_you_months_prefix: "Thank you for supporting us these last"
-#    thank_you_months_suffix: "months."
-#    thank_you: "Thank you for supporting CodeCombat."
-#    sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better."
-#    unsubscribe_feedback_placeholder: "O, what have we done?"
-#    parent_button: "Ask your parent"
-#    parent_email_description: "We'll email them so they can buy you a CodeCombat subscription."
-#    parent_email_input_invalid: "Email address invalid."
-#    parent_email_input_label: "Parent email address"
-#    parent_email_input_placeholder: "Enter parent email"
-#    parent_email_send: "Send Email"
-#    parent_email_sent: "Email sent!"
-#    parent_email_title: "What's your parent's email?"
-#    parents: "For Parents"
-#    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
-#    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
-#    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
-#    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
-#    payment_methods: "Payment Methods"
-#    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
-#    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_button: "Sale!"
-#    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
-#    subscription_required_to_play: "You'll need a subscription to play this level."
-#    unlock_help_videos: "Subscribe to unlock all video tutorials."
-#    personal_sub: "Personal Subscription" # Accounts Subscription View below
-#    loading_info: "Loading subscription information..."
-#    managed_by: "Managed by"
-#    will_be_cancelled: "Will be cancelled on"
-#    currently_free: "You currently have a free subscription"
-#    currently_free_until: "You currently have a subscription until"
-#    was_free_until: "You had a free subscription until"
-#    managed_subs: "Managed Subscriptions"
-#    subscribing: "Subscribing..."
-#    current_recipients: "Current Recipients"
-#    unsubscribing: "Unsubscribing"
-#    subscribe_prepaid: "Click Subscribe to use prepaid code"
-#    using_prepaid: "Using prepaid code for monthly subscription"
+  subscribe:
+    comparison_blurb: "Skærp dine færdigheder med et CodeCombat abonnement!"
+    feature1: "110+ grundlæggende baner på tværs af 4 verdener"
+    feature2: "10 magtfulde <strong> nye helte </strong> med unikke færdigheder!"
+    feature3: "80+ bonus baner"
+    feature4: "<strong>{{gems}} bonus ædelstene</strong> every month!"
+    feature5: "Video tutorials"
+    feature6: "Premium e-mail support"
+    feature7: "Private <strong>Klaner</strong>"
+    feature8: "<strong>Ingen reklamer!</strong>"
+    free: "Gratis"
+    month: "måned"
+    must_be_logged: "Du skal først være logget ind. Opret en konto eller log ind fra ovenstående menu."
+    subscribe_title: "Tilmeld"
+    unsubscribe: "Afmeld"
+    confirm_unsubscribe: "Bekræft Afmeldling"
+    never_mind: "Det gør ikke noget, jeg elsker dig stadig"
+    thank_you_months_prefix: "Tak for at støtte os disse sidste"
+    thank_you_months_suffix: "måneder."
+    thank_you: "Tak for at støtte CodeCombat."
+    sorry_to_see_you_go: "Ked af at se dig gå! Fortæl os, hvad vi kunne have gjort bedre."
+    unsubscribe_feedback_placeholder: "Nå, hvad har vi gjort?"
+    parent_button: "Spørg dine forældre"
+    parent_email_description: "Vi vil sende dem en email, så de kan købe dig en CodeCombat abonnement."
+    parent_email_input_invalid: "Ugyldig email adresse."
+    parent_email_input_label: "Forældres email adresse"
+    parent_email_input_placeholder: "Indtast forældre email"
+    parent_email_send: "Send Email"
+    parent_email_sent: "Email sendt!"
+    parent_email_title: "Hvad er dine forældres email?"
+    parents: "For forældre"
+    parents_title: "Kære Forældre: Dit barn er at lære at programmere. Vil du hjælpe dem videre?"
+    parents_blurb1: "Dit barn har spillet __nLevels__ baner og lært basal programmering. Hjælp dem med at dyrke deres interesse ved at købe dem et abonnement, så de kan fortsætte med at spille."
+    parents_blurb1a: "Programmering er en vigtig færdighed som dit barn utvivlsomt vil bruge som voksen. I 2020 vil grundlæggende software-færdigheder være et behov på 77% af alle arbejdspladser, og softwareingeniører er i høj efterspørgsel i hele verden. Vidste du, at datalogi er den højest betalte universitetsuddannelse?"
+    parents_blurb2: "For ${{price}} USD / måned vil dit barn få nye udfordringer hver uge og personlig email-support fra professionelle programmører."
+    parents_blurb3: "Ingen Risiko: Fuld reklamationsret, simpel 1-click afmeldling."
+    payment_methods: "Betalingsmetoder"
+    payment_methods_title: "Mulige betalingsmetoder"
+    payment_methods_blurb1: "Vi accepterer i øjeblikket kreditkort og Alipay. Du kan også sende {{three_month_price}} USD via PayPal til nick@codecombat.com med din konto-email i beskrivelsen til at købe et tre måneders abonnement og ædelstene, eller ${{year_price}} i et år."
+    payment_methods_blurb2: "Hvis du har brug en alternativ form for betaling, kan du kontakte"
+    sale_button: "Udsalg!"
+    sale_button_title: "Spar $21 USD, når du køber et 1 års abonnement"
+    stripe_description: "Månedligt Abonnement"
+    stripe_description_year_sale: "1 års Abonnement (${{discount}} rabat)"
+    subscription_required_to_play: "Du har brug for et abonnement for at spille denne bane."
+    unlock_help_videos: "Abonnér for at låse alle video-tutorials op."
+    personal_sub: "Personlig Abonnement" # Accounts Subscription View below
+    loading_info: "Indlæser abonnementsinformation..."
+    managed_by: "Administreret af"
+    will_be_cancelled: "Vil blive annulleret på"
+    currently_free: "Du har i øjeblikket et gratis abonnement"
+    currently_free_until: "Du har i øjeblikket et abonnement, indtil"
+    was_free_until: "Du havde et gratis abonnement, indtil"
+    managed_subs: "Administrerede Abonnementer"
+    subscribing: "Tilmelder..."
+    current_recipients: "Aktuelle Modtagere"
+    unsubscribing: "Afmelder"
+    subscribe_prepaid: "Klik Abonnér at bruge en forudbetalte kode"
+    using_prepaid: "Bruger forudbetalt kode til månedligt abonnement"
 
   choose_hero:
     choose_hero: "Vælg din helt"
@@ -575,210 +600,224 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     javascript_blurb: "Internettets sprog. (Ikke det samme som Java.)"
     coffeescript_blurb: "Pænere JavaScript syntax."
     clojure_blurb: "En moderne version af Lisp."
-    lua_blurb: " Spil scripting sprog."
-#    io_blurb: "Simple but obscure."
+    lua_blurb: "Spil scripting sprog."
+    io_blurb: "Simpelt men obskurt."
     status: "Status"
     hero_type: "Type"
     weapons: "Våben"
     weapons_warrior: "Sværd - Kort afstand, Ingen Magi"
     weapons_ranger: "Armbryst, Skydevåben - Lang afstand, Ingen Magi"
     weapons_wizard: "Tryllestave, Stave - Lang afstand, Magi"
-#    attack: "Damage" # Can also translate as "Attack"
+    attack: "Skade" # Can also translate as "Attack"
     health: "Liv"
     speed: "Fart"
     regeneration: "Regeneration"
-#    range: "Range" # As in "attack or visual range"
-#    blocks: "Blocks" # As in "this shield blocks this much damage"
-#    backstab: "Backstab" # As in "this dagger does this much backstab damage"
+    range: "Afstand" # As in "attack or visual range"
+    blocks: "Blokér" # As in "this shield blocks this much damage"
+    backstab: "Bagangreb" # As in "this dagger does this much backstab damage"
     skills: "Færdigheder"
-#    attack_1: "Deals"
-#    attack_2: "of listed"
-#    attack_3: "weapon damage."
-#    health_1: "Gains"
-#    health_2: "of listed"
-#    health_3: "armor health."
+    attack_1: "Giver"
+    attack_2: "af mulig"
+    attack_3: "våbenskade."
+    health_1: "Får"
+    health_2: "af mulig"
+    health_3: "rustningsliv."
     speed_1: "Rykker med"
     speed_2: "meter i sekundet."
     available_for_purchase: "Kan nu blive købt" # Shows up when you have unlocked, but not purchased, a hero in the hero store
     level_to_unlock: "Level for at låse op:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
     restricted_to_certain_heroes: "Kun visse helt kan spille dette level."
 
-#  skill_docs:
-#    writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this
-#    read_only: "read-only"
-#    action: "Action"
-#    spell: "Spell"
-#    action_name: "name"
-#    action_cooldown: "Takes"
-#    action_specific_cooldown: "Cooldown"
-#    action_damage: "Damage"
-#    action_range: "Range"
-#    action_radius: "Radius"
-#    action_duration: "Duration"
-#    example: "Example"
-#    ex: "ex" # Abbreviation of "example"
-#    current_value: "Current Value"
-#    default_value: "Default value"
-#    parameters: "Parameters"
-#    returns: "Returns"
-#    granted_by: "Granted by"
+  skill_docs:
+    writable: "skrivbar" # Hover over "attack" in Your Skills while playing a level to see most of this
+    read_only: "read-only"
+    action: "Handling"
+    spell: "Besværgelse"
+    action_name: "navn"
+    action_cooldown: "Takes"
+    action_specific_cooldown: "Pausetid"
+    action_damage: "Skade"
+    action_range: "Afstand"
+    action_radius: "Radius"
+    action_duration: "Varighed"
+    example: "Eksempel"
+    ex: "eks." # Abbreviation of "example"
+    current_value: "Nuværende Værdi"
+    default_value: "Standard værdi"
+    parameters: "Parametre"
+    returns: "Returnerer"
+    granted_by: "Givet af"
 
-#  save_load:
-#    granularity_saved_games: "Saved"
-#    granularity_change_history: "History"
+  save_load:
+    granularity_saved_games: "Gemte"
+    granularity_change_history: "Historie"
 
   options:
-#    general_options: "General Options" # Check out the Options tab in the Game Menu while playing a level
-#    volume_label: "Volume"
-#    music_label: "Music"
-#    music_description: "Turn background music on/off."
-#    editor_config_title: "Editor Configuration"
+    general_options: "Generelle Indstillinger" # Check out the Options tab in the Game Menu while playing a level
+    volume_label: "Lydstyrke"
+    music_label: "Musik"
+    music_description: "Tænd/Sluk baggrundsmusik."
+    editor_config_title: "Editor Konfiguration"
     editor_config_keybindings_label: "Tastaturgenveje"
-#    editor_config_keybindings_default: "Default (Ace)"
-#    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
-#    editor_config_livecompletion_label: "Live Autocompletion"
-#    editor_config_livecompletion_description: "Displays autocomplete suggestions while typing."
-#    editor_config_invisibles_label: "Show Invisibles"
-#    editor_config_invisibles_description: "Displays invisibles such as spaces or tabs."
-#    editor_config_indentguides_label: "Show Indent Guides"
-#    editor_config_indentguides_description: "Displays vertical lines to see indentation better."
-#    editor_config_behaviors_label: "Smart Behaviors"
-#    editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes."
+    editor_config_keybindings_default: "Standard (Ace)"
+    editor_config_keybindings_description: "Tilføjer yderligere genveje fra kendte editor-programmer."
+    editor_config_livecompletion_label: "Live Autocompletion"
+    editor_config_livecompletion_description: "Viser autocomplete forslag mens du skriver."
+    editor_config_invisibles_label: "Vis Skjulte"
+    editor_config_invisibles_description: "Viser skjulte tegn som mellemrum og indrykning."
+    editor_config_indentguides_label: "Vis Indrykningsguide"
+    editor_config_indentguides_description: "Viser lodrette linjer for at fremhæve indrykning."
+    editor_config_behaviors_label: "Intelligent Opførelse"
+    editor_config_behaviors_description: "Autocomplete af parenteser og anførelsestegn."
 
-#  about:
-#    main_title: "If you want to learn to program, you need to write (a lot of) code."
-#    main_description: "At CodeCombat, our job is to make sure you're doing that with a smile on your face."
-#    mission_link: "Mission"
-#    team_link: "Team"
-#    community_link: "Community"
-#    story_link: "Story"
-#    careers_link: "Careers"
-#    press_link: "Press"
-#    mission_title: "Our mission: make programming accessible to every student on Earth."
-#    mission_description_1: "<strong>Programming is magic</strong>. It's the ability to create things from pure imagination. We started CodeCombat to give learners the feeling of wizardly power at their fingertips by using <strong>typed code</strong>."
-#    mission_description_2: "As it turns out, that enables them to learn faster too. WAY faster. It's like having a conversation instead of reading a manual. We want to bring that conversation to every school and to <strong>every student</strong>, because everyone should have the chance to learn the magic of programming."
-#    team_title: "Meet the CodeCombat team"
-#    team_values: "We value open and respectful dialog, where the best idea wins. Our decisions are grounded in customer research and our process is focused on delivering tangible results for them. Everyone is hands-on, from our CEO to our Github contributors, because we value growth and learning in our team."
-#    nick_title: "Cofounder, CEO"
-#    nick_blurb: "Motivation Guru"
-#    matt_title: "Cofounder, CTO"
-#    matt_blurb: "Bicyclist"
-#    cat_title: "Game Designer"
-#    cat_blurb: "Airbender"
-#    scott_title: "Cofounder, Software Engineer"
-#    scott_blurb: "Reasonable One"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
-#    rob_title: "Software Engineer"
-#    rob_blurb: "Codes things and stuff"
-#    josh_c_title: "Game Designer"
-#    josh_c_blurb: "Designs games"
-#    robin_title: "UX Design & Research"
-#    robin_blurb: "Scaffolding"
-#    josh_title: "Game Designer"
-#    josh_blurb: "Floor Is Lava"
-#    retrostyle_title: "Illustration"
-#    retrostyle_blurb: "RetroStyle Games"
-#    jose_title: "Music"
-#    jose_blurb: "Taking Off"
-#    community_title: "...and our open-source community"
-#    community_subtitle: "Over 450 contributors have helped build CodeCombat, with more joining every week!"
-#    community_description_1: "CodeCombat is a community project, with hundreds of players volunteering to create levels, contribute to our code to add features, fix bugs, playtest, and even translate the game into 50 languages so far. Employees, contributors and the site gain by sharing ideas and pooling effort, as does the open source community in general. The site is built on numerous open source projects, and we are open sourced to give back to the community and provide code-curious players a familiar project to explore and experiment with. Anyone can join the CodeCombat community! Check out our"
-#    community_description_link: "contribute page"
-#    community_description_2: "for more info."
-#    number_contributors: "Over 450 contributors have lent their support and time to this project."
-#    story_title: "Our story so far"
-#    story_subtitle: "Since 2013, CodeCombat has grown from a mere set of sketches to a living, thriving game."
-#    story_statistic_1a: "5,000,000+"
-#    story_statistic_1b: "total players"
-#    story_statistic_1c: "have started their programming journey through CodeCombat"
-#    story_statistic_2a: "We’ve been translated into over 50 languages — our players hail from"
-#    story_statistic_2b: "200+ countries"
-#    story_statistic_3a: "Together, they have written"
-#    story_statistic_3b: "1 billion lines of code and counting"
-#    story_statistic_3c: "across six different programming languages"
-#    story_long_way_1: "Though we've come a long way..."
-#    story_sketch_caption: "Nick's very first sketch depicting a programming game in action."
-#    story_long_way_2: "we still have much to do before we complete our quest, so..."
-#    jobs_title: "Come work with us and help write CodeCombat history!"
-#    jobs_subtitle: "Don't see a good fit but interested in keeping in touch? See our \"Create Your Own\" listing."
-#    jobs_benefits: "Employee Benefits"
-#    jobs_benefit_1: "Competitive salary and options"
-#    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
-#    learn_more: "Learn More"
-#    jobs_custom_title: "Create Your Own"
-#    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
-#    jobs_custom_contact_1: "Send us a note at"
-#    jobs_custom_contact_2: "introducing yourself and we might get in touch in the future!"
-#    contact_title: "Press & Contact"
-#    contact_subtitle: "Need more information? Get in touch with us at"
-#    screenshots_title: "Game Screenshots"
-#    screenshots_hint: "(click to view full size)"
-#    downloads_title: "Download Assets & Information"
-#    about_codecombat: "About CodeCombat"
-#    logo: "Logo"
-#    screenshots: "Screenshots"
-#    character_art: "Character Art"
-#    download_all: "Download All"
-#    previous: "Previous"
-#    next: "Next"
-#    location_title: "We're located in downtown SF:"
+  about:
+    main_title: "Hvis du vil lære at programmere, skal du skrive (en masse) kode."
+    main_description: "Hos CodeCombat er vores opgave at sikre, at du gør det med et smil på læben."
+    mission_link: "Mission"
+    team_link: "Hold"
+    community_link: "Fællesskab"
+    story_link: "Baggrund"
+    careers_link: "Karriere"
+    press_link: "Pressen"
+    mission_title: "Vores mission: At gøre programmering tilgængelig for alle elever på Jorden."
+    mission_description_1: "<strong>Programmering er magi</strong>. Det er evnen til at skabe ting fra ren fantasi. Vi startede CodeCombat for at give eleverne en fornemmelse af troldmandsmagt lige ved hånden ved hjælp af <strong>indtastet kode</strong>."
+    mission_description_2: "Det viser sig, at det får dem til at lære hurtigere, MEGET hurtigere. Det er som at have en samtale i stedet for at læse en manual. Vi ønsker at bringe denne samtale til alle skoler og til <strong>alle elever</strong>, fordi alle skal have chancen for at lære det magiske ved programmering."
+    team_title: "Mød CodeCombat teamet"
+    team_values: "Vi værdsætter åben og respektfuld dialog, hvor den bedste idé vinder. Vores beslutninger er funderet med undersøgelser af kundernes oplevelser og vores proces er fokuseret på at levere konkrete resultater til dem. Alle er inddraget, fra vores CEO til vores GitHub bidragsydere, fordi vi værdsætter vækst og læring i vores team."
+    nick_title: "Medstifter, CEO"
+    nick_blurb: "Motivationsguru"
+    matt_title: "Medstifter, CTO"
+    matt_blurb: "Cyklist"
+    cat_title: "Game Designer"
+    cat_blurb: "Luftbetvinger"
+    scott_title: "Medstifter, Software Engineer"
+    scott_blurb: "Den Rimelige"
+    maka_title: "Kundens Talsmand"
+    maka_blurb: "Historiefortæller"
+    rob_title: "Software Engineer"
+    rob_blurb: "Koder ting og sager"
+    josh_c_title: "Game Designer"
+    josh_c_blurb: "Designer spil"
+    robin_title: "UX Design & Udvikling"
+    robin_blurb: "Støttearbejde"
+    josh_title: "Game Designer"
+    josh_blurb: "Gulvet Er Lava"
+    retrostyle_title: "Illustration"
+    retrostyle_blurb: "Retro Spil"
+    jose_title: "Musik"
+    jose_blurb: "Sætter i gang"
+    community_title: "...og vores open source fællesskab"
+    community_subtitle: "Over 450 bidragydere har hjulpet med at bygge CodeCombat, flere kommer til hver uge!"
+    community_description_1: "CodeCombat er et fællesprojekt, med hundredvis af spillere, der frivilligt skaber baner, bidrager til vores kode ved at tilføje funktioner, rette fejl, spilteste, og oversætte spillet til hele 50 sprog. Medarbejdere, bidragydere og portalen vinder alle ved at dele idéer og samle kræfterne, og ligeså gør open source fællesskabet. Portalen er bygget med en lang række open source projekter, og vi er open source for at give tilbage til fællesskabet og skabe kode til nysgerrige spillere så det har et velkendt projekt at udforske og eksperimentere med. Alle kan deltage i CodeCombat's fællesskab! Tjek vores"
+    community_description_link: "bidragsside"
+    community_description_2: "for mere info."
+    number_contributors: "Over 450 bidragydere har udlånt deres støtte og tid til dette projekt."
+    story_title: "Vores historie indtil videre"
+    story_subtitle: "Siden 2013 er CodeCombat vokset fra et simpelt sæt skitser til et levende, blomstrende spil."
+    story_statistic_1a: "5.000.000+"
+    story_statistic_1b: "spillere"
+    story_statistic_1c: "har startet deres programmeringsrejse med CodeCombat"
+    story_statistic_2a: "Vi har været oversat til over 50 sprog - vores spillere kommer fra"
+    story_statistic_2b: "200+ lande"
+    story_statistic_3a: "Tilsammen, har de skrevet"
+    story_statistic_3b: "1 milliard linjer kode og flere på vej"
+    story_statistic_3c: "i seks forskellige programmeringssprog"
+    story_long_way_1: "Selv om vi er kommet langt..."
+    story_sketch_caption: "Nick's allerførste skitse der forestiller et programmeringsspil i fuld gang."
+    story_long_way_2: "vi har stadig meget at gøre, før vi har fuldført vores opgave, så..."
+    jobs_title: "Kom og arbejd hos os og hjælp med at skrive CodeCombat historie!"
+    jobs_subtitle: "Kan du ikke finde den rette mulighed, men er interesseret i at holde kontakten? Se vores \"Lav Dit Eget\" liste."
+    jobs_benefits: "Personalegoder"
+    jobs_benefit_1: "Konkurrencedygtig løn og optioner"
+    jobs_benefit_2: "15 dages minimum feriepolitik, eksklusiv firmafridage"
+    jobs_benefit_3: "Fleksibilitet ved at arbejde hjemmefra" # {change}
+    jobs_benefit_4: "Ubegrænset antal syge- eller personligedage" # {change}
+    jobs_benefit_5: "Faglig udvikling og hjælp til efteruddannelse" # {change}
+    jobs_benefit_6: "Syge-, Tand- og Synsforsikring" # {change}
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
+    learn_more: "Lær Mere"
+    jobs_custom_title: "Lav Dit Eget"
+    jobs_custom_description: "Brænder du for CodeCombat men kan ikke se et ledigt job, der matcher dine kvalifikationer? Skriv til os og vis, hvordan du tror, ​​du kan bidrage til vores team. Vi vil meget gerne høre fra dig!"
+    jobs_custom_contact_1: "Send os en besked på"
+    jobs_custom_contact_2: "introducer dig selv så vi måske får etableret fremtidig kontakt!"
+    contact_title: "Presse & Kontakt"
+    contact_subtitle: "Behov for flere oplysninger? Kom i kontakt med os på"
+    screenshots_title: "Spil Screenshots"
+    screenshots_hint: "(klik for fuld størrelse)"
+    downloads_title: "Download Assets & Information"
+    about_codecombat: "Om CodeCombat"
+    logo: "Logo"
+    screenshots: "Screenshots"
+    character_art: "Character Art"
+    download_all: "Download Alt"
+    previous: "Forrige"
+    next: "Næste"
+    location_title: "Vi har kontor i centrum af SF:"
 
-#  teachers:
-#    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
-#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
-#    more_info_title: "Where can I find more information?"
-#    more_info_1: "Our"
-#    more_info_2: "teachers forum"
-#    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
+  teachers:
+    who_for_title: "Hvem er CodeCombat tiltænkt?"
+    who_for_1: "Vi anbefaler CodeCombat til elever på 9 år eller ældre. Ingen forudgående erfaring med programmering er nødvendig. Vi har designet CodeCombat til at appellere til både drenge og piger."
+    who_for_2: "Vores Kursussystem tillader lærere at oprette klasserværelser, følge fremdrift og og tildele yderligert indhold til eleverne gennem en skræddersyet brugergrænseflade."
+    more_info_title: "Hvor kan jeg finde mere information?"
+    more_info_1: "Vores"
+    more_info_2: "lærer forum"
+    more_info_3: "er et godt sted at få kontakt til ligesindede undervisere, der bruger CodeCombat."
 
-#  teachers_quote:
-#    name: "Demo Form"
-#    title: "Request a Demo"
-#    subtitle: "Get your students started in less than an hour. You'll be able to <strong>create a class, add students, and monitor their progress</strong> as they learn computer science."
-#    email_exists: "User exists with this email."
-#    phone_number: "Phone number"
-#    phone_number_help: "Where can we reach you during the workday?"
-#    role_label: "Your role"
-#    role_help: "Select your primary role."
-#    tech_coordinator: "Technology coordinator"
-#    advisor: "Advisor"
-#    principal: "Principal"
-#    superintendent: "Superintendent"
-#    parent: "Parent"
-#    organization_label: "Name of School/District"
-#    city: "City"
-#    state: "State"
-#    country: "Country"
-#    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
-#    education_level_label: "Education Level of Students"
-#    education_level_help: "Choose as many as apply."
-#    elementary_school: "Elementary School"
-#    high_school: "High School"
-#    please_explain: "(please explain)"
-#    middle_school: "Middle School"
-#    college_plus: "College or higher"
-#    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
-#    setup_a_class: "Set Up a Class"
+  teachers_quote:
+    name: "Demo Skema"
+    title: "Anmod en Demo"
+    subtitle: "Få dine elever startet på mindre end en time. Du vil være i stand til at <strong>oprette en klasse, tilføje elever, og overvåge deres fremgang</strong> mens de lærer datalogi!"
+    email_exists: "En bruger med denne email eksisterer allerede."
+    phone_number: "Telefonnummer"
+    phone_number_help: "Hvor kan vi få fat i dig i løbet af arbejdsdagen?"
+    role_label: "Din funktion"
+    role_help: "Vælg din primærfunktion."
+#    role_default: "Select Role"
+    tech_coordinator: "Teknologikoordinator"
+    advisor: "Rådgiver"
+    principal: "Skoleleder"
+    superintendent: "Leder"
+    parent: "Forælder"
+    organization_label: "Navn på Skole/Område"
+    city: "By"
+    state: "Stat"
+    country: "Land"
+    num_students_help: "Hvor mange forventer du at indskrive i CodeCombat?"
+#    num_students_default: "Select Range"
+    education_level_label: "Eleverne Uddannelsesniveau"
+    education_level_help: "Vælg så mange som passer."
+    elementary_school: "Grundskole"
+    high_school: "Ungdomsuddannelse"
+    please_explain: "(uddyb venligst)"
+    middle_school: "Mellemskole"
+    college_plus: "Vidergående uddannelse eller højere"
+    anything_else: "Noget andet, vi bør vide?"
+    thanks_header: "Tak for at anmode om en demo!" # {change}
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+    thanks_p: "Vi vil snart tage kontakt. Spørgsmål? Email os:" # {change}
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
+    setup_a_class: "Opret en klasse"
 
   versions:
     save_version_title: "Gem ny version"
     new_major_version: "Ny hoved Version"
-#    submitting_patch: "Submitting Patch..."
+    submitting_patch: "Indsender Opdatering..."
     cla_prefix: "For at gemme dine ændringer, må du acceptere brugerbetingelserne"
     cla_url: "CLA"
     cla_suffix: "."
     cla_agree: "Jeg er enig"
-#    owner_approve: "An owner will need to approve it before your changes will become visible."
+    owner_approve: "En ejer skal godkende den før dine ændringer bliver synlige."
 
   contact:
     contact_us: "Kontakt CodeCombat"
@@ -786,14 +825,14 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     forum_prefix: "For noget offentligt, prøv venligst "
     forum_page: "Vores forum"
     forum_suffix: " istedet."
-#    faq_prefix: "There's also a"
-#    faq: "FAQ"
-#    subscribe_prefix: "If you need help figuring out a level, please"
-#    subscribe: "buy a CodeCombat subscription"
-#    subscribe_suffix: "and we'll be happy to help you with your code."
-#    subscriber_support: "Since you're a CodeCombat subscriber, your email will get our priority support."
-#    screenshot_included: "Screenshot included."
-#    where_reply: "Where should we reply?"
+    faq_prefix: "Der er også en"
+    faq: "FAQ"
+    subscribe_prefix: "Hvis du har brug for hjælp til at finde ud af en bane, kan du"
+    subscribe: "købe et CodeCombat abonnement"
+    subscribe_suffix: "og vi vil med glæde hjælpe dig med din kode."
+    subscriber_support: "Eftersom du er en CodeCombat abonnent, vil din email få prima-support."
+    screenshot_included: "Screenshot inkluderet."
+    where_reply: "Hvor skal vi svare?"
     send: "Send Feedback"
 
   account_settings:
@@ -802,34 +841,34 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     autosave: "Ændringer Gemmes Automatisk"
     me_tab: "Mig"
     picture_tab: "Billede"
-#    delete_account_tab: "Delete Your Account"
-#    wrong_email: "Wrong Email"
-#    wrong_password: "Wrong Password"
-#    upload_picture: "Upload a picture"
-#    delete_this_account: "Delete this account permanently"
-#    reset_progress_tab: "Reset All Progress"
-#    reset_your_progress: "Clear all your progress and start over"
-#    god_mode: "God Mode"
+    delete_account_tab: "Slet Din Konto"
+    wrong_email: "Forkert Email"
+    wrong_password: "Forkert Password"
+    upload_picture: "Upload et billede"
+    delete_this_account: "Slet denne konto permanent"
+    reset_progress_tab: "Nulstil Forløb"
+    reset_your_progress: "Slet din fremgang og start forfra"
+    god_mode: "Gude Tilstand"
     password_tab: "Password"
     emails_tab: "Emails"
-#    admin: "Admin"
-#    manage_subscription: "Click here to manage your subscription."
+    admin: "Admin"
+    manage_subscription: "Klik her for at administrere dit abonnement."
     new_password: "Nyt Password"
     new_password_verify: "Bekræft"
-#    type_in_email: "Type in your email to confirm account deletion."
-#    type_in_email_progress: "Type in your email to confirm deleting your progress."
-#    type_in_password: "Also, type in your password."
+    type_in_email: "Indtast din email for at bekræfte kontosletning."
+    type_in_email_progress: "Indtast din email for at bekræfte sletning af din fremgang."
+    type_in_password: "Indtast også dit password."
     email_subscriptions: "Emailtilmeldinger"
-#    email_subscriptions_none: "No Email Subscriptions."
+    email_subscriptions_none: "Ingen Email Abonnementer."
     email_announcements: "Nyheder"
     email_announcements_description: "Få emails om de seneste nyheder og udvikling på CodeCombat."
     email_notifications: "Notifikationer"
-#    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
-#    email_any_notes: "Any Notifications"
-#    email_any_notes_description: "Disable to stop all activity notification emails."
-#    email_news: "News"
-#    email_recruit_notes: "Job Opportunities"
-#    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
+    email_notifications_summary: "Indstillinger for personlig, automatiske email notifikationer relateret til din CodeCombat aktivitet."
+    email_any_notes: "Eventuelle Notifikationer"
+    email_any_notes_description: "Deaktiver for at stoppe alle aktivitetsnotifikationer via email."
+    email_news: "Nyheder"
+    email_recruit_notes: "Jobmuligheder"
+    email_recruit_notes_description: "Hvis du spiller rigtigt godt, kan vi kontakte dig så du får dig et (bedre) job."
     contributor_emails: "Bidragsklasse-emails"
     contribute_prefix: "Vi leder efter folk til at joine vores gruppe! Tjek "
     contribute_page: "bidragssiden"
@@ -838,820 +877,916 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     error_saving: "Fejl under Gemning"
     saved: "Ændringer Gemt"
     password_mismatch: "Password matcher ikke."
-#    password_repeat: "Please repeat your password."
+    password_repeat: "Gentag venligst dit kodeord."
 
-#  keyboard_shortcuts:
-#    keyboard_shortcuts: "Keyboard Shortcuts"
-#    space: "Space"
-#    enter: "Enter"
-#    press_enter: "press enter"
-#    escape: "Escape"
-#    shift: "Shift"
-#    run_code: "Run current code."
-#    run_real_time: "Run in real time."
-#    continue_script: "Continue past current script."
-#    skip_scripts: "Skip past all skippable scripts."
-#    toggle_playback: "Toggle play/pause."
-#    scrub_playback: "Scrub back and forward through time."
-#    single_scrub_playback: "Scrub back and forward through time by a single frame."
-#    scrub_execution: "Scrub through current spell execution."
-#    toggle_debug: "Toggle debug display."
-#    toggle_grid: "Toggle grid overlay."
-#    toggle_pathfinding: "Toggle pathfinding overlay."
-#    beautify: "Beautify your code by standardizing its formatting."
-#    maximize_editor: "Maximize/minimize code editor."
+  keyboard_shortcuts:
+    keyboard_shortcuts: "Keyboard Genvejstaster"
+    space: "Mellemrum"
+    enter: "Enter"
+    press_enter: "tryk enter"
+    escape: "Esc"
+    shift: "Skift"
+    run_code: "Kør nuværende kode."
+    run_real_time: "Kør i realtid."
+    continue_script: "Fortsæt efter nuværende script."
+    skip_scripts: "Spring over alle scripts der kan springes over."
+    toggle_playback: "Tryk play/pause."
+    scrub_playback: "Kør tilbage og fremad i tid."
+    single_scrub_playback: "Kør tilbage og fremad i tid billede for billede."
+    scrub_execution: "Kør gennem besværgelseseksekvering."
+    toggle_debug: "Tænd/Sluk debug skærmbillede."
+    toggle_grid: "Tænd/Sluk gitter overlejring."
+    toggle_pathfinding: "Tænd/Sluk stifinder overlejring."
+    beautify: "Forskøn din kode ved at standardisere dens formattering."
+    maximize_editor: "Maksimer/Minimer kodeeditor."
 
-#  community:
-#    main_title: "CodeCombat Community"
-#    introduction: "Check out the ways you can get involved below and decide what sounds the most fun. We look forward to working with you!"
-#    level_editor_prefix: "Use the CodeCombat"
-#    level_editor_suffix: "to create and edit levels. Users have created levels for their classes, friends, hackathons, students, and siblings. If create a new level sounds intimidating you can start by forking one of ours!"
-#    thang_editor_prefix: "We call units within the game 'thangs'. Use the"
-#    thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites."
-#    article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the"
-#    article_editor_suffix: "and help CodeCombat players get the most out of their playtime."
-#    find_us: "Find us on these sites"
-#    social_github: "Check out all our code on GitHub"
-#    social_blog: "Read the CodeCombat blog on Sett"
-#    social_discource: "Join the discussion on our Discourse forum"
-#    social_facebook: "Like CodeCombat on Facebook"
-#    social_twitter: "Follow CodeCombat on Twitter"
-#    social_gplus: "Join CodeCombat on Google+"
+  community:
+    main_title: "CodeCombat Fællesskab"
+    introduction: "Tjek nedenfor hvordan du kan blive involveret, og beslut dig for hvad der lyder sjovest. Vi ser frem til at arbejde sammen med dig!"
+    level_editor_prefix: "Brug CodeCombat"
+    level_editor_suffix: "at oprette og redigere baner. Brugerne har skabt baner til deres klasser, venner, Hackathon, elever og søskende. Hvis det lyder skræmmende at lave en ny bare, kan du starte med at fork'e en af ​​vores!"
+    thang_editor_prefix: "Vi kalder enheder i spillet 'thangs'. Brug"
+    thang_editor_suffix: "at ændre CodeCombat's eget artwork. Tillad enheder at kaste projektiler, ændre retningen af ​​en animation, ændre en enheds livspoints, eller upload dine egne vektorgrafik sprites."
+    article_editor_prefix: "Har du fundet en fejl i vores dokumentation? Har du brug for at lave nogle instruktioner til dine egne kreationer? Tjek"
+    article_editor_suffix: "og hjælp CodeCombat spillere med at få mest muligt ud af deres spilletid."
+    find_us: "Find os på disse websteder"
+    social_github: "Tjek alt vores kode på GitHub"
+    social_blog: "Læs CodeCombat-bloggen på Sett"
+    social_discource: "Deltag i diskussionen på vores Diskurs forum"
+    social_facebook: "Like CodeCombat på Facebook"
+    social_twitter: "Følg CodeCombat på Twitter"
+    social_gplus: "Følg CodeCombat på Google+"
 #    social_slack: "Chat with us in the public CodeCombat Slack channel"
-#    contribute_to_the_project: "Contribute to the project"
+    contribute_to_the_project: "Bidrag til projektet"
 
-#  clans:
-#    clan: "Clan"
-#    clans: "Clans"
-#    new_name: "New clan name"
-#    new_description: "New clan description"
-#    make_private: "Make clan private"
-#    subs_only: "subscribers only"
-#    create_clan: "Create New Clan"
-#    private_preview: "Preview"
-#    private_clans: "Private Clans"
-#    public_clans: "Public Clans"
-#    my_clans: "My Clans"
-#    clan_name: "Clan Name"
-#    name: "Name"
-#    chieftain: "Chieftain"
-#    type: "Type"
-#    edit_clan_name: "Edit Clan Name"
-#    edit_clan_description: "Edit Clan Description"
-#    edit_name: "edit name"
-#    edit_description: "edit description"
-#    private: "(private)"
-#    summary: "Summary"
-#    average_level: "Average Level"
-#    average_achievements: "Average Achievements"
-#    delete_clan: "Delete Clan"
-#    leave_clan: "Leave Clan"
-#    join_clan: "Join Clan"
-#    invite_1: "Invite:"
-#    invite_2: "*Invite players to this Clan by sending them this link."
-#    members: "Members"
-#    progress: "Progress"
-#    not_started_1: "not started"
-#    started_1: "started"
-#    complete_1: "complete"
-#    exp_levels: "Expand levels"
-#    rem_hero: "Remove Hero"
-#    status: "Status"
-#    complete_2: "Complete"
-#    started_2: "Started"
-#    not_started_2: "Not Started"
-#    view_solution: "Click to view solution."
-#    view_attempt: "Click to view attempt."
-#    latest_achievement: "Latest Achievement"
-#    playtime: "Playtime"
-#    last_played: "Last played"
-#    leagues_explanation: "Play in a league against other clan members in these multiplayer arena instances."
-#    track_concepts1: "Track concepts"
-#    track_concepts2a: "learned by each student"
-#    track_concepts2b: "learned by each member"
-#    track_concepts3a: "Track levels completed for each student"
-#    track_concepts3b: "Track levels completed for each member"
-#    track_concepts4a: "See your students'"
-#    track_concepts4b: "See your members'"
-#    track_concepts5: "solutions"
-#    track_concepts6a: "Sort students by name or progress"
-#    track_concepts6b: "Sort members by name or progress"
-#    track_concepts7: "Requires invitation"
-#    track_concepts8: "to join"
-#    private_require_sub: "Private clans require a subscription to create or join."
+  clans:
+    clan: "Klan"
+    clans: "Klaner"
+    new_name: "Nyt klannavn"
+    new_description: "Ny klanbeskrivelse"
+    make_private: "Gør klan privat"
+    subs_only: "kun abonnenter"
+    create_clan: "Lav Ny Klan"
+    private_preview: "Forsmag"
+    private_clans: "Private Klaner"
+    public_clans: "Public Klaner"
+    my_clans: "Mine Klaner"
+    clan_name: "Klannavn"
+    name: "Navn"
+    chieftain: "Høvding"
+    type: "Type"
+    edit_clan_name: "Rediger Klannavn"
+    edit_clan_description: "Rediger Klanbeskrivelse"
+    edit_name: "Rediger navn"
+    edit_description: "Rediger beskrivelse"
+    private: "(privat)"
+    summary: "Oversigt"
+    average_level: "Gennemsnitligt Niveau"
+    average_achievements: "Gennemsnitlig Bedrifter"
+    delete_clan: "Slet Klan"
+    leave_clan: "Forlad Klan"
+    join_clan: "Følg Clan"
+    invite_1: "Invitér:"
+    invite_2: "*Invitér spillere til denne Klan ved at sende dem dette link."
+    members: "Medlemmer"
+    progress: "Fremgang"
+    not_started_1: "ikke begyndt"
+    started_1: "begyndt"
+    complete_1: "gennemført"
+    exp_levels: "Udvid baner"
+    rem_hero: "Fjern Helt"
+    status: "Status"
+    complete_2: "Gennemført"
+    started_2: "Begyndt"
+    not_started_2: "Ikke Begyndt"
+    view_solution: "Klik for at se løsningen."
+    view_attempt: "Klik for at se forsøg."
+    latest_achievement: "Seneste Bedrifter"
+    playtime: "Spilletid"
+    last_played: "Sidst spillede"
+    leagues_explanation: "Spil i en liga mod andre klanmedlemmer i disse multiplayer arenainstanser."
+    track_concepts1: "Følg koncepter"
+    track_concepts2a: "lært af hver elev"
+    track_concepts2b: "lært af hvert medlem"
+    track_concepts3a: "Følg baner gennemført af hver elev"
+    track_concepts3b: "Følg baner gennemført af hvert medlem"
+    track_concepts4a: "Vis dine elever'"
+    track_concepts4b: "Vis dine medlemmer'"
+    track_concepts5: "løsninger"
+    track_concepts6a: "Sortér elever ved navn eller fremgang"
+    track_concepts6b: "Sortér medlemmer ved navn eller fremgang"
+    track_concepts7: "Kræver invitation"
+    track_concepts8: "at slutte sig til"
+    private_require_sub: "Det kræver et abonnement at oprette eller deltage i private klaner."
 
-#  courses:
-#    course: "Course"
-#    courses: "courses"
-#    create_new_class: "Create New Class"
-#    not_enrolled: "You are not enrolled in this course."
-#    visit_pref: "Please visit the"
-#    visit_suf: "page to enroll."
-#    select_class: "Select one of your classes"
-#    unnamed: "*unnamed*"
-#    select: "Select"
-#    unnamed_class: "Unnamed Class"
-#    edit_settings: "edit class settings"
-#    edit_settings1: "Edit Class Settings"
-#    progress: "Class Progress"
-#    add_students: "Add Students"
-#    stats: "Statistics"
-#    total_students: "Total students:"
-#    average_time: "Average level play time:"
-#    total_time: "Total play time:"
-#    average_levels: "Average levels completed:"
-#    total_levels: "Total levels completed:"
-#    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
-#    students: "Students"
-#    students1: "students"
-#    concepts: "Concepts"
-#    levels: "levels"
-#    played: "Played"
-#    play_time: "Play time:"
-#    completed: "Completed:"
-#    invite_students: "Invite students to join this class."
-#    invite_link_header: "Link to join course"
-#    invite_link_p_1: "Give this link to students you would like to have join the course."
-#    invite_link_p_2: "Or have us email them directly:"
-#    capacity_used: "Course slots used:"
-#    enter_emails: "Enter student emails to invite, one per line"
-#    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
-#    creating_class: "Creating class..."
-#    purchasing_course: "Purchasing course..."
-#    buy_course: "Buy Course"
-#    buy_course1: "Buy this course"
-#    create_class: "Create Class"
-#    select_all_courses: "Select 'All Courses' for a 50% discount!"
-#    all_courses: "All Courses"
-#    number_students: "Number of students"
-#    enter_number_students: "Enter the number of students you need for this class."
-#    name_class: "Name your class"
-#    displayed_course_page: "This will be displayed on the course page for you and your students. It can be changed later."
-#    buy: "Buy"
-#    purchasing_for: "You are purchasing a license for"
-#    creating_for: "You are creating a class for"
-#    for: "for" # Like in 'for 30 students'
-#    receive_code: "Afterwards you will receive an unlock code to distribute to your students, which they can use to enroll in your class."
-#    free_trial: "Free trial for teachers!"
-#    get_access: "to get individual access to all courses for evalutaion purposes."
-#    questions: "Questions?"
-#    teachers_click: "Teachers Click Here"
-#    students_click: "Students Click Here"
-#    courses_on_coco: "Courses on CodeCombat"
-#    designed_to: "Courses are designed to introduce computer science concepts using CodeCombat's fun and engaging environment. CodeCombat levels are organized around key topics to encourage progressive learning, over the course of 5 hours."
-#    more_in_less: "Learn more in less time"
-#    no_experience: "No coding experience necesssary"
-#    easy_monitor: "Easily monitor student progress"
-#    purchase_for_class: "Purchase a course for your entire class. It's easy to sign up your students!"
-#    see_the: "See the"
-#    more_info: "for more information."
-#    choose_course: "Choose Your Course:"
-#    enter_code: "Enter an unlock code to join an existing class"
-#    enter_code1: "Enter unlock code"
-#    enroll: "Enroll"
-#    pick_from_classes: "Pick from your current classes"
-#    enter: "Enter"
-#    or: "Or"
-#    topics: "Topics"
-#    hours_content: "Hours of content:"
-#    get_free: "Get FREE course"
-#    enroll_paid: "Enroll Students in Paid Courses"
-#    you_have1: "You have"
-#    you_have2: "unused paid enrollments"
-#    use_one: "Use 1 paid enrollment for"
-#    use_multiple: "Use paid enrollments for the following students:"
-#    already_enrolled: "already enrolled"
-#    licenses_remaining: "licenses remaining:"
-#    insufficient_enrollments: "insufficient paid enrollments"
-#    enroll_students: "Enroll Students"
-#    get_enrollments: "Get More Enrollments"
-#    change_language: "Change Course Language"
-#    keep_using: "Keep Using"
-#    switch_to: "Switch To"
-#    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
-#    back_classrooms: "Back to my classrooms"
-#    back_courses: "Back to my courses"
-#    edit_details: "Edit class details"
-#    enrolled_courses: "enrolled in paid courses:"
-#    purchase_enrollments: "Purchase Enrollments"
-#    remove_student: "remove student"
-#    assign: "Assign"
-#    to_assign: "to assign paid courses."
-#    teacher: "Teacher"
-#    complete: "Complete"
-#    none: "None"
-#    save: "Save"
-#    play_campaign_title: "Play the Campaign"
-#    play_campaign_description: "You’re ready to take the next step! Explore hundreds of challenging levels, learn advanced programming skills, and compete in multiplayer arenas!"
-#    create_account_title: "Create an Account"
-#    create_account_description: "Sign up for a FREE CodeCombat account and gain access to more levels, more programming skills, and more fun!"
-#    preview_campaign_title: "Preview Campaign"
-#    preview_campaign_description: "Take a sneak peek at all that CodeCombat has to offer before signing up for your FREE account."
-#    arena: "Arena"
-#    arena_soon_title: "Arena Coming Soon"
-#    arena_soon_description: "We are working on a multiplayer arena for classrooms at the end of"
-#    not_enrolled1: "Not enrolled"
-#    not_enrolled2: "Ask your teacher to enroll you in the next course."
-#    next_course: "Next Course"
-#    coming_soon1: "Coming soon"
-#    coming_soon2: "We are hard at work making more courses for you!"
-#    available_levels: "Available Levels"
-#    welcome_to_courses: "Adventurers, welcome to Courses!"
-#    ready_to_play: "Ready to play?"
-#    start_new_game: "Start New Game"
-#    play_now_learn_header: "Play now to learn"
-#    play_now_learn_1: "basic syntax to control your character"
-#    play_now_learn_2: "while loops to solve pesky puzzles"
-#    play_now_learn_3: "strings & variables to customize actions"
-#    play_now_learn_4: "how to defeat an ogre (important life skills!)"
-#    welcome_to_page: "Welcome to your Courses page!"
-#    completed_hoc: "Amazing! You've completed the Hour of Code course!"
-#    ready_for_more_header: "Ready for more? Play the campaign mode!"
-#    ready_for_more_1: "Use gems to unlock new items!"
-#    ready_for_more_2: "Play through brand new worlds and challenges"
-#    ready_for_more_3: "Learn even more programming!"
-#    saved_games: "Saved Games"
-#    hoc: "Hour of Code"
+  courses:
+    course: "Kursus"
+    courses: "kurser"
+    create_new_class: "Lav Ny Klasse"
+    not_enrolled: "Du er ikke tilmeldt dette kursus."
+    visit_pref: "Besøg venligst"
+    visit_suf: "siden for at tilmelde dig."
+    select_class: "Vælg en af ​​dine klasser"
+    unnamed: "*unavngivet*"
+    select: "Vælg"
+    unnamed_class: "Unavngivet Klasse"
+    edit_settings: "rediger klasseindstillinger"
+    edit_settings1: "Rediger Klasseindstillinger"
+    progress: "Klassefremgang"
+    add_students: "Tilføj Elever"
+    stats: "Statistik"
+    total_students: "Antal Elever:"
+    average_time: "Gennemsnitlig banespilletid:"
+    total_time: "Total spilletid:"
+    average_levels: "Gennemsnitlig antal gennemførte baner:"
+    total_levels: "Total antal gennemførte baner:"
+    furthest_level: "Højest bane gennemført:"
+    students: "Elever"
+    students1: "elever"
+    concepts: "Begreber"
+    levels: "baner"
+    played: "Spillet"
+    play_time: "Spiltid:"
+    completed: "Gennemført:"
+    invite_students: "Invitér elever til denne klasse."
+    invite_link_header: "Link til at følge kurset"
+    invite_link_p_1: "Giv dette link til elever, som du gerne vil have deltager i kurset."
+    invite_link_p_2: "Eller lad os email'e dem direkte:"
+    capacity_used: "Kursuspladser brugt:"
+    enter_emails: "Indtast emails på eleverne, der skal inviteres, én pr linje"
+    send_invites: "Send Invitationer"
+    creating_class: "Opretter klasse..."
+    purchasing_course: "Køber kursus..."
+    buy_course: "Køb Kursus"
+    buy_course1: "Køb dette kursus"
+    select_all_courses: "Vælg 'Alle Kurser' og få 50% rabat!"
+    all_courses: "Alle Kurser"
+    number_students: "Antal elever"
+    enter_number_students: "Indtast antallet af elever der skal være plads til i denne klasse."
+    name_class: "Navngiv din klasse"
+    displayed_course_page: "Dette vil blive vist på kursussiden for dig og dine elever. Det kan ændres senere."
+    buy: "Køb"
+    purchasing_for: "Du køber en licens til"
+    creating_for: "Du opretter en klasse til"
+    for: "til" # Like in 'for 30 students'
+    receive_code: "Bagefter vil du modtage en oplåsningskode til dine elever, som de kan bruge til at tilmelde sig din klasse."
+    free_trial: "Gratis prøveversion for lærere!"
+    get_access: "at få individuel adgang til alle kurser for evalueringsformål."
+    questions: "Spørgsmål?"
+    teachers_click: "Lærere Klik Her"
+    students_click: "Elever Klik Her"
+    courses_on_coco: "Kurser på CodeCombat"
+    designed_to: "Kurserne er designet til at indføre datalogiske begreber via CodeCombat's sjove og engagerende miljø. CodeCombat's baner er organiseret omkring centrale emner til at fremme progressiv læring i løbet af 5 timer."
+    more_in_less: "Lær mere på kortere tid"
+    no_experience: "Ingen programmeringserfaring påkrævet"
+    easy_monitor: "Nem overvågning af elevernes fremgang"
+    purchase_for_class: "Køb et kursus til hele klassen. Det er nemt at tilmelde dine elever!"
+    see_the: "Se"
+    more_info: "for mere information."
+    choose_course: "Vælg Dit Kursus:"
+    enter_code: "Indtast en oplåsningskode for at deltage i en eksisterende klasse"
+    enter_code1: "Indtast oplåsningskode"
+    enroll: "Indskriv"
+    pick_from_classes: "Vælg fra dine nuværende klasser"
+    enter: "Indtast"
+    or: "Eller"
+    topics: "Emner"
+    hours_content: "Timers indhold:"
+    get_free: "Få GRATIS kursus"
+    enroll_paid: "Tilmeld Elever til Betalte Kurser"
+    you_have1: "Du har"
+    you_have2: "ubrugte betalte tilmeldinger"
+    use_one: "Brug en betalt tilmelding til"
+    use_multiple: "Brug betalte tilmeldinger til følgende elever:"
+    already_enrolled: "allerede tilmeldt"
+    licenses_remaining: "resterende licenser:"
+    insufficient_enrollments: "utilstrækkelige betalte tilmeldinger"
+    enroll_students: "Tilmeld Elever"
+    get_enrollments: "Få flere Tilmeldinger"
+    change_language: "Rediger kursussprog"
+    keep_using: "Forsæt Brug Af"
+    switch_to: "Skift Til"
+    greetings: "Vær Hilset!"
+    back_classrooms: "Tilbage til mine klasseværelser"
+    back_courses: "Tilbage til mine klasser"
+    edit_details: "Rediger klassedetaljer"
+    enrolled_courses: "indskrevne i betalte kurser:"
+    purchase_enrollments: "Køb Tilmeldinger"
+    remove_student: "fjern elev"
+    assign: "Tildel"
+    to_assign: "at tildele betalte kurser."
+    teacher: "Lærer"
+    complete: "Gennemført"
+    none: "Ingen"
+    save: "Gem"
+    play_campaign_title: "Spil Kampagnen"
+    play_campaign_description: "Du er klar til at tage det næste skridt! Udforsk hundredvis af udfordrende baner, lær avancerede programmeringsfærdigheder, og konkurrér i multiplayer arenaer!"
+    create_account_title: "Opret en Konto"
+    create_account_description: "Tilmeld dig med en GRATIS CodeCombat-konto og få adgang til flere baner, flere programmeringsfærdigheder og mere sjov!"
+    preview_campaign_title: "Smugkig Kampagne"
+    preview_campaign_description: "Tag et smugkig på alt hvad CodeCombat har at tilbyde før du tilmelder dig med en GRATIS konto."
+    arena: "Arena"
+    arena_soon_title: "Arena Kommer Snart"
+    arena_soon_description: "Vi arbejder på en multiplayer arena til klasseværelser i slutningen af"
+    not_enrolled1: "Ikke tilmeldt"
+    not_enrolled2: "Bed din lærer om at tilmelde dig det næste kursus."
+    next_course: "Næste Kursus"
+    coming_soon1: "Kommer snart"
+    coming_soon2: "Vi arbejder hårdt på at lave flere kurser til dig!"
+    available_levels: "Tilgengængelige Baner"
+    welcome_to_courses: "Eventyrere, velkommen til Kurser!"
+    ready_to_play: "Klar til at spille?"
+    start_new_game: "Start Nyt Spil"
+    play_now_learn_header: "Spil nu for at lære"
+    play_now_learn_1: "grundlæggende syntaks til at styre din helt"
+    play_now_learn_2: "while-løkker til at løse irriterende gåder"
+    play_now_learn_3: "strenge og variable at tilpasse handlinger"
+    play_now_learn_4: "hvordan man besejrer en kæmpe (vigtige færdigheder i livet!)"
+    welcome_to_page: "Velkommen til din Kursusside!"
+    completed_hoc: "Fantastisk! Du har gennemført 'Hour of Code'-kurset!"
+    ready_for_more_header: "Klar til mere? Spil kampagner!"
+    ready_for_more_1: "Brug ædelstene til at låse op for nye sager!"
+    ready_for_more_2: "Spil dig igennem helt nye verdener og udfordringer"
+    ready_for_more_3: "Lær endnu mere programmering!"
+    saved_games: "Gemte Spil"
+    hoc: "Hour of Code"
+    my_classes: "Mine Klasser"
+    class_added: "Klasse tilføjet!"
+    view_class: "vis klasse"
+    view_levels: "vis baner"
+    join_class: "Følg En Klasse"
+    ask_teacher_for_code: "Spørg din lærer om du har en CodeCombat-klassekode! Hvis det er tilfældet, angiv den nedenfor:"
+    enter_c_code: "<Indtast klassekode>"
+    join: "Følg"
+    joining: "Følger klasse"
+    course_complete: "Kursus Gennemført"
+    play_arena: "Spil Arena"
+    start: "Start"
+    last_level: "Sidste Bane"
+    welcome_to_hoc: "Eventyrere, velkommen til vores 'Hour of Code'!"
+    logged_in_as: "Logget ind som:"
+    not_you: "Ikke dig?"
+    welcome_back: "Hej eventyrer, velkommen tilbage!"
+    continue_playing: "Fortsæt Spil"
+    more_options: "Flere muligheder:"
+    option1_header: "Mulighed 1: Invitér elever via email"
+    option1_body: "Eleverne vil automatisk få tilsendt en invitation til at deltage i denne klasse, og de bliver nødt til at oprette en konto med et brugernavn og adgangskode."
+    option2_header: "Mulighed 2: Send URL til dine elever"
+    option2_body: "Eleverne vil blive bedt om at indtaste en emailadresse, brugernavn og adgangskode for at oprette en konto."
+    option3_header: "Mulighed 3: Send studerende til codecombat.com/courses"
+    option3_body: "Giv eleverne følgende adgangskode for at komme ind med en emailadresse, brugernavn og adgangskode, når de opretter en konto."
+    thank_you_pref: "Tak for dit køb! Du kan nu tildele"
+    thank_you_suff: "flere elever til betalte kurser."
+    return_to_class: "Tilbage til klasseværelse"
+    return_to_course_man: "Tilbage til kursusadministration."
+    students_not_enrolled: "elever uden tilmeldinger"
+    total_all_classes: "Total for Alle klasser"
+    how_many_enrollments: "Hvor mange ekstra betalte tilmeldinger har du brug for?"
+    each_student_access: "Hver elev i en klasse får adgang til 2-4 kurser, når de er indskrevet i betalte kurser. Du kan tildele hvert kursus til individuelt til elever."
+    purchase_now: "Køb Nu"
+    enrollments: "tilmeldlinger"
+    remove_student1: "Fjern Elever"
+    are_you_sure: "Er du sikker på at du vil fjerne denne elev fra denne klasse?"
+    remove_description1: "Elever mister adgang til dette klasseværelse og tildelte kurser. Fremgang og spilletid er ikke tabt, og eleven kan tilføjes til klasseværelset igen til enhver tid."
+    remove_description2: "Den aktiverede betalte licens vil ikke blive returneret."
+    keep_student: "Behold Elev"
+    removing_user: "Fjerne elev"
+    to_join_ask: "For at deltage i en klasse skal du spørge din lærer efter en oplåsningskode."
+    join_this_class: "Følg Klasse"
+    enter_here: "<indtaste oplåsningskode her>"
+    successfully_joined: "Du følger nu klassen"
+    click_to_start: "Klik her for at begynde at tage"
+    my_courses: "Mine Kurser"
+    classroom: "Klasseværelse"
+    use_school_email: "brug din skole-email hvis du har en"
+    unique_name: "et unikt navn ingen har valgt"
+    pick_something: "vælg noget du kan huske"
+    class_code: "Klassekode"
+    optional_ask: "valgfrit - spørg din lærer efter en!"
+    optional_school: "valgfrit - hvilken skole går du på?"
+    start_playing: "Begynd Spil"
+    skip_this: "Spring dette over, jeg opretter en konto senere!"
+    welcome: "Velkommen"
+    getting_started: "Kom godt i gang med kurser"
+    download_getting_started: "Download begyndervejledning [PDF]"
+    getting_started_1: "Opret en ny klasse ved at klikke på den grønne knap 'Opret Ny Klasse' nedenfor."
+    getting_started_2: "Når du har oprettet en klasse, skal du klikke på den blå 'Tilføj Elev'-knap."
+    getting_started_3: "Du vil se elevens fremgang nedenfor når de tilmelder sig og følger din klasse."
+    additional_resources: "Flere Ressourcer"
+    additional_resources_1_pref: "Download/Print vores"
+    additional_resources_1_mid: "Kursus 1"
+    additional_resources_1_mid2: "og"
+    additional_resources_1_mid3: "Kursus 2"
+    additional_resources_1_suff: "lærervejledninger med løsninger til hver bane."
+    additional_resources_2_pref: "Gennemfør vores"
+    additional_resources_2_suff: "for at få to gratis tilmeldinger til resten af ​​vores betalte kurser."
+    additional_resources_3_pref: "Besøg vores"
+    additional_resources_3_mid: "Lærer Forum"
+    additional_resources_3_suff: "for at få kontakt med ligesindede undervisere, der bruger CodeCombat."
+    additional_resources_4_pref: "Check vores"
+    additional_resources_4_mid: "Skolernes Side"
+    additional_resources_4_suff: "for at lære mere om CodeCombat klasseværelsestilbud."
+    educator_wiki_pref: "Eller tjek vores nye"
+    educator_wiki_mid: "underviser wiki"
+    educator_wiki_suff: "for at gennemse guiden online."
+    your_classes: "Dine Klasser"
+    no_classes: "Ingen klasser endnu!"
+    create_new_class1: "opret ny klasse"
+    available_courses: "Tilgengængelige Kurser"
+    unused_enrollments: "Ubrugte tilmeldinger til rådighed:"
+    students_access: "Alle elever får gratis adgang til 'Introduction to Computer Science'. En tilmelding per elev er krævet for at tildele betalte CodeCombat kurser. En enkelt elev behøver ikke flere tilmeldinger for at få adgang til alle betalte kurser."
+    active_courses: "aktive kurser"
+    no_students: "Endnu ingen elever!"
+    add_students1: "tilføj elever"
+    view_edit: "vis/redigér"
+    students_enrolled: "elever tilmeldt"
+    students_assigned: "elever tildelt"
+    length: "Varighed:"
+    title: "Titel" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Begreber Gennemgået"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Beskrivelse" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "Sprog kan ikke ændres, når først en klasse har deltagende elever."
+    learn_p: "Lær Python"
+    learn_j: "Lær JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Opret Klasse"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
 #    my_classes: "My Classes"
-#    class_added: "Class successfully added!"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
 #    view_class: "view class"
-#    view_levels: "view levels"
-#    join_class: "Join A Class"
-#    ask_teacher_for_code: "Ask your teacher if you have a CodeCombat class code! If so, enter it below:"
-#    enter_c_code: "<Enter Class Code>"
-#    join: "Join"
-#    joining: "Joining class"
-#    course_complete: "Course Complete"
-#    play_arena: "Play Arena"
-#    start: "Start"
-#    last_level: "Last Level"
-#    welcome_to_hoc: "Adventurers, welcome to our Hour of Code!"
-#    logged_in_as: "Logged in as:"
-#    not_you: "Not you?"
-#    welcome_back: "Hi adventurer, welcome back!"
-#    continue_playing: "Continue Playing"
-#    more_options: "More options:"
-#    option1_header: "Option 1: Invite students via email"
-#    option1_body: "Students will automatically be sent an invitation to join this class, and will need to create an account with a username and password."
-#    option2_header: "Option 2: Send URL to your students"
-#    option2_body: "Students will be asked to enter an email address, username and password to create an account."
-#    option3_header: "Option 3: Direct students to codecombat.com/courses"
-#    option3_body: "Give students the following passcode to enter along with an email address, username and password when they create an account."
-#    thank_you_pref: "Thank you for your purchase! You can now assign"
-#    thank_you_suff: "more students to paid courses."
-#    return_to_class: "Return to classroom"
-#    return_to_course_man: "Return to course management."
-#    students_not_enrolled: "students not enrolled"
-#    total_all_classes: "Total Across All Classes"
-#    how_many_enrollments: "How many additional paid enrollments do you need?"
-#    each_student_access: "Each student in a class will get access to Courses 2-4 once they are enrolled in paid courses. You may assign each course to each student individually."
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
 #    purchase_now: "Purchase Now"
-#    enrollments: "enrollments"
-#    remove_student1: "Remove Student"
-#    are_you_sure: "Are you sure you want to remove this student from this class?"
-#    remove_description1: "Student will lose access to this classroom and assigned classes. Progress and gameplay is NOT lost, and the student can be added back to the classroom at any time."
-#    remove_description2: "The activated paid license will not be returned."
-#    keep_student: "Keep Student"
-#    removing_user: "Removing user"
-#    to_join_ask: "To join a class, ask your teacher for an unlock code."
-#    join_this_class: "Join Class"
-#    enter_here: "<enter unlock code here>"
-#    successfully_joined: "Successfully joined"
-#    click_to_start: "Click here to start taking"
-#    my_courses: "My Courses"
-#    classroom: "Classroom"
-#    use_school_email: "use your school email if you have one"
-#    unique_name: "a unique name no one has chosen"
-#    pick_something: "pick something you can remember"
-#    class_code: "Class Code"
-#    optional_ask: "optional - ask your teacher to give you one!"
-#    optional_school: "optional - what school do you go to?"
-#    start_playing: "Start Playing"
-#    skip_this: "Skip this, I'll create an account later!"
-#    welcome: "Welcome"
-#    getting_started: "Getting Started with Courses"
-#    download_getting_started: "Download Getting Started Guide [PDF]"
-#    getting_started_1: "Create a new class by clicking the green 'Create New Class' button below."
-#    getting_started_2: "Once you've created a class, click the blue 'Add Students' button."
-#    getting_started_3: "You'll see student's progress below as they sign up and join your class."
-#    additional_resources: "Additional Resources"
-#    additional_resources_1_pref: "Download/print our"
-#    additional_resources_1_mid: "Course 1"
-#    additional_resources_1_mid2: "and"
-#    additional_resources_1_mid3: "Course 2"
-#    additional_resources_1_suff: "teacher's guides with solutions for each level."
-#    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
-#    additional_resources_3_pref: "Visit our"
-#    additional_resources_3_mid: "Teacher Forums"
-#    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
-#    additional_resources_4_pref: "Check out our"
-#    additional_resources_4_mid: "Schools Page"
-#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
-#    educator_wiki_pref: "Or check out our new"
-#    educator_wiki_mid: "educator wiki"
-#    educator_wiki_suff: "to browse the guide online."
-#    your_classes: "Your Classes"
-#    no_classes: "No classes yet!"
-#    create_new_class1: "create new class"
-#    available_courses: "Available Courses"
-#    unused_enrollments: "Unused enrollments available:"
-#    students_access: "All students get access to Introduction to Computer Science for free. One enrollment per student is required to assign them to paid CodeCombat courses. A single student does not need multiple enrollments to access all paid courses."
-#    active_courses: "active courses"
-#    no_students: "No students yet!"
-#    add_students1: "add students"
-#    view_edit: "view/edit"
-#    students_enrolled: "students enrolled"
-#    students_assigned: "students assigned"
-#    length: "Length:"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Ærkemager"
     archmage_title_description: "(Programmør)"
-#    archmage_summary: "If you are a developer interested in coding educational games, become an archmage to help us build CodeCombat!"
+    archmage_summary: "Hvis du er en udvikler som er interesseret i programmering af pædagogiske spil, så bliv en Ærkemager for at hjælpe os med at skabe CodeCombat!"
     artisan_title: "Artisan"
     artisan_title_description: "(Banedesigner)"
-#    artisan_summary: "Build and share levels for you and your friends to play. Become an Artisan to learn the art of teaching others to program."
+    artisan_summary: "Byg og del baner som dig og dine venner kan spille. Bliv en Artisan for at lære kunsten i at undervise andre programmering."
     adventurer_title: "Eventyrer"
     adventurer_title_description: "(Banetester)"
-#    adventurer_summary: "Get our new levels (even our subscriber content) for free one week early and help us work out bugs before our public release."
+    adventurer_summary: "Få vores nye baner (selv vores abonnentindhold) gratis en uge tidligere end andre og hjælp os med at fjerne bugs før vores offentlige release."
     scribe_title: "Skriver"
-    scribe_title_description: "(Artikkel redaktør)"
-#    scribe_summary: "Good code needs good documentation. Write, edit, and improve the docs read by millions of players across the globe."
+    scribe_title_description: "(Artikel redaktør)"
+    scribe_summary: "God kode kræver god dokumentation. Skriv, redigér og forbedre dokumenter læst af millioner af spillere over hele kloden."
     diplomat_title: "Diplomat"
     diplomat_title_description: "(Oversætter)"
-#    diplomat_summary: "CodeCombat is localized in 45+ languages by our Diplomats. Help us out and contribute translations."
+    diplomat_summary: "CodeCombat er oversat til 45+ sprog af vores Diplomater. Hjælp os ved at bidrage med oversættelser."
     ambassador_title: "Ambassadør"
     ambassador_title_description: "(Brugerstøtte)"
-#    ambassador_summary: "Tame our forum users and provide direction for those with questions. Our ambassadors represent CodeCombat to the world."
-#    teacher_title: "Teacher"
+    ambassador_summary: "Tæm vores forumbrugere og guide dem imod svar til deres spørgsmål. Vores ambassadører repræsenterer CodeCombat for verdenen."
+    teacher_title: "Lærer"
 
   editor:
-#    main_title: "CodeCombat Editors"
-#    article_title: "Article Editor"
-#    thang_title: "Thang Editor"
+    main_title: "CodeCombat Editorer"
+    article_title: "Artikel Editor"
+    thang_title: "Thang Editor"
     level_title: "Bane Redigeringsværktøj"
-#    achievement_title: "Achievement Editor"
-#    poll_title: "Poll Editor"
-#    back: "Back"
-#    revert: "Revert"
-#    revert_models: "Revert Models"
-#    pick_a_terrain: "Pick A Terrain"
-#    dungeon: "Dungeon"
-#    indoor: "Indoor"
-#    desert: "Desert"
-#    grassy: "Grassy"
-#    mountain: "Mountain"
-#    glacier: "Glacier"
-#    small: "Small"
-#    large: "Large"
-#    fork_title: "Fork New Version"
-#    fork_creating: "Creating Fork..."
-#    generate_terrain: "Generate Terrain"
-#    more: "More"
-#    wiki: "Wiki"
-#    live_chat: "Live Chat"
-#    thang_main: "Main"
-#    thang_spritesheets: "Spritesheets"
-#    thang_colors: "Colors"
-#    level_some_options: "Some Options?"
-#    level_tab_thangs: "Thangs"
-#    level_tab_scripts: "Scripts"
+    achievement_title: "Bedrift Editor"
+    poll_title: "Afstemning Editor"
+    back: "Tilbage"
+    revert: "Fortryd"
+    revert_models: "Fortryd Modeller"
+    pick_a_terrain: "Vælg Et Terræn"
+    dungeon: "Fangehul"
+    indoor: "Indendørs"
+    desert: "Ørken"
+    grassy: "Eng"
+    mountain: "Bjerge"
+    glacier: "Gletscher"
+    small: "Lille"
+    large: "Stor"
+    fork_title: "Fork Ny Version"
+    fork_creating: "Opretter Fork..."
+    generate_terrain: "Generér Terræn"
+    more: "Mere"
+    wiki: "Wiki"
+    live_chat: "Live Chat"
+    thang_main: "Main"
+    thang_spritesheets: "Spritesheets"
+    thang_colors: "Farver"
+    level_some_options: "Nogle Muligheder?"
+    level_tab_thangs: "Thangs"
+    level_tab_scripts: "Scripts"
     level_tab_settings: "Instillinger"
     level_tab_components: "Komponenter"
     level_tab_systems: "Systemer"
-#    level_tab_docs: "Documentation"
-#    level_tab_thangs_title: "Current Thangs"
-#    level_tab_thangs_all: "All"
+    level_tab_docs: "Dokumentation"
+    level_tab_thangs_title: "Nuværende Thangs"
+    level_tab_thangs_all: "Alle"
     level_tab_thangs_conditions: "Startbetingelser"
-#    level_tab_thangs_add: "Add Thangs"
-#    level_tab_thangs_search: "Search thangs"
-#    add_components: "Add Components"
-#    component_configs: "Component Configurations"
-#    config_thang: "Double click to configure a thang"
-#    delete: "Delete"
-#    duplicate: "Duplicate"
-#    stop_duplicate: "Stop Duplicate"
-#    rotate: "Rotate"
+    level_tab_thangs_add: "Tilføj Thangs"
+    level_tab_thangs_search: "Søg efter thangs"
+    add_components: "Tilføj Komponenter"
+    component_configs: "Komponent konfigurationer"
+    config_thang: "Dobbelt klik for at konfigurere en thang"
+    delete: "Slet"
+    duplicate: "Duplikér"
+    stop_duplicate: "Stop Duplikering"
+    rotate: "Rotér"
     level_settings_title: "Instillinger"
     level_component_tab_title: "Nuværende komponenter"
     level_component_btn_new: "Opret ny komponent"
     level_systems_tab_title: "Nuværende systemer"
     level_systems_btn_new: "Opret nyt system"
     level_systems_btn_add: "Tilføj system"
-#    level_components_title: "Back to All Thangs"
-#    level_components_type: "Type"
+    level_components_title: "Tilbage til Alle Thangs"
+    level_components_type: "Type"
     level_component_edit_title: "Redigér komponent"
-#    level_component_config_schema: "Config Schema"
+    level_component_config_schema: "Configurér Schema"
     level_component_settings: "Indstillinger"
     level_system_edit_title: "Redigér system"
     create_system_title: "Opret nyt system"
     new_component_title: "Opret ny komponent"
     new_component_field_system: "System"
     new_article_title: "Opret en Ny Artikel"
-#    new_thang_title: "Create a New Thang Type"
+    new_thang_title: "Opret en Ny Thang Type"
     new_level_title: "Opret en Ny Bane"
-#    new_article_title_login: "Log In to Create a New Article"
-#    new_thang_title_login: "Log In to Create a New Thang Type"
-#    new_level_title_login: "Log In to Create a New Level"
-#    new_achievement_title: "Create a New Achievement"
-#    new_achievement_title_login: "Log In to Create a New Achievement"
-#    new_poll_title: "Create a New Poll"
-#    new_poll_title_login: "Log In to Create a New Poll"
+    new_article_title_login: "Log ind for at oprette en Ny Artikel"
+    new_thang_title_login: "Log ind for at oprette en Ny Thang Type"
+    new_level_title_login: "Log ind for at oprette en Ny Bane"
+    new_achievement_title: "Opret en Ny Bedrift"
+    new_achievement_title_login: "Log ind for at oprette en Ny Bedrift"
+    new_poll_title: "Opret en Ny Afstemning"
+    new_poll_title_login: "Log ind for at oprette Ny Afstemning"
     article_search_title: "Søg Artikler Her"
-#    thang_search_title: "Search Thang Types Here"
+    thang_search_title: "Søg Thang Types Her"
     level_search_title: "Søg Baner Her"
-#    achievement_search_title: "Search Achievements"
-#    poll_search_title: "Search Polls"
-#    read_only_warning2: "Note: you can't save any edits here, because you're not logged in."
-#    no_achievements: "No achievements have been added for this level yet."
-#    achievement_query_misc: "Key achievement off of miscellanea"
-#    achievement_query_goals: "Key achievement off of level goals"
-#    level_completion: "Level Completion"
-#    pop_i18n: "Populate I18N"
-#    tasks: "Tasks"
-#    clear_storage: "Clear your local changes"
-#    add_system_title: "Add Systems to Level"
-#    done_adding: "Done Adding"
+    achievement_search_title: "Søg Bedrifter"
+    poll_search_title: "Søg Afstemninger"
+    read_only_warning2: "Bemærk: Du kan ikke gemme ændringer her, da du ikke er logget ind."
+    no_achievements: "Ingen bedrifter er endnu ikke blevet tilføjet denne bane."
+    achievement_query_misc: "Hovedbedrift ud af diverse"
+    achievement_query_goals: "Hovedbedrift ud af banemål"
+    level_completion: "Bane Gennemførsel"
+    pop_i18n: "Populér I18N"
+    tasks: "Opgaver"
+    clear_storage: "Rens dine lokale ændringer"
+    add_system_title: "Tilføj Systemer til Bane"
+    done_adding: "Alt Tilføjet"
 
   article:
     edit_btn_preview: "Forhåndsvisning"
     edit_article_title: "Ændr artikkel"
 
-#  polls:
-#    priority: "Priority"
+  polls:
+    priority: "Prioritering"
 
   contribute:
-#    page_title: "Contributing"
-#    intro_blurb: "CodeCombat is 100% open source! Hundreds of dedicated players have helped us build the game into what it is today. Join us and write the next chapter in CodeCombat's quest to teach the world to code!"
+    page_title: "Bidrager"
+    intro_blurb: "CodeCombat er 100% open source! Hundredvis af dedikerede spillere har hjulpet os med at bygge spillet op til hvad det er i dag. Kom og skrive det næste kapitel i CodeCombat's søgen efter at lære verden at kode!"
     alert_account_message_intro: "Hej med dig!"
-#    alert_account_message: "To subscribe for class emails, you'll need to be logged in first."
-#    archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever."
-#    class_attributes: "Class Attributes"
-#    archmage_attribute_1_pref: "Knowledge in "
-#    archmage_attribute_1_suf: ", or a desire to learn. Most of our code is in this language. If you're a fan of Ruby or Python, you'll feel right at home. It's JavaScript, but with a nicer syntax."
-#    archmage_attribute_2: "Some experience in programming and personal initiative. We'll help you get oriented, but we can't spend much time training you."
-#    how_to_join: "How To Join"
-#    join_desc_1: "Anyone can help out! Just check out our "
-#    join_desc_2: "to get started, and check the box below to mark yourself as a brave Archmage and get the latest news by email. Want to chat about what to do or how to get more deeply involved? "
-#    join_desc_3: ", or find us in our "
-#    join_desc_4: "and we'll go from there!"
+    alert_account_message: "For at modtage klasse-emails, skal du først være logget ind."
+    archmage_introduction: "En af de bedste ting ved at bygge spil er, at de kombinerer så mange forskellige ting. Grafik, lyd, netværk, sociale netværk, og selvfølgelig mange af de mere almindelige aspekter af programmering, fra low-level database management og server administration til at brugerinteraktionsdesign og bygning af grænseflader. Der er meget at gøre, og hvis du er en erfaren programmør med flair for virkelig at dykke ned i de små dele af CodeCombat, kan denne klasse være lige noget for dig. Vi ville elske at have din hjælp til at opbygge det bedste programmeringsspil nogensinde."
+    class_attributes: "Klasse Attributter"
+    archmage_attribute_1_pref: "Viden om "
+    archmage_attribute_1_suf: ", eller lyst til at lære det. Det meste af vores kode er i dette sprog. Hvis du er en fan af Ruby eller Python, vil du føle dig hjemme. Det er JavaScript, men med en pænere syntaks."
+    archmage_attribute_2: "Nogen programmeringserfaring og personligt initiativ. Vi hjælper dig med at finde rundt, men vi kan ikke bruge meget tid at træne dig."
+    how_to_join: "Sådan Deltager Du"
+    join_desc_1: "Alle kan hjælpe! Bare tjek vores "
+    join_desc_2: "for at komme i gang, og markér feltet nedenfor for at erklære dig selv som en modig Ærkemager og få de seneste nyheder via email. Hvis du vil chat'e om hvad man kan gøre, eller hvordan man bliver mere involveret? "
+    join_desc_3: ", eller find os i vores "
+    join_desc_4: "og vi tager den derfra!"
     join_url_email: "Skriv til os"
 #    join_url_slack: "public Slack channel"
-#    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
-#    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: ", then this class might be for you."
-#    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
-#    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
-#    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
-#    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
+    archmage_subscribe_desc: "Modtag email om nye programmeringsmuligheder og annonceringer."
+    artisan_introduction_pref: "Vi skal lave flere baner! Folk kræver mere indhold, og vi kan kun bygge et vist antal selv. Lige nu er din arbejdsstation bane ét; vores bane-editor er næppe brugbar selv af dens skabere, så vær på vagt. Hvis du har visioner om kampagner der spænder for-løkker til"
+    artisan_introduction_suf: ", så er denne klasse måske noget for dig."
+    artisan_attribute_1: "Enhver erfaring i at bygge indhold vil være rart, såsom at bruge Blizzard's bane-editor. Men det er ikke påkrævet!"
+    artisan_attribute_2: "En hang til masser af tests og iterationer. For at lave gode baner, er du nødt til at vise det til andre, se dem spille det og være parat til at finde en masse ting at forbedre."
+    artisan_attribute_3: "I øjeblikket er udholdenhed på lige fod med en Eventyrer. Vores Bane Editor er super ung og frustrerende at bruge. Du er hermed advaret!"
+    artisan_join_desc: "Brug Bane Editor til disse trin, sådan cirka:"
     artisan_join_step1: "Læs dokumentationen."
     artisan_join_step2: "Lav en ny bane og udforsk eksisterende baner."
-#    artisan_join_step3: "Find us in our public Slack channel for help."
-#    artisan_join_step4: "Post your levels on the forum for feedback."
-#    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
-#    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
-#    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
-#    adventurer_attribute_2: "Charismatic. Be gentle but articulate about what needs improving, and offer suggestions on how to improve."
-#    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
-#    adventurer_forum_url: "our forum"
-#    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    adventurer_subscribe_desc: "Get emails when there are new levels to test."
-#    scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
-#    scribe_introduction_url_mozilla: "Mozilla Developer Network"
-#    scribe_introduction_suf: " has built. If your idea of fun is articulating the concepts of programming in Markdown form, then this class might be for you."
-#    scribe_attribute_1: "Skill in words is pretty much all you need. Not only grammar and spelling, but able to convey complicated ideas to others."
-#    contact_us_url: "Contact us"
-#    scribe_join_description: "tell us a little about yourself, your experience with programming and what sort of things you'd like to write about. We'll go from there!"
-#    scribe_subscribe_desc: "Get emails about article writing announcements."
-#    diplomat_introduction_pref: "So, if there's one thing we learned from the "
-#    diplomat_launch_url: "launch in October"
-#    diplomat_introduction_suf: "it's that there is sizeable interest in CodeCombat in other countries! We're building a corps of translators eager to turn one set of words into another set of words to get CodeCombat as accessible across the world as possible. If you like getting sneak peeks at upcoming content and getting these levels to your fellow nationals ASAP, then this class might be for you."
-#    diplomat_attribute_1: "Fluency in English and the language you would like to translate to. When conveying complicated ideas, it's important to have a strong grasp in both!"
-#    diplomat_i18n_page_prefix: "You can start translating our levels by going to our"
-#    diplomat_i18n_page: "translations page"
-#    diplomat_i18n_page_suffix: ", or our interface and website on GitHub."
-#    diplomat_join_pref_github: "Find your language locale file "
-#    diplomat_github_url: "on GitHub"
-#    diplomat_join_suf_github: ", edit it online, and submit a pull request. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
-#    ambassador_introduction: "This is a community we're building, and you are the connections. We've got forums, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
-#    ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
-#    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
-#    ambassador_join_note_strong: "Note"
-#    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-#    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    teacher_subscribe_desc: "Get emails on updates and announcements for teachers."
-#    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
-#    diligent_scribes: "Our Diligent Scribes:"
-#    powerful_archmages: "Our Powerful Archmages:"
-#    creative_artisans: "Our Creative Artisans:"
-#    brave_adventurers: "Our Brave Adventurers:"
-#    translating_diplomats: "Our Translating Diplomats:"
-#    helpful_ambassadors: "Our Helpful Ambassadors:"
+    artisan_join_step3: "Find os i vores offentlige Slack kanal for at få hjælp."
+    artisan_join_step4: "Vis dine baner på forummet for at få feedback."
+    artisan_subscribe_desc: "Få emails omkring bane editor opdateringer og meddelelser."
+    adventurer_introduction: "Lad os være klar over din rolle: Du er Tanl. Du kommer til at tage megen skade. Vi har brug for folk til at prøve helt nye baner, og hjælpe med at identificere, hvordan vi gør tingene bedre. Smerten vil være enorm; at lave gode spil er en lang process, og ingen får det rigtigt første gang. Hvis du kan holde ud og har en høj restitueringsevne, så kan denne klasse være noget for dig."
+    adventurer_attribute_1: "En tørst efter at lære. Du ønsker at lære at kode og vi ønsker at lære dig, hvordan man koder. Men, du vil sandsynligvis foretage det meste af læringen."
+    adventurer_attribute_2: "Karismatisk. Være blid til at formulere hvad der skal forbedres, og kom med forslag til hvordan det kan forbedres."
+    adventurer_join_pref: "Enten find sammen med (eller rekruttér!) en Artisan, eller markere feltet nedenfor for at modtage e-mails, når der er nye baner klar til test. Vi vil fortælle hvilke baner der kan gennemgås via vores netværk som"
+    adventurer_forum_url: "vores forum"
+    adventurer_join_suf: "så hvis du foretrækker at blive underrettet på disse måder, så tilmeld dig der!"
+    adventurer_subscribe_desc: "Modtag email, når der er nye baner klar til test."
+    scribe_introduction_pref: "CodeCombat bliver ikke kun et sæt baner. Det vil også være en vidensressource, en wiki for programmeringsbegreber som baner kan gøre brug af. På den måde kan hver Artisan undgå at skulle lave en detaljeret beskrivelse af, hvad en sammenligningsoperator er, og istedet linke deres bane til en artikel der beskriver den. Noget i retning af hvad "
+    scribe_introduction_url_mozilla: "Mozilla Developer Network"
+    scribe_introduction_suf: " har gjort. Hvis din opfattelse af sjov er at formulere programmeringsbegreber i Markdown-format, så er denne klasse formentligt noget for dig."
+    scribe_attribute_1: "Evner med ord er stortset alt hvad du behøver. Ikke kun grammatik og stavning, men også evnen til at formidle komplicerede ideer til andre."
+    contact_us_url: "Kontakt os"
+    scribe_join_description: "fortæl os lidt om dig selv, dine erfaringer med programmering og hvilke emner, du gerne vil skrive om. Så tager vi den derfra!"
+    scribe_subscribe_desc: "Få emails omkring artikelskrivning."
+    diplomat_introduction_pref: "Så hvis der er én ting, vi har lært af "
+    diplomat_launch_url: "lanceringen i oktober"
+    diplomat_introduction_suf: "så er det, at der er betydelig interesse i CodeCombat i andre lande! Vi bygger et korps af oversættere ivrige efter at vende ét sæt ord om til et andet sæt ord for at gøre CodeCombat så tilgængelig i hele verden som muligt. Hvis du kan lide snigpremierer på kommende indhold og få disse baner ud til dine landsmænd ASAP, så er denne klasse noget for dig."
+    diplomat_attribute_1: "Flydende i engelsk og det sprog, du ønsker at oversætte til. Når man formidler komplicerede ideer, er det vigtigt at have en stærk forståelse i begge sprog!"
+    diplomat_i18n_page_prefix: "Du kan begynde med at oversætte vores baner ved at gå til vores"
+    diplomat_i18n_page: "oversætter side"
+    diplomat_i18n_page_suffix: ", eller til vores grænseflade og hjemmeside på GitHub."
+    diplomat_join_pref_github: "Find din sproglokaliseringsfil "
+    diplomat_github_url: "på GitHub"
+    diplomat_join_suf_github: ", redigér den online, og indsend en pull-anmodning. Kontrollér også feltet nedenfor for at holde dig up-to-date med internationaliseringsudviklingen!"
+    diplomat_subscribe_desc: "Få emails omkring i18n-udviklingen og baner der kan oversættes."
+    ambassador_introduction: "Dette er et fællesskab, som vi er ved at bygge, og du har kontakterne. Vi har fora, emails og sociale netværk med masser af mennesker at tale med, at hjælpe med at bruge spillet og lære fra. Hvis du vil hjælpe med at få folk involveret og have det sjovt, og med at få en god fornemmelse af CodeCombat og hvor vi skal hen, så kan denne klasse være noget for dig."
+    ambassador_attribute_1: "Kommunikationsevner. Vær i stand til at identificere de problemer, som spillerne har, og hjælpe dem med at løse dem. Hold også resten af ​​os informeret om, hvad spillerne siger, hvad de kan lide og ikke kan lide og hvad de ønsker sig mere af!"
+    ambassador_join_desc: "fortæl os lidt mere om dig selv, hvad du har gjort, og hvad du ville være interesseret i at gøre. Så tager vi den derfra!"
+    ambassador_join_note_strong: "Note"
+    ambassador_join_note_desc: "En af vores topprioriteter er at opbygge multiplayer, hvor spillere der har problemer med at løse niveauer kan tilkalde højlevel troldmænd til at hjælpe dem. Dette vil være en god måde for ambassadører at gøre deres arbejde. Vi vil holde jer opdateret omkring dette!"
+    ambassador_subscribe_desc: "Få emails omkring supportopdateringer og udviklingen af multiplayer."
+    teacher_subscribe_desc: "Få emails omkring opdateringer og meddelelser for lærere."
+    changes_auto_save: "Ændringerne gemmes automatisk, når du skifter afkrydsningsfelter."
+    diligent_scribes: "Vores flittige Skrivere:"
+    powerful_archmages: "Vores Magtfulde Ærkemagere:"
+    creative_artisans: "Vores Kreative Artisans:"
+    brave_adventurers: "Vores Modige Eventyrere:"
+    translating_diplomats: "Vores Oversættende Diplomater:"
+    helpful_ambassadors: "Vores Hjælpsomme Ambassadørere:"
 
-#  ladder:
-#    please_login: "Please log in first before playing a ladder game."
-#    my_matches: "My Matches"
-#    simulate: "Simulate"
-#    simulation_explanation: "By simulating games you can get your game ranked faster!"
-#    simulation_explanation_leagues: "You will mainly help simulate games for allied players in your clans and courses."
-#    simulate_games: "Simulate Games!"
-#    games_simulated_by: "Games simulated by you:"
-#    games_simulated_for: "Games simulated for you:"
-#    games_in_queue: "Games currently in the queue:"
-#    games_simulated: "Games simulated"
-#    games_played: "Games played"
-#    ratio: "Ratio"
-#    leaderboard: "Leaderboard"
-#    battle_as: "Battle as "
-#    summary_your: "Your "
-#    summary_matches: "Matches - "
-#    summary_wins: " Wins, "
-#    summary_losses: " Losses"
-#    rank_no_code: "No New Code to Rank"
-#    rank_my_game: "Rank My Game!"
-#    rank_submitting: "Submitting..."
-#    rank_submitted: "Submitted for Ranking"
-#    rank_failed: "Failed to Rank"
-#    rank_being_ranked: "Game Being Ranked"
-#    rank_last_submitted: "submitted "
-#    help_simulate: "Help simulate games?"
-#    code_being_simulated: "Your new code is being simulated by other players for ranking. This will refresh as new matches come in."
-#    no_ranked_matches_pre: "No ranked matches for the "
-#    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
-#    choose_opponent: "Choose an Opponent"
-#    select_your_language: "Select your language!"
-#    tutorial_play: "Play Tutorial"
-#    tutorial_recommended: "Recommended if you've never played before"
-#    tutorial_skip: "Skip Tutorial"
-#    tutorial_not_sure: "Not sure what's going on?"
-#    tutorial_play_first: "Play the Tutorial first."
-#    simple_ai: "Simple CPU"
-#    warmup: "Warmup"
-#    friends_playing: "Friends Playing"
-#    log_in_for_friends: "Log in to play with your friends!"
-#    social_connect_blurb: "Connect and play against your friends!"
-#    invite_friends_to_battle: "Invite your friends to join you in battle!"
-#    fight: "Fight!"
-#    watch_victory: "Watch your victory"
-#    defeat_the: "Defeat the"
-#    watch_battle: "Watch the battle"
-#    tournament_started: ", started"
-#    tournament_ends: "Tournament ends"
-#    tournament_ended: "Tournament ended"
-#    tournament_rules: "Tournament Rules"
-#    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
-#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
-#    tournament_blurb_zero_sum: "Unleash your coding creativity in both gold gathering and battle tactics in this alpine mirror match between red sorcerer and blue sorcerer. The tournament began on Friday, March 27 and will run until Monday, April 6 at 5PM PDT. Compete for fun and glory! Check out the details"
-#    tournament_blurb_ace_of_coders: "Battle it out in the frozen glacier in this domination-style mirror match! The tournament began on Wednesday, September 16 and will run until Wednesday, October 14 at 5PM PDT. Check out the details"
-#    tournament_blurb_blog: "on our blog"
-#    rules: "Rules"
-#    winners: "Winners"
-#    league: "League"
-#    red_ai: "Red CPU" # "Red AI Wins", at end of multiplayer match playback
-#    blue_ai: "Blue CPU"
-#    wins: "Wins" # At end of multiplayer match playback
-#    humans: "Red" # Ladder page display team name
-#    ogres: "Blue"
+  ladder:
+    please_login: "Du skal logge ind først, før du kan spille."
+    my_matches: "Mine kampe"
+    simulate: "Simulér"
+    simulation_explanation: "Ved at simulere spil kan du få dit spil rangeret hurtigere!"
+    simulation_explanation_leagues: "Du vil primært hjælpe med at simulere spil for allierede spillere i dine klaner og kurser."
+    simulate_games: "Simulér Spil!"
+    games_simulated_by: "Spil simuleret af dig:"
+    games_simulated_for: "Spil simuleret af dig:"
+    games_in_queue: "Spil lige nu i køen:"
+    games_simulated: "Spil simuleret"
+    games_played: "Spil spillet"
+    ratio: "Forhold"
+    leaderboard: "Rangstige"
+    battle_as: "Kæmp som "
+    summary_your: "Dine "
+    summary_matches: "Kampe - "
+    summary_wins: " Vundne, "
+    summary_losses: " Tabte"
+    rank_no_code: "Ingen ny kode til Rangliste"
+    rank_my_game: "Ranglist Mit Spil!"
+    rank_submitting: "Indsender..."
+    rank_submitted: "Indsendt til Rangordning"
+    rank_failed: "Det lykkedes ikke at Rangordne"
+    rank_being_ranked: "Spil Bliver Rangordnet"
+    rank_last_submitted: "indsendt "
+    help_simulate: "Hjælp med at simulere spil?"
+    code_being_simulated: "Din nye kode bliver simuleret af andre spillere for at blive rangordnet. Dette vil blive opdateret som nye kampe kommer til."
+    no_ranked_matches_pre: "Ingen rangordnet kampe for "
+    no_ranked_matches_post: " dit team! Spil mod nogle konkurrenter og vend derefter tilbage hertil for at få dit spil rangeret."
+    choose_opponent: "Vælg en Modstander"
+    select_your_language: "Vælg dit sprog!"
+    tutorial_play: "Spil Tutorial"
+    tutorial_recommended: "Recommended if you've never played before"
+    tutorial_skip: "Skip Tutorial"
+    tutorial_not_sure: "Ikke helt sikker på hvad der foregår?"
+    tutorial_play_first: "Spil vores Tutorial."
+    simple_ai: "Simpel CPU"
+    warmup: "Warmup"
+    friends_playing: "Venner der spiller"
+    log_in_for_friends: "Log på for at spille med dine venner!"
+    social_connect_blurb: "Tilslut og spil med vennerne!"
+    invite_friends_to_battle: "Invitér dine venner til at slutte sig til dig i kamp!"
+    fight: "Kæmp!"
+    watch_victory: "Vis din sejr"
+    defeat_the: "Overvind "
+    watch_battle: "Se kampen"
+    tournament_started: ", begyndt"
+    tournament_ends: "Turnering afslutter"
+    tournament_ended: "Turnering afsluttet"
+    tournament_rules: "Turneringsregler"
+    tournament_blurb: "Skriv koden, samle guld, byg hære, knus fjender, vind præmier og opgrader din karriere i vores $ 40.000 Grådighedsturnering! Tjek detaljerne"
+    tournament_blurb_criss_cross: "Vind bud, konstruer stier, overlist modstandere, snub ædelstene og opgrader din karriere i vores Criss-Cross turnering! Tjek detaljerne"
+    tournament_blurb_zero_sum: "Slip din kodekreativitet løs i både guldindsamling og kamptaktik i denne alpine spejlkamp mellem rød troldmand og blå troldmand. Turneringen startede fredag ​​den 27. marts og den vil køre til mandag d. 6 april ved 05:00 PDT. Konkurrer om sjov og herlighed! Tjek detaljerne"
+    tournament_blurb_ace_of_coders: "Kæmp løs på den frosne gletscher i en spejlkamp! Turneringen startede onsdag den 16. september og den løber til og med onsdag 14 oktober kl 05:00 PDT. Tjek detaljerne"
+    tournament_blurb_blog: "på vores blog"
+    rules: "Regler"
+    winners: "Vindere"
+    league: "Liga"
+    red_ai: "Rød CPU" # "Red AI Wins", at end of multiplayer match playback
+    blue_ai: "Blå CPU"
+    wins: "Vundne" # At end of multiplayer match playback
+    humans: "Rød" # Ladder page display team name
+    ogres: "Blå"
 
-#  user:
-#    stats: "Stats"
-#    singleplayer_title: "Singleplayer Levels"
-#    multiplayer_title: "Multiplayer Levels"
-#    achievements_title: "Achievements"
-#    last_played: "Last Played"
-#    status: "Status"
-#    status_completed: "Completed"
-#    status_unfinished: "Unfinished"
-#    no_singleplayer: "No Singleplayer games played yet."
-#    no_multiplayer: "No Multiplayer games played yet."
-#    no_achievements: "No Achievements earned yet."
-#    favorite_prefix: "Favorite language is "
-#    favorite_postfix: "."
-#    not_member_of_clans: "Not a member of any clans yet."
+  user:
+    stats: "Stats"
+    singleplayer_title: "Singleplayer Baner"
+    multiplayer_title: "Multiplayer Baner"
+    achievements_title: "Bedrifter"
+    last_played: "Sidst Spillet"
+    status: "Status"
+    status_completed: "Gennemførte"
+    status_unfinished: "Ufærdige"
+    no_singleplayer: "Ingen påbegyndte Singleplayer-spil."
+    no_multiplayer: "Ingen påbegyndte Multiplayer-spil."
+    no_achievements: "Ingen optjente Bedrifter."
+    favorite_prefix: "Yndlingssprog er "
+    favorite_postfix: "."
+    not_member_of_clans: "Endnu ikke medlem af nogen klan."
 
-#  achievements:
-#    last_earned: "Last Earned"
-#    amount_achieved: "Amount"
-#    achievement: "Achievement"
-#    current_xp_prefix: ""
-#    current_xp_postfix: " in total"
-#    new_xp_prefix: ""
-#    new_xp_postfix: " earned"
-#    left_xp_prefix: ""
-#    left_xp_infix: " until level "
-#    left_xp_postfix: ""
+  achievements:
+    last_earned: "Sidst Tjente"
+    amount_achieved: "Beløb"
+    achievement: "Bedrift"
+    current_xp_prefix: ""
+    current_xp_postfix: " i alt"
+    new_xp_prefix: ""
+    new_xp_postfix: " tjent"
+    left_xp_prefix: ""
+    left_xp_infix: " indtil level "
+    left_xp_postfix: ""
 
-#  account:
-#    payments: "Payments"
-#    prepaid_codes: "Prepaid Codes"
-#    purchased: "Purchased"
-#    subscription: "Subscription"
-#    invoices: "Invoices"
-#    service_apple: "Apple"
-#    service_web: "Web"
-#    paid_on: "Paid On"
-#    service: "Service"
-#    price: "Price"
-#    gems: "Gems"
-#    active: "Active"
-#    subscribed: "Subscribed"
-#    unsubscribed: "Unsubscribed"
-#    active_until: "Active Until"
-#    cost: "Cost"
-#    next_payment: "Next Payment"
-#    card: "Card"
-#    status_unsubscribed_active: "You're not subscribed and won't be billed, but your account is still active for now."
-#    status_unsubscribed: "Get access to new levels, heroes, items, and bonus gems with a CodeCombat subscription!"
+  account:
+    payments: "Betalinger"
+    prepaid_codes: "Forudbetalte Koder"
+    purchased: "Købt"
+    subscription: "Abonnement"
+    invoices: "Fakturaer"
+    service_apple: "Apple"
+    service_web: "Web"
+    paid_on: "Betalt"
+    service: "Service"
+    price: "Pris"
+    gems: "Ædelstene"
+    active: "Aktiv"
+    subscribed: "Tilmeldt"
+    unsubscribed: "Afmeldt"
+    active_until: "Aktiv Indtil"
+    cost: "Pris"
+    next_payment: "Næste Betaling"
+    card: "Kort"
+    status_unsubscribed_active: "Du er ikke tilmeldt og vil ikke blive faktureret, men din konto er ligenu stadig aktiv."
+    status_unsubscribed: "Få adgang til nye baner, helte, sager og bonus ædelstene med et CodeCombat-abonnement!"
 
-#  account_invoices:
-#    amount: "Amount in US dollars"
-#    declined: "Your card was declined"
-#    invalid_amount: "Please enter a US dollar amount."
-#    not_logged_in: "Log in or create an account to access invoices."
-#    pay: "Pay Invoice"
-#    purchasing: "Purchasing..."
-#    retrying: "Server error, retrying."
-#    success: "Successfully paid. Thanks!"
+  account_invoices:
+    amount: "Beløb i US dollars"
+    declined: "Dit kort blev afvist"
+    invalid_amount: "Angiv et US dollar beløb."
+    not_logged_in: "Log ind eller opret en konto for at få adgang til fakturaer."
+    pay: "Betal Faktura"
+    purchasing: "Køber..."
+    retrying: "Serverfejl, prøver igen."
+    success: "Betaling gennemført. Tak!"
 
-#  account_prepaid:
-#    purchase_code: "Purchase a Subscription Code"
-#    purchase_code1: "Subscription Codes can be redeemed to add premium subscription time to one or more CodeCombat accounts."
-#    purchase_code2: "Each CodeCombat account can only redeem a particular Subscription Code once."
-#    purchase_code3: "Subscription Code months will be added to the end of any existing subscription on the account."
-#    users: "Users"
-#    months: "Months"
-#    purchase_total: "Total"
-#    purchase_button: "Submit Purchase"
-#    your_codes: "Your Codes"
-#    redeem_codes: "Redeem a Subscription Code"
-#    prepaid_code: "Prepaid Code"
-#    lookup_code: "Lookup prepaid code"
-#    apply_account: "Apply to your account"
-#    copy_link: "You can copy the code's link and send it to someone."
-#    quantity: "Quantity"
-#    redeemed: "Redeemed"
-#    no_codes: "No codes yet!"
-#    you_can1: "You can"
-#    you_can2: "purchase a prepaid code"
-#    you_can3: "that can be applied to your own account or given to others."
+  account_prepaid:
+    purchase_code: "Køb en abonnementskode"
+    purchase_code1: "Abonnementskoder kan indløses for tilføje premium abonnementstid til en eller flere CodeCombat-konti."
+    purchase_code2: "Hver CodeCombat-konto kan kun indløse en bestemt abonnementskode en gang."
+    purchase_code3: "Abonnementskode måneder vil blive tilføjet til slutningen af et eksisterende abonnement på kontoen."
+    users: "Burgere"
+    months: "Måneder"
+    purchase_total: "Total"
+    purchase_button: "Indsend Køb"
+    your_codes: "Dine Koder"
+    redeem_codes: "Indløs en Abonnementskode"
+    prepaid_code: "Forudbetalt kode"
+    lookup_code: "Opslå forudbetalt kode"
+    apply_account: "Anvend på din konto"
+    copy_link: "Du kan kopiere koden's link og sende den til en person."
+    quantity: "Mængde"
+    redeemed: "Indløs"
+    no_codes: "Endnu ingen koder!"
+    you_can1: "Du kan"
+    you_can2: "købe en forudbetalt kode"
+    you_can3: "der kan anvendes på din egen konto eller gives til andre."
 
-#  loading_error:
-#    could_not_load: "Error loading from server"
-#    connection_failure: "Connection Failed"
-#    connection_failure_desc: "It doesn’t look like you’re connected to the internet! Check your network connection and then reload this page."
-#    login_required: "Login Required"
-#    login_required_desc: "You need to be logged in to access this page."
-#    unauthorized: "You need to be signed in. Do you have cookies disabled?"
-#    forbidden: "Forbidden"
-#    forbidden_desc: "Oh no, there’s nothing we can show you here! Make sure you’re logged into the correct account, or visit one of the links below to get back to programming!"
-#    not_found: "Not Found"
-#    not_found_desc: "Hm, there’s nothing here. Visit one of the following links to get back to programming!"
-#    not_allowed: "Method not allowed."
-#    timeout: "Server Timeout"
-#    conflict: "Resource conflict."
-#    bad_input: "Bad input."
-#    server_error: "Server error."
-#    unknown: "Unknown Error"
-#    error: "ERROR"
-#    general_desc: "Something went wrong, and it’s probably our fault. Try waiting a bit and then refreshing the page, or visit one of the following links to get back to programming!"
+  loading_error:
+    could_not_load: "Fejl ved indlæsning fra server"
+    connection_failure: "Forbindelsen mislykkedes"
+    connection_failure_desc: "Det ser ikke ud som om du er forbundet til Internet! Tjek din netværksforbindelse og genindlæse derefter denne side."
+    login_required: "Login påkrævet"
+    login_required_desc: "Du skal være logget ind for at få adgang til denne side."
+    unauthorized: "Du skal være logget ind. Har du har blokeret cookies?"
+    forbidden: "Ingen Adgang"
+    forbidden_desc: "Øv, der er ikke noget, som vi kan vise dig her! Sørg for, at du er logget ind på den rigtige konto, eller besøg en af ​​nedenstående links for at komme tilbage til programmering!"
+    not_found: "Ikke Fundet"
+    not_found_desc: "Øh, der er ikke noget her. Besøg et af følgende links for at komme tilbage til programmering!"
+    not_allowed: "Metode ikke tilladt."
+    timeout: "Server Timeout"
+    conflict: "Resource konflikt."
+    bad_input: "Dårligt input."
+    server_error: "Server fejl."
+    unknown: "Ukendt Fejl"
+    error: "FEJL"
+    general_desc: "Noget gik galt, og det er sandsynligvis vores skyld. Prøv at vente lidt og opdatér derefter siden, eller besøg en af ​​de følgende links for at komme tilbage til programmering!"
 
-#  resources:
-#    level: "Level"
-#    patch: "Patch"
-#    patches: "Patches"
-#    system: "System"
-#    systems: "Systems"
-#    component: "Component"
-#    components: "Components"
-#    hero: "Hero"
-#    campaigns: "Campaigns"
+  resources:
+    level: "Bane"
+    patch: "Opdatering"
+    patches: "Opdateringer"
+    system: "System"
+    systems: "Systemmer"
+    component: "Komponent"
+    components: "Komponenter"
+    hero: "Helt"
+    campaigns: "Kampagner"
 
-#  concepts:
-#    advanced_strings: "Advanced Strings"
-#    algorithms: "Algorithms"
-#    arguments: "Arguments"
-#    arithmetic: "Arithmetic"
-#    arrays: "Arrays"
-#    basic_syntax: "Basic Syntax"
-#    boolean_logic: "Boolean Logic"
-#    break_statements: "Break Statements"
-#    classes: "Classes"
-#    continue_statements: "Continue Statements"
-#    for_loops: "For Loops"
-#    functions: "Functions"
-#    graphics: "Graphics"
-#    if_statements: "If Statements"
-#    input_handling: "Input Handling"
-#    math_operations: "Math Operations"
-#    object_literals: "Object Literals"
-#    parameters: "Parameters"
-#    strings: "Strings"
-#    variables: "Variables"
-#    vectors: "Vectors"
-#    while_loops: "While Loops"
-#    recursion: "Recursion"
+  concepts:
+    advanced_strings: "Avanceret Strenge"
+    algorithms: "Algoritmer"
+    arguments: "Argumenter"
+    arithmetic: "Aritmetik"
+    arrays: "Arrays"
+    basic_syntax: "Grundlæggende Syntaks"
+    boolean_logic: "Boolsk Logik"
+    break_statements: "Break Erklæringer"
+    classes: "Klasser"
+    continue_statements: "Continue Erklæringer"
+    for_loops: "For Løkker"
+    functions: "Funktioner"
+    graphics: "Grafik"
+    if_statements: "If Erklæringer"
+    input_handling: "Input Håndtering"
+    math_operations: "Matematiske Funktioner"
+    object_literals: "Object Konstanter"
+    parameters: "Parametre"
+    strings: "Strenge"
+    variables: "Variable"
+    vectors: "Vektorer"
+    while_loops: "While Løkker"
+    recursion: "Rekursion"
 
-#  delta:
-#    added: "Added"
-#    modified: "Modified"
-#    not_modified: "Not Modified"
-#    deleted: "Deleted"
-#    moved_index: "Moved Index"
-#    text_diff: "Text Diff"
-#    merge_conflict_with: "MERGE CONFLICT WITH"
-#    no_changes: "No Changes"
+  delta:
+    added: "Tilføjet"
+    modified: "Ændret"
+    not_modified: "Ikke Ændret"
+    deleted: "Slettet"
+    moved_index: "Index Flyttet "
+    text_diff: "Tekst Sammenligning"
+    merge_conflict_with: "FOREN KONFLIKT MED"
+    no_changes: "Ingen Ændringer"
 
   multiplayer:
     multiplayer_title: "Flerspillerinstillinger" # We'll be changing this around significantly soon. Until then, it's not important to translate.
-#    multiplayer_toggle: "Enable multiplayer"
-#    multiplayer_toggle_description: "Allow others to join your game."
+    multiplayer_toggle: "Enable multiplayer"
+    multiplayer_toggle_description: "Tillad andre at deltage i dit spil."
     multiplayer_link_description: "Del dette link med andre deltagere."
     multiplayer_hint_label: "Tip:"
     multiplayer_hint: " Klik på linket for markere alt; tryk derefter ⌘-C eller Ctrl-C tfr at kopiere linket."
     multiplayer_coming_soon: "Yderligere flerspillermuligheder er på vej!"
-#    multiplayer_sign_in_leaderboard: "Sign in or create an account and get your solution on the leaderboard."
+    multiplayer_sign_in_leaderboard: "Log ind eller oprette en konto og få din løsning på ranglisten."
 
-#  legal:
-#    page_title: "Legal"
-#    opensource_intro: "CodeCombat is completely open source."
-#    opensource_description_prefix: "Check out "
-#    github_url: "our GitHub"
-#    opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See "
-#    archmage_wiki_url: "our Archmage wiki"
-#    opensource_description_suffix: "for a list of the software that makes this game possible."
-#    practices_title: "Respectful Best Practices"
-#    practices_description: "These are our promises to you, the player, in slightly less legalese."
-#    privacy_title: "Privacy"
-#    privacy_description: "We will not sell any of your personal information."
-#    security_title: "Security"
-#    security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems."
-#    email_title: "Email"
-#    email_description_prefix: "We will not inundate you with spam. Through"
-#    email_settings_url: "your email settings"
-#    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
-#    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
-#    copyrights_title: "Copyrights and Licenses"
-#    contributor_title: "Contributor License Agreement"
-#    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
-#    cla_url: "CLA"
-#    contributor_description_suffix: "to which you should agree before contributing."
-#    code_title: "Code - MIT"
-#    code_description_prefix: "All code owned by CodeCombat or hosted on codecombat.com, both in the GitHub repository or in the codecombat.com database, is licensed under the"
-#    mit_license_url: "MIT license"
-#    code_description_suffix: "This includes all code in Systems and Components that are made available by CodeCombat for the purpose of creating levels."
-#    art_title: "Art/Music - Creative Commons "
-#    art_description_prefix: "All common content is available under the"
-#    cc_license_url: "Creative Commons Attribution 4.0 International License"
-#    art_description_suffix: "Common content is anything made generally available by CodeCombat for the purpose of creating Levels. This includes:"
-#    art_music: "Music"
-#    art_sound: "Sound"
-#    art_artwork: "Artwork"
-#    art_sprites: "Sprites"
-#    art_other: "Any and all other non-code creative works that are made available when creating Levels."
-#    art_access: "Currently there is no universal, easy system for fetching these assets. In general, fetch them from the URLs as used by the site, contact us for assistance, or help us in extending the site to make these assets more easily accessible."
-#    art_paragraph_1: "For attribution, please name and link to codecombat.com near where the source is used or where appropriate for the medium. For example:"
-#    use_list_1: "If used in a movie or another game, include codecombat.com in the credits."
-#    use_list_2: "If used on a website, include a link near the usage, for example underneath an image, or in a general attributions page where you might also mention other Creative Commons works and open source software being used on the site. Something that's already clearly referencing CodeCombat, such as a blog post mentioning CodeCombat, does not need some separate attribution."
-#    art_paragraph_2: "If the content being used is created not by CodeCombat but instead by a user of codecombat.com, attribute them instead, and follow attribution directions provided in that resource's description if there are any."
-#    rights_title: "Rights Reserved"
-#    rights_desc: "All rights are reserved for Levels themselves. This includes"
-#    rights_scripts: "Scripts"
-#    rights_unit: "Unit configuration"
-#    rights_description: "Description"
-#    rights_writings: "Writings"
-#    rights_media: "Media (sounds, music) and any other creative content made specifically for that Level and not made generally available when creating Levels."
-#    rights_clarification: "To clarify, anything that is made available in the Level Editor for the purpose of making levels is under CC, whereas the content created with the Level Editor or uploaded in the course of creation of Levels is not."
-#    nutshell_title: "In a Nutshell"
-#    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
-#    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
-#    third_party_title: "Third Party Services"
-#    third_party_description: "CodeCombat uses the following third party services (among others):"
+  legal:
+    page_title: "Rettigheder"
+    opensource_intro: "CodeCombat er fuldstændigt open source."
+    opensource_description_prefix: "Check "
+    github_url: "vores GitHub"
+    opensource_description_center: "og hjælp, hvis du har lyst! CodeCombat er bygget på snesevis af open source-projekter, og vi elsker dem. Se "
+    archmage_wiki_url: "vores Ærkemager wiki"
+    opensource_description_suffix: "for en liste over den software, der gør dette spil muligt."
+    practices_title: "Respektfuld Best Practices"
+    practices_description: "Disse er vores løfter til dig, spilleren, i lidt mindre juridiske termer."
+    privacy_title: "Privatliv"
+    privacy_description: "Vi vil ikke sælge nogen af ​​dine personlige oplysninger."
+    security_title: "Sikkerhed"
+    security_description: "Vi stræber efter at holde dine personlige oplysninger sikre. Som et open source projekt, er vores hjemmeside frit åbent for alle, til at gennemgå og forbedre vores sikkerhedssystemer."
+    email_title: "Email"
+    email_description_prefix: "Vi vil ikke oversvømme dig med spam. Via"
+    email_settings_url: "dine email-indstillinger"
+    email_description_suffix: "eller via links i de e-mails vi sender, kan du ændre dine præferencer og nemt afmelde notifikationer når som helst."
+    cost_title: "Pris"
+    cost_description: "CodeCombat er gratis at spille på alle grundlæggende baner, med et ${{price}} USD/måned abonnement der giver adgang til ekstra baner og {{gems}} bonus ædelstene hver måned. Du kan annullere med et klik, og vi tilbyder fuld reklamationsret."
+    copyrights_title: "Ophavsret og licenser"
+    contributor_title: "Bidragsyder Licensaftale"
+    contributor_description_prefix: "Alle bidrag, både på webstedet og på vores GitHub repository, er genstand for vores"
+    cla_url: "CLA"
+    contributor_description_suffix: "hvori du skal være enig før du bidrager."
+    code_title: "Kode - MIT"
+    code_description_prefix: "Al kode ejet af CodeCombat eller tilgengængelig på codecombat.com, både i GitHub repository eller i codecombat.com databasen, er licenseret under"
+    mit_license_url: "MIT licens"
+    code_description_suffix: "Dette omfatter al kode i systemer og komponenter, der er stillet til rådighed af CodeCombat med det formål at skabe baner."
+    art_title: "Art/Musik - Creative Commons "
+    art_description_prefix: "Alt fælles indhold er tilgængelig under"
+    cc_license_url: "Creative Commons Attribution 4.0 International License"
+    art_description_suffix: "Fælles indhold er alt som er gjort tilgængelig af CodeCombat med det formål at skabe baner. Dette omfatter:"
+    art_music: "Musik"
+    art_sound: "Lyd"
+    art_artwork: "Artwork"
+    art_sprites: "Sprites"
+    art_other: "Ethvert og alle andre ikke-kode kreative værker, der er stillet til rådighed, når du opretter Baner."
+    art_access: "I øjeblikket er der intet universel, nemt system til at hente disse aktiver. Generelt kan de hentes via de webadresser, som anvendes på hjemmesiden, så kontakt os for at få hjælp, eller for at hjælpe os i at udvide stedet til at gøre disse aktiver mere lettilgængelige."
+    art_paragraph_1: "For tilskrivning, bedes navn og link til codecombat.com i nærheden af ​​hvor koden anvendes eller hvor det ellers passer for mediet. For eksempel:"
+    use_list_1: "Hvis det bruges i en film eller et andet spil, omfat codecombat.com i credits."
+    use_list_2: "Hvis det bruges på en hjemmeside, indsæt et link nær brug, for eksempel under et billede, eller i en generel tilskrivningsside, hvor du også kan nævne andre Creative Commons aktiver og open source software, der bruges på sitet. Noget, der allerede klart refererer CodeCombat, såsom et blogindlæg der nævner CodeCombat behøver for nogle separate tilskrivninger."
+    art_paragraph_2: "Hvis indholdet brugt ikke er skabt af CodeCombat men i stedet af en bruger af codecombat.com, tilskrives de i stedet, og følg henføringsmetoder som anvist i ressource-beskrivelsen, hvis der er en sådan."
+    rights_title: "Rettigheder Forbeholdes"
+    rights_desc: "Alle rettigheder er forbeholdt Banerne selv. Dette omfatter"
+    rights_scripts: "Scripts"
+    rights_unit: "Enhedskonfiguration"
+    rights_description: "Beskrivelse"
+    rights_writings: "Skriveri"
+    rights_media: "Medier (lyde, musik) og ethvert andet kreativt indhold lavet specielt til denne Bane og som ikke er gjort almindeligt tilgængelig, når man opretter Baner."
+    rights_clarification: "For at tydeliggøre, noget, der stilles til rådighed i Level Editor til det formål at lave Baner er under CC, mens indholdet oprettet med Bane Editor eller uploadet i løbet af skabelsen af baner er ikke."
+    nutshell_title: "I en nøddeskal"
+    nutshell_description: "Eventuelle ressourcer, vi leverer i Level Editor er gratis at bruge som du har lyst til at skabe Baner. Men vi forbeholder os ret til at begrænse distributionen af Banerne selv (der er oprettet på codecombat.com), så de kan blive opkrævet penge for i fremtiden, hvis det er hvad der ender med at ske."
+    canonical: "Den engelske version af dette dokument er den endelige, kanoniske version. Hvis der er uoverensstemmelse mellem oversættelser, den engelske dokument forrang."
+    third_party_title: "Tredjeparts Tjenester"
+    third_party_description: "CodeCombat bruger følgende tredjeparts-tjenester (blandt andre):"
 
-#  ladder_prizes:
-#    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
-#    blurb_1: "These prizes will be awarded according to"
-#    blurb_2: "the tournament rules"
-#    blurb_3: "to the top human and ogre players."
-#    blurb_4: "Two teams means double the prizes!"
-#    blurb_5: "(There will be two first place winners, two second-place winners, etc.)"
-#    rank: "Rank"
-#    prizes: "Prizes"
-#    total_value: "Total Value"
-#    in_cash: "in cash"
-#    custom_wizard: "Custom CodeCombat Wizard"
-#    custom_avatar: "Custom CodeCombat avatar"
-#    heap: "for six months of \"Startup\" access"
-#    credits: "credits"
-#    one_month_coupon: "coupon: choose either Rails or HTML"
-#    one_month_discount: "discount, 30% off: choose either Rails or HTML"
-#    license: "license"
-#    oreilly: "ebook of your choice"
+  ladder_prizes:
+    title: "Turneringspræmier" # This section was for an old tournament and doesn't need new translations now.
+    blurb_1: "Disse præmier vil blive uddelt i henhold til"
+    blurb_2: "turneringsreglerne"
+    blurb_3: "til top menneskelige og kæmpe spillere."
+    blurb_4: "To hold betyder dobbelt så mange præmier!"
+    blurb_5: "(Der vil være to førstepladser, to andenpladser, osv.)"
+    rank: "Rang"
+    prizes: "Præmier"
+    total_value: "Total Værdi"
+    in_cash: "i kontanter"
+    custom_wizard: "Brugerdefineret CodeCombat Troldmand"
+    custom_avatar: "Brugerdefineret CodeCombat avatar"
+    heap: "for seks måneder \"Opstarts\"-adgang"
+    credits: "kredit"
+    one_month_coupon: "kupon: vælg enten Rails eller HTML"
+    one_month_discount: "rabat på 30%: vælg imellem Rails eller HTML"
+    license: "licens"
+    oreilly: "ebook efter eget valg"
diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee
index 7fc4933f6..6ec75b1f4 100644
--- a/app/locale/de-AT.coffee
+++ b/app/locale/de-AT.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Spielen" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     submit_patch: "Patch einreichen"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
     and: "und"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     subject: "Betreff"
     email: "Email"
     password: "Passwort"
+#    confirm_password: "Confirm Password"
     message: "Nachricht"
     code: "Code"
     ladder: "Rangliste"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "Sekunde"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     years: "Jahre"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Fertig"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Anleitung"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Erzmagier"
diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee
index 522aa05e7..68ed45233 100644
--- a/app/locale/de-CH.coffee
+++ b/app/locale/de-CH.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     submit_patch: "Patch ireiche"
     submit_changes: "Wechsel ireiche"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
     and: "und"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    subject: "Subject"
     email: "E-mail"
     password: "Passwort"
+#    confirm_password: "Confirm Password"
     message: "Nachricht"
     code: "Code"
     ladder: "Leitere"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     warrior: "Krieger"
     ranger: "Ranger"
     wizard: "Zauberer"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "Sekunde"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     years: "Johr"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Fertig"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    victory_new_item: "New Item"
     victory_viking_code_school: "Oh mein Gott, dass isch aber es stregs Level gsi und du heschs gschafft! Also wen du nu kei Software-Entwickler bisch, sötsch eine sii! Du hesch en Iiladig becho um at Viking Code Schuel zgha wodu dini Fähigkeite chasch wiiterentwickle und en professionele Entwickel in nur 14 Täg werde!"
     victory_become_a_viking: "Werd en Vikinger!"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Handbuech"
     tome_cast_button_run: "Renn"
     tome_cast_button_running: "Renne"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee
index a2c9fd680..923c84b18 100644
--- a/app/locale/de-DE.coffee
+++ b/app/locale/de-DE.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     boast: "Bietet Rätsel die komplex genug sind um Spieler und Programmiere zu faszinieren."
     winning: "Eine gewinnbringende Kombination aus RPG-Gameplay und Programmierhausaufgaben die aufgeht und kindgerechte Bildung berechtigterweise unterhaltsam macht."
     run_class: "Alles was man braucht um einen Informatikkurs in der Schule zu geben, ohne dass man Hintergrundwissen braucht."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Spielen" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     submit_patch: "Patch einreichen"
     submit_changes: "Änderungen einreichen"
     save_changes: "Änderungen speichern"
+#    required_field: "Required field"
 
   general:
     and: "und"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     subject: "Betreff"
     email: "Email"
     password: "Passwort"
+#    confirm_password: "Confirm Password"
     message: "Nachricht"
     code: "Code"
     ladder: "Rangliste"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     warrior: "Krieger"
     ranger: "Waldläufer"
     wizard: "Magier"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "Sekunde"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     years: "Jahre"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Abgeschlossene Level:"
     course: "Kurse:"
     done: "Fertig"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     victory_new_item: "Neuen Gegenstand gewonnen"
     victory_viking_code_school: "Heiliger Bimbam, das war ein schweres Level, dass du gerade gemeister hast! Wenn du noch kein Softwareentwickler bist, solltest du darüber nachdenken. Du wurdest zum Eilverfahren für die Annahme an der Viking Code School eingeschrieben, wo du deine Skills auf den nächsten Level bringen kannst und ein professioneller Web-developer in 14 Wochen werden kannst."
     victory_become_a_viking: "Werde ein Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Anleitung"
     tome_cast_button_run: "Ausführen"
     tome_cast_button_running: "Wird ausgeführt"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     jobs_benefits: "Angestellten Vorteile"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
     learn_more: "Erfahre mehr"
     jobs_custom_title: "Kreiere deinen Eigenen"
     jobs_custom_description: "Du bist fasziniert von CodeCombat aber siehst keinen Job aufgeführt, der zu deinen Qualifikationen passt? Schreib uns und überzeuge uns wie du denkst, wie du in unserem Team mitwirken kannst. Wir freuen uns von dir zu hören!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     phone_number_help: "Wo können wir Sie wochentags erreichen?"
     role_label: "Ihre Rolle"
     role_help: "Wählen Sie ihre primäre Rolle."
+#    role_default: "Select Role"
     tech_coordinator: "Technologie-Koordinator"
     advisor: "Berater"
     principal: "Direktor"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     state: "Bundesland"
     country: "Land"
     num_students_help: "Wie viele beabsichtichen Sie in CodeCombat einzuschreiben?"
+#    num_students_default: "Select Range"
     education_level_label: "Bildungslevel der Schüler"
     education_level_help: "Wählen Sie so viele wie zutreffen."
     elementary_school: "Grundschule"
@@ -765,9 +796,17 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     college_plus: "Hochschule oder höher"
     anything_else: "Weitere Dinge die wir wissen sollten?"
     thanks_header: "Danke dass Sie eine Demo beantragen!" # {change}
-    thanks_p: "Wir melden uns bald. Fragen? Schreiben Sie uns eine Email:"
-    thanks_anon: "Loggen Sie sich unten ein oder Erstellen Sie einen Account um Zugang zu ihren zwei kostenlosen Einschreibungen zu erhalten (Wir werden Sie per Email benachrichtigen nach der Überprüfung, die normalerweise weniger als 48 Stunden dauert. So wie immer ist die erste Stunde des Inhaltes kostenlos für eine unbegrenzte Anzahl von Schülern." # {change}
-    thanks_logged_in: "Ihre zwei kostenlosen Einschreiben werden gerade überprüft. Wir werden Sie per Email nach der Überprüfung benachrichtigen, die normalerweise weniger als 48 Stunden dauert. So wie immer ist die erste Stunde des Inhaltes kostenlos für eine unbegrenzte Anzahl von Schülern." # {change}
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+    thanks_p: "Wir melden uns bald. Fragen? Schreiben Sie uns eine Email:" # {change}
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
     setup_a_class: "Eine Klasse erstellen"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     average_levels: "Durchschnittliche abgeschlossene Level:"
     total_levels: "Anzahl abgeschlossener Level:"
     furthest_level: "Höchster abgeschlossener Level:"
-    concepts_covered: "Abgedeckte Konzepte"
     students: "Schüler"
     students1: "Schüler"
     concepts: "Konzepten"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     capacity_used: "Benutzte Kurs-Slots:"
     enter_emails: "Schüler-Emails eingeben zum hinzufügen, eine Adresse pro Zeile"
     send_invites: "Einladung senden"
-    title: "Titel"
-    description: "Beschreibung"
     creating_class: "Klasse wird erstellt..."
     purchasing_course: "Kurs wird gekauft..."
     buy_course: "Kurs kaufen"
     buy_course1: "Kaufen Sie diesen Kurs"
-    create_class: "Klasse erstellen"
     select_all_courses: "Wählen Sie 'Alle Kurse' für einen 50% Rabatt!"
     all_courses: "Alle Kurse"
     number_students: "Anzahl der Schüler"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     keep_using: "Beibehalten"
     switch_to: "Wechseln zu"
     greetings: "Grüße!"
-    learn_p: "Erlerne Python"
-    learn_j: "Erlerne JavaScript"
-    language_cannot_change: "Die Sprache kann nicht geändert werden sobald ein Schüler der Klasse beigetreten ist."
     back_classrooms: "Zurück zu meinem Klassenraum"
     back_courses: "Zurück zu meinen Kursen"
     edit_details: "Klassendetails bearbeiten"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     students_enrolled: "Schüler eingeschrieben"
     students_assigned: "Schüler zugewiesen"
     length: "Länge:"
+    title: "Titel" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Abgedeckte Konzepte"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Beschreibung" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "Die Sprache kann nicht geändert werden sobald ein Schüler der Klasse beigetreten ist."
+    learn_p: "Erlerne Python"
+    learn_j: "Erlerne JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Klasse erstellen"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Erzmagier"
diff --git a/app/locale/el.coffee b/app/locale/el.coffee
index b326a40eb..a23817436 100644
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Επίπεδα" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     submit_patch: "Αποστολή Επιδιόρθωσης"
     submit_changes: "Υποβολή αλλαγών"
     save_changes: "Απόθηκευση Αλλαγών"
+#    required_field: "Required field"
 
   general:
     and: "και"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     subject: "Θέμα"
     email: "Email"
     password: "Κωδικός"
+#    confirm_password: "Confirm Password"
     message: "Μήνυμα"
     code: "Κώδικας"
     ladder: "Κατατάξη"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     warrior: "Πολεμιστής"
     ranger: "Καταδρομέας"
     wizard: "Μάγος"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "δευτερόλεπτο"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     years: "χρόνια"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Ολοκληρωμένο Επίπεδο:"
     course: "Μάθημα:"
     done: "Έτοιμο"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     victory_new_item: "Νέο αντικείμενο"
     victory_viking_code_school: "Μπράβο σου, μόλις πέρασες ένα δύσκολο επίπεδο! Αν δεν είσαι ήδη προγραμματιστής, πρέπει να γίνεις. Είσαι σε καλό δρόμο για να γίνεις δεκτός στο Σχολείο Προγρααματισμού των Βίκινγκ, όπου μπορείς να πας τις ικανότητες στο επόμενο επίπεδο και να γίνεις ένας επαγγελματίας προγραμματιστής ιστού σε 14 weeks."
     victory_become_a_viking: "Γίνε Βίκιγκ"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Οδηγός"
     tome_cast_button_run: "Εκτελεση"
     tome_cast_button_running: "Εκτελείται"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     average_levels: "Μέσος όρος ολοκληρωμένων επιπέδων:"
     total_levels: "Συνολικά ολοκληρωμένα επίπεδα:"
     furthest_level: "Επιπλέον ολοκληρωμένα επίπεδα:"
-    concepts_covered: "Θέματα που καλύφθηκαν"
     students: "Μαθητές"
     students1: "μαθητές"
     concepts: "Θέματα"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     capacity_used: "Θέσεις του μαθήματος που χρησιμοποιούνται:"
     enter_emails: "Δώσε τις διευθύνσεις ηλεκτρονικού ταχυδρομείου των μαθητών για να τους προσκαλέσουμε, μια ανά γραμμή"
     send_invites: "Αποστολή Προσκλήσεων"
-    title: "Τίτλος"
-    description: "Περιγραφή"
     creating_class: "Δημιουργία τάξης..."
     purchasing_course: "Αγορά μαθήματος..."
     buy_course: "Αγορά Μαθήματος"
     buy_course1: "Αγόρασε αυτό το μάθημα"
-    create_class: "Δημιουργία Τάξης"
     select_all_courses: "Διάλεξε  'Όλα τα μαθήματα' για έκπτωση 50%!"
     all_courses: "Όλα τα μαθήματα"
     number_students: "Αριθμός Μαθητών"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     keep_using: "Συνέχισε να χρησιμοποιείς"
     switch_to: "Αλλαγή σε"
     greetings: "Καλως ΄Ηρθες!"
-    learn_p: "Μάθε Python"
-    learn_j: "Μάθε JavaScript"
-    language_cannot_change: "Η γλώσσα δεν μπορεί να αλλάξει από τη στιγμή που οι μαθητές θα συνδεθούν με την τάξη."
     back_classrooms: "Πίσω στις τάξεις μου"
     back_courses: "Πίσω στα μαθήματα μου"
     edit_details: "Επεξεργασία Ρυθμίσεων Τάξης"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     students_enrolled: "Εγγεγραμμένοι Μαθητές"
 #    students_assigned: "students assigned"
     length: "Μήκος:"
+    title: "Τίτλος" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Θέματα που καλύφθηκαν"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Περιγραφή" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "Η γλώσσα δεν μπορεί να αλλάξει από τη στιγμή που οι μαθητές θα συνδεθούν με την τάξη."
+    learn_p: "Μάθε Python"
+    learn_j: "Μάθε JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Δημιουργία Τάξης"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Αρχιμάγος"
diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee
index 5008d3143..dc1d3cfd4 100644
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index 1a830dec5..e99284f17 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 4e0e0934f..c7b513f54 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -91,7 +91,7 @@
     student_count: "Number of students:"
     start_playing_for_free: "Start Playing for Free!"
     students_and_players: "Students & Players"
-    goto_classes: "Go to My Classes" # {change}
+    goto_classes: "Go to My Classes"
     educator_wiki: "Educator wiki"
     view_profile: "View My Profile"
     view_progress: "View Progress"
@@ -576,7 +576,6 @@
     stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "You'll need a subscription to play this level."
     unlock_help_videos: "Subscribe to unlock all video tutorials."
-
     personal_sub: "Personal Subscription"  # Accounts Subscription View below
     loading_info: "Loading subscription information..."
     managed_by: "Managed by"
@@ -731,10 +730,10 @@
     jobs_benefits: "Employee Benefits"
     jobs_benefit_1: "Competitive salary and options"
     jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-    jobs_benefit_3: "Flex time and flexible work-from-home" # {change}
-    jobs_benefit_4: "Unlimited vacation/sick/personal days" # {change}
-    jobs_benefit_5: "Professional development and continuing education support – free books and games!" # {change}
-    jobs_benefit_6: "Medical (gold), dental, vision" # {change}
+    jobs_benefit_3: "Flex time and flexible work-from-home"
+    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+    jobs_benefit_6: "Medical (gold), dental, vision"
     jobs_benefit_7: "Sit-stand desks for all"
     jobs_benefit_9: "10-year option exercise window"
     jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
@@ -796,17 +795,17 @@
     middle_school: "Middle School"
     college_plus: "College or higher"
     anything_else: "Anything else we should know?"
-    thanks_header: "Request Received!" # {change}
+    thanks_header: "Request Received!"
     thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
-    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:" # {change}
+    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
     finish_signup: "Finish creating your teacher account:"
     finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
     signup_with: "Sign up with:"
-    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
-    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account."
+    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account."
     create_account: "Create a Teacher Account"
     create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
-    convert_account_title: "Update to Teacher Account" # {change}
+    convert_account_title: "Update to Teacher Account"
     not: "Not"
     setup_a_class: "Set Up a Class"
 
@@ -1203,7 +1202,6 @@
     students_enrolled: "students enrolled"
     students_assigned: "students assigned"
     length: "Length:"
-
     title: "Courses" # Flat style redesign
     subtitle: "Review course guidelines, solutions, and levels"
     select_language: "Select language"
@@ -1212,10 +1210,8 @@
     concepts_covered: "Concepts covered"
     print_guide: "Print Guide (PDF)"
     view_guide_online: "View Guide Online (PDF)"
-
     grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
     enrollment_credits_available: "Enrollment Credits Available:"
-
     description: "Description" # ClassroomSettingsModal
     language_select: "Select a language"
     language_cannot_change: "Language cannot be changed once students join a class."
@@ -1235,7 +1231,6 @@
     student_age_range_to: "to"
     create_class: "Create Class"
     class_name: "Class Name"
-
     teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
 
   teacher:
@@ -1245,12 +1240,10 @@
     enrollments: "Enrollments"
     resources: "Resources"
     help: "Help"
-
     students: "Students" # Shared
     language: "Language"
     edit_class_settings: "edit class settings"
     complete: "Complete"
-
     access_restricted: "Access Restricted" # My Classes page
     teacher_account_required: "A teacher account is required to access this content."
     create_teacher_account: "Create Teacher Account"
@@ -1265,7 +1258,6 @@
     no_students_yet: "This class has no students yet."
     add_students: "Add Students"
     create_new_class: "Create a New Class"
-
     class_overview: "Class Overview" # View Class page
     avg_playtime: "Average level playtime"
     total_playtime: "Total play time"
@@ -1294,13 +1286,10 @@
     assign_to_selected_students: "Assign to Selected Students"
     assigned: "Assigned"
     enroll_selected_students: "Enroll Selected Students"
-
     guides_coming_soon: "Guides coming soon!" # Courses
-
     show_students_from: "Show students from" # Enroll students modal
     enroll_the_following_students: "Enroll the following students"
     all_students: "All Students"
-
     enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
     enrollments_blurb_2: "require enrollments to access the courses."
     credits_available: "Credits Available"
@@ -1314,7 +1303,7 @@
     how_to_enroll: "How to Enroll Students"
     how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
     how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
-    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content."
     bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
diff --git a/app/locale/eo.coffee b/app/locale/eo.coffee
index 14572b85f..cd2b545cf 100644
--- a/app/locale/eo.coffee
+++ b/app/locale/eo.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Niveloj" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee
index fe36e2e6a..2702a46dc 100644
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     boast: "Cuenta con acertijos lo suficiente complejos como para fascinar a jugadores y programadores por igual."
     winning: "Una combinación ganadora entre un juego de rol y una tarea sobre programación que consigue hacer de la educación amigable y disfrutable para los niños."
     run_class: "Todo lo que necesitas para organizar una clase de informática en tu escuela hoy mismo, sin necesidad de ningún conocimiento previo de informática."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Jugar" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     submit_patch: "Enviar Parche"
     submit_changes: "Enviar cambios"
     save_changes: "Guardar cambios"
+#    required_field: "Required field"
 
   general:
     and: "y"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     subject: "Asunto"
     email: "Email"
     password: "Contraseña"
+#    confirm_password: "Confirm Password"
     message: "Mensaje"
     code: "Código"
     ladder: "Escalera"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     warrior: "Guerrero"
     ranger: "Guardabosques"
     wizard: "Mago"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "segundo"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     years: "años"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Nivel Completado:"
     course: "Curso:"
     done: "Listo"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     victory_new_item: "Objeto Nuevo"
     victory_viking_code_school: "¡Changos macacos!, el nivel que acabas de pasar era dificil! Si todavía no eres un desarrollador de software, deberías serlo. Acabas de conseguir una aceptación por vía rápida con la Escuela Vikinga de Có, donde tú puedes llevar tus habilidades al siguiente nivel y convertirteen un desarrollador web profesional en 14 semanas."
     victory_become_a_viking: "Conviértete en un Vikingo"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guía"
     tome_cast_button_run: "Ejecutar"
     tome_cast_button_running: "Ejecutando"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     jobs_benefits: "Beneficios del empleado"
     jobs_benefit_1: "Salario competitivo y opciones"
     jobs_benefit_2: "Política vacacional de 15 días, como mínimo, excepto los feriados de la compañia "
-    jobs_benefit_3: "Flexibilidad para trabajar desde casa"
-    jobs_benefit_4: "Días personales/enfermo ilimitados"
-    jobs_benefit_5: "Desarrollo profesional y soporte de formación continua"
-    jobs_benefit_6: "Seguro médico/dental/vista"
+    jobs_benefit_3: "Flexibilidad para trabajar desde casa" # {change}
+    jobs_benefit_4: "Días personales/enfermo ilimitados" # {change}
+    jobs_benefit_5: "Desarrollo profesional y soporte de formación continua" # {change}
+    jobs_benefit_6: "Seguro médico/dental/vista" # {change}
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
     learn_more: "Aprender Más"
     jobs_custom_title: "Crear Tu Propio"
     jobs_custom_description: "¿Te apasiona CodeCombat pero nos ves un puesto de trabajo que coincida con tus cualificaciones? Escríbenos y muestrenos como cree que puede contribuir a nuestro equipo. ¡Nos encantaría saber de vos!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     phone_number_help: "¿Dónde podemos contactarte durante el horario de trabajo ?"
     role_label: "Tu función"
     role_help: "Seleccione su función principal."
+#    role_default: "Select Role"
     tech_coordinator: "Coordinador de tecnología"
     advisor: "Tutor"
     principal: "Director"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     state: "Estado"
     country: "País"
     num_students_help: "¿Cuántos prevees inscribir en CodeCombat?"
+#    num_students_default: "Select Range"
     education_level_label: "Nivel Educativo de los Estudiantes"
     education_level_help: "Elegí todas las que correspondan."
     elementary_school: "Escuela Primaria"
@@ -765,9 +796,17 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     college_plus: "Universidad o superior"
     anything_else: "¿Algo más que deberíamos saber?"
     thanks_header: "¡Gracias por solicitar un presupuesto!" # {change}
-    thanks_p: "Estaremos en contacto pronto. ¿Preguntas? Escríbenos:"
-    thanks_anon: "Inicia sesión o regístrate con tu cuenta más abajo para acceder a tus dos suscripciones gratuitas (te notificaremos por email cuando hayan sido aprobadas, que por lo general tarda menos de 48 horas). Como siempre, la primera hora de contenido es gratuita para un número ilimitado de estudiantes." # {change}
-    thanks_logged_in: "Tus dos suscripciones gratuitas están pendientes de aprobación. Te notificaremos por email cuando hayan sido aprobadas (por lo general dentro de las 48 horas). Como siempre, la primera hora de contenido es gratuita para un número ilimitado de estudiantes." # {change}
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+    thanks_p: "Estaremos en contacto pronto. ¿Preguntas? Escríbenos:" # {change}
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     average_levels: "Niveles Promedio completados:"
     total_levels: "Total de niveles completados:"
     furthest_level: "Máximo nivel completado:"
-    concepts_covered: "Conceptos Cubiertos"
     students: "Estudiantes"
     students1: "estudiantes"
     concepts: "Conceptos"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     capacity_used: "Espacios de curso usados:"
     enter_emails: "Introducir los emails de los estudiantes a invitar, uno por línea"
     send_invites: "¿Mandar Invitaciones?"
-    title: "Título"
-    description: "Descripción"
     creating_class: "Creando clase..."
     purchasing_course: "Adquiriendo curso..."
     buy_course: "Comprar Curso"
     buy_course1: "Comprar este curso"
-    create_class: "Crear Grupo"
     select_all_courses: "Seleccione 'Todos los cursos' para un 50% de descuento!"
     all_courses: "Todos los Cursos"
     number_students: "Número de estudiantes"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     keep_using: "Seguir Usando"
     switch_to: "Cambiar a"
     greetings: "Saludos!"
-    learn_p: "Aprender Python"
-    learn_j: "Aprender JavaScript"
-    language_cannot_change: "El lenguaje no puede ser cambiado una vez que el estudiante ingreso a la clase."
     back_classrooms: "Volver a mis aulas"
     back_courses: "Volver a mis cursos"
     edit_details: "Editar detallesde clase"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     students_enrolled: "estudiantes matriculados"
 #    students_assigned: "students assigned"
     length: "Duración:"
+    title: "Título" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Conceptos Cubiertos"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Descripción" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "El lenguaje no puede ser cambiado una vez que el estudiante ingreso a la clase."
+    learn_p: "Aprender Python"
+    learn_j: "Aprender JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Crear Grupo"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Archimago"
diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index 9b55664fa..5eb1c2f6d 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Jugar" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     submit_patch: "Enviar Parche"
     submit_changes: "Enviar Cambios"
     save_changes: "Guardar cambios"
+#    required_field: "Required field"
 
   general:
     and: "y"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     subject: "Asunto"
     email: "Correo electrónico"
     password: "Password"
+#    confirm_password: "Confirm Password"
     message: "Mensaje"
     code: "Código"
     ladder: "Clasificación"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     warrior: "Guerrero"
     ranger: "Unidad de combate a distancia"
     wizard: "Mago"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "segundo"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     years: "años"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Hecho"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     victory_new_item: "Nuevo artículo"
     victory_viking_code_school: "Jolínes, el nivel que acabas de pasar era dificil! Si todavía no eres un desarrollador de software, deberías serlo. Acabas de conseguir una aceptación por vía rápida con la Escuela Vikinga de Có, donde tú puedes llevar tus habilidades al siguiente nivel y convertirteen un desarrollador web profesional en 14 semanas."
     victory_become_a_viking: "Convertirse en un vikingo"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guía"
     tome_cast_button_run: "Correr"
     tome_cast_button_running: "Corriendo"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Archimago"
diff --git a/app/locale/et.coffee b/app/locale/et.coffee
index dc2520211..66dc0ae95 100644
--- a/app/locale/et.coffee
+++ b/app/locale/et.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee
index 7619f85a1..951994bab 100644
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "سطوح" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    subject: "Subject"
     email: "ایمیل"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
     message: "پیام"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee
index b2f1874de..8a65ebdff 100644
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Tasot" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     submit_patch: "Lähetä paikkaus"
     submit_changes: "Lähetä muutos"
     save_changes: "Tallenna muutokset"
+#    required_field: "Required field"
 
   general:
     and: "ja"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     subject: "Aihe"
     email: "Sähköposti"
     password: "Salasana"
+#    confirm_password: "Confirm Password"
     message: "Viesti"
     code: "Koodi"
     ladder: "Liiga"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     warrior: "Sotilas"
     ranger: "Vartija"
     wizard: "Velho"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "sekuntti"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     years: "vuodet"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Suoritit tason:"
     course: "Kurssi:"
     done: "Valmis"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     victory_new_item: "Uusi esine"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Tule viikingiksi"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Opas"
     tome_cast_button_run: "Suorita"
     tome_cast_button_running: "Suoritetaan"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arkkimaagi"
diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee
index f935e295f..fdb60d314 100644
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Jouer" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     submit_patch: "Soumettre un correctif"
     submit_changes: "Soumettre des Changements"
     save_changes: "Sauvegarder les modifications"
+#    required_field: "Required field"
 
   general:
     and: "et"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     subject: "Sujet"
     email: "E-mail"
     password: "Mot de passe"
+#    confirm_password: "Confirm Password"
     message: "Message"
     code: "Code"
     ladder: "Companion"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     warrior: "Guerrier"
     ranger: "Ranger"
     wizard: "Magicien"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "seconde"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     years: "années"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Niveau terminé:"
     course: "Cours:"
     done: "Fait"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     victory_new_item: "Nouvel item"
     victory_viking_code_school: "Par la barbe d'Odin, c'est un niveau difficile que tu viens de compléter! Si tu n'est pas un développeur de logiciel, tu devrais l'être ! Ceci vient de te propulser dans l'école de Code Vikings où tu pourras amener tes habilités au prochain niveau et devenir un développer web profesionnel en deux semaines."
     victory_become_a_viking: "Devenez un viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guide"
     tome_cast_button_run: "Exécuter"
     tome_cast_button_running: "En cours d'exécution"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     average_levels: "Nombre de niveaux moyen complétés:"
     total_levels: "Total de niveaux complétés :"
     furthest_level: "Meilleur niveau complété :"
-    concepts_covered: "Conceptes Couverts"
     students: "Elèves"
     students1: "éleves"
     concepts: "Conceptes"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    capacity_used: "Course slots used:"
     enter_emails: "Entrez les adresses emails des élèves à inviter, à raison d'une par ligne"
     send_invites: "Envoyer les invitations"
-    title: "Titre"
-    description: "Description"
     creating_class: "Creation de la classe..."
     purchasing_course: "Achat de cours..."
     buy_course: "Acheter des Cours"
     buy_course1: "Acheter ce cours"
-    create_class: "Créer une Classe"
     select_all_courses: "Sélectionnez 'Tous les cours' pour une réduction de 50%!"
     all_courses: "Tous les Cours"
     number_students: "Nombre d'élèves"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     keep_using: "Continuer à utiliser"
     switch_to: "Changer"
 #    greetings: "Greetings!"
-    learn_p: "Apprendre Python"
-    learn_j: "Apprendre JavaScript"
-    language_cannot_change: "Le language ne peut être changé une fois qu'un élève à rejoins la classe."
     back_classrooms: "Retour à mes classes"
     back_courses: "Retour à mes cours"
     edit_details: "Modifier les informations de la classe"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     students_enrolled: "élèves inscrits"
 #    students_assigned: "students assigned"
     length: "Durée:"
+    title: "Titre" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Conceptes Couverts"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "Le language ne peut être changé une fois qu'un élève à rejoins la classe."
+    learn_p: "Apprendre Python"
+    learn_j: "Apprendre JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Créer une Classe"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Archimage"
diff --git a/app/locale/gl.coffee b/app/locale/gl.coffee
index 9eb0cfb34..ee719ef3d 100644
--- a/app/locale/gl.coffee
+++ b/app/locale/gl.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Xogar" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     submit_patch: "Enviar Parche"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
     and: "e"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     subject: "Asunto"
     email: "Correo electrónico"
     password: "Contrasinal"
+#    confirm_password: "Confirm Password"
     message: "Mensaxe"
     code: "Código"
     ladder: "Clasificación"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "segundo"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     years: "anos"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Feito"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guía"
     tome_cast_button_run: "Executar"
     tome_cast_button_running: "Executando"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Archimago"
diff --git a/app/locale/he.coffee b/app/locale/he.coffee
index c7c96ca94..601507b8d 100644
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "שלבים" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     submit_patch: ".שלח תיקון"
     submit_changes: "שלח שינויים"
     save_changes: "שמור שינויים"
+#    required_field: "Required field"
 
   general:
     and: "וגם"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     subject: "נושא"
     email: "מייל"
     password: "סיסמה"
+#    confirm_password: "Confirm Password"
     message: "הודעה"
     code: "קוד"
     ladder: "סולם"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     warrior: "לוחם"
     ranger: "קשת"
     wizard: "מכשף"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "שנייה"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     years: "שנים"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "שלב שהושלם:"
     course: "מסלול:"
     done: "סיים"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     victory_new_item: "חפץ חדש"
     victory_viking_code_school: "אבוקדו קדוש, זה היה שלב קשה שסיימת! אם אתה עדיין לא מפתח תוכנה, אתה צריך להיות אחד. בדיוק עלית על הכביש המהיר בכדי להתקבל ל Viking Code School, שם תוכל לשאת את כישוריך לרמה הבאה ותוכל להפוך למפתח רשת מקצועי תוך 14 שבועות בלבד."
     victory_become_a_viking: "הפוך לוויקינג"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "מדריך"
     tome_cast_button_run: "הפעל"
     tome_cast_button_running: "פועל"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "כשף על"
diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee
index 460939840..34f01f7fe 100644
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "चरण" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee
index 92f95f47c..e2971ad98 100644
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     boast: "Elég bonyolult feladványokkal dicsekedhet, melyek játékosokat és kódereket egyaránt elbűvölnek."
     winning: "Programozás házi feladatok és RPG játékélmény nyerő kombinációja, mely tényleg élvezetessé teszi a tanulást."
     run_class: "Minden, amire egy programozás óra megtartásához szükséged lehet. Mély szaktudás nem szükséges."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Játék" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     submit_patch: "Kiegészítés bemutatása"
     submit_changes: "Változások véglegesítése"
     save_changes: "Változások mentése"
+#    required_field: "Required field"
 
   general:
     and: "és"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     subject: "Tárgy"
     email: "E-mail"
     password: "Jelszó"
+#    confirm_password: "Confirm Password"
     message: "Üzenet"
     code: "Kód"
     ladder: "Ranglétra"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     warrior: "Harcos"
     ranger: "Távolsági"
     wizard: "Varázsló"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "másodperc"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     years: "évek"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Teljesített pálya:"
     course: "Kurzus:"
     done: "Kész"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     victory_new_item: "Új tárgy"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Legyél Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Útmutató"
     tome_cast_button_run: "Futtatás"
     tome_cast_button_running: "Futás..."
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
     elementary_school: "Általános iskola"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     middle_school: "Középiskola"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Főmágus"
diff --git a/app/locale/id.coffee b/app/locale/id.coffee
index 2b98b99fe..846b9451f 100644
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@@ -25,8 +25,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
     im_a_student: "Aku seorang murid"
     learn_more: "Pelajari lebih lanjut"
     classroom_in_a_box: "Sebuah ruangan kelas di-dalam-kotak untuk mengajar sains komputer."
-    codecombat_is: "CodeCombat adalah sebuah panggung untuk para murid untuk belajar ilmu komputer sambil bermain permainan yang sesungguhnya." # {change}
-    our_courses: "Kursus kami telah di uji melalui para pemain secara khusus untuk unggul di ruang kelas, bahkan oleh para guru yang mempunyai sedikit atau tanpa pengalaman pemrograman sebelumnya." # {change}
+    codecombat_is: "CodeCombat adalah sebuah panggung untuk para murid untuk belajar ilmu komputer sambil bermain permainan yang sesungguhnya."
+    our_courses: "Kursus kami telah di uji melalui para pemain secara khusus untuk unggul di ruang kelas, bahkan oleh para guru yang mempunyai sedikit atau tanpa pengalaman pemrograman sebelumnya."
 #    top_screenshots_hint: "Students write code and see their changes update in real-time"
     designed_with: "Dirancang untuk para guru"
     real_code: "Kode asli yang diketik"
@@ -67,7 +67,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
     request_demo: "Minta sebuah demonstrasi"
     create_a_class: "Buat sebuah kelas"
 #    setup_a_class: "Set Up a Class"
-    have_an_account: "Sudah mempunyai akun?" # {change}
+    have_an_account: "Sudah mempunyai akun?"
 #    log_in: "Log In"
     logged_in_as: "You are currently logged in as"
     view_my_classes: "Lihat kelas-kelas saya"
@@ -81,66 +81,25 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
     boast: "teka-teki Membanggakan yang cukup kompleks untuk mempesona para pemain dan pengkode."
     winning: "Kombinasi yang unggul dari permainan RPG dan pemrograman pekerjaan rumah yang berhasil membuat pendidikan ramah anak yang sah dan menyenangkan."
     run_class: "Semua yang Anda butuhkan untuk menjalankan kelas ilmu komputer di sekolah Anda hari ini, latar belakang CS tidak diperlukan."
-
-#  new_home:
-#    slogan: "The most engaging game for learning programming."
-#    classroom_edition: "Classroom Edition:"
-#    learn_to_code: "Learn to code:"
-#    teacher: "Teacher"
-#    student: "Student"
-#    play_now: "Play Now"
-#    im_a_teacher: "I'm a Teacher"
-#    im_a_student: "I'm a Student"
-#    learn_more: "Learn more"
-#    classroom_in_a_box: "A classroom in-a-box for teaching computer science."
-#    codecombat_is: "CodeCombat is a platform for students to learn computer science while playing through a real game."
-#    our_courses: "Our courses have been specifically playtested to excel in a classroom setting, even by teachers with little to no prior programming experience."
-#    designed_with: "Designed with teachers in mind"
-#    real_code: "Real, typed code"
-#    from_the_first_level: "from the first level"
-#    getting_students: "Getting students to typed code as quickly as possible is critical to learning programming syntax and proper structure."
-#    educator_resources: "Educator resources"
-#    course_guides: "and course guides"
-#    teaching_computer_science: "Teaching computer science does not require a costly degree, because we provide tools to support educators of all backgrounds."
-#    accessible_to: "Accessible to"
-#    everyone: "everyone"
-#    democratizing: "Democratizing the process of learning coding is at the core of our philosophy. Everyone should be able to learn to code."
-#    forgot_learning: "I think they actually forgot that they were actually learning something."
-#    wanted_to_do: " Coding is something I've always wanted to do, and I never thought I would be able to learn it in school."
-#    why_games: "Why is learning through games important?"
-#    games_reward: "Games reward the productive struggle."
-#    encourage: "Gaming is a medium that encourages interaction, discovery, and trial-and-error. A good game challenges the player to master skills over time, which is the same critical process students go through as they learn."
-#    excel: "Games excel at rewarding"
-#    struggle: "productive struggle"
-#    kind_of_struggle: "the kind of struggle that results in learning that’s engaging and"
-#    motivating: "motivating"
-#    not_tedious: "not tedious."
-#    gaming_is_good: "Studies suggest gaming is good for children’s brains. (it’s true!)"
-#    game_based: "When game-based learning systems are"
-#    compared: "compared"
-#    conventional: "against conventional assessment methods, the difference is clear: games are better at helping students retain knowledge, concentrate and"
-#    perform_at_higher_level: "perform at a higher level of achievement"
-#    feedback: "Games also provide real-time feedback that allows students to adjust their solution path and understand concepts more holistically, instead of being limited to just “correct” or “incorrect” answers."
-#    real_game: "A real game, played with real coding."
-#    great_game: "A great game is more than just badges and achievements - it’s about a player’s journey, well-designed puzzles, and the ability to tackle challenges with agency and confidence."
-#    agency: "CodeCombat is a game that gives players that agency and confidence with our robust typed code engine, which helps beginner and advanced students alike write proper, valid code."
-#    curious: "Curious? Request a demo and we'll show you the ropes"
-#    create_class: "Or create a class and see it for yourself!"
-#    request_demo: "Request a Demo"
-#    create_a_class: "Create a Class"
-#    have_an_account: "Already have an account?"
-#    logged_in_as: "You are currently logged in as"
-#    view_my_classes: "View my classes"
-#    computer_science: "Computer science courses for all ages"
-#    show_me_lesson_time: "Show me lesson time estimates for:"
-#    curriculum: "Total curriculum hours:"
-#    ffa: "Free for all students"
-#    lesson_time: "Lesson time:"
-#    coming_soon: "Coming soon!"
-#    courses_available_in: "Courses are available in JavaScript, Python, and Java (coming soon!)"
-#    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
-#    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
-#    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Tingkatan" # The top nav bar entry where players choose which levels to play
@@ -170,7 +129,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -304,6 +262,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -336,6 +295,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -354,6 +314,9 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -372,6 +335,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -415,6 +379,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -765,10 +730,14 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -806,6 +775,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -816,6 +786,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -824,10 +795,18 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -1022,7 +1001,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -1037,13 +1015,10 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1092,9 +1067,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1230,6 +1202,109 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/it.coffee b/app/locale/it.coffee
index 1fba91ceb..c19db86d4 100644
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Livelli" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     submit_patch: "Invia patch"
     submit_changes: "Invia modifiche"
     save_changes: "Salva modifiche"
+#    required_field: "Required field"
 
   general:
     and: "e"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     subject: "Oggetto"
     email: "Email"
     password: "Password"
+#    confirm_password: "Confirm Password"
     message: "Messaggio"
     code: "Codice"
     ladder: "Scala"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     warrior: "Guerriero"
     ranger: "Ranger"
     wizard: "Mago"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "secondo"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     years: "anni"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Livello completato:"
     course: "Corso:"
     done: "Fatto"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     victory_new_item: "Nuovo oggetto"
     victory_viking_code_school: "Fumi sacri, era un livello duro quello che hai passato! Se non sei già uno sviluppatore, dovresti esserlo. Sei appena stato raccomandato per entrare nella Viking Code School, dove potrai raggiungere il prossimo livello di conoscenza e diventare uno sviluppatore web professionale in 14 settimane."
     victory_become_a_viking: "Diventa un Vichingo"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guida"
     tome_cast_button_run: "Vai"
     tome_cast_button_running: "In esecuzione"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     average_levels: "Media livelli completati:"
     total_levels: "Totale livelli completati:"
     furthest_level: "Livello più lontano raggiunto:"
-    concepts_covered: "Concetti Approfonditi"
     students: "Studenti"
     students1: "studenti"
     concepts: "Concetti"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     capacity_used: "Slot corsi usati:"
     enter_emails: "Immetti le email degli sdutendi da invitare, una per linea"
     send_invites: "Invia Inviti"
-    title: "Titolo"
-    description: "Descrizione"
     creating_class: "Creo classe..."
     purchasing_course: "Acquisto corso..."
     buy_course: "Compra corso"
     buy_course1: "Compra questo corso"
-    create_class: "Crea Classe"
     select_all_courses: "Seleziona 'Tutti i corsi' per uno sconto del 50%!"
     all_courses: "Tutti i corsi"
     number_students: "Numero di studenti"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-    learn_p: "Apprendi Python"
-    learn_j: "Apprendi JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+    title: "Titolo" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Concetti Approfonditi"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Descrizione" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+    learn_p: "Apprendi Python"
+    learn_j: "Apprendi JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Crea Classe"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arcimago"
diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index a46f36ab6..7bcea969d 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "ゲームマップへ" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     submit_patch: "パッチを送信"
     submit_changes: "変更を送信"
     save_changes: "変更を保存"
+#    required_field: "Required field"
 
   general:
     and: "と"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     subject: "件名"
     email: "メール"
     password: "パスワード"
+#    confirm_password: "Confirm Password"
     message: "メッセージ"
     code: "コード"
     ladder: "ラダー"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     warrior: "戦士"
     ranger: "レンジャー"
     wizard: "ウィザード"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "秒"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     years: "年"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "コンプリートレベル:"
     course: "コース:"
     done: "完了"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     victory_new_item: "ニューアイテム"
     victory_viking_code_school: "あなたはハードレベルのホーリー・スモークを打ち破りました! もしあなたが既にソフトウェア開発者でないなら, ぜひやってみましょう. あなたはちょうどViking Code Scoolで受け入れられるための出世街道にいます,そこでは次のレベルへのスキルを取得でき、14週間でプロのWeb開発者になれます。"
     victory_become_a_viking: "バイキングになる"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "ガイド"
     tome_cast_button_run: "実行"
     tome_cast_button_running: "実行中"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "アークメイジ"
diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee
index 2e9f80f89..5b4b173e4 100644
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "레벨" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     submit_patch: "패치 제출"
     submit_changes: "변경사항 제출"
     save_changes: "변경사항 저장"
+#    required_field: "Required field"
 
   general:
     and: "그리고"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     subject: "제목"
     email: "이메일"
     password: "비밀번호"
+#    confirm_password: "Confirm Password"
     message: "메시지"
     code: "코드"
     ladder: "레더"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     warrior: "전사"
     ranger: "레인저"
     wizard: "마법사"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "초"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     years: "년"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "완료된 레벨:"
     course: "코스:"
     done: "완료"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     victory_new_item: "새로운 아이템"
     victory_viking_code_school: "놀랍습니다, 당신은 그냥 이길 힘든 수준이었습니다! 이미 소프트웨어 개발자가 아닌 경우, 당신은 비이킹 코드 학교에서 빠르게 이해할것입니다, 당신이 다음 레벨에서 자신의 능력을 14주 동안 전문 웹 개발자가 될 수있는 곳입니다."
     victory_become_a_viking: "바이킹이 되세요"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "가이드"
     tome_cast_button_run: "실행"
     tome_cast_button_running: "실행중"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "대마법사"
diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee
index 2b73f4885..e2785b20e 100644
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Lygiai" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     submit_patch: "Pateikti pataisymą"
     submit_changes: "Išsaugoti pakeitimus"
     save_changes: "Saugoti pakeitimus"
+#    required_field: "Required field"
 
   general:
     and: "ir"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     subject: "Tema"
     email: "El. paštas"
     password: "Slaptažodis"
+#    confirm_password: "Confirm Password"
     message: "Žinutė"
     code: "Kodas"
     ladder: "Rezultatų lentelė"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     warrior: "Karys"
     ranger: "Žvalgas"
     wizard: "Burtininkas"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "sekundė"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     years: "metai"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Įveiktas Lygis:"
     course: "Kursas:"
     done: "Gerai"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     victory_new_item: "Naujas Daiktas"
     victory_viking_code_school: "Po paraliais, tu katik įveikei sunkujį lygį! Jei tu dar nesi programuotojas, tai bent turėtum būti. Tu katik paspartinai priėmimą į Vikingų Kodo Mokyklą, kur savo įgudžius gali perkelti į naują lygį ir, per 14 sąvaičių, gali tapti profesionaliu internetinių sistemų programuotoju."
     victory_become_a_viking: "Tapk Vikingu"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Vedlys"
     tome_cast_button_run: "Paleisti"
     tome_cast_button_running: "Leidžiama"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arkimagas"
diff --git a/app/locale/mk-MK.coffee b/app/locale/mk-MK.coffee
index d7e8ba35d..a6609747e 100644
--- a/app/locale/mk-MK.coffee
+++ b/app/locale/mk-MK.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Нивоа" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     submit_patch: "Поднеси закрпа"
     submit_changes: "Поднеси промени"
     save_changes: "Зачувај промени"
+#    required_field: "Required field"
 
   general:
     and: "и"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     subject: "Предмет на пораката"
     email: "E-mail"
     password: "Лозинка"
+#    confirm_password: "Confirm Password"
     message: "Порака"
 #    code: "Code"
     ladder: "Ранг листа"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     warrior: "Воин"
     ranger: "Ренџер"
     wizard: "Волшебник"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "секунда"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     years: "години"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Готово"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Водич"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee
index 3b9c684b4..45dd63c22 100644
--- a/app/locale/ms.coffee
+++ b/app/locale/ms.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Mula" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
     and: "dan"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    subject: "Subject"
     email: "Emel"
     password: "Kata Laluan"
+#    confirm_password: "Confirm Password"
     message: "Mesej"
     code: "Kod"
     ladder: "Tangga"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/my.coffee b/app/locale/my.coffee
index 233f7322c..6c3b8d57a 100644
--- a/app/locale/my.coffee
+++ b/app/locale/my.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee
index 8e3a68a15..8fdddd319 100644
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Spill" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     submit_patch: "Lever en Patch"
     submit_changes: "Lever Endringer"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
     and: "og"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     subject: "Emne"
     email: "Epost"
     password: "Passord"
+#    confirm_password: "Confirm Password"
     message: "Melding"
     code: "Kode"
     ladder: "Stige"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     warrior: "Kriger"
     ranger: "Vokter"
     wizard: "Trollmann"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "sekund"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     years: "år"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Ferdig"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guide"
     tome_cast_button_run: "Kjør"
     tome_cast_button_running: "Kjører"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Erketrollmann"
diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee
index 8d76fef18..d00ab4b8c 100644
--- a/app/locale/nl-BE.coffee
+++ b/app/locale/nl-BE.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     submit_patch: "Correctie Opsturen"
     submit_changes: "Wijzigingen indienen"
     save_changes: "Wijzigingen opslaan"
+#    required_field: "Required field"
 
   general:
     and: "en"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     subject: "Onderwerp"
     email: "Email"
     password: "Wachtwoord"
+#    confirm_password: "Confirm Password"
     message: "Bericht"
     code: "Code"
     ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     warrior: "Krijger"
     ranger: "Boogschutter"
     wizard: "Tovenaar"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "seconde"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     years: "jaren"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Voltooid Level:"
     course: "Les:"
     done: "Klaar"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     victory_new_item: "Nieuw Item"
     victory_viking_code_school: "Wow, jij hebt net een moeilijk level gehaald! Als je nog geen programmeur was, zou je er een moeten worden! Je hebt net versneld toegang gekregen voor de Viking programmeer school, waar je je vaardigheden kan opkrikken en binnen 14 weken een professionele webontwikkelaar kunt worden."
     victory_become_a_viking: "Word een Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Handleiding"
     tome_cast_button_run: "Uitvoeren"
     tome_cast_button_running: "Afspelen"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     average_levels: "Gemiddeld aantal levels voltooid:"
     total_levels: "Totaal aantal levels voltooid:"
     furthest_level: "Hoogst behaalde level:"
-    concepts_covered: "Behandelde concepten"
     students: "leerlingen"
     students1: "leerlingen"
     concepts: "Concepten"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     capacity_used: "Cursus stoelen gebruikt:"
     enter_emails: "Voer e-mailadressen van leerlingen in om uit te nodigen, één per regel"
     send_invites: "Verstuur uitnodigingen"
-    title: "Titel"
-    description: "beschrijving"
     creating_class: "Aanmaken klas..."
     purchasing_course: "Aanschaffen cursus..."
     buy_course: "Cursus kopen"
     buy_course1: "Koop deze cursus"
-    create_class: "Maak klas aan"
     select_all_courses: "Selecteer 'Alle cursussen' voor 50% korting!"
     all_courses: "Alle cursussen"
     number_students: "Aantal leerlingen"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     keep_using: "Blijf Gebruiken"
     switch_to: "Verander Naar"
     greetings: "Groeten!"
-    learn_p: "Leer Python"
-    learn_j: "Leer JavaScript"
-    language_cannot_change: "Nadat een leerling een les vervoegt kan de taal niet meer veranderd worden"
     back_classrooms: "Terug naar mijn klassen"
     back_courses: "Terug naar mijn lessen"
     edit_details: "Verander klas details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     students_enrolled: "ingeschreven studenten"
 #    students_assigned: "students assigned"
     length: "Lengte:"
+    title: "Titel" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Behandelde concepten"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "beschrijving" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "Nadat een leerling een les vervoegt kan de taal niet meer veranderd worden"
+    learn_p: "Leer Python"
+    learn_j: "Leer JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Maak klas aan"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Tovenaar"
diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee
index cb0d1379b..f9e59d723 100644
--- a/app/locale/nl-NL.coffee
+++ b/app/locale/nl-NL.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     boast: "Uitdagende raadsels die zowel gamers als fanatieke programmeurs weten te prikkelen."
     winning: "Een gouden combinatie van spel-elementen en programmeerhuiswerk, dat samen zorgt voor kind-vriendelijk en oprecht aangenaam onderwijs."
     run_class: "Alles wat je nodig hebt om vandaag nog programmeerlessen in jouw klas te geven, geen voorkennis vereist."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     submit_patch: "Correctie Opsturen"
     submit_changes: "Veranderingen indienen"
     save_changes: "veranderingen opslaan"
+#    required_field: "Required field"
 
   general:
     and: "en"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     subject: "Onderwerp"
     email: "E-mail"
     password: "Wachtwoord"
+#    confirm_password: "Confirm Password"
     message: "Bericht"
     code: "Code"
     ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     warrior: "Krijger"
     ranger: "Ranger"
     wizard: "Tovenaar"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "seconde"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     years: "jaren"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Voltooid Level:"
     course: "Les:"
     done: "Klaar"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     victory_new_item: "Nieuw Item"
     victory_viking_code_school: "Wow, jij hebt net een moeilijk level gehaald! Als je nog geen programmeur was, zou je er een moeten worden! Je hebt net versneld toegang gekregen voor de Viking programmeerSchool, waar je je vaardigheden kan opkrikken en binnen 14 weken een professionele webontwikkelaar kunt worden."
     victory_become_a_viking: "Word een Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Handleiding"
     tome_cast_button_run: "Uitvoeren"
     tome_cast_button_running: "Afspelen"
@@ -507,9 +532,9 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 
   subscribe:
     comparison_blurb: "Verbeter je vaardigheden met een abonement op CodeCombat!"
-    feature1: "meer dan 110+ basislevels over 4 werelden" # {change}
+    feature1: "meer dan 125+ basislevels over 4 werelden" # {change}
     feature2: "10 sterke <strong>nieuwe helden</strong> met unieke vaardigheden!"
-    feature3: "70+ bonuslevels" # {change}
+    feature3: "85+ bonuslevels" # {change}
     feature4: "<strong>{{gems}} bonus edelstenen</strong> elke maand!"
     feature5: "Video cursussen"
     feature6: "Hoogwaardige e-mail ondersteuning"
@@ -527,7 +552,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     thank_you: "Bedankt dat je CodeCombat steunt."
     sorry_to_see_you_go: "Jammer dat je weggaat! Laat ons alsjeblieft weten wat we beter hadden kunnen doen."
     unsubscribe_feedback_placeholder: "Oh, wat hebben we gedaan?"
-    parent_button: "Vraag het aan je ouder(s)"
+    parent_button: "Vraag ouder(s)"
     parent_email_description: "We zullen ze een e-mail sturen zodat zij een CodeCombat-abonnement voor je kunnen kopen."
     parent_email_input_invalid: "E-mailadress ongeldig."
     parent_email_input_label: "E-mailadres van ouder(s)"
@@ -545,7 +570,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     payment_methods_title: "Geaccepteerde betaalmethoden"
     payment_methods_blurb1: "Momenteel worden alleen credit cards, Alipay en iDEAL geaccepteerd." # {change}
     payment_methods_blurb2: "Als u op een andere manier wilt betalen, neem dan alstublieft contact op"
-    sale_button: "Koopje!"
+    sale_button: "Koop"
     sale_button_title: "Bespaar ${{discount}} bij aankoop van een 1-jarig abonnement" # {change}
     stripe_description: "Maandelijks abonnement"
     stripe_description_year_sale: "1-jarig abonnement (${{discount}} korting)" # {change}
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     jobs_benefits: "Arbeidsvoorwaarden"
     jobs_benefit_1: "Competitief salaris en mogelijkheden"
     jobs_benefit_2: "15 dagen minimaal vakantie beleid, exclusief bedrijfs feestdagen"
-    jobs_benefit_3: "Werk vanuit huis flexibiliteit"
-    jobs_benefit_4: "Onbeperkte ziek/persoonlijke dagen"
-    jobs_benefit_5: "Professionele ontwikkeling en voortgezette onderwijs steun"
-    jobs_benefit_6: "Medisch/tandarts/oog verzekering"
+    jobs_benefit_3: "Werk vanuit huis flexibiliteit" # {change}
+    jobs_benefit_4: "Onbeperkte ziek/persoonlijke dagen" # {change}
+    jobs_benefit_5: "Professionele ontwikkeling en voortgezette onderwijs steun" # {change}
+    jobs_benefit_6: "Medisch/tandarts/oog verzekering" # {change}
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
     learn_more: "Lees verder"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     phone_number_help: "Waar kunnen we je bereiken tijdens de werkdag?"
     role_label: "Jouw rol"
     role_help: "Kies je primaire rol."
+#    role_default: "Select Role"
     tech_coordinator: "Technologie coördinator"
     advisor: "Adviseur"
     principal: "Schoolhoofd"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     state: "Provincie"
     country: "Land"
     num_students_help: "Hoeveel leerlingen verwacht u in te schrijven voor CodeCombat?"
+#    num_students_default: "Select Range"
     education_level_label: "Opleidingsniveau van de leerlingen"
     education_level_help: "Kies hoeveel van toepassing is."
     elementary_school: "Lager Onderwijs"
@@ -765,9 +796,17 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     college_plus: "Hoger Onderwijs"
     anything_else: "Is er verder nog iets dat we moeten weten?"
     thanks_header: "Bedankt voor het aanvragen van een citaat!" # {change}
-    thanks_p: "Wij zullen spoedig contact met u opnemen. Vragen? Mail ons:"
-    thanks_anon: "Log hieronder in of geef je op met je account voor twee gratis inschrijvingen (wij zullen je per e-mail op de hoogte stellen zo gauw de aanmeldingen zijn goedgekeurd, wat meestal binnen 48 uur gebeurt). Zoals altijd is het eerste uur van het programma gratis voor alle leerlingen." # {change}
-    thanks_logged_in: "Jouw twee gratis inschrijvingen zijn in afwachting van goedkeuring. Wij zullen je per e-mail op de hoogte stellen zo gouw deze zijn goedgekeurd (meestal binnen 48 uur). Zoals altijd is het eerste uur van het programma gratis voor alle leerlingen." # {change}
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+    thanks_p: "Wij zullen spoedig contact met u opnemen. Vragen? Mail ons:" # {change}
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     average_levels: "Gemiddeld aantal levels voltooid:"
     total_levels: "Totaal aantal levels voltooid:"
     furthest_level: "Hoogst behaalde level:"
-    concepts_covered: "Behandelde concepten"
     students: "leerlingen"
     students1: "leerlingen"
     concepts: "Concepten"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     capacity_used: "Cursus stoelen gebruikt:"
     enter_emails: "Voer e-mailadressen van leerlingen in om uit te nodigen, één per regel"
     send_invites: "Verstuur uitnodigingen"
-    title: "Titel"
-    description: "beschrijving"
     creating_class: "Aanmaken klas..."
     purchasing_course: "Aanschaffen cursus..."
     buy_course: "Cursus kopen"
     buy_course1: "Koop deze cursus"
-    create_class: "Maak klas aan"
     select_all_courses: "Selecteer 'Alle cursussen' voor 50% korting!"
     all_courses: "Alle cursussen"
     number_students: "Aantal leerlingen"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     keep_using: "Blijf Gebruiken"
     switch_to: "Verander naar"
     greetings: "Groeten"
-    learn_p: "Leer Python"
-    learn_j: "Leer JavaScript"
-    language_cannot_change: "Taal kan niet worden veranderd als leerlingen zijn ingeschreven voor de klas."
     back_classrooms: "terug naar mijn klaslokalen"
     back_courses: "Terug naar mijn cursussen"
     edit_details: "bewerk klasgegevens"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     students_enrolled: "ingeschreven leerlingen"
 #    students_assigned: "students assigned"
     length: "Lengte:"
+    title: "Titel" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Behandelde concepten"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "beschrijving" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "Taal kan niet worden veranderd als leerlingen zijn ingeschreven voor de klas."
+    learn_p: "Leer Python"
+    learn_j: "Leer JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Maak klas aan"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Tovenaar"
diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee
index 20873b42e..8b2aa5e93 100644
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee
index bd43d1567..e2e02d0f4 100644
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     boast: "Zagadki, które są wyzwaniem zarówno do programistów jak i dla typowych graczy."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Poziomy" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     submit_patch: "Prześlij łatkę"
     submit_changes: "Prześlij zmiany"
     save_changes: "Zapisz zmiany"
+#    required_field: "Required field"
 
   general:
     and: "i"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     subject: "Temat"
     email: "Email"
     password: "Hasło"
+#    confirm_password: "Confirm Password"
     message: "Wiadomość"
     code: "Kod"
     ladder: "Drabinka"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     warrior: "Wojownik"
     ranger: "Łucznik"
     wizard: "Czarodziej"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "sekunda"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     years: "lat"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Ukończony poziom:"
     course: "Kurs:"
     done: "Zrobione"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     victory_new_item: "Nowy przedmiot"
     victory_viking_code_school: "O jejku, trudny był ten poziom, co? Jeśli jeszcze nie jesteś twórcą oprogramowania, możesz nim już zostać. Złóż swoje podanie o przyjęcie do Viking Code School, a z ich pomocą w zostaniesz na pewno w pełni profesjonalnym programistą."
     victory_become_a_viking: "Zostań wikingiem"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Przewodnik"
     tome_cast_button_run: "Uruchom"
     tome_cast_button_running: "Uruchomiono"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     jobs_benefits: "Korzyści z pracy u nas"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
     learn_more: "Dowiedz się więcej"
     jobs_custom_title: "Stórz własne stanowisko"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    phone_number_help: "Where can we reach you during the workday?"
     role_label: "Twoja rola"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
     principal: "Dyrektor"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     state: "Województwo"
     country: "Kraj"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
     elementary_school: "Szkoła podstawowa"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     middle_school: "Gimnazjum"
     college_plus: "Studia"
     anything_else: "Coś jeszcze powinniśmy wiedzieć?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     average_levels: "Średnio ukończonych poziomów:"
     total_levels: "Łącznie ukończonych poziomów:"
     furthest_level: "Najdalszy ukończony poziom:"
-    concepts_covered: "Omówione tematy"
     students: "Studenci"
     students1: "studenci"
     concepts: "Tematy"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     capacity_used: "Użyte sloty kursu:"
     enter_emails: "Wpisz emaila uczniów do zaproszenia, jeden na linię"
     send_invites: "Wyślij zaproszenia"
-    title: "Tytuł"
-    description: "Opis"
     creating_class: "Tworzenie klasy..."
     purchasing_course: "Kupowanie kursu..."
     buy_course: "Kup kurs"
     buy_course1: "Kup ten kurs"
-    create_class: "Stwórz klasę"
     select_all_courses: "Wybierz 'Wszystkie', aby otrzymać zniżkę 50%!"
     all_courses: "Wszystkie"
     number_students: "Ilość studentów"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     keep_using: "Używaj dalej"
     switch_to: "Przełącz na"
     greetings: "Witamy!"
-    learn_p: "Naucz się Pythona"
-    learn_j: "Naucz się JavaScriptu"
-#    language_cannot_change: "Language cannot be changed once students join a class."
     back_classrooms: "Wróć do moich klas"
     back_courses: "Wróć do moich kursów"
     edit_details: "Edytuj detale klasy"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     students_enrolled: "uczniowie biorący udział"
 #    students_assigned: "students assigned"
     length: "Długość:"
+    title: "Tytuł" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Omówione tematy"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Opis" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+    learn_p: "Naucz się Pythona"
+    learn_j: "Naucz się JavaScriptu"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Stwórz klasę"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arcymag"
diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee
index 3e1ed0ada..0b5a77f68 100644
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Jogar" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     jobs: "Empregos"
     schools: "Escolas"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
     get_involved: "Involva-se"
     open_source: "Código aberto (GitHub)"
     support: "Suporte"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     submit_patch: "Enviar arranjo"
     submit_changes: "Enviar mudanças"
     save_changes: "Salvar mudanças"
+#    required_field: "Required field"
 
   general:
     and: "e"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     subject: "Assunto"
     email: "Email"
     password: "Senha"
+#    confirm_password: "Confirm Password"
     message: "Mensagem"
     code: "Código"
     ladder: "Progressão"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     warrior: "Guerreiro"
     ranger: "Arqueiro"
     wizard: "Feiticeiro"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "segundo"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     years: "anos"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Nivel Completo:"
     course: "Curso:"
     done: "Pronto"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     victory_new_item: "Novo item"
     victory_viking_code_school: "Pelas barbas do profeta, esse foi um nível difícil! Se você ainda não é um desenvolvedor de software, você deveria ser. Você acaba de ser priorizado para aceitação na Viking Code School, onde você pode aprender mais e se tornar um desenvolvedor web profissional em 14 semanas."
     victory_become_a_viking: "Torne-se um viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guia"
     tome_cast_button_run: "Rodar"
     tome_cast_button_running: "Rodando"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
     learn_more: "Aprenda Mais"
     jobs_custom_title: "Crie seu próprio"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
     advisor: "Orientador"
     principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     state: "Estado"
     country: "País"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     average_levels: "Média de níveis completados:"
     total_levels: "Total de níveis completados:"
     furthest_level: "Maior nível alcançado:"
-    concepts_covered: "Conceitos Abordados"
     students: "Estudantes"
     students1: "estudantes"
     concepts: "Conceitos"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     capacity_used: "Espaço de curso usado:"
     enter_emails: "Insira os e-mails dos estudantes , um por linha"
     send_invites: "Enviar convites"
-    title: "Título"
-    description: "Descrição"
     creating_class: "Criando classe..."
     purchasing_course: "Comprando curso..."
     buy_course: "Comprar curso"
     buy_course1: "Compre esse curos"
-    create_class: "Criar Classe"
     select_all_courses: "Selecione 'Todos os Cursos' para ter um desconto de 50%!"
     all_courses: "Todos os Cursos"
     number_students: "Número de estudantes"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    keep_using: "Keep Using"
     switch_to: "Mudar para"
     greetings: "Saudações!"
-    learn_p: "Aprenda Python"
-    learn_j: "Aprenda JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
     back_courses: "Voltar aos meus cursos"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
     length: "Comprimento:"
+    title: "Título" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Conceitos Abordados"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Descrição" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+    learn_p: "Aprenda Python"
+    learn_j: "Aprenda JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Criar Classe"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arquimago"
diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee
index 720c8abfe..fcb7d54b1 100644
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Níveis" # The top nav bar entry where players choose which levels to play
@@ -106,17 +125,16 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     create_a_class: "Criar uma Turma"
     other: "Outros"
     learn_to_code: "Aprende a Programar!"
-#    toggle_nav: "Toggle navigation"
-#    jobs: "Jobs"
-#    schools: "Schools"
-#    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
-#    get_involved: "Get Involved"
-#    open_source: "Open source (GitHub)"
-#    support: "Support"
-#    faqs: "FAQs"
-#    help_pref: "Need help? Email"
-#    help_suff: "and we'll get in touch!"
+    toggle_nav: "Alternar navegação"
+    jobs: "Empregos"
+    schools: "Escolas"
+    educator_wiki: "Wiki do Educador"
+    get_involved: "Envolve-te"
+    open_source: "Open source (GitHub)"
+    support: "Suporte"
+    faqs: "FAQs"
+    help_pref: "Precisas de ajuda? Envia um e-mail para"
+    help_suff: "e nós entraremos em contacto!"
 
   modal:
     close: "Fechar"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     submit_patch: "Submeter Atualização"
     submit_changes: "Submeter Alterações"
     save_changes: "Guardar Alterações"
+    required_field: "Campo Necessário"
 
   general:
     and: "e"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     subject: "Assunto"
     email: "E-mail"
     password: "Palavra-passe"
+    confirm_password: "Confirmar Palavra-passe"
     message: "Mensagem"
     code: "Código"
     ladder: "Classificação"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     warrior: "Guerreiro"
     ranger: "Arqueiro"
     wizard: "Feiticeiro"
+    first_name: "Nome"
+    last_name: "Apelido"
+    username: "Nome de utilizador"
 
   units:
     second: "segundo"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     years: "anos"
 
   play_level:
+    level_complete: "Nível Completo"
     completed_level: "Nível Completo:"
     course: "Curso:"
     done: "Concluir"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     victory_new_item: "Novo Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Torna-te um Viking"
+    victory_no_progress_for_teachers: "O progresso não é guardado para professores. Mas podes adicionar à tua turma uma conta de estudante para ti."
     guide_title: "Guia"
     tome_cast_button_run: "Executar"
     tome_cast_button_running: "A Executar"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     average_levels: "Média de níveis completos:"
     total_levels: "Total de níveis completos:"
     furthest_level: "Nível mais avançado completo:"
-    concepts_covered: "Conceitos Abordados"
     students: "Estudantes"
     students1: "estudantes"
     concepts: "Conceitos"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    capacity_used: "Course slots used:"
     enter_emails: "Introduz os e-mails dos estudantes a convidar, um por linha"
     send_invites: "Enviar Convites"
-    title: "Título"
-    description: "Descrição"
     creating_class: "A criar turma..."
     purchasing_course: "A comprar curso..."
     buy_course: "Comprar Curso"
     buy_course1: "Comprar este curso"
-    create_class: "Criar Turma"
     select_all_courses: "Seleciona 'Todos os Cursos' para teres 50% de desconto!"
     all_courses: "Todos os Cursos"
     number_students: "Número de estudantes"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+    title: "Título" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Conceitos Abordados"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Descrição" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Criar Turma"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arcomago"
diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee
index 8f3f79d45..2e2289674 100644
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Nivele" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     submit_patch: "Înainteaza Patch"
     submit_changes: "Trimite modificări"
     save_changes: "Salveaza modificări"
+#    required_field: "Required field"
 
   general:
     and: "și"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     subject: "Subiect"
     email: "Email"
     password: "Parolă"
+#    confirm_password: "Confirm Password"
     message: "Mesaj"
     code: "Cod"
     ladder: "Clasament"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     warrior: "Războinic"
     ranger: "Arcaș"
     wizard: "Vrăjitor"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "secundă"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     years: "ani"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Gata"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     victory_new_item: "Item nou"
     victory_viking_code_school: "Wow, ăla a fost un nivel greu! Daca nu ești deja un dezvoltator de software, ar trebui să fi. Tocmai ai fost selectat pentru acceptare in Viking Code School, unde poți sa iți dezvolți abilitățile la nivelul următor și să devi un dezvoltator web profesionist în 14 săptămâni."
     victory_become_a_viking: "Devino Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Ghid"
     tome_cast_button_run: "Ruleaza"
     tome_cast_button_running: "In Derulare"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Archmage"
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 761d50f59..dfddf5d79 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Уровни" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     submit_patch: "Отослать патч"
     submit_changes: "Отослать изменения"
     save_changes: "Сохранить изменения"
+#    required_field: "Required field"
 
   general:
     and: "и"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     subject: "Тема"
     email: "Email"
     password: "Пароль"
+#    confirm_password: "Confirm Password"
     message: "Сообщение"
     code: "Код"
     ladder: "Ладдер"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     warrior: "Воин"
     ranger: "Рейнджер"
     wizard: "Волшебник"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "секунда"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     years: "лет"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Завершённый уровень:"
     course: "Курс:"
     done: "Готово"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     victory_new_item: "Новый предмет"
     victory_viking_code_school: "Ого, это было тяжелый уровень! Если вы еще не разработчик программ, вам стоит им стать. Вы только что ускорири принятие в Школу Викингов, где вы сможете поднять свои навыки на новый уровень и стать профессиональным веб-разработчиком за 14 недель."
     victory_become_a_viking: "Станьте Викингом"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Руководство"
     tome_cast_button_run: "Запустить"
     tome_cast_button_running: "В процессе"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     average_levels: "Среднее кол-во завершенных уровней:"
     total_levels: "Всего уровней завершено:"
     furthest_level: "Самый большой завершенный уровень:"
-    concepts_covered: "Концептов покрыто"
     students: "Студенты"
     students1: "студенты"
     concepts: "Концепты"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    capacity_used: "Course slots used:"
     enter_emails: "Введите email студентов по одному на строке, которых вы хотите пригласить"
     send_invites: "Отправить приглашения"
-    title: "Тема"
-    description: "Описание"
     creating_class: "Создание класса..."
     purchasing_course: "Покупка курса..."
     buy_course: "Купить курс"
     buy_course1: "Купить этот курс"
-    create_class: "Создать класс"
     select_all_courses: "Выбрать 'Все курсы' для 50% скидки!"
     all_courses: "Все курсы"
     number_students: "Кол-во студентов"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     keep_using: "Продолжить использовать"
     switch_to: "Переключить на"
     greetings: "Поздравления!"
-    learn_p: "Изучать Python"
-    learn_j: "Изучать JavaScript"
-    language_cannot_change: "Язык не может быть изменён после того как ученик присоединился к классу."
     back_classrooms: "Назад к моим классам"
     back_courses: "Назад к моим курсам"
     edit_details: "Редактировать описание класса"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     students_enrolled: "учеников зачислено"
 #    students_assigned: "students assigned"
     length: "Длительность:"
+    title: "Тема" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Концептов покрыто"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Описание" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "Язык не может быть изменён после того как ученик присоединился к классу."
+    learn_p: "Изучать Python"
+    learn_j: "Изучать JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Создать класс"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Архимаг"
diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee
index ebc7ff2a4..ab88bc7b7 100644
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     boast: "Komplexita úloh je dostatočná na fascináciu hráčov aj programátorov."
     winning: "Strhujúca kombinácia RPG a programovania pre výuku detí."
     run_class: "Všetko, čo potrebuješ, aby si mohol viesť výuku programovania na tvojej škole bez predchádzajúcich skúseností v tejto oblasti."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Hraj" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     jobs: "Práca"
     schools: "Pre školy"
     educator_wiki: "Prípravy"
-    request_quote: "Pridaj školu"
     get_involved: "Zapoj sa"
     open_source: "Open source (GitHub)"
     support: "Podpora"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     submit_patch: "Odoslať Opravu"
     submit_changes: "Odoslať zmeny"
     save_changes: "Ulož zmeny"
+#    required_field: "Required field"
 
   general:
     and: "a"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     subject: "Predmet"
     email: "Email"
     password: "Heslo"
+#    confirm_password: "Confirm Password"
     message: "Správa"
     code: "Kód"
     ladder: "Rebríček"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     warrior: "Bojovník"
     ranger: "Strelec"
     wizard: "Mág"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "sekunda"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     years: "rokov"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Ukončená úroveň:"
     course: "Kurz:"
     done: "Hotovo"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     victory_new_item: "Nový predmet"
     victory_viking_code_school: "No teda, podarilo sa ti prejsť veľmi ťažkú úroveň! Ak nie si vývojar softvéru, tak je najvyšší čas. Si prijatý do  Vikingskej školy programovania,kde môžeš ďalej rozvinúť svoje programovacie schopnosti a stať sa profesionálnym webovým vývojarom za 14 týždňov."
     victory_become_a_viking: "Staň sa vikingom!"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Návod"
     tome_cast_button_run: "Spustiť"
     tome_cast_button_running: "Prebieha"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Arcimág"
diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee
index 8f5ed155f..c3cae31d3 100644
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
     submit_patch: "Pošlji popravek"
     submit_changes: "Pošlji spremembe"
     save_changes: "Shrani spremembe"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee
index 75a0c6a15..019e66473 100644
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Нивои" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     submit_patch: "Потврди закрпу"
     submit_changes: "Потврди измене"
     save_changes: "Сачувај измене"
+#    required_field: "Required field"
 
   general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     subject: "Субјекат"
     email: "Мејл"
     password: "Шифра"
+#    confirm_password: "Confirm Password"
     message: "Порука"
     code: "Код"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     warrior: "Ратник"
     ranger: "Извиђач"
     wizard: "Маг"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "секунда"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     years: "године"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Завршен ниво:"
     course: "Курс:"
     done: "Урађено"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     victory_new_item: "Нови Итем"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Постани Викинг"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Водич"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee
index bdf35d30b..1386e9903 100644
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Spela" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    submit_patch: "Submit Patch"
     submit_changes: "Spara Ändringar"
     save_changes: "Spara ändringar"
+#    required_field: "Required field"
 
   general:
     and: "och"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     subject: "Ämne"
     email: "Mejl"
     password: "Lösenord"
+#    confirm_password: "Confirm Password"
     message: "Meddelande"
     code: "Kod"
     ladder: "Stege"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     warrior: "Krigare"
     ranger: "Vandrare"
     wizard: "Trollkarl"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "sekund"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     years: "år"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Avklarad nivå:"
     course: "Lektion:"
     done: "Klar"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     victory_new_item: "Nytt föremål"
     victory_viking_code_school: "Jösses vilken svår nivå du just klarade! Om du inte redan är en mjukvaruutvecklare så borde du vara det. Du bev precis fast-tracked för antagning vid Viking Code School, där du kan ta dina kunskaper till en ny nivå och bli en professionell webbutvecklare på 14 veckor."
     victory_become_a_viking: "Bli en Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Guide"
     tome_cast_button_run: "Kör"
     tome_cast_button_running: "Kör..."
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Ärkemagiker"
diff --git a/app/locale/th.coffee b/app/locale/th.coffee
index 04e4a5955..a74805f03 100644
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "เล่น" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    subject: "Subject"
     email: "อีเมล"
     password: "รหัสผ่าน"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     warrior: "นักรบ"
 #    ranger: "Ranger"
     wizard: "พ่อมด"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "วินาที"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     years: "ปี"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "เสร็จสิ้น"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     victory_new_item: "ไอเทมใหม่"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee
index 2cefbf579..096a32951 100644
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Oyna" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     jobs: "İşler"
     schools: "Schools"
     educator_wiki: "Eğitimci Wiki"
-    request_quote: "Fiyat Teklifi İste"
     get_involved: "Katıl"
     open_source: "Açık Kaynak (GitHub)"
     support: "Destek"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     submit_patch: "Yama Gönder"
     submit_changes: "Değişiklikleri Gönder"
     save_changes: "Değişiklikleri Kaydet"
+#    required_field: "Required field"
 
   general:
     and: "ve"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     subject: "Konu"
     email: "E-posta"
     password: "Şifre"
+#    confirm_password: "Confirm Password"
     message: "İleti"
     code: "Kod"
     ladder: "Merdiven"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     warrior: "Savaşçı"
     ranger: "Korucu"
     wizard: "Sihirbaz"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "saniye"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     years: "yıl"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Seviyeyi Tamamladın:"
     course: "Kurs:"
     done: "Bitti"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     victory_new_item: "Yeni Öğe"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Viking Ol"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Rehber"
     tome_cast_button_run: "Çalıştır"
     tome_cast_button_running: "Çalıştırılıyor"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Büyük Büyücü"
diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee
index 7f0b05083..98ac700e6 100644
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Грати" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     submit_patch: "Надіслати патч"
     submit_changes: "Надіслати зміни"
     save_changes: "Зберегти зміни"
+#    required_field: "Required field"
 
   general:
     and: "та"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     subject: "Предмет"
     email: "Email"
     password: "Пароль"
+#    confirm_password: "Confirm Password"
     message: "Повідомлення"
     code: "Код"
     ladder: "Драбина"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Українська", englishDescription:
     warrior: "Воїн"
     ranger: "Рейнджер"
     wizard: "Чаклун"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "секунда"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     years: "років"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "Готово"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     victory_new_item: "Новий предмет"
     victory_viking_code_school: "Хай йому грець! Цей рівень був важким, але Ви справились! Якщо Ви ще не програміст, вам слід ним стати. Ви щойно екстерном пройшли процедуру прийняття у Viking Code School, де Ви матимете змогу значно покращити свої здібності та стати професійним веб-розробником за 14 тижнів."
     victory_become_a_viking: "Стати вікінгом"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Посібник"
     tome_cast_button_run: "Виконати"
     tome_cast_button_running: "Виконання"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     average_levels: "Середня кількість завершених рівнів:"
     total_levels: "Всього рівнів завершено:"
     furthest_level: "Найбільший завершений рівень:"
-    concepts_covered: "Концептів покрито"
     students: "Студенти"
     students1: "студенти"
     concepts: "Концепти"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Українська", englishDescription:
     capacity_used: "Використано слотів курсу:"
     enter_emails: "Введіть email-и студентів по одному на рядок, яких ви хочете запросити"
     send_invites: "Відправити запрошення"
-    title: "Тема"
-    description: "Опис"
     creating_class: "Триває створення класу ... "
     purchasing_course: "Триває придбання курсу ... "
     buy_course: "Купити курс"
     buy_course1: "Купити цей курс"
-    create_class: "Створити клас"
     select_all_courses: "Виберіть 'Всі курси' для 50% знижки!"
     all_courses: "Всі курси"
     number_students: "Кількість студентів"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+    title: "Тема" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "Концептів покрито"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Опис" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "Створити клас"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "Архімаг"
diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee
index 2ef99581d..7863f5b76 100644
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/uz.coffee b/app/locale/uz.coffee
index a891b3a75..d33aefac4 100644
--- a/app/locale/uz.coffee
+++ b/app/locale/uz.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee
index 4b3b06950..5396a7b76 100644
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "Chơi!!" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     submit_patch: "Gửi Bản Cập Nhật"
     submit_changes: "Gửi Những Thay Đổi"
     save_changes: "Lưu Những Thay Đổi"
+#    required_field: "Required field"
 
   general:
     and: "và"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     subject: "Chủ đề"
     email: "Email"
     password: "Mật khẩu"
+#    confirm_password: "Confirm Password"
     message: "Tin nhắn"
     code: "Code"
     ladder: "Thang Điểm"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     warrior: "Chiến  binh"
     ranger: "Cung thủ"
     wizard: "Phù thủy"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "giây"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     years: "năm"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "Hoàn thành Level:"
     course: "Khoá học:"
     done: "Hoàn thành"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     victory_new_item: "Vật phẩm mới"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Trở thành một Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "Hướng dẫn"
     tome_cast_button_run: "Chạy"
     tome_cast_button_running: "Đang chạy"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     average_levels: "Lượng cấp độ trung bình đã hoàn thành:"
     total_levels: "Tổng số cấp độ đã hoàn thành"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-    title: "Tiêu đề"
-    description: "Miêu tả"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
     buy_course: "Mua khóa học"
     buy_course1: "Mua khóa học này"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
     all_courses: "Tất cả những khóa học"
     number_students: "Số lượng học sinh"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+    title: "Tiêu đề" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "Miêu tả" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 9dec32aad..936c5c877 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     boast: "以难解的谜题为豪，它们复杂到可以吸引游戏玩家和程序员。"
     winning: "RPG游戏和编程作业的完美结合，使得教育充满乐趣。"
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "关卡选择" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     submit_patch: "提交补丁"
     submit_changes: "提交更新"
     save_changes: "保存更新"
+#    required_field: "Required field"
 
   general:
     and: "与"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     subject: "主题"
     email: "邮件"
     password: "密码"
+#    confirm_password: "Confirm Password"
     message: "信息"
     code: "代码"
     ladder: "升级比赛"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     warrior: "战士"
     ranger: "游骑兵"
     wizard: "巫师"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "秒"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     years: "年"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "完成关卡:"
     course: "课程:"
     done: "完成"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     victory_new_item: "新的物品"
     victory_viking_code_school: "这关真的超难! 如果您想成为一个软件开发人员，您就应该去试一下Viking Code School。在这里您可以把您的知识增长到另一个台阶。只需要14周您就能成为一个专业的网页开发人员。"
     victory_become_a_viking: "成为一个维京人吧"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "指南"
     tome_cast_button_run: "运行"
     tome_cast_button_running: "正在运行"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     jobs_benefits: "职员福利"
     jobs_benefit_1: "充满竞争力的薪水和条件"
     jobs_benefit_2: "最少15天的假期政策，不包括公司节日"
-    jobs_benefit_3: "在家也能轻松工作"
-    jobs_benefit_4: "无病假、事假限制"
-    jobs_benefit_5: "专业开发的同时能继续支持教育"
-    jobs_benefit_6: "医疗/牙科/视觉保险"
+    jobs_benefit_3: "在家也能轻松工作" # {change}
+    jobs_benefit_4: "无病假、事假限制" # {change}
+    jobs_benefit_5: "专业开发的同时能继续支持教育" # {change}
+    jobs_benefit_6: "医疗/牙科/视觉保险" # {change}
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
     learn_more: "了解更多"
     jobs_custom_title: "创造你自己的工作"
     jobs_custom_description: "对 CodeCombat 充满激情却没找到适合自己的职业？给我们写信说明你该如何做出贡献。我们期待你的建议！"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     phone_number_help: "工作日时我们在哪可以找到您？"
     role_label: "您的身份"
     role_help: "选择您的主要身份。"
+#    role_default: "Select Role"
     tech_coordinator: "技术负责人"
     advisor: "顾问"
     principal: "校长"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     state: "州"
     country: "国家"
     num_students_help: "您估计有多少学生加入CodeCombat？"
+#    num_students_default: "Select Range"
     education_level_label: "学生的教育程度"
     education_level_help: "选择即将教导的程度"
     elementary_school: "小学"
@@ -765,9 +796,17 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     college_plus: "大学以上"
     anything_else: "您还有什么建议？"
     thanks_header: "感谢您填写这份表格。" # {change}
-    thanks_p: "我们不久会和你联系。仍有疑问？给我们发电子邮件："
-    thanks_anon: "登陆或注册在下方的账号会给您两个免费的名额(验证通过后会给您发送通知邮件，这通常会在48小时内完成)。和往常一样，第一个小时的内容对任意数量的学生都是免费的。" # {change}
-    thanks_logged_in: "您的两个免费名额正在审核。通过后我们会用邮件通知您(通常在48小时内)。和往常一样，第一个小时的内容对任意数量的学生都是免费的。" # {change}
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+    thanks_p: "我们不久会和你联系。仍有疑问？给我们发电子邮件：" # {change}
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
     setup_a_class: "建立一个班级"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     average_levels: "平均完成关卡："
     total_levels: "总共完成关卡："
     furthest_level: "最高关卡完成："
-    concepts_covered: "课目覆盖"
     students: "学生"
     students1: "个学生"
     concepts: "课目"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     capacity_used: "课程插槽已用："
     enter_emails: "输入学生电邮地​​址来邀请，每行一个"
     send_invites: "发送邀请"
-    title: "标题"
-    description: "描述"
     creating_class: "班级创建中..."
     purchasing_course: "购买课程中..."
     buy_course: "购买课程"
     buy_course1: "购买这个课程"
-    create_class: "创建班级"
     select_all_courses: "可半价一次购买所有课程！"
     all_courses: "所有课程"
     number_students: "学生人数"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     keep_using: "继续使用"
     switch_to: "切换到"
     greetings: "欢迎!"
-    learn_p: "学习Python"
-    learn_j: "学习JavaScript"
-    language_cannot_change: "一旦学生加入课程后则不可修改课程语言。"
     back_classrooms: "回到我的教室"
     back_courses: "回到我的课程"
     edit_details: "编辑课程详情"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     students_enrolled: "已注册学生"
     students_assigned: "已分配学生"
     length: "长度："
+    title: "标题" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "课目覆盖"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "描述" # ClassroomSettingsModal
+#    language_select: "Select a language"
+    language_cannot_change: "一旦学生加入课程后则不可修改课程语言。"
+    learn_p: "学习Python"
+    learn_j: "学习JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "创建班级"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "大法师"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 32b2c1dd2..c3b0c52ca 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "返回地圖" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     submit_patch: "送出修補"
     submit_changes: "送出修改"
     save_changes: "保存更改"
+#    required_field: "Required field"
 
   general:
     and: "和"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     subject: "主題"
     email: "郵件"
     password: "密碼"
+#    confirm_password: "Confirm Password"
     message: "訊息"
     code: "程式碼"
     ladder: "升級比賽"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     warrior: "武士"
     ranger: "搜索兵"
     wizard: "巫師"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "秒"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     years: "年"
 
   play_level:
+#    level_complete: "Level Complete"
     completed_level: "完成關卡："
     course: "課程："
     done: "完成"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     victory_new_item: "新的物品"
     victory_viking_code_school: "太厲害了，您剛完成了非常困難的關卡！如果您想成為一個軟體開發人員，您就應該去試一下Viking Code School。在這裡您可以把您的知識增長到另一個台階。只需要14個星期您就能成為一個專業的網頁開發人員。"
     victory_become_a_viking: "成為一個維京人。"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "指南"
     tome_cast_button_run: "運作"
     tome_cast_button_running: "運作中"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     average_levels: "平均完成關卡："
     total_levels: "總共完成關卡："
     furthest_level: "最高關卡完成："
-    concepts_covered: "課目覆蓋"
     students: "學生"
     students1: "個學生。"
     concepts: "課目"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     capacity_used: "課堂插槽己用："
     enter_emails: "輸入學生電郵地址來邀請，每行一個"
     send_invites: "發送邀請"
-    title: "標題"
-    description: "描述"
     creating_class: "課堂創建中…"
     purchasing_course: "購買課程中…"
     buy_course: "購買課程"
     buy_course1: "購買這個課程"
-    create_class: "創建課堂"
     select_all_courses: "可半價一次購買所有課程！"
     all_courses: "所有課程"
     number_students: "學生人數"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+    title: "標題" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+    concepts_covered: "課目覆蓋"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+    description: "描述" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+    create_class: "創建課堂"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "大法師"
diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee
index 413084b38..d7b7bd8b1 100644
--- a/app/locale/zh-WUU-HANS.coffee
+++ b/app/locale/zh-WUU-HANS.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
 #  general:
 #    and: "and"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
+#    confirm_password: "Confirm Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
 #  units:
 #    second: "second"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    years: "years"
 
 #  play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
 #    done: "Done"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
 #    guide_title: "Guide"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
 #  versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
 #  classes:
 #    archmage_title: "Archmage"
diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee
index 3ad12f378..b7aab9d92 100644
--- a/app/locale/zh-WUU-HANT.coffee
+++ b/app/locale/zh-WUU-HANT.coffee
@@ -81,6 +81,25 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike."
 #    winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable."
 #    run_class: "Everything you need to run a computer science class in your school today, no CS background required."
+#    teachers: "Teachers!"
+#    teachers_and_educators: "Teachers & Educators"
+#    class_in_box: "Learn how our classroom-in-a-box platform fits into your curriculum."
+#    get_started: "Get Started"
+#    students: "Students:"
+#    join_class: "Join Class"
+#    role: "Your role:"
+#    student_count: "Number of students:"
+#    start_playing_for_free: "Start Playing for Free!"
+#    students_and_players: "Students & Players"
+#    goto_classes: "Go to My Classes" # {change}
+#    educator_wiki: "Educator wiki"
+#    view_profile: "View My Profile"
+#    view_progress: "View Progress"
+#    login_switch: "Have an account?"
+#    check_out_wiki: "Check out our new educator Wiki"
+#    want_coco: "Want CodeCombat at your school?"
+#    form_select_role: "Select primary role"
+#    form_select_range: "Select class size"
 
   nav:
     play: "遊戲開來" # The top nav bar entry where players choose which levels to play
@@ -110,7 +129,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    jobs: "Jobs"
 #    schools: "Schools"
 #    educator_wiki: "Educator Wiki"
-#    request_quote: "Request a Quote"
 #    get_involved: "Get Involved"
 #    open_source: "Open source (GitHub)"
 #    support: "Support"
@@ -244,6 +262,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 #    save_changes: "Save Changes"
+#    required_field: "Required field"
 
   general:
     and: "搭"
@@ -276,6 +295,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     subject: "主題目頭"
     email: "郵箱"
     password: "密碼"
+#    confirm_password: "Confirm Password"
     message: "訊息"
     code: "代碼"
     ladder: "升級比賽"
@@ -294,6 +314,9 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    warrior: "Warrior"
 #    ranger: "Ranger"
 #    wizard: "Wizard"
+#    first_name: "First Name"
+#    last_name: "Last Name"
+#    username: "Username"
 
   units:
     second: "秒"
@@ -312,6 +335,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    years: "years"
 
   play_level:
+#    level_complete: "Level Complete"
 #    completed_level: "Completed Level:"
 #    course: "Course:"
     done: "妝下落"
@@ -355,6 +379,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
+#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
     guide_title: "指南"
 #    tome_cast_button_run: "Run"
 #    tome_cast_button_running: "Running"
@@ -705,10 +730,14 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    jobs_benefits: "Employee Benefits"
 #    jobs_benefit_1: "Competitive salary and options"
 #    jobs_benefit_2: "15 day minimum vacation policy, excluding company holidays"
-#    jobs_benefit_3: "Work from home flexibility"
-#    jobs_benefit_4: "Unlimited sick/personal days"
-#    jobs_benefit_5: "Professional development and continuing education support"
-#    jobs_benefit_6: "Medical/dental/vision insurance"
+#    jobs_benefit_3: "Flex time and flexible work-from-home"
+#    jobs_benefit_4: "Unlimited vacation/sick/personal days"
+#    jobs_benefit_5: "Professional development and continuing education support – free books and games!"
+#    jobs_benefit_6: "Medical (gold), dental, vision"
+#    jobs_benefit_7: "Sit-stand desks for all"
+#    jobs_benefit_9: "10-year option exercise window"
+#    jobs_benefit_10: "Maternity leave: 10 weeks paid, next 6 @ 55% salary, next 12 remote working"
+#    jobs_benefit_11: "Paternity leave: 10 weeks paid, next 12 remote working"
 #    learn_more: "Learn More"
 #    jobs_custom_title: "Create Your Own"
 #    jobs_custom_description: "Are you passionate about CodeCombat but don't see a job listed that matches your qualifications? Write us and show how you think you can contribute to our team. We'd love to hear from you!"
@@ -746,6 +775,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    phone_number_help: "Where can we reach you during the workday?"
 #    role_label: "Your role"
 #    role_help: "Select your primary role."
+#    role_default: "Select Role"
 #    tech_coordinator: "Technology coordinator"
 #    advisor: "Advisor"
 #    principal: "Principal"
@@ -756,6 +786,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    state: "State"
 #    country: "Country"
 #    num_students_help: "How many do you anticipate enrolling in CodeCombat?"
+#    num_students_default: "Select Range"
 #    education_level_label: "Education Level of Students"
 #    education_level_help: "Choose as many as apply."
 #    elementary_school: "Elementary School"
@@ -764,10 +795,18 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    middle_school: "Middle School"
 #    college_plus: "College or higher"
 #    anything_else: "Anything else we should know?"
-#    thanks_header: "Thanks for requesting a demo!"
-#    thanks_p: "We'll be in touch soon. Questions? Email us:"
-#    thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science."
-#    thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science."
+#    thanks_header: "Request Received!"
+#    thanks_sub_header: "Thanks for expressing interest in CodeCombat for your school."
+#    thanks_p: "We'll be in touch soon! If you need to get in contact, you can reach us at:"
+#    finish_signup: "Finish creating your teacher account:"
+#    finish_signup_p: "Create an account to set up a class, add your students, and monitor their progress as they learn computer science."
+#    signup_with: "Sign up with:"
+#    conversion_warning: "WARNING: Your current account is a <em>Student Account</em>. Once you submit this form, your account will be updated to a Teacher Account." # {change}
+#    learn_more_modal: "Teacher accounts on CodeCombat have the ability to monitor student progress, assign enrollments and manage classrooms. Teacher accounts cannot be a part of a classroom - if you are currently enrolled in a class using this account, you will no longer be able to access it once you update to a Teacher Account." # {change}
+#    create_account: "Create a Teacher Account"
+#    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
+#    convert_account_title: "Update to Teacher Account" # {change}
+#    not: "Not"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -962,7 +1001,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    average_levels: "Average levels completed:"
 #    total_levels: "Total levels completed:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
 #    students: "Students"
 #    students1: "students"
 #    concepts: "Concepts"
@@ -977,13 +1015,10 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    capacity_used: "Course slots used:"
 #    enter_emails: "Enter student emails to invite, one per line"
 #    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
 #    creating_class: "Creating class..."
 #    purchasing_course: "Purchasing course..."
 #    buy_course: "Buy Course"
 #    buy_course1: "Buy this course"
-#    create_class: "Create Class"
 #    select_all_courses: "Select 'All Courses' for a 50% discount!"
 #    all_courses: "All Courses"
 #    number_students: "Number of students"
@@ -1032,9 +1067,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    keep_using: "Keep Using"
 #    switch_to: "Switch To"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
 #    back_classrooms: "Back to my classrooms"
 #    back_courses: "Back to my courses"
 #    edit_details: "Edit class details"
@@ -1170,6 +1202,109 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
+#    title: "Courses" # Flat style redesign
+#    subtitle: "Review course guidelines, solutions, and levels"
+#    select_language: "Select language"
+#    select_level: "Select level"
+#    play_level: "Play Level"
+#    concepts_covered: "Concepts covered"
+#    print_guide: "Print Guide (PDF)"
+#    view_guide_online: "View Guide Online (PDF)"
+#    grants_lifetime_access: "Grants lifetime access to all Courses." # New enrollment modal
+#    enrollment_credits_available: "Enrollment Credits Available:"
+#    description: "Description" # ClassroomSettingsModal
+#    language_select: "Select a language"
+#    language_cannot_change: "Language cannot be changed once students join a class."
+#    learn_p: "Learn Python"
+#    learn_j: "Learn JavaScript"
+#    avg_student_exp_label: "Average Student Programming Experience"
+#    avg_student_exp_desc: "This will help us understand how to pace courses better."
+#    avg_student_exp_select: "Select the best option"
+#    avg_student_exp_none: "No Experience - little to no experience"
+#    avg_student_exp_beginner: "Beginner - some exposure or block-based"
+#    avg_student_exp_intermediate: "Intermediate - some experience with typed code"
+#    avg_student_exp_advanced: "Advanced - extensive experience with typed code"
+#    avg_student_exp_varied: "Varied Levels of Experience"
+#    student_age_range_label: "Student Age Range"
+#    student_age_range_younger: "Younger than 6"
+#    student_age_range_older: "Older than 18"
+#    student_age_range_to: "to"
+#    create_class: "Create Class"
+#    class_name: "Class Name"
+#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+
+#  teacher:
+#    teacher_dashboard: "Teacher Dashboard" # Navbar
+#    my_classes: "My Classes"
+#    courses: "Courses"
+#    enrollments: "Enrollments"
+#    resources: "Resources"
+#    help: "Help"
+#    students: "Students" # Shared
+#    language: "Language"
+#    edit_class_settings: "edit class settings"
+#    complete: "Complete"
+#    access_restricted: "Access Restricted" # My Classes page
+#    teacher_account_required: "A teacher account is required to access this content."
+#    create_teacher_account: "Create Teacher Account"
+#    what_is_a_teacher_account: "What's a Teacher Account?"
+#    teacher_account_explanation: "A CodeCombat Teacher account allows you to set up classrooms, monitor students’ progress as they work through courses, manage enrollments and access resources to aid in your curriculum-building."
+#    current_classes: "Current Classes"
+#    archived_classes: "Archived Classes"
+#    archived_classes_blurb: "Classes can be archived for future reference. Unarchive a class to view it in the Current Classes list again."
+#    view_class: "view class"
+#    archive_class: "archive class"
+#    unarchive_class: "unarchive class"
+#    no_students_yet: "This class has no students yet."
+#    add_students: "Add Students"
+#    create_new_class: "Create a New Class"
+#    class_overview: "Class Overview" # View Class page
+#    avg_playtime: "Average level playtime"
+#    total_playtime: "Total play time"
+#    avg_completed: "Average levels completed"
+#    total_completed: "Total levels completed"
+#    concepts_covered: "Concepts covered"
+#    earliest_incomplete: "Earliest incomplete level"
+#    latest_complete: "Latest completed level"
+#    enroll_student: "Enroll student"
+#    adding_students: "Adding students"
+#    course_progress: "Course Progress"
+#    not_applicable: "N/A"
+#    edit: "edit"
+#    remove: "remove"
+#    latest_completed: "Latest Completed"
+#    sort_by: "Sort by"
+#    progress: "Progress"
+#    select_course: "Select course to view"
+#    course_overview: "Course Overview"
+#    copy_class_code: "Copy Class Code"
+#    class_code_blurb: "New students can enter this class code on their dashboard or visit codecombat.com/courses to join the class."
+#    copy_class_url: "Copy Class URL"
+#    class_join_url_blurb: "New students can visit this URL while logged in to join the class."
+#    add_students_manually: "Add Students Manually"
+#    bulk_assign: "Bulk-assign"
+#    assign_to_selected_students: "Assign to Selected Students"
+#    assigned: "Assigned"
+#    enroll_selected_students: "Enroll Selected Students"
+#    guides_coming_soon: "Guides coming soon!" # Courses
+#    show_students_from: "Show students from" # Enroll students modal
+#    enroll_the_following_students: "Enroll the following students"
+#    all_students: "All Students"
+#    enrollments_blurb_1: "Students taking Computer Science" # Enrollments page
+#    enrollments_blurb_2: "require enrollments to access the courses."
+#    credits_available: "Credits Available"
+#    total_unique_students: "Total Unique Students"
+#    total_enrolled_students: "Total Enrolled Students"
+#    unenrolled_students: "Unenrolled Students"
+#    add_enrollment_credits: "Add Enrollment Credits"
+#    purchasing: "Purchasing..."
+#    purchased: "Purchased!"
+#    purchase_now: "Purchase Now"
+#    how_to_enroll: "How to Enroll Students"
+#    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
+#    how_to_enroll_blurb_2: "To bulk-enroll multiple students, select them using the checkboxes on the left side of the classroom page and click the \"Enroll Selected Students\" button."
+#    how_to_enroll_blurb_3: "Once a student is enrolled, they will have access to all of the course content." # {change}
+#    bulk_pricing_blurb: "Purchasing for more than 15 students? Get in touch with us for bulk pricing quotes."
 
   classes:
     archmage_title: "大法師"
diff --git a/app/styles/teachers/request-quote-view.sass b/app/styles/teachers/request-quote-view.sass
index f00405168..f4c61da92 100644
--- a/app/styles/teachers/request-quote-view.sass
+++ b/app/styles/teachers/request-quote-view.sass
@@ -49,3 +49,48 @@
       
   .text-h1
     margin: 40px 0 30px
+
+  
+.algolia-autocomplete 
+  width: 100%;
+
+  .aa-input
+    width: 100%
+
+  .aa-hint
+    color: #999
+    width: 100%
+
+  .aa-dropdown-menu 
+    background-color: #fff
+    border: 1px solid #999
+    border-top: none
+    width: 100%
+
+    .aa-suggestion 
+      cursor: pointer
+      padding: 5px 4px
+      border-top: 1px solid #ccc
+
+      .school
+        font-family: Open Sans
+        font-size: 14px
+        line-height: 20px
+        font-weight: bold
+
+      .district
+        font-family: Open Sans
+        font-size: 14px
+        line-height: 20px
+
+        span
+          white-space: nowrap
+
+
+    .aa-suggestion.aa-cursor 
+      background-color: #B2D7FF
+
+    em
+      font-weight: bold
+      font-style: normal
+
diff --git a/app/templates/teachers/request-quote-view.jade b/app/templates/teachers/request-quote-view.jade
index 8852838af..645771c77 100644
--- a/app/templates/teachers/request-quote-view.jade
+++ b/app/templates/teachers/request-quote-view.jade
@@ -96,7 +96,7 @@ block content
           .col-md-offset-2.col-md-4.col-sm-6
             .form-group
               label.control-label(data-i18n="teachers_quote.organization_label")
-              input.form-control(name="organization")
+              input.form-control#organization-control(name="organization")
 
           .col-md-4.col-sm-6
             .form-group
@@ -170,6 +170,14 @@ block content
             span.spl.text-muted(data-i18n="signup.optional")
 
           textarea.form-control(rows=8, name="notes")
+          input(type="hidden" name="nces_id")
+          input(type="hidden" name="nces_name")
+          input(type="hidden" name="nces_district")
+          input(type="hidden" name="nces_district_id")
+          input(type="hidden" name="nces_district_schools")
+          input(type="hidden" name="nces_district_students")
+          input(type="hidden" name="nces_students")
+          input(type="hidden" name="phone")
 
       #buttons-row.row.text-center
         input#submit-request-btn.btn.btn-lg.btn-primary(type="submit" data-i18n="[value]teachers_quote.title")
diff --git a/app/views/TestView.coffee b/app/views/TestView.coffee
index 51b7e206c..6ad2d51b5 100644
--- a/app/views/TestView.coffee
+++ b/app/views/TestView.coffee
@@ -78,6 +78,7 @@ module.exports = TestView = class TestView extends RootView
     describe 'CodeCombat Client', =>
       jasmine.Ajax.install()
       beforeEach ->
+        me.clear()
         jasmine.Ajax.requests.reset()
         Backbone.Mediator.init()
         Backbone.Mediator.setValidationEnabled false
diff --git a/app/views/core/AuthModal.coffee b/app/views/core/AuthModal.coffee
index 330b48a2c..fc6a78cde 100644
--- a/app/views/core/AuthModal.coffee
+++ b/app/views/core/AuthModal.coffee
@@ -18,6 +18,9 @@ module.exports = class AuthModal extends ModalView
     'click #gplus-login-btn': 'onClickGPlusLoginButton'
     'click #facebook-login-btn': 'onClickFacebookLoginButton'
     'click #close-modal': 'hide'
+    
+  subscriptions:
+    'errors:server-error': 'onServerError'
 
 
   # Initialization
diff --git a/app/views/play/level/tome/DocFormatter.coffee b/app/views/play/level/tome/DocFormatter.coffee
index 94122cd20..e4a9179c8 100644
--- a/app/views/play/level/tome/DocFormatter.coffee
+++ b/app/views/play/level/tome/DocFormatter.coffee
@@ -51,10 +51,10 @@ module.exports = class DocFormatter
     else
       @doc.owner ?= 'this'
       ownerName = @doc.ownerName = if @doc.owner isnt 'this' then @doc.owner else switch @options.language
-        when 'python', 'lua' then 'self'
+        when 'python', 'lua' then (if @options.useHero then 'hero' else 'self')
         when 'java' then 'hero'
         when 'coffeescript' then '@'
-        else 'this'
+        else (if @options.useHero then 'hero' else 'this')
       if @doc.type is 'function'
         [docName, args] = @getDocNameAndArguments()
         sep = {clojure: ' '}[@options.language] ? ', '
@@ -82,9 +82,9 @@ module.exports = class DocFormatter
       if @options.language is 'javascript'
         @doc.shorterName = @doc.shortName.replace ';', ''
         if @doc.owner is 'this' or @options.tabbify
-          @doc.shorterName = @doc.shorterName.replace /^this\./, ''
+          @doc.shorterName = @doc.shorterName.replace /^(this|hero)\./, ''
       else if (@options.language in ['python', 'lua']) and (@doc.owner is 'this' or @options.tabbify)
-        @doc.shorterName = @doc.shortName.replace /^self[:.]/, ''
+        @doc.shorterName = @doc.shortName.replace /^(self|hero)[:.]/, ''
       @doc.title = if @options.shortenize then @doc.shorterName else @doc.shortName
 
     # Grab the language-specific documentation for some sub-properties, if we have it.
@@ -125,6 +125,21 @@ module.exports = class DocFormatter
             console.error "Couldn't create docs template of", val, "\nwith context", context, "\nError:", e
         obj[prop] = @replaceSpriteName obj[prop]  # Do this before using the template, otherwise marked might get us first.
 
+    # Temporary hack to replace self|this with hero until we can update the docs
+    if @options.useHero
+      thisToken =
+        'python': /self/g,
+        'javascript': /this/g,
+        'lua': /self/g
+
+      if thisToken[@options.language]
+        if @doc.example
+          @doc.example = @doc.example.replace thisToken[@options.language], 'hero'
+        if @doc.snippets?[@options.language]?.code
+          @doc.snippets[@options.language].code.replace thisToken[@options.language], 'hero'
+        if @doc.args
+          arg.example = arg.example.replace thisToken[@options.language], 'hero' for arg in @doc.args when arg.example
+
     if @doc.shortName is 'loop' and @options.level.get('type', true) in ['course', 'course-ladder']
       @replaceSimpleLoops()
 
diff --git a/app/views/play/level/tome/SpellPaletteView.coffee b/app/views/play/level/tome/SpellPaletteView.coffee
index 2171d4a4f..c7ac5174f 100644
--- a/app/views/play/level/tome/SpellPaletteView.coffee
+++ b/app/views/play/level/tome/SpellPaletteView.coffee
@@ -30,6 +30,7 @@ module.exports = class SpellPaletteView extends CocoView
     @session = options.session
     @supermodel = options.supermodel
     @thang = options.thang
+    @useHero = options.useHero
     docs = @options.level.get('documentation') ? {}
     @showsHelp = docs.specificArticles?.length or docs.generalArticles?.length
     @createPalette()
@@ -297,7 +298,7 @@ module.exports = class SpellPaletteView extends CocoView
 
   addEntry: (doc, shortenize, isSnippet=false, item=null, showImage=false) ->
     writable = (if _.isString(doc) then doc else doc.name) in (@thang.apiUserProperties ? [])
-    new SpellPaletteEntryView doc: doc, thang: @thang, shortenize: shortenize, isSnippet: isSnippet, language: @options.language, writable: writable, level: @options.level, item: item, showImage: showImage
+    new SpellPaletteEntryView doc: doc, thang: @thang, shortenize: shortenize, isSnippet: isSnippet, language: @options.language, writable: writable, level: @options.level, item: item, showImage: showImage, useHero: @useHero
 
   onDisableControls: (e) -> @toggleControls e, false
   onEnableControls: (e) -> @toggleControls e, true
diff --git a/app/views/play/level/tome/TomeView.coffee b/app/views/play/level/tome/TomeView.coffee
index 27766e578..d60671af5 100644
--- a/app/views/play/level/tome/TomeView.coffee
+++ b/app/views/play/level/tome/TomeView.coffee
@@ -218,7 +218,8 @@ module.exports = class TomeView extends CocoView
 
   updateSpellPalette: (thang, spell) ->
     return unless thang and @spellPaletteView?.thang isnt thang and thang.programmableProperties or thang.apiProperties
-    @spellPaletteView = @insertSubView new SpellPaletteView thang: thang, supermodel: @supermodel, programmable: spell?.canRead(), language: spell?.language ? @options.session.get('codeLanguage'), session: @options.session, level: @options.level, courseID: @options.courseID, courseInstanceID: @options.courseInstanceID
+    useHero = /hero/.test(spell.getSource())
+    @spellPaletteView = @insertSubView new SpellPaletteView thang: thang, supermodel: @supermodel, programmable: spell?.canRead(), language: spell?.language ? @options.session.get('codeLanguage'), session: @options.session, level: @options.level, courseID: @options.courseID, courseInstanceID: @options.courseInstanceID, useHero: useHero
     @spellPaletteView.toggleControls {}, spell.view.controlsEnabled if spell?.view   # TODO: know when palette should have been disabled but didn't exist
 
   spellFor: (thang, spellName) ->
diff --git a/app/views/teachers/RequestQuoteView.coffee b/app/views/teachers/RequestQuoteView.coffee
index 3316d5c6a..14065b9f7 100644
--- a/app/views/teachers/RequestQuoteView.coffee
+++ b/app/views/teachers/RequestQuoteView.coffee
@@ -6,9 +6,11 @@ AuthModal = require 'views/core/AuthModal'
 storage = require 'core/storage'
 errors = require 'core/errors'
 ConfirmModal = require 'views/editor/modal/ConfirmModal'
+algolia = require 'core/services/algolia'
 
 FORM_KEY = 'request-quote-form'
 SIGNUP_REDIRECT = '/teachers'
+NCES_KEYS = ['id', 'name', 'district', 'district_id', 'district_schools', 'district_students', 'students', 'phone']
 
 module.exports = class RequestQuoteView extends RootView
   id: 'request-quote-view'
@@ -18,6 +20,10 @@ module.exports = class RequestQuoteView extends RootView
   events:
     'change #request-form': 'onChangeRequestForm'
     'submit #request-form': 'onSubmitRequestForm'
+    'change input[name="city"]': 'invalidateNCES'
+    'change input[name="state"]': 'invalidateNCES'
+    'change input[name="district"]': 'invalidateNCES'
+    'change input[name="country"]': 'invalidateNCES'
     'click #email-exists-login-link': 'onClickEmailExistsLoginLink'
     'submit #signup-form': 'onSubmitSignupForm'
     'click #logout-link': -> me.logout()
@@ -36,10 +42,14 @@ module.exports = class RequestQuoteView extends RootView
     if @trialRequest and @trialRequest.get('status') isnt 'submitted' and @trialRequest.get('status') isnt 'approved'
       window.tracker?.trackEvent 'View Trial Request', category: 'Teachers', label: 'View Trial Request', ['Mixpanel']
     super()
-    
+
+  invalidateNCES: ->
+    for key in NCES_KEYS
+      @$('input[name="nces_' + key + '"]').val ''
+
   afterRender: ->
     super()
-    
+
     # apply existing trial request on form
     properties = @trialRequest.get('properties')
     if properties
@@ -49,7 +59,7 @@ module.exports = class RequestQuoteView extends RootView
       otherLevel = _.first(_.difference(submittedLevels, commonLevels)) or ''
       @$('#other-education-level-checkbox').attr('checked', !!otherLevel)
       @$('#other-education-level-input').val(otherLevel)
-      
+
     # apply changes from local storage
     obj = storage.load(FORM_KEY)
     if obj
@@ -57,6 +67,31 @@ module.exports = class RequestQuoteView extends RootView
       @$('#other-education-level-input').val(obj.otherInput)
       forms.objectToForm(@$('#request-form'), obj, { overwriteExisting: true })
 
+    $("#organization-control").autocomplete({hint: false}, [
+      source: (query, callback) ->
+        algolia.schoolsIndex.search(query, { hitsPerPage: 5, aroundLatLngViaIP: false }).then (answer) ->
+          callback answer.hits
+        , ->
+          callback []
+      displayKey: 'name',
+      templates:
+        suggestion: (suggestion) ->
+          hr = suggestion._highlightResult
+          "<div class='school'> #{hr.name.value} </div>" +
+            "<div class='district'>#{hr.district.value}, " +
+              "<span>#{hr.city?.value}, #{hr.state.value}</span></div>"
+
+    ]).on 'autocomplete:selected', (event, suggestion, dataset) =>
+      @$('input[name="city"]').val suggestion.city
+      @$('input[name="state"]').val suggestion.state
+      @$('input[name="district"]').val suggestion.district
+      @$('input[name="country"]').val 'USA'
+
+      for key in NCES_KEYS
+        @$('input[name="nces_' + key + '"]').val suggestion[key]
+
+      @onChangeRequestForm()
+
   onChangeRequestForm: ->
     # save changes to local storage
     obj = forms.formToObject(@$('form'))
@@ -68,12 +103,12 @@ module.exports = class RequestQuoteView extends RootView
     e.preventDefault()
     form = @$('#request-form')
     attrs = forms.formToObject(form)
-    
+
     # custom other input logic (also used in form local storage save/restore)
     if @$('#other-education-level-checkbox').is(':checked')
       val = @$('#other-education-level-input').val()
       attrs.educationLevel.push(val) if val
-      
+
     forms.clearFormAlerts(form)
     requestFormSchema = if me.isAnonymous() then requestFormSchemaAnonymous else requestFormSchemaLoggedIn
     result = tv4.validateMultiple(attrs, requestFormSchemaAnonymous)
@@ -106,7 +141,7 @@ module.exports = class RequestQuoteView extends RootView
       modal.once 'confirm', @saveTrialRequest, @
     else
       @saveTrialRequest()
-    
+
   saveTrialRequest: ->
     @trialRequest.notyErrors = false
     @$('#submit-request-btn').text('Sending').attr('disabled', true)
@@ -123,7 +158,7 @@ module.exports = class RequestQuoteView extends RootView
         .addClass('has-error')
         .append($("<div class='help-block error-help-block'>#{userExists} <a id='email-exists-login-link'>#{logIn}</a>"))
       forms.scrollToFirstError()
-    else 
+    else
       errors.showNotyNetworkError(arguments...)
 
   onClickEmailExistsLoginLink: ->
@@ -167,7 +202,7 @@ module.exports = class RequestQuoteView extends RootView
             })
         })
     })
-    
+
   onClickFacebookSignupButton: ->
     btn = @$('#facebook-signup-btn')
     btn.attr('disabled', true)
@@ -212,7 +247,7 @@ module.exports = class RequestQuoteView extends RootView
       forms.setErrorToProperty(form, 'password1', 'Passwords do not match')
       error = true
     return if error
-    
+
     me.set({
       password: attrs.password1
       name: attrs.name
@@ -246,9 +281,12 @@ requestFormSchemaAnonymous = {
       type: 'array'
       items: { type: 'string' }
     }
-    notes: { type: 'string' }
+    notes: { type: 'string' },
 }
 
+for key in NCES_KEYS
+  requestFormSchemaAnonymous['nces_' + key] = type: 'string'
+
 # same form, but add username input
 requestFormSchemaLoggedIn = _.cloneDeep(requestFormSchemaAnonymous)
 requestFormSchemaLoggedIn.required.push('name')
diff --git a/bower.json b/bower.json
index b75664929..46ec14996 100644
--- a/bower.json
+++ b/bower.json
@@ -49,9 +49,14 @@
     "fastclick": "~1.0.3",
     "three.js": "~0.71.0",
     "lscache": "~1.0.5",
-    "esper.js": "http://files.codecombat.com/esper.tar.gz"
+    "esper.js": "http://files.codecombat.com/esper.tar.gz",
+    "algoliasearch": "^3.13.1",
+    "algolia-autocomplete.js": "^1.17.0"
   },
   "overrides": {
+    "algolia-autocomplete.js": {
+      "main": "dist/autocomplete.jquery.js"
+    },
     "backbone": {
       "main": "backbone.js"
     },