diff --git a/style/symbols.sty b/style/symbols.sty
index 2532c37c900e5c863e8716453ce93b95d8acb6a8..0b4e72eda229fc78ca144af8c58355878cecef06 100644
--- a/style/symbols.sty
+++ b/style/symbols.sty
@@ -11,43 +11,53 @@
 % https://gitlab.uliege.be/thlamb/rotare-doc
 % ------------------------------------------------------------------------------
 
-% Generate nomenclature
+% Package for the nomenclature and layout tweaks
 \RequirePackage[stdsubgroups]{nomencl}
 \makenomenclature
 \newcommand{\nomunit}[1]{%
   \renewcommand{\nomentryend}{\hspace*{\fill}\si{#1}}%
 }
-% TODO better spacing/title style
 
 % --- Velocities ---------------------------------------------------------------
 
 % Main velocities components
 \newcommand{\vAx}{\ensuremath{V}} % Absolute axial velocity
+\nomenclature[A]{\vAx}{Axial velocity\nomunit{\m\per\s}}
 \newcommand{\vTg}{\ensuremath{U}} % Absolute tangential velocity
+\nomenclature[A]{\vTg}{Tangential velocity\nomunit{\m\per\s}}
 \newcommand{\rVel}{\ensuremath{W}} % Relative velocity
-
+\nomenclature[A]{\rVel}{Relative velocity\nomunit{\m\per\s}}
 % Induced velocities
 \newcommand\iAx[1][]{\ensuremath{v_{#1i}}} % Induced axial velocity
+\nomenclature[A]{\iAx}{Induced axial velocity\nomunit{\m\per\s}}
 \newcommand{\iTg}[1][]{\ensuremath{u_{#1i}}} % Induced tangential velocity
-
+\nomenclature[A]{\iTg}{Induced tangential velocity\nomunit{\m\per\s}}
 
 \newcommand{\indSwirl}{\ensuremath{u_i}} % Swirl velocity, in-plane toward rot blade
 \newcommand{\indAxVel}{\ensuremath{v_i}} % Induced velocity, normal to rotor dis
 \newcommand{\airspeed}{\ensuremath{V_\infty}} % Freestream velocity
+\nomenclature[A]{\airspeed}{Freestream velocity\nomunit{\m\per\s}}
 \newcommand{\aVel}{\ensuremath{V}} % Axial velocity component
 \newcommand{\indAxWake}{\ensuremath{v_w}} % Slipstream velocity downstream
 \newcommand{\indSwirlWake}{\ensuremath{u_w}} % Slipstream velocity downstream
 \newcommand{\axFact}{\ensuremath{a}} % Axial induction factor
+\nomenclature[A]{\axFact}{Axial induction factor\nomunit{-}}
 \newcommand{\tgFact}{\ensuremath{b}} % Tangential induciton factor
+\nomenclature[A]{\tgFact}{Tangential induction factor\nomunit{-}}
 
 
 
 \newcommand{\angVel}{\ensuremath{\Omega}} % Angular velocity
+\nomenclature[G]{\angVel}{Angular velocity\nomunit{\per\s}}
+
 
 % --- Angles -------------------------------------------------------------------
 \newcommand{\sweep}{\ensuremath{\Lambda}} % Sweep
+\nomenclature[G]{\sweep}{Blade sweep angle\nomunit{}}
 \newcommand{\indAngle}{\ensuremath{\phi}} % Induced angle
+\nomenclature[G]{\phi}{Induced angle\nomunit{}}
 \newcommand{\aoa}{\ensuremath{\alpha}} % Angle of attack
+\nomenclature[G]{\aoa}{Angle of attack\nomunit{}}
 
 % --- Others -------------------------------------------------------------------
 \newcommand{\area}{\ensuremath{A}} % (Rotor) Area
@@ -55,24 +65,38 @@
 
 
 \newcommand{\radius}{\ensuremath{R}} % Rotor radius
+\nomenclature[A]{\radius}{Rotor radius\nomunit{\m}}
 \newcommand{\rRad}{\ensuremath{r}} % Nondimensional radial position along the blade
+\nomenclature[A]{\rRad}{Nondimensional radial position\nomunit{-}}
 \newcommand{\aRad}{\ensuremath{y}} % Radial distance along the blade
+\nomenclature[A]{\aRad}{Absolute radial position\nomunit{\m}}
 \newcommand{\advRat}{\ensuremath{\mathcal{J}}} % Advance ratio
+\nomenclature[A]{\advRat}{Advance ratio\nomunit{-}}
 \newcommand{\mFlow}{\ensuremath{\dot{m}}} % Mass flow rate
+\nomenclature[A]{\mFlow}{Mass flow rate\nomunit{\kg\per\s}}
 
 \newcommand{\mach}{\ensuremath{\mathcal{M}}} % Mach number
-\newcommand{\reynolds}{\ensuremath{\mathcal{Re}}} % Reynolds number
+\nomenclature[A]{\mach}{Mach number\nomunit{-}}
+\newcommand{\reynolds}{\ensuremath{Re}} % Reynolds number
+\nomenclature[A]{\reynolds}{Reynolds number\nomunit{-}}
 \newcommand{\dens}{\ensuremath{\rho}} % Density
+\nomenclature[A]{\dens}{Density\nomunit{kg\per\m^3}}
 \newcommand{\nBlades}{\ensuremath{N_b}} % Number of blades
+\nomenclature[A]{\nBlades}{Number of blades\nomunit{-}}
 
 % --- Forces, torques, powers, etc ---------------------------------------------
 
 % Foces
 \newcommand{\lift}{\ensuremath{\mathcal{L}}} % Lift
+\nomenclature[A]{\lift}{Lift\nomunit{\N}}
 \newcommand{\drag}{\ensuremath{\mathcal{D}}} % Drag
+\nomenclature[A]{\drag}{Drag\nomunit{\N}}
 \newcommand{\thrust}{\ensuremath{\mathcal{T}}} % Thrust
+\nomenclature[A]{\thrust}{Thrust\nomunit{\N}}
 \newcommand{\torque}{\ensuremath{\mathcal{Q}}} % Torque
+\nomenclature[A]{\torque}{Torque\nomunit{\N.\m}}
 \newcommand{\power}{\ensuremath{\mathcal{P}}} % Power
+\nomenclature[A]{\power}{Power\nomunit{\W}}
 \newcommand{\ForceX}{\ensuremath{F_x}} % Rotor force along X_TPP-axis
 \newcommand{\ForceY}{\ensuremath{F_y}} % Rotor force along Y_TPP-axis
 \newcommand{\MomX}{\ensuremath{M_x}} % Rotor moment along X_TPP-axis
@@ -80,14 +104,29 @@
 
 % Coefficients
 \newcommand{\cLift}{\ensuremath{c_l}} % Sectional lift coefficient
+\nomenclature[A]{\cLift}{Lift coefficient\nomunit{-}}
 \newcommand{\cLiftSlope}{\ensuremath{c_{l,\alpha}}} % Lift curve slope
+\nomenclature[A]{\cLiftSlope}{Lift curve slope\nomunit{-}}
 \newcommand{\cDrag}{\ensuremath{c_d}} % Sectional drag coefficient
+\nomenclature[A]{\cDrag}{Drag coefficient\nomunit{-}}
 \newcommand{\cMom}{\ensuremath{c_m}} % Sectional moment coefficient coefficient
+\nomenclature[A]{\cMom}{Moment coefficient\nomunit{-}}
 \newcommand{\cThrust}{\ensuremath{C_{\thrust}}} % Thrust coefficient
+\nomenclature[A]{\cThrust}{Thrust coefficient\nomunit{-}}
 \newcommand{\cTorque}{\ensuremath{C_{\torque}}} % Torque coefficient
+\nomenclature[A]{\cTorque}{Torque coefficient\nomunit{-}}
 \newcommand{\cPower}{\ensuremath{C_{\power}}} % Power coefficient
+\nomenclature[A]{\cPower}{Power coefficient\nomunit{-}}
 \newcommand{\cForceX}{\ensuremath{C_{F_x}}} % Longitudinal force coefficient
 \newcommand{\cForceY}{\ensuremath{C_{F_y}}} % Lateral side force coefficient
 \newcommand{\cMomX}{\ensuremath{C_{M_x}}} % Rolling moment coefficient
 \newcommand{\cMomY}{\ensuremath{C_{M_y}}} % Pitching moment coefficient
 
+
+
+
+
+% Subscripts
+\nomenclature[Z]{$\left(\ \right)_1$}{Upstream of the rotor}
+\nomenclature[Z]{$\left(\ \right)_2$}{At the rotor disk}
+\nomenclature[Z]{$\left(\ \right)_3$}{Far downstream of the rotor}