Reworking the CSS...

29 files changed, 181 insertions, 183 deletions

diff --git a/src/battle/src/View/Character.elm b/src/battle/src/View/Character.elm
index d33feb1..d2b6a52 100644
--- a/src/battle/src/View/Character.elm
+++ b/src/battle/src/View/Character.elm
@@ -31,9 +31,9 @@ get_activation_level_class : (
 get_activation_level_class char =
    if (Struct.Character.is_enabled char)
    then
-      (Html.Attributes.class "battle-character-icon-enabled")
+      (Html.Attributes.class "character-icon-enabled")
    else
-      (Html.Attributes.class "battle-character-icon-disabled")
+      (Html.Attributes.class "character-icon-disabled")
 
 get_alliance_class : (
       Struct.Model.Type ->
@@ -43,9 +43,9 @@ get_alliance_class : (
 get_alliance_class model char =
    if ((Struct.Character.get_player_ix char) == model.player_ix)
    then
-      (Html.Attributes.class "battle-character-ally")
+      (Html.Attributes.class "character-ally")
    else
-      (Html.Attributes.class "battle-character-enemy")
+      (Html.Attributes.class "character-enemy")
 
 get_position_style : (
       Struct.Character.Type ->
@@ -73,7 +73,7 @@ get_focus_class model char =
       (Just (Struct.UI.SelectedCharacter (Struct.Character.get_index char)))
    )
    then
-      (Html.Attributes.class "battle-character-selected")
+      (Html.Attributes.class "character-selected")
    else
       if
       (
@@ -82,7 +82,7 @@ get_focus_class model char =
          (Just (Struct.Character.get_index char))
       )
       then
-         (Html.Attributes.class "battle-character-targeted")
+         (Html.Attributes.class "character-targeted")
       else
          (Html.Attributes.class "")
 
@@ -90,7 +90,7 @@ get_icon_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_icon_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-icon-body"),
+         (Html.Attributes.class "character-icon-body"),
          (Html.Attributes.class
             (
                "asset-character-team-body-"
@@ -106,7 +106,7 @@ get_icon_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_icon_head_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-icon-head"),
+         (Html.Attributes.class "character-icon-head"),
          (Html.Attributes.class
             ("asset-character-icon-" ++ (Struct.Character.get_icon_id char))
          )
@@ -123,8 +123,8 @@ get_icon_actual_html : (
 get_icon_actual_html model char =
       (Html.div
          [
-            (Html.Attributes.class "battle-tiled"),
-            (Html.Attributes.class "battle-character-icon"),
+            (Html.Attributes.class "tiled"),
+            (Html.Attributes.class "character-icon"),
             (get_activation_level_class char),
             (get_alliance_class model char),
             (get_position_style char),
@@ -144,7 +144,7 @@ get_portrait_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_portrait_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-portrait-body"),
+         (Html.Attributes.class "character-portrait-body"),
          (Html.Attributes.class
             (
                "asset-character-portrait-"
@@ -160,7 +160,7 @@ get_portrait_armor_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_portrait_armor_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-portrait-armor"),
+         (Html.Attributes.class "character-portrait-armor"),
          (Html.Attributes.class
             (
                "asset-armor-"
@@ -194,15 +194,15 @@ get_portrait_html viewer_ix char =
             (
                if ((Struct.Character.get_player_ix char) == viewer_ix)
                then
-                  "battle-character-ally"
+                  "character-ally"
                else
-                  "battle-character-enemy"
+                  "character-enemy"
             )
          ),
-         (Html.Attributes.class "battle-character-portrait"),
+         (Html.Attributes.class "character-portrait"),
          (Html.Attributes.class
             (
-               "battle-character-portrait-team-"
+               "character-portrait-team-"
                ++
                (toString (Struct.Character.get_player_ix char))
             )
diff --git a/src/battle/src/View/Controlled.elm b/src/battle/src/View/Controlled.elm
index d0c33a5..cb71842 100644
--- a/src/battle/src/View/Controlled.elm
+++ b/src/battle/src/View/Controlled.elm
@@ -59,7 +59,7 @@ end_turn_button suffix =
    (Html.button
       [
          (Html.Events.onClick Struct.Event.TurnEnded),
-         (Html.Attributes.class "battle-end-turn-button")
+         (Html.Attributes.class "end-turn-button")
       ]
       [ (Html.text ("End Turn" ++ suffix)) ]
    )
@@ -129,7 +129,7 @@ get_html char_turn player_ix =
    of
       (Just char) ->
          (Html.div
-            [(Html.Attributes.class "battle-controlled")]
+            [(Html.Attributes.class "controlled")]
             [
                (View.Controlled.CharacterCard.get_summary_html
                   char_turn
@@ -149,7 +149,7 @@ get_html char_turn player_ix =
                      (Util.Html.nothing)
                ),
                (Html.div
-                  [(Html.Attributes.class "battle-controlled-actions")]
+                  [(Html.Attributes.class "controlled-actions")]
                   (get_available_actions char_turn)
                )
             ]
diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm
index ac56cbb..08393c8 100644
--- a/src/battle/src/View/Controlled/CharacterCard.elm
+++ b/src/battle/src/View/Controlled/CharacterCard.elm
@@ -39,9 +39,9 @@ get_name : (
 get_name char =
    (Html.div
       [
-         (Html.Attributes.class "battle-info-card-name"),
-         (Html.Attributes.class "battle-info-card-text-field"),
-         (Html.Attributes.class "battle-character-card-name")
+         (Html.Attributes.class "info-card-name"),
+         (Html.Attributes.class "info-card-text-field"),
+         (Html.Attributes.class "character-card-name")
       ]
       [
          (Html.text (Struct.Character.get_name char))
@@ -63,7 +63,7 @@ get_health_bar char =
       (View.Gauge.get_html
          ("HP: " ++ (toString current) ++ "/" ++ (toString max))
          (100.0 * ((toFloat current)/(toFloat max)))
-         [(Html.Attributes.class "battle-character-card-health")]
+         [(Html.Attributes.class "character-card-health")]
          []
          []
       )
@@ -75,7 +75,7 @@ get_rank_status : (
 get_rank_status rank =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-status"),
+         (Html.Attributes.class "character-card-status"),
          (Html.Attributes.class "clickable"),
          (Html.Events.onClick
             (Struct.Event.RequestedHelp (Struct.HelpRequest.HelpOnRank rank))
@@ -84,10 +84,10 @@ get_rank_status rank =
             (
                case rank of
                   Struct.Character.Commander ->
-                     "battle-character-card-commander-status"
+                     "character-card-commander-status"
 
                   Struct.Character.Target ->
-                     "battle-character-card-target-status"
+                     "character-card-target-status"
 
                   Struct.Character.Optional -> ""
             )
@@ -104,7 +104,7 @@ get_statuses : (
 get_statuses char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-statuses")
+         (Html.Attributes.class "character-card-statuses")
       ]
       [
          (
@@ -137,7 +137,7 @@ get_active_movement_bar maybe_navigator char =
       (View.Gauge.get_html
          ("MP: " ++ (toString current) ++ "/" ++ (toString max))
          (100.0 * ((toFloat current)/(toFloat max)))
-         [(Html.Attributes.class "battle-character-card-movement")]
+         [(Html.Attributes.class "character-card-movement")]
          []
          []
       )
@@ -164,7 +164,7 @@ get_inactive_movement_bar char =
             )
          )
          100.0
-         [(Html.Attributes.class "battle-character-card-movement")]
+         [(Html.Attributes.class "character-card-movement")]
          []
          []
       )
@@ -202,7 +202,7 @@ get_weapon_field_header : (
 get_weapon_field_header damage_multiplier weapon =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-header")
+         (Html.Attributes.class "character-card-header")
       ]
       [
          (Html.div
@@ -247,7 +247,7 @@ get_mod_html mod =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-info-card-mod")
+            (Html.Attributes.class "info-card-mod")
          ]
          [
             (Html.text
@@ -263,7 +263,7 @@ get_multiplied_mod_html multiplier mod =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-character-card-mod")
+            (Html.Attributes.class "character-card-mod")
          ]
          [
             (Html.text
@@ -285,13 +285,13 @@ get_weapon_details : (
 get_weapon_details omnimods damage_multiplier weapon =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-weapon")
+         (Html.Attributes.class "character-card-weapon")
       ]
       [
          (get_weapon_field_header damage_multiplier weapon),
          (Html.div
             [
-               (Html.Attributes.class "battle-info-card-omnimods-listing")
+               (Html.Attributes.class "info-card-omnimods-listing")
             ]
             (List.map
                (get_multiplied_mod_html damage_multiplier)
@@ -309,7 +309,7 @@ get_weapon_summary : (
 get_weapon_summary damage_multiplier weapon =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-weapon-summary")
+         (Html.Attributes.class "character-card-weapon-summary")
       ]
       [
          (get_weapon_field_header damage_multiplier weapon)
@@ -324,12 +324,12 @@ get_armor_details : (
 get_armor_details omnimods armor =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-armor")
+         (Html.Attributes.class "character-card-armor")
       ]
       [
          (Html.div
             [
-               (Html.Attributes.class "battle-character-card-armor-name")
+               (Html.Attributes.class "character-card-armor-name")
             ]
             [
                (Html.text (Struct.Armor.get_name armor))
@@ -337,7 +337,7 @@ get_armor_details omnimods armor =
          ),
          (Html.div
             [
-               (Html.Attributes.class "battle-info-card-omnimods-listing")
+               (Html.Attributes.class "info-card-omnimods-listing")
             ]
             (List.map
                (get_mod_html)
@@ -351,7 +351,7 @@ stat_name  : String -> (Html.Html Struct.Event.Type)
 stat_name name =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-stat-name")
+         (Html.Attributes.class "character-card-stat-name")
       ]
       [
          (Html.text name)
@@ -362,7 +362,7 @@ stat_val : Int -> Bool -> (Html.Html Struct.Event.Type)
 stat_val val perc =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-stat-val")
+         (Html.Attributes.class "character-card-stat-val")
       ]
       [
          (Html.text
@@ -388,7 +388,7 @@ get_relevant_stats : (
 get_relevant_stats stats =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-card-stats")
+         (Html.Attributes.class "character-card-stats")
       ]
       [
          (stat_name "Dodge"),
@@ -415,22 +415,22 @@ get_minimal_html : (
 get_minimal_html player_ix char =
    (Html.div
       [
-         (Html.Attributes.class "battle-info-card"),
-         (Html.Attributes.class "battle-info-card-minimal"),
-         (Html.Attributes.class "battle-character-card"),
-         (Html.Attributes.class "battle-character-card-minimal")
+         (Html.Attributes.class "info-card"),
+         (Html.Attributes.class "info-card-minimal"),
+         (Html.Attributes.class "character-card"),
+         (Html.Attributes.class "character-card-minimal")
       ]
       [
          (get_name char),
          (Html.div
             [
-               (Html.Attributes.class "battle-info-card-top"),
-               (Html.Attributes.class "battle-character-card-top")
+               (Html.Attributes.class "info-card-top"),
+               (Html.Attributes.class "character-card-top")
             ]
             [
                (Html.div
                   [
-                     (Html.Attributes.class "battle-info-card-picture")
+                     (Html.Attributes.class "info-card-picture")
                   ]
                   [
                      (View.Character.get_portrait_html player_ix char)
@@ -461,19 +461,19 @@ get_summary_html char_turn player_ix char =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-character-card")
+            (Html.Attributes.class "character-card")
          ]
          [
             (get_name char),
             (Html.div
                [
-                  (Html.Attributes.class "battle-info-card-top"),
-                  (Html.Attributes.class "battle-character-card-top")
+                  (Html.Attributes.class "info-card-top"),
+                  (Html.Attributes.class "character-card-top")
                ]
                [
                   (Html.div
                      [
-                        (Html.Attributes.class "battle-info-card-picture")
+                        (Html.Attributes.class "info-card-picture")
                      ]
                      [
                         (View.Character.get_portrait_html player_ix char)
@@ -508,20 +508,20 @@ get_full_html player_ix char =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-info-card"),
-            (Html.Attributes.class "battle-character-card")
+            (Html.Attributes.class "info-card"),
+            (Html.Attributes.class "character-card")
          ]
          [
             (get_name char),
             (Html.div
                [
-                  (Html.Attributes.class "battle-info-card-top"),
-                  (Html.Attributes.class "battle-character-card-top")
+                  (Html.Attributes.class "info-card-top"),
+                  (Html.Attributes.class "character-card-top")
                ]
                [
                   (Html.div
                      [
-                        (Html.Attributes.class "battle-info-card-picture")
+                        (Html.Attributes.class "info-card-picture")
                      ]
                      [
                         (View.Character.get_portrait_html player_ix char)
diff --git a/src/battle/src/View/Controlled/ManualControls.elm b/src/battle/src/View/Controlled/ManualControls.elm
index 1dceafb..7dd88e7 100644
--- a/src/battle/src/View/Controlled/ManualControls.elm
+++ b/src/battle/src/View/Controlled/ManualControls.elm
@@ -20,7 +20,7 @@ direction_button : (
 direction_button dir label =
    (Html.div
       [
-         (Html.Attributes.class ("battle-manual-controls-" ++ label)),
+         (Html.Attributes.class ("manual-controls-" ++ label)),
          (Html.Attributes.class "clickable"),
          (Html.Events.onClick
             (Struct.Event.DirectionRequested dir)
@@ -33,7 +33,7 @@ go_button : (Html.Html Struct.Event.Type)
 go_button =
    (Html.button
       [
-         (Html.Attributes.class "battle-manual-controls-go"),
+         (Html.Attributes.class "manual-controls-go"),
          (Html.Events.onClick Struct.Event.AttackWithoutMovingRequest)
       ]
       [
@@ -48,7 +48,7 @@ get_html : (Html.Html Struct.Event.Type)
 get_html =
    (Html.div
       [
-         (Html.Attributes.class "battle-manual-controls")
+         (Html.Attributes.class "manual-controls")
       ]
       [
          (direction_button Struct.Direction.Left "left"),
diff --git a/src/battle/src/View/Controlled/Targets.elm b/src/battle/src/View/Controlled/Targets.elm
index eee5a54..4b27175 100644
--- a/src/battle/src/View/Controlled/Targets.elm
+++ b/src/battle/src/View/Controlled/Targets.elm
@@ -63,7 +63,7 @@ get_html : (
 get_html model target_ref =
    (Html.div
       [
-         (Html.Attributes.class "battle-side-bar-targets")
+         (Html.Attributes.class "side-bar-targets")
       ]
       [(get_target_info_html model target_ref)]
    )
diff --git a/src/battle/src/View/Gauge.elm b/src/battle/src/View/Gauge.elm
index cf89f3a..2b9c4e0 100644
--- a/src/battle/src/View/Gauge.elm
+++ b/src/battle/src/View/Gauge.elm
@@ -18,7 +18,7 @@ get_text_div: (
 get_text_div text extra_txt_attr =
    (Html.div
       (
-         [(Html.Attributes.class "battle-gauge-text")]
+         [(Html.Attributes.class "gauge-text")]
          ++ extra_txt_attr
       )
       [
@@ -41,7 +41,7 @@ get_bar_div percent extra_bar_attr =
                ]
             ),
             (Html.Attributes.class
-               "battle-gauge-bar"
+               "gauge-bar"
             )
          ]
          ++
@@ -66,7 +66,7 @@ get_html : (
 get_html text percent extra_div_attr extra_bar_attr extra_txt_attr =
    (Html.div
       (
-         [(Html.Attributes.class "battle-gauge")]
+         [(Html.Attributes.class "gauge")]
          ++ extra_div_attr
       )
       [
diff --git a/src/battle/src/View/MainMenu.elm b/src/battle/src/View/MainMenu.elm
index 96bf539..e436555 100644
--- a/src/battle/src/View/MainMenu.elm
+++ b/src/battle/src/View/MainMenu.elm
@@ -33,7 +33,7 @@ get_html : (Html.Html Struct.Event.Type)
 get_html =
    (Html.div
       [
-         (Html.Attributes.class "battle-main-menu")
+         (Html.Attributes.class "main-menu")
       ]
       (
          (get_main_menu_button_html)
diff --git a/src/battle/src/View/Map.elm b/src/battle/src/View/Map.elm
index ad10695..12e9474 100644
--- a/src/battle/src/View/Map.elm
+++ b/src/battle/src/View/Map.elm
@@ -32,7 +32,7 @@ get_tiles_html : Struct.Map.Type -> (Html.Html Struct.Event.Type)
 get_tiles_html map =
    (Html.div
       [
-         (Html.Attributes.class "battle-tiles-layer"),
+         (Html.Attributes.class "tiles-layer"),
          (Html.Attributes.style
             [
                (
@@ -86,7 +86,7 @@ maybe_print_navigator interactive maybe_nav =
          (Just nav) ->
             (Html.div
                [
-                  (Html.Attributes.class ("battle-navigator" ++ name_suffix))
+                  (Html.Attributes.class ("navigator" ++ name_suffix))
                ]
                (View.Map.Navigator.get_html
                   (Struct.Navigator.get_summary nav)
@@ -105,7 +105,7 @@ get_characters_html : (
 get_characters_html model characters =
    (Html.div
       [
-         (Html.Attributes.class "battle-characters")
+         (Html.Attributes.class "characters")
       ]
       (List.map
          (View.Map.Character.get_html model)
@@ -123,7 +123,7 @@ get_html : (
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battle-actual"),
+         (Html.Attributes.class "actual"),
          (Html.Attributes.style
             (
                if ((Struct.UI.get_zoom_level model.ui) == 1)
diff --git a/src/battle/src/View/Map/Character.elm b/src/battle/src/View/Map/Character.elm
index aaf7cb2..4470b4a 100644
--- a/src/battle/src/View/Map/Character.elm
+++ b/src/battle/src/View/Map/Character.elm
@@ -36,7 +36,7 @@ get_animation_class model char =
                then
                   (Html.Attributes.class "")
                else
-                  (Html.Attributes.class "battle-character-selected")
+                  (Html.Attributes.class "character-selected")
 
             (Struct.TurnResultAnimator.TurnResult current_action) ->
                if
@@ -51,7 +51,7 @@ get_animation_class model char =
                   case current_action of
                      (Struct.TurnResult.Moved _) ->
                         (Html.Attributes.class
-                           "battle-animated-character-icon"
+                           "animated-character-icon"
                         )
 
                      _ -> (Html.Attributes.class "")
@@ -64,9 +64,9 @@ get_activation_level_class : (
 get_activation_level_class char =
    if (Struct.Character.is_enabled char)
    then
-      (Html.Attributes.class "battle-character-icon-enabled")
+      (Html.Attributes.class "character-icon-enabled")
    else
-      (Html.Attributes.class "battle-character-icon-disabled")
+      (Html.Attributes.class "character-icon-disabled")
 
 get_alliance_class : (
       Struct.Model.Type ->
@@ -76,9 +76,9 @@ get_alliance_class : (
 get_alliance_class model char =
    if ((Struct.Character.get_player_ix char) == model.player_ix)
    then
-      (Html.Attributes.class "battle-character-ally")
+      (Html.Attributes.class "character-ally")
    else
-      (Html.Attributes.class "battle-character-enemy")
+      (Html.Attributes.class "character-enemy")
 
 get_position_style : (
       Struct.Character.Type ->
@@ -106,7 +106,7 @@ get_focus_class model char =
       (Just (Struct.UI.SelectedCharacter (Struct.Character.get_index char)))
    )
    then
-      (Html.Attributes.class "battle-character-selected")
+      (Html.Attributes.class "character-selected")
    else
       if
       (
@@ -115,7 +115,7 @@ get_focus_class model char =
          (Just (Struct.Character.get_index char))
       )
       then
-         (Html.Attributes.class "battle-character-targeted")
+         (Html.Attributes.class "character-targeted")
       else
          (Html.Attributes.class "")
 
@@ -123,7 +123,7 @@ get_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-icon-body"),
+         (Html.Attributes.class "character-icon-body"),
          (Html.Attributes.class
             (
                "asset-character-team-body-"
@@ -139,7 +139,7 @@ get_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_head_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-icon-head"),
+         (Html.Attributes.class "character-icon-head"),
          (Html.Attributes.class
             ("asset-character-icon-" ++ (Struct.Character.get_icon_id char))
          )
@@ -154,7 +154,7 @@ get_banner_html char =
       Struct.Character.Commander ->
          (Html.div
             [
-               (Html.Attributes.class "battle-character-icon-banner"),
+               (Html.Attributes.class "character-icon-banner"),
                (Html.Attributes.class "asset-character-icon-commander-banner")
             ]
             [
@@ -164,7 +164,7 @@ get_banner_html char =
       Struct.Character.Target ->
          (Html.div
             [
-               (Html.Attributes.class "battle-character-icon-banner"),
+               (Html.Attributes.class "character-icon-banner"),
                (Html.Attributes.class "asset-character-icon-target-banner")
             ]
             [
@@ -181,8 +181,8 @@ get_actual_html : (
 get_actual_html model char =
       (Html.div
          [
-            (Html.Attributes.class "battle-tiled"),
-            (Html.Attributes.class "battle-character-icon"),
+            (Html.Attributes.class "tiled"),
+            (Html.Attributes.class "character-icon"),
             (get_animation_class model char),
             (get_activation_level_class char),
             (get_alliance_class model char),
diff --git a/src/battle/src/View/Map/Navigator.elm b/src/battle/src/View/Map/Navigator.elm
index 63c982a..c4b430f 100644
--- a/src/battle/src/View/Map/Navigator.elm
+++ b/src/battle/src/View/Map/Navigator.elm
@@ -28,12 +28,10 @@ marker_get_html is_interactive (loc_ref, marker) =
    (Html.div
       (
          [
-            (Html.Attributes.class "battle-marker-icon"),
-            (Html.Attributes.class "battle-tiled"),
+            (Html.Attributes.class "marker-icon"),
+            (Html.Attributes.class "tiled"),
             (Html.Attributes.class
                (
-                  "battle-"
-                  ++
                   (
                      case marker of
                         Struct.Marker.CanGoToCanDefend -> "can-go-to-can-defend"
@@ -79,7 +77,7 @@ marker_get_html is_interactive (loc_ref, marker) =
                )
                then
                   [
-                     (Html.Attributes.class "battle-navigator-interactive"),
+                     (Html.Attributes.class "navigator-interactive"),
                      (Html.Attributes.class "clickable"),
                      (Html.Events.onClick
                         (Struct.Event.CharacterOrTileSelected loc_ref)
@@ -87,11 +85,11 @@ marker_get_html is_interactive (loc_ref, marker) =
                   ]
                else
                   [
-                     (Html.Attributes.class "battle-navigator-interactive")
+                     (Html.Attributes.class "navigator-interactive")
                   ]
             else
                [
-                  (Html.Attributes.class "battle-navigator-non-interactive"),
+                  (Html.Attributes.class "navigator-non-interactive"),
                   (Html.Events.onClick
                      (Struct.Event.CharacterOrTileSelected loc_ref)
                   )
@@ -123,20 +121,20 @@ path_node_get_html is_below_markers next_dir (curr_loc, curr_dir, curr_nodes) =
       (
          (Html.div
             [
-               (Html.Attributes.class "battle-path-icon"),
+               (Html.Attributes.class "path-icon"),
                (Html.Attributes.class
                   (
                      if (is_below_markers)
                      then
-                        "battle-path-icon-below-markers"
+                        "path-icon-below-markers"
                      else
-                        "battle-path-icon-above-markers"
+                        "path-icon-above-markers"
                   )
                ),
-               (Html.Attributes.class "battle-tiled"),
+               (Html.Attributes.class "tiled"),
                (Html.Attributes.class
                   (
-                     "battle-path-icon-"
+                     "path-icon-"
                      ++
                      (Struct.Direction.to_string curr_dir)
                      ++
@@ -185,12 +183,12 @@ mark_the_spot : (
 mark_the_spot loc origin_dir =
    (Html.div
       [
-         (Html.Attributes.class "battle-path-icon"),
-         (Html.Attributes.class "battle-path-icon-above-markers"),
-         (Html.Attributes.class "battle-tiled"),
+         (Html.Attributes.class "path-icon"),
+         (Html.Attributes.class "path-icon-above-markers"),
+         (Html.Attributes.class "tiled"),
          (Html.Attributes.class
             (
-               "battle-path-icon-mark"
+               "path-icon-mark"
                ++
                (Struct.Direction.to_string origin_dir)
             )
diff --git a/src/battle/src/View/Map/Tile.elm b/src/battle/src/View/Map/Tile.elm
index 36e7cb4..962b998 100644
--- a/src/battle/src/View/Map/Tile.elm
+++ b/src/battle/src/View/Map/Tile.elm
@@ -24,7 +24,7 @@ get_layer_html : (
 get_layer_html index border =
    (Html.div
       [
-         (Html.Attributes.class ("battle-tile-icon-f-" ++ (toString index))),
+         (Html.Attributes.class ("tile-icon-f-" ++ (toString index))),
          (Html.Attributes.style
             [
                (
@@ -52,7 +52,7 @@ get_content_html tile =
    (
       (Html.div
          [
-            (Html.Attributes.class "battle-tile-icon-bg"),
+            (Html.Attributes.class "tile-icon-bg"),
             (Html.Attributes.style
                [
                   (
@@ -73,7 +73,7 @@ get_content_html tile =
       (
          (Html.div
             [
-               (Html.Attributes.class "battle-tile-icon-dt"),
+               (Html.Attributes.class "tile-icon-dt"),
                (Html.Attributes.style
                   [
                      (
@@ -105,11 +105,11 @@ get_html tile =
    let tile_loc = (Struct.Tile.get_location tile) in
       (Html.div
          [
-            (Html.Attributes.class "battle-tile-icon"),
-            (Html.Attributes.class "battle-tiled"),
+            (Html.Attributes.class "tile-icon"),
+            (Html.Attributes.class "tiled"),
             (Html.Attributes.class
                (
-                  "battle-tile-variant-"
+                  "tile-variant-"
                   ++ (toString (Struct.Tile.get_local_variant_ix tile))
                )
             ),
diff --git a/src/battle/src/View/MessageBoard/Animator/Attack.elm b/src/battle/src/View/MessageBoard/Animator/Attack.elm
index 437a76d..78c1f49 100644
--- a/src/battle/src/View/MessageBoard/Animator/Attack.elm
+++ b/src/battle/src/View/MessageBoard/Animator/Attack.elm
@@ -47,7 +47,7 @@ get_empty_attack_html : (Html.Html Struct.Event.Type)
 get_empty_attack_html =
    (Html.div
       [
-         (Html.Attributes.class "battle-message-attack-text")
+         (Html.Attributes.class "message-attack-text")
       ]
       []
    )
@@ -65,7 +65,7 @@ get_attack_html attacker defender attack =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-message-attack-text")
+            (Html.Attributes.class "message-attack-text")
          ]
          [
             (Html.text
@@ -111,9 +111,9 @@ get_attack_animation_class : (
 get_attack_animation_class attack char =
    if (attack.critical)
    then
-      "battle-animated-portrait-attack-critical"
+      "animated-portrait-attack-critical"
    else
-      "battle-animated-portrait-attacks"
+      "animated-portrait-attacks"
 
 get_defense_animation_class : (
       Struct.Attack.Type ->
@@ -125,22 +125,22 @@ get_defense_animation_class attack char =
    then
       if (attack.precision == Struct.Attack.Miss)
       then
-         "battle-animated-portrait-dodges"
+         "animated-portrait-dodges"
       else
-         "battle-animated-portrait-undamaged"
+         "animated-portrait-undamaged"
    else if ((Struct.Character.get_current_health char) > 0)
    then
       if (attack.precision == Struct.Attack.Graze)
       then
-         "battle-animated-portrait-grazed-damage"
+         "animated-portrait-grazed-damage"
       else
-         "battle-animated-portrait-damaged"
+         "animated-portrait-damaged"
    else
       if (attack.precision == Struct.Attack.Graze)
       then
-         "battle-animated-portrait-grazed-death"
+         "animated-portrait-grazed-death"
       else
-         "battle-animated-portrait-dies"
+         "animated-portrait-dies"
 
 get_attacker_card : (
       (Maybe Struct.Attack.Type) ->
@@ -154,12 +154,12 @@ get_attacker_card maybe_attack char =
             if ((Struct.Character.get_current_health char) > 0)
             then
                [
-                  (Html.Attributes.class "battle-animated-portrait")
+                  (Html.Attributes.class "animated-portrait")
                ]
             else
                [
-                  (Html.Attributes.class "battle-animated-portrait-absent"),
-                  (Html.Attributes.class "battle-animated-portrait")
+                  (Html.Attributes.class "animated-portrait-absent"),
+                  (Html.Attributes.class "animated-portrait")
                ]
 
          (Just attack) ->
@@ -179,7 +179,7 @@ get_attacker_card maybe_attack char =
                         (get_attack_animation_class attack char)
                   )
                ),
-               (Html.Attributes.class "battle-animated-portrait")
+               (Html.Attributes.class "animated-portrait")
             ]
       )
       [
@@ -202,12 +202,12 @@ get_defender_card maybe_attack char =
             if ((Struct.Character.get_current_health char) > 0)
             then
                [
-                  (Html.Attributes.class "battle-animated-portrait")
+                  (Html.Attributes.class "animated-portrait")
                ]
             else
                [
-                  (Html.Attributes.class "battle-animated-portrait-absent"),
-                  (Html.Attributes.class "battle-animated-portrait")
+                  (Html.Attributes.class "animated-portrait-absent"),
+                  (Html.Attributes.class "animated-portrait")
                ]
 
          (Just attack) ->
@@ -227,7 +227,7 @@ get_defender_card maybe_attack char =
                         (get_defense_animation_class attack char)
                   )
                ),
-               (Html.Attributes.class "battle-animated-portrait")
+               (Html.Attributes.class "animated-portrait")
             ]
       )
       [
@@ -255,8 +255,8 @@ get_placeholder_html characters attacker_ix defender_ix maybe_attack =
       ((Just atkchar), (Just defchar)) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-message-board"),
-               (Html.Attributes.class "battle-message-attack")
+               (Html.Attributes.class "message-board"),
+               (Html.Attributes.class "message-attack")
             ]
             (
                [
diff --git a/src/battle/src/View/MessageBoard/Error.elm b/src/battle/src/View/MessageBoard/Error.elm
index 797d89f..c03467a 100644
--- a/src/battle/src/View/MessageBoard/Error.elm
+++ b/src/battle/src/View/MessageBoard/Error.elm
@@ -24,8 +24,8 @@ get_html : (
 get_html model error =
    (Html.div
       [
-         (Html.Attributes.class "battle-message-board"),
-         (Html.Attributes.class "battle-error")
+         (Html.Attributes.class "message-board"),
+         (Html.Attributes.class "error")
       ]
       [
          (Html.text (Struct.Error.to_string error))
diff --git a/src/battle/src/View/MessageBoard/Help.elm b/src/battle/src/View/MessageBoard/Help.elm
index 6c20bbc..a1d1af7 100644
--- a/src/battle/src/View/MessageBoard/Help.elm
+++ b/src/battle/src/View/MessageBoard/Help.elm
@@ -23,8 +23,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battle-message-board"),
-         (Html.Attributes.class "battle-message-board-help")
+         (Html.Attributes.class "message-board"),
+         (Html.Attributes.class "message-board-help")
       ]
       (
          case model.help_request of
diff --git a/src/battle/src/View/MessageBoard/Help/Guide.elm b/src/battle/src/View/MessageBoard/Help/Guide.elm
index 7268c12..38c2a9a 100644
--- a/src/battle/src/View/MessageBoard/Help/Guide.elm
+++ b/src/battle/src/View/MessageBoard/Help/Guide.elm
@@ -18,7 +18,7 @@ get_header_html title =
       []
       [
          (Html.div
-            [(Html.Attributes.class "battle-help-guide-icon")]
+            [(Html.Attributes.class "help-guide-icon")]
             []
          ),
          (Html.text title)
diff --git a/src/battle/src/View/MessageBoard/Help/Rank.elm b/src/battle/src/View/MessageBoard/Help/Rank.elm
index 4a01e75..9e9a858 100644
--- a/src/battle/src/View/MessageBoard/Help/Rank.elm
+++ b/src/battle/src/View/MessageBoard/Help/Rank.elm
@@ -14,7 +14,7 @@ import Struct.Event
 get_guide_icon_html : (Html.Html Struct.Event.Type)
 get_guide_icon_html =
    (Html.div
-      [(Html.Attributes.class "battle-help-guide-icon")]
+      [(Html.Attributes.class "help-guide-icon")]
       []
    )
 
@@ -28,10 +28,10 @@ get_header_with_icon_html title rank_name =
          (Html.div
             [
                (Html.Attributes.class
-                  "battle-message-board-help-figure"
+                  "message-board-help-figure"
                ),
                (Html.Attributes.class
-                  ("battle-character-card-" ++ rank_name ++ "-status")
+                  ("character-card-" ++ rank_name ++ "-status")
                )
             ]
             []
diff --git a/src/battle/src/View/SubMenu.elm b/src/battle/src/View/SubMenu.elm
index e661b9c..a010019 100644
--- a/src/battle/src/View/SubMenu.elm
+++ b/src/battle/src/View/SubMenu.elm
@@ -56,7 +56,7 @@ get_html model =
    case (Struct.UI.try_getting_displayed_tab model.ui) of
       (Just tab) ->
          (Html.div
-            [(Html.Attributes.class "battle-sub-menu")]
+            [(Html.Attributes.class "sub-menu")]
             [(get_inner_html model tab)]
          )
 
@@ -66,7 +66,7 @@ get_html model =
                case (Array.get char_ref model.characters) of
                   (Just char) ->
                      (Html.div
-                        [(Html.Attributes.class "battle-sub-menu")]
+                        [(Html.Attributes.class "sub-menu")]
                         [
                            (Html.text "Targeting:"),
                            (Html.Lazy.lazy3
diff --git a/src/battle/src/View/SubMenu/Characters.elm b/src/battle/src/View/SubMenu/Characters.elm
index 396dbee..e433ab0 100644
--- a/src/battle/src/View/SubMenu/Characters.elm
+++ b/src/battle/src/View/SubMenu/Characters.elm
@@ -24,7 +24,7 @@ get_character_element_html : (
 get_character_element_html player_ix char =
    (Html.div
       [
-         (Html.Attributes.class "battle-characters-element"),
+         (Html.Attributes.class "characters-element"),
          (
             if (Struct.Character.is_alive char)
             then
@@ -38,9 +38,9 @@ get_character_element_html player_ix char =
          (
             if (Struct.Character.is_enabled char)
             then
-               (Html.Attributes.class "battle-characters-element-active")
+               (Html.Attributes.class "characters-element-active")
             else
-               (Html.Attributes.class "battle-characters-element-inactive")
+               (Html.Attributes.class "characters-element-inactive")
          )
       ]
       [
@@ -59,8 +59,8 @@ get_html : (
 get_html characters player_ix =
    (Html.div
       [
-         (Html.Attributes.class "battle-tabmenu-content"),
-         (Html.Attributes.class "battle-tabmenu-characters-tab")
+         (Html.Attributes.class "tabmenu-content"),
+         (Html.Attributes.class "tabmenu-characters-tab")
       ]
       (List.map
          (get_character_element_html player_ix)
diff --git a/src/battle/src/View/SubMenu/Settings.elm b/src/battle/src/View/SubMenu/Settings.elm
index e0ad4d7..0becac1 100644
--- a/src/battle/src/View/SubMenu/Settings.elm
+++ b/src/battle/src/View/SubMenu/Settings.elm
@@ -30,8 +30,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battle-tabmenu-content"),
-         (Html.Attributes.class "battle-tabmenu-settings-tab")
+         (Html.Attributes.class "tabmenu-content"),
+         (Html.Attributes.class "tabmenu-settings-tab")
       ]
       [
          (scale_button (0.75) "Zoom -"),
diff --git a/src/battle/src/View/SubMenu/Status.elm b/src/battle/src/View/SubMenu/Status.elm
index 485704e..afb9f09 100644
--- a/src/battle/src/View/SubMenu/Status.elm
+++ b/src/battle/src/View/SubMenu/Status.elm
@@ -26,8 +26,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battle-footer-tabmenu-content"),
-         (Html.Attributes.class "battle-footer-tabmenu-content-status")
+         (Html.Attributes.class "footer-tabmenu-content"),
+         (Html.Attributes.class "footer-tabmenu-content-status")
       ]
       [
          (case (Struct.UI.get_previous_action model.ui) of
diff --git a/src/battle/src/View/SubMenu/Status/CharacterInfo.elm b/src/battle/src/View/SubMenu/Status/CharacterInfo.elm
index 814ce5f..094b8d0 100644
--- a/src/battle/src/View/SubMenu/Status/CharacterInfo.elm
+++ b/src/battle/src/View/SubMenu/Status/CharacterInfo.elm
@@ -25,7 +25,7 @@ get_html : (
 get_html player_ix char =
    (Html.div
       [
-         (Html.Attributes.class "battle-tabmenu-character-info")
+         (Html.Attributes.class "tabmenu-character-info")
       ]
       [
          (Html.text ("Focusing:")),
diff --git a/src/battle/src/View/SubMenu/Status/TileInfo.elm b/src/battle/src/View/SubMenu/Status/TileInfo.elm
index cace444..1dbe8f6 100644
--- a/src/battle/src/View/SubMenu/Status/TileInfo.elm
+++ b/src/battle/src/View/SubMenu/Status/TileInfo.elm
@@ -27,11 +27,11 @@ get_icon : (Struct.Tile.Instance -> (Html.Html Struct.Event.Type))
 get_icon tile =
    (Html.div
       [
-         (Html.Attributes.class "battle-tile-card-icon"),
-         (Html.Attributes.class "battle-info-card-picture"),
+         (Html.Attributes.class "tile-card-icon"),
+         (Html.Attributes.class "info-card-picture"),
          (Html.Attributes.class
             (
-               "battle-tile-variant-"
+               "tile-variant-"
                ++ (toString (Struct.Tile.get_local_variant_ix tile))
             )
          )
@@ -50,9 +50,9 @@ get_name model tile =
       (Just tile_type) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-info-card-name"),
-               (Html.Attributes.class "battle-info-card-text-field"),
-               (Html.Attributes.class "battle-tile-card-name")
+               (Html.Attributes.class "info-card-name"),
+               (Html.Attributes.class "info-card-text-field"),
+               (Html.Attributes.class "tile-card-name")
             ]
             [
                (Html.text (Struct.Tile.get_name tile_type))
@@ -72,8 +72,8 @@ get_cost tile =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-info-card-text-field"),
-            (Html.Attributes.class "battle-tile-card-cost")
+            (Html.Attributes.class "info-card-text-field"),
+            (Html.Attributes.class "tile-card-cost")
          ]
          [
             (Html.text text)
@@ -87,8 +87,8 @@ get_location tile =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-info-card-text-field"),
-            (Html.Attributes.class "battle-tile-card-location")
+            (Html.Attributes.class "info-card-text-field"),
+            (Html.Attributes.class "tile-card-location")
          ]
          [
             (Html.text
@@ -110,7 +110,7 @@ get_mod_html mod =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-info-card-mod")
+            (Html.Attributes.class "info-card-mod")
          ]
          [
             (Html.text
@@ -123,7 +123,7 @@ get_omnimods_listing : (List (String, Int)) -> (Html.Html Struct.Event.Type)
 get_omnimods_listing mod_list =
    (Html.div
       [
-         (Html.Attributes.class "battle-info-card-omnimods-listing")
+         (Html.Attributes.class "info-card-omnimods-listing")
       ]
       (List.map (get_mod_html) mod_list)
    )
@@ -132,7 +132,7 @@ get_omnimods : Struct.Omnimods.Type -> (Html.Html Struct.Event.Type)
 get_omnimods omnimods =
    (Html.div
       [
-         (Html.Attributes.class "battle-info-card-omnimods")
+         (Html.Attributes.class "info-card-omnimods")
       ]
       [
          (Html.text "Attribute Modifiers"),
@@ -158,15 +158,15 @@ get_html model loc =
       (Just tile) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-info-card"),
-               (Html.Attributes.class "battle-tile-card")
+               (Html.Attributes.class "info-card"),
+               (Html.Attributes.class "tile-card")
             ]
             [
                (get_name model tile),
                (Html.div
                   [
-                     (Html.Attributes.class "battle-info-card-top"),
-                     (Html.Attributes.class "battle-tile-card-top")
+                     (Html.Attributes.class "info-card-top"),
+                     (Html.Attributes.class "tile-card-top")
                   ]
                   [
                      (get_icon tile),
diff --git a/src/battle/src/View/SubMenu/Timeline.elm b/src/battle/src/View/SubMenu/Timeline.elm
index 7fb1813..a0978b5 100644
--- a/src/battle/src/View/SubMenu/Timeline.elm
+++ b/src/battle/src/View/SubMenu/Timeline.elm
@@ -71,8 +71,8 @@ true_get_html : (
 true_get_html characters player_ix turn_results =
    (Html.div
       [
-         (Html.Attributes.class "battle-tabmenu-content"),
-         (Html.Attributes.class "battle-tabmenu-timeline-tab")
+         (Html.Attributes.class "tabmenu-content"),
+         (Html.Attributes.class "tabmenu-timeline-tab")
       ]
       (Array.toList
          (Array.map
diff --git a/src/battle/src/View/SubMenu/Timeline/Attack.elm b/src/battle/src/View/SubMenu/Timeline/Attack.elm
index 682540d..6ba8cd0 100644
--- a/src/battle/src/View/SubMenu/Timeline/Attack.elm
+++ b/src/battle/src/View/SubMenu/Timeline/Attack.elm
@@ -26,7 +26,7 @@ get_title_html : (
 get_title_html attacker defender =
    (Html.div
       [
-         (Html.Attributes.class "battle-timeline-attack-title")
+         (Html.Attributes.class "timeline-attack-title")
       ]
       [
          (Html.text
@@ -135,8 +135,8 @@ get_html characters player_ix attack =
       ((Just atkchar), (Just defchar)) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-attack")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-attack")
             ]
             (
                [
@@ -155,8 +155,8 @@ get_html characters player_ix attack =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-attack")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-attack")
             ]
             [
                (Html.text "Error: Attack with unknown characters")
diff --git a/src/battle/src/View/SubMenu/Timeline/Movement.elm b/src/battle/src/View/SubMenu/Timeline/Movement.elm
index 0746f1f..e3be53d 100644
--- a/src/battle/src/View/SubMenu/Timeline/Movement.elm
+++ b/src/battle/src/View/SubMenu/Timeline/Movement.elm
@@ -32,8 +32,8 @@ get_html characters player_ix movement =
       (Just char) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-movement")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-movement")
             ]
             [
                (View.Character.get_portrait_html player_ix char),
@@ -53,8 +53,8 @@ get_html characters player_ix movement =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-movement")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-movement")
             ]
             [
                (Html.text "Error: Moving with unknown character")
diff --git a/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm b/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm
index db5e023..1d91c9a 100644
--- a/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm
+++ b/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm
@@ -23,8 +23,8 @@ get_html : (
 get_html pdefeat =
    (Html.div
       [
-         (Html.Attributes.class "battle-timeline-element"),
-         (Html.Attributes.class "battle-timeline-player-defeat")
+         (Html.Attributes.class "timeline-element"),
+         (Html.Attributes.class "timeline-player-defeat")
       ]
       [
          (Html.text
diff --git a/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm b/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm
index a6486fa..233e03c 100644
--- a/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm
+++ b/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm
@@ -23,8 +23,8 @@ get_html : (
 get_html pturns =
    (Html.div
       [
-         (Html.Attributes.class "battle-timeline-element"),
-         (Html.Attributes.class "battle-timeline-turn-start")
+         (Html.Attributes.class "timeline-element"),
+         (Html.Attributes.class "timeline-turn-start")
       ]
       [
          (Html.text
diff --git a/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm b/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm
index 4d47f62..9728f04 100644
--- a/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm
+++ b/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm
@@ -23,8 +23,8 @@ get_html : (
 get_html pvict =
    (Html.div
       [
-         (Html.Attributes.class "battle-timeline-element"),
-         (Html.Attributes.class "battle-timeline-player-victory")
+         (Html.Attributes.class "timeline-element"),
+         (Html.Attributes.class "timeline-player-victory")
       ]
       [
          (Html.text
diff --git a/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm b/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm
index 499e0c3..2e874b0 100644
--- a/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm
+++ b/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm
@@ -32,8 +32,8 @@ get_html characters player_ix weapon_switch =
       (Just char) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-weapon-switch")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-weapon-switch")
             ]
             [
                (View.Character.get_portrait_html player_ix char),
@@ -49,8 +49,8 @@ get_html characters player_ix weapon_switch =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-weapon-switch")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-weapon-switch")
             ]
             [
                (Html.text "Error: Unknown character switched weapons")